diff --git a/src/router/index.js b/src/router/index.js index 3bb11c88..ecc1bf1d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -5549,6 +5549,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/contracted/village/contractor/contractorLandMap'], resolve) }, + { + path: '/contracted/village/employer', + name: 'contractedVillageEmployer', + meta: { + title: '发包方', + hidden: true, + }, + component: (resolve) => require(['@/views/contracted/village/employer/employer'], resolve) + }, ]; diff --git a/src/utils/request.js b/src/utils/request.js index 01599d57..a4b60e5f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -113,6 +113,11 @@ service.interceptors.response.use(res => { window.location.href = '/agriculturalTrusteeship/login'; return; } + // 土地确权 + if (window.location.href.indexOf('/contracted') != -1){ + window.location.href = '/contracted/login'; + return; + } // 产权交易 window.location.href = '/login'; }) diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue index a3661854..9ae5b75a 100644 --- a/src/views/contracted/village/contractor/contractor.vue +++ b/src/views/contracted/village/contractor/contractor.vue @@ -5,9 +5,9 @@

承包方

-

发包方

-

地块

-

地图

+

发包方

+

地块

+

地图

diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue new file mode 100644 index 00000000..00870466 --- /dev/null +++ b/src/views/contracted/village/employer/employer.vue @@ -0,0 +1,255 @@ + + + diff --git a/src/views/contracted/village/massif/massif.vue b/src/views/contracted/village/massif/massif.vue new file mode 100644 index 00000000..9ae5b75a --- /dev/null +++ b/src/views/contracted/village/massif/massif.vue @@ -0,0 +1,188 @@ + + + diff --git a/src/views/sunVillage_info/list_finance_add.vue b/src/views/sunVillage_info/list_finance_add.vue index 1f4c13e9..6f382a9a 100644 --- a/src/views/sunVillage_info/list_finance_add.vue +++ b/src/views/sunVillage_info/list_finance_add.vue @@ -115,6 +115,7 @@ openNy:this.format(new Date(),'yyyy-MM'), openPic:'', openFile:'', + openName:this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月财务公开' }, openPic:[], fileList:[], @@ -144,7 +145,6 @@ this.type = this.$route.query.type; this.queryParams.bookId = Cookies.get('bookId'); this.queryParams.deptId = Cookies.get('deptId'); - this.form.openName = this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月财务公开'; }, methods: { onSubmit(){ diff --git a/src/views/sunVillage_info/list_tourists_add.vue b/src/views/sunVillage_info/list_tourists_add.vue index 5656082f..943f8338 100644 --- a/src/views/sunVillage_info/list_tourists_add.vue +++ b/src/views/sunVillage_info/list_tourists_add.vue @@ -103,6 +103,7 @@ openNy:this.format(new Date(),'yyyy-MM'), openPic:'', openFile:'', + openName:this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月零工公开' }, openPic:[], fileList:[], @@ -132,7 +133,6 @@ this.type = this.$route.query.type; this.queryParams.bookId = Cookies.get('bookId'); this.queryParams.deptId = Cookies.get('deptId'); - this.form.openName = this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月零工公开'; }, methods: { onSubmit(){