模具 发料完工增加确认框

src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue

@@ -90,7 +90,7 @@
             <div v-if="row.is_send">
 
               {{ $mk.getDateString(row.send_time) }}
-              <a-button @click.stop="pageSend(row,true)" >撤销</a-button>
+              <a-button v-if="!row.is_complete" @click.stop="pageSend(row, true)">撤销</a-button>
             </div>
           </div>
         </template>
@@ -457,6 +457,9 @@ export default {
       return this.$mk.toBigInt(dataId);
     },
     pageComplete(row) {
+
+      this.$mk.confirm('您确定完成吗？').then(type => {
+        if (type == 'confirm') {
           this.$mk.post({
             url: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/reporting`,
             data: {
@@ -469,9 +472,17 @@ export default {
               this.$emit("reloadData");
             }
           });
+        }
+      });
+
+
     },
 
     pageDone(row, isUndo) {
+
+
+      this.$mk.confirm(!isUndo ? '您确定要报工吗？' : '您确定撤销吗？').then(type => {
+        if (type == 'confirm') {
           this.$mk.post({
             url: isUndo ?
               `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/CancelReporting` :
@@ -486,9 +497,16 @@ export default {
               this.$emit("reloadData");
             }
           });
+        }
+      });
+
+
     },
 
     pageSend(row, isUndo) {
+
+      this.$mk.confirm(!isUndo ? '您确定要发料吗？' : '您确定撤销吗？').then(type => {
+        if (type == 'confirm') {
           this.$mk.post({
             url: isUndo ?
               `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/CancelSendMaterial` :
@@ -503,6 +521,10 @@ export default {
               this.$emit("reloadData");
             }
           });
+        }
+      });
+
+
     },
 
     pageAdd(row) {

src/pages/Middle/Mold/Touch/Reporting.vue

@@ -37,9 +37,14 @@
               </div>
               <div class="gx-item-col">
                 <a-button type="primary" @click="pageSend(item)" v-if="item.is_send !== 1">发料</a-button>
+                <a-button @click="pageSend(item, true)" v-else-if="!item.is_complete">撤销发料</a-button>
 
-                <a-button type="primary" @click="pageReport(item)"
+                <a-button style="margin-left: 3px;" type="primary" @click="pageReport(item)"
                   v-if="item.is_send && item.is_complete !== 1">报工</a-button>
+                  
+                <a-button style="margin-left: 3px;"  @click="pageReport(item,true)"
+                  v-if="item.is_complete == 1">撤销报工</a-button>
+
               </div>
             </div>
             <div class="card-item-progress">
@@ -346,6 +351,8 @@ export default {
         this.tableDataOrders = JSON.parse(JSON.stringify(a.data.mold_production_order || []));
 
         this.allDetailsData = JSON.parse(JSON.stringify(a.data.mold_production_order_component_processes || []));
+
+
       }).catch((a) => {
         this.loading = false
         this.$mk.error(a.data.msg);
@@ -477,6 +484,8 @@ export default {
         this.detailsData = [];
 
         
+        //this.detailsData = JSON.parse(JSON.stringify(row.mold_production_order_component_processes || []));
+
       });
     },
 
@@ -547,12 +556,18 @@ export default {
     },
 
 
-    pageReport(item) {
+    pageReport(item, isUndo) {
 
+      this.$mk.confirm(!isUndo ? '您确定要报工吗？' : '您确定撤销吗？').then(type => {
+        if (type == 'confirm') {
 
           this.$mk.post({
-        url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/create`,
+            url: 
-        loading: "报工中...",
+            isUndo ?
+            `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/cancel` :
+            `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/create`,
+
+            loading: "操作中...",
             data: {
               "ptyid": parseInt(process.env.VUE_APP_PTYID),
               "project_token": process.env.VUE_APP_APPTOKEN,
@@ -566,7 +581,7 @@ export default {
           }).then(a => {
             console.log(a)
             if (a.code == 200) {
-          this.$mk.success("报工成功");
+              this.$mk.success("操作成功");
 
               this.loadProductionOrder({ id: this.currentId });
 
@@ -576,13 +591,23 @@ export default {
             }
 
           });
+
+        }
+      });
+
+
     },
-    pageSend(item) {
+    pageSend(item, isUndo) {
 
       console.log(item)
+
+      this.$mk.confirm(!isUndo ? '您确定要发料吗？' : '您确定撤销吗？').then(type => {
+        if (type == 'confirm') {
           this.$mk.post({
-        url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/sendMaterial`,
+            url: isUndo ?
-        loading: "发料中...",
+              `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/cancelSendMaterial` :
+              `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/sendMaterial`,
+            loading: "操作中...",
             data: {
               "ptyid": parseInt(process.env.VUE_APP_PTYID),
               "project_token": process.env.VUE_APP_APPTOKEN,
@@ -596,7 +621,7 @@ export default {
           }).then(a => {
             console.log(a)
             if (a.code == 200) {
-          this.$mk.success("发料成功");
+              this.$mk.success("操作成功");
 
               this.loadProductionOrder({ id: this.currentId });
 
@@ -606,6 +631,10 @@ export default {
             }
 
           });
+        }
+      });
+
+
     },