任务记录

dangan-ui/src/views/dangan/quanwen/index.vue

@@ -224,7 +224,7 @@
             </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-input v-model="form.allInfo" type="textarea" placeholder="请输入全文识别内容" :rows="10"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -266,7 +266,7 @@
             </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-input v-model="form.allInfo" type="textarea" placeholder="请输入全文识别内容" :rows="10"/>
               </el-form-item>
             </el-col>
           </el-row>

dangan-ui/src/views/dangan/retrieval/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;">
@@ -806,6 +840,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="form.allInfo" type="textarea" placeholder="请输入全文识别内容" :rows="10"/>
+                </el-form-item>
+              </el-col>
+
             </el-col>
           </el-row>
 
@@ -829,6 +870,7 @@ 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 +1005,19 @@ export default {
         },
         total: 0
       },
+      // 转非农业人口批复存根
+      option12: {
+        // 遮罩层
+        loading: true,
+        open: false,
+        list: [],
+        qParams: {
+          pageNum: 1,
+          pageSize: 10,
+          name: null,
+        },
+        total: 0
+      },
       option:{
         open_jc: false,
         form:{},
@@ -1041,6 +1096,13 @@ export default {
           this.option7Query()
         }
 
+        // 转非农业人口批复存根
+        if(this.checkList.indexOf('option12') !== -1){
+          this.option12.open = true
+          this.option12.qParams.name = this.keyword
+          this.option12Query()
+        }
+
       }else {
 
         this.$alert(`请先输入关键字`, `提示`, {
@@ -1061,6 +1123,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 +1134,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 +1145,7 @@ export default {
       this.option7.name = null;
       this.option8.name = null;
       this.option9.name = null;
+      this.option12.name = null;
 
       this.option1.total = 0;
       this.option2.total = 0;
@@ -1091,6 +1156,7 @@ export default {
       this.option7.total = 0;
       this.option8.total = 0;
       this.option9.total = 0;
+      this.option12.total = 0;
     },
     // 常住人口登记表1
     option1Query(){
@@ -1245,6 +1311,23 @@ 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 => {
+          this.option12.list = response.rows;
+          this.option12.total = response.total;
+          this.option12.loading = false;
+        })
+      }
+    },
     handleCheckAllChange(val) {
       if(val){
         this.checkList = []
@@ -1544,6 +1627,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 +1694,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 +1748,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()
+            });
           }
         }
       });

dangan-ui/src/views/dangan/task/index.vue

@@ -184,7 +184,21 @@
     <el-dialog title="识别类型确认" :visible.sync="dAType.open" width="500px" append-to-body>
       <div style="padding: 0 40px 40px;">
 
-        <el-select v-if="dAType.selRow && (dAType.selRow.ywType==='option1'||dAType.selRow.ywType==='option3'||dAType.selRow.ywType==='option9'||dAType.selRow.ywType==='option2')"
+        <el-select v-if="dAType.selRow && (dAType.selRow.ywType==='option1')"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions0"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
+        <el-select v-if="dAType.selRow && (dAType.selRow.ywType==='option3'||dAType.selRow.ywType==='option9'||dAType.selRow.ywType==='option2')"
                    v-model="dAType.sbType"
                    placeholder="请选择识别类型"
                    clearable
@@ -268,6 +282,20 @@
           />
         </el-select>
 
+        <el-select v-if="dAType.selRow && dAType.selRow.ywType==='option12'"
+                   v-model="dAType.sbType"
+                   placeholder="请选择识别类型"
+                   clearable
+                   style="width:100%"
+        >
+          <el-option
+            v-for="item in dAType.sbTypeOptions7"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+
       </div>
       <div style="text-align: center">
         <el-button type="primary" @click="sbTypeSubmit">确定</el-button>
@@ -520,6 +548,12 @@
               </el-form-item>
             </el-col>
 
+            <el-col :span="12" v-if="shiBie.form.ywType==='option12'">
+              <el-form-item label="全文识别内容" prop="allInfo" label-width="100px">
+                <el-input v-model="shiBie.form.allInfo" type="textarea" placeholder="请输入全文识别内容" :rows="10"/>
+              </el-form-item>
+            </el-col>
+
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:right; margin-top: 30px;">
@@ -541,6 +575,7 @@
   import { addQyz } from "@/api/dangan/qyz";
   import { addZqz } from "@/api/dangan/zqz";
   import { addZfnyhkcg } from "@/api/dangan/zfnyhkcg";
+  import { addQuanwen } from "@/api/dangan/quanwen";
 
   import axios from "axios";
 
@@ -555,6 +590,14 @@
           open: false,
           sbType: null,
           // 常住人口登记表
+          sbTypeOptions0: [
+            { label:'常住人口登记表1', value:'option1' },
+            { label:'常住人口登记表2', value:'option3' },
+            { label:'常住人口登记表3', value:'option9' },
+            { label:'常住卡', value:'option2' },
+            { label:'常住1全文识别类型', value:'option11' },
+          ],
+          // 常住人口登记表
           sbTypeOptions1: [
             { label:'常住人口登记表1', value:'option1' },
             { label:'常住人口登记表2', value:'option3' },
@@ -581,6 +624,10 @@
           sbTypeOptions6: [
             { label:'转非农业人口批复存根', value:'option7' }
           ],
+          // 全文识别类型
+          sbTypeOptions7: [
+            { label:'全文识别类型', value:'option12' }
+          ],
           selRow: null
         },
         // 遮罩层
@@ -786,6 +833,7 @@
             muId: null,
             muPath: null,
             relation: null,
+            allInfo: null,
             name: null,
             otherName: null,
             usedName: null,
@@ -1066,6 +1114,31 @@
             updateTime: null
           }
         }
+        if(this.form.ywType==='option12'){
+          this.shiBie.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.shiBie.form.ywType = this.form.ywType;
         this.shiBie.form.taskId = this.form.id;
         this.shiBie.form.muId = this.form.muId;
@@ -1168,6 +1241,15 @@
                 this.getList();
               });
             }
+            if(this.shiBie.form.ywType==='option12'){
+              addQuanwen(this.shiBie.form).then(response => {
+                this.$modal.msgSuccess("手动识别成功");
+                this.shiBie.open= false;
+                this.xgtp.open= false;
+                this.open= false;
+                this.getList();
+              });
+            }
           }
         });
       },
@@ -1227,6 +1309,10 @@
         if(row.ywType==='option8'){
           this.$router.push("/dangan/zqz?muId=" + row.muId+ '&taskId=' +row.id);
         }
+        // 全文识别类型
+        if(row.ywType==='option12'){
+          this.$router.push("/dangan/quanwen?muId=" + row.muId+ '&taskId=' +row.id);
+        }
       }
     }
   };