+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 开始扫描
+
+
+ 共计：
+ {{smwj.list.length}} 张
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 开始扫描
-
+
-
-
@@ -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)=>{
diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index f90e1bd..63b4392 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/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: {
diff --git a/dangan-ui/src/views/dangan/qyz/index.vue b/dangan-ui/src/views/dangan/qyz/index.vue
index 2ad6a77..cc1a76a 100644
--- a/dangan-ui/src/views/dangan/qyz/index.vue
+++ b/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: {
diff --git a/dangan-ui/src/views/dangan/task/index.vue b/dangan-ui/src/views/dangan/task/index.vue
index 6151dac..bf42cd0 100644
--- a/dangan-ui/src/views/dangan/task/index.vue
+++ b/dangan-ui/src/views/dangan/task/index.vue
@@ -57,7 +57,7 @@
-
+
查看任务进度
+
+ 查看任务数据
+
{});
},
+ // 查看任务添加记录
+ 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);
+ }
+ }
}
};
diff --git a/dangan-ui/src/views/dangan/ytzm/index.vue b/dangan-ui/src/views/dangan/ytzm/index.vue
index 706c9bc..789f8f9 100644
--- a/dangan-ui/src/views/dangan/ytzm/index.vue
+++ b/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: {
diff --git a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
index 82ed108..7c56fa8 100644
--- a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
+++ b/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: {
diff --git a/dangan-ui/src/views/dangan/zqz/index.vue b/dangan-ui/src/views/dangan/zqz/index.vue
index 39925c7..9daba42 100644
--- a/dangan-ui/src/views/dangan/zqz/index.vue
+++ b/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: {