From 72f6f5abb7d6a90c9edfb69db63907ef3e17ef03 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 22 十一月 2023 11:31:27 +0800
Subject: [PATCH] 销售明细单添加确认订单前确认是否选择项目
---
src/views/other/payment/collectionPlan/AddCollectionPlan.vue | 242 ++++++++++++++++++++++--------------------------
1 files changed, 110 insertions(+), 132 deletions(-)
diff --git a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
index 64b634c..c3cd4b1 100644
--- a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
+++ b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
@@ -13,8 +13,8 @@
<div class="collection-view">
<div class="label">鏀舵璁″垝绫诲瀷</div>
<el-select v-model="editConfig.infomation.collectionType" size="mini">
- <el-option label="璁″垝鏀舵鏃ユ湡" value="1"></el-option>
- <el-option label="椤圭洰鐘舵��" value="2"></el-option>
+ <el-option label="璁″垝鏀舵鏃ユ湡" :value="1"></el-option>
+ <el-option label="椤圭洰鐘舵��" :value="2"></el-option>
</el-select>
</div>
<div class="collection-view">
@@ -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="璇烽�夋嫨"
@@ -106,7 +106,13 @@
"
></el-input>
<div v-else-if="item.date">
- <el-date-picker v-model="scope.row[item.prop]" type="date" size="mini" style="width: 130px">
+ <el-date-picker
+ v-model="scope.row[item.prop]"
+ type="date"
+ value-format="yyyy-MM-dd"
+ size="mini"
+ style="width: 130px"
+ >
</el-date-picker>
</div>
<div v-else @click="delClick(scope.row)"><i class="el-icon-delete"></i></div>
@@ -142,7 +148,7 @@
</div>
<div class="btn-view">
<el-button type="primary" size="small" @click="saveClick">淇濆瓨</el-button>
- <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
+ <el-button size="small" @click="droppedClick">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
@@ -182,7 +188,6 @@
mergeNumber: 7
},
tableData: [],
- productId: 1,
addProductArr: [],
memberOptions: [],
allTerms: 3,
@@ -191,11 +196,13 @@
sourceId: this.editCommonConfig.infomation.id,
principalId: 0,
planAmount: 0, // 璁″垝閲戦
- firstDate: this.getCurrentDate(1)
+ firstDate: this.getCurrentDate(1),
+ collectionType: 1,
+ tableInfomation: []
}
},
created() {
- console.log(this.editCommonConfig.sourceType)
+ console.log(this.editCommonConfig)
this.setData()
this.setTableForm()
this.getCommonData()
@@ -203,10 +210,14 @@
methods: {
// 璁剧疆鍒濆鍊�
setData() {
+ this.amount =
+ typeof this.editCommonConfig.infomation.amountTotal == "string"
+ ? parseInt(this.editCommonConfig.infomation.amountTotal)
+ : this.editCommonConfig.infomation.amountTotal
this.editConfig.infomation = {
- collectionType: "1",
+ collectionType: this.collectionType,
moneyType: "浜烘皯甯�",
- amount: this.amount.toFixed(2)
+ amountTotal: this.editCommonConfig.infomation.amountTotal
}
},
getCommonData() {
@@ -224,9 +235,12 @@
// 淇濆瓨
saveClick() {
this.sumTotalAmount()
+ console.log(this.amount)
if (this.editConfig.title === "鏂板缓") {
if (this.principalId === 0) {
this.$message.error("璇烽�夋嫨鏀舵璁″垝璐熻矗浜�")
+ } else if (this.amount === 0) {
+ this.$message.error("鏀舵閲戦涓嶈兘涓�0")
} else if (this.amount !== this.planAmount) {
this.$message.error("鏀舵璁″垝鍜屾湭璁″垝閲戦涓嶄竴鑷达紝璇烽噸绠�")
} else {
@@ -241,6 +255,10 @@
})
}
}
+ },
+ droppedClick() {
+ this.editConfig.visible = false
+ this.$parent.getData()
},
// 璁＄畻璁″垝鎬婚
sumTotalAmount() {
@@ -259,65 +277,12 @@
},
handleClose() {
this.editConfig.visible = false
+ this.$parent.getData()
},
setTableForm() {
+ this.setTableInfomation(this.firstDate)
this.tableData = {
- tableInfomation: [
- {
- amount: this.amount,
- amountReceivable: this.amount * 0.3,
- amountReceived: 0,
- amountTotal: 0,
- collectionDate: this.getCurrentDate(1),
- collectionType: 0,
- fileId: 0,
- id: 0,
- moneyType: "浜烘皯甯�",
- percent: 30,
- principalId: this.principalId,
- remark: "",
- sourceId: this.sourceId,
- sourceType: this.sourceType,
- status: 1,
- term: 1
- },
- {
- amount: this.amount,
- amountReceivable: this.amount * 0.5,
- amountReceived: 0,
- amountTotal: 0,
- collectionDate: this.getCurrentDate(2),
- collectionType: 0,
- fileId: 0,
- id: 0,
- moneyType: "浜烘皯甯�",
- percent: 50,
- principalId: this.principalId,
- remark: "",
- sourceId: this.sourceId,
- sourceType: this.sourceType,
- status: 1,
- term: 2
- },
- {
- amount: this.amount,
- amountReceivable: this.amount * 0.2,
- amountReceived: 0,
- amountTotal: 0,
- collectionDate: this.getCurrentDate(3),
- collectionType: 0,
- fileId: 0,
- id: 0,
- moneyType: "浜烘皯甯�",
- percent: 20,
- principalId: this.principalId,
- remark: "",
- sourceId: this.sourceId,
- sourceType: this.sourceType,
- status: 1,
- term: 3
- }
- ],
+ tableInfomation: this.tableInfomation,
tableColumn: [
{ label: "鎿嶄綔", prop: "operate", width: 60 },
{ label: "鏈熸", prop: "term", inputNumber: true, width: 90 },
@@ -327,6 +292,65 @@
{ label: "澶囨敞", prop: "remark", input: true }
]
}
+ },
+ setTableInfomation(date) {
+ console.log(this.sourceId)
+ this.tableInfomation = [
+ {
+ amount: this.amount,
+ amountReceivable: this.amount * 0.3,
+ amountReceived: 0,
+ amountTotal: this.amount,
+ collectionDate: this.setDate(date, 0),
+ collectionType: this.editConfig.infomation.collectionType,
+ fileId: 0,
+ id: 0,
+ moneyType: "浜烘皯甯�",
+ percent: 30,
+ principalId: this.principalId,
+ remark: "",
+ sourceId: this.sourceId,
+ sourceType: this.sourceType,
+ status: 1,
+ term: 1
+ },
+ {
+ amount: this.amount,
+ amountReceivable: this.amount * 0.5,
+ amountReceived: 0,
+ amountTotal: this.amount,
+ collectionDate: this.setDate(date, 1),
+ collectionType: this.editConfig.infomation.collectionType,
+ fileId: 0,
+ id: 0,
+ moneyType: "浜烘皯甯�",
+ percent: 50,
+ principalId: this.principalId,
+ remark: "",
+ sourceId: this.sourceId,
+ sourceType: this.sourceType,
+ status: 1,
+ term: 2
+ },
+ {
+ amount: this.amount,
+ amountReceivable: this.amount * 0.2,
+ amountReceived: 0,
+ amountTotal: this.amount,
+ collectionDate: this.setDate(date, 2),
+ collectionType: this.editConfig.infomation.collectionType,
+ fileId: 0,
+ id: 0,
+ moneyType: "浜烘皯甯�",
+ percent: 20,
+ principalId: this.principalId,
+ remark: "",
+ sourceId: this.sourceId,
+ sourceType: this.sourceType,
+ status: 1,
+ term: 3
+ }
+ ]
},
// 閲嶇畻
recalculateClick() {
@@ -339,9 +363,9 @@
amount: this.amount,
amountReceivable: this.amount,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(this.firstDate, 0),
- collectionType: 0,
+ collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
id: 0,
moneyType: "浜烘皯甯�",
@@ -360,9 +384,9 @@
amount: this.amount,
amountReceivable: this.amount * 0.5,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(this.firstDate, 0),
- collectionType: 0,
+ collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
id: 0,
moneyType: "浜烘皯甯�",
@@ -378,9 +402,9 @@
amount: this.amount,
amountReceivable: this.amount * 0.5,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(this.firstDate, 1),
- collectionType: 0,
+ collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
id: 0,
moneyType: "浜烘皯甯�",
@@ -394,62 +418,8 @@
}
]
} else if (this.allTerms === 3) {
- this.tableData.tableInfomation = [
- {
- amount: this.amount,
- amountReceivable: this.amount * 0.3,
- amountReceived: 0,
- amountTotal: 0,
- collectionDate: this.setDate(this.firstDate, 0),
- collectionType: 0,
- fileId: 0,
- id: 0,
- moneyType: "浜烘皯甯�",
- percent: 30,
- principalId: this.principalId,
- remark: "",
- sourceId: this.sourceId,
- sourceType: this.sourceType,
- status: 1,
- term: 1
- },
- {
- amount: this.amount,
- amountReceivable: this.amount * 0.5,
- amountReceived: 0,
- amountTotal: 0,
- collectionDate: this.setDate(this.firstDate, 1),
- collectionType: 0,
- fileId: 0,
- id: 0,
- moneyType: "浜烘皯甯�",
- percent: 50,
- principalId: this.principalId,
- remark: "",
- sourceId: this.sourceId,
- sourceType: this.sourceType,
- status: 1,
- term: 2
- },
- {
- amount: this.amount,
- amountReceivable: this.amount * 0.2,
- amountReceived: 0,
- amountTotal: 0,
- collectionDate: this.setDate(this.firstDate, 2),
- collectionType: 0,
- fileId: 0,
- id: 0,
- moneyType: "浜烘皯甯�",
- percent: 20,
- principalId: this.principalId,
- remark: "",
- sourceId: this.sourceId,
- sourceType: this.sourceType,
- status: 1,
- term: 3
- }
- ]
+ this.setTableInfomation(this.firstDate)
+ this.tableData.tableInfomation = this.tableInfomation
}
},
delClick(row) {
@@ -475,13 +445,21 @@
setDate(str, monthNumber) {
console.log(str.split("-"))
let dateArr = str.split("-")
- let year = parseInt(dateArr[0])
- let month = parseInt(dateArr[1]) + monthNumber
+ // 鏈堜唤鍜�
+ let monthCount = parseInt(dateArr[1]) + monthNumber
+ // 骞�
+ let year = monthCount > 12 ? parseInt(dateArr[0]) + 1 : parseInt(dateArr[0])
+ // 鏈�
+ let month = monthCount > 12 ? monthCount - 12 : monthCount
+ // 鏃�
let day = parseInt(dateArr[2])
+
return year + "-" + month + "-" + day
},
principalClick(val) {
this.principalId = val
+ this.setTableInfomation(this.firstDate)
+ this.tableData.tableInfomation = this.tableInfomation
}
}
}
--
Gitblit v1.8.0