diff --git a/dangan-ui/src/api/dangan/retrieval.js b/dangan-ui/src/api/dangan/retrieval.js
index 4ec547e..1287601 100644
--- a/dangan-ui/src/api/dangan/retrieval.js
+++ b/dangan-ui/src/api/dangan/retrieval.js
@@ -14,7 +14,7 @@ export function listCzrkdj(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 出生医学证明
 export function listBirthDJ(query) {
   return request({
     url: '/dangan/search/cszm',
@@ -24,7 +24,7 @@ export function listBirthDJ(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 迁移证
 export function listQyz(query) {
   return request({
     url: '/dangan/search/qyz',
@@ -34,7 +34,7 @@ export function listQyz(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 一胎证明
 export function listYtzm(query) {
   return request({
     url: '/dangan/search/ytzm',
@@ -44,7 +44,7 @@ export function listYtzm(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 转非农业人口批复存根
 export function listZfnyhkcg(query) {
   return request({
     url: '/dangan/search/zfny',
@@ -54,7 +54,7 @@ export function listZfnyhkcg(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 准迁证
 export function listZqz(query) {
   return request({
     url: '/dangan/search/zqz',
@@ -77,7 +77,7 @@ export function listCzrkdj1(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 查询出生医学证明列表
 export function listBirthDJ1(query) {
   return request({
     url: '/dangan/search/cszm1',
@@ -87,7 +87,7 @@ export function listBirthDJ1(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 查询迁移证列表
 export function listQyz1(query) {
   return request({
     url: '/dangan/search/qyz1',
@@ -97,7 +97,7 @@ export function listQyz1(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 查询一胎证明列表
 export function listYtzm1(query) {
   return request({
     url: '/dangan/search/ytzm1',
@@ -107,7 +107,7 @@ export function listYtzm1(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 查询转非农业人口批复存根列表
 export function listZfnyhkcg1(query) {
   return request({
     url: '/dangan/search/zfny1',
@@ -117,7 +117,7 @@ export function listZfnyhkcg1(query) {
   })
 }
 
-// 查询常住人口登记列表
+// 查询准迁证列表
 export function listZqz1(query) {
   return request({
     url: '/dangan/search/zqz1',
diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index be3c49c..89bae02 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -109,6 +109,7 @@
         <el-table v-loading="loading" :data="czrkdjList" border>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="180" show-overflow-tooltip fixed/>
           <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
+          <el-table-column label="全文识别内容" align="center" prop="allInfo" min-width="200" show-overflow-tooltip/>
           <el-table-column label="户主或与户主关系" align="center" prop="relation" min-width="130" show-overflow-tooltip/>
           <el-table-column label="姓名" align="center" prop="name" min-width="100" show-overflow-tooltip/>
           <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
diff --git a/dangan-ui/src/views/dangan/quanwen/index.vue b/dangan-ui/src/views/dangan/quanwen/index.vue
index eb4e633..141cc63 100644
--- a/dangan-ui/src/views/dangan/quanwen/index.vue
+++ b/dangan-ui/src/views/dangan/quanwen/index.vue
@@ -1,15 +1,48 @@
 <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="任务id" prop="taskId">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="任务ID" prop="taskId">
         <el-input
           v-model="queryParams.taskId"
-          placeholder="请输入任务id"
+          placeholder="请输入任务ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="目录id" prop="muId">
+      <el-form-item label="纠错状态" prop="errorCorrect">
+        <el-select
+          v-model="queryParams.errorCorrect"
+          placeholder="纠错状态"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.error_correct"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="auditStatus">
+        <el-select
+          v-model="queryParams.auditStatus"
+          placeholder="审核状态"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.audit_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="排除空记录" prop="flag">
+        <el-checkbox v-model="queryParams.flag" :true-label="1" :false-label="0" @change="handleQuery"></el-checkbox>
+      </el-form-item>
+<!--      <el-form-item label="目录id" prop="muId">
         <el-input
           v-model="queryParams.muId"
           placeholder="请输入目录id"
@@ -72,7 +105,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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>
@@ -88,29 +121,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['dangan:quanwen: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:quanwen:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['dangan:quanwen:remove']"
-        >删除</el-button>
+        >新增手动识别</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -125,24 +136,38 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="quanwenList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="全文识别内容" align="center" prop="allInfo" />
-      <el-table-column label="任务id" align="center" prop="taskId" />
-      <el-table-column label="业务类型(字典)" align="center" prop="ywType" />
-      <el-table-column label="目录id" align="center" prop="muId" />
+    <el-table v-loading="loading" :data="quanwenList" border>
       <el-table-column label="档案目录路径" align="center" prop="muPath" />
-      <el-table-column label="识别图片id" align="center" prop="picIds" />
-      <el-table-column label="识别图片" align="center" prop="pictures" />
-      <el-table-column label="相关图片id" align="center" prop="allPicIds" />
-      <el-table-column label="相关图片" align="center" prop="allPics" />
-      <el-table-column label="是否纠错(字典0否1是)" align="center" prop="errorCorrect" />
-      <el-table-column label="审核状态(字典)" align="center" prop="auditStatus" />
-      <el-table-column label="审核人" align="center" prop="auditName" />
+      <el-table-column label="任务ID" align="center" prop="taskId" />
+      <el-table-column label="全文识别内容" align="center" prop="allInfo" min-width="200" show-overflow-tooltip/>
+<!--      <el-table-column label="业务类型(字典)" align="center" prop="ywType" />-->
+<!--      <el-table-column label="目录id" align="center" prop="muId" />
+      <el-table-column label="识别图片id" align="center" prop="picIds" />-->
+      <el-table-column label="识别图片" align="center" prop="pictures">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="相关图片id" align="center" prop="allPicIds" />-->
+      <!--      <el-table-column label="相关图片" align="center" prop="allPics">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="纠错状态" align="center" prop="errorCorrect" min-width="100" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.error_correct" :value="scope.row.errorCorrect"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="auditStatus" min-width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="审核人" align="center" prop="auditName" />-->
       <el-table-column label="审核结果" align="center" prop="auditResult" />
       <el-table-column label="审核原由" align="center" prop="auditReason" />
-      <el-table-column label="备注" align="center" prop="remark" />
+<!--      <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
@@ -151,7 +176,14 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['dangan:quanwen:edit']"
-          >修改</el-button>
+          >纠错</el-button>
+          <el-button
+            v-if="scope.row.auditStatus=='0'"
+            size="mini"
+            type="text"
+            @click="handleShenHe(scope.row)"
+            v-hasPermi="['dangan:quanwen:audit']"
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"
@@ -159,10 +191,15 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['dangan:quanwen:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDetail(scope.row)"
+          >图片详情</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -171,72 +208,224 @@
       @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="allInfo">
-          <el-input v-model="form.allInfo" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="任务id" prop="taskId">
-          <el-input v-model="form.taskId" placeholder="请输入任务id" />
-        </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="识别图片id" prop="picIds">
-          <el-input v-model="form.picIds" placeholder="请输入识别图片id" />
-        </el-form-item>
-        <el-form-item label="识别图片" prop="pictures">
-          <el-input v-model="form.pictures" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="相关图片id" prop="allPicIds">
-          <el-input v-model="form.allPicIds" placeholder="请输入相关图片id" />
-        </el-form-item>
-        <el-form-item label="相关图片" prop="allPics">
-          <el-input v-model="form.allPics" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="是否纠错(字典0否1是)" prop="errorCorrect">
-          <el-input v-model="form.errorCorrect" placeholder="请输入是否纠错(字典0否1是)" />
+    <!-- 纠错 新-->
+    <el-dialog title="纠错" :visible.sync="open_jc" width="90%" append-to-body top="10px !important">
+      <div style="min-height: 85vh;">
+        <el-form ref="form" :model="form" :rules="rules">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-carousel height="calc(86vh - 100px)" v-if="form.pictures" :autoplay="false">
+                <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height: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="allInfo" label-width="100px">
+                <el-input v-model="form.allInfo" type="textarea" placeholder="请输入全文识别内容" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!--    新增手动识别   新-->
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="90%" append-to-body top="10px !important">
+      <div style="min-height: 85vh;">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="档案目录路径" prop="muPath">
+                <el-input readonly  placeholder="档案目录路径" v-model="form.muPath">
+                  <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="calc(86vh - 100px)" :autoplay="false">
+                <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                  <div class="jc_sb_img" style="height:100%; overflow:auto; text-align:center; font-size:0">
+                    <el-image style="height: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="allInfo" label-width="100px">
+                <el-input v-model="form.allInfo" type="textarea" placeholder="请输入全文识别内容" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+        </el-form>
+
+        <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
+          <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </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">
+        <el-form-item label="审核结果" prop="auditResult">
+          <el-select
+            v-model="shenHe.form.auditResult"
+            placeholder="请选择审核结果"
+            clearable
+            style="width:100%"
+          >
+            <el-option label="通过" value="1"/>
+            <el-option label="不通过" value="2"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="审核人" prop="auditName">
-          <el-input v-model="form.auditName" placeholder="请输入审核人" />
+        <el-form-item label="审核原因" prop="auditReason">
+          <el-input v-model="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
         </el-form-item>
-        <el-form-item label="审核结果" prop="auditResult">
-          <el-input v-model="form.auditResult" placeholder="请输入审核结果" />
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="shenHeSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!--选择档案历史记录-->
+    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
+      <el-form :model="dalsInfo.queryParams" ref="queryFormDals" size="small" :inline="true" label-width="100px">
+
+        <el-form-item label="图片ID" prop="id">
+          <el-input
+            v-model="dalsInfo.queryParams.id"
+            placeholder="请输入图片ID"
+            clearable
+            @keyup.enter.native="dalsInfoQuery"
+          />
         </el-form-item>
-        <el-form-item label="审核原由" prop="auditReason">
-          <el-input v-model="form.auditReason" placeholder="请输入审核原由" />
+
+        <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="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+
+        <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"/>
+        <el-table-column label="图片ID" align="center" prop="id"  min-width="50"/>
+        <el-table-column label="档案目录路径" align="center" prop="muPath" 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="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="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="dalsSubmit">确 定</el-button>
       </div>
     </el-dialog>
+
+    <!--选择档案目录-->
+    <el-dialog title="选择档案目录" :visible.sync="damlInfo.visible" width="500px" append-to-body>
+      <div style="min-height: 300px;max-height: 500px;overflow-y: auto">
+        <el-tree
+          :data="damlInfo.list"
+          :props="{
+          children: 'children',
+          label: 'muName'
+        }"
+          :expand-on-click-node="false"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"
+        />
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="damlInfoSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 查看图片详情 -->
+    <el-dialog title="图片详情" :visible.sync="sbtp.open" width="1000px" append-to-body top="6vh">
+      <div>
+        <el-table v-loading="sbtp.loading" :data="sbtp.list" border>
+          <el-table-column label="图片ID" align="center" prop="id" fixed min-width="90"/>
+          <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
+          <el-table-column label="上传时间" align="center" prop="createTime" min-width="120" 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>
+        <pagination
+          v-show="sbtp.total>0"
+          :total="sbtp.total"
+          :page.sync="sbtp.queryParams.pageNum"
+          :limit.sync="sbtp.queryParams.pageSize"
+          @pagination="sbtpQuery"
+        />
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listQuanwen, getQuanwen, delQuanwen, addQuanwen, updateQuanwen } from "@/api/dangan/quanwen";
+import { listByIds } from "@/api/dangan/task";
+import { listCatalog } from "@/api/dangan/catalog";
+import { listPictureRecard } from "@/api/dangan/pictureRecard";
 
 export default {
   name: "Quanwen",
+  dicts: ['error_correct', 'audit_status', 'recognize', 'yw_type'],
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -245,15 +434,18 @@ export default {
       quanwenList: [],
       // 弹出层标题
       title: "",
-      // 是否显示弹出层
-      open: false,
+      // 是否显示纠错弹出层
+      open_jc: false,
+      // 是否显示新增弹出层
+      open_add: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         allInfo: null,
         taskId: null,
-        ywType: null,
+        ywType: 'option12',
+        flag: 1,
         muId: null,
         muPath: null,
         picIds: null,
@@ -268,18 +460,84 @@ export default {
       },
       // 表单参数
       form: {},
+      // 识别list
+      shiBieList: [],
       // 表单校验
       rules: {
-        ywType: [
-          { required: true, message: "业务类型(字典)不能为空", trigger: "change" }
-        ],
-        muId: [
-          { required: true, message: "目录id不能为空", trigger: "blur" }
-        ],
+        muPath: [
+          { required: true, message: "档案目录路径不能为空", trigger: "blur" }
+        ]
+      },
+      // 审核
+      shenHe:{
+        // 是否显示审核弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          auditResult: [
+            { required: true, message: "审核结果不能为空", trigger: "blur" }
+          ],
+          auditReason: [
+            { required: true, message: "审核原因不能为空", trigger: "blur" }
+          ],
+        }
+      },
+      // 档案历史记录
+      dalsInfo: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10,
+          id: null,
+          recognize: null
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
+      },
+      // 档案目录
+      damlInfo:{
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询参数
+        queryParams:{
+          ywType: 'option12',
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        node: null
+      },
+      // 相关图片
+      sbtp:{
+        title: null,
+        open: false,
+        list: [],
+        total: 0,
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10,
+          ids: null
+        }
       }
     };
   },
   created() {
+    if(this.$route.query.muId){
+      this.queryParams.muId = this.$route.query.muId;
+    }
+    if(this.$route.query.taskId){
+      this.queryParams.taskId = this.$route.query.taskId;
+    }
     this.getList();
   },
   methods: {
@@ -294,7 +552,8 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open_jc = false;
+      this.open_add = false
       this.reset();
     },
     // 表单重置
@@ -303,7 +562,7 @@ export default {
         id: null,
         allInfo: null,
         taskId: null,
-        ywType: null,
+        ywType: 'option12',
         muId: null,
         muPath: null,
         picIds: null,
@@ -321,6 +580,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
+      this.shiBieList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -333,26 +593,18 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(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 = "添加全文识别";
+      this.open_add = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id
       getQuanwen(id).then(response => {
         this.form = response.data;
-        this.open = true;
-        this.title = "修改全文识别";
+        this.open_jc = true;
       });
     },
     /** 提交按钮 */
@@ -360,15 +612,10 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.errorCorrect = 1;
             updateQuanwen(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addQuanwen(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
+              this.open_jc = false;
               this.getList();
             });
           }
@@ -377,8 +624,8 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除全文识别编号为"' + ids + '"的数据项？').then(function() {
+      const ids = row.id;
+      this.$modal.confirm('是否确认删除该数据项').then(function() {
         return delQuanwen(ids);
       }).then(() => {
         this.getList();
@@ -390,7 +637,174 @@ export default {
       this.download('dangan/quanwen/export', {
         ...this.queryParams
       }, `quanwen_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 审核按钮操作 */
+    handleShenHe(row) {
+      this.reset();
+      this.resetForm("shenHeForm");
+      const id = row.id
+      getQuanwen(id).then(response => {
+        this.shenHe.form = response.data;
+        this.shenHe.open  = true;
+      });
+    },
+    // 审核提交
+    shenHeSubmit(){
+      this.$refs["shenHeForm"].validate(valid => {
+        if (valid) {
+          this.shenHe.form.auditStatus = this.shenHe.form.auditResult
+          updateQuanwen(this.shenHe.form).then(response => {
+            this.$modal.msgSuccess("操作成功");
+            this.shenHe.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    // 选择档案记录
+    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(){
+      if(this.dalsInfo.selectRow && 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(){
+      this.damlInfo.visible = true;
+      this.getlistCatalog()
+    },
+    // 获取档案目录
+    getlistCatalog(){
+      this.damlInfo.loading = true;
+      listCatalog(this.damlInfo.queryParams).then(response => {
+        this.damlInfo.list = this.handleTree(response.data, "id","pid");
+        this.damlInfo.loading = false;
+      });
+    },
+    // 点击选择档案目录
+    damlInfoSubmit(){
+      this.form.muId = this.damlInfo.node.data.id;
+      this.form.muPath = this.getAllLabels(this.damlInfo.node);
+      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);
+
+            this.form.auditStatus = '0';
+            this.form.errorCorrect = 2;
+
+            addQuanwen(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open_add = false;
+              this.getList();
+            });
+          }else {
+            this.$alert(`请先点击【选择档案记录】选择识别图片`, `提示`, {
+              type: 'warning'
+            });
+          }
+        }
+      });
+    },
+    // 获取所有label
+    getAllLabels(obj) {
+      let values = '';
+      function getValues(obj) {
+        if(values.length>0){
+          values = obj.label+'/'+values
+        }else {
+          values = obj.label
+        }
+        if(obj.level>1){
+          getValues(obj.parent);
+        }
+      }
+      getValues(obj);
+      return values;
+    },
+    // 节点单击事件
+    handleNodeClick(data, Node) {
+      this.damlInfo.node = Node;
+    },
+    // 图片详情
+    handleDetail(row){
+      console.log(123789,row);
+      this.sbtp.queryParams.pageNum = 1;
+      this.sbtp.queryParams.ids = row.picIds;
+      this.sbtp.open = true;
+      this.sbtpQuery();
+    },
+    sbtpQuery(){
+      this.sbtp.list = [];
+      this.sbtp.loading = true;
+      listByIds(this.sbtp.queryParams).then(response => {
+        this.sbtp.list = response.rows;
+        this.sbtp.total = response.total;
+        this.sbtp.loading = false;
+      }).catch(()=>{
+        this.sbtp.loading = false;
+      });
+    },
   }
 };
 </script>