From c347827bdf71edb46e02f04c3c7df18ac9c60e1b Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 28 八月 2025 17:24:38 +0800 Subject: [PATCH] feat: 签约 --- src/views/FlexJobManage/FlexJobManage.vue | 44 ++++++++++++++++++++++++++++++-------------- src/views/EmploymentManage/components/CheckManageDialog.vue | 11 ++++++++--- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/src/views/EmploymentManage/components/CheckManageDialog.vue b/src/views/EmploymentManage/components/CheckManageDialog.vue index 89d5dfc..7955957 100644 --- a/src/views/EmploymentManage/components/CheckManageDialog.vue +++ b/src/views/EmploymentManage/components/CheckManageDialog.vue @@ -47,21 +47,26 @@ const columns = defineColumns([ { id: '1', + enCode: 'taskTime', + name: '浠诲姟鏃ユ湡', + }, + { + id: '2', enCode: 'createdTime', name: '鎻愪氦鏃堕棿', }, { - id: '2', + id: '3', enCode: 'files', name: '楠屾敹鐓х墖', }, { - id: '3', + id: '4', enCode: 'checkReceiveStatus', name: '楠屾敹鐘舵��', }, { - id: '4', + id: '5', enCode: 'checkReceiveTime', name: '楠屾敹鏃堕棿', }, diff --git a/src/views/FlexJobManage/FlexJobManage.vue b/src/views/FlexJobManage/FlexJobManage.vue index aeb4fc9..13aff9e 100644 --- a/src/views/FlexJobManage/FlexJobManage.vue +++ b/src/views/FlexJobManage/FlexJobManage.vue @@ -163,7 +163,7 @@ { data: { enCode: 'signBtn', - name: '绛剧害', + name: '浼佷笟绛剧害', }, emits: { onClick: (role) => handleSign(role), @@ -173,6 +173,22 @@ !( row.userSignContractStatus === EnumTaskUserSignContractStatus.Pass && row.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait + ), + }, + }, + { + data: { + enCode: 'signBtn', + name: '閭�璇风绾�', + }, + emits: { + onClick: (role) => handleSign(role), + }, + extraProps: { + hide: (row: API.GetEnterpriseEmployeesQueryResultItem) => + !( + row.userSignContractStatus === EnumTaskUserSignContractStatus.Wait || + row.userSignContractStatus === EnumTaskUserSignContractStatus.Refuse ), }, }, @@ -419,17 +435,18 @@ async function handleSendShotMessage() { try { - Message.warnMessage('鍔熻兘寮�鍙戜腑'); - // const selectionRows = getSelectionRows(); - // if (selectionRows) { - // if (selectionRows.some((x) => x.status === 10)) { - // await Message.tipMessage('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愪汉鍛橈紝纭瑕佺户缁彂閫佺煭淇¢�氱煡鍚楋紵'); - // } - // handleShotMessageAdd({ - // ids: selectionRows.map((x) => x.id), - // name: '浜哄憳绛剧害閫氶亾鐭俊', - // }); - // } + const selectionRows = getSelectionRows(); + if (selectionRows) { + if ( + selectionRows.some((x) => x.userSignContractStatus === EnumTaskUserSignContractStatus.Pass) + ) { + await Message.tipMessage('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愪汉鍛橈紝纭瑕佺户缁彂閫佺煭淇¢�氱煡鍚楋紵'); + } + handleShotMessageAdd({ + ids: selectionRows.map((x) => x.id), + name: '浜哄憳绛剧害閫氶亾鐭俊', + }); + } } catch (error) {} } @@ -481,8 +498,7 @@ async function handleUnSign(row: API.GetEnterpriseEmployeesQueryResultItem) { try { - Message.warnMessage('鍔熻兘寮�鍙戜腑'); - // await Message.tipMessage('纭畾瑙g害鐢ㄦ埛锛�'); + await Message.tipMessage('纭畾瑙g害鐢ㄦ埛锛�'); } catch (error) {} } -- Gitblit v1.9.1