Merge branch 'develop-yuancheng' into 'develop'

fix:隐藏已选

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

develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js

@@ -4,6 +4,7 @@ import SelectApprovers from '../components-control/select-approvers.vue'
 export default {
   execute: function (bill, param) {
     if (bill) {
+      bill.setControlsSate(param["_control_name_"], "enable", false)
       let taskId = bill.getGlobalParam('reviewParam').taskId;
       let selectedApprovers = []
       window.GMS.$http.get(`/bpm/bill/selectApprover/ApproverList/${taskId}`).then((res) => {
@@ -12,10 +13,11 @@ export default {
           return
         }
         else if (res.data.code != 200) {
-          // this.executeApproval(bill, param)
+          bill.setControlsSate(param["_control_name_"], "enable", true)
           GMS.$hideContainer.$Message.error(res.data.msg || '提交失败，请联系系统管理员');
           return
         }
+        bill.setControlsSate(param["_control_name_"], "enable", true)
         const nodeData = res.data.ApproverVo
         const optionList = [...nodeData.approvers]
         if (optionList.length == 0) {
@@ -78,6 +80,7 @@ export default {
           this.approval(bill, param);
           bill.setControlsSate(param["_control_name_"], "loading", false)
         } else {
+          bill.setControlsSate(param["_control_name_"], "enable", true)
           bill.setControlsSate(param["_control_name_"], "loading", false)
           GMS.$hideContainer.$message.error("操作异常请联系管理员");
         }
@@ -93,6 +96,8 @@ export default {
     GMS.$http.post('/gms/workflow/task/completed/' + taskId + '?result=1&comments=' + comments).then(
       function (response) {
         if (response.status == 200 || response.statusText == 'OK') {
+          bill.setControlsSate(param["_control_name_"], "enable", true)
+
           // console.log('审批成功');
           bill.setControlsSate(param["_control_name_"], "loading", false)
           GMS.$hideContainer.$Message.success('审批成功！')
@@ -112,7 +117,9 @@ export default {
     )
       .catch(
         function (error) {
+          bill.setControlsSate(param["_control_name_"], "enable", true)
           bill.setControlsSate(param["_control_name_"], "loading", false)
+          GMS.$hideContainer.$Message.error('error')
         }.bind(this)
       );
   }

develop/@gms/gms-plugin-billexpand/src/actions/closeAction.js

@@ -9,7 +9,7 @@ export default {
       GMS.$hideContainer.$portalAPI.emit('entry-tag-close')
     }
     else if (Bridge.vm) {
-      Bridge.vm.modal_visible = false
+      Bridge.vm.handleCancel()
     }
 	}
 }
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/actions/rejectAction.js

@@ -3,6 +3,7 @@ import Bridge from '../components-control/util/bridge'
 export default {
   execute: function (bill, param) {
       if(bill){
+        bill.setControlsSate(param["_control_name_"], "enable", false)
           if(param.param.isNeedSave){
               let saveParam = {
                   actions: "bill.Basic.save",
@@ -19,6 +20,7 @@ export default {
                       bill.setControlsSate(param["_control_name_"],"loading",false)
                   }else{
                       bill.setControlsSate(param["_control_name_"],"loading",false)
+                      bill.setControlsSate(param["_control_name_"], "enable", true)
                       GMS.$hideContainer.$message.error("操作异常请联系管理员");
                   }
               }.bind(this));
@@ -37,6 +39,7 @@ export default {
           function(response) {
               if (response.status == 200 || response.statusText == 'OK') {
                   // console.log('驳回成功');
+                  bill.setControlsSate(param["_control_name_"], "enable", true)
                   bill.setControlsSate(param["_control_name_"],"loading",false)
                   GMS.$hideContainer.$Message.success('驳回成功！')
                   if (
@@ -54,7 +57,9 @@ export default {
       )
       .catch(
           function(error) {
+              bill.setControlsSate(param["_control_name_"], "enable", true)
               bill.setControlsSate(param["_control_name_"],"loading",false)
+              GMS.$hideContainer.$Message.error(error)
           }.bind(this)
       );
   }

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

@@ -2,8 +2,8 @@
   <div class="rbc-basedata">
     <el-popover trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth">
       <div class="select-box" slot="reference">
-        <Icon type="ios-close-circle" :class="{'clear-tree-icon': true, 'hidden-icon': disabled || readonly || !selectValue }" @click="clearList" />
         <Input ref="searchInput" v-model="selectValue" :disabled="disabled" :readonly="readonly || multiple" :class="{'multiple-input': multiple && !readonly}" placeholder="" @on-change="handleChange" @on-focus="handleFocus" @on-blur="handleBlur" @keydown.down.native="handleSelectNext" @keydown.up.native="handleSelectPrev" @keydown.enter.native="handleSelected">
+          <Icon type="ios-close-circle" :class="{'clear-icon': true, 'hidden-icon': disabled || readonly || !selectValue }" slot="suffix" @click="clearList" />
           <Icon type="ios-more" class="more-select" slot="suffix" @click="handleInputSelect" />
         </Input>
       </div>
@@ -106,7 +106,6 @@ export default {
   mounted () {
     addResizeListener(this.$el, this.handleResize)
   },
-
   methods: {
     handleResize () {
      this.searchPopperMinWidth = this.$el.getBoundingClientRect().width
@@ -334,30 +333,23 @@ export default {
 <style lang="less" scoped>
   .select-box {
     position: relative;
+    .clear-icon {
+      display: none;
+    }
     /deep/ .ivu-input-suffix {
       z-index: 999;
+      i {
+        position: relative;
+        top: 50%;
+        transform: translate(0, -50%);
+      }
     }
   }
-
-  .select-box .clear-tree-icon {
-    position: absolute;
-    color: #808695;
-    font-size: 16px;
-    width: 14px;
-    height: 14px;
-    top: 0;
-    bottom: 0;
-    right: 26px;
-    margin: auto 0;
-    z-index: 999;
-    display: none;
-    background-color: #fff;
-  }
-
-  .select-box:hover .clear-tree-icon {
-    display: inline-block;
+  .select-box:hover {
+    .clear-icon {
+      display: inline-block;
+    }
   }
-
   .select-box:hover .hidden-icon,
   .select-box .hidden-icon {
     display: none;

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

@@ -29,7 +29,7 @@
 </style>
 <template>
   <div class="view-div">
-    <div v-show="!hideSelected" class="selected-view" >
+    <div v-show="false" class="selected-view" >
       <div style="margin-bottom: 20px; width: 100%;">
         <Checkbox
           :value="selection.length > 0"