From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/operate/inventoryAdjustment/index.vue | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index a4b1734..e97a63b 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -144,6 +144,7 @@
this.adjustAmount = val - row.amount
this.tableList.tableData[row.index].adjustAmount = this.adjustAmount
// this.differenceAmount = val
+ this.differenceAmount = val
},
// 鏂板
addProductClick() {
@@ -178,10 +179,11 @@
this.addTitle = "鏂板缓"
this.showDiscard = false
let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
+
requestUrl({
- // amount: this.amount,
- adjustAmount: this.adjustAmount,
- // differenceAmount: this.differenceAmount,
+ amount: this.amount,
+ // adjustAmount: this.adjustAmount,
+ differenceAmount: this.differenceAmount,
locationId: this.locationId,
operationId: this.operationId,
productId: this.productId
@@ -204,7 +206,7 @@
// 鏄惁閫夋嫨浜у搧
isSel() {
for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData && this.tableData[i].productName.length === 0) {
+ if (this.tableData[i].productName?.length === 0) {
this.isNoProduct = false
break
} else {
@@ -214,13 +216,19 @@
},
// 鍙栨秷
discardBtnClick() {
- if (this.isRowClick) {
- this.tableData.map((item) => {
- item.isEdit = true
- })
- } else {
- this.tableData.splice(0, 1)
- }
+ this.getData()
+ // this.tableList.tableData.forEach((item) => {
+ // item.differenceAmount = 0
+ // item.adjustAmount = 0
+ // })
+ // this.tableList
+ // if (this.isRowClick) {
+ // this.tableData.map((item) => {
+ // item.isEdit = true
+ // })
+ // } else {
+ // this.tableData.splice(0, 1)
+ // }
this.addTitle = "鏂板缓"
this.showDiscard = false
},
@@ -236,7 +244,7 @@
console.log("鍘嗗彶")
this.$router.push({
name: "inventoryAdjustmentHistory",
- params: { locationId: row.locationId, productId: row.productId }
+ params: { locationId: row.locationId, productId: row.productId, baseOperationType: row.baseOperationType }
})
}
},
@@ -251,7 +259,7 @@
handleUseClick(row) {
// scope.row.isSet = !scope.row.isSet
finishInventoryAdjustment({
- locationProductAmountId: row.locationProductAmount,
+ locationProductAmountId: row.locationProductAmountId,
operationId: row.operationId,
productId: row.productId
}).then((res) => {
@@ -268,6 +276,7 @@
},
// 琛岀偣鍑�
tableRowClick(row, rowIndex) {
+ this.locationId = row.locationId
this.rowIndex = rowIndex
this.isSel()
if (!this.isNoProduct && this.currentRowId === 0) {
--
Gitblit v1.8.0