Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend…

Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend into develop-qiaoyanqi

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

@@ -136,6 +136,10 @@ export default {
     hideSelected: {
       type: Boolean,
       default: false
+    },
+    isVxe: {
+      type: Boolean,
+      default: false
     }
   },
   data () {

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

@@ -19,7 +19,7 @@
       <!-- </div> -->
     </el-popover>
     <!-- 弹框 -->
-    <EditModal v-model="showModal" :title="title" :selection="selection" :table-name="tableName" :multiple="multiple" :tableKey="tableKey" :treeKey="treeKey" :tableColumns="tableColumns" :searchPlaceholder="searchPlaceholder" :authType="authType" :versionDate="versionDate" :modalWidth="modalWidth" :isLeaf="isLeaf" :hideSelected="hideSelected" :structtype="structtype" :groupTableName="groupTableName" :treeTableName="treeTableName" :filterFormular="filterFormular" :filterFormularSP="filterFormularSP" :billdefineName="billdefineName" :billId="billId" :bill="bill" :isFilter="isFilter" :rowIndex="rowIndex" @on-ok="onSelectOk" />
+    <EditModal v-if="showModal" v-model="showModal" :title="title" :selection="selection" :table-name="tableName" :multiple="multiple" :tableKey="tableKey" :treeKey="treeKey" :tableColumns="tableColumns" :searchPlaceholder="searchPlaceholder" :authType="authType" :versionDate="versionDate" :modalWidth="modalWidth" :isLeaf="isLeaf" :hideSelected="hideSelected" :structtype="structtype" :groupTableName="groupTableName" :treeTableName="treeTableName" :filterFormular="filterFormular" :filterFormularSP="filterFormularSP" :billdefineName="billdefineName" :billId="billId" :bill="bill" :isFilter="isFilter" :rowIndex="rowIndex" @on-ok="onSelectOk" />
   </div>
 </template>
 <script>
@@ -95,6 +95,13 @@ export default {
         this.getBaseDataList()
       },
     },
+    structtype: {
+      handler() {
+        if (this.isVxe) {
+          this.getBaseDataList()
+        }
+      }
+    }
   },
   mounted () {
     addResizeListener(this.$el, this.handleResize)
@@ -180,6 +187,7 @@ export default {
     },
     // 获取下拉列表数据
     async getBaseDataList() {
+      if (this.structtype === -1) return
       const getTreeDataMap = (nodes) => {
         nodes.forEach((node) => {
           if (!node.hasChildren) {
@@ -203,8 +211,8 @@ export default {
       }
       let groupname = ''
       let treeData = {}
-      if (Object.keys(this.treeDataMap).length === 0) {
-        let treePostData = JSON.parse(JSON.stringify(postData) || this.structtype === 1)
+      if (Object.keys(this.treeDataMap).length === 0 || this.structtype === 1) {
+        let treePostData = JSON.parse(JSON.stringify(postData))
         if (this.structtype === 1) {
           // 获取分组树表名
           if (this.groupTableName.define.showFields) {

develop/@gms/gms-plugin-billexpand/src/control/buttonGrouop.vue

 <template>
   <div ref="btnGroup" class="btngroup-container" :style="btnContainerStyle">
-    <ButtonGroup class="button-group">
+    <ButtonGroup v-if="buttonShow" class="button-group">
       <div v-for="(item, index) in btnGroup" :key="index">
         <gms-button :define="item.buttonDefine" :context="context" :billStateDisable="item.billStateDisable"></gms-button>
         <Divider type="vertical" />
@@ -21,7 +21,8 @@ export default {
         bottom: ''
       },
       btnGroup: [],
-      workflowState: 0
+      workflowState: 0,
+      buttonShow: true
     }
   },
   watch: {
@@ -31,6 +32,14 @@ export default {
       },
       immediate: true,
     },
+    'tmpBill.type': {
+      handler(nv) {
+        if (nv === 'draftLoad') {
+          this.buttonShow = false
+        }
+      },
+      immediate: true
+    },
   },
 
   mounted() {

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

@@ -1328,7 +1328,7 @@ export default {
 			"description": "",
 			"title": "财务_编辑[CW_editBill]",
 			"value": "CW_editBill",
-			"btnDisable": "billEdit;90;91;92"
+			"btnDisable": "billEdit;90;92"
 		},
 		{
 			"discard": false,
@@ -1341,7 +1341,7 @@ export default {
 			"description": "",
 			"title": "财务_删除[CW_deleteBill]",
 			"value": "CW_deleteBill",
-			"btnDisable": "billEdit;90;91;92"
+			"btnDisable": "billEdit;90;92"
 		},
 		{
 			"discard": false,

develop/@rbc/rbc-login/src/views/login/index.vue

@@ -265,18 +265,20 @@ export default {
         });
     },
 
-    async getVerificationCode() {
+    getVerificationCode() {
       try {
         this.verifyuuid = GMS.util.generateUUID();
-        const res = await GMS.$http.get(
+        GMS.$http.get(
           `/captcha/getCaptcha?clientId=${this.verifyuuid}`,
           {
             responseType: "blob",
           }
-        );
+        ).then((res) => {
           if (res.data) {
             this.verificationImg = window.URL.createObjectURL(res.data);
           }
+        })
+        
       } catch (err) {
         console.log(err);
       }