diff --git a/.env.production b/.env.production index cb3d270..9cd485d 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ VITE_USE_MOCK = false # 发布路径 -VITE_PUBLIC_PATH = /biz102 +VITE_PUBLIC_PATH = /biz103 # 是否启用gzip或brotli压缩 # 选项值: gzip | brotli | none @@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/nursingunit102 +VITE_GLOB_API_URL=/nursingunit103 #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit102 +VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit103 # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm copy.vue b/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm copy.vue index 99fc5ba..b41421d 100644 --- a/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm copy.vue +++ b/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm copy.vue @@ -2,190 +2,218 @@ @@ -194,159 +222,159 @@ diff --git a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue index 11d4943..9e1319a 100644 --- a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue +++ b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue @@ -174,13 +174,13 @@ v-model:value="formData.healthCertificatePositive" disabled> - + diff --git a/src/views/admin/employeesapply/components/EmployeesApplyFormbk_.vue b/src/views/admin/employeesapply/components/EmployeesApplyFormbk_.vue index 4b4adfb..cbbb06c 100644 --- a/src/views/admin/employeesapply/components/EmployeesApplyFormbk_.vue +++ b/src/views/admin/employeesapply/components/EmployeesApplyFormbk_.vue @@ -155,12 +155,12 @@ - + diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts index e85d5ad..286eabb 100644 --- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts +++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts @@ -153,12 +153,12 @@ export const columns: BasicColumn[] = [ dataIndex: 'healthCertificatePositive', customRender: render.renderImage, }, - { - title: '健康证反面', - align: "center", - dataIndex: 'healthCertificateNegative', - customRender: render.renderImage, - }, + // { + // title: '健康证反面', + // align: "center", + // dataIndex: 'healthCertificateNegative', + // customRender: render.renderImage, + // }, { title: '银行卡正面', align: "center", diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue index a07c04b..9faf208 100644 --- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue +++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue @@ -2,19 +2,21 @@
- + - + 查询 - 重置 + 重置 @@ -22,54 +24,97 @@
- - - - -
- -
+ + + + + - +
- {{item.name}} / - {{item.sex_dictText?item.sex_dictText:'无'}} + {{ item.name }} / + {{ item.sex ? item.sex : '无' }}
-
-
入职日期: {{item.entryTime }}
-
身份证号: {{item.idCard }}
-
联系电话: {{item.tel }}
-
出生日期: {{item.dateOfBirth }}
+
+ 入职日期 : {{ item.entryTime + }}
-
- - {{ item.createTime.substring(0,10) }} - + + +
在线
+
离线
+
+ +
+ + +
+ +
+
+ 身份证号: + +
{{ item.idCard }}
+
+
+ + +
+ +
+
+ 联系电话: + +
{{ item.tel }}
+
+
+ + +
+ +
+
+ 出生日期: + +
{{ item.dateOfBirth }}
+
+
+
+
+ +
+ - - - - + + + + + +
-
+
共 {{ total }} 条数据 - +
-
+
@@ -84,60 +129,60 @@ diff --git a/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm copy.vue b/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm copy.vue index 949418a..3b37986 100644 --- a/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm copy.vue +++ b/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm copy.vue @@ -164,11 +164,11 @@ - + diff --git a/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue b/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue index e2bd822..f0449b5 100644 --- a/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue +++ b/src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue @@ -198,7 +198,7 @@ disabled> - + diff --git a/src/views/elder/elderinfo/components/ElderInfoForm.vue b/src/views/elder/elderinfo/components/ElderInfoForm.vue index 3931da5..8f98d72 100644 --- a/src/views/elder/elderinfo/components/ElderInfoForm.vue +++ b/src/views/elder/elderinfo/components/ElderInfoForm.vue @@ -131,7 +131,7 @@ - {{ formData.endTime }} + {{ formData.endTime == '9999-12-31' ? '长期' : formData.endTime }}