Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

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

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

@@ -11,7 +11,6 @@ export default {
       if (compareData(GMS.oldBillData, bill.getBuillData())) {
         this.approvalLogical(bill, param, this)
       } else {
-        GMS.billDataChangeChecked = true
         GMS.$hideContainer.$Modal.confirm({
           title: "信息提示",
           content: "信息发生变化, 是否保存",
@@ -19,7 +18,6 @@ export default {
             this.saveLogical(bill, param, {data: bill.getBuillData(), detailData: []}, this) 
           },
           onCancel: () => {
-            this.approvalLogical(bill, param, this)
           }
         })
       }
@@ -28,7 +26,7 @@ export default {
       GMS.$hideContainer.$Message.error('缺少参数');
     }
   },
-  saveLogical: (bill, param, postData, _this) => {
+  saveLogical: function (bill, param, postData) {
     let url = `/rbc/bill/action/executed/${param.define}/bill.Basic.save?transmission=total`
     GMS.$http.post(url, JSON.stringify(postData), {
       headers: {
@@ -39,7 +37,7 @@ export default {
     })
     .then((response) => {
       if (response.data.code == 0) {
-        _this.approvalLogical(bill, param, _this)
+        this.approvalLogical(bill, param)
       } else {
         response.data.message && GMS.vbus.$Message.error({
           content: response.data.message,
@@ -48,22 +46,20 @@ export default {
       }
     })
   },
-  approvalLogical: (bill, param, _this) => {
+  approvalLogical: function (bill, param) {
     let taskId = bill.getGlobalParam('reviewParam').taskId;
     bill.setControlsSate(param["_control_name_"], "enable", false)
     let selectedApprovers = []
     window.GMS.$http.get(`/bpm/bill/selectApprover/ApproverList/${taskId}`).then((res) => {
       if (res.data.code == 204) {
-        _this.executeApproval(bill, param, _this)
+        this.executeApproval(bill, param)
         return
       }
       else if (res.data.code != 200) {
-        delete GMS.billDataChangeChecke
         bill.setControlsSate(param["_control_name_"], "enable", true)
         GMS.$hideContainer.$Message.error(res.data.msg || '提交失败，请联系系统管理员');
         return
       }
-      delete GMS.billDataChangeChecke
       bill.setControlsSate(param["_control_name_"], "enable", true)
       const nodeData = res.data.ApproverVo
       const optionList = [...nodeData.approvers]
@@ -96,7 +92,7 @@ export default {
               approvers: selectedApprovers,
             }
           ).then(() => {
-            _this.executeApproval(bill, param)
+            this.executeApproval(bill, param)
           }).catch(() => {
             GMS.$hideContainer.$Message.error('选择审批人发生错误')
           })
@@ -108,7 +104,7 @@ export default {
       GMS.$hideContainer.$Message.error('未找到下一节点的审批人');
     })
   },
-  executeApproval: function(bill, param, _this) {
+  executeApproval: function(bill, param) {
     if (param.param.actions) {
       let saveParam = {
         actions: param.param.actions,
@@ -121,7 +117,7 @@ export default {
       }
       bill.executeServerAction(saveParam, function (code, data) {
         if (code === 200) {
-          _this.approval(bill, param);
+          this.approval(bill, param);
           // bill.setControlsSate(param["_control_name_"], "loading", false)
         } else {
           bill.setControlsSate(param["_control_name_"], "enable", true)
@@ -130,7 +126,7 @@ export default {
         }
       }.bind(this));
     } else {
-      _this.approval(bill, param);
+      this.approval(bill, param);
     }
   },
   approval: function (bill, param) {
@@ -144,6 +140,7 @@ export default {
           // console.log('审批成功');
           bill.setControlsSate(param["_control_name_"], "loading", false)
           GMS.$hideContainer.$Message.success('审批成功！')
+          GMS.vbus.$emit('change-form-state', { state: 'readOnly'})
           
           if (
             window.osConfig.appOpenMode &&

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

@@ -6,7 +6,6 @@ export default {
         if (compareData(GMS.oldBillData, bill.getBuillData())) {
           this.approvalLogical(bill, param, this)
         } else {
-          GMS.billDataChangeChecked = true
           GMS.$hideContainer.$Modal.confirm({
             title: "信息提示",
             content: "信息发生变化, 是否保存",
@@ -14,7 +13,6 @@ export default {
              this.saveLogical(bill, param, {data: bill.getBuillData(), detailData: []}, this) 
             },
             onCancel: () => {
-              this.approvalLogical(bill, param, this)
             }
           })
         }
@@ -22,7 +20,7 @@ export default {
         GMS.$hideContainer.$Message.error('缺少参数');
       }
   },
-  approvalLogical: (bill, param, _this) => {
+  approvalLogical: function (bill, param) {
     bill.setControlsSate(param["_control_name_"], "enable", false)
     if(param.param.actions){
         let saveParam = {
@@ -30,18 +28,17 @@ export default {
         }
         bill.executeServerAction(saveParam,function(code,data){
             if(code===200){
-                _this.approval(bill, param);
+                this.approval(bill, param);
             }else{
-                delete GMS.billDataChangeChecke 
                 bill.setControlsSate(param["_control_name_"], "enable", true)
                 GMS.$hideContainer.$message.error("操作异常请联系管理员");
             }
         }.bind(this));
     } else {
-        _this.approval(bill, param);
+        this.approval(bill, param);
     }
   },
-  saveLogical: (bill, param, postData, _this) => {
+  saveLogical: function (bill, param, postData) {
     let url = `/rbc/bill/action/executed/${param.define}/bill.Basic.save?transmission=total`
     GMS.$http.post(url, JSON.stringify(postData), {
       headers: {
@@ -52,7 +49,7 @@ export default {
     })
     .then((response) => {
       if (response.data.code == 0) {
-        _this.approvalLogical(bill, param, _this)
+        this.approvalLogical(bill, param)
       } else {
         response.data.message && GMS.vbus.$Message.error({
           content: response.data.message,
@@ -73,6 +70,7 @@ export default {
               if (response.status == 200 || response.statusText == 'OK') {
                   bill.setControlsSate(param["_control_name_"], "enable", true)
                   bill.setControlsSate(param["_control_name_"],"loading",false)
+                  GMS.vbus.$emit('change-form-state', { state: 'readOnly'})
                   GMS.$hideContainer.$Message.success('驳回成功！')
                   if (
                     window.osConfig.appOpenMode &&