update:1213问题修改

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