档案采集，上传历史记录页面添加 常驻1全文识别类型，全文识别类型

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

@@ -199,8 +199,23 @@
 
     <!--更换识别类型-->
     <el-dialog title="识别类型确认" :visible.sync="dAType.open" width="500px" append-to-body>
+
       <div style="padding: 0 40px 40px;">
-        <el-select v-if="dangAnNode&&(dangAnNode.data.ywType==='option1'||dangAnNode.data.ywType==='option3'||dangAnNode.data.ywType==='option9'||dangAnNode.data.ywType==='option2')"
+        <el-select v-if="dangAnNode && dangAnNode.data.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="dangAnNode&&(dangAnNode.data.ywType==='option3'||dangAnNode.data.ywType==='option9'||dangAnNode.data.ywType==='option2')"
           v-model="dAType.sbType"
           placeholder="请选择识别类型"
           clearable
@@ -284,6 +299,20 @@
           />
         </el-select>
 
+        <el-select v-if="dangAnNode&&(dangAnNode.data.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>
@@ -315,6 +344,14 @@ export default {
         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' },
@@ -340,6 +377,10 @@ export default {
         // 转非农业人口批复存根
         sbTypeOptions6: [
           { label:'转非农业人口批复存根', value:'option7' }
+        ],
+        // 全文识别类型
+        sbTypeOptions7: [
+          { label:'全文识别类型', value:'option12' }
         ]
       },
       // 颜色模式，0：黑白 1：灰色 2：彩色
@@ -623,7 +664,7 @@ export default {
 
           collectSaves(formData).then(response => {
             let YwType = this.dangAnNode.data.ywType
-            if(YwType==='option1'||YwType==='option2'||YwType==='option3'||YwType==='option4'||YwType==='option5'||YwType==='option6'||YwType==='option7'||YwType==='option8'||YwType==='option9'){
+            if(YwType==='option1'||YwType==='option2'||YwType==='option3'||YwType==='option4'||YwType==='option5'||YwType==='option6'||YwType==='option7'||YwType==='option8'||YwType==='option9'||YwType==='option12'){
               this.pictureRecard = response.data;
               this.yxPictureRecardNum = 0;
               this.wxPictureRecardNum = this.pictureRecard.length;
@@ -669,7 +710,7 @@ export default {
 
           collectSaves(formData).then(response => {
             let YwType = this.dangAnNode.data.ywType
-            if(YwType==='option1'||YwType==='option2'||YwType==='option3'||YwType==='option4'||YwType==='option5'||YwType==='option6'||YwType==='option7'||YwType==='option8'||YwType==='option9'){
+            if(YwType==='option1'||YwType==='option2'||YwType==='option3'||YwType==='option4'||YwType==='option5'||YwType==='option6'||YwType==='option7'||YwType==='option8'||YwType==='option9'||YwType==='option12'){
               this.pictureRecard = response.data;
               this.yxPictureRecardNum = 0;
               this.wxPictureRecardNum = this.pictureRecard.length;

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

@@ -63,7 +63,7 @@
       </el-form>
 
       <el-row :gutter="10" class="mb8" >
-        <el-col :span="1.5" v-if="queryParams.recognize==='0'&&(queryParams.ywType==='option1'||queryParams.ywType==='option2'||queryParams.ywType==='option3'||queryParams.ywType==='option4'||queryParams.ywType==='option5'||queryParams.ywType==='option6'||queryParams.ywType==='option7'||queryParams.ywType==='option8'||queryParams.ywType==='option9')">
+        <el-col :span="1.5" v-if="queryParams.recognize==='0'&&(queryParams.ywType==='option1'||queryParams.ywType==='option2'||queryParams.ywType==='option3'||queryParams.ywType==='option4'||queryParams.ywType==='option5'||queryParams.ywType==='option6'||queryParams.ywType==='option7'||queryParams.ywType==='option8'||queryParams.ywType==='option9'||queryParams.ywType==='option12')">
           <el-button icon="el-icon-full-screen" size="mini" type="primary" @click="cjsbrw">创建识别任务</el-button>
         </el-col>
         <el-col :span="1.5" v-if="queryParams.recognize==='0'">
@@ -146,8 +146,21 @@
     <!--更换识别类型-->
     <el-dialog title="识别类型确认" :visible.sync="dAType.open" width="500px" append-to-body>
       <div style="padding: 0 40px 40px;">
+        <el-select v-if="queryParams.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="queryParams.ywType==='option1'||queryParams.ywType==='option3'||queryParams.ywType==='option9'||queryParams.ywType==='option2'"
+        <el-select v-if="queryParams.ywType==='option3'||queryParams.ywType==='option9'||queryParams.ywType==='option2'"
                    v-model="dAType.sbType"
                    placeholder="请选择识别类型"
                    clearable
@@ -231,6 +244,20 @@
           />
         </el-select>
 
+        <el-select v-if="queryParams.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>
@@ -259,6 +286,14 @@ export default {
         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' },
@@ -284,6 +319,10 @@ export default {
         // 转非农业人口批复存根
         sbTypeOptions6: [
           { label:'转非农业人口批复存根', value:'option7' }
+        ],
+        // 全文识别类型
+        sbTypeOptions7: [
+          { label:'全文识别类型', value:'option12' }
         ]
       },
       // 选中数组