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 | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index 525b7d3..e97a63b 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -102,7 +102,7 @@
selectBox: false,
selectIndex: true,
tableColumn: [
- { label: "浣嶇疆", prop: "locationName", location: false },
+ { label: "浣嶇疆", prop: "locationName", location: true },
{ label: "浜у搧", prop: "productName", product: true },
{ label: "鍦ㄥ簱鏁伴噺", prop: "amount" },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
@@ -144,7 +144,7 @@
this.adjustAmount = val - row.amount
this.tableList.tableData[row.index].adjustAmount = this.adjustAmount
// this.differenceAmount = val
- this.differenceAmount=val
+ this.differenceAmount = val
},
// 鏂板
addProductClick() {
@@ -179,7 +179,7 @@
this.addTitle = "鏂板缓"
this.showDiscard = false
let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
-
+
requestUrl({
amount: this.amount,
// adjustAmount: this.adjustAmount,
@@ -206,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 {
@@ -216,19 +216,19 @@
},
// 鍙栨秷
discardBtnClick() {
- console.log(this.tableList.tableData,"鐪嬬湅")
- 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.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
},
@@ -244,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 }
})
}
},
@@ -276,8 +276,7 @@
},
// 琛岀偣鍑�
tableRowClick(row, rowIndex) {
- console.log(row,"kankna")
- this.locationId=row.locationId
+ this.locationId = row.locationId
this.rowIndex = rowIndex
this.isSel()
if (!this.isNoProduct && this.currentRowId === 0) {
--
Gitblit v1.8.0