diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index e8becf2c..77f59660 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -56,7 +56,7 @@
           </el-col>
         </el-row>
 
-        <el-row style="margin-top: 15px">
+        <el-row style="margin-top: 15px" v-if="this.formDataVisible != null &&  this.formDataVisible.scanType == 1">
           <!--          <el-col :span="6">-->
           <!--            <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">-->
           <!--              <el-select-->
@@ -104,13 +104,29 @@
           <!--              <el-button type="primary" @click="toggleBusType" style="margin-left: 5px">切换业务</el-button>-->
           <!--            </el-form-item>-->
           <!--          </el-col>-->
-
-          <el-col :span="6" v-if="this.formDataVisible != null &&  this.formDataVisible.scanType == 1">
+          <el-col :span="6">
+            <el-form-item prop="locInvCode" label="当前仓库:">
+              <el-select v-model="formData.invCode" placeholder="请选择当前仓库" clearable
+                         disabled
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="query-form-item" :label="this.formDataVisible.unitTittle + ':'">
               <el-select v-model="formData.fromCorp"
                          filterable
                          remote
                          reserve-keyword
+                         @change="changeCorp"
                          placeholder="请选择往来单位" clearable style="width: 90%">
                 <el-option
                   v-for="item in fromInvOptions"
@@ -174,7 +190,7 @@
         </div>
         <el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
           <el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
-          <el-descriptions-item label="往来信息">{{ formData.fromCorp }}</el-descriptions-item>
+          <el-descriptions-item label="往来信息">{{ formData.fromCorpName }}</el-descriptions-item>
           <el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>
           <el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>
           <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
@@ -336,6 +352,7 @@ import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import {getInvListByUser} from "@/api/system/invWarehouse";
 
 export default {
   /**
@@ -425,6 +442,8 @@ export default {
       },
       busTypeList: [],
       busTypeTotal: 0,
+
+      invList: [],
     }
   },
 
@@ -472,26 +491,27 @@ export default {
         if (res.code == 20000) {
           this.busTypeList = res.data.list
           this.busTypeTotal = res.data.total
-
           if (this.formData.billNo != null) {
             this.getBillNo(this.formData.billNo)
             this.startDeal();
           } else {
+            let busType = null;
             if (this.busTypeList.length == 1 && this.$route.query.busType == null) {
-              let busType = this.busTypeList[0]
+              busType = this.busTypeList[0]
               this.formData.busType = this.busTypeList[0].documentTypeCode
               this.selectBusTypeDisabled = false
-              this.formDataVisible = busType
-              if (this.formDataVisible.scanType == 1) {
-                this.findFromInvList("");
-              }
               this.findCurOrder();
             } else {
               this.formData.busType = this.$route.query.busType
               this.findCurOrder();
               this.$refs.inputRef.focus();
+              busType = this.busTypeList.find(item => item.documentTypeCode === this.formData.busType);
+            }
+            this.formDataVisible = busType
+            if (this.formDataVisible.scanType == 1) {
+              this.findFromInvList("");
+              this.getInvList();
             }
-
           }
 
         }
@@ -956,6 +976,23 @@ export default {
       // this.$refs.selectHeadEmpId.blur();
       this.selectBusTypeDisabled = true
     },
+
+
+    getInvList() {
+      let query = {
+        advanceType: 1,
+      }
+      getInvListByUser(query)
+        .then((response) => {
+          this.invList = response.data || []
+        })
+        .catch(() => {
+        })
+    },
+    changeCorp() {
+      let corp = this.fromInvOptions.find(item => item.erpId === this.formData.fromCorp);
+      this.formData.fromCorpName = corp.name
+    },
   },
   mounted() {
     this.$refs.inputRef.focus();
@@ -969,6 +1006,7 @@ export default {
       this.fromList = re.data.fromList;
     });
     this.findCurWorkPlaces();
+
     this.formData.invCode = this.$store.getters.locInvCode;
     if (this.$route.query.billNo != null) {
       this.formData.billNo = this.$route.query.billNo