From 8550c7090368487be0a9f13ff5ff955b1ae9d028 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 11 十一月 2025 16:45:11 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.2' of http://120.26.58.240:8888/r/flexJobUndertake into dev-1.3.0.2
---
src/views/FlexJobManage/components/StaffInfoDialog.vue | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/src/views/FlexJobManage/components/StaffInfoDialog.vue b/src/views/FlexJobManage/components/StaffInfoDialog.vue
index 0dd52d5..c9024f8 100644
--- a/src/views/FlexJobManage/components/StaffInfoDialog.vue
+++ b/src/views/FlexJobManage/components/StaffInfoDialog.vue
@@ -15,8 +15,13 @@
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="12">
- <ProFormItemV2 v-if="form.isDetail" label="鎶ュ悕鏃堕棿锛�" prop="regiterTime">
- <div>{{ format(form.regiterTime, 'YYYY-MM-DD HH:mm') }}</div>
+ <ProFormItemV2 label="鏈嶅姟鍗忚锛�" prop="contractUrl">
+ <ProFormUpload
+ v-model:file-url="form.contractUrl"
+ :limit="1"
+ :limitFileSize="10"
+ accept="jpg/jpeg,png,pdf"
+ ></ProFormUpload>
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="12">
@@ -33,8 +38,18 @@
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="12">
- <ProFormItemV2 v-if="form.isDetail" label="瀹炲悕鏃堕棿锛�" prop="userRealTime">
- <div>{{ format(form.userRealTime, 'YYYY-MM-DD HH:mm') }}</div>
+ <ProFormItemV2
+ label="鍗忚鏃堕棿:"
+ prop="regiterTime"
+ :check-rules="[{ message: '璇烽�夋嫨鍗忚鏃堕棿', type: 'array' }]"
+ >
+ <ProFormDatePicker
+ v-model="form.regiterTime"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="璧峰鏃ユ湡"
+ end-placeholder="缁堟鏃ユ湡"
+ ></ProFormDatePicker>
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="12">
@@ -49,11 +64,7 @@
></ProFormText>
</ProFormItemV2>
</ProFormColItem>
- <ProFormColItem :span="12">
- <ProFormItemV2 v-if="form.isDetail" label="绛剧害鏃堕棿锛�" prop="userSignContractTime">
- <div>{{ format(form.userSignContractTime, 'YYYY-MM-DD HH:mm') }}</div>
- </ProFormItemV2>
- </ProFormColItem>
+ <ProFormColItem :span="12"> </ProFormColItem>
<ProFormColItem :span="12">
<ProFormItemV2
label="鎬у埆锛�"
@@ -68,16 +79,7 @@
></ProFormRadio>
</ProFormItemV2>
</ProFormColItem>
- <ProFormColItem :span="12">
- <ProFormItemV2 v-if="form.isDetail" label="鐢靛瓙鍚堝悓锛�" prop="contractUrl">
- <ProFormUpload
- v-model:file-url="form.contractUrl"
- :limit="1"
- :limitFileSize="10"
- accept="jpg/jpeg,png,pdf"
- ></ProFormUpload>
- </ProFormItemV2>
- </ProFormColItem>
+ <ProFormColItem :span="12"> </ProFormColItem>
<ProFormColItem :span="12">
<ProFormItemV2
label="骞撮緞锛�"
@@ -90,12 +92,8 @@
:min="0"
:max="9999"
placeholder="璇疯緭鍏ュ勾榫�"
- >
- <template #readContent>
- <span v-if="form.age">{{ form.age }}宀�</span>
- <span v-else></span>
- </template>
- </ProFormInputNumber>
+ unit="宀�"
+ />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -129,7 +127,7 @@
<el-button v-if="form.isDetail" @click="emit('onCancel')">鍏抽棴</el-button>
<template v-else>
<el-button type="primary" @click="handleConfirm">鎻愪氦</el-button>
- <el-button @click="handleReset">閲嶇疆</el-button>
+ <!-- <el-button @click="handleReset">閲嶇疆</el-button> -->
<el-button @click="emit('onCancel')">鍙栨秷</el-button>
</template>
</span>
@@ -151,6 +149,7 @@
ProFormRadio,
ProFormUpload,
ProFormInputNumber,
+ ProFormDatePicker,
} from '@bole-core/components';
import { calculateAge, deepClone, format } from '@/utils';
import { EnumUserGender, EnumUserGenderTextForPerson } from '@/constants';
--
Gitblit v1.9.1