diff --git a/dangan-ui/src/api/dangan/retrieval.js b/dangan-ui/src/api/dangan/retrieval.js
index 1287601..a8b679f 100644
--- a/dangan-ui/src/api/dangan/retrieval.js
+++ b/dangan-ui/src/api/dangan/retrieval.js
@@ -64,6 +64,16 @@ export function listZqz(query) {
   })
 }
 
+// 全文识别类型
+export function listQw1(query) {
+  return request({
+    url: '/dangan/search/qw1',
+    timeout: 300000,
+    method: 'get',
+    params: query
+  })
+}
+
 
 // ------------------------------------------   不同音 ----------------------------------------------
 
diff --git a/dangan-ui/src/views/dangan/retrieval/index.vue b/dangan-ui/src/views/dangan/retrieval/index.vue
index eeff0fe..47cc044 100644
--- a/dangan-ui/src/views/dangan/retrieval/index.vue
+++ b/dangan-ui/src/views/dangan/retrieval/index.vue
@@ -23,7 +23,7 @@
           <el-checkbox label="option5">迁移证</el-checkbox>
           <el-checkbox label="option8">准迁证</el-checkbox>
           <el-checkbox label="option7">转非农业人口批复存根</el-checkbox>
-          <el-checkbox label="option12">全文识别内容</el-checkbox>
+          <el-checkbox label="option12">全文识别类型</el-checkbox>
 
           <!--          <el-checkbox v-for="dict in dict.type.yw_type"
                                  :key="dict.value"
@@ -400,7 +400,7 @@
 
     <!-- 全文识别内容 -->
     <div class="content" v-if="option12.open&&option12.list&&option12.list.length>0">
-      <el-divider content-position="left">全文识别内容</el-divider>
+      <el-divider content-position="left">全文识别类型</el-divider>
       <el-table v-loading="option12.loading" :data="option12.list" border>
         <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="180" show-overflow-tooltip/>
         <el-table-column label="任务ID" align="center" prop="taskId"  min-width="100" show-overflow-tooltip fixed/>
@@ -447,24 +447,12 @@
             <el-col :span="12">
 
               <!--常住人口登记表1-->
-              <el-row :gutter="10" v-if="option.form.ywType==='option1'">
-                <!--                <el-col :span="24">
-                                  <el-form-item label="户主或与户主关系" prop="relation" label-width="130px">
-                                    <el-input v-model="option.form.relation" placeholder="请输入户主或与户主关系" />
-                                  </el-form-item>
-                                </el-col>
-                                <el-col :span="24">
-                                  <el-form-item label="姓名" prop="name" label-width="130px">
-                                    <el-input v-model="option.form.name" placeholder="请输入姓名" />
-                                  </el-form-item>
-                                </el-col>
-                                <el-col :span="24">
-                                  <el-form-item label="出生年月日" prop="birthday" label-width="130px">
-                                    <el-input v-model="option.form.birthday" placeholder="请输入出生年月日" />
-                                  </el-form-item>
-                                </el-col>-->
-
-
+              <el-row class="my_mb" :gutter="10" v-if="option.form.ywType==='option1'">
+                <el-col :span="24">
+                  <el-form-item label="全文识别内容" prop="allInfo" label-width="100px">
+                    <el-input v-model="option.form.allInfo" type="textarea" placeholder="请输入全文识别内容" :rows="3"/>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="户主或与户主关系" label-width="130px">
                     <el-input v-model="option.form.relation" placeholder="请输入户主或与户主关系" />
@@ -843,7 +831,7 @@
               <!-- 全文识别内容 -->
               <el-col :span="24" v-if="option.form.ywType==='option12'">
                 <el-form-item label="全文识别内容" prop="allInfo" label-width="100px">
-                  <el-input v-model="form.allInfo" type="textarea" placeholder="请输入全文识别内容" :rows="10"/>
+                  <el-input v-model="option.form.allInfo" type="textarea" placeholder="请输入全文识别内容" :rows="10"/>
                 </el-form-item>
               </el-col>
 
@@ -863,7 +851,7 @@
 
 <script>
 import { listCzrkdj, listBirthDJ, listQyz, listZfnyhkcg, listYtzm, listZqz,
-  listCzrkdj1, listBirthDJ1, listQyz1, listZfnyhkcg1, listYtzm1, listZqz1 } from "@/api/dangan/retrieval";
+  listCzrkdj1, listBirthDJ1, listQyz1, listZfnyhkcg1, listYtzm1, listZqz1, listQw1 } from "@/api/dangan/retrieval";
 import { getCzrkdj, updateCzrkdj } from "@/api/dangan/czrkdj";
 import { getBirthDJ, updateBirthDJ } from "@/api/dangan/birthDJ";
 import { getYtzm, updateYtzm } from "@/api/dangan/ytzm";
@@ -1014,7 +1002,7 @@ export default {
         qParams: {
           pageNum: 1,
           pageSize: 10,
-          name: null,
+          allInfo: null,
         },
         total: 0
       },
@@ -1096,10 +1084,10 @@ export default {
           this.option7Query()
         }
 
-        // 转非农业人口批复存根
+        // 全文识别类型
         if(this.checkList.indexOf('option12') !== -1){
           this.option12.open = true
-          this.option12.qParams.name = this.keyword
+          this.option12.qParams.allInfo = this.keyword
           this.option12Query()
         }
 
@@ -1145,7 +1133,7 @@ export default {
       this.option7.name = null;
       this.option8.name = null;
       this.option9.name = null;
-      this.option12.name = null;
+      this.option12.allInfo = null;
 
       this.option1.total = 0;
       this.option2.total = 0;
@@ -1315,13 +1303,9 @@ export default {
     option12Query(){
       this.option12.loading = true;
       if(this.isTongYin){
-        listZfnyhkcg(this.option12.qParams).then(response => {
-          this.option12.list = response.rows;
-          this.option12.total = response.total;
-          this.option12.loading = false;
-        })
+
       }else {
-        listZfnyhkcg1(this.option12.qParams).then(response => {
+        listQw1(this.option12.qParams).then(response => {
           this.option12.list = response.rows;
           this.option12.total = response.total;
           this.option12.loading = false;
@@ -1854,4 +1838,10 @@ export default {
   }
 }
 
+.my_mb{
+  .el-form-item{
+    margin-bottom: 15px;
+  }
+}
+
 </style>
diff --git a/dangan-ui/src/views/index.vue b/dangan-ui/src/views/index.vue
index 6348395..47cc044 100644
--- a/dangan-ui/src/views/index.vue
+++ b/dangan-ui/src/views/index.vue
@@ -23,6 +23,7 @@
           <el-checkbox label="option5">迁移证</el-checkbox>
           <el-checkbox label="option8">准迁证</el-checkbox>
           <el-checkbox label="option7">转非农业人口批复存根</el-checkbox>
+          <el-checkbox label="option12">全文识别类型</el-checkbox>
 
           <!--          <el-checkbox v-for="dict in dict.type.yw_type"
                                  :key="dict.value"
@@ -37,6 +38,7 @@
       <el-table v-loading="option1.loading" :data="option1.list" 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/>
@@ -396,6 +398,38 @@
       />
     </div>
 
+    <!-- 全文识别内容 -->
+    <div class="content" v-if="option12.open&&option12.list&&option12.list.length>0">
+      <el-divider content-position="left">全文识别类型</el-divider>
+      <el-table v-loading="option12.loading" :data="option12.list" border>
+        <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="180" show-overflow-tooltip/>
+        <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="pictures">
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="100">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="updateOption(scope.row)"
+              v-hasPermi="['dangan:quanwen:edit']"
+            >纠错</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="option12.total>0"
+        :total="option12.total"
+        :page.sync="option12.qParams.pageNum"
+        :limit.sync="option12.qParams.pageSize"
+        @pagination="option12Query"
+      />
+    </div>
+
     <!-- 纠错 新 -->
     <el-dialog title="纠错" :visible.sync="option.open_jc" width="90%" append-to-body top="10px !important">
       <div style="min-height: 85vh;">
@@ -413,24 +447,12 @@
             <el-col :span="12">
 
               <!--常住人口登记表1-->
-              <el-row :gutter="10" v-if="option.form.ywType==='option1'">
-                <!--                <el-col :span="24">
-                                  <el-form-item label="户主或与户主关系" prop="relation" label-width="130px">
-                                    <el-input v-model="option.form.relation" placeholder="请输入户主或与户主关系" />
-                                  </el-form-item>
-                                </el-col>
-                                <el-col :span="24">
-                                  <el-form-item label="姓名" prop="name" label-width="130px">
-                                    <el-input v-model="option.form.name" placeholder="请输入姓名" />
-                                  </el-form-item>
-                                </el-col>
-                                <el-col :span="24">
-                                  <el-form-item label="出生年月日" prop="birthday" label-width="130px">
-                                    <el-input v-model="option.form.birthday" placeholder="请输入出生年月日" />
-                                  </el-form-item>
-                                </el-col>-->
-
-
+              <el-row class="my_mb" :gutter="10" v-if="option.form.ywType==='option1'">
+                <el-col :span="24">
+                  <el-form-item label="全文识别内容" prop="allInfo" label-width="100px">
+                    <el-input v-model="option.form.allInfo" type="textarea" placeholder="请输入全文识别内容" :rows="3"/>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="户主或与户主关系" label-width="130px">
                     <el-input v-model="option.form.relation" placeholder="请输入户主或与户主关系" />
@@ -806,6 +828,13 @@
                 </el-form-item>
               </el-col>
 
+              <!-- 全文识别内容 -->
+              <el-col :span="24" v-if="option.form.ywType==='option12'">
+                <el-form-item label="全文识别内容" prop="allInfo" label-width="100px">
+                  <el-input v-model="option.form.allInfo" type="textarea" placeholder="请输入全文识别内容" :rows="10"/>
+                </el-form-item>
+              </el-col>
+
             </el-col>
           </el-row>
 
@@ -822,13 +851,14 @@
 
 <script>
 import { listCzrkdj, listBirthDJ, listQyz, listZfnyhkcg, listYtzm, listZqz,
-  listCzrkdj1, listBirthDJ1, listQyz1, listZfnyhkcg1, listYtzm1, listZqz1 } from "@/api/dangan/retrieval";
+  listCzrkdj1, listBirthDJ1, listQyz1, listZfnyhkcg1, listYtzm1, listZqz1, listQw1 } from "@/api/dangan/retrieval";
 import { getCzrkdj, updateCzrkdj } from "@/api/dangan/czrkdj";
 import { getBirthDJ, updateBirthDJ } from "@/api/dangan/birthDJ";
 import { getYtzm, updateYtzm } from "@/api/dangan/ytzm";
 import { getQyz, updateQyz } from "@/api/dangan/qyz";
 import { getZqz, updateZqz } from "@/api/dangan/zqz";
 import { getZfnyhkcg, updateZfnyhkcg } from "@/api/dangan/zfnyhkcg";
+import { getQuanwen, updateQuanwen } from "@/api/dangan/quanwen";
 
 export default {
   name: "Retrieval",
@@ -963,6 +993,19 @@ export default {
         },
         total: 0
       },
+      // 转非农业人口批复存根
+      option12: {
+        // 遮罩层
+        loading: true,
+        open: false,
+        list: [],
+        qParams: {
+          pageNum: 1,
+          pageSize: 10,
+          allInfo: null,
+        },
+        total: 0
+      },
       option:{
         open_jc: false,
         form:{},
@@ -1041,6 +1084,13 @@ export default {
           this.option7Query()
         }
 
+        // 全文识别类型
+        if(this.checkList.indexOf('option12') !== -1){
+          this.option12.open = true
+          this.option12.qParams.allInfo = this.keyword
+          this.option12Query()
+        }
+
       }else {
 
         this.$alert(`请先输入关键字`, `提示`, {
@@ -1061,6 +1111,7 @@ export default {
       this.option7.open = false;
       this.option8.open = false;
       this.option9.open = false;
+      this.option12.open = false;
 
       this.option1.list = [];
       this.option2.list = [];
@@ -1071,6 +1122,7 @@ export default {
       this.option7.list = [];
       this.option8.list = [];
       this.option9.list = [];
+      this.option12.list = [];
 
       this.option1.name = null;
       this.option2.name = null;
@@ -1081,6 +1133,7 @@ export default {
       this.option7.name = null;
       this.option8.name = null;
       this.option9.name = null;
+      this.option12.allInfo = null;
 
       this.option1.total = 0;
       this.option2.total = 0;
@@ -1091,6 +1144,7 @@ export default {
       this.option7.total = 0;
       this.option8.total = 0;
       this.option9.total = 0;
+      this.option12.total = 0;
     },
     // 常住人口登记表1
     option1Query(){
@@ -1245,6 +1299,19 @@ export default {
         })
       }
     },
+    // 全文识别内容
+    option12Query(){
+      this.option12.loading = true;
+      if(this.isTongYin){
+
+      }else {
+        listQw1(this.option12.qParams).then(response => {
+          this.option12.list = response.rows;
+          this.option12.total = response.total;
+          this.option12.loading = false;
+        })
+      }
+    },
     handleCheckAllChange(val) {
       if(val){
         this.checkList = []
@@ -1544,6 +1611,30 @@ export default {
           updateBy: null,
           updateTime: null
         };
+      }else if(row.ywType==='option12'){
+        this.option.form = {
+          id: null,
+          ywType: 'option12',
+          allInfo: null,
+          taskId: null,
+          flag: 1,
+          muId: null,
+          muPath: null,
+          picIds: null,
+          pictures: null,
+          allPicIds: null,
+          allPics: null,
+          errorCorrect: null,
+          auditStatus: null,
+          auditName: null,
+          auditResult: null,
+          auditReason: null,
+          remark: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null
+        };
       }
       this.shiBieList = [];
       this.resetForm("formOption");
@@ -1587,6 +1678,12 @@ export default {
           this.option.form = response.data;
           this.option.open_jc = true;
         });
+      }else if(row.ywType==='option12'){
+        getQuanwen(id).then(response => {
+          this.reset(response.data)
+          this.option.form = response.data;
+          this.option.open_jc = true;
+        });
       }
     },
     /** 提交按钮 */
@@ -1635,6 +1732,13 @@ export default {
               this.option.open_jc = false;
               this.handleQuery()
             });
+          }else if(this.option.form.ywType==='option12'){
+            this.option.form.errorCorrect = 1;
+            updateQuanwen(this.option.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.option.open_jc = false;
+              this.handleQuery()
+            });
           }
         }
       });
@@ -1734,4 +1838,10 @@ export default {
   }
 }
 
+.my_mb{
+  .el-form-item{
+    margin-bottom: 15px;
+  }
+}
+
 </style>