From ee13301137e118fde9ca61d3b531043390d8f609 Mon Sep 17 00:00:00 2001 From: QI_YUJIE <2878090898@qq.com> Date: Thu, 24 Aug 2023 16:54:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/contracted/index.vue | 12 +++- .../village/contractor/contractWord.vue | 8 ++- .../village/contractor/contractor.vue | 7 ++- .../village/contractor/contractorDetail.vue | 13 ++--- .../village/contractor/contractorFamily.vue | 10 ++-- .../contractor/contractorFamilyDetail.vue | 4 +- .../village/contractor/contractorHeader.vue | 9 +-- .../village/contractor/contractorLand.vue | 10 ++-- .../contractor/contractorLandDetail.vue | 4 +- .../village/contractor/contractorLandMap.vue | 56 ++++++++++++++++++- .../contracted/village/employer/employer.vue | 4 +- src/views/contracted/village/map/map.vue | 6 +- .../contracted/village/massif/massif.vue | 7 ++- .../village/massif/massifDetail.vue | 4 +- 14 files changed, 117 insertions(+), 37 deletions(-) diff --git a/src/views/contracted/index.vue b/src/views/contracted/index.vue index 3d530d3b..b5be8bda 100644 --- a/src/views/contracted/index.vue +++ b/src/views/contracted/index.vue @@ -55,9 +55,9 @@ - + --> @@ -122,6 +122,12 @@ }); }, goDetail(item){ + // 调查任务完成状态:已完成标记为1,未完成标记为2 + let status = '1'; + if (item.surStatus === 'UNFINISHED') { + status = '2'; + } + Cookies.set('taskStatus', status, { expires: 30 }); this.$router.push({path:'/contracted/village/contractor', query: { deptId: item.deptId, deptName: item.deptName }}) }, onSelect(action) { diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue index 0e40143e..6dfc7ab9 100644 --- a/src/views/contracted/village/contractor/contractWord.vue +++ b/src/views/contracted/village/contractor/contractWord.vue @@ -8,7 +8,7 @@ --> - +

承包方

@@ -152,7 +152,7 @@ -

保存

+

保存

@@ -182,10 +182,12 @@ showCbqxz: false, // 控制承包结束时间弹出层的显示和隐藏 minDate: new Date(1978, 0, 1), maxDate: new Date(2100, 11, 31), - isDisabled: false + isDisabled: false, + taskStatus: null, // 调查任务的完成状态:1表示已完成,2表示未完成 }; }, created() { + this.taskStatus = Cookies.get('taskStatus'); this.getDicts("jyq_method").then(response => { this.cbfsOptions = response.data; }); diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue index c03c9374..f8e2a9ea 100644 --- a/src/views/contracted/village/contractor/contractor.vue +++ b/src/views/contracted/village/contractor/contractor.vue @@ -20,7 +20,7 @@ @search="onSearch" > -
+

+ 新增

@@ -61,7 +61,7 @@

挂起原因

-
+

删除

@@ -114,9 +114,12 @@ showRemark: false, // 异常备注信息 remark: null, + // 调查任务的完成状态:1表示已完成,2表示未完成 + taskStatus: null, }; }, created() { + this.taskStatus = Cookies.get('taskStatus'); this.queryParams.deptId = this.$route.query.deptId; this.getDicts("confirmed_survey_status").then(response => { this.surveyStatusOptions = response.data; diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue index acb07a1e..b8fc2b66 100644 --- a/src/views/contracted/village/contractor/contractorDetail.vue +++ b/src/views/contracted/village/contractor/contractorDetail.vue @@ -8,7 +8,7 @@
--> - +

承包方

@@ -72,7 +72,7 @@ -

保存

+

保存

@@ -98,15 +98,12 @@ contractorTypeOptions: [], // 承包方证件类型字典 credentialTypeOptions: [], + // 调查任务的完成状态:1表示已完成,2表示未完成 + taskStatus: null, }; }, - watch: { - '$route': function() { - window.location.reload(); - } - }, created() { - console.log(this.$route.params); + this.taskStatus = Cookies.get('taskStatus'); this.getDicts("cbf_type").then(response => { this.contractorTypeOptions = response.data; }); diff --git a/src/views/contracted/village/contractor/contractorFamily.vue b/src/views/contracted/village/contractor/contractorFamily.vue index 22e13cb5..4a1588a6 100644 --- a/src/views/contracted/village/contractor/contractorFamily.vue +++ b/src/views/contracted/village/contractor/contractorFamily.vue @@ -8,7 +8,7 @@ --> - +

承包方

@@ -41,7 +41,7 @@

{{ item.sfgyr }}

- --> - +

承包方

@@ -21,7 +21,7 @@

进入地图

-
+

+ 新增

@@ -49,7 +49,7 @@

北:{{ item.dkbz }}

-