From fdc8e98b2b8b50ab037ed759489bc5e721298f7c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 17 十一月 2025 09:24:36 +0800
Subject: [PATCH] fix: bug
---
src/views/FlexJobManage/FlexJobContractManage.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/views/FlexJobManage/FlexJobContractManage.vue b/src/views/FlexJobManage/FlexJobContractManage.vue
index 782b98f..ca7df4e 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="璧峰鏃ユ湡"
@@ -78,7 +78,12 @@
type="primary"
>鎵归噺绛剧害</el-button
>
- <!-- <el-button @click="handleEnterpriseBatchSign()" type="primary">鎵归噺浼佷笟绛剧害</el-button> -->
+ <el-button
+ v-if="checkSubModuleItemShow('pageButton', 'batchEnterpriseSignBtn')"
+ @click="handleEnterpriseBatchSign()"
+ type="primary"
+ >鎵归噺浼佷笟绛剧害</el-button
+ >
</template>
</ProTableQueryFilterBar>
<ProTableV2
@@ -157,8 +162,7 @@
hide: (row: API.GetEnterpriseEmployeesQueryResultItem) =>
!(
row.userSignContractStatus === EnumTaskUserSignContractStatus.Pass &&
- row.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait &&
- row.source === EnumEnterpriseEmployeeSource.Internal
+ row.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait
),
},
},
@@ -169,9 +173,8 @@
extraProps: {
hide: (row: API.GetEnterpriseEmployeesQueryResultItem) =>
!(
- row.userSignContractStatus !== EnumTaskUserSignContractStatus.Pass &&
- row.hireStatus === EnumTaskUserHireStatus.Pass &&
- row.source === EnumEnterpriseEmployeeSource.Internal
+ row.source === EnumEnterpriseEmployeeSource.Internal &&
+ row.userSignContractStatus !== EnumTaskUserSignContractStatus.Pass
),
},
},
@@ -352,9 +355,14 @@
const selectionRows = getSelectionRows();
if (selectionRows) {
if (
- selectionRows.some((x) => x.userSignContractStatus === EnumTaskUserSignContractStatus.Pass)
+ selectionRows.some(
+ (x) =>
+ x.source === EnumEnterpriseEmployeeSource.External ||
+ x.userSignContractStatus === EnumTaskUserSignContractStatus.Pass
+ )
) {
- await Message.tipMessage('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愪汉鍛橈紝纭瑕佺户缁彂閫佺煭淇￠�氱煡鍚楋紵');
+ await Message.tipMessage('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愭垨澶栭儴浜哄憳锛岀‘璁よ缁х画鍙戦�佺煭淇￠�氱煡鍚楋紵');
+ return;
}
handleShotMessageAdd({
ids: selectionRows.map((x) => x.id),
@@ -409,10 +417,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