From 096dd7944408d95106359fb5437c9ab993af1c48 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 2 Apr 2025 11:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A7=E4=BB=B6=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/storage/oldPartsInvertory.js      | 15 ++++--
 .../views/storage/oldPartsInvertory/index.vue | 48 ++++++++++++++-----
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/yxt-as-ui/src/api/storage/oldPartsInvertory.js b/yxt-as-ui/src/api/storage/oldPartsInvertory.js
index 0cf4789f19..0f33138e17 100644
--- a/yxt-as-ui/src/api/storage/oldPartsInvertory.js
+++ b/yxt-as-ui/src/api/storage/oldPartsInvertory.js
@@ -53,13 +53,20 @@ export default {
       }
     })
   },
-  // 根据仓库查询库位
+  // 根据仓库查询库区
   getWarehouseareas: function(data) {
     return request({
       url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
       method: 'get',
-      params: data,
-      headers: { 'Content-Type': 'application/json' }
+      params: data
     })
-  }
+  },
+  // 根据库区查询库位
+  getAllRackByKQSid: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid',
+      method: 'get',
+      params: data
+    })
+  },
 }
diff --git a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
index d040f5f7c1..679a21d80d 100644
--- a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
@@ -22,9 +22,15 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="库区">
+                <el-select v-model="queryParams.params.warehouseAreaName" filterable clearable placeholder="请选择" @change="warehouseAreaNameSelect">
+                  <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaCode" :value="item.sid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="库位">
-                <el-select v-model="queryParams.params.warehouseRackCode" filterable clearable placeholder="请选择" @change="warehouseRackCodeSelect">
-                  <el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.areaCode" :value="item.sid">
+                <el-select v-model="queryParams.params.warehouseRackCode" filterable clearable placeholder="请选择">
+                  <el-option v-for="item in warehouseRackCodeList" :key="item.rackCode" :label="item.rackName" :value="item.rackCode">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -34,6 +40,9 @@
               <el-form-item label="车架号">
                 <el-input v-model="queryParams.params.vinNo" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="维修单号">
+                <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@@ -136,9 +145,11 @@ export default {
           goodsSpuName: '',
           goodsSkuCode: '',
           warehouseName: '',
+          warehouseAreaName: '',
           warehouseRackCode: '',
           manufacturerName: '',
           vinNo: '',
+          sourceBillNo: '',
           createBySid: '',
           orgPath: ''
         }
@@ -146,7 +157,8 @@ export default {
       sids: [],
       multipleSelection: [],
       warehouseList: [],
-      warehouseRackList: []
+      warehouseAreaList: [],
+      warehouseRackCodeList: []
     }
   },
   mounted() {
@@ -229,9 +241,11 @@ export default {
           goodsSpuName: '',
           goodsSkuCode: '',
           warehouseName: '',
+          warehouseAreaName: '',
           warehouseRackCode: '',
           manufacturerName: '',
           vinNo: '',
+          sourceBillNo: '',
           createBySid: '',
           orgPath: ''
         }
@@ -316,29 +330,37 @@ export default {
       this.viewState = 1
     },
     getWarehouseList() {
-      req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }
       })
     },
-    getWarehouseAreaList(sid) {
-      req.getWarehouseareas({ ckSid: sid }).then((res) => {
-        if (res.success) {
-          this.warehouseRackList = res.data
-        }
-      })
-    },
     warehouseNameSelect(val) {
       const choose = this.warehouseList.filter((item) => item.sid === val)
       this.queryParams.params.warehouseName = choose[0].warehouseName
       this.queryParams.params.warehouseSid = choose[0].sid
       this.getWarehouseAreaList(choose[0].sid)
     },
-    warehouseRackCodeSelect(val) {
-      const choose = this.warehouseRackList.filter((item) => item.sid === val)
+    getWarehouseAreaList(sid) {
+      req.getWarehouseareas({ ckSid: sid }).then((res) => {
+        if (res.success) {
+          this.warehouseAreaList = res.data
+        }
+      })
+    },
+    warehouseAreaNameSelect(val) {
+      const choose = this.warehouseAreaList.filter((item) => item.sid === val)
       this.queryParams.params.warehouseRackCode = choose[0].areaCode
       this.queryParams.params.warehouseRackSid = choose[0].sid
+      this.getWareHouseCodeList(choose[0].sid)
+    },
+    getWareHouseCodeList(sid) {
+      req.getAllRackByKQSid({ kqSid: sid }).then((res) => {
+        if (res.success) {
+          this.warehouseRackCodeList = res.data
+        }
+      })
     }
   }
 }