Merge remote-tracking branch 'origin/dev2.5_scan' into dev2.5_scan

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",

src/views/basic/collectPoint/timerSetting.vue

@@ -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="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" style="margin-bottom: 0">
+                <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,
@@ -457,7 +492,12 @@ export default {
         outputMode: 1,
         autoDownloadKey: [],
         autoFinishOrderKey: [],
-        autoUploadOrderKey:[]
+        autoUploadOrderKey: [],
+        delayTageCode: null,
+        conflictScan: null,
+        conflictReturn: null,
+        noCodeScan: null,
+
       },
       systemParam: null,
       socket: null,
@@ -630,5 +670,8 @@ export default {
   padding-bottom: 17px;
   padding-top: 17px;
 }
+.el-col{
+
+}
 
 </style>

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()
       //处理哪个活动的明细子组件