确认单据

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 开发环境
 # VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://127.0.0.1:9991'
+VUE_APP_BASE_API = 'http://192.168.0.166:9991'
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 
 # 应用访问路径 例如使用前缀 /admin/

src/views/collect/DealOrder.vue

@@ -56,7 +56,7 @@
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
-                @click.native="finishOrder()"
+                @click.native="confirmFinishOrder()"
               >处理完成
               </el-button>
 
@@ -371,6 +371,7 @@ export default {
         busType: null,
         workPlaceCode: null,
         fromCorp: null,
+        confirmFinish: false,
       },
       selectPrescriptionVisible: false,
       corpOrderIdDisabled: false,
@@ -689,25 +690,39 @@ export default {
       });
     },
 
-    finishOrder() {
+    confirmFinishOrder() {
       this.$confirm('是否确定完成此单据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.finishOrder()
+      }).catch(() => {
+      });
+    },
+
+    finishOrder() {
       finishOrder(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
           this.formData = {tagStatus: -1};
           this.curRow = null
+          this.formData.confirmFinish = false;
           this.refreshCodesPanel(this)
+        } else if (res.code == 502) {
+          this.$confirm(res.message, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.formData.confirmFinish = true;
+            this.finishOrder();
+          }).catch(() => {
+          });
         }
       }).catch(() => {
         this.loading = false
       })
-      }).catch(() => {
-      });
-
     },
 
     updateOrder() {
@@ -878,8 +893,6 @@ export default {
     }
 
 
-
-
   }
 
 }