4/9 优化1.0

src/views/collect/DealOrder.vue

@@ -1037,16 +1037,22 @@ export default {
           }
         } else if (res.code == 502) {
           loading.close();
-          this.$confirm(res.message, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.formData.confirmFinish = true
-            this.finishOrder()
-            this.reset()
-          }).catch(() => {
-          })
+          if (this.formDataVisible.coercionSubmit == 1){
+            this.confirmDialogVisible = false
+            return this.$message.error("单据已经开启强制提交")
+          }else {
+            this.$confirm(res.message, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+                this.formData.confirmFinish = true
+                this.finishOrder()
+                this.reset()
+            }).catch(() => {
+            })
+          }
+
         } else if (res.code == 503) {
           loading.close();
           this.$alert('该单据未全部赋码无法完成,请检查后重试', '提示', {
@@ -1056,11 +1062,7 @@ export default {
           })
         } else {
           loading.close();
-          this.$alert(res.message, '提示', {
-            confirmButtonText: '确定',
-            callback: action => {
-            }
-          })
+          return this.$message.error(res.message)
         }
       }).catch(() => {
         loading.close();
@@ -1673,8 +1675,9 @@ export default {
             this.handleConfirm()
             return
           } else {
-            MessageBox.close()
             this.finishOrder()
+            MessageBox.close()
+
           }