From 8044ce0461efa525c315624ea147eb0e4533be70 Mon Sep 17 00:00:00 2001
From: lianlonggang <lianlonggang@qq.com>
Date: Thu, 14 May 2026 10:03:38 +0800
Subject: [PATCH] =?UTF-8?q?style(healthMonitor,user):=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=A9=BA=E7=99=BD=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 规范 sectoralData.data.ts 文件的代码缩进与空行
- 规范 HealthUserEmployeeEx.data.ts 文件的代码格式
- 规范 HealthUserEmployeeExList.vue 文件的模板格式
---
 .../sectoralData/sectoralData.data.ts         | 25 ++++++++++++--
 .../HealthUserEmployeeEx.data.ts              | 34 +++++++++++++++++++
 .../HealthUserEmployeeExList.vue              |  4 +++
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/src/views/healthMonitor/healMonitorManage/monitorToll/sectoralData/sectoralData.data.ts b/src/views/healthMonitor/healMonitorManage/monitorToll/sectoralData/sectoralData.data.ts
index 932028c..0d33cc1 100644
--- a/src/views/healthMonitor/healMonitorManage/monitorToll/sectoralData/sectoralData.data.ts
+++ b/src/views/healthMonitor/healMonitorManage/monitorToll/sectoralData/sectoralData.data.ts
@@ -164,10 +164,10 @@ export const columnsNew: BasicColumn[] = [
         customRender: ({ record }) => {
             const total = record.totalAssignedDeviceNums ?? 0;
             const assigned = record.assignedDeviceNums ?? 0;
-            return total - assigned;
+            return Math.max(0, total - assigned);
         },
     },
-{
+    {
         title: '已绑定设备数',
         dataIndex: ['assignedDeviceNums'],
         customRender: ({ text }) => {
@@ -181,7 +181,15 @@ export const columnsNew: BasicColumn[] = [
         customRender: ({ record }) => {
             const total = record.totalAssignedDeviceNums ?? 0;
             const assigned = record.assignedDeviceNums ?? 0;
-            return total - assigned;
+            return Math.max(0, total - assigned);
+        },
+    },
+    {
+        title: '非关爱人员数量',
+        dataIndex: ['nonCareNums'],
+        customRender: ({ text }) => {
+            if (!text) return 0;
+            return text;
         },
     },
     {
@@ -232,6 +240,7 @@ export const columnsNew: BasicColumn[] = [
             return text;
         },
     },
+
 ];
 
 const startTime = dayjs().subtract(6, 'day').format('YYYY-MM-DD');
@@ -376,6 +385,16 @@ export const detailColumns = (arr: BasicColumn[] = []) => {
             title: '手表所属单位',
             dataIndex: 'watchOrgName',
         },
+        {
+            title: '非关爱人员',
+            dataIndex: 'nonCareFlag',
+            width: 100,
+            customRender: ({ text }) => {
+                if (text === 1) return '是';
+                if (text === 0) return '否';
+                return '';
+            },
+        },
         ...arr,
         {
             title: '应佩戴天数',
diff --git a/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeEx.data.ts b/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeEx.data.ts
index 7da38fa..ad477ba 100644
--- a/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeEx.data.ts
+++ b/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeEx.data.ts
@@ -85,6 +85,13 @@ export const columns: BasicColumn[] = [
         dataIndex: ['departTree', '3'],
         width: 180,
     },
+    {
+        title: '非关爱人员',
+        align: 'center',
+        dataIndex: ['extension', 'nonCareFlag'],
+        width: 100,
+        slots: { customRender: 'nonCareTag' },
+    },
     {
         title: '出生日期',
         align: 'center',
@@ -160,6 +167,17 @@ export const searchFormSchema: FormSchema[] = [
         field: 'phone',
         component: 'Input',
     },
+    {
+        label: '非关爱人员',
+        field: 'nonCareFlag',
+        component: 'Select',
+        componentProps: {
+            options: [
+                { label: '否', value: 0 },
+                { label: '是', value: 1 },
+            ],
+        },
+    },
     {
         label: '单位名称',
         field: 'orgCode',
@@ -676,28 +694,44 @@ export const formSchema: (isUpdate: boolean) => FormSchema[] = (isUpdate) => {
             label: '关爱联络员姓名',
             field: 'careLiaisonName',
             component: 'Input',
+            show: false,
         },
         {
             label: '关爱联络员职务',
             field: 'careLiaisonJob',
             component: 'Input',
+            show: false,
         },
         {
             label: '关爱联络员电话',
             field: 'careLiaisonPhone',
             component: 'Input',
             rules: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' }],
+            show: false,
         },
         {
             label: '急救人员姓名',
             field: 'lifeguardName',
             component: 'Input',
+            show: false,
         },
         {
             label: '急救人员电话',
             field: 'lifeguardPhone',
             component: 'Input',
             rules: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' }],
+            show: false,
+        },
+        {
+            label: '非关爱人员',
+            field: 'nonCareFlag',
+            component: 'RadioButtonGroup',
+            componentProps: {
+                options: [
+                    { label: '否', value: 0 },
+                    { label: '是', value: 1 },
+                ],
+            },
         },
         {
             label: '',
diff --git a/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeExList.vue b/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeExList.vue
index b6ec630..d85882f 100644
--- a/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeExList.vue
+++ b/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeExList.vue
@@ -109,6 +109,10 @@
                     {{ record.status_dictText }}
                 </Tag>
             </template>
+            <template #nonCareTag="{ record }">
+                <Tag v-if="record.extension?.nonCareFlag === 1" color="orange">是</Tag>
+                <Tag v-else-if="record.extension?.nonCareFlag === 0" color="blue">否</Tag>
+            </template>
         </BasicTable>
         <!-- 表单区域 -->
         <HealthUserEmployeeExDrawer :showFooter="showFooter" @register="registerDrawer" @success="handleSuccess" />