diff --git a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
index f8e8f792c0..6a0f20bc84 100644
--- a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="旧件出入库查询" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <button-bar ref="btnbar" view-title="旧件出入库查询" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -10,67 +10,60 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="商品ID">
-                <el-input v-model="queryParams.params.goodsID" placeholder="" clearable />
+                <el-input v-model="queryParams.params.goodsID" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="商品名称">
-                <el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="商品编码">
-                <el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable />
+              <el-form-item label="图号">
+                <el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="仓库">
-                <el-select v-model="queryParams.params.warehouseName" filterable clearable placeholder="请选择"
-                  style="width:100%" @change="warehouseNameSelect">
-                  <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
-                    :value="item.sid">
+                <el-select v-model="queryParams.params.warehouseName" filterable clearable placeholder="请选择" style="width:100%" @change="warehouseNameSelect">
+                  <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid">
+                  </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.areaName" :value="item.sid">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="库位">
-                <el-select v-model="queryParams.params.warehouseRackCode" filterable clearable placeholder="请选择"
-                  style="width:100%" @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="请选择" style="width:100%">
+                  <el-option v-for="item in warehouseRackCodeList" :key="item.rackCode" :label="item.rackCode" :value="item.rackCode">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="厂家">
-                <el-select v-model="queryParams.params.manufacturerName" filterable clearable placeholder="请选择"
-                  style="width:100%" @change="manufacturerNameSelect">
-                  <el-option v-for="item in manufacturerList" :key="item.sid" :label="item.manufacturerName"
-                    :value="item.sid">
+                <el-select v-model="queryParams.params.manufacturerName" filterable clearable placeholder="请选择" style="width:100%" @change="manufacturerNameSelect">
+                  <el-option v-for="item in manufacturerList" :key="item.sid" :label="item.manufacturerName" :value="item.sid">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="车架号">
-                <el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.vinNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="来源单号">
-                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="单据类型">
-                <el-select v-model="queryParams.params.billType" filterable clearable placeholder="请选择"
-                  style="width:100%">
-                  <el-option v-for="item in billStateList" :key="item.dictKey" :label="item.dictValue"
-                    :value="item.dictKey">
+                <el-select v-model="queryParams.params.billType" filterable clearable placeholder="请选择" style="width:100%">
+                  <el-option v-for="item in billStateList" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="业务类型">
-                <el-select v-model="queryParams.params.busTypeValue" filterable clearable placeholder="请选择"
-                  style="width:100%">
-                  <el-option v-for="item in busTypeList" :key="item.dictKey" :label="item.dictValue"
-                    :value="item.dictKey">
+                <el-select v-model="queryParams.params.busTypeValue" filterable clearable placeholder="请选择" style="width:100%">
+                  <el-option v-for="item in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="发生时间">
-                <el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
-                至
-                <el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
+                <el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -86,371 +79,300 @@
         <!-- End 项目列表头部 -->
         <!-- Start 项目列表 -->
         <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
-            @selection-change="selectionLineChangeHandle">
-            <el-table-column fixed width="50" type="selection" align="center" />
-            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column prop="vinNo" label="车架号" width="120" align="center" />
-            <el-table-column prop="goodsID" label="商品ID" width="120" align="center" />
-            <el-table-column prop="goodsSpuName" label="商品名称" width="120" align="center" />
-            <el-table-column prop="goodsSkuCode" label="商品编码" width="120" align="center" />
-            <el-table-column prop="manufacturerName" label="厂家" width="180" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="120" align="center" />
-            <el-table-column prop="unit" label="单位" width="120" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-            <el-table-column prop="warehouseRackCode" label="库位" width="150" align="center" />
-            <el-table-column prop="billNo" label="来源单号" width="150" align="center" />
-            <el-table-column prop="billType" label="单据类型" width="150" align="center" />
-            <el-table-column prop="createTime" label="发生时间" width="150" align="center" />
-            <el-table-column prop="busTypeValue" label="业务类型" width="150" align="center" />
-            <el-table-column prop="count" label="数量" width="150" align="center" />
-            <el-table-column prop="currentCount" label="出入库后的库存" width="180" align="center" />
-
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center"/>
+            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="vinNo" label="车架号" width="120" align="center"/>
+            <el-table-column prop="goodsID" label="商品ID" width="120" align="center"/>
+            <el-table-column prop="goodsSpuName" label="商品名称" width="120" align="center"/>
+            <el-table-column prop="goodsSkuCode" label="图号" width="120" align="center"/>
+            <el-table-column prop="manufacturerName" label="厂家" width="180" align="center"/>
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="120" align="center"/>
+            <el-table-column prop="unit" label="单位" width="120" align="center"/>
+            <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
+            <el-table-column prop="warehouseAreaName" label="库区" width="150" align="center"/>
+            <el-table-column prop="warehouseRackCode" label="库位" width="150" align="center"/>
+            <el-table-column prop="billNo" label="来源单号" width="150" align="center"/>
+            <el-table-column label="单据类型" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billType == '1' ? '入库' : scope.row.billType == '0' ? '出库' : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="createTime" label="发生时间" width="150" align="center"/>
+            <el-table-column prop="busTypeValue" label="业务类型" width="150" align="center"/>
+            <el-table-column prop="count" label="数量" width="150" align="center"/>
+            <el-table-column prop="currentCount" label="出入库后的库存" width="180" align="center"/>
           </el-table>
         </div>
         <!-- End 项目列表 -->
         <div class="pages">
-          <div class="tit" />
+          <div class="tit"/>
           <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
         </div>
       </div>
     </div>
     <!-- End 查询和其列表部分 -->
-    <!-- 新增修改部分组件 -->
-    <!-- <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> -->
-    <!-- <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" /> -->
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsInAndOutStorage.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  // import divAdd from './oldPartsInStorageAdd.vue'
-  // import divInfo from './oldPartsInvertoryInfo.vue'
-  import {
-    typeValues
-  } from '@/api/Common/dictcommons'
-  import req2 from '@/api/goods/factory.js'
-  export default {
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      // divAdd,
-      // divInfo
-    },
-    data() {
-      return {
-        dialogVisible: false,
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'success',
-            size: 'small',
-            icon: 'export',
-            btnKey: 'toBuild',
-            btnLabel: '导出'
-          },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            name: ''
-          }
-        },
-        sids: [],
-        selectionList: [],
-        manufacturerList: [],
-        warehouseList: [],
-        warehouseRackList: [],
-        busTypeList: [{
-            name: "单据类型1",
-            sid: "1"
-          },
-          {
-            name: "单据类型2",
-            sid: "2"
-          }
-        ],
-        billStateList: [],
-      }
-    },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      this.loadList()
-      this.init()
-    },
-    methods: {
+import req from '@/api/storage/oldPartsInAndOutStorage.js'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import { typeValues } from '@/api/Common/dictcommons'
+import req2 from '@/api/goods/factory.js'
 
-      init() {
-        var parpams1 = {
-          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+export default {
+  components: {
+    ButtonBar,
+    Pagination
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      tableLoading: false,
+      dataList: [],
+      btnList: [
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'toBuild',
+          btnLabel: '导出'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
         }
-        req.getWarehouses(parpams1).then((res) => {
-          if (res.success) {
-            this.warehouseList = res.data
-
-            console.log("aaaaaa", this.warehouseList);
-
-          }
-        })
-
-        typeValues({
-          type: 'wms_busType'
-        }).then((res) => {
-          if (res.success) {
-            this.busTypeList = res.data
-          }
-        })
-
-        typeValues({
-          type: 'billsType'
-        }).then((res) => {
-          if (res.success) {
-            this.billStateList = res.data
-          }
-        })
-
-        var parpams2 = {
-          useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+      ],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          goodsID: '',
+          goodsSpuName: '',
+          goodsSkuCode: '',
+          warehouseName: '',
+          warehouseAreaName: '',
+          warehouseRackCode: '',
+          manufacturerName: '',
+          vinNo: '',
+          billNo: '',
+          billType: '',
+          busTypeValue: '',
+          createTimeStart: '',
+          createTimeEnd: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         }
-        req2.getAllFacturer(parpams2).then(resp => {
-          this.manufacturerList = resp.data
-        })
-        console.log("aaaaaa", this.manufacturerList);
-
       },
-
-
-      selectionLineChangeHandle(val) {
-        console.log("val", val);
-
-        this.selectionList = val
-        const aa = []
-        val.forEach(element => {
-          aa.push(element.sid)
-        })
-        this.sids = aa
-
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
+      sids: [],
+      selectionList: [],
+      manufacturerList: [],
+      warehouseList: [],
+      warehouseRackCodeList: [],
+      busTypeList: [],
+      billStateList: [
+        {
+          dictKey: '0',
+          dictValue: '出库'
+        },
+        {
+          dictKey: '1',
+          dictValue: '入库'
         }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'doDel':
-            // this.doDel()
-            this.toRelevancy()
-            break
-          case 'toBuild':
-            this.toBuild()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
+      ]
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    this.loadList()
+    this.init()
+  },
+  methods: {
+    init() {
+      req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
+        if (res.success) {
+          this.warehouseList = res.data
         }
-      },
-      loadList() {
-        this.tableLoading = true
-        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
-        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-        this.queryParams.params.menuUrl = this.$route.path
-        req.listPage(this.queryParams).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.queryParams.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.queryParams.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-      },
-
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            name: ''
-          }
+      })
+      typeValues({ type: 'wms_busType' }).then((res) => {
+        if (res.success) {
+          this.busTypeList = res.data
         }
-        this.loadList()
-      },
-      doDel() {
-
-        if (this.sids.length > 0) {
-          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
-          this.$confirm(tip, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
-            req.deleteBySids(this.sids).then((resp) => {
-              loading.close()
-              if (resp.success) {
-                this.$message({
-                  type: 'success',
-                  message: resp.msg,
-                  showClose: true
-                })
-                this.loadList()
-              } else {
-                // 根据resp.code进行异常情况处理
-              }
-            }).catch(e => {
-              loading.close()
-            })
-          }).catch(() => {})
+      })
+      req2.getAllFacturer({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then(resp => {
+        this.manufacturerList = resp.data
+      })
+    },
+    selectionLineChangeHandle(val) {
+      this.selectionList = val
+      const aa = []
+      val.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case 'toBuild':
+          this.toBuild()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    loadList() {
+      this.tableLoading = true
+      this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+      this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.queryParams.params.menuUrl = this.$route.path
+      req.listPage(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
+          const data = resp.data
+          this.queryParams.total = data.total
+          this.dataList = data.records
         } else {
-          this.$message({
-            showClose: true,
-            message: '请至少选择一条记录进行删除操作'
-          })
+          // 根据resp.code进行异常情况处理
+          this.dataList = []
+          this.queryParams.total = 0
         }
-      },
-
-      toBuild() {
-        // if (this.sids.length > 0) {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-
-
-        req.exportExcel(this.queryParams.params).then((resp) => {
-          loading.close()
-          const blob = new Blob([resp], {
-            type: 'application/vnd.ms-excel'
-          })
-          const fileName = '旧件出入库记录' + '.xls'
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'nonde'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href)
-          document.body.removeChild(elink)
-        }).catch(() => {
-          loading.close()
-        })
-        // } else {
-        //   this.$message({
-        //     type: "warning",
-        //     showClose: true,
-        //     message: '请至少选择一条记录进行操作'
-        //   })
-        // }
-      },
-
-      toRelevancy() {
-        this.viewState = 4
-        this.$refs['divinfo'].showAdd()
-      },
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
-      resetState() {
-        this.viewState = 1
-      },
-
-      manufacturerNameSelect(val) {
-
-        console.log("supplierNameSelect", val);
-        const choose = this.manufacturerList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>supplierNameSelect', choose)
-        this.queryParams.params.manufacturerName = choose[0].manufacturerName
-        this.queryParams.params.manufacturerSid = choose[0].sid
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
 
-      },
-      getWarehouseAreaList(sid) {
-        var query = {
-          ckSid: sid
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          goodsID: '',
+          goodsSpuName: '',
+          goodsSkuCode: '',
+          warehouseName: '',
+          warehouseAreaName: '',
+          warehouseRackCode: '',
+          manufacturerName: '',
+          vinNo: '',
+          billNo: '',
+          billType: '',
+          busTypeValue: '',
+          createTimeStart: '',
+          createTimeEnd: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         }
-        req.getWarehouseareas(query).then((res) => {
-          if (res.success) {
-            this.warehouseRackList = res.data
-
-            console.log("aaaaaa", this.warehouseRackList);
-
-          }
+      }
+      this.loadList()
+    },
+    toBuild() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.exportExcel(this.queryParams.params).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
         })
-      },
-      warehouseNameSelect(val) {
-        console.log("selectWarehouseName", val);
-        const choose = this.warehouseList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseName', choose)
+        const fileName = '旧件出入库记录' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    manufacturerNameSelect(val) {
+      const choose = this.manufacturerList.filter((item) => item.sid === val)
+      this.queryParams.params.manufacturerName = choose[0].manufacturerName
+    },
+    warehouseNameSelect(val) {
+      const choose = this.warehouseList.filter((item) => item.sid === val)
+      if (choose !== null && choose.length > 0) {
         this.queryParams.params.warehouseName = choose[0].warehouseName
-        this.queryParams.params.warehouseSid = choose[0].sid
-
         this.getWarehouseAreaList(choose[0].sid)
-
-      },
-      warehouseRackCodeSelect(val) {
-        console.log("selectWarehouseAreaCode", val);
-
-        const choose = this.warehouseRackList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
-        this.queryParams.params.warehouseRackCode = choose[0].areaCode
-        this.queryParams.params.warehouseRackSid = choose[0].sid
-
-      },
+      } else {
+        this.queryParams.params.warehouseName = ''
+      }
+    },
+    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)
+      if (choose !== null && choose.length > 0) {
+        this.queryParams.params.warehouseAreaName = choose[0].areaName
+        this.getWareHouseCodeList(choose[0].sid)
+      } else {
+        this.queryParams.params.warehouseAreaName = ''
+      }
+    },
+    getWareHouseCodeList(sid) {
+      req.getAllRackByKQSid({ kqSid: sid }).then((res) => {
+        if (res.success) {
+          this.warehouseRackCodeList = res.data
+        }
+      })
     }
   }
+}
 </script>
 <style scoped>
 </style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
index 679a21d80d..f8a4e60e7b 100644
--- a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
@@ -24,13 +24,13 @@
               </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 v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName" :value="item.sid">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="库位">
                 <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 v-for="item in warehouseRackCodeList" :key="item.rackCode" :label="item.rackCode" :value="item.rackCode">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -338,9 +338,12 @@ export default {
     },
     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)
+      if (choose !== null && choose.length > 0) {
+        this.queryParams.params.warehouseName = choose[0].warehouseName
+        this.getWarehouseAreaList(choose[0].sid)
+      } else {
+        this.queryParams.params.warehouseName = ''
+      }
     },
     getWarehouseAreaList(sid) {
       req.getWarehouseareas({ ckSid: sid }).then((res) => {
@@ -351,9 +354,12 @@ export default {
     },
     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)
+      if (choose !== null && choose.length > 0) {
+        this.queryParams.params.warehouseAreaName = choose[0].areaName
+        this.getWareHouseCodeList(choose[0].sid)
+      } else {
+        this.queryParams.params.warehouseAreaName = ''
+      }
     },
     getWareHouseCodeList(sid) {
       req.getAllRackByKQSid({ kqSid: sid }).then((res) => {