From 431c0d52116837d798d68c6a8c68c81e21526066 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 12 七月 2025 14:55:13 +0800
Subject: [PATCH] 1.新增入职合同开始结束时间做限制（合同起始时间匹配合同年限）

---
 src/views/collaborativeApproval/approvalProcess/index.vue |   73 +++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 4958ecb..c2b4fc8 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -2,11 +2,11 @@
   <div class="app-container">
     <div class="search_form">
       <div>
-        <span class="search_title">渚涘簲鍟嗭細</span>
+        <span class="search_title">娴佺▼缂栧彿锛�</span>
         <el-input
-            v-model="searchForm.supplier"
+            v-model="searchForm.approveId"
             style="width: 240px"
-            placeholder="璇疯緭鍏ヤ緵搴斿晢鎼滅储"
+            placeholder="璇疯緭鍏ユ祦绋嬬紪鍙锋悳绱�"
             @change="handleQuery"
             clearable
             :prefix-icon="Search"
@@ -43,71 +43,80 @@
 import { Search } from "@element-plus/icons-vue";
 import {onMounted, ref} from "vue";
 import {ElMessageBox} from "element-plus";
-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";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
+
 
 const data = reactive({
   searchForm: {
-    supplier: "",
+		approveId: "",
   },
 });
 const { searchForm } = toRefs(data);
 const tableColumn = ref([
   {
     label: "瀹℃壒鐘舵��",
-    prop: "checkResult",
+    prop: "approveStatus",
     dataType: "tag",
+		width: 100,
     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",
-    width: 230
+    prop: "approveId",
+    width: 170
   },
   {
     label: "鐢宠閮ㄩ棬",
-    prop: "checkName",
+    prop: "approveDeptName",
+		width: 220
   },
   {
     label: "瀹℃壒浜嬬敱",
-    prop: "productName",
+    prop: "approveReason",
+		width: 200
   },
   {
     label: "鐢宠浜�",
-    prop: "model",
+    prop: "approveUserName",
   },
   {
     label: "鐢宠鏃ユ湡",
-    prop: "unit",
+    prop: "approveTime",
+		width: 120
   },
   {
     label: "缁撴潫鏃ユ湡",
-    prop: "quantity",
+    prop: "approveOverTime",
     width: 120
   },
   {
     label: "褰撳墠瀹℃壒浜�",
-    prop: "checkCompany",
+    prop: "approveUserCurrentName",
     width: 120
   },
   {
@@ -123,6 +132,7 @@
         clickFun: (row) => {
           openForm("edit", row);
         },
+				disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1
       },
       {
         name: "瀹℃牳",
@@ -130,6 +140,7 @@
         clickFun: (row) => {
           openApprovalDia("approval", row);
         },
+				disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveUserCurrentId !== userStore.id
       },
       {
         name: "璇︽儏",
@@ -166,7 +177,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;
@@ -196,7 +207,7 @@
 const handleDelete = () => {
   let ids = [];
   if (selectedRows.value.length > 0) {
-    ids = selectedRows.value.map((item) => item.id);
+    ids = selectedRows.value.map((item) => item.approveId);
   } else {
     proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
     return;
@@ -207,24 +218,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