Skip to content

R
rbc-demo
Commit 64dca799 by 袁成
Options

fix 同意驳回增加执行动作

parent f050b5ca
Showing with 40 additions and 30 deletions
develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
...@@ -68,23 +68,23 @@ export default { ...@@ -68,23 +68,23 @@ export default {
} }
}, },
executeApproval: function(bill, param) { executeApproval: function(bill, param) {
if (param.param.isNeedSave) { if (param.param.actions) {
let saveParam = { let saveParam = {
actions: "bill.Basic.save", actions: param.param.actions,
afterAction: "", // afterAction: "",
confirmTitle: "", // confirmTitle: "",
customSaveAction: "", // customSaveAction: "",
noCheckCardDepressPeriod: true, // noCheckCardDepressPeriod: true,
noCheckSubTable: true, // noCheckSubTable: true,
viewName: "" // viewName: ""
} }
bill.executeServerAction(saveParam, function (code, data) { bill.executeServerAction(saveParam, function (code, data) {
if (code === 200) { if (code === 200) {
this.approval(bill, param); this.approval(bill, param);
bill.setControlsSate(param["_control_name_"], "loading", false) // bill.setControlsSate(param["_control_name_"], "loading", false)
} else { } else {
bill.setControlsSate(param["_control_name_"], "enable", true) 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("操作异常请联系管理员"); GMS.$hideContainer.$message.error("操作异常请联系管理员");
} }
}.bind(this)); }.bind(this));
......
develop/@gms/gms-plugin-billexpand/src/actions/rejectAction.js
...@@ -3,22 +3,16 @@ export default { ...@@ -3,22 +3,16 @@ export default {
execute: function (bill, param) { execute: function (bill, param) {
if(bill){ if(bill){
bill.setControlsSate(param["_control_name_"], "enable", false) bill.setControlsSate(param["_control_name_"], "enable", false)
if(param.param.isNeedSave){ if(param.param.actions){
let saveParam = { let saveParam = {
actions: "bill.Basic.save", actions: param.param.actions,
afterAction: "",
confirmTitle: "",
customSaveAction: "",
noCheckCardDepressPeriod: true,
noCheckSubTable: true,
viewName: ""
} }
bill.executeServerAction(saveParam,function(code,data){ bill.executeServerAction(saveParam,function(code,data){
if(code===200){ if(code===200){
this.approval(bill, param); this.approval(bill, param);
bill.setControlsSate(param["_control_name_"],"loading",false) // bill.setControlsSate(param["_control_name_"],"loading",false)
}else{ }else{
bill.setControlsSate(param["_control_name_"],"loading",false) // bill.setControlsSate(param["_control_name_"],"loading",false)
bill.setControlsSate(param["_control_name_"], "enable", true) bill.setControlsSate(param["_control_name_"], "enable", true)
GMS.$hideContainer.$message.error("操作异常请联系管理员"); GMS.$hideContainer.$message.error("操作异常请联系管理员");
} }
......
develop/@gms/gms-plugin-billexpand/src/emcon.js
...@@ -1626,12 +1626,20 @@ export default { ...@@ -1626,12 +1626,20 @@ export default {
"path": "资产/通用", "path": "资产/通用",
"extends": { "extends": {
"param": [ "param": [
// {
// "ref": "bill",
// "type": "metaData",
// "title": "成功跳转页面",
// "key": "viewName"
// },
{ {
"ref": "bill", "clearable": true,
"type": "metaData", "ref": "gams2.bill",
"title": "成功跳转页面", "type": "select",
"key": "viewName" "title": "执行动作",
} "key": "actions",
"innerRef": "actions"
},
] ]
}, },
"description": "", "description": "",
...@@ -1678,12 +1686,20 @@ export default { ...@@ -1678,12 +1686,20 @@ export default {
"path": "资产/通用", "path": "资产/通用",
"extends": { "extends": {
"param": [ "param": [
// {
// "ref": "bill",
// "type": "metaData",
// "title": "成功跳转页面",
// "key": "viewName"
// },
{ {
"ref": "bill", "clearable": true,
"type": "metaData", "ref": "gams2.bill",
"title": "成功跳转页面", "type": "select",
"key": "viewName" "title": "执行动作",
} "key": "actions",
"innerRef": "actions"
},
] ]
}, },
"description": "", "description": "",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment