From d01af540b961aaaa17f68e70374f78a6695219cc Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 17 十一月 2025 10:25:32 +0800
Subject: [PATCH] fix: bug
---
src/views/FlexJobManage/FlexJobContractManage.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/FlexJobManage/FlexJobContractManage.vue b/src/views/FlexJobManage/FlexJobContractManage.vue
index 5554c52..0aea8c5 100644
--- a/src/views/FlexJobManage/FlexJobContractManage.vue
+++ b/src/views/FlexJobManage/FlexJobContractManage.vue
@@ -23,7 +23,7 @@
</QueryFilterItem>
<QueryFilterItem>
<FieldDatePicker
- v-model="extraParamState.signContractTime"
+ v-model="extraParamState.userSignContractTime"
type="daterange"
range-separator="~"
start-placeholder="璧峰鏃ユ湡"
@@ -162,8 +162,7 @@
hide: (row: API.GetEnterpriseEmployeesQueryResultItem) =>
!(
row.userSignContractStatus === EnumTaskUserSignContractStatus.Pass &&
- row.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait &&
- row.source === EnumEnterpriseEmployeeSource.Internal
+ row.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait
),
},
},
@@ -174,10 +173,8 @@
extraProps: {
hide: (row: API.GetEnterpriseEmployeesQueryResultItem) =>
!(
- row.userSignContractStatus !== EnumTaskUserSignContractStatus.Pass &&
- ((row.hireStatus === EnumTaskUserHireStatus.Pass &&
- row.source === EnumEnterpriseEmployeeSource.External) ||
- row.source === EnumEnterpriseEmployeeSource.Internal)
+ row.source === EnumEnterpriseEmployeeSource.Internal &&
+ row.userSignContractStatus !== EnumTaskUserSignContractStatus.Pass
),
},
},
@@ -357,7 +354,10 @@
try {
const selectionRows = getSelectionRows();
if (selectionRows) {
- if (
+ if (selectionRows.some((x) => x.source === EnumEnterpriseEmployeeSource.External)) {
+ Message.warnMessage('鍕鹃�変汉鍛樹腑鍖呭惈澶栭儴浜哄憳');
+ return;
+ } else if (
selectionRows.some((x) => x.userSignContractStatus === EnumTaskUserSignContractStatus.Pass)
) {
await Message.tipMessage('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愪汉鍛橈紝纭瑕佺户缁彂閫佺煭淇￠�氱煡鍚楋紵');
@@ -415,10 +415,10 @@
(x) =>
x.userSignContractStatus === EnumTaskUserSignContractStatus.Pass ||
x.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Pass ||
- x.hireStatus === EnumTaskUserHireStatus.Wait
+ x.source === EnumEnterpriseEmployeeSource.External
);
if (hasSigned) {
- Message.warnMessage('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愭垨鏈綍鐢ㄤ汉鍛�');
+ Message.warnMessage('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愭垨澶栭儴浜哄憳');
return;
}
handleSignAdd({
--
Gitblit v1.9.1