From 866332ce77e3a036786ebc54aa08b82566e03977 Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Tue, 19 Sep 2023 11:45:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=8C=85=E7=BD=91=E7=AD=BE=E3=80=81?= =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sunVillage_info/fixedAssets.js | 4 +- src/views/homesteadSurvey/list2.vue | 64 +- src/views/homesteadSurvey/wcnhList.vue | 4914 +++++++++++++++++ src/views/sunVillage_info/list_cbf.vue | 36 +- src/views/sunVillage_info/list_cbfsq.vue | 17 +- src/views/sunVillage_info/list_cbht.vue | 7 +- .../list_chronicles_process.vue | 6 +- .../list_contract_signature.vue | 4 +- .../list_contractor_process.vue | 12 +- .../sunVillage_info/list_employer_process.vue | 6 +- 10 files changed, 5018 insertions(+), 52 deletions(-) create mode 100644 src/views/homesteadSurvey/wcnhList.vue diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index d70982fe..f176adac 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -791,7 +791,7 @@ export function signProcessArchive(id) { // 签署合同下载 export function signedContractDownload(id) { return request({ - url: '/service/cbht/sign/download/' + id, + url: '/open/villageAffairs/public/sign/download/' + id, method: 'get' }); } @@ -799,7 +799,7 @@ export function signedContractDownload(id) { // 签字合同预览 export function viewSignedContract(id) { return request({ - url: '/service/cbht/sign/view/' + id, + url: '/open/villageAffairs/public/sign/view/' + id, method: 'get' }); } diff --git a/src/views/homesteadSurvey/list2.vue b/src/views/homesteadSurvey/list2.vue index b4f7b9ff..4e574ecf 100644 --- a/src/views/homesteadSurvey/list2.vue +++ b/src/views/homesteadSurvey/list2.vue @@ -86,26 +86,26 @@ - - - - - - - - -
-
- - - + + + + + + + + + + + + + + + + + + + @@ -124,12 +124,14 @@ import { listTown, getTown } from "@/api/homesteadSurvey/town"; import { listVillage} from "@/api/homesteadSurvey/village"; import {deptGetId,} from "@/api/homestead/index"; + import wcnhList from "@/views/homesteadSurvey/wcnhList"; import $ from "jquery"; import {Dialog} from "vant"; import {ref} from "vue"; import axios from "axios"; export default { name: "homesteadList", + components: { wcnhList}, data() { return { loading1:false, @@ -819,9 +821,7 @@ }, /** 新增外村农户按钮操作 */ onClickWcnh(){ - this.getWcnhList().then((resp) => { - this.outsideOpen = true; - }); + this.outsideOpen = true; }, getWcnhList() { return queryHomesteadnhhncyList({ @@ -4942,13 +4942,19 @@ }, /** 外村农户提交按钮 */ outsideSubmitForm() { - addOutsidenhhncy(this.outsideForm).then(response => { - if(response.code != 200) throw response.msg; - this.$toast("新增成功"); - this.outsideOpen = false; - this.getList(); - this.outDiglogStatus = true; - }).catch(() => this.outDiglogStatus = true); + let wcnhData = this.$refs.wcnh.wcnhData; + if(wcnhData == null){ + this.$toast("请选择外村农户！"); + }else { + addOutsidenhhncy(wcnhData).then(response => { + if(response.code != 200) throw response.msg; + this.$toast("新增成功"); + this.outsideOpen = false; + this.getList(); + this.outDiglogStatus = true; + }).catch(() => this.outDiglogStatus = true); + } + }, closeSearchBox(){ this.showSearch = false ; diff --git a/src/views/homesteadSurvey/wcnhList.vue b/src/views/homesteadSurvey/wcnhList.vue new file mode 100644 index 00000000..79bbc637 --- /dev/null +++ b/src/views/homesteadSurvey/wcnhList.vue @@ -0,0 +1,4914 @@ + + + + + diff --git a/src/views/sunVillage_info/list_cbf.vue b/src/views/sunVillage_info/list_cbf.vue index 896a7bd8..17ec70cc 100644 --- a/src/views/sunVillage_info/list_cbf.vue +++ b/src/views/sunVillage_info/list_cbf.vue @@ -44,7 +44,7 @@

预览

--> -
+

合同网签

@@ -52,6 +52,15 @@

公示结果签名

+
+ +

合同预览

+
+
+ +

下载合同

+
+ + + + + +
授权 @@ -140,7 +140,6 @@ }, /*承包方授权*/ cbfsq(){ - console.info(3333333333); eqbEmpower(this.form).then(response => { if(response.code === 200 ){ this.sqbutShow = false; @@ -156,7 +155,7 @@ if(this.form.accountId != null && this.form.accountId !== ""){ this.sqbutShow = false; } - this.getDicts("zjlx").then(response => { + this.getDicts("cert_type").then(response => { response.data.forEach(function (item) { if (item.dictValue === _this.form.cbfzjlx) { _this.zjlxName = item.dictLabel; diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue index 62783886..4f83f96c 100644 --- a/src/views/sunVillage_info/list_cbht.vue +++ b/src/views/sunVillage_info/list_cbht.vue @@ -84,10 +84,7 @@
- - - Alternative Content--> - + @@ -181,7 +178,7 @@ getList() { this.loading = true; let wcStatus = this.$route.query.wcStatus; - if(wcStatus){ + if(wcStatus === 'true'){ this.$set(this.queryParams, 'signingStatus',"3"); }else{ this.$set(this.queryParams, 'signingStatus',null); diff --git a/src/views/sunVillage_info/list_chronicles_process.vue b/src/views/sunVillage_info/list_chronicles_process.vue index 9b9ac602..f180ed4e 100644 --- a/src/views/sunVillage_info/list_chronicles_process.vue +++ b/src/views/sunVillage_info/list_chronicles_process.vue @@ -146,7 +146,11 @@ $('#canvasTT').css('display', 'none'); }, onSign(){ - this.showesign = true; + if(this.form.gsjs != null && this.form.gsjs !== ""){ + this.showesign = true; + }else{ + this.$toast.fail('请填写记事内容！'); + } }, // 清空画板 handleReset() { diff --git a/src/views/sunVillage_info/list_contract_signature.vue b/src/views/sunVillage_info/list_contract_signature.vue index af2c17b9..50abfd0e 100644 --- a/src/views/sunVillage_info/list_contract_signature.vue +++ b/src/views/sunVillage_info/list_contract_signature.vue @@ -59,7 +59,7 @@

承包合同

-

进入合同 >

+

进入合同 >

@@ -95,7 +95,7 @@

{{form.htywcfsbfb}}

{{form.htywcfs}}份

-

进入查看 >

+

进入查看 >

diff --git a/src/views/sunVillage_info/list_contractor_process.vue b/src/views/sunVillage_info/list_contractor_process.vue index 75966858..0b646bb7 100644 --- a/src/views/sunVillage_info/list_contractor_process.vue +++ b/src/views/sunVillage_info/list_contractor_process.vue @@ -174,7 +174,17 @@ $('#canvasTT').css('display', 'none'); }, onSign(){ - this.showesign = true; + if(this.form.gsjsrqz == null || this.form.gsjsrqz === ""){ + this.$toast.fail('请先完成承包方记事！'); + }else{ + if(this.form.gsshyj != null && this.form.gsshyj !== ""){ + this.showesign = true; + }else{ + this.$toast.fail('请填写审核意见！'); + } + + } + }, // 清空画板 handleReset() { diff --git a/src/views/sunVillage_info/list_employer_process.vue b/src/views/sunVillage_info/list_employer_process.vue index 0f28772c..c8e9bc32 100644 --- a/src/views/sunVillage_info/list_employer_process.vue +++ b/src/views/sunVillage_info/list_employer_process.vue @@ -138,7 +138,11 @@ $('#canvasTT').css('display', 'none'); }, onSign(){ - this.showesign = true; + if(this.form.shyj != null && this.form.shyj !== ""){ + this.showesign = true; + }else{ + this.$toast.fail('请填写审核意见！'); + } }, // 清空画板 handleReset() {