From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/other/payment/collectionPlan/AddCollectionPlan.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
index bf6b7cd..f3d9da6 100644
--- a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
+++ b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
@@ -25,14 +25,14 @@
</div>
<div class="collection-view">
<div class="label">閲戦</div>
- <div>{{ editConfig.infomation.amount }}</div>
+ <div>{{ editConfig.infomation.amountTotal }}</div>
</div>
<div class="collection-view">
<div class="label">鏈鍒掗噾棰�</div>
- <div>{{ editConfig.infomation.amount }}</div>
+ <div>{{ editConfig.infomation.amountTotal }}</div>
</div>
<div class="collection-view">
- <div class="label">鏀舵璁″垝璐熻矗浜�</div>
+ <div class="label"><span style="color: #f56c6c">*</span>鏀舵璁″垝璐熻矗浜�</div>
<el-select
v-model="editConfig.infomation.principalId"
placeholder="璇烽�夋嫨"
@@ -182,7 +182,6 @@
mergeNumber: 7
},
tableData: [],
- productId: 1,
addProductArr: [],
memberOptions: [],
allTerms: 3,
@@ -205,10 +204,14 @@
methods: {
// 璁剧疆鍒濆鍊�
setData() {
+ this.amount =
+ typeof this.editCommonConfig.infomation.amountTotal == "string"
+ ? parseInt(this.editCommonConfig.infomation.amountTotal)
+ : this.editCommonConfig.infomation.amountTotal
this.editConfig.infomation = {
collectionType: this.collectionType,
moneyType: "浜烘皯甯�",
- amount: this.amount.toFixed(2)
+ amountTotal: this.editCommonConfig.infomation.amountTotal
}
},
getCommonData() {
@@ -261,6 +264,7 @@
},
handleClose() {
this.editConfig.visible = false
+ this.$parent.getData()
},
setTableForm() {
this.setTableInfomation(this.firstDate)
@@ -283,7 +287,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.3,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(date, 0),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -301,7 +305,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.5,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(date, 1),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -319,7 +323,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.2,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(date, 2),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -346,7 +350,7 @@
amount: this.amount,
amountReceivable: this.amount,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(this.firstDate, 0),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -367,7 +371,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.5,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(this.firstDate, 0),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -385,7 +389,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.5,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(this.firstDate, 1),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
--
Gitblit v1.8.0