Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

See merge request GFP/RBC/rbc-frontend!34

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue

@@ -246,7 +246,8 @@ export default {
       const listRes = await this.getBaseData(postData)
       const { rows } = listRes.data
       // 过滤叶子节点，list接口不返回叶子节点标识，离谱
-      if (this.isLeaf) {
+      // 分组列表类型基础数据请求出来的数据不需要过滤叶子节点
+      if (this.isLeaf && this.structtype !== 1) {
         this.baseDataList = rows.filter((item) => {
           return this.treeDataMap[item.code]
         })

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/indexMixin.js

@@ -10,19 +10,19 @@ export default {
       },
     },
   },
-  watch: {
-    value: {
-      handler: function (newVal) {
-        if (newVal) {
-          this.init(newVal)
-        } else {
-          this.selection = []
-          this.sendEvent(null)
-        }
-      },
-      deep: true,
-    },
-  },
+  // watch: {
+  //   value: {
+  //     handler: function (newVal) {
+  //       if (newVal) {
+  //         this.init(newVal)
+  //       } else {
+  //         this.selection = []
+  //         this.sendEvent(null)
+  //       }
+  //     },
+  //     deep: true,
+  //   },
+  // },
   
   methods: {
     init(value) {

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -1157,7 +1157,7 @@ export default {
 			"title": "财务_查询草稿[CW_draftSearchAction]",
 			"value": "draftSearchAction",
 			"btnDisable": "false",
-			"btnDisable": "billReadOnly;90;91;92"
+			"btnDisable": "billReadOnly;1;90;91;92"
 		}, {
 			"discard": false,
 			"path": "单据/复制单据",
@@ -1354,7 +1354,7 @@ export default {
 			"description": "",
 			"title": "财务_暂存[CW_tempSave]",
 			"value": "CW_tempSave",
-			"btnDisable": "billReadOnly;90;91;92"
+			"btnDisable": "billReadOnly;1;90;91;92"
 		},
 		{
 			"discard": false,
@@ -1367,7 +1367,7 @@ export default {
 			"description": "",
 			"title": "财务_保存[CW_saveAction]",
 			"value": "CW_saveAction",
-			"btnDisable": "billReadOnly;90;92"
+			"btnDisable": "billReadOnly;1;90;92"
 		},
 		{
 			"discard": false,
@@ -1477,7 +1477,7 @@ export default {
 			"description": "",
 			"title": "财务_提交[CW_submitAction]",
 			"value": "CW_submitAction",
-			"btnDisable": "billEdit;90;92"
+			"btnDisable": "billEdit;1;90;92"
 		},
 		{
 			"discard": false,

develop/@gms/gms-plugin-billexpand/src/query-actions/seeDetailAction.js

@@ -39,6 +39,7 @@ export default {
         c.init = true;
         c.modal_visible = true;
         c.isReadOnly = true;
+        c.state = 'readOnly'
       });
     }
   },