diff --git a/src/views/basic/collectPoint/timerSetting.vue b/src/views/basic/collectPoint/timerSetting.vue
index e787b712..38067e67 100644
--- a/src/views/basic/collectPoint/timerSetting.vue
+++ b/src/views/basic/collectPoint/timerSetting.vue
@@ -4,7 +4,7 @@
       <el-form :model="formData" :rules="formRules" label-width="160px" ref="dataForm">
 
         <el-button-group style="display: flex;margin: 0px 0 10px 90%; ">
-<!--          <el-button type="primary" @click.native="saveTest()">测试货架组件</el-button>-->
+          <!--          <el-button type="primary" @click.native="saveTest()">测试货架组件</el-button>-->
           <el-button type="primary" @click.native="save()">保存</el-button>
         </el-button-group>
 
@@ -165,72 +165,72 @@ export default {
     return {
       num: 1,
       ShelfDisplayFlag: false,
-      shelfData:[
+      shelfData: [
         {
           row: 1,
           height: 50,
           slots: [
-            { id: 1, item: 'Item A1' },
-            { id: 2, item: 'Item A2' },
-            { id: 3, item: 'Item 3' },
-            { id: 4, item: 'Item 4' },
+            {id: 1, item: 'Item A1'},
+            {id: 2, item: 'Item A2'},
+            {id: 3, item: 'Item 3'},
+            {id: 4, item: 'Item 4'},
           ]
         },
         {
           row: 2,
           height: 80,
           slots: [
-            { id: 1, item: 'Item B1' },
-            { id: 2, item: 'Item B2' },
-            { id: 3, item: 'Item 3' },
-            { id: 4, item: 'Item 4' },
-            { id: 5, item: 'Item 3' },
+            {id: 1, item: 'Item B1'},
+            {id: 2, item: 'Item B2'},
+            {id: 3, item: 'Item 3'},
+            {id: 4, item: 'Item 4'},
+            {id: 5, item: 'Item 3'},
           ]
         },
         {
           row: 3,
           height: 80,
           slots: [
-            { id: 1, item: 'Item B1' },
-            { id: 2, item: 'Item B2' },
-            { id: 3, item: 'Item 3' },
-            { id: 4, item: 'Item 4' },
-            { id: 5, item: 'Item 3' },
+            {id: 1, item: 'Item B1'},
+            {id: 2, item: 'Item B2'},
+            {id: 3, item: 'Item 3'},
+            {id: 4, item: 'Item 4'},
+            {id: 5, item: 'Item 3'},
           ]
         },
         {
           row: 6,
           height: 80,
           slots: [
-            { id: 1, item: 'Item B1' },
-            { id: 2, item: 'Item B2' },
-            { id: 3, item: 'Item 3' },
-            { id: 4, item: 'Item 4' },
-            { id: 5, item: 'Item 3' },
-            { id: 5, item: 'Item 3' },
-            { id: 5, item: 'Item 3' },
-            { id: 5, item: 'Item 3' },
-            { id: 5, item: 'Item 3' },
-            { id: 5, item: 'Item 3' },
+            {id: 1, item: 'Item B1'},
+            {id: 2, item: 'Item B2'},
+            {id: 3, item: 'Item 3'},
+            {id: 4, item: 'Item 4'},
+            {id: 5, item: 'Item 3'},
+            {id: 5, item: 'Item 3'},
+            {id: 5, item: 'Item 3'},
+            {id: 5, item: 'Item 3'},
+            {id: 5, item: 'Item 3'},
+            {id: 5, item: 'Item 3'},
           ]
         },
         {
           row: 5,
           height: 200,
           slots: [
-            { id: 1, item: 'Item B1' },
-            { id: 2, item: 'Item B2' },
+            {id: 1, item: 'Item B1'},
+            {id: 2, item: 'Item B2'},
           ]
         },
         {
           row: 4,
           height: 80,
           slots: [
-            { id: 1, item: 'Item B1' },
-            { id: 2, item: 'Item B2' },
-            { id: 3, item: 'Item 3' },
-            { id: 4, item: 'Item 4' },
-            { id: 5, item: 'Item 3' },
+            {id: 1, item: 'Item B1'},
+            {id: 2, item: 'Item B2'},
+            {id: 3, item: 'Item 3'},
+            {id: 4, item: 'Item 4'},
+            {id: 5, item: 'Item 3'},
           ]
         },
       ],
@@ -243,7 +243,7 @@ export default {
 
     }
   },
-  components:{
+  components: {
     ShelfDisplay
   },
   methods: {
@@ -252,14 +252,14 @@ export default {
       console.log('被点击的货位:', slot);
       // 你可以根据需要执行其他操作，例如更新父组件的状态或导航到另一个
     },
-      selectSysParam() {
+    selectSysParam() {
       getSet().then((response) => {
         if (response.code == 20000) {
           this.formData = response.data
         }
       })
     },
-    saveTest(){
+    saveTest() {
       this.ShelfDisplayFlag = true
     },
     save() {
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index d5bba5ba..c7f84d50 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -141,7 +141,7 @@
           </el-col>
           <el-col :span="6">
             <!--            :label="this.formDataVisible.unitTittle + ':'"-->
-            <el-form-item class="query-form-item" label="收货方">
+            <el-form-item class="query-form-item" label="收货方:">
               <el-select v-model="formData.fromCorp"
                          filterable
                          :disabled="formData.billNo"
@@ -468,7 +468,7 @@ export default {
       formDataVisible: {
         scanType: null,
         unitTittle: "往来单位",
-        corpType: 1,
+        corpType: 3,
       },
       curWorkPlaces: [],
       erpList: [],
@@ -631,7 +631,7 @@ export default {
     },
     findFromInvList(val) {
       let cQuery = {
-        corpType: this.formDataVisible.corpType,
+        corpType: 3,
         invCode: this.formData.invCode
       };
       findFromCorp(cQuery)
@@ -829,7 +829,7 @@ export default {
         //todo   拆零扫码确认
         const codeArray = this.filterQuery.code.split(";");
         let query = {
-          orderId: this.formData.billNo,
+          billNo: this.formData.billNo,
           codeList: codeArray
         }
         //更新扫码确认
@@ -839,6 +839,7 @@ export default {
             this.$message.success('确认成功')
             this.result = ''
             this.$refs.inputRef.focus()
+            this.$refs.inputRef.select()
             this.getBizDetailList();
           } else {
             this.$message.error(response.message)
@@ -1048,7 +1049,6 @@ export default {
     },
 
     saveDraftOrder() {
-
       this.$confirm('此操作将挂起当前正在处理单据，是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1308,6 +1308,10 @@ export default {
       if (!this.autoFinishOrderFlag) {
         return
       }
+
+      if (this.formDataVisible.scanType == 1)
+        return;
+
       vailOrderFinish(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
@@ -1422,7 +1426,7 @@ export default {
       let corp = this.fromInvOptions.find(item => item.code === this.formData.fromCorp);
       this.formData.fromCorpName = corp.name
     },
-    changeShipper(){
+    changeShipper() {
       let corp = this.invList.find(item => item.code === this.formData.shipper);
       this.formData.shipperName = corp.name
     },
@@ -1647,6 +1651,8 @@ export default {
       }
     },
     overdeleteCode() {
+      this.warnVisible = false
+      this.warnResult = "";
       this.labelName = 1
       this.scanStatus = null
       this.scanTip = "扫码录入:"
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index e2d22897..6fde9063 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -9,8 +9,9 @@
     >
       <el-card>
         <el-row style="margin-bottom: 8px">
-          <span style="font-size: 18px;font-weight: bold;color: red" v-if="redMesg && this.splitType == 'out'">请先扫取货槽编码</span>
-          <span style="font-size: 18px;font-weight: bold">{{curQueueName }}</span>
+          <span style="font-size: 18px;font-weight: bold;color: red"
+                v-if="redMesg && this.splitType == 'out'">请先扫取货槽编码</span>
+          <span style="font-size: 18px;font-weight: bold">{{ curQueueName }}</span>
           <el-button-group
             style="display: flex; margin-top: 5px; float: right"
           >
@@ -639,7 +640,7 @@ export default {
       redMesg: false,
       redMesgOld: false,
       productName: null,
-      orderStatus:false,//是否调用子组件
+      orderStatus: false,//是否调用子组件
     }
   },
   components: {
@@ -1394,7 +1395,6 @@ export default {
       this.errVisible = false
 
 
-
       this.isCodeAlive = false
       this.isBizDetailAlive = false
       this.isCodeDetailAlive = false
@@ -1425,9 +1425,9 @@ export default {
         this.orderStatus = false
       }
     },
-    getOrderData(orderDetail){
+    getOrderData(orderDetail) {
       this.productName = orderDetail.coName
-      this.curQueueName = "当前取货槽:" + this.productName  + "("  + this.curQueue.code + ")"
+      this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
       this.orderStatus = true
     },
 
@@ -1782,7 +1782,7 @@ export default {
       //   return
       // }
       this.saveLoading = true
-      if (this.orderFormData.billNo != null){
+      if (this.orderFormData.billNo != null) {
         deleteByOrderId(tQuery).then((response) => {
           this.saveLoading = false
           if (response.code === 20000) {
@@ -1796,7 +1796,7 @@ export default {
           this.loading = false
           this.saveLoading = false
         })
-      }else {
+      } else {
         this.successCloseData()
         this.result = ''
         this.$refs.inputRef.focus()
@@ -2041,10 +2041,10 @@ export default {
           if (response.code == 20000) {
             this.curQueue = response.data;
             this.productName = this.curQueue.cpmctymc
-            if (isBlank(this.productName)){
-              this.curQueueName = "当前取货槽:"  + this.curQueue.code
-            }else {
-              this.curQueueName = "当前取货槽:"  + this.productName + "(" + this.curQueue.code + ")"
+            if (isBlank(this.productName)) {
+              this.curQueueName = "当前取货槽:" + this.curQueue.code
+            } else {
+              this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
             }
 
             this.redMesg = false
diff --git a/src/views/collect/IoSplitOperateCode.vue b/src/views/collect/IoSplitOperateCode.vue
index 0c17d451..ff2b21fe 100644
--- a/src/views/collect/IoSplitOperateCode.vue
+++ b/src/views/collect/IoSplitOperateCode.vue
@@ -945,7 +945,7 @@ export default {
     onReset() {
 
       this.filterQuery = {
-        statusType: 'draft',
+        statusType:null,
         busType: null,
         id: "",
         billNo: null,
@@ -1313,10 +1313,10 @@ export default {
       this.filterQuery.statusType = 'split_finish';
     } else if (this.splitType == "out") {
       this.filterQuery.action = 'SC72197936495755';
-      this.filterQuery.statusType = 'scan_code';
+      this.filterQuery.statusType = null;//'scan_code'
     } else if (this.splitType == "return") {
       this.filterQuery.action = 'SC72249388338364';
-      this.filterQuery.statusType = 'scan_code';
+      this.filterQuery.statusType =null;
     }
 
     getHead("IoSplitFinishCode", "1").then((re) => {
diff --git a/src/views/collect/SelectCollectOrderEndDialog.vue b/src/views/collect/SelectCollectOrderEndDialog.vue
index d9cf7a0a..905a3c12 100644
--- a/src/views/collect/SelectCollectOrderEndDialog.vue
+++ b/src/views/collect/SelectCollectOrderEndDialog.vue
@@ -505,7 +505,7 @@ export default {
         key: val,
         page: 1,
         limit: 10,
-        workPlaceClass:1
+        workPlaceClass: 1
       }
       filterWorkOptimize(query)
         .then((response) => {