扫码数量超出弹框提示

src/views/collect/DealOrder.vue

@@ -173,14 +173,15 @@
         width="25%"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
+        :custom-class="'compact-dialog'"
         center
       >
-        <div style="text-align: center">
-          <i class="el-icon-warning" style="font-size: 36px; color: #E6A23C; margin-bottom: 12px;"></i>
+        <div style="display: flex; align-items: center; justify-content: center; text-align: center;">
+          <i class="el-icon-warning" style="font-size: 36px; color: #E6A23C; margin-right: 12px;"></i>
           <p style="font-size: 14px; margin: 0;">{{ confirmMessage }}</p>
         </div>
-        <span slot="footer" class="dialog-footer" style="padding: 10px 20px;">
-          <el-button size="small" @click="confirmDialogVisible = false">取消</el-button>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="small" plain @click="confirmDialogVisible = false">取消</el-button>
           <el-button size="small" type="primary" @click="handleConfirm">确定</el-button>
         </span>
       </el-dialog>
@@ -813,18 +814,18 @@ export default {
               this.placeholder = '已选入单据，请扫UDI码进行作业'
               this.getBillNo(this.formData.billNo)
               this.startDeal()
-
             } else {
               this.scanCode = ''
-              this.$alert(response.message, '提示', {
-                confirmButtonText: '确定',
-                type: 'warning',
-                closeOnClickModal: true,
-                callback: (action) => {
-                  this.$refs.inputRef.focus()
-                  this.$refs.inputRef.select()
-                }
-              })
+              this.$message.error(response.message)
+              // this.$alert(response.message, '提示', {
+              //   confirmButtonText: '确定',
+              //   type: 'warning',
+              //   closeOnClickModal: true,
+              //   callback: (action) => {
+              //     this.$refs.inputRef.focus()
+              //     this.$refs.inputRef.select()
+              //   }
+              // })
             }
           }
           this.loading = false
@@ -895,15 +896,16 @@ export default {
 
           } else {
             this.scanCode = ''
-            this.$alert(response.message, '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
-              closeOnClickModal: true,
-              callback: (action) => {
-                this.$refs.inputRef.focus()
-                this.$refs.inputRef.select()
-              }
-            })
+            this.$message.error(response.message)
+            // this.$alert(response.message, '提示', {
+            //   confirmButtonText: '确定',
+            //   type: 'warning',
+            //   closeOnClickModal: true,
+            //   callback: (action) => {
+            //     this.$refs.inputRef.focus()
+            //     this.$refs.inputRef.select()
+            //   }
+            // })
           }
         }
         this.loading = false
@@ -953,8 +955,6 @@ export default {
             this.$refs.inputRef.focus()
             this.$message.error(res.message)
           }
-
-
         }
       }).catch(() => {
         this.loading = false
@@ -1016,7 +1016,6 @@ export default {
 
     finishOrder() {
       // 显示加载状态
-
       finishOrder(this.formData).then(res => {
         const loading = this.$loading({
           lock: true,
@@ -1238,27 +1237,24 @@ export default {
       if (!this.autoFinishOrderFlag) {
         return
       }
-
       if (this.formDataVisible.scanType == 1) {
         return
       }
-
       vailOrderFinish(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
           if (res.data) {
-            this.$confirm('单据已赋码或可自动赋码，是否立即完成单据？', '提示', {
-              confirmButtonText: '立即提交',
-              cancelButtonText: '手动扫码',
-              type: 'warning'
-            }).then(() => {
+            this.confirmMessage = '单据已赋码或可自动赋码，是否立即完成单据？'
+            this.confirmCallback = () => {
               this.finishOrder()
-            }).catch(() => {
+            }
+            this.confirmDialogVisible = true
+            this.$once('hook:beforeDestroy', () => {
               this.autoFinishOrderFlag = false
             })
           }
         } else {
-
+          this.autoFinishOrderFlag = false
         }
       }).catch(() => {
         this.loading = false
@@ -1805,4 +1801,12 @@ export default {
   margin-left: 20px;
   margin-right: 10px;
 }
+
+.no-enter-dialog {
+  pointer-events: auto !important;
+}
+
+.no-enter-dialog .el-message-box__btns .el-button {
+  pointer-events: auto !important;
+}
 </style>