diff --git a/src/api/homesteadSurvey/index.js b/src/api/homesteadSurvey/index.js index bb9f7bee..bfa468eb 100644 --- a/src/api/homesteadSurvey/index.js +++ b/src/api/homesteadSurvey/index.js @@ -8,7 +8,14 @@ export function listTask(query) { params: query }) } - +// 数据调查任务列表（带完成数、调查数） +export function mobileList(query) { + return request({ + url: '/home/homesteadsurvey/mobileList', + method: 'get', + params: query + }) +} // 导出数据调查任务 export function exportTask(id) { return request({ diff --git a/src/components/home/HomeApplyUploadCompTc.vue b/src/components/home/HomeApplyUploadCompTc.vue index fbe586dc..db08bd56 100644 --- a/src/components/home/HomeApplyUploadCompTc.vue +++ b/src/components/home/HomeApplyUploadCompTc.vue @@ -63,6 +63,7 @@ export default { }, }, created() { + console.info(this.businessType); if (this.businessType !== null) { this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full) } diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 419f4f26..1321ccb8 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -301,6 +301,8 @@ @@ -790,8 +792,8 @@ export default { showXzyy:false, showXzqssj:false, showUpload:false, - minDate: new Date(1900,0,1), - maxDate: new Date(2025, 10, 1), + minDate: new Date(1950,1,1), + maxDate: new Date(2030, 10, 1), form:{} }; }, diff --git a/src/views/homesteadSurvey/add2.vue b/src/views/homesteadSurvey/add2.vue index 4ffe693f..c21e6b85 100644 --- a/src/views/homesteadSurvey/add2.vue +++ b/src/views/homesteadSurvey/add2.vue @@ -74,11 +74,11 @@

{{item.nhdm}}

-

- - 户主 +

+ + 户主

-

+

使用权人

@@ -89,7 +89,7 @@
@@ -205,7 +205,7 @@ export default { const ids = val.id || this.ids; Dialog.confirm({ title: '系统提示', - message: '是否确认删除使用权人标识为"' + val.id + '"的数据项?', + message: '是否确认删除使用权人数据项?', confirmButtonText: '确定', cancelButtonText: '取消' }) diff --git a/src/views/homesteadSurvey/add3.vue b/src/views/homesteadSurvey/add3.vue index faad26ee..e8940121 100644 --- a/src/views/homesteadSurvey/add3.vue +++ b/src/views/homesteadSurvey/add3.vue @@ -74,9 +74,9 @@

{{item.zcs}}

-

- - 自然幢信息 +

+ + 自然幢信息

@@ -85,8 +85,14 @@

@@ -350,7 +356,7 @@ export default { const ids = val.id || this.ids; Dialog.confirm({ title: '系统提示', - message: '是否确认删除自然幢标识为"' + val.id + '"的数据项?', + message: '是否确认删除自然幢号数据项?', confirmButtonText: '确定', cancelButtonText: '取消' }) @@ -389,6 +395,12 @@ export default { >>> .delete-button { height: 100%; } +>>> .van-row{ + height: 100%; +} +>>> .van-col{ + height: 100%; +} >>> .van-swipe-cell__wrapper{ margin-right:-3px; } diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue index c11eb451..d823126e 100644 --- a/src/views/homesteadSurvey/add4.vue +++ b/src/views/homesteadSurvey/add4.vue @@ -74,18 +74,21 @@

{{ formatDict(jzwqkList, item.jzwqk) }}

-

- - 附件 -

-

- - 查看附属设施信息 +

+ + 查看附属设施信息

@@ -98,22 +101,17 @@

异常标记

-

- 签名确认 +

+ 驳回原因 +

+

+ 签名确认 + 签名图片

调查审核

- - - @@ -135,16 +133,16 @@ -
+
清空画板 保存提交 -
- + + - +

备注图片

@@ -153,7 +151,27 @@ + + + + + + + + + + +

审核

+ + + + 通过 + 驳回 + + + + { + if(response.code === 200){ + let _this =this + _this.$toast({ + icon: 'success', // 找到自己需要的图标 + message: '保存成功', + duration:"1000", + onClose:function(){ + _this.dcshShow = false; + _this.goRightBack(); + } + }) + } + }); + } else { + return done(); } - updateZjdzd(this.zjdzdxx).then(response => { - let _this =this - _this.$toast({ - icon: 'success', // 找到自己需要的图标 - message: '保存成功', - duration:"1000", - onClose:function(){ - _this.dcshShow = false; - _this.goRightBack(); - } - }) - }); + }, onRefreshFsss(){ if(this.loading){ @@ -329,15 +351,17 @@ export default { .then((res) => { this.signature.resultImg = res; let wj = this.dataURLtoBlob(res); + let surveyItem = JSON.parse(localStorage.getItem("surveyItem")); let param = new FormData() // 创建form对象 param.append('file', wj) // 通过append向form对象添加数据 + param.append('id', surveyItem.id) param.append('date', this.format(new Date(), 'yyyy-MM-dd')) // 通过append向form对象添加数据 - zjddcSign(param, this.zjdzdxx.zjddm).then(response => { + zjddcSign(param, this.zjdzdxx.zjddm,surveyItem.id).then(response => { this.$notify({type: 'success', message: '签字成功'}); - this.showesign = false; getZjdzd(this.zjdzdxx.id).then((response) => { localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data)) location.reload(); + this.showesign = false; }); @@ -388,7 +412,7 @@ export default { const ids = val.id || this.ids; Dialog.confirm({ title: '系统提示', - message: '是否确认删除附属物标识为"' + val.id + '"的数据项?', + message: '是否确认删除附属物的数据项?', confirmButtonText: '确定', cancelButtonText: '取消' }) @@ -400,28 +424,41 @@ export default { }).catch(() => {}); }, qmqr(){ + if(this.zjdzdxx.surveySign != null){ + this.signature.resultImg = this.$store.getters.baseRoutingUrl+this.zjdzdxx.surveySign; + } this.showesign = true; }, ycbj(){ this.ycbzShow = true; }, - confirmn(){ - this.$set(this.zjdzdxx, 'surveyStatus', "2"); - updateZjdzd(this.zjdzdxx).then(response => { - localStorage.setItem("zjdzdxxItem",JSON.stringify(this.zjdzdxx)); - let _this =this - this.$toast({ - icon: 'success', // 找到自己需要的图标 - message: '保存成功', - duration:"1000", - onClose:function(){ - _this.getList(); - _this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: _this.zjdzdxx.zjddm}}); - } - }) - }); + // van-dialog 点击confirm事件不自动关闭 + onBeforeClose(action, done) { + if (action === 'confirm') { + this.$refs.ycbzForm.validate().then(() => { + this.$set(this.zjdzdxx, 'surveyStatus', "2"); + updateZjdzd(this.zjdzdxx).then(response => { + localStorage.setItem("zjdzdxxItem",JSON.stringify(this.zjdzdxx)); + let _this =this + this.$toast({ + icon: 'success', // 找到自己需要的图标 + message: '保存成功', + duration:"1000", + onClose:function(){ + _this.getList(); + } + }) + return done(true); + }); + }).catch(() => { + return done(false); + }); + } else { + return done(); + } }, dcsh(){ + this.$set(this.zjdzdxx, 'surveyStatus', "5"); this.dcshShow = true; }, showUploadList(id){ @@ -584,6 +621,12 @@ export default { >>> .delete-button { height: 100%; } +>>> .van-row{ + height: 100%; +} +>>> .van-col{ + height: 100%; +} >>> .van-swipe-cell__wrapper{ margin-right:-3px; } diff --git a/src/views/homesteadSurvey/hncyList2.vue b/src/views/homesteadSurvey/hncyList2.vue index 2c38fa8c..52c022cc 100644 --- a/src/views/homesteadSurvey/hncyList2.vue +++ b/src/views/homesteadSurvey/hncyList2.vue @@ -65,8 +65,8 @@ {{item.xm}}

-

成员详情

-

删除

+

成员详情

+

删除

@@ -77,9 +77,9 @@ diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue index 96e5f611..bbab82f3 100644 --- a/src/views/homesteadSurvey/index.vue +++ b/src/views/homesteadSurvey/index.vue @@ -84,13 +84,12 @@ @@ -118,13 +117,12 @@ @@ -150,13 +148,12 @@ @@ -172,7 +169,7 @@