代码备份

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) {
@@ -1647,6 +1651,8 @@ export default {
       }
     },
     overdeleteCode() {
+      this.warnVisible = false
+      this.warnResult = "";
       this.labelName = 1
       this.scanStatus = null
       this.scanTip = "扫码录入:"

src/views/collect/IoCreateOrder.vue

@@ -9,7 +9,8 @@
     >
       <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;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"
@@ -1394,7 +1395,6 @@ export default {
       this.errVisible = false
 
 
-
       this.isCodeAlive = false
       this.isBizDetailAlive = false
       this.isCodeDetailAlive = false

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) => {