From 04bf2cc9cd64a8df7047aaa56bb64ab69a78804b Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期日, 04 八月 2024 15:55:49 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/promotion/promotion_html
---
module/md/page/customer/page/customer_basic_acct.html | 164 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 93 insertions(+), 71 deletions(-)
diff --git a/module/md/page/customer/page/customer_basic_acct.html b/module/md/page/customer/page/customer_basic_acct.html
index 14ea082..4b86bc8 100644
--- a/module/md/page/customer/page/customer_basic_acct.html
+++ b/module/md/page/customer/page/customer_basic_acct.html
@@ -1328,6 +1328,7 @@
this.saveChangeRowTable();
}
else { // 寮�鎴锋彁浜�
+ me.loading_pass = true ;
var bo_JCXX = this.$refs.JCXX.checkForm();
if (!bo_JCXX) {
@@ -1520,6 +1521,33 @@
}
tableData_.push(row_);
})
+ if (me.formData_criteria && me.formData_criteria.length > 0) { //涓嶆槸鏂板
+ me.formdata_rule_group.map(group => {//
+ group.children.map(unitobj => {
+ var row_ = {
+ id: unitobj.id,
+ parent_id: me.formData.id,
+ criteria_id: unitobj.criteria_id,
+ criteria_value: unitobj.criteria_value,
+ remark: unitobj.remark ? unitobj.remark : '',
+ }
+ md_org_account_criteria_.push(row_);
+ })
+ })
+ }
+ else {
+ me.formdata_rule_group.map(group => {//
+ group.children.map(unitobj => {
+ var row_ = {
+ parent_id: me.formData.id,
+ criteria_id: unitobj.id,
+ criteria_value: unitobj.criteria_value,
+ remark: unitobj.remark ? unitobj.remark : '',
+ }
+ md_org_account_criteria_.push(row_);
+ })
+ })
+ }
if (tableData_.length == 0) {
Root.message({
@@ -1537,7 +1565,14 @@
me.iscommit = false
return
}
-
+ if (md_org_account_criteria_.some(e=>e.criteria_value == '' || e.criteria_value == null)) {
+ Root.message({
+ type: 'warning',
+ message: '璇峰厛娣诲姞鏄庣粏鏁版嵁'
+ });
+ me.iscommit = false
+ return
+ }
let param = {
dataname: 'md_org_account',
data: {},
@@ -1555,50 +1590,6 @@
}
}
- if (me.formData_criteria && me.formData_criteria.length > 0) { //涓嶆槸鏂板
- me.formdata_rule_group.map(group => {//
- group.children.map(unitobj => {
- if (!unitobj.criteria_value) {
- Root.message({
- type: 'warning',
- message: '璇峰厛娣诲姞鏄庣粏鏁版嵁'
- });
- me.iscommit = false
- return
- }
- var row_ = {
- id: unitobj.id,
- parent_id: me.formData.id,
- criteria_id: unitobj.criteria_id,
- criteria_value: unitobj.criteria_value,
- remark: unitobj.remark ? unitobj.remark : '',
- }
- md_org_account_criteria_.push(row_);
- })
- })
- }
- else {
- me.formdata_rule_group.map(group => {//
- group.children.map(unitobj => {
- if (!unitobj.criteria_value) {
- Root.message({
- type: 'warning',
- message: '璇峰厛娣诲姞鏄庣粏鏁版嵁'
- });
- me.iscommit = false
- return
- }
- var row_ = {
- parent_id: me.formData.id,
- criteria_id: unitobj.id,
- criteria_value: unitobj.criteria_value,
- remark: unitobj.remark ? unitobj.remark : '',
- }
- md_org_account_criteria_.push(row_);
- })
- })
- }
-
param.data["md_org_account_criteria"] = md_org_account_criteria_.length ? md_org_account_criteria_ : null;
param.data[this.dataname] = entity;
@@ -1623,11 +1614,11 @@
if (result.success) {
if(me.iscommit){
me.iscommit = false;
- Root.message({
- type: 'success',
- message: '鎻愪氦鎴愬姛'
- });
- me.saveAfter();
+ // Root.message({
+ // type: 'success',
+ // message: '鎻愪氦鎴愬姛'
+ // });
+ me.doapprove()
}
else {
Root.message({
@@ -1669,6 +1660,57 @@
}
});
},
+ doapprove(){
+ var me = this
+ me.loading_pass = true;
+ let param = {
+ dataname: "md_org_account",
+ id: me.formData.id,
+ remark: this.approveremark
+ }
+ Server.call("root/data/approve", param, function(result) {
+ me.loading_pass = false;
+ // Root.message({
+ // type: 'success',
+ // message: '瀹℃壒鎴愬姛'
+ // });
+ Root.message({
+ type: 'success',
+ message: '鎻愪氦鎴愬姛'
+ });
+ me.saveAfter()
+ }, function(errorresult) {
+ console.log("閿欒淇℃伅", errorresult);
+ me.loading_pass = false;
+ if (errorresult.messages && errorresult.messages.count && errorresult.messages.count.error) {
+ if (errorresult.messages.list) {
+ var config = {
+ totab: false,
+ // width: "1200px",
+ // height: 800,
+ icon: "icon-product",
+ text: "閿欒淇℃伅",
+ url: "module/tool/page/popup_error_messages.html",
+ data: {},
+ delta: errorresult.messages.list,
+ callback: function(obj, callback) {
+ if (callback) {
+ callback();
+ }
+ }
+ };
+ me.doPopupByPublic(config);
+
+ }
+ }
+ else {
+ Root.message({
+ type: 'error',
+ message: '鎻愪氦澶辫触'
+ });
+ }
+ });
+ },
// 閫氳繃鎴栨嫆缁�
onShowApproval(passOrRefuse) {
@@ -1701,26 +1743,6 @@
// this.getMachine(function(next_step, up_step) { //
// me.doRunApproval(next_step, up_step);
// });
- },
-
- getMachine(callback) {
- var me = this;
- let param = {
- dataname: "md_org_account",
- }
- Server.call("root/state/getMachine", param, function(result) {
- var next_step = {}; // 鍚戜笅娴佺▼
- var up_step = {}; // 鍚戜笂娴佺▼
-
- if (result && result.machine && result.machine.detail) {
- result.machine.detail.map(md=>{
- next_step[md.from_code] = md.to_code;
- up_step[md.to_code] = md.from_code;
- })
-
- callback(next_step, up_step);
- }
- })
},
doRunApproval(next_step, up_step) {
@@ -2108,7 +2130,7 @@
<el-button size="small" type="default" @click="closeDialog">鍙� 娑�</el-button>
<el-button size="small" v-if="!isChange && isedit" type="success" @click="submitRowTable":icon="buttonsconfig.submit.icon">{{buttonsconfig.submit.name}}</el-button>
- <el-button size="small" v-if="isChange" type="success" @click="submitRowTable":icon="buttonsconfig.submit.icon">{{buttonsconfig.submit.name}}</el-button>
+ <el-button size="small" v-if="isChange" type="success" :loading="loading_pass" @click="submitRowTable":icon="buttonsconfig.submit.icon">{{buttonsconfig.submit.name}}</el-button>
<el-button size="small" v-if="isrefuseedit" type="success" @click="">鍐嶆鎻愪氦</el-button>
--
Gitblit v1.8.0