From 90f68df4d0657a900565593bc2c4e0e3ef8cabe0 Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期四, 10 七月 2025 10:08:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/product-inventory-management into dev

---
 src/views/collaborativeApproval/approvalProcess/index.vue |   49 +++++++++++++++++++------------------------------
 1 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 4958ecb..ab98ab8 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -46,6 +46,7 @@
 import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js";
 import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
 import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
+import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";
 
 const data = reactive({
   searchForm: {
@@ -56,53 +57,55 @@
 const tableColumn = ref([
   {
     label: "瀹℃壒鐘舵��",
-    prop: "checkResult",
+    prop: "approveStatus",
     dataType: "tag",
     formatData: (params) => {
       if (params == 0) {
         return "寰呭鏍�";
       } else if (params == 1) {
-        return "宸插畬鎴�";
+        return "瀹℃牳涓�";
       } else if (params == 2) {
-        return "涓嶉�氳繃";
+        return "瀹℃牳瀹屾垚";
       } else {
-        return '瀹℃牳涓�';
+        return '涓嶉�氳繃';
       }
     },
     formatType: (params) => {
-      if (params == '涓嶅悎鏍�') {
-        return "danger";
-      } else if (params == '鍚堟牸') {
+      if (params == 0) {
+        return "warning";
+      } else if (params == 1) {
+        return "primary";
+      }  else if (params == 2) {
         return "success";
       } else {
-        return null;
+        return 'danger';
       }
     },
   },
   {
     label: "娴佺▼缂栧彿",
-    prop: "supplier",
+    prop: "approveId",
     width: 230
   },
   {
     label: "鐢宠閮ㄩ棬",
-    prop: "checkName",
+    prop: "approveDeptName",
   },
   {
     label: "瀹℃壒浜嬬敱",
-    prop: "productName",
+    prop: "approveReason",
   },
   {
     label: "鐢宠浜�",
-    prop: "model",
+    prop: "approveUser",
   },
   {
     label: "鐢宠鏃ユ湡",
-    prop: "unit",
+    prop: "approveTime",
   },
   {
     label: "缁撴潫鏃ユ湡",
-    prop: "quantity",
+    prop: "approveOverTime",
     width: 120
   },
   {
@@ -166,7 +169,7 @@
 };
 const getList = () => {
   tableLoading.value = true;
-  qualityInspectListPage({...page, ...searchForm.value, inspectType: 0}).then(res => {
+  approveProcessListPage({...page, ...searchForm.value,}).then(res => {
     tableLoading.value = false;
     tableData.value = res.data.records
     page.total = res.data.total;
@@ -207,24 +210,10 @@
     type: "warning",
   })
       .then(() => {
-        qualityInspectDel(ids).then((res) => {
+        approveProcessDelete(ids).then((res) => {
           proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
           getList();
         });
-      })
-      .catch(() => {
-        proxy.$modal.msg("宸插彇娑�");
-      });
-};
-// 瀵煎嚭
-const handleOut = () => {
-  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
-    confirmButtonText: "纭",
-    cancelButtonText: "鍙栨秷",
-    type: "warning",
-  })
-      .then(() => {
-        proxy.download("/quality/qualityInspect/export", {inspectType: 0}, "鍘熸潗鏂欐楠�.xlsx");
       })
       .catch(() => {
         proxy.$modal.msg("宸插彇娑�");

--
Gitblit v1.9.3