diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index c465bfb3..29276801 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -15,13 +15,13 @@
             <el-button-group>
               <el-button
                 type="primary"
-                :disabled="formData.billNo"
+                :disabled="formData.billNo  || (this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"
                 @click.native="nextCollectOrder()"
               >下一单
               </el-button>
               <el-button
                 type="primary"
-                :disabled="formData.billNo"
+                :disabled="formData.billNo ||(this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"
                 @click.native="selectPrescribe()"
               >选单
               </el-button>
@@ -113,8 +113,8 @@
           <!--          </el-col>-->
           <el-col :span="6">
             <el-form-item prop="locInvCode" label="发货方:">
-              <el-select v-model="formData.invCode" placeholder="请选择发货方" clearable
-                         disabled
+              <el-select v-model="formData.shipper" placeholder="请选择发货方" clearable
+                         :disabled="formData.billNo"
                          style="width: 90%"
               >
                 <el-option
@@ -132,6 +132,7 @@
             <el-form-item class="query-form-item" label="收货方">
               <el-select v-model="formData.fromCorp"
                          filterable
+                         :disabled="formData.billNo"
                          remote
                          reserve-keyword
                          @change="changeCorp"
@@ -178,9 +179,9 @@
                   style="margin-left: 15px"
                 >
                 </el-button>
-
+                <!-- :disabled="!formData.billNo ||  (this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"-->
                 <el-button type="primary"
-                           :disabled="!formData.billNo" @click="addGs">ALT+29
+                           @click="addGs">ALT+29
                 </el-button>
                 <el-button
                   type="primary"
@@ -664,12 +665,11 @@ export default {
 
     getInputFocus(event) {
       event.currentTarget.select();
-      ``
     },
 
 
     enterKey() {
-      if (this.formData.billNo == null) {
+      if (this.formData.billNo == null && (this.formDataVisible === null || this.formDataVisible.scanType != 1)) {
         this.enterBillNoKey()
         return;
       }
@@ -851,6 +851,8 @@ export default {
       let tagQuery = {
         workPlaceCode: this.formData.workPlaceCode,
         fromCorp: this.formData.fromCorp,
+        fromCorpName: this.formData.fromCorpName,
+        shipper: this.formData.invCode,
         billNo: this.formData.billNo,
         code: this.filterQuery.code.trim(),
         insert: this.formData.insert,
@@ -1219,7 +1221,7 @@ export default {
         })
     },
     changeCorp() {
-      let corp = this.fromInvOptions.find(item => item.erpId === this.formData.fromCorp);
+      let corp = this.fromInvOptions.find(item => item.code === this.formData.fromCorp);
       this.formData.fromCorpName = corp.name
     },
     //处理事件
@@ -1257,6 +1259,8 @@ export default {
               billNo: this.formData.billNo,
               insert: this.formData.insert,
               busType: this.formData.busType,
+              fromCorpName: this.formData.fromCorpName,
+              invCode: this.formData.invCode,
             }
             orderbatchAddCode(params2).then((res) => {
               if (res.code === 20000) {