From 301cbea766080fb65b8c6af563388b61606322f3 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 19 十月 2023 14:23:25 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style

---
 src/views/operate/inventoryAdjustment/index.vue |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index 24acee5..d31d459 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>
@@ -87,7 +87,8 @@
       productId: 0,
       differenceAmount: 0,
       amount: 0,
-      operationId: 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,7 +140,10 @@
     // 鎿嶄綔杈撳叆
     inputContent(val, prop, row) {
       console.log(val, prop, row)
-      this.differenceAmount = val
+      console.log(val-row.amount,"缁撴灉")
+      this.adjustAmount=val-row.amount
+      this.tableList.tableData[row.index].adjustAmount=this.adjustAmount   
+      // this.differenceAmount = val
     },
     // 鏂板
     addProductClick() {
@@ -151,7 +158,7 @@
         this.operationId = 0
         this.currentRowId = 0
         this.countId++
-        this.tableData.push({
+        this.tableData.unshift({
           countId: this.countId,
           amount: 0,
           adjustAmount: 0,
@@ -172,8 +179,9 @@
         this.showDiscard = false
         let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
         requestUrl({
-          amount: this.amount,
-          differenceAmount: this.differenceAmount,
+          // amount: this.amount,
+          adjustAmount:this.adjustAmount,
+          // differenceAmount: this.differenceAmount,
           locationId: this.locationId,
           operationId: this.operationId,
           productId: this.productId
@@ -211,7 +219,7 @@
           item.isEdit = true
         })
       } else {
-        this.tableData.splice(this.tableData.length - 1, 1)
+        this.tableData.splice(0, 1)
       }
       this.addTitle = "鏂板缓"
       this.showDiscard = false
@@ -260,7 +268,7 @@
     },
     // 琛岀偣鍑�
     tableRowClick(row, rowIndex) {
-      console.log("11111")
+      this.rowIndex=rowIndex
       this.isSel()
       if (!this.isNoProduct && this.currentRowId === 0) {
         this.$message.error("璇峰畬鎴愬綋鍓嶆柊寤烘垨鍙栨秷鏂板缓")

--
Gitblit v1.8.0