From 3b756dc4d55246700234d62e6b93a93acf9b71f6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 21 Mar 2022 10:43:46 +0800 Subject: [PATCH 01/10] 11 --- src/views/pages/caiji.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index be259c60..a3f3a376 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -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') { // 体验 From 485583ef91b794fa5d16d0c9a2d330f0df5ce6f0 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 21 Mar 2022 14:15:38 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/caiji.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index a3f3a376..cd63b2a8 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -337,7 +337,7 @@ export default { } this.loadVillage() this.detNumList = [] - for (let i = 1; i < 11; i++) { + for (let i = 0; i < 11; i++) { let obj = { value: i + '', label: i + '次', 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 03/10] =?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 04/10] =?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 05/10] =?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: '', From 4161d7043504a373187531872b9b581916741810 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 22 Mar 2022 10:56:30 +0800 Subject: [PATCH 06/10] 111 --- src/views/pages/caiji.vue | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index c5c3a786..61b7f458 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -607,7 +607,7 @@ export default { this.memberList.forEach(element => { - if (element.name && element.idNum) { + if (element.name && element.name !== '' && element.idNum && element.idNum !== '') { element.customerId = this.customerId if (element.selDetNum && element.selDetNum.value) { element.heSuanCount = element.selDetNum.value @@ -716,25 +716,27 @@ export default { return aletMessage } + if (this.memberList[0].length > 1) { + for (let i = 1; i < this.memberList.length; i++) { + let item = this.memberList[i] - for (let i = 1; i < this.memberList.length; i++) { - let item = this.memberList[i] - - if (item.name || item.mobile || item.idNum || item.selDetNum.value || item.selDetCondition.value) {//填写了信息的，必须填写姓名身份证 - if (!item.name || !item.idNum) { - aletMessage = '请完整填写用户' + (i + 1) + '的姓名和身份证信息' + if (item.name || item.mobile || item.idNum || item.selDetNum.value || item.selDetCondition.value) {//填写了信息的，必须填写姓名身份证 + if (!item.name || !item.idNum) { + aletMessage = '请完整填写用户' + (i + 1) + '的姓名和身份证信息' + return aletMessage + } + } else { + aletMessage = '用户' + (i + 1) + '的信息没有填写，是否继续' + this.showMessagsBox = true return aletMessage + } - } else { - aletMessage = '用户' + (i + 1) + '的信息没有填写，是否继续' - this.showMessagsBox = true - return aletMessage } - } + }, popupOk () { From aae3b21861b79f74faef090e3824ee767a70c535 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 22 Mar 2022 13:41:50 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BD=A0=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8D=97=E4=BA=AC=E8=B7=AFid=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/caiji.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index 61b7f458..ec1041c5 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -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') { // 体验 From 3ca4f47723386f1fd9dfbaa28b06d6da0c29e22e Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 22 Mar 2022 14:27:54 +0800 Subject: [PATCH 08/10] dd --- src/views/modules/base/collect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index 1c488f35..da587f69 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -83,7 +83,7 @@ From 3e4aa22d3709fc6dac241665e44d727a933f0109 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 22 Mar 2022 14:46:11 +0800 Subject: [PATCH 09/10] dd --- src/views/modules/base/collect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index da587f69..8f6c49af 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -2,7 +2,7 @@
- + Date: Tue, 22 Mar 2022 15:05:27 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=87=87=E9=9B=86=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=BD=91=E9=A1=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/caiji.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index ec1041c5..f8d9a2a9 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -203,6 +203,7 @@ import { requestPost } from "@/js/dai/request"; import { Toast } from "mint-ui"; import { MessageBox } from 'mint-ui'; import { Loading } from 'element-ui' // 引入Loading服务 +import { messages } from '@/i18n' let loading // 加载动画 export default { @@ -308,13 +309,17 @@ export default { computed: { }, - created () { }, - mounted () { + + created () { console.log(this.$route) this.shequId = this.$route.params.id this.customerId = this.$route.query.customerId this.shequName = this.$route.query.name + document.title = this.shequName + }, + mounted () { + let envShow = process.env.VUE_APP_NODE_ENV console.log('环境', envShow) @@ -855,7 +860,10 @@ export default { } - } + }, + beforeDestroy () { + document.title = messages[val].brand.lg + }, }