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 | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/FlexJobManage/FlexJobContractManage.vue b/src/views/FlexJobManage/FlexJobContractManage.vue
index 2ae2743..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="璧峰鏃ユ湡"
@@ -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,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
),
},
},
@@ -352,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('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愪汉鍛橈紝纭瑕佺户缁彂閫佺煭淇￠�氱煡鍚楋紵');
@@ -410,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