From 3c6448011805d2a0e2441b642aeacdf0b9194f87 Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Fri, 13 Jan 2023 15:12:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0=E5=8F=8A=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/onlineHome/homestead/reporting.js | 13 +- .../sunVillage_info/homestead/application.js | 2 +- src/components/house/MultiImageUploadComp.vue | 3 + src/router/index.js | 36 ++ .../homeApplication/proposerLite.vue | 29 +- .../supervision/supervisionCloseCase.vue | 106 +++-- .../supervision/supervisionDetail.vue | 198 ++++++++++ .../homestead/supervision/supervisionList.vue | 23 +- .../supervision/supervisionModify.vue | 372 ++++++++++-------- .../homestead/supervision/supervisionWfxx.vue | 189 +++++++++ 10 files changed, 737 insertions(+), 234 deletions(-) create mode 100644 src/views/yinnong/homestead/supervision/supervisionDetail.vue create mode 100644 src/views/yinnong/homestead/supervision/supervisionWfxx.vue diff --git a/src/api/onlineHome/homestead/reporting.js b/src/api/onlineHome/homestead/reporting.js index c88858dd..f46d04b9 100644 --- a/src/api/onlineHome/homestead/reporting.js +++ b/src/api/onlineHome/homestead/reporting.js @@ -61,12 +61,19 @@ export function zyyctcApply(id){ //宅基地流转提交 export function jgAdd(data){ return request({ - url:'/house/jg/add', + url:'/home/jg/add', + method:'post', + data:data + }) +} +//宅基地流转提交 +export function jgEdit(data){ + return request({ + url:'/home/jg/edit', method:'post', data:data }) } - //宅基地流转提交 export function closeCase(data){ return request({ @@ -89,7 +96,7 @@ export function upload(data){ //宅基地流转详情 export function getJg(id){ return request({ - url:'/house/jg/get/'+id, + url:'/home/jg/get/'+id, method:'get' }) } diff --git a/src/api/sunVillage_info/homestead/application.js b/src/api/sunVillage_info/homestead/application.js index 6003d59a..3dc3bff5 100644 --- a/src/api/sunVillage_info/homestead/application.js +++ b/src/api/sunVillage_info/homestead/application.js @@ -85,7 +85,7 @@ export function attach(data){ return request({ url:'/common/attach', method:'post', - headers:{'Content-Type': 'application/x-www-form-urlencoded;boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW'}, + header: { "Content-Type": 'application/x-www-form-urlencoded' }, data:data }) } diff --git a/src/components/house/MultiImageUploadComp.vue b/src/components/house/MultiImageUploadComp.vue index c8438cae..b5b2e121 100644 --- a/src/components/house/MultiImageUploadComp.vue +++ b/src/components/house/MultiImageUploadComp.vue @@ -10,6 +10,7 @@ :before-delete="handleRemove" v-model="uploadImg.fileList" :after-read="onUploadChanged" + max-count="1" > @@ -27,6 +28,7 @@ export default { watch: { value: { handler: function (newVal, oldVal) { + console.info(newVal); if(newVal == this.internalValue) return; this.reset(); @@ -78,6 +80,7 @@ export default { } file.fileList = this.uploadImg.fileList; this.$emit('fileChanged', this.uploadImg.fileList); + this.$emit('fileUpdate', file); this.updateValue(); console.log('新增', this.uploadImg.fileList); }).catch((e) => { diff --git a/src/router/index.js b/src/router/index.js index 2350eb62..6e5b5150 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2479,6 +2479,42 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/homestead/supervision/supervisionAdd'], resolve) }, + { + path: '/yinnong/supervisionCloseCase', + name: 'yinnongSupervisionCloseCase', + meta: { + title: '修改宅基地监管', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/supervision/supervisionCloseCase'], resolve) + }, + { + path: '/yinnong/supervisionWfxx', + name: 'yinnongSupervisionWfxx', + meta: { + title: '修改宅基地监管', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/supervision/supervisionWfxx'], resolve) + }, + { + path: '/yinnong/supervisionModify', + name: 'yinnongSupervisionModify', + meta: { + title: '修改宅基地监管', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/supervision/supervisionModify'], resolve) + }, + { + path: '/yinnong/supervisionDetail', + name: 'yinnongSupervisionDetail', + meta: { + title: '宅基地监管详情', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/homestead/supervision/supervisionDetail'], resolve) + }, { path: '/lawEnforcement', name: 'lawEnforcement', diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue index 695e3c06..298e3a3a 100644 --- a/src/views/sunVillage_info/homeApplication/proposerLite.vue +++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue @@ -675,11 +675,9 @@ + + diff --git a/src/views/yinnong/homestead/supervision/supervisionList.vue b/src/views/yinnong/homestead/supervision/supervisionList.vue index da9c3bf6..93087b43 100644 --- a/src/views/yinnong/homestead/supervision/supervisionList.vue +++ b/src/views/yinnong/homestead/supervision/supervisionList.vue @@ -21,27 +21,30 @@ @load="getList" > - + @@ -95,9 +98,11 @@ export default { getList(this.queryParams).then(response => { console.log(response) for (var i = 0; i < response.rows.length; i++) { - response.rows[i].status = this.selectDictLabel(this.auditStatus, response.rows[i].status); - response.rows[i].jglx = this.selectDictLabel(this.jglxDictionaries, response.rows[i].jglx); - response.rows[i].taskSource = this.selectDictLabel(this.taskSourceDictionaries, response.rows[i].taskSource); + // response.rows[i].status = this.selectDictLabel(this.auditStatus, response.rows[i].status); + // response.rows[i].jglx = this.selectDictLabel(this.jglxDictionaries, response.rows[i].jglx); + this.$set(response.rows[i], "statusName", this.selectDictLabel(this.auditStatus, response.rows[i].status)); + this.$set(response.rows[i], "jglxName", this.selectDictLabel(this.jglxDictionaries, response.rows[i].jglx)); + this.$set(response.rows[i], "taskSourceName", this.selectDictLabel(this.taskSourceDictionaries, response.rows[i].taskSource)); this.applicationList.push(response.rows[i]); } if(this.applicationList.length >= response.total){ diff --git a/src/views/yinnong/homestead/supervision/supervisionModify.vue b/src/views/yinnong/homestead/supervision/supervisionModify.vue index d843ebe0..92e11de2 100644 --- a/src/views/yinnong/homestead/supervision/supervisionModify.vue +++ b/src/views/yinnong/homestead/supervision/supervisionModify.vue @@ -11,138 +11,117 @@
+ +
+ + {{item.sqrxm}} + +
+ + + - - - - - - - - - - - - - - - - - - - - - - - - +
- -

违法信息

-
- - - 执法情况

+ + + + + + + + +
+

违法信息

+
+ - - - - - - - - + + + + + + + - + + + +
+
@@ -150,7 +129,7 @@ - +
@@ -159,9 +138,14 @@ + +