update:1213问题修改

src/views/emergency/communication/components/detail.vue

@@ -17,7 +17,18 @@
             </a-descriptions-item>
             <a-descriptions-item label="发起人年龄">
                 {{ resultInfo?.initiatorUserAge }}
-                <span class="sepical-des" @click="personLocal(resultInfo?.initiatorLatitude, resultInfo?.initiatorLongitude)">员工位置</span>
+            </a-descriptions-item>
+            <a-descriptions-item label="">
+                <span class="sepical-des" style="margin-left: 0" @click="personLocal(resultInfo?.initiatorLatitude, resultInfo?.initiatorLongitude)">
+                    员工位置
+                </span>
+            </a-descriptions-item>
+            <a-descriptions-item></a-descriptions-item>
+            <a-descriptions-item>
+                <div style="width: 100%; border-bottom: 1px dashed #333"></div>
+            </a-descriptions-item>
+            <a-descriptions-item>
+                <div style="width: 100%; border-bottom: 1px dashed #333"></div>
             </a-descriptions-item>
             <a-descriptions-item label="被救助人">
                 {{ Object.keys(newEmploy).length > 0 ? newEmploy.realname : resultInfo?.salvageUserName }}

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,

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: '手机号码格式有误'}],
     },
     {

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: '全科医生',