From 9373e192d80ba82036929de1904f7fadb515bfd5 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 01 九月 2025 16:27:07 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

---
 src/views/FlexJobManage/FlexJobManage.vue |   67 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/views/FlexJobManage/FlexJobManage.vue b/src/views/FlexJobManage/FlexJobManage.vue
index e2d1b49..55741d4 100644
--- a/src/views/FlexJobManage/FlexJobManage.vue
+++ b/src/views/FlexJobManage/FlexJobManage.vue
@@ -129,7 +129,7 @@
 import { FlexJobManageColumns } from './constants';
 import { EnumTaskUserHireStatusText, EnumTaskUserSignContractStatusText } from '@/constants';
 import { Message } from '@bole-core/core';
-import { convertApi2FormUrlOnlyOne, downloadFileByUrl, format, omitByFalse } from '@/utils';
+import { convertApi2FormUrlOnlyOne, downloadFileByUrl, format } from '@/utils';
 import StaffInfoDialog from './components/StaffInfoDialog.vue';
 import BatchImportDialog from './components/BatchImportDialog.vue';
 import SendShotMessageDialog from './components/SendShotMessageDialog.vue';
@@ -187,8 +187,8 @@
     extraProps: {
       hide: (row: API.GetEnterpriseEmployeesQueryResultItem) =>
         !(
-          row.userSignContractStatus === EnumTaskUserSignContractStatus.Wait ||
-          row.userSignContractStatus === EnumTaskUserSignContractStatus.Stop
+          row.userSignContractStatus !== EnumTaskUserSignContractStatus.Pass &&
+          row.hireStatus === EnumTaskUserHireStatus.Pass
         ),
     },
   },
@@ -208,16 +208,16 @@
         ),
     },
   },
-  {
-    data: {
-      enCode: 'delBtn',
-      name: '鍒犻櫎',
-    },
-    props: { type: 'danger' },
-    emits: {
-      onClick: (role) => handleDelete(role),
-    },
-  },
+  // {
+  //   data: {
+  //     enCode: 'delBtn',
+  //     name: '鍒犻櫎',
+  //   },
+  //   props: { type: 'danger' },
+  //   emits: {
+  //     onClick: (role) => handleDelete(role),
+  //   },
+  // },
 ]);
 
 const router = useRouter();
@@ -265,7 +265,7 @@
         enterpriseSignContractStatus: extraParamState.enterpriseSignContractStatus,
       };
 
-      let res = await enterpriseEmployeeServices.getEnterpriseEmployees(omitByFalse(params), {
+      let res = await enterpriseEmployeeServices.getEnterpriseEmployees(params, {
         showLoading: !state.loading,
       });
       return res;
@@ -467,7 +467,7 @@
 } = useFormDialog({
   onConfirm: signContract,
   defaultFormParams: {
-    id: '',
+    ids: [] as string[],
     contractTemplateId: '',
   },
 });
@@ -475,14 +475,13 @@
 function handleInviteSign(row: API.GetEnterpriseEmployeesQueryResultItem) {
   if (row) {
     handleSignEdit({
-      id: row.id,
+      ids: [row.id],
       contractTemplateId: '',
     });
   }
 }
 function handleBatchSign() {
   const selectionRows = getSelectionRows();
-  console.log('selectionRows: ', selectionRows);
   if (selectionRows) {
     const hasSigned = selectionRows?.some(
       (x) =>
@@ -494,14 +493,17 @@
       Message.warnMessage('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愭垨鏈綍鐢ㄤ汉鍛�');
       return;
     }
-    handleSignAdd();
+    handleSignAdd({
+      ids: selectionRows.map((x) => x.id),
+      contractTemplateId: '',
+    });
   }
 }
 
 async function signContract() {
   try {
     let params: API.InviteElectronSignCommand = {
-      id: signEditForm.id,
+      ids: signEditForm.ids,
       contractTemplateId: signEditForm.contractTemplateId,
     };
     let res = await enterpriseEmployeeServices.inviteElectronSign(params);
@@ -521,20 +523,27 @@
   } catch (error) {}
 }
 
-async function handleUnSign(row: API.GetEnterpriseEmployeesQueryResultItem) {
-  try {
-    await Message.tipMessage('纭畾瑙ｇ害鐢ㄦ埛锛�');
-    let res = await enterpriseEmployeeServices.stopElectronSign({ id: row.id });
-    if (res) {
-      Message.successMessage('鎿嶄綔鎴愬姛');
-      getList(paginationState.pageIndex);
-    }
-  } catch (error) {}
+function handleUnSign(row: API.GetEnterpriseEmployeesQueryResultItem) {
+  stopElectronSign([row.id]);
 }
 
 function handleBatchUnSign() {
   try {
-    Message.warnMessage('鍔熻兘寮�鍙戜腑');
+    const selectionRows = getSelectionRows();
+    if (selectionRows) {
+      stopElectronSign(selectionRows.map((x) => x.id));
+    }
+  } catch (error) {}
+}
+
+async function stopElectronSign(ids: string[]) {
+  try {
+    await Message.tipMessage('纭畾瑙ｇ害鐢ㄦ埛锛�');
+    let res = await enterpriseEmployeeServices.stopElectronSign({ ids: ids });
+    if (res) {
+      Message.successMessage('鎿嶄綔鎴愬姛');
+      getList(paginationState.pageIndex);
+    }
   } catch (error) {}
 }
 

--
Gitblit v1.9.1