From 75e90888d0dc60d229b8f179d6b58de708595080 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 13 十一月 2023 17:24:06 +0800
Subject: [PATCH] 新增位置-上级位置改为非必填

---
 src/views/operate/inventoryAdjustment/index.vue |   58 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index 309916e..e97a63b 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -25,7 +25,7 @@
           @tableRowClick="tableRowClick"
         >
           <template slot="tableButton">
-            <el-table-column label="鎿嶄綔" width="180" fixed="right" align="center">
+            <el-table-column label="鎿嶄綔" width="180" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.isEdit" @click.stop="handleHistoryClick(scope.row)" class="yes-cursor">
                   <i class="el-icon-refresh-left"></i>
@@ -86,8 +86,9 @@
       locationId: 0,
       productId: 0,
       differenceAmount: 0,
-      Amount: 0,
-      operationId: 0
+      amount: 0,
+      operationId: 0,
+      adjustAmount: 0
     }
   },
   created() {
@@ -98,7 +99,8 @@
     setTable() {
       this.tableList = {
         tableData: this.tableData,
-        selectBox: true,
+        selectBox: false,
+        selectIndex: true,
         tableColumn: [
           { label: "浣嶇疆", prop: "locationName", location: true },
           { label: "浜у搧", prop: "productName", product: true },
@@ -120,11 +122,13 @@
         if (res.code === 200) {
           console.log(res)
           const list = res.data.map((item) => {
+            item.adjustAmount = 0
             return {
               ...item,
               isSet: false,
               isEdit: true,
-              editable: true
+              editable: true,
+              adjustAmount: 0
             }
           })
           this.tableList.tableData = list || []
@@ -136,6 +140,10 @@
     // 鎿嶄綔杈撳叆
     inputContent(val, prop, row) {
       console.log(val, prop, row)
+      console.log(val - row.amount, "缁撴灉")
+      this.adjustAmount = val - row.amount
+      this.tableList.tableData[row.index].adjustAmount = this.adjustAmount
+      // this.differenceAmount = val
       this.differenceAmount = val
     },
     // 鏂板
@@ -151,10 +159,9 @@
         this.operationId = 0
         this.currentRowId = 0
         this.countId++
-        this.tableData.push({
+        this.tableData.unshift({
           countId: this.countId,
-          Amount: 0,
-          areaName: "",
+          amount: 0,
           adjustAmount: 0,
           productId: "",
           differenceAmount: 0,
@@ -172,8 +179,10 @@
         this.addTitle = "鏂板缓"
         this.showDiscard = false
         let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
+
         requestUrl({
-          Amount: this.Amount,
+          amount: this.amount,
+          // adjustAmount: this.adjustAmount,
           differenceAmount: this.differenceAmount,
           locationId: this.locationId,
           operationId: this.operationId,
@@ -197,7 +206,7 @@
     // 鏄惁閫夋嫨浜у搧
     isSel() {
       for (let i = 0; i < this.tableData.length; i++) {
-        if (this.tableData[i].productName.length === 0) {
+        if (this.tableData[i].productName?.length === 0) {
           this.isNoProduct = false
           break
         } else {
@@ -207,13 +216,19 @@
     },
     // 鍙栨秷
     discardBtnClick() {
-      if (this.isRowClick) {
-        this.tableData.map((item) => {
-          item.isEdit = true
-        })
-      } else {
-        this.tableData.splice(this.tableData.length - 1, 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
     },
@@ -229,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 }
         })
       }
     },
@@ -244,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) => {
@@ -261,7 +276,8 @@
     },
     // 琛岀偣鍑�
     tableRowClick(row, rowIndex) {
-      console.log("11111")
+      this.locationId = row.locationId
+      this.rowIndex = rowIndex
       this.isSel()
       if (!this.isNoProduct && this.currentRowId === 0) {
         this.$message.error("璇峰畬鎴愬綋鍓嶆柊寤烘垨鍙栨秷鏂板缓")
@@ -282,7 +298,7 @@
           }
         })
         this.differenceAmount = row.differenceAmount
-        this.Amount = row.Amount
+        this.amount = row.amount
         this.productId = row.productId
         this.operationId = row.operationId
       }

--
Gitblit v1.8.0