src/api/collect/splitCreateOrder.js

@@ -81,6 +81,7 @@ export function updateOrder(query) {
 }
 
 
+
 export function checkCollectOrderManCode(query) {
   return axios({
     url: "/udiwms/basic/collect/IoCollectOrderCodeMan/checkCode",

src/views/basic/collectPoint/timerSetting.vue

@@ -229,42 +229,8 @@
               <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" >
+                <el-form-item label="网页扫码数量设置:" prop="scanMaxCount" style="margin-bottom: 0">
                   <el-input
                     style="width: 90%"
                     size="small"
@@ -275,7 +241,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" class="el-col">
-                <el-form-item label="PAD扫码数量设置:" prop="pdaMaxCount" >
+                <el-form-item label="PAD扫码数量设置:" prop="pdaMaxCount" style="margin-bottom: 0">
                   <el-input
                     style="width: 90%"
                     size="small"
@@ -286,7 +252,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" class="el-col">
-                <el-form-item label="工控扫码数量设置:" prop="ipcMaxCount" >
+                <el-form-item label="工控扫码数量设置:" prop="ipcMaxCount" style="margin-bottom: 0">
                   <el-input
                     style="width: 90%"
                     size="small"
@@ -296,8 +262,6 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
-
-
             </el-row>
             <!--<el-row :gutter="20" style="margin-top: 20px">-->
             <!--  <el-col :span="8" class="el-col">-->
@@ -409,7 +373,8 @@ export default {
     return {
       num: 1,
       ShelfDisplayFlag: false,
-      busTypeOptions: [],
+      busTypeOptions: [
+      ],
       shelfData: [
         {
           row: 1,
@@ -492,12 +457,7 @@ export default {
         outputMode: 1,
         autoDownloadKey:[],
         autoFinishOrderKey:[],
-        autoUploadOrderKey: [],
+        autoUploadOrderKey:[]
-        delayTageCode: null,
-        conflictScan: null,
-        conflictReturn: null,
-        noCodeScan: null,
-
       },
       systemParam: null,
       socket: null,
@@ -670,8 +630,5 @@ export default {
   padding-bottom: 17px;
   padding-top: 17px;
 }
-.el-col{
-
-}
 
 </style>

src/views/collect/DealOrder.vue

@@ -710,7 +710,6 @@ 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)
@@ -1056,11 +1055,7 @@ export default {
           })
         } else {
           loading.close();
-          this.$alert(res.message, '提示', {
+          this.$message.error(res.message)
-            confirmButtonText: '确定',
-            callback: action => {
-            }
-          })
         }
       }).catch(() => {
         loading.close();
@@ -1137,7 +1132,7 @@ export default {
     },
 
     startDeal() {
-      this.autoFinishOrderFlag = false
+      this.autoFinishOrderFlag = true
       this.curRow = this.formData
       this.dealSplitOrder()
       //处理哪个活动的明细子组件