From 0c3e495e53142749fb88a979b4dd844c8c70dfc8 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Sat, 13 Dec 2025 18:43:00 +0800
Subject: [PATCH] =?UTF-8?q?update:1213=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../communication/components/detail.vue | 13 +++-
.../emergency/outburst/order/Order.data.ts | 4 +-
.../outburst/resource/Resource.data.ts | 62 ++++++++++++++++---
src/views/system/user/user.data.ts | 28 ++++-----
4 files changed, 83 insertions(+), 24 deletions(-)
diff --git a/src/views/emergency/communication/components/detail.vue b/src/views/emergency/communication/components/detail.vue
index 8931df7..f16df8a 100644
--- a/src/views/emergency/communication/components/detail.vue
+++ b/src/views/emergency/communication/components/detail.vue
@@ -17,7 +17,18 @@
{{ resultInfo?.initiatorUserAge }}
- 员工位置
+
+
+
+ 员工位置
+
+
+
+
+
+
+
+
{{ Object.keys(newEmploy).length > 0 ? newEmploy.realname : resultInfo?.salvageUserName }}
diff --git a/src/views/emergency/outburst/order/Order.data.ts b/src/views/emergency/outburst/order/Order.data.ts
index 8e50ed0..83e644d 100644
--- a/src/views/emergency/outburst/order/Order.data.ts
+++ b/src/views/emergency/outburst/order/Order.data.ts
@@ -190,7 +190,9 @@ export const columnsPersonS: BasicColumn[] = [
dataIndex: 'salvageUserSecondDepart',
customRender: ({ record }) => {
// @ts-ignore
- return `${record.initiatorUserName}-${render.renderDict(record.initiatorUserSex, 'sex2').children}-${record.initiatorUserAge}`;
+ return `${record.initiatorUserName}-${render.renderDict(record.initiatorUserSex, 'sex2').children}${
+ record.initiatorUserAge ? `-${record.initiatorUserAge}` : ''
+ }`;
},
},
...currentColumns,
diff --git a/src/views/emergency/outburst/resource/Resource.data.ts b/src/views/emergency/outburst/resource/Resource.data.ts
index 9a032ec..e5f933b 100644
--- a/src/views/emergency/outburst/resource/Resource.data.ts
+++ b/src/views/emergency/outburst/resource/Resource.data.ts
@@ -106,7 +106,7 @@ export const formSchema: FormSchema[] = [
dictCode: 'hospital_level',
},
// 处理特殊类型不展示医院等级
- ifShow: (params) => !['4', '5', '6'].includes(params.values?.type),
+ ifShow: (params) => !['3', '4', '5', '6'].includes(params.values?.type),
required: true,
},
// {
@@ -135,26 +135,72 @@ export const formSchema: FormSchema[] = [
field: 'img',
component: 'JImageUpload',
},
+ {
+ label: '地点',
+ field: 'geoCollectType',
+ component: 'RadioGroup',
+ required: true,
+ defaultValue: '0',
+ componentProps: {
+ options: [
+ {
+ value: '0',
+ label: '地图选点',
+ },
+ {
+ value: '1',
+ label: '手动输入',
+ },
+ ],
+ },
+ },
{
label: '地址',
- field: 'customAddress',
+ field: 'address',
component: 'Input',
- slot: 'customAddress',
- rules: [{ required: true }],
- ifShow: false,
+ slot: 'address',
+ dynamicRules: ({ values }) => {
+ return [
+ {
+ required: values.geoCollectType == 0,
+ message: '请进行地图选点',
+ },
+ ];
+ },
+ show: ({ values }) => values.geoCollectType == 0,
+ },
+ // {
+ // label: '详细地址',
+ // field: 'address',
+ // component: 'Input',
+ // slot: 'address',
+ // required: true,
+ // },
+ {
+ label: '经度',
+ field: 'longitude',
+ component: 'Input',
+ required: ({ values }) => values.geoCollectType == 1,
+ show: ({ values }) => values.geoCollectType == 1,
+ },
+ {
+ label: '纬度',
+ field: 'latitude',
+ component: 'Input',
+ required: ({ values }) => values.geoCollectType == 1,
+ show: ({ values }) => values.geoCollectType == 1,
},
{
label: '详细地址',
field: 'address',
component: 'Input',
- slot: 'address',
- required: true,
+ required: ({ values }) => values.geoCollectType == 1,
+ show: ({ values }) => values.geoCollectType == 1,
},
{
label: '联系电话',
field: 'mobile',
component: 'Input',
- rules: [{ required: true }],
// rules: [{ required: true },{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误'}],
},
{
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index 499b946..4d4f75f 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -667,20 +667,20 @@ export const typeList: UserType[] = [
component: healthExpert,
auth: 'system:consultation:con_doctor:list',
},
- {
- key: 4,
- title: '操作人员',
- component: personnelManagement1,
- auth: 'system:health_operator_ex:list',
- type: '5',
- },
- {
- key: 5,
- title: '专业人员',
- component: personnelManagement2,
- auth: 'system:health_user_operator_ex:list',
- type: '6',
- },
+ // {
+ // key: 4,
+ // title: '操作人员',
+ // component: personnelManagement1,
+ // auth: 'system:health_operator_ex:list',
+ // type: '5',
+ // },
+ // {
+ // key: 5,
+ // title: '专业人员',
+ // component: personnelManagement2,
+ // auth: 'system:health_user_operator_ex:list',
+ // type: '6',
+ // },
{
key: 3,
title: '全科医生',