Commit 56ab16fa by qiaoyanqi

同意驳回 加信息提示校验

parent fc97fca8
...@@ -8,7 +8,10 @@ export default { ...@@ -8,7 +8,10 @@ export default {
GMS.$hideContainer.$Message.error('请配置审批轨迹') GMS.$hideContainer.$Message.error('请配置审批轨迹')
return return
} }
if (compareData(GMS.oldBillData, bill.getBuillData())) { let curTagId = window.nros.context.getCurrTag();
let oldObj = curTagId && GMS.oldBillDataMap[curTagId]?GMS.oldBillDataMap[curTagId]:GMS.oldBillData;
let flag = compareData(oldObj, bill.getBuillData()) || bill.getGlobalParam("noRunTimeFormula");
if (flag) {
this.approvalLogical(bill, param, this) this.approvalLogical(bill, param, this)
} else { } else {
GMS.$hideContainer.$Modal.confirm({ GMS.$hideContainer.$Modal.confirm({
......
...@@ -3,7 +3,10 @@ import { compareData } from "../components-control/util/dataChange" ...@@ -3,7 +3,10 @@ import { compareData } from "../components-control/util/dataChange"
export default { export default {
execute: function (bill, param) { execute: function (bill, param) {
if(bill){ if(bill){
if (compareData(GMS.oldBillData, bill.getBuillData())) { let curTagId = window.nros.context.getCurrTag();
let oldObj = curTagId && GMS.oldBillDataMap[curTagId]?GMS.oldBillDataMap[curTagId]:GMS.oldBillData;
let flag = compareData(oldObj, bill.getBuillData()) || bill.getGlobalParam("noRunTimeFormula");
if (flag) {
this.approvalLogical(bill, param, this) this.approvalLogical(bill, param, this)
} else { } else {
GMS.$hideContainer.$Modal.confirm({ GMS.$hideContainer.$Modal.confirm({
......
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