From 0763efd91867241c173135916806f41f7f9b177b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 02 十二月 2025 15:33:10 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.4' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.3.0.4
---
apps/underTakeMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/apps/underTakeMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/underTakeMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
index 7bf13b5..96354d7 100644
--- a/apps/underTakeMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
+++ b/apps/underTakeMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
@@ -48,11 +48,25 @@
<nut-button type="primary" @click.stop="checkContract(item)">鏌ョ湅鍚堢害</nut-button>
</template> -->
<nut-button
- v-if="item.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait"
+ v-if="
+ item.userSignContractStatus === EnumTaskUserSignContractStatus.Pass &&
+ item.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait
+ "
type="primary"
@click.stop="goEnterpriseSign(item)"
>绛剧害</nut-button
>
+
+ <nut-button
+ v-if="
+ (item.userSignContractStatus !== EnumTaskUserSignContractStatus.Pass ||
+ !item.userSignContractStatus) &&
+ item.source === EnumEnterpriseEmployeeSource.Internal
+ "
+ type="primary"
+ @click.stop="goFlexJobSign(item)"
+ >閭�璇风绾�</nut-button
+ >
<!-- <nut-button
v-if="item.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait"
type="primary"
@@ -73,6 +87,7 @@
EnumTaskUserHireStatus,
EnumTaskUserSignContractStatus,
EnumPagedListOrder,
+ EnumEnterpriseEmployeeSource,
} from '@12333/constants';
import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee';
import Taro from '@tarojs/taro';
@@ -96,9 +111,9 @@
},
enterpriseSignContractStatus: queryState.enterpriseSignContractStatus,
};
- if (queryState.enterpriseSignContractStatus != EnumTaskUserSignContractStatus.Stop) {
- params.hireStatus = EnumTaskUserHireStatus.Pass;
- }
+ // if (queryState.enterpriseSignContractStatus != EnumTaskUserSignContractStatus.Stop) {
+ // params.hireStatus = EnumTaskUserHireStatus.Pass;
+ // }
return enterpriseEmployeeServices.getEnterpriseEmployees(params, {
showLoading: false,
});
--
Gitblit v1.10.0