From 8cceb6858a8acb2724e6e4806294264c375dd4fe Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Mon, 27 Oct 2025 15:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E8=80=85=E7=AE=A1=E7=90=86-=E9=95=BF?=
 =?UTF-8?q?=E8=80=85=E4=BF=A1=E6=81=AF-=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=98=E6=9B=B4=E4=B8=BA=E6=8A=A4=E7=90=86=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=9F=A5=E8=AF=A2=E3=80=81=E5=88=97=E8=A1=A8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BANUID=E5=AD=97=E6=AE=B5=E3=80=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83=EF=BC=88?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=89=E5=AD=97=E6=AE=B5=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/elder/elderinfo/ElderInfo.data.ts     |  7 ++++++-
 src/views/elder/elderinfo/ElderInfoList.vue     | 17 +++++++++++++----
 .../elderinfo/components/ElderInfoForm.vue      | 15 +++++++++------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/views/elder/elderinfo/ElderInfo.data.ts b/src/views/elder/elderinfo/ElderInfo.data.ts
index 5ef47fe..fc48164 100644
--- a/src/views/elder/elderinfo/ElderInfo.data.ts
+++ b/src/views/elder/elderinfo/ElderInfo.data.ts
@@ -6,10 +6,15 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '护理单元',
+    title: 'NUID',
     align: 'center',
     dataIndex: 'nuId',
   },
+  {
+    title: '护理单元',
+    align: 'center',
+    dataIndex: 'nuId_dictText',
+  },
   {
     title: '长者姓名',
     align: 'center',
diff --git a/src/views/elder/elderinfo/ElderInfoList.vue b/src/views/elder/elderinfo/ElderInfoList.vue
index 18ca848..5604bec 100644
--- a/src/views/elder/elderinfo/ElderInfoList.vue
+++ b/src/views/elder/elderinfo/ElderInfoList.vue
@@ -5,16 +5,24 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
         :wrapper-col="wrapperCol">
         <a-row :gutter="24">
+          <!-- <a-col :lg="6">
+            <a-form-item name="nuId">
+              <template #label><span title="NUID">NUID</span></template>
+              <JInput v-model:value="queryParam.nuId" placeholder="请输入NUID" />
+            </a-form-item>
+          </a-col> -->
           <a-col :lg="6">
             <a-form-item name="nuId">
-              <template #label><span title="nuId">nuId</span></template>
-              <JInput v-model:value="queryParam.nuId" />
+              <template #label><span title="护理单元">护理单元</span></template>
+              <j-dict-select-tag v-model:value="queryParam.nuId"
+                :dictCode="`nu_base_info,nu_name,nu_id,del_flag = 0  order by nu_id asc`" placeholder="请选择护理单元"
+                allowClear :ignoreDisabled="true" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="name">
               <template #label><span title="姓名">姓名</span></template>
-              <JInput v-model:value="queryParam.name" />
+              <JInput v-model:value="queryParam.name" placeholder="请输入长者姓名" />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -30,7 +38,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" >
+    <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
       </template>
@@ -59,6 +67,7 @@ import { downloadFile } from '/@/utils/common/renderUtils';
 import ElderInfoModal from './components/ElderInfoModal.vue'
 import { useUserStore } from '/@/store/modules/user';
 import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
 const formRef = ref();
 const queryParam = reactive<any>({});
diff --git a/src/views/elder/elderinfo/components/ElderInfoForm.vue b/src/views/elder/elderinfo/components/ElderInfoForm.vue
index e2ecc8f..2cb027d 100644
--- a/src/views/elder/elderinfo/components/ElderInfoForm.vue
+++ b/src/views/elder/elderinfo/components/ElderInfoForm.vue
@@ -13,12 +13,14 @@
                 <!-- <a-input v-model:value="formData.nuId" placeholder="请输入护理单元"  allow-clear ></a-input> -->
                 <span>{{ formData.nuId }}</span>
               </a-form-item>
-              <!-- <a-form-item label="护理单元名称"> -->
-              <!-- <a-input v-model:value="formData.nuId" placeholder="请输入护理单元"  allow-clear ></a-input> -->
-              <!-- <j-dict-select-tag type='list' v-model:value="formData.nuId" :dictCode="`nu_base_info,nu_name,nu_id`"
-                  placeholder="请选择分类标签" allowClear @upDictCode="upNuNameFunc" />
-                <span>{{ nuNameTextFunc(formData.nuId) }}</span>
-              </a-form-item> -->
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="护理单元">
+                <!-- <a-input v-model:value="formData.nuId" placeholder="请输入护理单元"  allow-clear ></a-input> -->
+                <!-- <j-dict-select-tag type='list' v-model:value="formData.nuId" :dictCode="`nu_base_info,nu_name,nu_id`"
+                  placeholder="请选择分类标签" allowClear @upDictCode="upNuNameFunc" />-->
+                <span>{{ formData.nuId_dictText }}</span>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="姓名" v-bind="validateInfos.name" id="ElderInfoForm-name" name="name">
@@ -171,6 +173,7 @@ const emit = defineEmits(['register', 'ok']);
 const formData = reactive<Record<string, any>>({
   id: '',
   nuId: '',
+  nuId_dictText: '',
   name: '',
   sex: '',
   age: '',