diff --git a/dangan-ui/src/views/dangan/retrieval/index.vue b/dangan-ui/src/views/dangan/retrieval/index.vue
index bf63148..48a7eb3 100644
--- a/dangan-ui/src/views/dangan/retrieval/index.vue
+++ b/dangan-ui/src/views/dangan/retrieval/index.vue
@@ -5,11 +5,14 @@
         <el-input v-model="keyword" placeholder="请输入关键字" @keyup.enter.native="handleQuery"></el-input>
         <el-button style="height:50px;font-size: 14px;" type="primary" icon="el-icon-search" @click="handleQuery">检索</el-button>
       </div>
-      <el-checkbox-group v-model="checkList">
-        <el-checkbox v-for="dict in dict.type.yw_type"
-                     :key="dict.value"
-                     :label="dict.value">{{ dict.label }}</el-checkbox>
-      </el-checkbox-group>
+      <div style="width:100%; text-align:left">
+        <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="checkList" @change="handleCheckboxGroupChange">
+          <el-checkbox v-for="dict in dict.type.yw_type"
+                       :key="dict.value"
+                       :label="dict.value">{{ dict.label }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
     </div>
 
     <!-- 常住人口登记表1 -->
@@ -1471,6 +1474,8 @@ export default {
       // 显示搜索条件
       keyword: '',
       checkList: [],
+      // 是否全选
+      checkAll: false,
       // 常住人口登记表1
       option1: {
         // 遮罩层
@@ -1796,6 +1801,23 @@ export default {
         this.option7.loading = false;
       })
     },
+    handleCheckAllChange(val) {
+      if(val){
+        this.checkList = []
+        this.dict.type.yw_type.forEach(item => {
+          this.checkList.push(item.value)
+        })
+      }else {
+        this.checkList = []
+      }
+    },
+    handleCheckboxGroupChange(){
+      if(this.checkList.length===this.dict.type.yw_type.length){
+        this.checkAll = true;
+      }else {
+        this.checkAll = false;
+      }
+    }
   }
 }
 </script>
diff --git a/dangan-ui/src/views/index.vue b/dangan-ui/src/views/index.vue
index 22d2613..cf61779 100644
--- a/dangan-ui/src/views/index.vue
+++ b/dangan-ui/src/views/index.vue
@@ -5,11 +5,14 @@
         <el-input v-model="keyword" placeholder="请输入关键字" @keyup.enter.native="handleQuery"></el-input>
         <el-button style="height:50px;font-size: 14px;" type="primary" icon="el-icon-search" @click="handleQuery">检索</el-button>
       </div>
-      <el-checkbox-group v-model="checkList">
-        <el-checkbox v-for="dict in dict.type.yw_type"
-                     :key="dict.value"
-                     :label="dict.value">{{ dict.label }}</el-checkbox>
-      </el-checkbox-group>
+      <div style="width:100%; text-align:left">
+        <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="checkList" @change="handleCheckboxGroupChange">
+          <el-checkbox v-for="dict in dict.type.yw_type"
+                       :key="dict.value"
+                       :label="dict.value">{{ dict.label }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
     </div>
 
     <!-- 常住人口登记表1 -->
@@ -21,11 +24,7 @@
         <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
         <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
         <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
         <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
@@ -218,11 +217,7 @@
         <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
         <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
         <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
         <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
@@ -415,11 +410,7 @@
         <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
         <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
         <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
         <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
@@ -612,11 +603,7 @@
         <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
         <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
         <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
         <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
@@ -937,11 +924,7 @@
         <el-table-column label="工作单位男" align="center" prop="mUnit" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号男" align="center" prop="mCardId" min-width="100" show-overflow-tooltip/>
         <el-table-column label="生育证号" align="center" prop="syzh" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
         <el-table-column label="医院地址" align="center" prop="hospital" min-width="100" show-overflow-tooltip/>
         <el-table-column label="婴儿性别" align="center" prop="babySex" min-width="100" show-overflow-tooltip/>
         <el-table-column label="意见" align="center" prop="suggest" min-width="100" show-overflow-tooltip/>
@@ -1176,49 +1159,29 @@
         <el-table-column label="与申请人关系1" align="center" prop="relation1" min-width="120" show-overflow-tooltip/>
         <el-table-column label="姓名1" align="center" prop="name1" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别1" align="center" prop="sex1" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期1" align="center" prop="birthDate1" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthDate1, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期1" align="center" prop="birthDate1" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号1" align="center" prop="cardId1" min-width="100" show-overflow-tooltip/>
         <el-table-column label="与申请人关系2" align="center" prop="relation2" min-width="120" show-overflow-tooltip/>
         <el-table-column label="姓名2" align="center" prop="name2" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别2" align="center" prop="sex2" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期2" align="center" prop="birthDate2" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthDate2, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期2" align="center" prop="birthDate2" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号2" align="center" prop="cardId2" min-width="100" show-overflow-tooltip/>
         <el-table-column label="与申请人关系3" align="center" prop="relation3" min-width="120" show-overflow-tooltip/>
         <el-table-column label="姓名3" align="center" prop="name3" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别3" align="center" prop="sex3" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期3" align="center" prop="birthDate3" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthDate3, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期3" align="center" prop="birthDate3" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号3" align="center" prop="cardId3" min-width="100" show-overflow-tooltip/>
         <el-table-column label="与申请人关系4" align="center" prop="relation4" min-width="120" show-overflow-tooltip/>
         <el-table-column label="姓名4" align="center" prop="name4" min-width="100" show-overflow-tooltip/>
         <el-table-column label="性别4" align="center" prop="sex4" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="出生日期4" align="center" prop="birthDate4" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthDate4, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="出生日期4" align="center" prop="birthDate4" min-width="100" show-overflow-tooltip/>
         <el-table-column label="身份证号4" align="center" prop="cardId4" min-width="100" show-overflow-tooltip/>
         <el-table-column label="发往单位" align="center" prop="fwdw" min-width="100" show-overflow-tooltip/>
         <el-table-column label="迁入地址" align="center" prop="qrAddress" min-width="100" show-overflow-tooltip/>
         <el-table-column label="准迁原因" align="center" prop="zqReason" min-width="100" show-overflow-tooltip/>
         <el-table-column label="批准机关" align="center" prop="pzjg" min-width="100" show-overflow-tooltip/>
         <el-table-column label="承办人" align="center" prop="cbr" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="签发日期" align="center" prop="qfDate" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.qfDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="签发日期" align="center" prop="qfDate" min-width="100" show-overflow-tooltip/>
         <el-table-column label="识别图片" align="center" prop="pictures">
           <template slot-scope="scope">
             <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
@@ -1388,11 +1351,7 @@
         <el-table-column label="机关1" align="center" prop="jg1" min-width="100" show-overflow-tooltip/>
         <el-table-column label="机关2" align="center" prop="jg2" min-width="100" show-overflow-tooltip/>
         <el-table-column label="承办人" align="center" prop="cbr" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="承办日期" align="center" prop="cbDate" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.cbDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="承办日期" align="center" prop="cbDate"  min-width="100" show-overflow-tooltip/>
         <el-table-column label="识别图片" align="center" prop="pictures">
           <template slot-scope="scope">
             <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
@@ -1515,6 +1474,8 @@ export default {
       // 显示搜索条件
       keyword: '',
       checkList: [],
+      // 是否全选
+      checkAll: false,
       // 常住人口登记表1
       option1: {
         // 遮罩层
@@ -1840,6 +1801,23 @@ export default {
         this.option7.loading = false;
       })
     },
+    handleCheckAllChange(val) {
+      if(val){
+        this.checkList = []
+        this.dict.type.yw_type.forEach(item => {
+          this.checkList.push(item.value)
+        })
+      }else {
+        this.checkList = []
+      }
+    },
+    handleCheckboxGroupChange(){
+      if(this.checkList.length===this.dict.type.yw_type.length){
+        this.checkAll = true;
+      }else {
+        this.checkAll = false;
+      }
+    }
   }
 }
 </script>