Merge remote-tracking branch 'origin/develop' into develop-fengjiansheng

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

@@ -114,8 +114,12 @@ export default {
             GMS.queryObject.index=0;
           }
           GMS.vbus.$Message.success("保存成功");
+          if (param.param && param.param.isApprove) {
+            GMS.vbus.$emit('change-form-state', { state: ''})
+          } else {
             GMS.vbus.$emit('change-form-state', { state: 'readOnly', billId: id})
-          GMS.vbus.$emit("saveSuccess", buidData, param);
+          }
+          // GMS.vbus.$emit("saveSuccess", buidData, param);
         } else {
           response.data.message && GMS.vbus.$Message.error({
             content: errorMessageUtil.saveAction.getErrorMessage(response.data.message),

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

@@ -7,7 +7,9 @@ export default {
         GMS.showDetailAction = true;//详情，点击确定按钮。记录此参数
         component = c;
         c.bill = bill;
-        c.isReadOnly = true
+        c.isReadOnly = true;
+        c.state = 'readOnly';
+        c.hideButtonGroup = true;
         let tableName = null;
         if(param.param && param.param.tableName){
           tableName = param.param.tableName

develop/@gms/gms-plugin-billexpand/src/components-control/add-info-modal.vue

@@ -76,6 +76,7 @@
           :state="state"
           v-if="selectBill"
           @loadFinish="loadFinishFun"
+          :hideButtonGroup="hideButtonGroup"
         ></gms-bill-form>
         <div slot="footer" style="height: 0"></div>
       </Modal>
@@ -112,6 +113,7 @@ export default {
       tableColnum: [],
       subBillData: null,
       masterFieldsObj:{},
+      hideButtonGroup:false
     };
   },
   mounted() {

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

@@ -25,9 +25,11 @@
 <template>
   <div class="dept-person-div">
     <Modal
+      ref="modal"
       v-model="visible"
       :title="title"
       :width="modalWidth"
+      :mask-closable="false"
       @on-ok="onOk"
       @on-cancel="onCancel"
     >
@@ -134,8 +136,15 @@ export default {
     window.onresize = () => {
       this.getModalHeight()
     }
+    this.$refs.modal.$el.addEventListener('click', this.stopPropagation)
+  },
+  beforeUnmount() {
+    this.$refs.modal.$el.removeeventlistener('click', this.stopPropagation)
   },
   methods: {
+    stopPropagation(event) {
+      event.stopPropagation()
+    },
     getModalHeight() {
       let viewport = window.innerHeight
       if (viewport <= 600 && viewport >= 400) {

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

@@ -136,9 +136,16 @@ export default {
         approveState = this.workflowState
       }
       let disableState = val.split(';')
-      // 配置工作流已提交未审批90状态下可用
-      if (btnItem && btnItem.isApprove) {
-        disableState = disableState.filter(item => item !== '90')
+      // 配置工作流已提交未审批90, billReadOnly状态下可用
+      // 主要用于保存在审批状态下可用，审批还能修改··
+      if (this.define.btnGroupAction && this.define.btnGroupAction[btnItem] && this.define.btnGroupAction[btnItem].isApprove) {
+        disableState = disableState.filter(item => {
+          if (item === '90') {
+            return false
+          } else {
+            return true
+          }
+        })
       }
       const getBillState = () => {
         if (this.tmpBill.state === '') {