From 48adbb5e7759f33efb0a97c8baf22aaebba7987a Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 25 十月 2023 17:30:58 +0800
Subject: [PATCH] 销售明细单、销售退货单选择产品逻辑修改及新增字段
---
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 201 ++++++++++++++++++++++----------------------------
1 files changed, 89 insertions(+), 112 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 396ee9a..814a295 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -211,14 +211,13 @@
</div>
<div class="product-view">
<CommonFormTableView
+ ref="commonFormTableView"
:detail-enter="true"
+ :select-box="true"
:show-summary="showSummary"
:product-table-list="productTableList"
@inputContent="inputContent"
- @addProductClick="addProductClick"
- @emptyProductClick="emptyProductClick"
- @recalculateProductClick="recalculateProductClick"
- @clearupProduct="clearupProduct"
+ @getSelectArray="getSelectArray"
/>
</div>
</div>
@@ -252,7 +251,7 @@
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
import { getSalesDetailsList } from "@/api/sales/salesDetails"
-import { mapActions } from "vuex"
+// import { mapActions } from "vuex"
export default {
name: "AddSalesReturnDialog",
@@ -273,10 +272,10 @@
computed: {
clientList() {
return this.$store.state.getClientName.clientList
- },
- salesDetailsList() {
- return this.$store.state.getClientName.salesDetailsList
}
+ // salesDetailsList() {
+ // return this.$store.state.getClientName.salesDetailsList
+ // }
},
data() {
return {
@@ -314,12 +313,15 @@
productId: 1,
isNoProduct: true,
clientId: this.editCommonConfig.infomation.clientId,
- SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId
+ SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId,
+ tableData: [],
+ selProductData: [],
+ salesDetailsList: []
}
},
created() {
this.$store.dispatch("geClient")
- this.$store.dispatch("geSalesDetails")
+ // this.$store.dispatch("geSalesDetails")
this.setTableForm()
this.getCommonData()
// this.getProductList()
@@ -339,7 +341,7 @@
}
},
methods: {
- ...mapActions(["getSalesDetailsFliter"]),
+ // ...mapActions(["getSalesDetailsFliter"]),
formInfo() {
this.objCode.type = "閿�鍞��璐х紪鐮�"
this.objCode.codeStandID = ""
@@ -376,43 +378,43 @@
this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
- // 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()
- console.log(params)
- if (this.editConfig.title === "鏂板缓") {
- getAddSalesReturn(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
- } else {
- getUpdateSalesReturn(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.selProductData.length; i++) {
+ if (this.selProductData[i].name.length === 0) {
+ this.isNoProduct = true
+ break
+ } else {
+ this.isNoProduct = false
+ }
}
+ if (this.isNoProduct) {
+ this.$message.error("璇烽�夋嫨浜у搧")
+ } else {
+ const params = this.saveParams()
+ console.log(params)
+ if (this.editConfig.title === "鏂板缓") {
+ getAddSalesReturn(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ } else {
+ getUpdateSalesReturn(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")
+ return false
}
- // } else {
- // console.log("error submit")
- // return false
- // }
})
},
saveParams() {
@@ -423,7 +425,7 @@
clientId: this.clientId || 0,
memberId: data.memberId || 0,
number: data.number || "",
- products: this.tableData,
+ products: this.selProductData,
reason: data.reason || "",
repository: data.repository || "",
returnDate: data.returnDate || "",
@@ -437,6 +439,34 @@
},
handleClose() {
this.editConfig.visible = false
+ },
+ // 鑾峰彇閿�鍞槑缁�
+ async getSalesDetailsList(id, value) {
+ await getSalesDetailsList({
+ clientId: id
+ }).then((res) => {
+ if (res.code == 200) {
+ this.salesDetailsList = res.data.list
+ if (value === "鍏ㄩ儴浜у搧") {
+ this.salesDetailsList.map((item) => {
+ if (item.id === this.editConfig.infomation.sourceId) {
+ this.tableData = item.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
+ this.productTableList.tableData = item.products
+ this.selProductData.forEach((key) => {
+ this.tableData.forEach((row) => {
+ if (key.number === row.number) {
+ this.$refs.commonFormTableView.$refs.fromTable.toggleRowSelection(row, true)
+ }
+ })
+ })
+ }
+ })
+ }
+ }
+ })
},
// 閫夋嫨鐢ㄦ埛鐩稿叧鏂规硶
querySearchAsync(queryString, cb, value) {
@@ -463,14 +493,9 @@
this.editConfig.infomation.salesDetailNumber = ""
this.clientId = item.id
this.editSelCommonConfig.clientId = item.id
- await getSalesDetailsList({
- clientId: this.clientId
- }).then((res) => {
- this.getSalesDetailsFliter(res.data.list)
- })
+ this.getSalesDetailsList(item.id)
} else if (value === "contract") {
this.productTableList.tableData = item.products
- this.tableData = item.products
this.SalesDetailsId = item.id
}
},
@@ -481,6 +506,7 @@
} else if (value === "contract") {
this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
this.editSelCommonConfig.editVisible = true
+ this.editSelCommonConfig.clientId = this.clientId
// this.editSelCommonConfig.salesDetailNumber = this.editConfig.infomation.salesDetailNumber
}
},
@@ -491,16 +517,11 @@
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.editSelCommonConfig.clientId = row.id
- await getSalesDetailsList({
- clientId: row.id
- }).then((res) => {
- this.getSalesDetailsFliter(res.data.list)
- })
+ this.getSalesDetailsList(row.id)
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = row.number
this.SalesDetailsId = row.id
this.productTableList.tableData = row.products
- this.tableData = row.products
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
@@ -511,6 +532,7 @@
this.clientId = 0
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = ""
+ this.productTableList.tableData = []
}
},
// 娣诲姞闄勪欢
@@ -519,24 +541,12 @@
setFormatClick() {},
setTableForm() {
if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
- this.tableData = [
- {
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
+ this.tableData = []
} else {
- this.tableData = this.editConfig.infomation.products
- this.tableData.map((item, index) => {
- item.productId = index + 1
- })
+ this.selProductData = this.editConfig.infomation.products
+ this.getSalesDetailsList(this.editConfig.infomation.clientId, "鍏ㄩ儴浜у搧")
}
+ console.log(this.tableData)
this.productTableList = {
tableData: this.tableData,
tableColumn: [
@@ -558,43 +568,10 @@
}
})
},
- // 浜у搧鏂板
- addProductClick() {
- this.productId++
- this.tableData.push({
- 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
+ // 閫夋嫨浜у搧
+ getSelectArray(val) {
+ console.log(val, "cccccccccccccccccc")
+ this.selProductData = val
}
}
}
--
Gitblit v1.8.0