From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 21 八月 2023 11:23:34 +0800
Subject: [PATCH] bug修复
---
src/views/sales/quotation/AddQuotationDialog.vue | 121 +++++++++++++++++++++++-----------------
1 files changed, 69 insertions(+), 52 deletions(-)
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index da372c4..a191a7b 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -190,7 +190,7 @@
<div style="margin-left: 400px">
甯佺
<el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
- <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
@@ -201,6 +201,9 @@
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
/>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
@@ -319,14 +322,14 @@
},
memberOptions: [],
quotationStatusOptions: [{ id: 1, name: "涓嶇煡閬�" }], // 鎶ヤ环鍗曠姸鎬�
- currencyOptions: [], // 甯佺
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
showSummary: {
show: true,
total: true,
- sumProp: ["Amount", "Unit", "other3"],
- mergeNumber: 3
+ sumProp: ["Amount", "total"],
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
@@ -348,8 +351,7 @@
saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
tableData: [],
productId: 1,
- addProductArr: [],
- isProductName: false
+ isNoProduct: true
}
},
created() {
@@ -378,23 +380,19 @@
}
})
},
- productNameValidate() {
- for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].Name === "") {
- this.isProductName = true
- return
- } else {
- this.isProductName = false
- }
- }
- },
// 淇濆瓨
saveClick(formName) {
- this.productNameValidate()
this.$refs[formName].validate((valid) => {
if (valid) {
- console.log(this.isProductName)
- if (this.isProductName) {
+ 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 {
const params = this.saveParams()
@@ -512,64 +510,83 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
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: "other3", 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 = [
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ }
+ ]
+ this.productTableList.tableData = this.tableData
+ },
+ // 浜у搧閲嶇畻
+ recalculateProductClick() {},
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
}
}
}
--
Gitblit v1.8.0