From 4161d7043504a373187531872b9b581916741810 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 22 Mar 2022 10:56:30 +0800 Subject: [PATCH 1/6] 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 2/6] =?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 3/6] 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 4/6] 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 5/6] =?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 + }, } From eea5c2ef6074d77966fdc78d78a055cd16dad243 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 22 Mar 2022 15:26:06 +0800 Subject: [PATCH 6/6] 111 --- 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 f8d9a2a9..320cc91f 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -316,7 +316,7 @@ export default { this.shequId = this.$route.params.id this.customerId = this.$route.query.customerId this.shequName = this.$route.query.name - document.title = this.shequName + document.title = this.shequName + '信息管理平台' }, mounted () {