From 5de621e943d9605d10e2ac5d46658c0626a68caa Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 07 三月 2024 10:11:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/SRM
---
src/components/makepager/CommonFormTableView.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index aafa359..eeffb91 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -305,7 +305,7 @@
handleSelectClient(item, prop, row) {
this.tableList.tableData.map((ite) => {
if (ite.name === item.name) {
- ite.ID = row.ID
+ ite.id = row.id
ite.amount = item.amount || 1
ite.number = item.number
ite.purchasePrice = item.purchasePrice
@@ -316,13 +316,13 @@
}
})
if (this.detailEnter) {
- this.setEditName(item, row.ID)
+ this.setEditName(item, row.id)
}
- this.$emit("handleProduct",item)
+ this.$emit("handleProduct",item,row)
},
- setEditName(item, ID) {
+ setEditName(item, id) {
let selRow = {
- ID: ID,
+ id: id,
deliveryTime: item.deliveryTime,
maximumStock: item.maximumStock,
minimumStock: item.minimumStock,
@@ -350,7 +350,7 @@
console.log(this.tableList.tableData)
if (this.detailEnter) {
this.tableList.tableData.map((ite) => {
- ite.ID
+ ite.id
ite.name = item.name
ite.amount = item.amount || 1
ite.number = item.number
@@ -359,12 +359,13 @@
ite.deliveryTime = item.deliveryTime
ite.shippingDuration = item.shippingDuration
})
- this.setEditName(item, this.tableList.tableData[0].ID)
+ this.setEditName(item, this.tableList.tableData[0].id)
} else {
this.tableList.tableData.map((ite, index) => {
if (index === this.productIndex) {
ite.name = item.name
- ite.productId = item.ID
+ ite.productId = item.id
+ ite.productIndex = this.productIndex+1
ite.amount = item.amount || 1
ite.number = item.number
ite.purchasePrice = item.purchasePrice
@@ -375,7 +376,6 @@
this.$forceUpdate()
}
})
-
console.log(this.tableList.tableData, "=====chanp")
}
},
--
Gitblit v1.8.0