From 38072cc8650d65b1f229bb0160909421fbbfde07 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 07 Mar 2021 20:40:20 +0800
Subject: [PATCH] 修改数据库
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
index 45d6218..be9c9d9 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
@@ -256,11 +256,15 @@
label="收款">
</el-table-column>
<el-table-column
- prop="t3"
+ prop="payMethod"
+ label="支付方式">
+ </el-table-column>
+ <el-table-column
+ prop="achieveType"
label="业绩类型">
</el-table-column>
<el-table-column
- prop="t1"
+ prop="goodsCash"
label="原业绩">
</el-table-column>
<el-table-column
@@ -664,6 +668,9 @@
}
_this.data.items = dataItems;
+ _this.data.zkTotal = _this.refundMoney;
+
+
AjaxProxy.requst({
app: _this,
data: _this.data,
@@ -903,7 +910,8 @@
console.log("校验业绩是否大于订单收款金额");
let jsqMap={};
let isOk=true;
- this.achieveItems.forEach(achieve=>{
+ for(let i=0 ; i< this.achieveItems.length; i++){
+ let achieve=this.achieveItems[i];
if(!isNaN(achieve.goodsCash) ){
key=achieve.achieveType+achieve.orderItemId;
if(!jsqMap[key]){
@@ -914,14 +922,14 @@
if(jsqMap[key]>achieve.zkTotal) {
this.$message.error("【"+achieve.goodsName + "】业绩分配金额大于支付金额");
isOk = false;
- return;
+ break;
}
}else{
this.$message.error("【"+achieve.goodsName + "】业绩分配金额请填写数字");
isOk=false;
- return;
+ break;
}
- });
+ }
console.log("isOk",isOk);
return isOk;
},
--
Gitblit v1.9.1