diff --git a/dangan-ui/src/views/dangan/catalog/index.vue b/dangan-ui/src/views/dangan/catalog/index.vue
index 083da25..c3d79a2 100644
--- a/dangan-ui/src/views/dangan/catalog/index.vue
+++ b/dangan-ui/src/views/dangan/catalog/index.vue
@@ -158,7 +158,7 @@
           <el-button size="mini" type="primary" @click="selectXZCSQ(2)">村/社区</el-button>
         </el-form-item>
         <el-form-item label="图片" prop="picPath" v-if="form.pid===0">
-          <image-upload v-model="form.picPath" limit="1"/>
+          <image-upload v-model="form.picPath" :limit="1"/>
         </el-form-item>
         <el-form-item label="显示顺序" prop="orderNum">
           <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
@@ -229,59 +229,12 @@
 
     </el-dialog>
 
-    <!-- 上传记录 -->
-    <el-dialog title="上传记录" :visible.sync="scjl.open" width="1000px" append-to-body top="6vh">
-
-      <el-tabs v-model="scjl.recognize" @tab-click="scjlActiveClick">
-        <el-tab-pane label="未识别" name="0">
-          <div v-if="scjl.list.length>0" style="display:flex;justify-content: space-between;margin:10px;">
-            <el-checkbox v-model="scjl.checkAll" @change="handleCheckAllChange">全选</el-checkbox>
-            <el-button icon="el-icon-full-screen" type="primary"  @click="OCRRecognition">OCR识别</el-button>
-          </div>
-          <div class="wsb">
-            <el-checkbox v-for="item in scjl.list" :label="item.picName" :key="item.id" v-model="item.checked" @change="handleCheckChange(item)">
-              <div class="list">
-                <el-image
-                  style="width: 120px; height: 120px"
-                  :src="item.picUrl"
-                  :preview-src-list="[item.picUrl]">
-                </el-image>
-                <p>{{ item.picName }}</p>
-                <p>{{ item.muPath }}</p>
-                <p>{{ item.wlsjPath }}</p>
-              </div>
-            </el-checkbox>
-          </div>
-          <el-empty :image-size="240" v-if="scjl.list.length===0"></el-empty>
-        </el-tab-pane>
-        <el-tab-pane label="已识别" name="1">
-          <div class="ysb">
-            <div class="list" v-for="item in scjl.list" :label="item.picName" :key="item.id">
-              <el-image
-                style="width: 120px; height: 120px"
-                :src="item.picUrl"
-                :preview-src-list="[item.picUrl]">
-              </el-image>
-              <p>{{ item.picName }}</p>
-              <p>{{ item.muPath }}</p>
-              <p>{{ item.wlsjPath }}</p>
-            </div>
-          </div>
-
-          <el-empty :image-size="240" v-if="scjl.list.length===0"></el-empty>
-        </el-tab-pane>
-      </el-tabs>
-
-    </el-dialog>
-
   </div>
 </template>
 
 <script>
 import { listCatalog, getCatalog, delCatalog, addCatalog, updateCatalog } from "@/api/dangan/catalog";
-import { listPictureRecard } from "@/api/dangan/pictureRecard";
 import { listAreaSort } from "@/api/dangan/areaSort";
-import { collectRecongnize } from "@/api/dangan/collection";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -347,16 +300,7 @@ export default {
           areaType: 2,
           pid: null,
         }
-      },
-      // 上传记录
-      scjl:{
-        open: false,
-        checkAll: false,
-        list: [],
-        // 档案目录ID
-        muId: null,
-        recognize: '0'
-      },
+      }
     };
   },
   created() {
@@ -489,6 +433,10 @@ export default {
     handleDACJ(row){
       this.$router.push("/collection?id=" + row.id);
     },
+    // 档案上传记录
+    handleSCJL(row){
+      this.$router.push("/pictureRecard?muId=" + row.id);
+    },
     // 上级类目选择
     selectPid(){
       this.form.ywType = undefined;
@@ -537,74 +485,16 @@ export default {
       this.form.muName = row.muName;
       this.xzcsq.open = false;
     },
-    // 上传记录
-    handleSCJL(row){
-      this.scjl.list = [];
-      this.scjl.open = true;
-      this.scjl.muId = row.id;
-      this.scjl.recognize = '0';
-      this.getPictureRecard();
-    },
-    // 获取档案上传记录
-    getPictureRecard(){
-      listPictureRecard({
-        pageNum: 1,
-        pageSize: 1000000000,
-        muId: this.scjl.muId,
-        recognize: this.scjl.recognize,
-      }).then(response => {
-        this.scjl.list = response.rows;
-      });
-    },
-    // 获取档案上传记录
-    scjlActiveClick(tab){
-      this.scjl.recognize = tab.name;
-      this.scjl.list = [];
-      this.getPictureRecard();
-    },
-    // 全选
-    handleCheckAllChange(val) {
-      this.scjl.list.forEach(item =>{
-        item['checked']= val
-      })
-      this.scjl.list = [...this.scjl.list]
-    },
-    // 选择
-    handleCheckChange(val) {
-      let checkAll = true
-      this.scjl.list.forEach(item=>{
-        if(!item['checked']){
-          checkAll = false
-        }
-      })
-      this.scjl.list = [...this.scjl.list]
-      this.scjl.checkAll = checkAll
-    },
-    // OCR识别
-    OCRRecognition(){
-      let arr = [];
-      this.scjl.list.forEach(item => {
-        if(item.checked){
-          arr.push(item)
-        }
-      })
-
-      if(arr.length>0){
-        collectRecongnize(arr).then(response => {
-          this.scjl.list = [];
-          this.$modal.msgSuccess("操作成功");
-          this.getPictureRecard();
-        });
+    // 档案信息
+    handleDAXX(row){
+      if(row.ywType==='option1'|| row.ywType==='option3'|| row.ywType==='option9'){
+        this.$router.push("/dangan/czrkdj?muId=" + row.id);
       }else {
-        this.$alert(`请先选择需要识别的档案！`, `提示`, {
+        this.$alert(`暂无相关页面！`, `提示`, {
           type: 'warning'
         });
       }
     },
-    // 档案信息
-    handleDAXX(row){
-      this.$router.push("/dangan/czrkdj?muId=" + row.id);
-    },
   }
 };
 </script>
diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue
index b11efa5..41ee085 100644
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@@ -44,8 +44,8 @@
           <div v-if="pictureRecard.length>0">
 
             <div style="margin-bottom: 20px;">
-              <el-checkbox v-model="isYiZu">是否一组[OCR最多选择2张识别]</el-checkbox>
-              <el-checkbox v-model="isSuangMian">是否双面</el-checkbox>
+              <el-checkbox v-model="isYiZu">一组[OCR最多选择2张识别]</el-checkbox>
+              <el-checkbox v-model="isSuangMian">双面</el-checkbox>
             </div>
 
             <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index 16d48f3..c91dd9b 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -33,14 +33,6 @@
           placeholder="请选择出生日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="地址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="籍贯" prop="jiguan">
         <el-input
           v-model="queryParams.jiguan"
@@ -87,7 +79,6 @@
           />
         </el-select>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -95,6 +86,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['dangan:czrkdj:add']"
+        >新增手动识别</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -109,18 +110,18 @@
     </el-row>
 
     <el-table v-loading="loading" :data="czrkdjList">
-<!--      <el-table-column label="目录ID" align="center" prop="muId" />-->
-      <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="户主姓名" align="center" prop="hzName" />
-      <el-table-column label="与户主关系" align="center" prop="relation" />
-      <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+      <el-table-column label="档案目录ID" align="center" prop="muId" min-width="80" fixed/>
+      <el-table-column label="姓名" align="center" prop="name" fixed min-width="100" show-overflow-tooltip/>
+      <el-table-column label="户主姓名" align="center" prop="hzName" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="与户主关系" align="center" prop="relation" 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="address" />
-      <el-table-column label="籍贯" align="center" prop="jiguan" />
-      <el-table-column label="身份证号" align="center" prop="cardId" />
+      <el-table-column label="地址" align="center" prop="address" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="籍贯" align="center" prop="jiguan" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="身份证号" align="center" prop="cardId" min-width="100" show-overflow-tooltip/>
       <el-table-column label="是否纠错" align="center" prop="errorCorrect" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.error_correct" :value="scope.row.errorCorrect"/>
@@ -142,8 +143,8 @@
           <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -178,40 +179,51 @@
     />
 
     <!-- 添加或修改常住人口登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog title="纠错" :visible.sync="open_jc" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="户主姓名" prop="hzName">
-          <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
-        </el-form-item>
-        <el-form-item label="与户主关系" prop="relation">
-          <el-input v-model="form.relation" placeholder="请输入与户主关系" />
-        </el-form-item>
-        <el-form-item label="出生日期" prop="birthday">
-          <el-date-picker clearable style="width:100%;"
-            v-model="form.birthday"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择出生日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入地址" />
-        </el-form-item>
-        <el-form-item label="籍贯" prop="jiguan">
-          <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
-        </el-form-item>
-        <el-form-item label="身份证号" prop="cardId">
-          <el-input v-model="form.cardId" placeholder="请输入身份证号" />
-        </el-form-item>
-        <el-form-item label="档案图片" prop="pictures">
-          <image-upload v-model="form.pictures"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-carousel height="600px" v-if="form.pictures" :autoplay="false">
+              <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                <div style="height: 600px; overflow: auto">
+                  <el-image style="height:850px; width: 100%" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                </div>
+              </el-carousel-item>
+            </el-carousel>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="form.name" placeholder="请输入姓名" />
+            </el-form-item>
+            <el-form-item label="户主姓名" prop="hzName">
+              <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
+            </el-form-item>
+            <el-form-item label="与户主关系" prop="relation">
+              <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+            </el-form-item>
+            <el-form-item label="出生日期" prop="birthday">
+              <el-date-picker clearable style="width:100%;"
+                              v-model="form.birthday"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择出生日期">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入地址" />
+            </el-form-item>
+            <el-form-item label="籍贯" prop="jiguan">
+              <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="cardId">
+              <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -219,6 +231,85 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1200px" append-to-body>
+
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="业务类型" prop="ywType">
+              <el-select v-model="form.ywType" placeholder="请选择业务类型">
+                <el-option label="常住人口登记1" value="option1"></el-option>
+                <el-option label="常住人口登记2" value="option3"></el-option>
+                <el-option label="常住人口登记3" value="option9"></el-option>
+                <el-option label="常住卡" value="option2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="档案目录ID" prop="muId">
+              <el-input readonly  placeholder="请选择档案目录ID" v-model="form.muId">
+                <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-button type="primary" @click="selectDaRecard" style="margin-left: 10px;">选择档案记录</el-button>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
+          <el-col :span="12">
+            <el-carousel height="600px" :autoplay="false">
+              <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                <div style="height: 600px; overflow: auto">
+                  <el-image style="height:850px; width: 100%" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                </div>
+              </el-carousel-item>
+            </el-carousel>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="form.name" placeholder="请输入姓名" />
+            </el-form-item>
+            <el-form-item label="户主姓名" prop="hzName">
+              <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
+            </el-form-item>
+            <el-form-item label="与户主关系" prop="relation">
+              <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+            </el-form-item>
+            <el-form-item label="出生日期" prop="birthday">
+              <el-date-picker clearable style="width:100%;"
+                              v-model="form.birthday"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择出生日期">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入地址" />
+            </el-form-item>
+            <el-form-item label="籍贯" prop="jiguan">
+              <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="cardId">
+              <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+
+    </el-dialog>
+
     <!-- 审核对话框 -->
     <el-dialog title="审核" :visible.sync="shenHe.open" width="500px" append-to-body>
       <el-form ref="shenHeForm" :model="shenHe.form" :rules="shenHe.rules" label-width="90px">
@@ -242,15 +333,126 @@
       </div>
     </el-dialog>
 
+    <!--选择档案历史记录-->
+    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
+      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+
+        <el-form-item label="物理书架路径" prop="wlsjPath">
+          <el-input
+            v-model="dalsInfo.queryParams.wlsjPath"
+            placeholder="请输入物理书架路径"
+            clearable
+            @keyup.enter.native="dalsInfoQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="是否已经识别" prop="recognize">
+          <el-select
+            v-model="dalsInfo.queryParams.recognize"
+            placeholder="是否已经识别"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.recognize"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="图片名称" prop="picName">
+          <el-input
+            v-model="dalsInfo.queryParams.picName"
+            placeholder="请输入图片名称"
+            clearable
+            @keyup.enter.native="dalsInfoQuery"
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="dalsInfoQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" border height="500" @selection-change="dalsInfoDblclick">
+        <el-table-column type="selection" width="50" align="center" fixed/>
+        <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="50"/>
+        <el-table-column label="档案目录路径" align="center" prop="muPath" fixed min-width="100" show-overflow-tooltip/>
+        <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="是否已经识别" align="center" prop="recognize" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="图片路径" align="center" prop="picUrl">
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="dalsInfo.total>0"
+        :total="dalsInfo.total"
+        :page.sync="dalsInfo.queryParams.pageNum"
+        :limit.sync="dalsInfo.queryParams.pageSize"
+        @pagination="getlistPictureRecard"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dalsSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!--选择档案目录-->
+    <el-dialog title="选择档案目录" :visible.sync="damlInfo.visible" width="1200px" append-to-body>
+      <el-table v-if="damlInfo.refreshTable"
+                v-loading="damlInfo.loading"
+                :data="damlInfo.list"
+                row-key="id"
+                :default-expand-all="damlInfo.isExpandAll"
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @cell-dblclick="damlInfoDblclick">
+        <el-table-column label="目录名称" align="left" header-align="center" prop="muName"/>
+        <el-table-column label="业务类型" align="center" prop="ywType" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="显示顺序" align="center" prop="orderNum" />
+        <el-table-column label="状态" align="center" prop="status" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="图片" align="center" prop="picPath" >
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.picPath" :width="50" :height="50" v-if="scope.row.pid===0"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+      </el-table>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { listCzrkdj, getCzrkdj, delCzrkdj, updateCzrkdj } from "@/api/dangan/czrkdj";
+import { listCzrkdj, getCzrkdj, delCzrkdj, addCzrkdj, updateCzrkdj } from "@/api/dangan/czrkdj";
+import { listCatalog } from "@/api/dangan/catalog";
+import { listPictureRecard } from "@/api/dangan/pictureRecard";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Czrkdj",
-  dicts: ['error_correct', 'audit_status'],
+  components: { Treeselect },
+  dicts: ['error_correct', 'audit_status', 'recognize', 'yw_type', 'sys_normal_disable', 'area_type'],
   data() {
     return {
       // 遮罩层
@@ -261,10 +463,12 @@ export default {
       total: 0,
       // 常住人口登记表格数据
       czrkdjList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
+      // 目录树选项
+      muOptions: [],
+      // 是否显示纠错弹出层
+      open_jc: false,
+      // 是否显示纠错弹出层
+      open_add: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -282,11 +486,19 @@ export default {
       },
       // 表单参数
       form: {},
+      // 识别list
+      shiBieList: [],
       // 表单校验
       rules: {
+        ywType: [
+          { required: true, message: "业务类型不能为空", trigger: "blur" }
+        ],
         muId: [
           { required: true, message: "目录ID不能为空", trigger: "blur" }
         ],
+        name: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
       },
       // 审核
       shenHe:{
@@ -304,6 +516,41 @@ export default {
           ],
         }
       },
+      // 档案历史记录
+      dalsInfo: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
+      },
+      // 档案目录
+      damlInfo:{
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 是否展开，默认全部折叠
+        isExpandAll: false,
+        // 重新渲染表格状态
+        refreshTable: true,
+        // 查询参数
+        queryParams:{
+          ywType: null,
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
+      }
     };
   },
   created() {
@@ -322,7 +569,8 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open_jc = false;
+      this.open_add = false
       this.reset();
     },
     // 表单重置
@@ -358,14 +606,18 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open_add = true;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id
       getCzrkdj(id).then(response => {
         this.form = response.data;
-        this.open = true;
-        this.title = "修改常住人口登记";
+        this.open_jc = true;
       });
     },
     /** 提交按钮 */
@@ -376,7 +628,7 @@ export default {
             this.form.errorCorrect = 1;
             updateCzrkdj(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.open_jc = false;
               this.getList();
             });
           }
@@ -422,6 +674,133 @@ export default {
         }
       });
     },
+    // 选择档案记录
+    selectDaRecard(){
+      if(this.form.muId){
+        this.dalsInfo.queryParams.muId = this.form.muId;
+        this.getlistPictureRecard()
+        this.dalsInfo.visible = true;
+      }else {
+        this.$alert(`请先选择档案目录`, `提示`, {
+          type: 'warning'
+        });
+      }
+    },
+    // 档案历史记录查询
+    dalsInfoQuery(){
+      this.dalsInfo.queryParams.pageNum = 1;
+      this.getlistPictureRecard();
+    },
+    // 档案历史选择 选中数据
+    dalsInfoDblclick(row) {
+      this.dalsInfo.selectRow = row;
+    },
+    // 档案历史确认选中
+    dalsSubmit(){
+      // 是否是常住人口登记表1 :   常住人口登记表1 双面识别
+      if(this.form.ywType==='option1'){
+        if(this.dalsInfo.selectRow.length===2){
+          this.dalsInfo.visible = false;
+          this.shiBieList = this.dalsInfo.selectRow
+        }else {
+          this.$alert(`选择2条档案历史记录数据`, `提示`, {
+            type: 'warning'
+          });
+        }
+      }else {
+        if(this.dalsInfo.selectRow.length===1){
+          this.dalsInfo.visible = false;
+          this.shiBieList = this.dalsInfo.selectRow
+        }else {
+          this.$alert(`选择1条档案历史记录数据`, `提示`, {
+            type: 'warning'
+          });
+        }
+      }
+    },
+    /** 查询档案历史记录列表 */
+    getlistPictureRecard() {
+      this.dalsInfo.loading = true;
+      listPictureRecard(this.dalsInfo.queryParams).then(response => {
+        this.dalsInfo.list = response.rows;
+        this.dalsInfo.total = response.total;
+        this.dalsInfo.loading = false;
+      });
+    },
+    // 档案目录选择
+    muIdChange(){
+      if(this.form.ywType){
+        this.damlInfo.visible = true;
+        this.damlInfo.queryParams.ywType = this.form.ywType;
+        this.getlistCatalog()
+      }else {
+        this.$alert(`请先选择业务类型`, `提示`, {
+          type: 'warning'
+        });
+      }
+    },
+    // 获取档案目录
+    getlistCatalog(){
+      this.damlInfo.loading = true;
+      listCatalog(this.damlInfo.queryParams).then(response => {
+        this.damlInfo.list = this.handleTree(response.data, "id","pid");
+        this.damlInfo.loading = false;
+      });
+    },
+    // 双击选择档案目录
+    damlInfoDblclick(row){
+      this.damlInfo.selectRow = row;
+      this.form.muId = row.id
+      this.damlInfo.visible = false
+    },
+    /** 新增手动识别提交按钮 */
+    addSubmitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if(this.shiBieList&&this.shiBieList.length>0){
+            // 识别图片id
+            this.form.picIds='';
+            // 识别图片地址
+            this.form.pictures='';
+            // 相关图片id
+            this.form.allPicIds='';
+            // 相关图片id
+            this.form.allPics='';
+
+            this.shiBieList.forEach(item=>{
+              this.form.picIds += item.id+',';
+              // 识别图片地址
+              this.form.pictures += item.picUrl+',';
+              // 相关图片id
+              this.form.allPicIds += item.id+',';
+              // 相关图片id
+              this.form.allPics += item.picUrl+',';
+            })
+
+            this.form.picIds= this.form.picIds.slice(0, -1);
+            this.form.pictures= this.form.pictures.slice(0, -1);
+            this.form.allPicIds= this.form.allPicIds.slice(0, -1);
+            this.form.allPics= this.form.allPics.slice(0, -1);
+
+            addCzrkdj(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open_add = false;
+              this.getList();
+            });
+          }else {
+            this.$alert(`请先点击【选择档案记录】或【直接上传】选择识别图片`, `提示`, {
+              type: 'warning'
+            });
+          }
+        }
+      });
+    },
   }
 };
 </script>
+
+<style lang="scss">
+.el-carousel__item{
+  background-color: #b5c2d2;
+}
+</style>
diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue
index 15b0dc3..38178db 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -1,18 +1,26 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="图片名称" prop="picName">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="档案目录ID" prop="muId">
         <el-input
-          v-model="queryParams.picName"
-          placeholder="请输入图片名称"
+          v-model="queryParams.muId"
+          placeholder="请输入档案目录ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="图片路径" prop="picUrl">
+      <el-form-item label="档案目录路径" prop="muPath">
         <el-input
-          v-model="queryParams.picUrl"
-          placeholder="请输入图片路径"
+          v-model="queryParams.muPath"
+          placeholder="请输入档案目录路径"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="图片名称" prop="picName">
+        <el-input
+          v-model="queryParams.picName"
+          placeholder="请输入图片名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -33,30 +41,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="档案目录ID" prop="muId">
-        <el-input
-          v-model="queryParams.muId"
-          placeholder="请输入档案目录ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="档案目录路径" prop="muPath">
-        <el-input
-          v-model="queryParams.muPath"
-          placeholder="请输入档案目录路径"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="是否已经识别" prop="recognize">
-        <el-input
+        <el-select
           v-model="queryParams.recognize"
-          placeholder="请输入是否已经识别"
+          placeholder="是否已经识别"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.recognize"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -64,28 +64,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['dangan:pictureRecard:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['dangan:pictureRecard:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      <el-col :span="2">
         <el-button
           type="danger"
           plain
@@ -96,39 +75,33 @@
           v-hasPermi="['dangan:pictureRecard:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dangan:pictureRecard:export']"
-        >导出</el-button>
+      <el-col :span="22" style="display: flex; align-items: center; justify-content: end">
+        <el-checkbox v-model="isSuangMian" style="margin-right: 10px;">双面</el-checkbox>
+        <el-button icon="el-icon-full-screen" type="primary" @click="OCRRecognition">OCR识别</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="pictureRecardList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="上传时间" align="center" prop="createTime" />
-      <el-table-column label="图片名称" align="center" prop="picName" />
-      <el-table-column label="图片路径" align="center" prop="picUrl" />
+    <el-table v-loading="loading" :data="pictureRecardList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="50" align="center" fixed/>
+      <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="50"/>
+      <el-table-column label="档案目录路径" align="center" prop="muPath" fixed min-width="100" show-overflow-tooltip/>
       <el-table-column label="物理书架ID" align="center" prop="wlsjId" />
-      <el-table-column label="物理书架路径" align="center" prop="wlsjPath" />
-      <el-table-column label="档案目录ID" align="center" prop="muId" />
-      <el-table-column label="档案目录路径" align="center" prop="muPath" />
-      <el-table-column label="是否已经识别" align="center" prop="recognize" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="是否已经识别" align="center" prop="recognize" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="上传时间" align="center" prop="createTime" />
+      <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="图片路径" align="center" prop="picUrl">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.picUrl" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['dangan:pictureRecard:edit']"
-          >修改</el-button>
           <el-button
             size="mini"
             type="text"
@@ -148,47 +121,21 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改档案图片信息记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="图片名称" prop="picName">
-          <el-input v-model="form.picName" placeholder="请输入图片名称" />
-        </el-form-item>
-        <el-form-item label="图片路径" prop="picUrl">
-          <el-input v-model="form.picUrl" placeholder="请输入图片路径" />
-        </el-form-item>
-        <el-form-item label="物理书架ID" prop="wlsjId">
-          <el-input v-model="form.wlsjId" placeholder="请输入物理书架ID" />
-        </el-form-item>
-        <el-form-item label="物理书架路径" prop="wlsjPath">
-          <el-input v-model="form.wlsjPath" placeholder="请输入物理书架路径" />
-        </el-form-item>
-        <el-form-item label="档案目录ID" prop="muId">
-          <el-input v-model="form.muId" placeholder="请输入档案目录ID" />
-        </el-form-item>
-        <el-form-item label="档案目录路径" prop="muPath">
-          <el-input v-model="form.muPath" placeholder="请输入档案目录路径" />
-        </el-form-item>
-        <el-form-item label="是否已经识别" prop="recognize">
-          <el-input v-model="form.recognize" placeholder="请输入是否已经识别" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <div class="myProgress" v-show="openProgress">
+      <el-progress type="circle" :percentage="percentage"></el-progress>
+      <div style="margin-top:20px;">拼命识别中...</div>
+    </div>
+
   </div>
 </template>
 
 <script>
-import { listPictureRecard, getPictureRecard, delPictureRecard, addPictureRecard, updatePictureRecard } from "@/api/dangan/pictureRecard";
+import { listPictureRecard, delPictureRecard } from "@/api/dangan/pictureRecard";
+import { collectRecongnize, collectProgress, collectRecongnizeZu } from "@/api/dangan/collection";
 
 export default {
   name: "PictureRecard",
+  dicts: ['recognize'],
   data() {
     return {
       // 遮罩层
@@ -205,10 +152,6 @@ export default {
       total: 0,
       // 档案图片信息记录表格数据
       pictureRecardList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -221,20 +164,16 @@ export default {
         muPath: null,
         recognize: null,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        picName: [
-          { required: true, message: "图片名称不能为空", trigger: "blur" }
-        ],
-        picUrl: [
-          { required: true, message: "图片路径不能为空", trigger: "blur" }
-        ],
-      }
+      percentage: 0,
+      openProgress: false,
+      // 是否双面
+      isSuangMian: false,
+      // 选中记录
+      selectionList: []
     };
   },
   created() {
+    this.queryParams.muId = this.$route.query.muId || undefined
     this.getList();
   },
   methods: {
@@ -247,30 +186,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        picName: null,
-        picUrl: null,
-        wlsjId: null,
-        wlsjPath: null,
-        muId: null,
-        muPath: null,
-        recognize: null,
-        remark: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -283,46 +198,11 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.selectionList = selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加档案图片信息记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getPictureRecard(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改档案图片信息记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updatePictureRecard(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPictureRecard(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -333,12 +213,51 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('dangan/pictureRecard/export', {
-        ...this.queryParams
-      }, `pictureRecard_${new Date().getTime()}.xlsx`)
-    }
+    // OCR识别
+    OCRRecognition(){
+      let arr = [];
+      let singeOrDouble = 0
+      if(this.isSuangMian){
+        singeOrDouble = 1
+      }
+      this.selectionList.forEach(item => {
+        item.singeOrDouble = singeOrDouble
+        arr.push(item);
+      })
+      if(arr.length>0){
+        collectRecongnize(arr).then(response => {
+          this.selectionList = [];
+          this.$modal.msgSuccess("操作成功");
+          this.getList();
+        });
+      }else {
+        this.$alert(`请先选择需要识别的档案！`, `提示`, {
+          type: 'warning'
+        });
+      }
+    },
+    /** 查询目录列表 */
+    getProgress() {
+      collectProgress().then(response => {
+        this.percentage = response*100;
+      });
+    },
   }
 };
 </script>
+
+<style lang="scss">
+.myProgress{
+  position: absolute;
+  top:0;
+  left:0;
+  width: 100%;
+  height: 100%;
+  background: rgba(255,255,255,0.8);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-size: 20px;
+}
+</style>
diff --git a/dangan-ui/src/views/dangan/retrieval/index.vue b/dangan-ui/src/views/dangan/retrieval/index.vue
index 514c434..4dd33b7 100644
--- a/dangan-ui/src/views/dangan/retrieval/index.vue
+++ b/dangan-ui/src/views/dangan/retrieval/index.vue
@@ -6,12 +6,9 @@
         <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 :label="0">常住人口登记表</el-checkbox>
-        <el-checkbox :label="1">出生登记</el-checkbox>
-        <el-checkbox :label="2">户口迁移</el-checkbox>
-        <el-checkbox :label="3">变更更正</el-checkbox>
-        <el-checkbox :label="4">编码表</el-checkbox>
-        <el-checkbox :label="5">其它</el-checkbox>
+        <el-checkbox v-for="dict in dict.type.yw_type"
+                     :key="dict.value"
+                     :label="dict.value">{{ dict.label }}</el-checkbox>
       </el-checkbox-group>
     </div>
 
@@ -323,6 +320,7 @@ import { listCzrkdj } from "@/api/dangan/czrkdj";
 
 export default {
   name: "Retrieval",
+  dicts: ['yw_type'],
   data() {
     return {
       // 显示搜索条件
@@ -398,7 +396,7 @@ export default {
   },
   methods: {
     handleQuery(){
-      if(this.checkList.indexOf(0) !== -1){
+      if(this.checkList.indexOf('0') !== -1){
         this.czrkdj.open = true
         this.czrkdj.qParams.name = this.keyword
         this.czrkdjQuery();
@@ -408,7 +406,7 @@ export default {
         this.czrkdj.total = 0;
       }
 
-      if(this.checkList.indexOf(1) !== -1){
+      if(this.checkList.indexOf('1') !== -1){
         this.csdj.open = true
         this.csdj.qParams.name = this.keyword
         // this.csdjQuery();
@@ -418,7 +416,7 @@ export default {
         this.csdj.total = 0;
       }
 
-      if(this.checkList.indexOf(2) !== -1){
+      if(this.checkList.indexOf('2') !== -1){
         this.hkqy.open = true
         this.hkqy.qParams.name = this.keyword
         // this.hkqyQuery();
@@ -428,7 +426,7 @@ export default {
         this.hkqy.total = 0;
       }
 
-      if(this.checkList.indexOf(3) !== -1){
+      if(this.checkList.indexOf('3') !== -1){
         this.bggz.open = true
         this.bggz.qParams.name = this.keyword
         // this.bggzQuery();
@@ -438,7 +436,7 @@ export default {
         this.bggz.total = 0;
       }
 
-      if(this.checkList.indexOf(4) !== -1){
+      if(this.checkList.indexOf('4') !== -1){
         this.bmb.open = true
         this.bmb.qParams.name = this.keyword
         // this.bmbQuery();
@@ -448,7 +446,7 @@ export default {
         this.bmb.total = 0;
       }
 
-      if(this.checkList.indexOf(5) !== -1){
+      if(this.checkList.indexOf('5') !== -1){
         this.qt.open = true
         this.qt.qParams.name = this.keyword
         // this.qtQuery();
@@ -528,6 +526,10 @@ export default {
   height: 20px;
 }
 
+::v-deep .el-checkbox{
+  margin-bottom: 15px;
+}
+
 ::v-deep .el-checkbox__inner::after {
   height: 10px;
   left: 7px;
diff --git a/dangan-ui/src/views/index.vue b/dangan-ui/src/views/index.vue
index 514c434..4dd33b7 100644
--- a/dangan-ui/src/views/index.vue
+++ b/dangan-ui/src/views/index.vue
@@ -6,12 +6,9 @@
         <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 :label="0">常住人口登记表</el-checkbox>
-        <el-checkbox :label="1">出生登记</el-checkbox>
-        <el-checkbox :label="2">户口迁移</el-checkbox>
-        <el-checkbox :label="3">变更更正</el-checkbox>
-        <el-checkbox :label="4">编码表</el-checkbox>
-        <el-checkbox :label="5">其它</el-checkbox>
+        <el-checkbox v-for="dict in dict.type.yw_type"
+                     :key="dict.value"
+                     :label="dict.value">{{ dict.label }}</el-checkbox>
       </el-checkbox-group>
     </div>
 
@@ -323,6 +320,7 @@ import { listCzrkdj } from "@/api/dangan/czrkdj";
 
 export default {
   name: "Retrieval",
+  dicts: ['yw_type'],
   data() {
     return {
       // 显示搜索条件
@@ -398,7 +396,7 @@ export default {
   },
   methods: {
     handleQuery(){
-      if(this.checkList.indexOf(0) !== -1){
+      if(this.checkList.indexOf('0') !== -1){
         this.czrkdj.open = true
         this.czrkdj.qParams.name = this.keyword
         this.czrkdjQuery();
@@ -408,7 +406,7 @@ export default {
         this.czrkdj.total = 0;
       }
 
-      if(this.checkList.indexOf(1) !== -1){
+      if(this.checkList.indexOf('1') !== -1){
         this.csdj.open = true
         this.csdj.qParams.name = this.keyword
         // this.csdjQuery();
@@ -418,7 +416,7 @@ export default {
         this.csdj.total = 0;
       }
 
-      if(this.checkList.indexOf(2) !== -1){
+      if(this.checkList.indexOf('2') !== -1){
         this.hkqy.open = true
         this.hkqy.qParams.name = this.keyword
         // this.hkqyQuery();
@@ -428,7 +426,7 @@ export default {
         this.hkqy.total = 0;
       }
 
-      if(this.checkList.indexOf(3) !== -1){
+      if(this.checkList.indexOf('3') !== -1){
         this.bggz.open = true
         this.bggz.qParams.name = this.keyword
         // this.bggzQuery();
@@ -438,7 +436,7 @@ export default {
         this.bggz.total = 0;
       }
 
-      if(this.checkList.indexOf(4) !== -1){
+      if(this.checkList.indexOf('4') !== -1){
         this.bmb.open = true
         this.bmb.qParams.name = this.keyword
         // this.bmbQuery();
@@ -448,7 +446,7 @@ export default {
         this.bmb.total = 0;
       }
 
-      if(this.checkList.indexOf(5) !== -1){
+      if(this.checkList.indexOf('5') !== -1){
         this.qt.open = true
         this.qt.qParams.name = this.keyword
         // this.qtQuery();
@@ -528,6 +526,10 @@ export default {
   height: 20px;
 }
 
+::v-deep .el-checkbox{
+  margin-bottom: 15px;
+}
+
 ::v-deep .el-checkbox__inner::after {
   height: 10px;
   left: 7px;