From f668a63a51811ea7d97b109c787fd7ff6e81ab09 Mon Sep 17 00:00:00 2001 From: QI_YUJIE <2878090898@qq.com> Date: Fri, 30 Sep 2022 08:39:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=85=E5=9F=BA?= =?UTF-8?q?=E5=9C=B0=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=B2=E5=8A=9E=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homestead/homeApplication/proposerLite.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue index 79332ea2..feca7c34 100644 --- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue +++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue @@ -1988,11 +1988,15 @@ export default { case PROPOSER_VIEW: this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(houseApplyStatus, ["1", '32']); this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31"]); - this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8']); - this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']); - this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']); - this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']); + this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '7', this.isInRoles(role, 'town_leader') ? -99 : '8']); + this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']); + this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']); + this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']); + // this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", "7", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8','7']); + // this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8','7']); + // this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8','7']); + // this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8','7']); this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']); this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']); @@ -2565,7 +2569,8 @@ export default { } // 通用设置 - if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){ + // if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){ + if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null){ if (this.isAccepting()) { this.active = PROPOSER_STAGE_START; this.selectedTabName = PROPOSER_STAGE_START; From 66cd960e30ebcd3abcc11ecc3bf05b6081f64402 Mon Sep 17 00:00:00 2001 From: QI_YUJIE <2878090898@qq.com> Date: Fri, 30 Sep 2022 08:41:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=85=E5=9F=BA?= =?UTF-8?q?=E5=9C=B0=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=B2=E5=8A=9E=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onlineHome/homestead/homeApplication/proposerLite.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue index feca7c34..8b1100d2 100644 --- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue +++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue @@ -1992,11 +1992,7 @@ export default { this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']); this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']); this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']); - - // this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", "7", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8','7']); - // this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8','7']); - // this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8','7']); - // this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8','7']); + this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']); this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']); From 9bdb17590f2a7a85da728c94159cff6316cfef11 Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Fri, 30 Sep 2022 09:56:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/onlineHome/homestead/homeApplication/proposerLite.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue index 79332ea2..20d4e603 100644 --- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue +++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue @@ -3848,6 +3848,8 @@ export default { } if(this.$refs.pictureUploadApplyingTHouseApproveNature && this.$refs.pictureUploadApplyingTHouseApproveNature.isValid()) { this.submitHouseApproveNatureplanOptions(); + console.info( this.applicationDetail.tHouseApproveNatureOptions.naturePlan) + return "cccc"; } else { if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.naturePlan)) { return "自然资源部门现场拍照不能为空"; From 1f86893331582bbc95ea39e04493c26c167bc69e Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Fri, 30 Sep 2022 15:29:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homestead/circulation/circulationAdd.vue | 5 ++++- .../homestead/homeApplication/proposerLite.vue | 16 +++++++++------- src/views/onlineHome/workbench.vue | 16 ++++++++-------- .../homestead/circulation/circulationModify.vue | 4 +++- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/views/onlineHome/homestead/circulation/circulationAdd.vue b/src/views/onlineHome/homestead/circulation/circulationAdd.vue index e9aed340..3fca6c14 100644 --- a/src/views/onlineHome/homestead/circulation/circulationAdd.vue +++ b/src/views/onlineHome/homestead/circulation/circulationAdd.vue @@ -278,7 +278,10 @@ //流转方式 this.houseGetDicts("lzfs").then((res) => { for( let i = 0 ; i < res.data.length ; i++){ - this.lzfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}) + if(res.data[i].dictSort < 6){ + this.lzfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}) + } + } }); //转入方证件类型 diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue index cd5d7ce1..576ca92b 100644 --- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue +++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue @@ -114,7 +114,7 @@ - +

使用权流转

- -
-
- -
-
-

使用权抵押

- + + + + + + + +
diff --git a/src/views/yinnong/homestead/circulation/circulationModify.vue b/src/views/yinnong/homestead/circulation/circulationModify.vue index 02530d65..433f270e 100644 --- a/src/views/yinnong/homestead/circulation/circulationModify.vue +++ b/src/views/yinnong/homestead/circulation/circulationModify.vue @@ -281,7 +281,9 @@ export default { //流转方式 this.houseGetDicts("lzfs").then((res) => { for( let i = 0 ; i < res.data.length ; i++){ - this.lzfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}) + if(res.data[i].dictSort < 6){ + this.lzfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}) + } } this.lzfs = this.selectDictLabel(res.data, response.data.lzfs); });