From ea4db7da378991900efb589c2b300e07d5c86797 Mon Sep 17 00:00:00 2001 From: xuyuanqing <392009588@qq.com> Date: Thu, 30 Nov 2023 13:35:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?= =?UTF-8?q?=E6=9F=A5=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homesteadSurvey/fsssAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/homesteadSurvey/fsssAdd.vue b/src/views/homesteadSurvey/fsssAdd.vue index daf1039c..4c794fc1 100644 --- a/src/views/homesteadSurvey/fsssAdd.vue +++ b/src/views/homesteadSurvey/fsssAdd.vue @@ -25,7 +25,7 @@ -

农户

+

权利人
From f4b0919d4ebb5be2750dfb1c31bc8883e67616b3 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Fri, 1 Dec 2023 13:26:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=90=AB=E5=BB=B6=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/projectDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue index f6188215..92aa2c3a 100644 --- a/src/views/project/projectDetail.vue +++ b/src/views/project/projectDetail.vue @@ -60,7 +60,7 @@ 竞价开始时间：{{ detail.biddingStartTime }} - 竞价结束时间：{{ detail.biddingStopTime }} + 竞价结束时间 (含延期)：{{ detail.biddingStopTime }} 竞价方式：{{ detail.biddingType }} From 0fe17af568c47599a452646ed96413d3714e9ebb Mon Sep 17 00:00:00 2001 From: xuyuanqing <392009588@qq.com> Date: Fri, 1 Dec 2023 15:08:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?= =?UTF-8?q?=E6=9F=A5=E7=AD=BE=E5=AD=97=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homesteadSurvey/add4.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue index 6070ff26..e4e9dc61 100644 --- a/src/views/homesteadSurvey/add4.vue +++ b/src/views/homesteadSurvey/add4.vue @@ -126,13 +126,13 @@ :lineWidth="signature.lineWidth" :lineColor="signature.lineColor" :bgColor.sync="signature.bgColor" - v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg" + v-if="zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5' || !signature.resultImg && permission == 'true'" /> - - -
+ +
清空画板 保存提交
From 2f8b221cc8e38cd6a153e36bfb0fb92f49ecc8b5 Mon Sep 17 00:00:00 2001 From: xuyuanqing <392009588@qq.com> Date: Fri, 1 Dec 2023 15:38:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?= =?UTF-8?q?=E6=9F=A5=E5=85=B3=E8=81=94=E5=86=9C=E6=88=B7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homesteadSurvey/shyqrAdd.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue index 828202bf..a959b234 100644 --- a/src/views/homesteadSurvey/shyqrAdd.vue +++ b/src/views/homesteadSurvey/shyqrAdd.vue @@ -348,6 +348,7 @@ export default { deptId:JSON.parse(localStorage.getItem("surveyItem")).deptId, nhdmDictionaries:[], newList:[], + newListTwo:[], nmfwDictionaries:[], mapShow: false, form:{} @@ -402,6 +403,7 @@ export default { }; }); this.newList = this.nhdmDictionaries; + this.newListTwo = this.nhdmDictionaries; }); }, checkNhdmQx(){ @@ -534,7 +536,7 @@ export default { } } if(val==""){ - this.getList() + this.newList = this.newListTwo; } }, /** 查找地图中宅基地 */ From c55ab210d9f4435c93fd013063b5f132f72fd08e Mon Sep 17 00:00:00 2001 From: xuyuanqing <392009588@qq.com> Date: Mon, 4 Dec 2023 15:21:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E9=80=80=E5=87=BA=E8=B7=B3=E8=BD=AC=E3=80=81=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/user/index.vue b/src/views/user/index.vue index 1a6a78c9..f870faba 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -106,7 +106,7 @@ export default { for(var i = keys.length; i--;) document.cookie = keys[i] + '=0;expires=' + new Date(0).toUTCString() } - this.$router.push({name:'index'}) + this.$router.push({ path: "/index" }); }); }, getInfo(){ @@ -120,7 +120,10 @@ export default { this.activitiStatus = response.data.activitiStatus; this.instanceId = response.data.instanceId; this.memberType = response.data.memberType; - this.getHistoryList() + if(this.instanceId !== "" && this.instanceId != null){ + this.getHistoryList() + } + }); }); },