fix 同意驳回增加执行动作

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

@@ -68,23 +68,23 @@ export default {
     }
   },
   executeApproval: function(bill, param) {
-    if (param.param.isNeedSave) {
+    if (param.param.actions) {
       let saveParam = {
-        actions: "bill.Basic.save",
-        afterAction: "",
-        confirmTitle: "",
-        customSaveAction: "",
-        noCheckCardDepressPeriod: true,
-        noCheckSubTable: true,
-        viewName: ""
+        actions: param.param.actions,
+        // afterAction: "",
+        // confirmTitle: "",
+        // customSaveAction: "",
+        // noCheckCardDepressPeriod: true,
+        // noCheckSubTable: true,
+        // viewName: ""
       }
       bill.executeServerAction(saveParam, function (code, data) {
         if (code === 200) {
           this.approval(bill, param);
-          bill.setControlsSate(param["_control_name_"], "loading", false)
+          // bill.setControlsSate(param["_control_name_"], "loading", false)
         } else {
           bill.setControlsSate(param["_control_name_"], "enable", true)
-          bill.setControlsSate(param["_control_name_"], "loading", false)
+          // bill.setControlsSate(param["_control_name_"], "loading", false)
           GMS.$hideContainer.$message.error("操作异常请联系管理员");
         }
       }.bind(this));

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

@@ -3,22 +3,16 @@ export default {
   execute: function (bill, param) {
       if(bill){
         bill.setControlsSate(param["_control_name_"], "enable", false)
-          if(param.param.isNeedSave){
+          if(param.param.actions){
               let saveParam = {
-                  actions: "bill.Basic.save",
-                  afterAction: "",
-                  confirmTitle: "",
-                  customSaveAction: "",
-                  noCheckCardDepressPeriod: true,
-                  noCheckSubTable: true,
-                  viewName: ""
+                  actions: param.param.actions,
               }
               bill.executeServerAction(saveParam,function(code,data){
                   if(code===200){
                       this.approval(bill, param);
-                      bill.setControlsSate(param["_control_name_"],"loading",false)
+                    //   bill.setControlsSate(param["_control_name_"],"loading",false)
                   }else{
-                      bill.setControlsSate(param["_control_name_"],"loading",false)
+                    //   bill.setControlsSate(param["_control_name_"],"loading",false)
                       bill.setControlsSate(param["_control_name_"], "enable", true)
                       GMS.$hideContainer.$message.error("操作异常请联系管理员");
                   }

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -1626,12 +1626,20 @@ export default {
 			"path": "资产/通用",
 			"extends": {
 				"param": [
+					// {
+					// 	"ref": "bill",
+					// 	"type": "metaData",
+					// 	"title": "成功跳转页面",
+					// 	"key": "viewName"
+					// },
 					{
-						"ref": "bill",
-						"type": "metaData",
-						"title": "成功跳转页面",
-						"key": "viewName"
-					}
+						"clearable": true,
+						"ref": "gams2.bill",
+						"type": "select",
+						"title": "执行动作",
+						"key": "actions",
+						"innerRef": "actions"
+					},
 				]
 			},
 			"description": "",
@@ -1678,12 +1686,20 @@ export default {
 			"path": "资产/通用",
 			"extends": {
 				"param": [
+					// {
+					// 	"ref": "bill",
+					// 	"type": "metaData",
+					// 	"title": "成功跳转页面",
+					// 	"key": "viewName"
+					// },
 					{
-						"ref": "bill",
-						"type": "metaData",
-						"title": "成功跳转页面",
-						"key": "viewName"
-					}
+						"clearable": true,
+						"ref": "gams2.bill",
+						"type": "select",
+						"title": "执行动作",
+						"key": "actions",
+						"innerRef": "actions"
+					},
 				]
 			},
 			"description": "",