From 8e9a6b08e0864ce67ef75cac0c509444f1b215d6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 21 Mar 2022 09:49:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?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 | 104 +++++++++++++++++++++++++------------- 1 file changed, 68 insertions(+), 36 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index c19c93d6..d52b1599 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -201,6 +201,7 @@ import { requestPost } from "@/js/dai/request"; import { Toast } from "mint-ui"; +import { MessageBox } from 'mint-ui'; let loading // 加载动画 export default { @@ -247,6 +248,7 @@ export default { customerId: '',//customerId }, + showMessagsBox: false,//是否显示人员未填写提示弹出框 selMemberIndex: null, @@ -316,7 +318,7 @@ export default { let envShow = process.env.VUE_APP_NODE_ENV console.log('环境', envShow) - let internalShequId = '1202807601961984002' + let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',] // if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境 // internalShequId = null // } else if (envShow === 'prod:uat') { // 体验 @@ -326,7 +328,7 @@ export default { // } this.formData.customerId = this.customerId - if (this.shequId === internalShequId) { + if (internalShequId.indexOf(this.shequId) > -1) { this.formData.origin = 'internal' } else { this.formData.origin = 'external' @@ -551,17 +553,29 @@ export default { }, async handleSubmit () { - let message = this.validataFormData() + + if (message) { - Toast({ - message: message, - duration: 3000 - }); - return false + if (this.showMessagsBox) { + MessageBox.confirm(message).then(action => { + this.submit() + }); + } else { + Toast({ + message: message, + duration: 3000 + }); + } + } else { + this.submit() } + }, + async submit () { + + if (this.formData.origin === 'internal') { this.formData.villageId = this.selVillage.value @@ -619,45 +633,48 @@ export default { } }, + + //必填验证 validataFormData () { - let message = '' + let aletMessage = '' + this.showMessagsBox = false if (this.formData.origin === 'internal') {//内部 - if (!this.selVillage) { - message = '请选择小区' - return message + aletMessage = '请选择小区' + + return aletMessage } if (!this.selBuild) { - message = '请选择楼栋' - return message + aletMessage = '请选择楼栋' + return aletMessage } if (!this.selUnit) {//没有选择单元 - message = '请选择单元' - return message + aletMessage = '请选择单元' + return aletMessage } else {//选择了单元 if (this.selUnit.value === 'else') {//单元选择了其他 if (!this.unitContent) { - message = '请填写单元号' - return message + aletMessage = '请填写单元号' + return aletMessage } if (!this.homeContent) {//房屋必须填写内容 - message = '请填写房屋' - return message + aletMessage = '请填写房屋' + return aletMessage } } else {//单元没有选择其他 if (!this.selHome) { - message = '请选择房屋' - return message + aletMessage = '请选择房屋' + return aletMessage } else if (this.selHome.value === 'else' && !this.homeContent) { - message = '请填写房屋' - return message + aletMessage = '请填写房屋' + return aletMessage } } @@ -666,29 +683,44 @@ export default { } else { if (!this.formData.address) { - message = '请填写地址' - return message + aletMessage = '请填写地址' + return aletMessage } } if (!this.selHomeType) { - message = '请选择房屋类型' - return message + aletMessage = '请选择房屋类型' + return aletMessage } if (!this.formData.houseHolderName) { - message = '请填写户主姓名' - return message + aletMessage = '请填写户主姓名' + return aletMessage + } + let member1 = this.memberList[0] + + + if (!member1.name || !member1.mobile || !member1.idNum || !member1.selDetNum.value || !member1.selDetCondition.value) { + aletMessage = '请完整填写用户1信息' + return aletMessage } - let member = this.memberList[0] - for (let i = 0; i < this.memberList.length; 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) { - message = '请完整填写用户' + (i + 1) + '信息' - return message + + 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 + } - } + } }, From ea4c0d8e6b8da2cb683adcdab65e11847c7a0ca3 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 21 Mar 2022 10:28:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/caiji.scss | 37 ++++++++++++++- src/router/index.js | 9 ++++ src/views/pages/caiji.vue | 40 ++++++++++++---- src/views/pages/caijisuccess.vue | 78 ++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+), 12 deletions(-) create mode 100644 src/views/pages/caijisuccess.vue diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss index dede8360..8dafd6eb 100644 --- a/src/assets/scss/pages/caiji.scss +++ b/src/assets/scss/pages/caiji.scss @@ -1,4 +1,4 @@ -.bg-app { +.bg-caiji { background-color: rgba(189, 214, 255, 0.89); height: 100%; width: 100vw; @@ -39,7 +39,8 @@ justify-content: center; .btn { - width: 100px; + width: 150px; + font-size: 16px; } } } @@ -47,3 +48,35 @@ .picker_content { color: rgb(59, 59, 59); } + +.bg-caiji-success { + height: 100vh; + width: 100vw; + + text-align: center; + .title { + background-color: rgba(189, 214, 255, 0.89); + padding: 20px; + text-align: center; + font-size: 20px; + } + + .main { + margin-top: 100px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + + .icon-success { + font-size: 40px; + // width: 20px; + // height: 20px; + } + + .success-content { + margin-top: 10px; + font-size: 25px; + } + } +} diff --git a/src/router/index.js b/src/router/index.js index 2961eea4..8b2d8ab6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,6 +53,15 @@ export const pageRoutes = [ title: "居民信息填报", }, }, + { + path: "/caijisuccess", + props: true, + name: "caijisuccess", + component: () => import("@/views/pages/caijisuccess"), + meta: { + title: "居民信息填报", + }, + }, ]; // 模块路由(基于主入口布局页面) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index d52b1599..be259c60 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -1,5 +1,5 @@