diff --git a/src/api/collect/splitCreateOrder.js b/src/api/collect/splitCreateOrder.js
index a623dabe..eb6f15ea 100644
--- a/src/api/collect/splitCreateOrder.js
+++ b/src/api/collect/splitCreateOrder.js
@@ -81,7 +81,6 @@ export function updateOrder(query) {
 }
 
 
-
 export function checkCollectOrderManCode(query) {
   return axios({
     url: "/udiwms/basic/collect/IoCollectOrderCodeMan/checkCode",
diff --git a/src/views/basic/collectPoint/timerSetting.vue b/src/views/basic/collectPoint/timerSetting.vue
index eb1d5087..a7ca7e76 100644
--- a/src/views/basic/collectPoint/timerSetting.vue
+++ b/src/views/basic/collectPoint/timerSetting.vue
@@ -38,25 +38,25 @@
               </el-col>
 
             </el-row>
-<!--            <el-row :gutter="20">-->
-              <el-col :span="20" class="el-col">
-                <el-form-item label="适用业务单据类型:" prop="autoDownloadKey" label-width="160px">
-                  <el-select
-                    v-model="formData.autoDownloadKey"
-                    multiple
-                    placeholder="请选择适用业务单据类型"
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="item in busTypeOptions"
-                      :key="item.documentTypeCode"
-                      :label="item.busName"
-                      :value="item.documentTypeCode"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-<!--            </el-row>-->
+            <!--            <el-row :gutter="20">-->
+            <el-col :span="20" class="el-col">
+              <el-form-item label="适用业务单据类型:" prop="autoDownloadKey" label-width="160px">
+                <el-select
+                  v-model="formData.autoDownloadKey"
+                  multiple
+                  placeholder="请选择适用业务单据类型"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in busTypeOptions"
+                    :key="item.documentTypeCode"
+                    :label="item.busName"
+                    :value="item.documentTypeCode"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!--            </el-row>-->
           </el-collapse-item>
           <el-collapse-item name="1">
             <template slot="title">
@@ -80,7 +80,7 @@
             </template>
             <el-row :gutter="20">
               <el-col :span="8" class="el-col">
-                <el-form-item label="待处理单据自动分配:" prop="autoAllotOrder" >
+                <el-form-item label="待处理单据自动分配:" prop="autoAllotOrder">
                   <el-radio-group v-model="formData.autoAllotOrder">
                     <el-radio :label="true">是</el-radio>
                     <el-radio :label="false">否</el-radio>
@@ -88,7 +88,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" class="el-col">
-                <el-form-item label="单据自动完成:" prop="autoFinishOrder" >
+                <el-form-item label="单据自动完成:" prop="autoFinishOrder">
                   <el-radio-group v-model="formData.autoFinishOrder">
                     <el-radio :label="true">是</el-radio>
                     <el-radio :label="false">否</el-radio>
@@ -96,7 +96,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" class="el-col">
-                <el-form-item label="寄售预验收扫码校验:" prop="autoFinishOrder" >
+                <el-form-item label="寄售预验收扫码校验:" prop="autoFinishOrder">
                   <el-radio-group v-model="formData.isScanCodeCheck">
                     <el-radio :label="true">是</el-radio>
                     <el-radio :label="false">否</el-radio>
@@ -104,25 +104,25 @@
                 </el-form-item>
               </el-col>
             </el-row>
-<!--            <el-row :gutter="20">-->
-              <el-col :span="20" class="el-col">
-                <el-form-item label="适用业务单据类型:" prop="autoFinishOrderKey" label-width="160px">
-                  <el-select
-                    v-model="formData.autoFinishOrderKey"
-                    multiple
-                    placeholder="请选择适用业务单据类型"
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="item in busTypeOptions"
-                      :key="item.documentTypeCode"
-                      :label="item.busName"
-                      :value="item.documentTypeCode"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-<!--            </el-row>-->
+            <!--            <el-row :gutter="20">-->
+            <el-col :span="20" class="el-col">
+              <el-form-item label="适用业务单据类型:" prop="autoFinishOrderKey" label-width="160px">
+                <el-select
+                  v-model="formData.autoFinishOrderKey"
+                  multiple
+                  placeholder="请选择适用业务单据类型"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in busTypeOptions"
+                    :key="item.documentTypeCode"
+                    :label="item.busName"
+                    :value="item.documentTypeCode"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!--            </el-row>-->
           </el-collapse-item>
           <el-collapse-item name="3">
             <template slot="title">
@@ -161,25 +161,25 @@
               </el-col>
             </el-row>
 
-<!--            <el-row :gutter="20">-->
-              <el-col :span="20" class="el-col">
-                <el-form-item label="适用业务单据类型:" prop="autoUploadOrderKey" label-width="160px">
-                  <el-select
-                    v-model="formData.autoUploadOrderKey"
-                    multiple
-                    placeholder="请选择适用业务单据类型"
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="item in busTypeOptions"
-                      :key="item.documentTypeCode"
-                      :label="item.busName"
-                      :value="item.documentTypeCode"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-<!--            </el-row>-->
+            <!--            <el-row :gutter="20">-->
+            <el-col :span="20" class="el-col">
+              <el-form-item label="适用业务单据类型:" prop="autoUploadOrderKey" label-width="160px">
+                <el-select
+                  v-model="formData.autoUploadOrderKey"
+                  multiple
+                  placeholder="请选择适用业务单据类型"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in busTypeOptions"
+                    :key="item.documentTypeCode"
+                    :label="item.busName"
+                    :value="item.documentTypeCode"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!--            </el-row>-->
 
           </el-collapse-item>
           <el-collapse-item name="3">
@@ -229,8 +229,42 @@
               <p class="form-title">扫码设置</p>
             </template>
             <el-row :gutter="20">
+
+              <el-col :span="8" class="el-col">
+                <el-form-item label="启用后置赋码:" prop="delayTageCode" >
+                  <el-radio-group v-model="formData.delayTageCode">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" class="el-col">
+                <el-form-item label="启用扫码冲突替换:" prop="conflictScan" >
+                  <el-radio-group v-model="formData.conflictScan">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" class="el-col">
+                <el-form-item label="启用退货冲突替换:" prop="conflictReturn" >
+                  <el-radio-group v-model="formData.conflictReturn">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
               <el-col :span="8" class="el-col">
-                <el-form-item label="网页扫码数量设置:" prop="scanMaxCount" style="margin-bottom: 0">
+                <el-form-item label="无码类型是否允许上货 :" prop="noCodeScan" >
+                  <el-radio-group v-model="formData.noCodeScan">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8" class="el-col">
+                <el-form-item label="网页扫码数量设置:" prop="scanMaxCount" >
                   <el-input
                     style="width: 90%"
                     size="small"
@@ -241,7 +275,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" class="el-col">
-                <el-form-item label="PAD扫码数量设置:" prop="pdaMaxCount" style="margin-bottom: 0">
+                <el-form-item label="PAD扫码数量设置:" prop="pdaMaxCount" >
                   <el-input
                     style="width: 90%"
                     size="small"
@@ -252,7 +286,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" class="el-col">
-                <el-form-item label="工控扫码数量设置:" prop="ipcMaxCount" style="margin-bottom: 0">
+                <el-form-item label="工控扫码数量设置:" prop="ipcMaxCount" >
                   <el-input
                     style="width: 90%"
                     size="small"
@@ -262,6 +296,8 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
+
+
             </el-row>
             <!--<el-row :gutter="20" style="margin-top: 20px">-->
             <!--  <el-col :span="8" class="el-col">-->
@@ -373,8 +409,7 @@ export default {
     return {
       num: 1,
       ShelfDisplayFlag: false,
-      busTypeOptions: [
-      ],
+      busTypeOptions: [],
       shelfData: [
         {
           row: 1,
@@ -455,9 +490,14 @@ export default {
         ipcMaxCount: null,
         autoDecode: 1,
         outputMode: 1,
-        autoDownloadKey:[],
-        autoFinishOrderKey:[],
-        autoUploadOrderKey:[]
+        autoDownloadKey: [],
+        autoFinishOrderKey: [],
+        autoUploadOrderKey: [],
+        delayTageCode: null,
+        conflictScan: null,
+        conflictReturn: null,
+        noCodeScan: null,
+
       },
       systemParam: null,
       socket: null,
@@ -469,10 +509,10 @@ export default {
   },
   methods: {
     getWorkBindBusTypes() {
-      getWorkBindBusTypes({page:1,limit:500}).then(res => {
+      getWorkBindBusTypes({page: 1, limit: 500}).then(res => {
         if (res.code == 20000) {
-            this.busTypeOptions = res.data.list || []
-          }
+          this.busTypeOptions = res.data.list || []
+        }
       })
     },
     handleInput() {
@@ -521,7 +561,7 @@ export default {
         .then((response) => {
           if (response.code != 20000) {
             this.$message.error(response.message);
-          } else{
+          } else {
             this.selectSysParam()
             this.$message.success("操作成功");
           }
@@ -630,5 +670,8 @@ export default {
   padding-bottom: 17px;
   padding-top: 17px;
 }
+.el-col{
+
+}
 
 </style>
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index cda9ac6e..97085a95 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -710,6 +710,7 @@ export default {
 
       this.checkSuccess = true
       this.filterQuery.code = this.scanCode.trim()
+      this.scanCode = '';
       if (this.filterQuery.code.includes(';')) {
         const codeArray = this.filterQuery.code.split(';')
         const verify = this.verifyScanCount(codeArray)
@@ -1055,7 +1056,11 @@ export default {
           })
         } else {
           loading.close();
-          this.$message.error(res.message)
+          this.$alert(res.message, '提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+            }
+          })
         }
       }).catch(() => {
         loading.close();
@@ -1132,7 +1137,7 @@ export default {
     },
 
     startDeal() {
-      this.autoFinishOrderFlag = true
+      this.autoFinishOrderFlag = false
       this.curRow = this.formData
       this.dealSplitOrder()
       //处理哪个活动的明细子组件