长者管理-长者信息-搜索条件变更为护理单元查询、列表展示NUID字段、详情增加护理单元（名称）字段的展示

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',

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>
+              <template #label><span title="护理单元">护理单元</span></template>
-              <JInput v-model:value="queryParam.nuId" />
+              <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>({});

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-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" />
+                  placeholder="请选择分类标签" allowClear @upDictCode="upNuNameFunc" />-->
-                <span>{{ nuNameTextFunc(formData.nuId) }}</span>
+                <span>{{ formData.nuId_dictText }}</span>
-              </a-form-item> -->
+              </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: '',