From c48fc6b1b440ef54da502ebf8b8e13fe4343f929 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 15 八月 2023 21:45:10 +0800
Subject: [PATCH] 完善荣誉证书模块的类别和名称的选择输入功能;家根网可以按照身份、姓名搜索;成长经历阅历的各个小模块的时间在修改时变成可选形式

---
 ruoyi-ui/src/views/genealogy/index.vue |   71 +++++++++++++----------------------
 1 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index c5601bb..b723ec3 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -48,14 +48,11 @@
       </el-form-item>
 
       <el-form-item label="鎬у埆" prop="sex">
-        <el-input
-          v-model="queryParams.sex"
-          placeholder="璇疯緭鍏ユ�у埆"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery">
-          <i slot="prefix" class="el-input__icon el-icon-search"></i>
-        </el-input>
+        <el-select v-model="queryParams.sex" placeholder="璇烽�夋嫨鎬у埆" clearable
+                   style="width: 240px" @keyup.enter.native="handleQuery">
+          <el-option v-for="item in typeOption"
+                     :key="item.value" :label="item.label" :value="item.value"/>
+        </el-select>
       </el-form-item>
 
       <el-form-item label="鐢熸棩" prop="birth">
@@ -84,15 +81,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-->
@@ -163,7 +151,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" >
@@ -207,7 +194,7 @@
     </el-table>
 
     <pagination
-      v-show="total"
+      v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -404,6 +391,14 @@
         }],
 
       },
+      typeOption: [{
+        value: '1',
+        label: '鐢�',
+      },
+        {
+          value: '0',
+          label: '濂�',
+        }],
       typeOptions: [{
         value:'1',
         label:'绗�1浠�'
@@ -486,22 +481,24 @@
           this.listRoot = response.data.data;
         //  alert(this.listRoot)
           this.total = response.data.length;
+          this.pageNum=1;
+          this.pageSize=10;
        //   alert(this.total)
           this.loading = false;
         }
       );
     },
     /** 鏌ヨ绫诲埆淇℃伅 */
-    getCateInfor()
-    {
-      let _this = this
-      getCategory().then(response=>{
-
-        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
-          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
-        })
-      })
-    },
+    // getCateInfor()
+    // {
+    //   let _this = this
+    //   getCategory().then(response=>{
+    //
+    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+    //     })
+    //   })
+    // },
     //韬唤閫夋嫨
     getSrc(identity) {
       if (identity === '1'){
@@ -669,22 +666,6 @@
       }
     },
 
-    /** 瀵煎叆鎿嶄綔*/
-    // handleEnport(params){
-    //   var file = params.file;
-    //   var formData = new FormData();
-    //   formData.append('excelImport', file);
-    //   let _this = this
-    //   enload(formData).then(response => {
-    //     _this.getList();
-    //     Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
-    //
-    //   }).catch(err)
-    //   {
-    //     Message({ message: "瀵煎叆澶辫触", type: 'error' })
-    //   }
-    //
-    // }
   }
 };
 </script>

--
Gitblit v1.9.1