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/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状态下可用
+      // 配置工作流已提交未审批90, billReadOnly状态下可用
+      // 主要用于保存在审批状态下可用，审批还能修改··
       if (btnItem && btnItem.isApprove) {
-        disableState = disableState.filter(item => item !== '90')
+        disableState = disableState.filter(item => {
+          if (item === '90' || item === 'billReadOnly') {
+            return false
+          } else {
+            return true
+          }
+        })
       }
       const getBillState = () => {
         if (this.tmpBill.state === '') {