From fd0e3fd03817d6610c52b09fe27cccf0d3f96438 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 12 八月 2025 16:26:11 +0800
Subject: [PATCH] Merge branch 'dev_ai' of http://114.132.189.42:9002/r/product-inventory-management into ywx

---
 src/views/collaborativeApproval/approvalProcess/index.vue |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 7e51ea4..9630af3 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -11,6 +11,14 @@
             clearable
             :prefix-icon="Search"
         />
+        <span class="search_title ml10">瀹℃壒鐘舵�侊細</span>
+				<el-select v-model="searchForm.approveStatus" clearable @change="handleQuery" style="width: 240px">
+					<el-option label="寰呭鏍�" :value="0" />
+					<el-option label="瀹℃牳涓�" :value="1" />
+					<el-option label="瀹℃牳瀹屾垚" :value="2" />
+					<el-option label="瀹℃牳鏈�氳繃" :value="3" />
+					<el-option label="宸查噸鏂版彁浜�" :value="4" />
+				</el-select>
         <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
         >鎼滅储</el-button
         >
@@ -36,20 +44,26 @@
     </div>
     <info-form-dia ref="infoFormDia" @close="handleQuery"></info-form-dia>
     <approval-dia ref="approvalDia" @close="handleQuery"></approval-dia>
+    <FileList ref="fileListRef" />
   </div>
 </template>
 
 <script setup>
+import FileList from "./fileList.vue";
 import { Search } from "@element-plus/icons-vue";
 import {onMounted, ref} from "vue";
 import {ElMessageBox} from "element-plus";
 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";
+import {approveProcessDelete, approveProcessListPage} from "@/api/collaborativeApproval/approvalProcess.js";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
+
 
 const data = reactive({
   searchForm: {
 		approveId: "",
+		approveStatus: "",
   },
 });
 const { searchForm } = toRefs(data);
@@ -58,6 +72,7 @@
     label: "瀹℃壒鐘舵��",
     prop: "approveStatus",
     dataType: "tag",
+		width: 100,
     formatData: (params) => {
       if (params == 0) {
         return "寰呭鏍�";
@@ -65,6 +80,8 @@
         return "瀹℃牳涓�";
       } else if (params == 2) {
         return "瀹℃牳瀹屾垚";
+      } else if (params == 4) {
+        return "宸查噸鏂版彁浜�";
       } else {
         return '涓嶉�氳繃';
       }
@@ -74,8 +91,10 @@
         return "warning";
       } else if (params == 1) {
         return "primary";
-      }  else if (params == 2) {
+      } else if (params == 2) {
         return "success";
+      } else if (params == 4) {
+        return "";
       } else {
         return 'danger';
       }
@@ -89,6 +108,7 @@
   {
     label: "鐢宠閮ㄩ棬",
     prop: "approveDeptName",
+		width: 220
   },
   {
     label: "瀹℃壒浜嬬敱",
@@ -97,11 +117,13 @@
   },
   {
     label: "鐢宠浜�",
-    prop: "approveUser",
+    prop: "approveUserName",
+    width: 120
   },
   {
     label: "鐢宠鏃ユ湡",
     prop: "approveTime",
+		width: 200
   },
   {
     label: "缁撴潫鏃ユ湡",
@@ -110,7 +132,7 @@
   },
   {
     label: "褰撳墠瀹℃壒浜�",
-    prop: "checkCompany",
+    prop: "approveUserCurrentName",
     width: 120
   },
   {
@@ -118,7 +140,7 @@
     label: "鎿嶄綔",
     align: "center",
     fixed: "right",
-    width: 150,
+    width: 230,
     operation: [
       {
         name: "缂栬緫",
@@ -126,6 +148,7 @@
         clickFun: (row) => {
           openForm("edit", row);
         },
+				disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4
       },
       {
         name: "瀹℃牳",
@@ -133,12 +156,20 @@
         clickFun: (row) => {
           openApprovalDia("approval", row);
         },
+				disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveStatus == 4 || row.approveUserCurrentId !== userStore.id
       },
       {
         name: "璇︽儏",
         type: "text",
         clickFun: (row) => {
           openApprovalDia('view', row);
+        },
+      },
+      {
+        name: "闄勪欢",
+        type: "text",
+        clickFun: (row) => {
+          downLoadFile(row);
         },
       },
     ],
@@ -162,6 +193,11 @@
   page.current = 1;
   getList();
 };
+const fileListRef = ref(null)
+const downLoadFile = (row) => {
+  fileListRef.value.open(row.commonFileList)
+
+}
 const pagination = (obj) => {
   page.current = obj.page;
   page.size = obj.limit;

--
Gitblit v1.9.3