From a4de8fd671bfdd6987dbea07dbfd68a4231451dc Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 11 Dec 2023 10:09:02 +0800
Subject: [PATCH] up

---
 src/views/record/index.vue      | 38 ++++++++++++++++++++++-----------
 src/views/record/personinfo.vue |  2 +-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index c3429cf..0692d00 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -5,7 +5,9 @@
       <lx-header icon="md-apps" text="档案管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <slot>
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
-            <Input v-model="select.keyword" style="width: 150px;margin-right: 10px;" placeholder="搜索姓名" />
+            <Input v-model="select.keyword" clearable style="width: 120px;margin-right: 10px;margin-bottom: 10px;" placeholder="搜索姓名" />
+            <Input v-model="select.idcard" clearable style="width: 170px;margin-right: 10px;" placeholder="搜索身份证" />
+
             <el-select class='street' v-model="select.jiedao" placeholder="请选择街道" clearable>
               <el-option v-for="item in lists.streetList" :key="item.value" :label="item.value" :value="item.value">
               </el-option>
@@ -19,26 +21,27 @@
               <el-option v-for="item in lists.disabilitylevelList" :key="item.value" :label="item.value"
                 :value="item.value">
               </el-option>
-            </el-select>
-            <el-select class='street' style='width:120px' v-model="select.link_tables[0]['year']" placeholder="请选择年份"
+            </el-select>
+            <el-date-picker  class='street' style='width:110px' v-model="select.link_tables[0]['year']" value-format="yyyy" type="year" placeholder="选择年"> </el-date-picker>
+            <!-- <el-select class='street' style='width:120px' v-model="select.link_tables[0]['year']" placeholder="请选择年份"
               clearable>
               <el-option v-for="item in [{label:2021,value:2021},{label:2022,value:2022},{label:2023,value:2023}]"
                 :key="item.value" :label="item.value" :value="item.value">
               </el-option>
-            </el-select>
-            <el-select collapse-tags class='street' style='width:240px' v-model="select.link_tables[0]['tables']" multiple placeholder="请选择业务" clearable>
+            </el-select> -->
+            <el-select collapse-tags class='street' style='width:225px' v-model="select.link_tables[0]['tables']" multiple placeholder="请选择业务" clearable>
               <el-option v-for="item in lists.workflowList"
                 :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
 
 
-            <Button type="primary" @click="getindex">查询</Button>
-            <Button type="primary" style="margin-left: 10px;" @click="resetindex">重置</Button>
-            <Button type="primary" style="margin-left: 10px;"
+            <Button type="primary" style="margin-right: 10px;" @click="getindex">查询</Button>
+            <Button type="primary" style="margin-right: 10px;" @click="resetindex">重置</Button>
+            <Button type="primary" style="margin-right: 10px;"
               @click="$refs['addRecord'].isShow = true,$refs['addRecord'].type = 'add'">添加</Button>
-            <Button type="primary" style="margin-left: 10px;" @click="$refs['imports'].show()">导入</Button>
-            <Button type="primary" style="margin-left: 10px;"
+            <Button type="primary" style="margin-right: 10px;" @click="$refs['imports'].show()">导入</Button>
+            <Button type="primary" style="margin-right: 10px;"
               @click="exportExcel(new Date().getTime().toString())">导出</Button>
           </div>
         </slot>
@@ -102,7 +105,8 @@
           pageSize: 40,
           pageIndex: 1,
           keyword: "",
-          jiedao: '',
+          jiedao: '',
+          idcard:'',
           disabilityLevel: "",
           disabilityType: "",
           link_tables: [{
@@ -209,7 +213,7 @@
               }else{
                 return ''
               }
-             
+
             }
           },
           // {
@@ -314,6 +318,10 @@
             "key": "name",
             "op": "like",
             "value": this.select.keyword
+          }, {
+            "key": "idcard",
+            "op": "like",
+            "value": this.select.idcard
           }, {
             "key": "jiedao",
             "op": "eq",
@@ -508,5 +516,11 @@
 
   /deep/ .street .el-select__caret {
     line-height: 32px;
+  }
+  /deep/ .el-input__icon.el-icon-date{
+    line-height: 32px;
+  }
+  /deep/ .el-input__icon.el-icon-circle-close{
+    line-height: 32px;
   }
 </style>
diff --git a/src/views/record/personinfo.vue b/src/views/record/personinfo.vue
index b59449f..595fd2b 100644
--- a/src/views/record/personinfo.vue
+++ b/src/views/record/personinfo.vue
@@ -286,7 +286,7 @@
         // 个人信息
         let names = `<div class="persons"><img src='${imgUrl}'><div>${res.name}<div></div>`
         let contents =
-          `<div class='workhover' onclick="goUrls(${res.id},'records')"><p>姓名：${res.name}</p><p>性别：${res.sex}</p><p>年龄：${age}</p><p>街道：${res.jiedao?res.jiedao:''}</p><p>联系方式：${res.mobile?res.mobile:''}</p><p>残疾类别：${res.disabilitytype}</p><p>残疾等级：${res?.disabilitylevel}</p><p>现居住地：${res.reside}</p></div>`
+          `<div class='workhover' onclick="goUrls(${res.id},'records')"><p>姓名：${res.name}</p><p>性别：${res.sex}</p><p>年龄：${age}</p><p style="width:224px">身份证：${res.idcard}</p><p>街道：${res.jiedao?res.jiedao:''}</p><p>联系方式：${res.mobile?res.mobile:''}</p><p>残疾类别：${res.disabilitytype}</p><p>残疾等级：${res?.disabilitylevel}</p><p style="padding-bottom:10px">现居住地：${res.reside}</p></div>`
 
         this.option['nodeList'][0]['content'] = names
         this.option['nodeList'][1]['content'] = contents