From 769cb2d76c2e7c9aae0af749f25eb57428c86d2f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 21 Mar 2022 15:17:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/collect.vue | 371 +++++++++++++++++++++++++++++ 1 file changed, 371 insertions(+) create mode 100644 src/views/modules/base/collect.vue diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue new file mode 100644 index 00000000..65ca98ed --- /dev/null +++ b/src/views/modules/base/collect.vue @@ -0,0 +1,371 @@ + + + + + From aa312b68a34b119f39c924252e5b21c21baa7a97 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 22 Mar 2022 08:48:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/collect.vue | 88 +++++++++++++++++++++++++----- 1 file changed, 73 insertions(+), 15 deletions(-) diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index 65ca98ed..1c488f35 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -2,15 +2,22 @@
- - - + + + + + - +
+ + 导出 +
item.firstIndex === rowIndex) if (index > -1) { return { @@ -212,7 +228,41 @@ export default { } } }, - + async handleChu() { + const url = + "/epmetuser/icresicollect/export"; + const { pageSize, pageNo, fmData } = this; + axios({ + url: window.SITE_CONFIG["apiURL"] + url, + method: "post", + data: { + pageSize, + pageNo, + ...fmData, + }, + responseType: "blob", + }) + .then((res) => { + let fileName = window.decodeURI( + res.headers["content-disposition"].split(";")[1].split("=")[1] + ); + console.log("filename", fileName); + let blob = new Blob([res.data], { type: "application/vnd.ms-excel" }); + var url = window.URL.createObjectURL(blob); + var aLink = document.createElement("a"); + aLink.style.display = "none"; + aLink.href = url; + aLink.setAttribute("download", fileName); + document.body.appendChild(aLink); + aLink.click(); + document.body.removeChild(aLink); //下载完成移除元素 + window.URL.revokeObjectURL(url); //释放掉blob对象 + }) + .catch((err) => { + console.log("获取导出情失败", err); + return this.$message.error("网络错误"); + }); + }, handleSizeChange(val) { console.log(`每页 ${val} 条`); this.pageSize = val; @@ -272,7 +322,16 @@ export default { this.$message.success("操作失败！"); } }, - + async getcommunityList() { + const url = + "/gov/org/agency/community-list"; + const { data, code, msg } = await requestPost(url); + if (code === 0) { + console.log("列表请求成功！！！！！！！！！！！！！！"); + this.communityList = data + } else { + } + }, async getTableData() { const url = "/epmetuser/icresicollect/list"; @@ -286,7 +345,6 @@ export default { console.log("列表请求成功！！！！！！！！！！！！！！"); this.total = data.total || 0; let _i = 0 - let firstIndex = 0 let arr = [] this.spanIndex = data.list && data.list.map((item, index) => { if (index == 0) _i = 0 From 09a2e2be4c41b369304cf1d7ef5678221048482c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 22 Mar 2022 10:28:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E9=9B=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/caiji.vue | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index cd63b2a8..c5c3a786 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -259,7 +259,7 @@ export default { mobile: '', idNum: '', customerId: '', - heSuanCount: 0, + heSuanCount: null, ymjz: '', selDetNum: {}, selDetCondition: {} @@ -319,8 +319,8 @@ export default { let envShow = process.env.VUE_APP_NODE_ENV console.log('环境', envShow) - let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',] - // let internalShequId = ['1202807601961984002',] + // let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',] + let internalShequId = ['1202807601961984002',] // if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境 // internalShequId = null // } else if (envShow === 'prod:uat') { // 体验 @@ -577,7 +577,6 @@ export default { }, async submit () { - if (this.formData.origin === 'internal') { this.formData.villageId = this.selVillage.value @@ -603,17 +602,26 @@ export default { this.formData.houseType = this.selHomeType.value + let memberListTemp = [] + + this.memberList.forEach(element => { - element.customerId = this.customerId - if (element.selDetNum && element.selDetNum.value) { - element.heSuanCount = element.selDetNum.value - } - if (element.selDetCondition && element.selDetCondition.value) { - element.ymjz = element.selDetCondition.value + + if (element.name && element.idNum) { + element.customerId = this.customerId + if (element.selDetNum && element.selDetNum.value) { + element.heSuanCount = element.selDetNum.value + } + if (element.selDetCondition && element.selDetCondition.value) { + element.ymjz = element.selDetCondition.value + } + + memberListTemp.push(element) } + }); - this.formData.memberList = this.memberList + this.formData.memberList = memberListTemp console.log(this.formData) this.btnDisabled = true this.startLoading() @@ -639,8 +647,6 @@ export default { } }, - - //必填验证 validataFormData () { @@ -801,7 +807,7 @@ export default { name: '', mobile: '', idNum: '', - heSuanCount: 0, + heSuanCount: null, ymjz: '', selDetNum: {}, customerId: '',