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 + } - } + } },