From 3704e11b86fa50bf9f670de268a18e6de3b5d48a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 03 十二月 2025 09:02:43 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.4' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.3.0.4

---
 src/views/EmploymentManage/EmploymentSignList.vue      |   30 ++++++++++++---
 src/constants/enterpriseEmployee.ts                    |    9 +++-
 src/views/EmploymentManage/EmploymentManageArrange.vue |   27 +++++++++++++
 3 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/src/constants/enterpriseEmployee.ts b/src/constants/enterpriseEmployee.ts
index 1d926ed..9b3808b 100644
--- a/src/constants/enterpriseEmployee.ts
+++ b/src/constants/enterpriseEmployee.ts
@@ -1,9 +1,14 @@
-import { EnumTaskUserHireStatus, EnumTaskUserSignContractStatus,EnumGetArrangeTaskUsersQueryApplyStatus } from './apiEnum';
+import {
+  EnumTaskUserHireStatus,
+  EnumTaskUserSignContractStatus,
+  EnumGetArrangeTaskUsersQueryApplyStatus,
+} from './apiEnum';
 
 export const EnumTaskUserHireStatusText = {
   [EnumTaskUserHireStatus.Wait]: '寰呭綍鐢�',
   [EnumTaskUserHireStatus.Pass]: '宸插綍鐢�',
   [EnumTaskUserHireStatus.Refuse]: '宸茶阿缁�',
+  [EnumTaskUserHireStatus.Cancel]: '宸插彇娑�',
 };
 
 export const EnumTaskUserSignContractStatusTextForFilter = {
@@ -23,4 +28,4 @@
 export const EnumGetArrangeTaskUsersQueryApplyStatusText = {
   [EnumGetArrangeTaskUsersQueryApplyStatus.None]: '鏈姤鍚�',
   [EnumGetArrangeTaskUsersQueryApplyStatus.Completed]: '宸叉姤鍚�',
-}
+};
diff --git a/src/views/EmploymentManage/EmploymentManageArrange.vue b/src/views/EmploymentManage/EmploymentManageArrange.vue
index a89ff48..2973c98 100644
--- a/src/views/EmploymentManage/EmploymentManageArrange.vue
+++ b/src/views/EmploymentManage/EmploymentManageArrange.vue
@@ -75,6 +75,15 @@
         row.arrangeStatus === EnumTaskUserArrangeStatus.Complete,
     },
   },
+  cancelRecruitBtn: {
+    emits: {
+      onClick: (role) => setTaskUserHire(role, EnumTaskUserHireStatus.Cancel),
+    },
+    extraProps: {
+      hide: (row: API.GetArrangeTaskUsersQueryResultItem) =>
+        row.arrangeStatus === EnumTaskUserArrangeStatus.Complete,
+    },
+  },
 };
 
 const { column, operationBtns } = useAccess({
@@ -158,4 +167,22 @@
     }
   } catch (error) {}
 }
+
+async function setTaskUserHire(
+  row: API.GetArrangeTaskUsersQueryResultItem,
+  hireStatus: EnumTaskUserHireStatus
+) {
+  try {
+    await Message.tipMessage(`纭瑕佸彇娑堝綍鐢ㄥ悧锛焋);
+    let params: API.SetTaskUserHireCommand = {
+      id: row.id,
+      hireStatus: hireStatus,
+    };
+    let res = await taskUserServices.setTaskUserHire(params);
+    if (res) {
+      Message.successMessage('鎿嶄綔鎴愬姛');
+      getList(paginationState.pageIndex);
+    }
+  } catch (error) {}
+}
 </script>
diff --git a/src/views/EmploymentManage/EmploymentSignList.vue b/src/views/EmploymentManage/EmploymentSignList.vue
index ce8b10e..6072f08 100644
--- a/src/views/EmploymentManage/EmploymentSignList.vue
+++ b/src/views/EmploymentManage/EmploymentSignList.vue
@@ -65,11 +65,20 @@
   },
   recruitBtn: {
     emits: {
-      onClick: (role) => setTaskUserHire(role.id, EnumTaskUserHireStatus.Pass),
+      onClick: (role) => handleRecruit(role.id, EnumTaskUserHireStatus.Pass),
     },
     extraProps: {
       hide: (row: API.GetTaskUsersQueryResultItem) =>
         row.hireStatus === EnumTaskUserHireStatus.Pass,
+    },
+  },
+  cancelRecruitBtn: {
+    emits: {
+      onClick: (role) => handleCancelRecruit(role.id, EnumTaskUserHireStatus.Cancel),
+    },
+    extraProps: {
+      hide: (row: API.GetTaskUsersQueryResultItem) =>
+        row.hireStatus !== EnumTaskUserHireStatus.Pass,
     },
   },
   refuseBtn: {
@@ -216,13 +225,22 @@
   setTaskUserHire(editForm.id, EnumTaskUserHireStatus.Refuse, editForm.remark);
 }
 
+async function handleRecruit(id: string, hireStatus: EnumTaskUserHireStatus) {
+  try {
+    await Message.tipMessage(`纭瑕佸綍鐢ㄥ悧锛焋);
+    setTaskUserHire(id, hireStatus);
+  } catch (error) {}
+}
+
+async function handleCancelRecruit(id: string, hireStatus: EnumTaskUserHireStatus) {
+  try {
+    await Message.tipMessage(`纭瑕佸彇娑堝綍鐢ㄥ悧锛焋);
+    setTaskUserHire(id, hireStatus);
+  } catch (error) {}
+}
+
 async function setTaskUserHire(id: string, hireStatus: EnumTaskUserHireStatus, remark?: string) {
   try {
-    if (hireStatus === EnumTaskUserHireStatus.Pass) {
-      await Message.tipMessage(
-        `纭瑕�${hireStatus === EnumTaskUserHireStatus.Pass ? '褰曠敤' : '璋㈢粷'}鍚楋紵`
-      );
-    }
     let params: API.SetTaskUserHireCommand = {
       id: id,
       hireStatus: hireStatus,

--
Gitblit v1.9.1