From fa33dc0f574dcbe03cebe6c9b8132a1c78947134 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 14 Mar 2024 15:45:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ApprovalFlow/index.vue         |  4 +-
 src/views/inout/receive/DialogNewReceive.vue  |  7 +-
 src/views/inout/receive/receiveAdd.vue        |  8 +--
 src/views/inout/receive/receiveAudit.vue      | 12 ++--
 .../inout/receive/receiveAuditDetail.vue      | 65 +++++++++++++++----
 src/views/inout/receive/receiveMySearch.vue   |  8 +--
 src/views/inout/receive/receiveSearch.vue     | 40 ++++++++++--
 .../inout/receive/selectReveiceListDialog.vue |  8 +--
 8 files changed, 112 insertions(+), 40 deletions(-)

diff --git a/src/components/ApprovalFlow/index.vue b/src/components/ApprovalFlow/index.vue
index c203d327..7482d7a7 100644
--- a/src/components/ApprovalFlow/index.vue
+++ b/src/components/ApprovalFlow/index.vue
@@ -123,7 +123,7 @@ export default {
         });
     },
     approvalFlowUpdate(row) {
-      if (row.approvalStatus == 2){
+      if (row.approvalStatus == 2 && this.isChang){
         this.approvalFlow.id = row.id
         this.approvalFlowUpdateShow = !this.approvalFlowUpdateShow
       }
@@ -138,7 +138,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.idQuery.approvalFlowId
+      console.log(this.idQuery.approvalFlowId)
       getDetailList(this.idQuery.approvalFlowId)
         .then((response) => {
           this.activities = response.data || [];
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index d5a4b634..1693434b 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -254,9 +254,10 @@ export default {
       deleteLoading: false,
       orderNo: null,
       statusMap: {
-        1: "草稿",
-        2: "未审核",
-        3: "已审核",
+        0: "草稿",
+        1: "未审核",
+        2: "已审核",
+        3: "已拒绝"
       },
       orderEditor: true,
       iCount: 0,
diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
index 3784eefe..9b0812e7 100644
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -417,10 +417,10 @@ export default {
         update: "编辑领用单据",
       },
       statusMap: {
-        1: "草稿",
-        2: "未审核",
-        3: "已审核",
-        4: "已拒绝"
+        0: "草稿",
+        1: "未审核",
+        2: "已审核",
+        3: "已拒绝"
       },
       idQuery: {},
       corpList: [],
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index cc3184df..365c8c76 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -354,6 +354,7 @@
       v-if="newSpDistributionVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
+      :before-close="handleClose"
     >
       <auditDetail
         :closeDialog="closeDialog"
@@ -394,10 +395,10 @@ export default {
         targetInvCode: null,
       },
       statusMap: {
-        1: "草稿",
-        2: "未审核",
-        3: "已审核",
-        4: "已拒绝"
+        0: "草稿",
+        1: "未审核",
+        2: "已审核",
+        3: "已拒绝"
       },
       idQuery: null,
       newSpDistributionVisible: false,
@@ -463,6 +464,9 @@ export default {
   },
 
   methods: {
+    handleClose() {
+      this.closeDialog()
+    },
     onReset() {
       this.$router.push({
         path: "",
diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue
index 9b9b72f7..e851de4a 100644
--- a/src/views/inout/receive/receiveAuditDetail.vue
+++ b/src/views/inout/receive/receiveAuditDetail.vue
@@ -3,20 +3,26 @@
     <el-form :model="formData" ref="dataForm" label-width="100px">
       <el-row type="flex" justify="end">
         <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -5px">
+<!--          <el-button-->
+<!--            type="primary"-->
+<!--            @click.native="saveOrder('3')"-->
+<!--            :loading="loading"-->
+<!--          >审核通过-->
+<!--          </el-button-->
+<!--          >-->
+<!--          <el-button-->
+<!--            type="primary"-->
+<!--            @click.native="saveOrder('4')"-->
+<!--            :loading="loading"-->
+<!--          >审核拒绝-->
+<!--          </el-button-->
+<!--          >-->
           <el-button
             type="primary"
-            @click.native="saveOrder('3')"
-            :loading="loading"
-          >审核通过
-          </el-button
-          >
-          <el-button
-            type="primary"
-            @click.native="saveOrder('4')"
-            :loading="loading"
-          >审核拒绝
-          </el-button
-          >
+            @click.native="showApprovalFlowDetail()"
+          >审核过程
+          </el-button>
+
         </el-button-group>
       </el-row>
       <el-card style="margin-top: -5px;">
@@ -80,10 +86,30 @@
         </el-table>
       </el-card>
     </el-form>
+
+    <el-dialog
+      title="审批详情"
+      :visible.sync="approvalFlowDetailVisible"
+      width="80%"
+      v-if="approvalFlowDetailVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="handleClose"
+    >
+      <approvalFlowDetail
+        :isChang="true"
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+      ></approvalFlowDetail>
+    </el-dialog>
+
+
   </div>
 </template>
 
 <script>
+import approvalFlowDetail from "@/components/ApprovalFlow/index";
 import dialogInvProduct from "../DialogSelectInvProduct";
 import {getAudit, getOrderDetail} from "@/api/inout/receiveOrder";
 
@@ -104,11 +130,14 @@ export default {
       billNo: null,
       createTime: "",
       billType: "",
+      approvalFlowId: ""
     },
     codeArray: [],
   },
   data() {
     return {
+      idQuery: {},
+      approvalFlowDetailVisible: false,
       showSearch: true,
       code: "",
       query: {
@@ -119,9 +148,19 @@ export default {
     };
   },
   components: {
-    dialogInvProduct
+    dialogInvProduct,approvalFlowDetail
   },
   methods: {
+    closeDialog() {
+      this.approvalFlowDetailVisible = false;
+    },
+    handleClose() {
+      this.approvalFlowDetailVisible = false;
+    },
+    showApprovalFlowDetail() {
+      this.idQuery = this.formData
+      this.approvalFlowDetailVisible = true;
+    },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
diff --git a/src/views/inout/receive/receiveMySearch.vue b/src/views/inout/receive/receiveMySearch.vue
index 4e8031e8..e6da7efc 100644
--- a/src/views/inout/receive/receiveMySearch.vue
+++ b/src/views/inout/receive/receiveMySearch.vue
@@ -454,10 +454,10 @@ export default {
         invCode: null
       },
       statusMap: {
-        1: "草稿",
-        2: "未审核",
-        3: "已审核",
-        4: "已拒绝"
+        0: "草稿",
+        1: "未审核",
+        2: "已审核",
+        3: "已拒绝"
       },
       idQuery: {},
       invList: [],
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 0166d0b4..0289806c 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -410,10 +410,29 @@
         :idQuery="idQuery"
       ></auditDetail>
     </el-dialog>
+
+
+    <el-dialog
+      title="审批详情"
+      :visible.sync="approvalFlowDetailVisible"
+      width="80%"
+      v-if="approvalFlowDetailVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="handleClose"
+    >
+      <approvalFlowDetail
+        :isChang="false"
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+      ></approvalFlowDetail>
+    </el-dialog>
+
   </div>
 </template>
 <script>
-
+import approvalFlowDetail from "@/components/ApprovalFlow/index";
 import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
 import auditDetail from "@/views/inout/receive/receiveAuditDetail"
 import {delReceive} from "@/api/thrsys/thrOrderReceive";
@@ -441,15 +460,16 @@ export default {
         targetInvCode: null,
       },
       statusMap: {
-        1: "草稿",
-        2: "未审核",
-        3: "已审核",
-        4: "已拒绝"
+        0: "草稿",
+        1: "未审核",
+        2: "已审核",
+        3: "已拒绝"
       },
       idQuery: null,
       invList: [],
       invCodebe: null,
       newSpDistributionVisible: false,
+      approvalFlowDetailVisible: false,
       total: 0,
       tableHeader:[],
       queryList:[],
@@ -543,6 +563,13 @@ export default {
   },
 
   methods: {
+    handleClose() {
+      this.approvalFlowDetailVisible = false;
+    },
+    showApprovalFlowDetail(_this,row) {
+      _this.idQuery = row
+      _this.approvalFlowDetailVisible = true;
+    },
     onReset() {
       this.$router.push({
         path: "",
@@ -715,6 +742,7 @@ export default {
     },
     closeDialog() {
       this.newSpDistributionVisible = false;
+      this.approvalFlowDetailVisible = false;
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
@@ -727,7 +755,7 @@ export default {
     }
   },
   components: {
-    auditDetail
+    auditDetail,approvalFlowDetail
   },
   mounted() {
   },
diff --git a/src/views/inout/receive/selectReveiceListDialog.vue b/src/views/inout/receive/selectReveiceListDialog.vue
index 057e805f..9d7c24e6 100644
--- a/src/views/inout/receive/selectReveiceListDialog.vue
+++ b/src/views/inout/receive/selectReveiceListDialog.vue
@@ -113,10 +113,10 @@ export default {
       },
       formName: null,
       statusMap: {
-        1: "草稿",
-        2: "未审核",
-        3: "已审核",
-        4: "已拒绝"
+        0: "草稿",
+        1: "未审核",
+        2: "已审核",
+        3: "已拒绝"
       },
       ids: [],
       idQuery: {},