From 8c48c154e9a6a8dad7afbbb00574047a1702578c Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Sun, 15 Oct 2023 09:22:35 +0800 Subject: [PATCH 1/4] 2 --- index.html | 2 +- src/views/sunVillage_info/index.vue | 2 +- src/views/sunVillage_info/index_code.vue | 2 +- src/views/sunVillage_info/index_code_rights.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index d5ea3bb7..cc183ac1 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ - 农燊高科 + 中农高科 diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue index b281a83d..5bc4a0c9 100644 --- a/src/views/sunVillage_info/index.vue +++ b/src/views/sunVillage_info/index.vue @@ -50,7 +50,7 @@
- {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}} + {{configValue == ""?'技术支持：深圳中农高科信息技术有限公司':configValue}}
diff --git a/src/views/sunVillage_info/index_code.vue b/src/views/sunVillage_info/index_code.vue index 58fbd4cc..c5c0b7fd 100644 --- a/src/views/sunVillage_info/index_code.vue +++ b/src/views/sunVillage_info/index_code.vue @@ -59,7 +59,7 @@
- {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}} + {{configValue == ""?'技术支持：深圳中农高科信息技术有限公司':configValue}}
diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue index a98ee40b..a891ba7b 100644 --- a/src/views/sunVillage_info/index_code_rights.vue +++ b/src/views/sunVillage_info/index_code_rights.vue @@ -31,7 +31,7 @@
- {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}} + {{configValue == ""?'技术支持：深圳中农高科信息技术有限公司':configValue}}
From 1e576b2ba065ac0c99fce5b5ad038c4cf58075aa Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Sun, 15 Oct 2023 09:27:51 +0800 Subject: [PATCH 2/4] Revert "2" This reverts commit 8c48c154 --- index.html | 2 +- src/views/sunVillage_info/index.vue | 2 +- src/views/sunVillage_info/index_code.vue | 2 +- src/views/sunVillage_info/index_code_rights.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index cc183ac1..d5ea3bb7 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ - 中农高科 + 农燊高科 diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue index 5bc4a0c9..b281a83d 100644 --- a/src/views/sunVillage_info/index.vue +++ b/src/views/sunVillage_info/index.vue @@ -50,7 +50,7 @@
- {{configValue == ""?'技术支持：深圳中农高科信息技术有限公司':configValue}} + {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}}
diff --git a/src/views/sunVillage_info/index_code.vue b/src/views/sunVillage_info/index_code.vue index c5c0b7fd..58fbd4cc 100644 --- a/src/views/sunVillage_info/index_code.vue +++ b/src/views/sunVillage_info/index_code.vue @@ -59,7 +59,7 @@
- {{configValue == ""?'技术支持：深圳中农高科信息技术有限公司':configValue}} + {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}}
diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue index a891ba7b..a98ee40b 100644 --- a/src/views/sunVillage_info/index_code_rights.vue +++ b/src/views/sunVillage_info/index_code_rights.vue @@ -31,7 +31,7 @@
- {{configValue == ""?'技术支持：深圳中农高科信息技术有限公司':configValue}} + {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}}
From a3d6d3a29143a89e5a7f10caf60aa960194df9c7 Mon Sep 17 00:00:00 2001 From: QI_YUJIE <2878090898@qq.com> Date: Mon, 16 Oct 2023 10:35:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sunVillage_info/list_contractor_single_process.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/sunVillage_info/list_contractor_single_process.vue b/src/views/sunVillage_info/list_contractor_single_process.vue index d05455d3..1687e72c 100644 --- a/src/views/sunVillage_info/list_contractor_single_process.vue +++ b/src/views/sunVillage_info/list_contractor_single_process.vue @@ -201,7 +201,7 @@ this.$notify({type: 'success', message: '签字成功'}); this.showForm2 = true; this.form = r1.data; - this.$router.push({name:'sunVillageInfoListContractor'}) + this.$router.push({path:'/sunVillage_info/list_contractor',query:{sqStatus:true}}); }) // let param = new FormData() // 创建form对象 // param.append('file', wj) // 通过append向form对象添加数据 From 385e3c23537330f2ea930dc64f03f559aeea3ee9 Mon Sep 17 00:00:00 2001 From: QI_YUJIE <2878090898@qq.com> Date: Mon, 16 Oct 2023 13:10:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sunVillage_info/list_cbfsq_view.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/sunVillage_info/list_cbfsq_view.vue b/src/views/sunVillage_info/list_cbfsq_view.vue index a901162e..b7ce57a3 100644 --- a/src/views/sunVillage_info/list_cbfsq_view.vue +++ b/src/views/sunVillage_info/list_cbfsq_view.vue @@ -160,7 +160,7 @@ - + @@ -204,7 +204,7 @@ }; }, created() { - if(this.$route.query.sqStatus){ + if(this.$route.query.sqStatus){ // 授权 getCbfById(this.$route.query.id).then(response => { this.form = response.data; if(this.form.accountId != null && this.form.accountId !== ""){ @@ -219,7 +219,7 @@ this.getContractedLandList(this.form.cbfbm); }); - }else if(this.$route.query.shStatus){ + }else if(this.$route.query.shStatus){ // 审核 getCbfById(this.$route.query.id).then(response => { this.form = response.data; if(this.form.gsshqz != null && this.form.gsshqz !== ""){ @@ -239,20 +239,20 @@ } }, methods: { - InitOptions() { + /* InitOptions() { for(let k in this.options) { this.getDicts(k).then((resp) => this.options[k] = resp.data); } }, - /*承包方授权*/ + // 承包方授权 cbfsq(){ eqbEmpower(this.form).then(response => { if(response.code === 200 ){ this.sqbutShow = false; } }); - }, + }, */ getSysCfb(){ getCbfList({deptId:this.sysFarmer.deptId,cbfzjhm:this.sysFarmer.idcard}).then(response => { this.sqbutShow = true;