档案采集上传计数，任务记录跳转档案合集、导出图片超时时间加长，档案目录ID列隐藏

dangan-ui/src/utils/request.js

@@ -130,7 +130,8 @@ export function download(url, params, filename, config) {
     transformRequest: [(params) => { return tansParams(params) }],
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     responseType: 'blob',
-    ...config
+    ...config,
+    timeout: 180000,
   }).then(async (data) => {
     const isBlob = blobValidate(data);
     if (isBlob) {

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

@@ -865,7 +865,12 @@ export default {
     };
   },
   created() {
-    this.queryParams.muId = this.$route.query.muId
+    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: {

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

@@ -49,7 +49,7 @@
           <el-link type="primary" @click="handleDAXX(scope.row)">{{ scope.row.muName }}</el-link>
         </template>
       </el-table-column>
-      <el-table-column label="ID" align="center" prop="id" min-width="50" show-overflow-tooltip/>
+<!--      <el-table-column label="ID" align="center" prop="id" min-width="50" show-overflow-tooltip/>-->
       <el-table-column label="业务类型" align="center" prop="ywType" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
@@ -401,7 +401,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.muName + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除该数据项？').then(function() {
         return delCatalog(row.id);
       }).then(() => {
         this.getList();

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

@@ -49,7 +49,16 @@
 
           <div v-if="pictureRecard.length>0">
 
-            <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+            <div>
+              <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+              <span style="margin-left: 40px;">共计：</span>
+              <span style="color: #1c84c6">{{ pictureRecard.length }} 张</span>
+              <span style="margin-left: 40px;">已选：</span>
+              <span style="color: #1c84c6">{{ yxPictureRecardNum }}</span>
+              <span style="margin-left: 40px;">未选：</span>
+              <span style="color: #1c84c6">{{ wxPictureRecardNum }}</span>
+            </div>
+
             <div style="margin: 15px 0;"></div>
             <el-checkbox v-for="item in pictureRecard" :label="item.picName" :key="item.id" v-model="item.checked" @change="handleCheckChange(item)">
               <div style="width: 150px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
@@ -89,6 +98,10 @@
             <div class="el-upload__tip" slot="tip">只能上传图片，且不超过{{ upload.fileSize }}MB</div>
           </el-upload>
 
+          <div style="font-size: 14px;margin-top: 10px;">
+            <span>共计：</span>
+            <span style="color:#2083d7;">{{fileList.length}} 张</span>
+          </div>
           <ul class="el-upload-list el-upload-list--text" style="max-height:200px;overflow-y:auto;padding: 15px;">
             <li tabindex="0" class="el-upload-list__item is-success" v-for="(item,index) in fileList" :key="item.uid">
               <a class="el-upload-list__item-name">
@@ -113,61 +126,72 @@
     <el-dialog title="扫描文件上传" :visible.sync="smwj.open" width="750px" append-to-body>
 
       <div v-loading="smwj.loading">
-        <div style="margin-bottom: 30px;display: flex;align-items:start;min-height: 300px;">
+        <div v-loading="smwj.smloading" element-loading-text="文件扫描中"
+             element-loading-spinner="el-icon-loading">
+          <div style="margin-bottom: 30px;min-height: 300px;">
+
+            <div style="width: 700px;margin-left: 20px;">
+              <div>
+                <el-row class="sm_row" :gutter="20">
+                  <el-col class="sm_col" :span="8">
+                    <label style="width: 100px;">颜色模式</label>
+                    <el-select v-model="pixel" placeholder="请选择颜色模式">
+                      <el-option label="黑白" :value="0"></el-option>
+                      <el-option label="灰色" :value="1"></el-option>
+                      <el-option label="彩色" :value="2"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col class="sm_col" :span="8">
+                    <label style="width: 100px;">去白页</label>
+                    <el-select v-model="white" placeholder="请选择去白页">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col class="sm_col" :span="8">
+                    <label style="width: 100px;">分辨率</label>
+                    <el-select v-model="resolution" placeholder="请选择分辨率">
+                      <el-option label="100" :value="100"></el-option>
+                      <el-option label="150" :value="150"></el-option>
+                      <el-option label="200" :value="200"></el-option>
+                      <el-option label="300" :value="300"></el-option>
+                      <el-option label="600" :value="600"></el-option>
+                    </el-select>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col class="sm_col" :span="12">
+                    <el-button icon="el-icon-upload2" type="primary" @click="WebScanInit">开始扫描</el-button>
+                  </el-col>
+                  <el-col :span="10" style="text-align: right; font-size: 14px" v-if="smwj.list.length>0">
+                    <span>共计：</span>
+                    <span style="color:#2083d7;">{{smwj.list.length}} 张</span>
+                  </el-col>
+                </el-row>
+
+              </div>
 
-          <div style="width: 700px;margin-left: 20px;" v-loading="smwj.smloading" element-loading-text="文件扫描中"
-               element-loading-spinner="el-icon-loading">
-            <div>
-              <el-row class="sm_row" :gutter="20">
-                <el-col class="sm_col" :span="8">
-                  <label style="width: 100px;">颜色模式</label>
-                  <el-select v-model="pixel" placeholder="请选择颜色模式">
-                    <el-option label="黑白" :value="0"></el-option>
-                    <el-option label="灰色" :value="1"></el-option>
-                    <el-option label="彩色" :value="2"></el-option>
-                  </el-select>
-                </el-col>
-                <el-col class="sm_col" :span="8">
-                  <label style="width: 100px;">去白页</label>
-                  <el-select v-model="white" placeholder="请选择去白页">
-                    <el-option label="是" :value="true"></el-option>
-                    <el-option label="否" :value="false"></el-option>
-                  </el-select>
-                </el-col>
-                <el-col class="sm_col" :span="8">
-                  <label style="width: 100px;">分辨率</label>
-                  <el-select v-model="resolution" placeholder="请选择分辨率">
-                    <el-option label="100" :value="100"></el-option>
-                    <el-option label="150" :value="150"></el-option>
-                    <el-option label="200" :value="200"></el-option>
-                    <el-option label="300" :value="300"></el-option>
-                    <el-option label="600" :value="600"></el-option>
-                  </el-select>
-                </el-col>
-              </el-row>
-              <el-button icon="el-icon-upload2" type="primary" @click="WebScanInit">开始扫描</el-button>
             </div>
 
-          </div>
+            <div v-if="smwj.list.length>0" style="margin-left: 20px;display: flex;flex-wrap: wrap">
 
-          <div v-if="smwj.list.length>0" style="width: 560px;margin-left: 20px;display: flex;flex-wrap: wrap">
+              <div v-for="(item,index) in smwj.list" class="smwjList">
+                <el-image
+                  style="width: 70px; height: 70px"
+                  :src="item.base64Str"
+                  :preview-src-list="[item.base64Str]">
+                </el-image>
 
-            <div v-for="(item,index) in smwj.list" class="smwjList">
+                <i class="el-icon-close" style="font-size:18px" @click="deleteFile1(index)"></i>
-              <el-image
+              </div>
-                style="width: 70px; height: 70px"
-                :src="item.base64Str"
-                :preview-src-list="[item.base64Str]">
-              </el-image>
 
-              <i class="el-icon-close" style="font-size:18px" @click="deleteFile1(index)"></i>
             </div>
 
           </div>
 
-        </div>
+          <div style="text-align: center">
-
+            <el-button style="width:300px;" type="primary" @click="submitFiles(1)">确定上传</el-button>
-        <div style="text-align: center">
+          </div>
-          <el-button style="width:300px;" type="primary" @click="submitFiles(1)">确定上传</el-button>
         </div>
       </div>
 
@@ -345,6 +369,8 @@ export default {
       },
       // 上传图片记录
       pictureRecard: [],
+      yxPictureRecardNum: 0,
+      wxPictureRecardNum: 0,
       // 已识别图片
       yPictureRecard: [],
       // 未识别图片
@@ -566,10 +592,11 @@ export default {
     },
     // 确认上传文件提交
     submitFiles(type) {
-
       this.checkAll = false;
       if (type === 1) {
+        this.smwj.loading = true;
         if (this.smwj.list.length === 0) {
+          this.smwj.loading = false;
           this.$alert(`请先开始扫描！`, `提示`, {
             type: 'warning'
           });
@@ -591,23 +618,27 @@ export default {
           DaPicturesRecard.muPath = this.getAllLabels(this.dangAnNode);
           DaPicturesRecard.ywType = this.dangAnNode.data.ywType;
           formData.append('picRecard', new Blob([JSON.stringify(DaPicturesRecard)], {type: 'application/json',}));
-          this.smwj.loading = true;
+
           collectSaves(formData).then(response => {
             this.pictureRecard = response.data;
+            this.yxPictureRecardNum = 0;
+            this.wxPictureRecardNum = this.pictureRecard.length;
             this.smwj.open = false;
             this.smwj.loading = false;
           }).catch(err => {
             this.smwj.loading = false;
           });
         } else {
+          this.smwj.loading = false;
           this.$alert(`上传文件大小不能超过 ${this.upload.fileSize} MB!`, `提示`, {
             type: 'warning'
           });
         }
 
       } else {
-
+        this.upload.loading = true;
         if (this.fileList.length === 0) {
+          this.upload.loading = false;
           this.$alert(`请先上传图片！`, `提示`, {
             type: 'warning'
           });
@@ -629,10 +660,12 @@ export default {
           DaPicturesRecard.muPath = this.getAllLabels(this.dangAnNode);
           DaPicturesRecard.ywType = this.dangAnNode.data.ywType;
           formData.append('picRecard', new Blob([JSON.stringify(DaPicturesRecard)], {type: 'application/json',}));
-          this.upload.loading = true;
+
 
           collectSaves(formData).then(response => {
             this.pictureRecard = response.data;
+            this.yxPictureRecardNum = 0;
+            this.wxPictureRecardNum = this.pictureRecard.length;
             this.upload.open = false;
             this.upload.loading = false;
           }).catch(err => {
@@ -640,6 +673,7 @@ export default {
           });
 
         } else {
+          this.upload.loading = false;
           this.$alert(`上传文件大小不能超过 ${this.upload.fileSize} MB!`, `提示`, {
             type: 'warning'
           });
@@ -666,7 +700,17 @@ export default {
       this.pictureRecard.forEach(item =>{
         item['checked']= val
       })
-      this.pictureRecard = [...this.pictureRecard]
+      this.pictureRecard = [...this.pictureRecard];
+
+      let yxP = 0
+      this.pictureRecard.forEach( item => {
+        if(item.checked){
+          yxP+=1
+        }
+      })
+
+      this.yxPictureRecardNum = yxP;
+      this.wxPictureRecardNum = Number(this.pictureRecard.length - yxP);
     },
     handleCheckChange(val) {
       let checkAll = true
@@ -676,7 +720,17 @@ export default {
         }
       })
       this.pictureRecard = [...this.pictureRecard]
-      this.checkAll = checkAll
+      this.checkAll = checkAll;
+
+      let yxP = 0
+      this.pictureRecard.forEach( item => {
+        if(item.checked){
+          yxP+=1
+        }
+      })
+
+      this.yxPictureRecardNum = yxP;
+      this.wxPictureRecardNum = Number(this.pictureRecard.length - yxP);
     },
     // 创建识别任务
     cjsbrw(){
@@ -761,6 +815,8 @@ export default {
       collectRecongnize(arr).then(response => {
         this.pictureRecard = [...this.wPictureRecard];
         this.checkAll = false;
+        this.yxPictureRecardNum = 0;
+        this.wxPictureRecardNum = this.pictureRecard.length;
         this.$modal.msgSuccess(response.msg);
         loading.close();
       }).catch((err)=>{

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

@@ -2491,6 +2491,11 @@ export default {
       this.queryParams.muId = this.$route.query.muId;
       this.queryParams.ywType = this.$route.query.ywType;
     }
+
+    if(this.$route.query.taskId){
+      this.queryParams.taskId = this.$route.query.taskId;
+    }
+
     this.getList();
   },
   methods: {

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

@@ -878,7 +878,12 @@ export default {
     };
   },
   created() {
-    this.queryParams.muId = this.$route.query.muId
+    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: {

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

@@ -57,7 +57,7 @@
           <dict-tag :options="dict.type.task_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="200">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.status==='0'|| scope.row.status==='3'|| scope.row.status==='4'"
@@ -83,6 +83,14 @@
             type="text"
             @click="handleUpdate(scope.row)"
           >查看任务进度</el-button>
+
+          <el-button
+            v-if="scope.row.status==='2' || (scope.row.status==='-1'&& (scope.row.failNum!==null)) || scope.row.status==='4'"
+            size="mini"
+            type="text"
+            @click="viewDetail(scope.row)"
+          >查看任务数据</el-button>
+
           <el-button
             size="mini"
             type="text"
@@ -1194,6 +1202,33 @@
           this.$modal.msgSuccess("删除成功");
         }).catch(() => {});
       },
+      // 查看任务添加记录
+      viewDetail(row){
+        // 常住人口登记表
+        if(row.ywType==='option1'|| row.ywType==='option3'|| row.ywType==='option9'|| row.ywType==='option2'){
+          this.$router.push("/dangan/czrkdj?muId=" + row.muId + '&ywType=' +row.ywType + '&taskId=' +row.id);
+        }
+        // 出生医学证明
+        if(row.ywType==='option4'){
+          this.$router.push("/dangan/birthDJ?muId=" + row.muId+ '&taskId=' +row.id);
+        }
+        // 迁移证
+        if(row.ywType==='option5'){
+          this.$router.push("/dangan/qyz?muId=" + row.muId+ '&taskId=' +row.id);
+        }
+        // 一胎证明
+        if(row.ywType==='option6'){
+          this.$router.push("/dangan/ytzm?muId=" + row.muId+ '&taskId=' +row.id);
+        }
+        // 转非农业人口批复存根
+        if(row.ywType==='option7'){
+          this.$router.push("/dangan/zfnyhkcg?muId=" + row.muId+ '&taskId=' +row.id);
+        }
+        // 准迁证
+        if(row.ywType==='option8'){
+          this.$router.push("/dangan/zqz?muId=" + row.muId+ '&taskId=' +row.id);
+        }
+      }
     }
   };
 </script>

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

@@ -805,7 +805,12 @@ export default {
     };
   },
   created() {
-    this.queryParams.muId = this.$route.query.muId
+    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: {

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

@@ -904,7 +904,12 @@ export default {
     };
   },
   created() {
-    this.queryParams.muId = this.$route.query.muId
+    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: {

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

@@ -1014,7 +1014,12 @@ export default {
     };
   },
   created() {
-    this.queryParams.muId = this.$route.query.muId
+    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: {