From 96fdf32bd5612b6c16dcbcc8352a9f54adcc8e7e Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 18 八月 2023 16:26:59 +0800
Subject: [PATCH] 產品相關及bug修復
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 164 ++++++++++++++++++++++++++++--------------------------
1 files changed, 85 insertions(+), 79 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 3aa7e53..b019896 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -206,7 +206,11 @@
<el-row>
<el-col :span="24">
<el-form-item label="澶囨敞" prop="remark">
- <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="editConfig.infomation.notes"></el-input>
+ <el-input
+ type="textarea"
+ :autosize="{ minRows: 2 }"
+ v-model="editConfig.infomation.remark"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -257,6 +261,7 @@
@addProductClick="addProductClick"
@emptyProductClick="emptyProductClick"
@recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
/>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
@@ -376,7 +381,7 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other7"],
+ sumProp: ["Amount", "total"],
mergeNumber: 2
},
editSelectClientConfig: {
@@ -391,7 +396,8 @@
},
clientId: this.editCommonConfig.infomation.client_id,
saleChanceId: this.editCommonConfig.infomation.saleChanceId,
- productId: 1
+ productId: 1,
+ isNoProduct: true
}
},
created() {
@@ -423,26 +429,38 @@
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.editConfig.infomation)
- const params = this.saveParams()
- console.log(params)
- if (this.editConfig.title === "鏂板缓") {
- getAddSalesDetails(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].name.length === 0) {
+ this.isNoProduct = true
+ break
+ } else {
+ this.isNoProduct = false
+ }
+ }
+ if (this.isNoProduct) {
+ this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
- getUpdateSalesDetails(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
- this.$parent.getData()
- }
- })
+ const params = this.saveParams()
+ console.log(params)
+ if (this.editConfig.title === "鏂板缓") {
+ getAddSalesDetails(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ } else {
+ getUpdateSalesDetails(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ }
}
} else {
console.log("error submit")
@@ -461,17 +479,7 @@
memberId: data.memberId || 0,
number: data.number || "",
phone: data.phone || "",
- products: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ],
+ products: this.tableData,
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
saleType: data.saleType || 0,
@@ -529,9 +537,9 @@
}
},
selClient(row, value) {
- if (value === "contact") {
- this.editConfig.infomation.contact_name = row.name
- this.contactId = row.id
+ if (value === "client") {
+ this.editConfig.infomation.client_name = row.name
+ this.clientId = row.id
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
@@ -555,83 +563,81 @@
if (this.editConfig.title === "鏂板缓") {
this.tableData = [
{
- id: 1,
- Amount: 0,
- IsSale: true,
- MaterialMode: "",
- MinInventory: 0,
- Name: "",
- Number: "",
- PurchaseType: "",
- SalePrice: 0,
- Unit: ""
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
}
]
} else {
this.tableData = this.editConfig.infomation.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
}
this.productTableList = {
tableData: this.tableData,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "Name", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "Number" },
- { label: "鏁伴噺", prop: "Amount", input: true, isRequird: true },
- { label: "閿�鍞崟浠�", prop: "Unit", input: true },
- { label: "浠风◣鍚堣", prop: "total", input: true },
- { label: "鎻忚堪", prop: "other8" }
+ { label: "#", prop: "productId", width: 40 },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
},
// 浜у搧鍒楄〃杈撳叆
inputContent(val, prop, row) {
- console.log("aaaaaaaa")
- console.log(val, prop)
- this.productId = row.id
+ this.productId = row.productId
this.tableData.map((item) => {
- if (item.id === row.id) {
+ if (item.productId === row.productId) {
item[prop] = val
}
})
- console.log(this.tableData)
},
// 浜у搧鏂板
addProductClick() {
this.productId++
this.tableData.push({
- id: this.productId,
- Amount: 0,
- IsSale: true,
- MaterialMode: "",
- MinInventory: 0,
- Name: "",
- Number: "",
- PurchaseType: "",
- SalePrice: 0,
- Unit: ""
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
})
+ this.showSummary.show = true
},
// 浜у搧娓呯┖
emptyProductClick() {
this.productId = 1
this.tableData = [
{
- id: 1,
- Amount: 0,
- IsSale: true,
- MaterialMode: "",
- MinInventory: 0,
- Name: "",
- Number: "",
- PurchaseType: "",
- SalePrice: 0,
- Unit: ""
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
}
]
this.productTableList.tableData = this.tableData
},
// 浜у搧閲嶇畻
- recalculateProductClick() {}
+ recalculateProductClick() {},
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
+ }
}
}
</script>
--
Gitblit v1.8.0