Merge branch 'develop-zhouyi' into 'develop'

feat(@gms/gms-plugin-billexpand): 同意时运行公式，并处理确认保存

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

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

@@ -14,6 +14,8 @@ export default {
       if (flag) {
         this.approvalLogical(bill, param, this)
       } else {
+        bill.runFormulaCheckData(param, (msg) => {
+          if (msg.length == 0) {
             GMS.$hideContainer.$Modal.confirm({
               title: "信息提示",
               content: "信息发生变化, 是否保存",
@@ -23,6 +25,14 @@ export default {
               onCancel: () => {
               }
             })
+          } else {
+            GMS.vbus.$Modal.warning({
+              title: "信息错误",
+              content: msg,
+            });
+          }
+        });
+        
       }
 
     } else {
@@ -40,6 +50,13 @@ export default {
     })
     .then((response) => {
       if (response.data.code == 0) {
+        let curTagId = window.nros.context.getCurrTag();
+        if (curTagId) {
+          GMS.oldBillDataMap[curTagId] = bill.getBuillData()
+        }
+        else {
+          GMS.oldBillData = bill.getBuillData()
+        }
         this.approvalLogical(bill, param)
       } else {
         response.data.message && GMS.vbus.$Message.error({