From 780d8b6476eb7cdf07042edec04915d686d44594 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 18 十月 2023 20:48:39 +0800
Subject: [PATCH] 库存调整、库存报表、位置报表参数调整

---
 src/views/reportForm/inventoryReport/index.vue       |   47 +++++++++++++++--------
 src/views/reportForm/inboundOutboundDetail/index.vue |    5 ++
 src/components/makepager/CommonFormTableView.vue     |    1 
 src/views/reportForm/locationReport/index.vue        |   26 ++++++++-----
 src/views/operate/inventoryAdjustment/index.vue      |   16 +++++--
 5 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 263508c..5bd8931 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -121,7 +121,6 @@
                   v-else
                   v-model="scope.row[item.prop]"
                   placeholder=""
-                  :min="0"
                   :precision="2"
                   :controls="false"
                   size="mini"
diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index 48c3806..d31d459 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -87,7 +87,8 @@
       productId: 0,
       differenceAmount: 0,
       amount: 0,
-      operationId: 0
+      operationId: 0,
+      adjustAmount:0,
     }
   },
   created() {
@@ -121,6 +122,7 @@
         if (res.code === 200) {
           console.log(res)
           const list = res.data.map((item) => {
+            item.adjustAmount=0
             return {
               ...item,
               isSet: false,
@@ -138,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() {
@@ -174,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
@@ -262,7 +268,7 @@
     },
     // 琛岀偣鍑�
     tableRowClick(row, rowIndex) {
-      console.log("11111")
+      this.rowIndex=rowIndex
       this.isSel()
       if (!this.isNoProduct && this.currentRowId === 0) {
         this.$message.error("璇峰畬鎴愬綋鍓嶆柊寤烘垨鍙栨秷鏂板缓")
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 46a21b5..c31f520 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -168,7 +168,10 @@
     async getData() {
       if (this.params.name === "鎶ヨ〃") {
         await getHistory({
-          productId: this.params.id,
+          keyWord:this.params.row.productTypeName,
+          produceId:this.params.row.id,
+          productName:this.params.row.productName,
+          unit:this.params.row.unit,
           page: this.pagerOptions.currPage,
           pageSize: this.pagerOptions.pageSize
         }).then((res) => {
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index b03195f..eace0e9 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -5,7 +5,7 @@
       <SearchCommonView
         :showAdd="false"
         :add-title="'鏂板缓'"
-        :placeholder="''"
+        :placeholder="'璇疯緭鍏ヤ骇鍝佸悕绉版垨浜у搧绫诲埆'"
         :amount-view="false"
         @addCommonClick="addBtnClick"
         @searchClick="getList"
@@ -22,11 +22,11 @@
               v-for="(item, index) in warehouseList"
               :key="index"
               v-model="stashRadio"
-              :label="item.name"
+              :label="item.code"
               @change="radioHandleChange"
               >{{ item.name }}</el-radio
             >
-            <!-- <el-radio v-model="stashRadio" label="2">澶囬�夐」</el-radio> -->
+            <!-- @click.prevent.native="checkRadio(item.code)"   鍙栨秷鍗曢�夐」 -->
           </template>
         </div>
         <p style="margin-top: 30px">绫诲埆</p>
@@ -145,7 +145,8 @@
       stashRadio: "1",
       pageSizes: [15, 30],
       oldRadioBtn: "",
-      metaTitle: this.$route.meta.title
+      metaTitle: this.$route.meta.title,
+      searchStr:""
     }
   },
   created() {
@@ -166,6 +167,12 @@
       this.warehouseListName = e
       this.getData()
     },
+    // checkRadio(val){
+    //   console.log(val)
+    //   val == this.stashRadio ? this.stashRadio = '' : this.stashRadio = val
+    //   this.warehouseListName = val
+    //   this.getData()
+    // },
     setTable() {
       if (this.isIconIndex === "1") {
         this.pageSizes = [30, 60]
@@ -268,7 +275,12 @@
       this.tableList.tableColumn = this.setTableColumn(val)
     },
     getList(val) {
-      console.log(val)
+      this.searchStr=val
+      this.getInventoryData({
+        page: this.pagerOptions.currPage,
+        pageSize: this.pagerOptions.pageSize,
+        keyWord:val,
+      })
     },
     // 琛岀偣鍑�
     tableRowClick(row) {
@@ -280,8 +292,8 @@
     // 鏂板缓
     addBtnClick() {
       // this.editConfig.visible = true;
-      this.editConfig.title = "鏂板缓"
-      this.getData()
+      // this.editConfig.title = "鏂板缓"
+      // this.getData()
     },
     // 鐘舵��
     getStatus(val) {
@@ -329,21 +341,24 @@
 
     //鎺ュ彛璇锋眰-----------------------------------------------------------------------------------------------
     // 鑾峰彇搴撳瓨鎶ヨ〃鏁版嵁
-    async getData() {
+    async getInventoryData(params){
+      await getInventoryData(params).then((res) => {
+          if (res.code === 200) {
+            const list = res.data
+            this.tableList.tableInfomation = list || []
+            this.pagerOptions.totalCount = res.total
+          }
+        })
+    },
+    getData() {
       let params = {
+        keyWord:this.searchStr,
         categoryIds: this.categoryListId,
-        keyWord:this.productName,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize,
         warehouseCode: this.warehouseListName
       }
-      await getInventoryData(params).then((res) => {
-        if (res.code === 200) {
-          const list = res.data
-          this.tableList.tableInfomation = list || []
-          this.pagerOptions.totalCount = res.total
-        }
-      })
+      this.getInventoryData(params)
     },
     // 鑾峰彇浜у搧绫诲瀷鍒楄〃鏁版嵁
     async getProductCategoryList() {
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 2da4e3e..68a953b 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -2,17 +2,15 @@
 <template>
   <div class="rightContent">
     <div class="top">
-      <div>
         <SearchCommonView
           :add-title="'鏂板缓'"
           :showAdd="false"
-          :placeholder="''"
+          :placeholder="'璇疯緭鍏ヤ綅缃悕绉般�佷骇鍝佸悕绉版垨浜у搧绫诲埆'"
           :amount-view="false"
           @addCommonClick="addBtnClick"
           @searchClick="getList"
           :isDisabled="true"
         />
-      </div>
     </div>
     <div class="list-view">
       <div class="table">
@@ -199,11 +197,8 @@
       this.tableList.tableColumn = this.setTableColumn(val)
     },
     // 璇锋眰鏁版嵁
-    async getData() {
-      await getLocationData({
-        page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
-      }).then((res) => {
+    async getLocationData(params){
+      await getLocationData(params).then((res) => {
         if (res.code === 200) {
           const list = res.data
           this.tableList.tableInfomation = list || []
@@ -211,10 +206,20 @@
         }
       })
     },
+    getData() {
+      this.getLocationData({
+        page: this.pagerOptions.currPage,
+        pageSize: this.pagerOptions.pageSize
+      })
+    },
 
     // 鎼滅储
     getList(val) {
-      console.log(val)
+      this.getLocationData({
+        page: this.pagerOptions.currPage,
+        pageSize: this.pagerOptions.pageSize,
+        keyWord:val
+      })
     },
     // 琛岀偣鍑�
     tableRowClick(row) {
@@ -238,7 +243,8 @@
       this.$router.push({
         name: "inboundOutboundDetail",
         params: {
-          id: row.produceId,
+          row:row,
+          // id: row.produceId,
           name: "鎶ヨ〃"
         }
       })

--
Gitblit v1.8.0