From 01c25c7e0f38e7f458d5dc97a70a9b7b8d4f7a6c Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期六, 07 十月 2023 23:30:45 +0800
Subject: [PATCH] 健康保健修改

---
 ruoyi-ui/src/views/genealogy/index.vue |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index c3238d9..59c0854 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -55,7 +55,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="鐢熸棩" prop="birth">
+      <el-form-item label="鐢熸棩" prop="birth deadDay">
         <el-date-picker
           v-model="dateRange"
           style="width:  197px;
@@ -69,6 +69,7 @@
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
           end-placeholder="缁撴潫鏃ユ湡"
+          @keyup.enter.native="handleQuery"
         ></el-date-picker>
 
       </el-form-item>
@@ -81,15 +82,6 @@
       </el-form-item>
     </el-form>
     <div>
-<!--      <div style="width: 149px;-->
-<!--      height: 24px;-->
-<!--      font-size: 18px;-->
-<!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
-<!--      font-weight: 400;-->
-<!--      color: #000000;-->
-<!--      line-height: 21px;-->
-<!--      ">寮犳皬涓�瑙堣〃</div>-->
-
       <el-row :gutter="10" class="mb8">
 <!--        <el-col :span="1.5">-->
 <!--          <el-button-->
@@ -151,7 +143,7 @@
       </el-row>
     </div>
 
-    <el-table v-loading="loading" :data="listRoot"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+    <el-table v-loading="loading" :data="listRoot" :row-key="getRowId" ref="multipleTable"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
       <el-table-column type="selection" width="55"  align="center" />
       <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
 
@@ -160,7 +152,6 @@
           <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
           <span v-else>鈥斺��</span>
         </template>
-<!--        <template slot-scope="scope">{{ getSrc(scope.row.identity) }}</template>-->
       </el-table-column>
       <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center"/>
       <el-table-column label="鎬у埆" prop="sex" sortable width="100" align="center" >
@@ -204,7 +195,6 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -314,7 +304,7 @@
       dsb:true,
       btn:false,
       fit:['fill'],
-
+      uploading: false,
       formDat: {
         //寮犳皬涓�瑙堣〃
         userid:undefined,
@@ -523,6 +513,10 @@
         return '鍏跺畠'
       }
     },
+    getRowId(row)
+    {
+      return row.id
+    },
 
     handleRemove(file) {
       alert(323)

--
Gitblit v1.9.1