From cc74efb36fd1f1de56b3acb2ba59d4b416eaed4f Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 19 Jan 2021 00:23:21 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 00ca519..195139c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -502,7 +502,7 @@
@check="(click, checked,$item)=>{handleCheckChange(click, checked,$item)}"
:props="defaultProps">
</el-tree>
- <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)"><div style="line-height: 30px;"><img style="width: 25px; height: 25px;" :src="item.img"><span style="margin-left: 5px;">{{item.value}}</span></div></li>
+ <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)"><div style=" height:30px; line-height: 30px; display: flex; align-items: center"><img style="width: 25px; height: 25px; align-items: center;" :src="item.img"><span style="margin-left: 5px;">{{item.value}}</span></div></li>
</el-popover>
</span>
</ul>
@@ -681,7 +681,7 @@
item.payMoney = item.zkPrice;
}
orderPayMoney += item.payMoney;
-
+ item.uuid = MTools.uuid();
//业绩设置
_this.achieveList.push({
orderItem: item,
@@ -951,17 +951,30 @@
}
if (item.uuid == achieve.orderItem.uuid) {
let achieveNew = {
+ uuid:item.uuid,
beaultId: achieve.saleId,
t1: achieve.achieveMoney,
t3: achieve.t3,
projPercentage: achieve.commission,
};
- item.achaeveList.push(achieveNew);
+
+ var flag = true;
+ for(var j = 0; j < item.achaeveList.length; j++) {
+ if(item.achaeveList[j].uuid == achieveNew.uuid && item.achaeveList[j].beaultId == achieveNew.beaultId) {
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag) {
+ item.achaeveList.push(achieveNew);
+ }
break;
}
}
})
+ console.log(_this.order);
//校验业绩金额
if (_this.checkAchieve()) {
let url = basePath + "/admin/order/payOrder";
@@ -1222,6 +1235,13 @@
}
} else {
Vue.set(item,'isActive',true);
+ var hasAmount = 0;
+ for(var i = 0; i < payMoneys.length; i++) {
+ hasAmount += parseFloat(payMoneys[i].money);
+ }
+ if (_this.order.payMoney - hasAmount > 0) {
+ Vue.set(item, 'money', _this.order.payMoney - hasAmount);
+ }
_this.payMoneys.push(item);
}
});
--
Gitblit v1.9.1