1/13 优化1.0

src/views/basic/workplace/freightManage.vue

@@ -143,7 +143,7 @@
           <!--</pagination>-->
         </el-card>
       </div>
-      <div style="width: 340px;height: 340px;margin-bottom: 10px">
+      <div style="width: 360px;height: 340px;margin-bottom: 10px">
         <el-card style="width: 100%;height: 100%">
           <div slot="header" class="clearfix" style="margin-bottom: 10px;">
             <span style="font-weight: 700;">出货槽列表</span>

src/views/collect/IocCollectOrderCheckCode.vue

@@ -330,10 +330,6 @@ export default {
         return
       }
 
-
-
-
-
       this.filterQuery.udiCode = this.scanCode.trim()
       if (this.filterQuery.udiCode.includes(';')) {
         const codeArray = this.filterQuery.udiCode.split(';')

src/views/collect/IocCollectOrderVerify.vue

@@ -251,9 +251,6 @@ export default {
   methods: {
     enterKey() {
       this.errResult = ''
-
-
-
       if (this.scanCode.includes("DMOENTER")) {
         if (this.orderData.billNo == null) {
           this.$message.error('请先选择单据')
@@ -317,15 +314,15 @@ export default {
       this.verifyCode(params)
     },
     enterBillNoKey(billNo) {
-      if (isBlank(billNo)){
-        this.orderQuery.code = billNo
-      }else {
-        this.orderQuery.code = this.scanCode
-      }
+      this.orderQuery.billNo = this.scanCode
       this.orderQuery.workPlaceCode = this.workplaceId
       this.orderQuery.busType = this.busType
       orderFinish(this.orderQuery).then(res => {
         if (res.code == 20000) {
+          if (res.data.list.length == 0){
+            this.scanCode = ""
+            return this.$message.error("单据未处理完成")
+          }
           if (res.data.list[0].checkCodeStatus == 1){
             this.initData()
             return this.$message.error("当前单据已经校验")
@@ -384,8 +381,6 @@ export default {
         if (res.code == 20000) {
           if (Array.isArray(res.data)) {
             this.printCodeResultList(res.data)
-            this.codeQuery.selectType = 1
-            this.getResultDetailList()
             let codeList = res.data
             let filterCodeList = codeList.filter(item => item.status === 5).map(item => item.code)
             if (filterCodeList.length > 0) {
@@ -396,11 +391,11 @@ export default {
           } else {
             this.verifyFinish(1, res.data, res.message)
             this.checkCodeEndList.push(query.code)
-            this.codeQuery.selectType = 1
-            this.getResultDetailList()
             //码不对 全部码
             this.$message.success('校验成功')
           }
+          this.codeQuery.selectType = 1
+          this.getResultDetailList()
         } else if (res.code == 503) {
           this.replaceCode(query, 2)
         } else if (res.code == 504) {
@@ -828,6 +823,7 @@ export default {
     handleScanComplete(fullScanData) {
       console.log("Scan complete:", fullScanData.join(";"));
       if (this.orderData.billNo == null ) {
+        console.log("fullScanData[0]",fullScanData[0])
         this.enterBillNoKey(fullScanData[0])
         return;
       }