From b626d79c65da6f5e269fdc2af9c71dcd1823bac1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 03 九月 2025 15:08:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
index 38af6bf..ccbb0d1 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
@@ -10,7 +10,7 @@
></MineAgreementSignDetailItem>
<MineAgreementSignDetailItem
label="鍗忚鐘舵��"
- :detail="EnumTaskUserSignContractStatusText[detail?.userSignContractStatus]"
+ :detail="EnumTaskUserSignContractStatusSignText[detail?.userSignContractStatus]"
></MineAgreementSignDetailItem>
</template>
</MineAgreementSignDetailCard>
@@ -73,19 +73,23 @@
import MineAgreementSignDetailItem from './MineAgreementSignDetailItem.vue';
import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee';
import {
+ EnumElectronSignAccess,
EnumTaskUserSignContractStatus,
- EnumTaskUserSignContractStatusText,
+ EnumTaskUserSignContractStatusSignText,
} from '@12333/constants';
-import { format } from '@12333/utils';
+import { format, hiddenPhone, Message, setOSSLink, openDocument } from '@12333/utils';
import Taro from '@tarojs/taro';
defineOptions({
name: 'InnerPage',
});
+const { userDetail } = useUser();
const router = Taro.useRouter();
+const launchOption = useLaunchOptions();
+//鐏靛伐Id
const id = router.params?.id;
-const code = router.params?.code;
+const code = launchOption?.query?.scene || router.params?.code;
const {
isLoading,
@@ -93,7 +97,7 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['enterpriseEmployeeServices/getTaskInfo', id, code],
+ queryKey: ['enterpriseEmployeeServices/getPersonalUserElectronSign', id, code],
queryFn: async () => {
return await enterpriseEmployeeServices.getPersonalUserElectronSign(
{ id: id, code: code },
@@ -109,13 +113,46 @@
});
function checkAgreement() {
- const encodedUrl = encodeURIComponent(detail?.value?.contractUrl);
- Taro.navigateTo({
- url: `${RouterPath.mineAgreementSignDetail}?url=${encodedUrl}`,
- });
+ if (detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Wait) {
+ goToSign();
+ }
+ if (
+ detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Stop ||
+ detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Pass
+ ) {
+ if (!detail?.value?.contractUrl) {
+ Message.warning('鍗忚鏃犳硶鏌ョ湅锛岃绋嶅悗鍐嶈瘯');
+ return;
+ }
+ openDocument(setOSSLink(detail?.value?.contractUrl));
+ }
}
-const goToSign = useAccessReal(() => {});
+const goToSign = useAccessReal(async () => {
+ try {
+ // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.BestSign) {
+ let params: API.PersonalUserElectronSignCommand = {
+ id: detail.value?.id,
+ };
+ let res = await enterpriseEmployeeServices.personalUserElectronSign(params);
+ if (res) {
+ const encodedUrl = encodeURIComponent(res.signContractLongUrl);
+ Taro.navigateTo({ url: `${RouterPath.extraPage}?url=${encodedUrl}` });
+ }
+ // }
+ // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.AlipaySign) {
+ // Message.confirm({
+ // message: `绛剧害鐭俊宸插彂閫佽嚦鎮�${hiddenPhone(
+ // detail.value?.contactPhoneNumber
+ // )}鐨勬墜鏈猴紝璇峰強鏃舵煡鐪嬪苟绛剧害`,
+ // showCancelBtn: false,
+ // });
+ // }
+ } catch (error) {}
+});
+Taro.useDidShow(() => {
+ refetch();
+});
</script>
<style lang="scss">
--
Gitblit v1.9.1