From 5e49e39a8d240435ab0511751c59335690d99b4c Mon Sep 17 00:00:00 2001 From: zhaochengke Date: Tue, 7 Jun 2022 16:41:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E7=A4=BA=20=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=86=9C=E6=88=B7=20=E5=AE=85=E5=9F=BA?= =?UTF-8?q?=E5=9C=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arbitration/arbitrationHandlerList.vue | 9 +- .../homestead/arbitration/arbitrationList.vue | 9 +- .../arbitration/arbitrationProcessList.vue | 9 +- .../homestead/circulation/circulationAdd.vue | 9 +- .../homeApplication/houseAnnounce.vue | 8 +- .../homeApplication/houseLicense.vue | 8 +- .../homestead/mortgage/mortgageAdd.vue | 21 +++- .../homestead/mortgage/mortgageModify.vue | 19 ++- .../homestead/paidExit/paidExitAdd.vue | 18 ++- .../homestead/paidExit/paidExitModify.vue | 16 ++- src/views/onlineHome/publicity.vue | 108 +++++++++++++----- 11 files changed, 160 insertions(+), 74 deletions(-) diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue index e9bd9675..c7c0fee2 100644 --- a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue +++ b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue @@ -92,12 +92,11 @@ export default { }, methods: { getList(target) { - if(this.loading) return; let type = typeof (target); console.log(type, target); if (target === 0) { this.refreshing = true; - this.finished = false; + this.finished = true; this.total = 0; this.queryParams.pageNum = 1; this.list = []; @@ -111,7 +110,7 @@ export default { else { this.refreshing = true; - this.finished = false; + this.finished = true; this.total = 0; this.queryParams.pageNum = 1; this.list = [] @@ -126,9 +125,7 @@ export default { this.list.push(e); }); this.total += response.rows.length; - if (this.total >= response.total) { - this.finished = true; - } + this.finished = this.total >= response.total; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue index 3f2ae905..5473b60f 100644 --- a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue +++ b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue @@ -98,12 +98,11 @@ export default { }, methods: { getList(target) { - if(this.loading) return; let type = typeof (target); console.log(type, target); if (target === 0) { this.refreshing = true; - this.finished = false; + this.finished = true; this.total = 0; this.queryParams.pageNum = 1; this.list = []; @@ -117,7 +116,7 @@ export default { else { this.refreshing = true; - this.finished = false; + this.finished = true; this.total = 0; this.queryParams.pageNum = 1; this.list = [] @@ -132,9 +131,7 @@ export default { this.list.push(e); }); this.total += response.rows.length; - if (this.total >= response.total) { - this.finished = true; - } + this.finished = this.total >= response.total; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue index a39aad45..e6d01968 100644 --- a/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue +++ b/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue @@ -92,12 +92,11 @@ export default { }, methods: { getList(target) { - if(this.loading) return; let type = typeof (target); console.log(type, target); if (target === 0) { this.refreshing = true; - this.finished = false; + this.finished = true; this.total = 0; this.queryParams.pageNum = 1; this.list = []; @@ -111,7 +110,7 @@ export default { else { this.refreshing = true; - this.finished = false; + this.finished = true; this.total = 0; this.queryParams.pageNum = 1; this.list = [] @@ -126,9 +125,7 @@ export default { this.list.push(e); }); this.total += response.rows.length; - if (this.total >= response.total) { - this.finished = true; - } + this.finished = this.total >= response.total; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/circulation/circulationAdd.vue b/src/views/onlineHome/homestead/circulation/circulationAdd.vue index 0b0b0b38..4067a7ae 100644 --- a/src/views/onlineHome/homestead/circulation/circulationAdd.vue +++ b/src/views/onlineHome/homestead/circulation/circulationAdd.vue @@ -294,6 +294,8 @@ for( let i = 0 ; i < zjdRes.rows.length ; i++){ this.zjdDictionaries.push(zjdRes.rows[i].zjddm); } + if(this.zjdDictionaries.length > 0) + this.onConfirmZjd(this.zjdDictionaries[0]); }); //流转前房屋用途 this.houseGetDicts("fwyt").then((res) => {//流转前房屋用途 @@ -319,8 +321,11 @@ var form = {}; form.zjddm = value; getByZjddm(form).then(qlrRes => { - console.log(qlrRes.data.shyqrdm) - this.circulation.shyqrdm = qlrRes.data.shyqrdm; + let data = qlrRes.data; + console.log(data) + this.circulation.shyqrdm = data.shyqrdm; + this.$set(this.circulation, 'suyqrdbxm', data.shyqrdbxm); + this.$set(this.circulation, 'zcfsfbjtjjzzcy', data.sfbncjtjjzzcy == '1' || data.sfbncjtjjzzcy == 'Y' ? 'Y' : 'N'); this.$forceUpdate(); }); this.showZjd = false; diff --git a/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue b/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue index d0cf0e41..c00d52c7 100644 --- a/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue +++ b/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue @@ -160,7 +160,7 @@ export default { console.log(type, target); if (target === 0) { this.refreshing = true; - this.finished = false; + this.finished = true; this.total = 0; this.queryParams.pageNum = 1; this.list = []; @@ -174,7 +174,7 @@ export default { else { this.refreshing = true; - this.finished = false; + this.finished = true; this.resetQuery(); this.total = 0; this.queryParams.pageNum = 1; @@ -190,9 +190,7 @@ export default { this.list.push(e); }); this.total += response.rows.length; - if (this.total >= response.total) { - this.finished = true; - } + this.finished = this.total >= response.total; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/homeApplication/houseLicense.vue b/src/views/onlineHome/homestead/homeApplication/houseLicense.vue index cf0f9e94..922eaf79 100644 --- a/src/views/onlineHome/homestead/homeApplication/houseLicense.vue +++ b/src/views/onlineHome/homestead/homeApplication/houseLicense.vue @@ -112,7 +112,7 @@ export default { console.log(type, target); if (target === 0) { this.refreshing = true; - this.finished = false; + this.finished = true; this.total = 0; this.queryParams.pageNum = 1; this.list = []; @@ -126,7 +126,7 @@ export default { else { this.refreshing = true; - this.finished = false; + this.finished = true; this.resetQuery(); this.total = 0; this.queryParams.pageNum = 1; @@ -142,9 +142,7 @@ export default { this.list.push(e); }); this.total += response.rows.length; - if (this.total >= response.total) { - this.finished = true; - } + this.finished = this.total >= response.total; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue b/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue index 8924fac9..ad66b60b 100644 --- a/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue +++ b/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue @@ -30,11 +30,11 @@ @cancel="showzjddm = false" /> - - - - - + + + + + import { dyAdd } from "@/api/onlineHome/homestead/mortgage"; -import { zjdzd } from "@/api/onlineHome/homestead/circulation"; +import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation"; export default { name: "mortgageAdd", data() { @@ -230,12 +230,21 @@ export default { for( let i = 0 ; i < zjdRes.rows.length ; i++){ this.zjdDictionaries.push(zjdRes.rows[i].zjddm); } + if(this.zjdDictionaries.length > 0) + this.onConfirmZjddm(this.zjdDictionaries[0]); }); }, onConfirmZjddm(data){ console.log(data) this.circulation.zjddm = data; this.showzjddm = false; + getByZjddm({zjddm: data,}).then(qlrRes => { + let data = qlrRes.data; + console.log(data) + this.$set(this.circulation, 'bdcdyh', data.bdcdyh); + this.$set(this.circulation, 'bdcqzh', data.bdcqzh); + this.$forceUpdate(); + }); }, onConfirmQszt(data){ this.qszt = data.text; diff --git a/src/views/onlineHome/homestead/mortgage/mortgageModify.vue b/src/views/onlineHome/homestead/mortgage/mortgageModify.vue index ac2cec72..6f43261b 100644 --- a/src/views/onlineHome/homestead/mortgage/mortgageModify.vue +++ b/src/views/onlineHome/homestead/mortgage/mortgageModify.vue @@ -30,11 +30,11 @@ @cancel="showzjddm = false" /> - - - - - + + + + + import { dyApply , getDy , dyEdit } from "@/api/onlineHome/homestead/mortgage"; -import { zjdzd } from "@/api/onlineHome/homestead/circulation"; +import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation"; export default { name: "mortgageModify", data() { @@ -243,6 +243,13 @@ export default { console.log(data) this.circulation.zjddm = data; this.showzjddm = false; + getByZjddm({zjddm: data,}).then(qlrRes => { + let data = qlrRes.data; + console.log(data) + this.$set(this.circulation, 'bdcdyh', data.bdcdyh); + this.$set(this.circulation, 'bdcqzh', data.bdcqzh); + this.$forceUpdate(); + }); }, onConfirmQszt(data){ this.qszt = data.text; diff --git a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue index 0e574191..bd99b4e2 100644 --- a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue +++ b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue @@ -160,7 +160,7 @@