From 513838b72f613b3e985d4a1cab2bd1ecec31f591 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Sat, 16 Sep 2023 09:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=8F=91=E6=96=99=E5=8F=8A?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9A=84=E6=93=8D=E4=BD=9C=20#2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MoldProductionOrder/ComponentDetail.vue   | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
index 5800573..aa55b36 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
@@ -83,20 +83,27 @@
         :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
 
 
-      <vxe-column title="发料" width="160">
+      <vxe-column title="发料" width="210">
         <template #default="{ row }">
           <div v-if="getDataId()">
-            <a-button v-if="!row.is_send" @click.stop="pageSend(row)">发料</a-button>
-            <div v-if="row.is_send">{{ $mk.getDateString(row.send_time) }}</div>
+            <a-button v-if="!row.is_send" @click.stop="pageSend(row)" type="primary">发料</a-button>
+            <div v-if="row.is_send">
+              
+              {{ $mk.getDateString(row.send_time) }}
+              <a-button @click.stop="pageSend(row,true)" >撤销</a-button>
+            </div>
           </div>
         </template>
       </vxe-column>
 
-      <vxe-column title="完成" width="160">
+      <vxe-column title="完成" width="210">
         <template #default="{ row }">
           <div v-if="getDataId()">
-            <a-button v-if="!row.is_complete" @click.stop="pageDone(row)">完成</a-button>
-            <div v-if="row.is_complete">{{ $mk.getDateString(row.complete_time) }}</div>
+            <a-button v-if="!row.is_complete" @click.stop="pageDone(row)" type="primary">完成</a-button>
+            <div v-if="row.is_complete">
+              {{ $mk.getDateString(row.complete_time) }}
+              <a-button @click.stop="pageDone(row,true)" >撤销</a-button>
+            </div>
           </div>
         </template>
       </vxe-column>
@@ -464,9 +471,11 @@ export default {
       });
     },
 
-    pageDone(row) {
+    pageDone(row,isUndo) {
       this.$mk.post({
-        url: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/Reporting`,
+        url: isUndo ? 
+        `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/CancelReporting`:
+        `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/Reporting`,
         data: {
           id: this.$mk.toBigInt( row.id)
         },
@@ -479,9 +488,11 @@ export default {
       });
     },
 
-    pageSend(row) {
+    pageSend(row,isUndo) {
       this.$mk.post({
-        url: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/SendMaterial`,
+        url: isUndo ? 
+        `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/CancelSendMaterial`:
+        `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/component/processes/SendMaterial`,
         data: {
           id:this.$mk.toBigInt( row.id)
         },