diff --git a/yxt-as-ui/src/views/storage/oldPartsCope/index.vue b/yxt-as-ui/src/views/storage/oldPartsCope/index.vue
index 2a86d4ffd2..35027c6474 100644
--- a/yxt-as-ui/src/views/storage/oldPartsCope/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsCope/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,43 +10,36 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="分公司">
-                <el-input v-model="queryParams.params.useOrgName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请部门">
-                <el-input v-model="queryParams.params.createDeptName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.createDeptName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请人">
-                <el-input v-model="queryParams.params.createByName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.createByName" 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-date-picker v-model="queryParams.params.createStartTime" 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.createEndTime" 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.createStartTime" 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.createEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
               </el-form-item>
               <el-form-item label="办结日期">
-                <el-date-picker v-model="queryParams.params.finishStartTime" 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.finishEndTime" 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.finishStartTime" 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.finishEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
               </el-form-item>
               <el-form-item label="处理原因">
                 <el-select v-model="queryParams.params.handleReasonKey" placeholder="请选择">
-                  <el-option v-for="(item,i) in handleReasonList" :key="i" :label="item.name" :value="item.sid">
+                  <el-option v-for="item in reasonList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="处理方式">
                 <el-select v-model="queryParams.params.handleModeKey" placeholder="请选择">
-                  <el-option v-for="(item,i) in billStateList" :key="i" :label="item.name" :value="item.sid">
+                  <el-option v-for="item in modeList" :key="item.dictKeyitem.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -57,21 +50,17 @@
             </div>
           </div>
         </div>
-        <!-- Start 项目列表头部 -->
         <div class="listtop">
           <div class="tit">旧件处理申请列表</div>
         </div>
-        <!-- 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="60" label="序号" type="index" :index="indexMethod" 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="60" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column fixed label="操作" align="center" width="180">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'"
-                  @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toEdit(scope.row)">办理
+                </el-button>
                 <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -81,343 +70,308 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="billNo" label="单据编号 " width="180" align="center" />
-            <el-table-column prop="useOrgName" label="分公司" align="center" />
-            <el-table-column prop="deptName" label="申请部门" align="center" />
-            <el-table-column prop="createByName" label="申请人" align="center" />
-            <el-table-column prop="createTime" label="申请日期" align="center" />
-            <el-table-column prop="finishTime" label="办结日期" align="center" />
-            <el-table-column prop="handleReasonValue" label="处理原因" width="180" align="center" />
-            <el-table-column prop="handleModeValue" label="处理方式" width="180" align="center" />
-            <el-table-column prop="profitTotal" label="收益总额" width="180" align="center" />
-
+            <el-table-column prop="billNo" label="单据编号 " width="180" align="center"/>
+            <el-table-column prop="useOrgName" label="分公司" align="center"/>
+            <el-table-column prop="deptName" label="申请部门" align="center"/>
+            <el-table-column prop="createByName" label="申请人" align="center"/>
+            <el-table-column prop="createTime" label="申请日期" align="center"/>
+            <el-table-column prop="finishTime" label="办结日期" align="center"/>
+            <el-table-column prop="handleReasonValue" label="处理原因" width="180" align="center"/>
+            <el-table-column prop="handleModeValue" label="处理方式" width="180" align="center"/>
+            <el-table-column prop="profitTotal" 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" />
-
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
     <!-- 流程审批记录 -->
     <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
-      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
-        :src="this.centerDialogVisible === true ? url :''"></iframe>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsCope.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import divAdd from './oldPartsCopeAdd.vue'
-  import divInfo from './oldPartsCopeInfo.vue'
-  import {
-    getStorage
-  } from '@/utils/auth'
-  export default {
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      divAdd,
-      divInfo
-    },
-    data() {
-      return {
-        url: '',
-        dialogHeight: '80%',
-        centerDialogVisible: false,
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'primary',
-            size: 'small',
-            icon: 'plus',
-            btnKey: 'toAdd',
-            btnLabel: '新增'
-          },
-          {
-            type: 'danger',
-            size: 'small',
-            icon: 'del',
-            btnKey: 'doDel',
-            btnLabel: '删除'
-          },
+import req from '@/api/storage/oldPartsCope.js'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import divAdd from './oldPartsCopeAdd.vue'
+import divInfo from './oldPartsCopeInfo.vue'
+import { getStorage } from '@/utils/auth'
+import { typeValues } from '@/api/Common/dictcommons'
 
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "useOrgName": "",
-            "deptName": "",
-            "createByName": "",
-            "billNo": "",
-            "createStartTime": "",
-            "createEndTime": "",
-            "finishStartTime": "",
-            "finishEndTime": "",
-            "handleReasonKey": "",
-            "handleModeKey": "",
-            "userSid": "",
-            "orgPath": "",
-            "menuUrl": "",
-            "menuSid": ""
-          }
+export default {
+  components: {
+    ButtonBar,
+    Pagination,
+    divAdd,
+    divInfo
+  },
+  data() {
+    return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      tableLoading: false,
+      dataList: [],
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
         },
-        sids: [],
-        selectionList: [],
-        handleReasonList: [{
-            name: '处理原因1',
-            sid: "1"
-          },
-          {
-            name: '处理原因2',
-            sid: "2"
-          }
-        ],
-        billStateList: [{
-            name: '处理方式1',
-            sid: "1"
-          },
-          {
-            name: '处理方式2',
-            sid: "2"
-          }
-        ],
-      }
-    },
-    mounted() {
-      // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
-      window.addEventListener('message', this.handleMessage)
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      this.loadList()
-    },
-    methods: {
-      async handleMessage(event) {
-        var code = ''
-        if (event.data.params !== null && event.data.params !== undefined) {
-          code = event.data.params.code
-        }
-        if (code === 1) {
-          this.centerDialogVisible = false
-        } else if (code === 2) {
-          this.dialogHeight = event.data.params.data
-          this.setIframeHeight(document.getElementById('iframe'))
-        }
-      },
-      closeIt() {
-        this.url = ''
-        this.centerDialogVisible = false
-      },
-      setIframeHeight(iframe) {
-        iframe.height = this.dialogHeight
-      },
-      flowRecord(row) {
-        this.centerDialogVisible = true
-        var params = {
-          deployId: row.procDefId,
-          procInsId: row.procInstId,
-          token: getStorage()
-        }
-        this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
-      },
-      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 = '显示查询条件'
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
         }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'doDel':
-            this.doDel()
-            break
-          case 'toAdd':
-            this.toAdd()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
+      ],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          handleReasonKey: '',
+          handleModeKey: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: '',
+          menuSid: ''
         }
       },
-      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: {
-            "useOrgName": "",
-            "deptName": "",
-            "createByName": "",
-            "billNo": "",
-            "createStartTime": "",
-            "createEndTime": "",
-            "finishStartTime": "",
-            "finishEndTime": "",
-            "handleReasonKey": "",
-            "handleModeKey": "",
-            "userSid": "",
-            "orgPath": "",
-            "menuUrl": "",
-            "menuSid": ""
-          }
+      sids: [],
+      selectionList: [],
+      reasonList: [],
+      modeList: []
+    }
+  },
+  mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    this.init()
+    this.loadList()
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'process_mode' }).then((res) => {
+        if (res.success) {
+          this.modeList = res.data
         }
-        this.loadList()
-      },
-      doDel() {
-
-        for (var i = 0; i < this.selectionList.length; i++) {
-
-          if (this.selectionList[i].nodeState != '待提交') {
-            this.$message({
-              type: 'warning',
-              message: '请勿勾选已提交的。',
-              showClose: true
-            })
-            return
-          }
+      })
+      typeValues({ type: 'process_reason' }).then((res) => {
+        if (res.success) {
+          this.reasonList = res.data
         }
-
-        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(() => {})
+      })
+    },
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
+      }
+    },
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
+    },
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInstId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
+    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 'doDel':
+          this.doDel()
+          break
+        case 'toAdd':
+          this.toAdd()
+          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
         }
-      },
-
-      toAdd() {
-
-        this.viewState = 2
-        this.$refs['divadd'].showAdd()
-
-      },
-
-      toEdit(row) {
-
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
-
-      },
-
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
-      toRelevancy(row) {
-        this.viewState = 4
-        this.$refs['divinfo'].showEdit(row)
-      },
-
-      resetState() {
-        this.viewState = 1
-      },
+      }).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: {
+          useOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          handleReasonKey: '',
+          handleModeKey: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: '',
+          menuSid: ''
+        }
+      }
+      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(() => {
+        })
+      } else {
+        this.$message({
+          showClose: true,
+          message: '请至少选择一条记录进行删除操作'
+        })
+      }
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divadd'].showEdit(row)
+    },
+    toRelevancy(row) {
+      this.viewState = 4
+      this.$refs['divinfo'].showEdit(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
     }
   }
+}
 </script>
 <style scoped>
 </style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
index 7aaad1b3a9..b1afb0fb8d 100644
--- a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
@@ -1,24 +1,16 @@
 <template>
-  <div>
+  <div class="app-container">
     <div class="tab-header webtop">
-      <!-- 标题 -->
-      <div>{{title}}旧件处理申请</div>
-      <!-- start 添加修改按钮 -->
+      <div>{{ title }}旧件处理申请</div>
       <div>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
-      <!-- end 添加修改按钮 -->
-      <!-- end 详情按钮 -->
     </div>
     <div class="listconadd">
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <div class="title">
-          <div>基础信息</div>
-        </div>
         <el-row class="first_row">
-
           <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -27,41 +19,26 @@
             <div class="span-sty">申请部门</div>
             <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
           </el-col>
-
-          <!--  <el-col :span="12">
-            <div class="span-sty">单据编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <div class="span-sty">申请日期</div>
-            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span>
-              <!--   <el-date-picker v-model="formobj.createTime" class="addinputw addinputInfo" type="date"
-                value-format="yyyy-MM-dd" placeholder="选择日期">
-              </el-date-picker> -->
-            </el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row>
-
           <el-col :span="8">
             <div class="span-sty"><span class="must">*</span> 处理原因</div>
             <el-form-item prop="handleReasonValue">
-              <el-select v-model="formobj.handleReasonValue" placeholder="请选择" class="addinputw addinputInfo"
-                @change="selectHandleReason">
-                <el-option v-for="(item,i) in handleReasonList" :key="i" :label="item.name" :value="item.sid">
+              <el-select v-model="formobj.handleReasonValue" placeholder="请选择" class="addinputw addinputInfo" @change="selectHandleReason">
+                <el-option v-for="item in reasonList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
             <div class="span-sty"><span class="must">*</span> 处理方式</div>
             <el-form-item prop="handleModeValue">
-              <el-select v-model="formobj.handleModeValue" placeholder="请选择" class="addinputw addinputInfo"
-                @change="selectHandleMode">
-                <el-option v-for="(item,i) in handleModeList" :key="i" :label="item.name" :value="item.sid">
+              <el-select v-model="formobj.handleModeValue" placeholder="请选择" class="addinputw addinputInfo" @change="selectHandleMode">
+                <el-option v-for="item in modeList" :key="item.dictKey" :label="item.dictValue" :value="item.item.dictKey">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -70,611 +47,457 @@
             <div class="span-sty">收益总额</div>
             <el-form-item><span class="addinputInfo">{{ totalQuantity }}</span></el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row>
-
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item>
-              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea"
-                :rows="4" clearable />
-
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
             </el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row>
-
           <el-col :span="24">
             <div class="span-sty"><span class="must">*</span> 附件</div>
             <el-form-item prop="imgList">
-              <upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
-                :upload-data="{ type: '0001' }" @change="backData" />
+              <upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map" :upload-data="{ type: '0001' }" @change="backData"/>
             </el-form-item>
           </el-col>
-
         </el-row>
-
-        <div class="title  titleOne">
-          <div>商品列表</div>
+        <div class="title titleOne">
+          <div>待处理旧件列表</div>
           <el-button type="primary" size="mini" @click="importDetail()">选择旧件</el-button>
         </div>
-
         <el-table v-loading="listLoading" :data="formobj.asOldparthandleList" border>
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column fixed label="操作" align="center" width="100">
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="deleteAsOldparthandle(scope.row)">删除</el-button>
-            </template>
-          </el-table-column>
-
-          <!-- <el-table-column align="center" width="100" :render-header="commodityHeader">
-            <template slot-scope="scope">
-              <i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
+              <el-button type="primary" size="mini" @click="deleteAsOldparthandle(scope.$index)">删除</el-button>
             </template>
           </el-table-column>
-          <el-table-column label="商品名称" align="center" min-width="200">
-            <template slot-scope="scope">
-              <el-popover placement="right" width="900" trigger="click">
-                <div>
-                  <el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
-                    @current-change="commodityCurrentChange($event, scope.row)">
-                    <el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" />
-                    <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-                    <el-table-column prop="goodsSkuOwnSpec" label="厂家" align="center" />
-                    <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
-                    <el-table-column prop="unit" label="单位" align="center" />
-                  </el-table>
-                  <el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size"
-                    layout="total, pager" :total="commodityQuery.total" />
-                </div>
-                <el-input slot="reference" v-model="scope.row.goodsSkuName"
-                  @input="commodityInput(scope.row.goodsSkuName)" clearable placeholder="商品名称" />
-              </el-popover>
-            </template>
-          </el-table-column> -->
-          <!-- <el-table-column prop="vinNo" label="车架号" align="center" /> -->
-          <el-table-column prop="goodsID" label="商品ID" align="center" />
-          <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
-          <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-          <el-table-column prop="manufacturerName" label="厂家" align="center" />
-          <!-- <el-table-column prop="supplierName" label="供应商" align="center" /> -->
-          <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
-          <el-table-column prop="unit" label="单位" align="center" />
-          <el-table-column prop="warehouseName" label="仓库" align="center" />
-          <el-table-column prop="warehouseRackCode" label="库位" align="center" />
+          <el-table-column prop="goodsID" label="商品ID" align="center"/>
+          <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
+          <el-table-column prop="goodsSkuCode" label="图号" align="center"/>
+          <el-table-column prop="manufacturerName" label="厂家" align="center"/>
+          <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
+          <el-table-column prop="unit" label="单位" align="center"/>
+          <el-table-column prop="warehouseName" label="仓库" align="center"/>
+          <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
           <el-table-column label="数量" align="center" width="180">
             <template slot-scope="scope">
-              <el-input ref="focusAssumptionInput" v-model="scope.row.count" clearable placeholder=""
-                @input="commodityComputeYHAndXSJE(scope.row)" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              <el-input ref="focusAssumptionInput" v-model="scope.row.count" clearable placeholder="" @input="commodityComputeYHAndXSJE(scope.row)" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
             </template>
           </el-table-column>
-          <el-table-column prop="profit" label="收益金额" align="center" />
+          <el-table-column prop="profit" label="收益金额" align="center"/>
         </el-table>
-
       </el-form>
-
     </div>
-
-    <el-dialog title="选择旧件商品" :visible.sync="dialogVisible" :before-close="handleClose"
-      style="width:150%;margin-left: -20%;">
-
+    <el-dialog title="选择旧件商品" :visible.sync="dialogVisible" :before-close="handleClose" style="width:150%;margin-left: -20%;">
       <el-form :inline="true" class="tab-header" style="margin-top: -30px;">
         <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.goodsName" placeholder="" clearable />
+          <el-input v-model="queryParams.params.goodsName" placeholder="" clearable/>
         </el-form-item>
         <el-form-item label="商品编码">
-          <el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable />
+          <el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable/>
         </el-form-item>
-        <!--  <el-form-item label="仓库">
-          <el-input v-model="queryParams.params.warehouseName" placeholder="" clearable />
-        </el-form-item>
-        <el-form-item label="库位">
-          <el-input v-model="queryParams.params.warehouseRackCode" placeholder="" clearable />
-        </el-form-item>
-        <el-form-item label="供应商">
-          <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
-        </el-form-item> -->
         <el-form-item label="厂家">
-          <el-input v-model="queryParams.params.manufacturerName" placeholder="" clearable />
+          <el-input v-model="queryParams.params.manufacturerName" placeholder="" clearable/>
         </el-form-item>
       </el-form>
-
       <div class="btn" style="text-align: center; margin-top: 20px;">
         <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </div>
-
-      <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;margin-top: 20px;"
-        @selection-change="selectionLineChangeHandle">
-        <el-table-column fixed width="50" type="selection" align="center" />
-        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-        <el-table-column prop="goodsID" label="商品ID" align="center" />
-        <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
-        <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-        <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
-        <el-table-column prop="unit" label="单位" align="center" />
-        <el-table-column prop="manufacturerName" label="厂家" align="center" />
-        <el-table-column prop="vinNo" label="车架号" align="center" />
-        <el-table-column prop="sourceBillNo" label="维修单号" align="center" />
-        <!-- <el-table-column prop="warehouseName" label="仓库" align="center" />
-        <el-table-column prop="warehouseRackCode" label="库位" align="center" />
-        <el-table-column prop="supplierName" label="供应商" align="center" /> -->
-        <!-- <el-table-column prop="price" label="单价" align="center" /> -->
-        <el-table-column prop="count" label="库存数量" align="center" />
+      <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;margin-top: 20px;" @selection-change="selectionLineChangeHandle">
+        <el-table-column fixed width="50" type="selection" align="center"/>
+        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+        <el-table-column prop="goodsID" label="商品ID" align="center"/>
+        <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
+        <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
+        <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
+        <el-table-column prop="unit" label="单位" align="center"/>
+        <el-table-column prop="manufacturerName" label="厂家" align="center"/>
+        <el-table-column prop="vinNo" label="车架号" align="center"/>
+        <el-table-column prop="sourceBillNo" label="维修单号" align="center"/>
+        <el-table-column prop="count" label="库存数量" align="center"/>
       </el-table>
       <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="importDetail" />
-
+        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="importDetail"/>
       </div>
-
       <div class="btn" style="text-align: center; margin-top: 20px;">
         <el-button type="primary" size="mini" @click="addDialogList()">确认</el-button>
         <el-button type="primary" size="mini" @click="handleClose()">关闭</el-button>
       </div>
     </el-dialog>
-
-
-
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsCope.js'
-  import uploadImg from '@/components/uploadFile/uploadImg'
-  import {
-    getOrgSidByPath
-  } from '@/api/Common/dictcommons'
-  import {
-    getCurrentDate
-  } from '@/utils/index.js'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  export default {
-    components: {
-      Pagination,
-      pageye,
-      uploadImg
-    },
-    data() {
-      return {
-        dialogVisible: false,
-        title: '【新增】',
-        orderInfo: {},
-        tableLoading: false,
-        loadList: false,
-        listLoading: false,
-        submitdisabled: false,
-        formobj: {
-          "sid": "",
-          "remarks": "",
-          "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "createTime": getCurrentDate(),
-          "billNo": "",
-          "filePaths": [],
-          "useOrgSid": '',
-          "useOrgName": '',
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "",
-          "taskId": "",
-          "finishTime": "",
-          "totalProfit": "",
-          "asOldparthandleList": [
-
-          ]
-        },
-        hideUploadBtn: false,
-
-        // commodity商品
-        commodityKey: 1,
-        commodityLoading: false,
-        commodityQuery: {
-          current: 1,
-          size: 2,
-          total: 0,
-          params: {
-            name: '',
-            inOrg: "",
-            outOrg: ""
-          }
-        },
-        commodityData: [],
-        isUpdata: false,
-        imgList: [],
-        handleModeList: [{
-            name: '处理方式1',
-            sid: "1"
-          },
-          {
-            name: '处理方式2',
-            sid: "2"
-          }
-        ],
-        handleReasonList: [{
-            name: '处理原因1',
-            sid: "1"
-          },
-          {
-            name: '处理原因2',
-            sid: "2"
-          }
-        ],
-        selectionList: [],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "goodsName": "",
-            "goodsSkuCode": "",
-            "warehouseName": "",
-            "warehouseRackCode": "",
-            "supplierName": "",
-          }
-        },
-        dataList: [],
-        rules: {
-          // createTime: [{
-          //   required: true,
-          //   message: '申请日期不能为空',
-          //   trigger: 'change'
-          // }],
-          handleReasonValue: [{
-            required: true,
-            message: '处理原因不能为空',
-            trigger: 'change'
-          }],
-          handleModeValue: [{
-            required: true,
-            message: '处理方式不能为空',
-            trigger: 'change'
-          }],
-          filePaths: [{
-            required: true,
-            message: '附件不能为空',
-            trigger: 'blur'
-          }],
+import req from '@/api/storage/oldPartsCope.js'
+import uploadImg from '@/components/uploadFile/uploadImg'
+import { getOrgSidByPath, typeValues } from '@/api/Common/dictcommons'
+import { getCurrentDate } from '@/utils/index.js'
+import Pagination from '@/components/pagination'
+
+export default {
+  components: {
+    Pagination,
+    uploadImg
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      title: '【新增】',
+      tableLoading: false,
+      loadList: false,
+      listLoading: false,
+      submitdisabled: false,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: window.sessionStorage.getItem('userSid'),
+        createByName: window.sessionStorage.getItem('name'),
+        deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
+        deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+        createTime: getCurrentDate(),
+        billNo: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        totalProfit: '',
+        asOldparthandleList: []
+      },
+      imgList: [],
+      modeList: [],
+      reasonList: [],
+      selectionList: [],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          goodsName: '',
+          goodsSkuCode: '',
+          warehouseName: '',
+          warehouseRackCode: '',
+          supplierName: ''
         }
+      },
+      dataList: [],
+      rules: {
+        handleReasonValue: [{ required: true, message: '处理原因不能为空', trigger: 'change' }],
+        handleModeValue: [{ required: true, message: '处理方式不能为空', trigger: 'change' }],
+        filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
       }
-    },
-    computed: {
-      // 收益总额
-      totalQuantity() {
-        let quantity = 0
-        if (this.formobj.asOldparthandleList.length > 0) {
-          this.formobj.asOldparthandleList.forEach((e) => {
-            quantity += Number(e.profit)
-          })
+    }
+  },
+  computed: {
+    // 收益总额
+    totalQuantity() {
+      let quantity = 0
+      if (this.formobj.asOldparthandleList.length > 0) {
+        this.formobj.asOldparthandleList.forEach((e) => {
+          quantity += Number(e.profit)
+        })
+      }
+      return quantity
+    }
+  },
+  created() {
+    getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      if (res.success) {
+        this.formobj.createOrgSid = res.data
+        this.formobj.useOrgSid = res.data
+      }
+    })
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'process_mode' }).then((res) => {
+        if (res.success) {
+          this.modeList = res.data
         }
-
-        this.formobj.totalProfit = quantity
-
-        return quantity
-      },
-    },
-    created() {
-      getOrgSidByPath({
-        orgPath: window.sessionStorage.getItem('defaultOrgPath')
-      }).then((res) => {
+      })
+      typeValues({ type: 'process_reason' }).then((res) => {
         if (res.success) {
-          this.formobj.createOrgSid = res.data
-          this.formobj.useOrgSid = res.data
+          this.reasonList = res.data
         }
       })
     },
-    methods: {
-
-
-      selectHandleReason(val) {
-        console.log('>>>>>>>>>selectHandleReason', val)
-        const choose = this.handleReasonList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectHandleReason', choose)
-        this.formobj.handleReasonValue = choose[0].name
-        this.formobj.handleReasonKey = choose[0].sid
-      },
-      selectHandleMode(val) {
-        const choose = this.handleModeList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectHandleMode', choose)
-        this.formobj.handleModeValue = choose[0].name
-        this.formobj.handleModeKey = choose[0].sid
-      },
-
-
-      indexMethod(index) {
-        return Number(index) + 1
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.importDetail()
-      },
-      resetQuery() {
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "goodsName": "",
-            "goodsSkuCode": "",
-            "warehouseName": "",
-            "warehouseRackCode": "",
-            "supplierName": "",
-          }
+    selectHandleReason(val) {
+      const choose = this.reasonList.filter((item) => item.dictKey === val)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.handleReasonValue = choose[0].dictValue
+        this.formobj.handleReasonKey = choose[0].dictKey
+      } else {
+        this.formobj.handleReasonValue = ''
+        this.formobj.handleReasonKey = ''
+      }
+    },
+    selectHandleMode(val) {
+      const choose = this.modeList.filter((item) => item.dictKey === val)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.handleModeValue = choose[0].dictValue
+        this.formobj.handleModeKey = choose[0].dictKey
+      } else {
+        this.formobj.handleModeValue = ''
+        this.formobj.handleModeKey = ''
+      }
+    },
+    indexMethod(index) {
+      return Number(index) + 1
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.importDetail()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          goodsName: '',
+          goodsSkuCode: '',
+          warehouseName: '',
+          warehouseRackCode: '',
+          supplierName: ''
         }
-        this.importDetail()
-      },
-
-      importDetail() {
-        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.handleGoodsListPage(this.queryParams).then((resp) => {
-          this.tableLoading = false
-          this.dialogVisible = true
-          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
-        })
-
-      },
-      selectionLineChangeHandle(val) {
-        this.selectionList = val
-
-      },
-      addDialogList() {
-
-        for (var i = 0; i < this.selectionList.length; i++) {
-
-          var item = {
-            count: this.selectionList[i].count,
-            goodsSkuCode: this.selectionList[i].goodsSkuCode,
-            goodsID: this.selectionList[i].goodsID,
-            goodsSpuSid: this.selectionList[i].goodsSpuSid,
-            goodsSkuSid: this.selectionList[i].goodsSkuSid,
-            goodsSpuName: this.selectionList[i].goodsSpuName,
-            goodsSkuTitle: this.selectionList[i].goodsSkuTitle,
-            goodsSkuOwnSpec: this.selectionList[i].goodsSkuOwnSpec,
-            mainSid: '',
-            sid: '',
-            supplierName: this.selectionList[i].supplierName,
-            unit: this.selectionList[i].unit,
-            vinNo: this.selectionList[i].vinNo,
-            warehouseName: this.selectionList[i].warehouseName,
-            warehouseRackCode: this.selectionList[i].warehouseRackCode,
-            warehouseRackSid: this.selectionList[i].warehouseRackSid,
-            warehouseSid: this.selectionList[i].warehouseSid,
-            price: this.selectionList[i].price,
-            sourceBillNo: this.selectionList[i].sourceBillNo,
-            manufacturerSid: this.selectionList[i].manufacturerSid,
-            manufacturerName: this.selectionList[i].manufacturerName,
-            supplierSid: this.selectionList[i].supplierSid,
-            supplierName: this.selectionList[i].supplierName,
-            profit: (Number(this.selectionList[i].count) * Number(this.selectionList[i].price)).toFixed(2)
-          }
-
-
-          this.formobj.asOldparthandleList.push(item)
+      }
+      this.importDetail()
+    },
+    importDetail() {
+      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.handleGoodsListPage(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        this.dialogVisible = true
+        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
         }
-        this.dialogVisible = false
-      },
-      handleClose() {
-        this.dialogVisible = false
-      },
-      deleteAsOldparthandle(row) {
-        const index = this.formobj.asOldparthandleList.findIndex((item) => item === row)
-        console.log("index》》》》", index)
-        this.formobj.asOldparthandleList.splice(index, 1)
-
-      },
-      saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            this.submitdisabled = true
-            req.save(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '保存成功'
-                })
-                this.handleReturn('true')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
+    selectionLineChangeHandle(val) {
+      this.selectionList = val
+    },
+    addDialogList() {
+      for (var i = 0; i < this.selectionList.length; i++) {
+        var item = {
+          count: this.selectionList[i].count,
+          goodsSkuCode: this.selectionList[i].goodsSkuCode,
+          goodsID: this.selectionList[i].goodsID,
+          goodsSpuSid: this.selectionList[i].goodsSpuSid,
+          goodsSkuSid: this.selectionList[i].goodsSkuSid,
+          goodsSpuName: this.selectionList[i].goodsSpuName,
+          goodsSkuTitle: this.selectionList[i].goodsSkuTitle,
+          goodsSkuOwnSpec: this.selectionList[i].goodsSkuOwnSpec,
+          mainSid: '',
+          sid: '',
+          unit: this.selectionList[i].unit,
+          vinNo: this.selectionList[i].vinNo,
+          warehouseName: this.selectionList[i].warehouseName,
+          warehouseRackCode: this.selectionList[i].warehouseRackCode,
+          warehouseRackSid: this.selectionList[i].warehouseRackSid,
+          warehouseSid: this.selectionList[i].warehouseSid,
+          price: this.selectionList[i].price,
+          sourceBillNo: this.selectionList[i].sourceBillNo,
+          manufacturerSid: this.selectionList[i].manufacturerSid,
+          manufacturerName: this.selectionList[i].manufacturerName,
+          supplierSid: this.selectionList[i].supplierSid,
+          supplierName: this.selectionList[i].supplierName,
+          profit: (Number(this.selectionList[i].count) * Number(this.selectionList[i].price)).toFixed(2)
+        }
+        this.formobj.asOldparthandleList.push(item)
+      }
+      this.dialogVisible = false
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    deleteAsOldparthandle(index) {
+      this.formobj.asOldparthandleList.splice(index, 1)
+    },
+    saveOrUpdate() {
+      this.formobj.totalProfit = this.totalQuantity
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.save(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '保存成功'
+              })
+              this.handleReturn('true')
+            } else {
               this.submitdisabled = false
-            })
-          }
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.formobj.totalProfit = this.totalQuantity
+      if (this.formobj.asOldparthandleList.length === 0) {
+        this.$message({
+          showClose: true,
+          type: 'warning',
+          message: '旧件申请列表不能为空'
         })
-      },
-      submit() {
-
-
-        if (this.formobj.asOldparthandleList.length == 0) {
+        return
+      }
+      for (var i = 0; i < this.formobj.asOldparthandleList.length; i++) {
+        if (Number(this.formobj.asOldparthandleList[i].count) === 0) {
           this.$message({
             showClose: true,
             type: 'warning',
-            message: '旧件申请列表不能为空'
+            message: '旧件数量不能为空'
           })
           return
         }
-
-        for (var i = 0; i < this.formobj.asOldparthandleList.length; i++) {
-          if (Number(this.formobj.asOldparthandleList[i].count) == 0) {
-            this.$message({
-              showClose: true,
-              type: 'warning',
-              message: '旧件数量不能为空'
-            })
-            return
-          }
-        }
-
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            this.submitdisabled = true
-            req.submit(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '保存成功'
-                })
-                this.handleReturn('true')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
+      }
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '保存成功'
+              })
+              this.handleReturn('true')
+            } else {
               this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.imgList = []
+      this.formobj = {
+        sid: '',
+        remarks: '',
+        createBySid: window.sessionStorage.getItem('userSid'),
+        createByName: window.sessionStorage.getItem('name'),
+        deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
+        deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+        createTime: getCurrentDate(),
+        billNo: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        totalProfit: '',
+        asOldparthandleList: []
+      }
+      this.submitdisabled = false
+      this.$emit('doback')
+    },
+    showAdd() {
+      this.title = '【新增】'
+      this.init()
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.title = '【修改】'
+      this.init()
+      req.init(row.sid).then(resp => {
+        if (resp.success) {
+          this.formobj = resp.data
+          for (var i = 0; i < resp.data.filePaths.length; i++) {
+            this.imgList.push({
+              url: resp.data.filePaths[i].url
             })
           }
-        })
-
-      },
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.imgList = []
-        this.formobj = {
-          "sid": "",
-          "remarks": "",
-          "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "createTime": getCurrentDate(),
-          "billNo": "",
-          "filePaths": [],
-          "useOrgSid": '',
-          "useOrgName": '',
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "",
-          "taskId": "",
-          "finishTime": "",
-          "totalProfit": "",
-          "asOldparthandleList": [
-
-          ]
         }
-        this.submitdisabled = false
-        this.isUpdata = false
-        this.$emit('doback')
-      },
-
-      showAdd() {
-        this.title = "【新增】"
-        this.isUpdata = false
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-      },
-      showEdit(row) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        this.title = "【修改】"
-        this.isUpdata = true
-        var params = {
-          sid: row.sid
-        }
-
-        req.init(row.sid)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
-
-              for (var i = 0; i < resp.data.filePaths.length; i++) {
-                this.imgList.push({
-                  url: resp.data.filePaths[i].url
-                })
-              }
-
-            }
-          })
-          .catch(e => {
-            this.formobj = {}
-          })
-      },
-
-      backData(value) {
-        console.log('backData》》》》', value)
-        console.log('imgList', this.imgList)
-
+      }).catch(e => {
+        this.formobj = {}
+      })
+    },
+    backData(value) {
+      this.formobj.filePaths = []
+      if (this.imgList.length > 0) {
         for (var i = 0; i < this.imgList.length; i++) {
           this.formobj.filePaths.push(this.imgList[i].url)
         }
-
-
-      },
-      commodityComputeYHAndXSJE(row) {
-        console.log('commodityComputeYHAndXSJE》》》》', row)
-        row.profit = (Number(row.count) * Number(row.price)).toFixed(2)
       }
-
+    },
+    commodityComputeYHAndXSJE(row) {
+      row.profit = (Number(row.count) * Number(row.price)).toFixed(2)
     }
   }
+}
 </script>
 <style scoped>
-  /deep/ .el-form-item__error {
-    margin-left: 120px !important;
-  }
-
-  .must {
-    color: #f00;
-  }
-
-  .span-sty {
-    width: 130px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 120px !important;
-    width: calc(100% - 115px);
-  }
-
-  .first_row {
-    border-top: 1px solid #E0E3EB;
-  }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
+
+.must {
+  color: #f00;
+}
+
+.span-sty {
+  width: 130px !important;
+}
+
+.addinputInfo {
+  margin-left: 120px !important;
+}
+
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 120px !important;
+  width: calc(100% - 115px);
+}
+
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
+
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue
index cfeb4b5cdc..81d32df4c4 100644
--- a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue
@@ -1,22 +1,14 @@
 <template>
-  <div>
+  <div class="app-container">
     <div class="tab-header webtop">
-      <!-- 标题 -->
-      <div>旧件处理申请</div>
-      <!-- start 添加修改按钮 -->
+      <div>旧件处理申请详情</div>
       <div>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
-      <!-- end 添加修改按钮 -->
-      <!-- end 详情按钮 -->
     </div>
     <div class="listconadd">
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-        <div class="title">
-          <div>基础信息</div>
-        </div>
         <el-row class="first_row">
-
           <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -25,21 +17,12 @@
             <div class="span-sty">申请部门</div>
             <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
           </el-col>
-
-
-          <!--     <el-col :span="12">
-            <div class="span-sty">单据编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <div class="span-sty">申请日期</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row>
-
           <el-col :span="8">
             <div class="span-sty">处理原因</div>
             <el-form-item><span class="addinputInfo">{{ formobj.handleReasonValue }}</span></el-form-item>
@@ -50,214 +33,122 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">收益总额</div>
-            <el-form-item><span class="addinputInfo">{{ totalQuantity }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.totalProfit }}</span></el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row>
-
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row>
-
           <el-col :span="24">
             <div class="span-sty">附件</div>
             <el-form-item class="trightb_item">
-              <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
-                v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
+              <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item,index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="[item]">
               </el-image>
             </el-form-item>
           </el-col>
-
         </el-row>
-
-        <div class="title">
-          <div>待处理旧件列表</div>
-        </div>
+        <div class="title">待处理旧件列表</div>
         <el-table v-loading="listLoading" :data="formobj.asOldparthandleList" border>
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <!-- <el-table-column prop="vinNo" label="车架号" align="center" /> -->
-          <el-table-column prop="goodsID" label="商品ID" align="center" />
-          <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
-          <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-          <!-- <el-table-column prop="supplierName" label="供应商" align="center" /> -->
-          <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
-          <el-table-column prop="unit" label="单位" align="center" />
-          <el-table-column prop="manufacturerName" label="厂家" align="center" />
-          <!-- <el-table-column prop="vinNo" label="车架号" align="center" /> -->
-          <!-- <el-table-column prop="sourceBillNo" label="维修单号" align="center" /> -->
-          <!-- <el-table-column prop="warehouseName" label="仓库" align="center" />
-        <el-table-column prop="warehouseRackCode" label="库位" align="center" />
-        <el-table-column prop="supplierName" label="供应商" align="center" /> -->
-          <!-- <el-table-column prop="price" label="单价" align="center" /> -->
-          <el-table-column prop="count" label="库存数量" align="center" />
-          <el-table-column prop="profit" label="收益金额" align="center" />
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column prop="goodsID" label="商品ID" align="center"/>
+          <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
+          <el-table-column prop="goodsSkuCode" label="图号" align="center"/>
+          <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
+          <el-table-column prop="unit" label="单位" align="center"/>
+          <el-table-column prop="manufacturerName" label="厂家" align="center"/>
+          <el-table-column prop="count" label="库存数量" align="center"/>
+          <el-table-column prop="profit" label="收益金额" align="center"/>
         </el-table>
-
       </el-form>
-
     </div>
-
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsCope.js'
-  export default {
-    data() {
-      return {
-        listLoading: false,
-        submitdisabled: false,
-        formobj: {
-          "sid": "",
-          "remarks": "",
-          "createBySid": "",
-          "createByName": "",
-          "createDeptSid": "",
-          "createDeptName": "",
-          "createTime": "",
-          "billNo": "",
-          "filePaths": [],
-          "useOrgSid": "",
-          "useOrgName": "",
-          "orgSidPath": "",
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "",
-          "taskId": "",
-          "finishTime": "",
-          "totalProfit": "",
-          "asOldparthandleList": [
-
-          ]
-        },
-        hideUploadBtn: false,
-
-        // commodity商品
-        commodityKey: 1,
-        commodityLoading: false,
-        commodityQuery: {
-          current: 1,
-          size: 2,
-          total: 0,
-          params: {
-            name: '',
-            inOrg: "",
-            outOrg: ""
-          }
-        },
-        commodityData: [],
-        imgList: [],
+import req from '@/api/storage/oldPartsCope.js'
+
+export default {
+  data() {
+    return {
+      listLoading: false,
+      submitdisabled: false,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        deptSid: '',
+        deptName: '',
+        createTime: '',
+        billNo: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        totalProfit: '',
+        asOldparthandleList: []
       }
+    }
+  },
+  methods: {
+    indexMethod(index) {
+      return Number(index) + 1
     },
-    created() {},
-    computed: {
-      // 收益总额
-      totalQuantity() {
-        let quantity = 0
-        if (this.formobj.asOldparthandleList.length > 0) {
-          this.formobj.asOldparthandleList.forEach((e) => {
-            quantity += Number(e.profit)
-          })
-        }
-
-        this.formobj.totalProfit = quantity
-
-        return quantity
-      },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        deptSid: '',
+        deptName: '',
+        createTime: '',
+        billNo: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        totalProfit: '',
+        asOldparthandleList: []
+      }
+      this.$emit('doback')
     },
-    methods: {
-
-      indexMethod(index) {
-        return Number(index) + 1
-      },
-
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.imgList = []
-        this.formobj = {
-          "sid": "",
-          "remarks": "",
-          "createBySid": "",
-          "createByName": "",
-          "createDeptSid": "",
-          "createDeptName": "",
-          "createTime": "",
-          "billNo": "",
-          "filePaths": [],
-          "useOrgSid": "",
-          "useOrgName": "",
-          "orgSidPath": "",
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "",
-          "taskId": "",
-          "finishTime": "",
-          "totalProfit": "",
-          "asOldparthandleList": []
+    showEdit(row) {
+      req.init(row.sid).then(resp => {
+        if (resp.success) {
+          this.formobj = resp.data
         }
-        this.$emit('doback')
-      },
-
-      showAdd() {},
-      showEdit(row) {
-        var params = {
-          sid: row.sid
-        }
-
-        req.init(row.sid)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
-
-              for (var i = 0; i < resp.data.filePaths.length; i++) {
-                this.imgList.push({
-                  url: resp.data.filePaths[i].url
-                })
-              }
-
-            }
-          })
-          .catch(e => {
-            this.formobj = {}
-          })
-      },
-
+      }).catch(e => {
+        this.formobj = {}
+      })
     }
   }
+}
 </script>
 <style scoped>
-  .span-sty {
-    width: 130px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
+.span-sty {
+  width: 130px !important;
+}
 
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 120px !important;
-    width: calc(100% - 115px);
-  }
+.addinputInfo {
+  margin-left: 120px !important;
+}
 
-  .first_row {
-    border-top: 1px solid #E0E3EB;
-  }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
 </style>
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
index 8809fdfd38..a41cd71a6b 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
@@ -11,6 +11,8 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
@@ -69,6 +71,9 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
     @Autowired
     private AsBusrepairBillFeign asBusrepairBillFeign;
 
+    @Autowired
+    private WmsWarehouseInfoService wmsWarehouseInfoService;
+
     public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) {
         WmsOldInventoryQuery query = pagerQuery.getParams();
         QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>();
@@ -594,6 +599,7 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailFeign.getOldDetailsByOldGoodsId(wmsBusrepairInventorybillDetailOldApp.getGoodsID()).getData();
             WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode());
             String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOldApp.getGoodsID(), wmsWarehouseRack.getSid());
+            WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseRack.getWarehouseSid());
             if (StringUtils.isNotBlank(kcSid)){
                 WmsUpdateCountQuery wmsUpdateCountQuery = new WmsUpdateCountQuery();
                 wmsUpdateCountQuery.setSid(kcSid);
@@ -619,8 +625,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
                 dto.setManufacturerName(asBusrepairInventorybillDetail.getManufacturerName());
                 dto.setUnit(asBusrepairInventorybillDetail.getUnit());
                 dto.setCount(asBusrepairInventorybillDetail.getCount().toString());
-                dto.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
-                dto.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
+                dto.setWarehouseSid(warehouseInfo.getSid());
+                dto.setWarehouseName(warehouseInfo.getWarehouseName());
                 dto.setWarehouseRackSid(wmsWarehouseRack.getSid());
                 dto.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
                 dto.setFirstInDate(DateUtil.today());
@@ -659,8 +665,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             wmsInventoryRecord.setCurrentCount(asBusrepairInventorybillDetail.getCount());
             wmsInventoryRecord.setUnit(asBusrepairInventorybillDetail.getUnit());
             wmsInventoryRecord.setCount(asBusrepairInventorybillDetail.getCount());
-            wmsInventoryRecord.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
-            wmsInventoryRecord.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
+            wmsInventoryRecord.setWarehouseSid(warehouseInfo.getSid());
+            wmsInventoryRecord.setWarehouseName(warehouseInfo.getWarehouseName());
             wmsInventoryRecord.setWarehouseRackSid(wmsWarehouseRack.getSid());
             wmsInventoryRecord.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(wmsOldGroundConfirm.getCreateBySid()).getData();