From 9669d7e4115d7761944fd566d7daaada31788c01 Mon Sep 17 00:00:00 2001 From: jinna Date: Fri, 16 Jun 2023 18:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/login/userlogin.vue | 4 +- src/styles/login.scss | 5 - src/views/register/add.vue | 246 ++++++++++++++++++++--------------- src/views/register/index.vue | 31 +++-- src/views/register/recon.vue | 149 +++++++++++++++++---- vue.config.js | 3 +- 6 files changed, 285 insertions(+), 153 deletions(-) diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index dae6bbc..05fa0d5 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -88,9 +88,9 @@ //角色ID roleId: "", //用户名 - username: "admin", + username: "", //密码 - password: "admin", + password: "", //账号类型 type: "account", //验证码的值 diff --git a/src/styles/login.scss b/src/styles/login.scss index 528b00e..f2f429e 100644 --- a/src/styles/login.scss +++ b/src/styles/login.scss @@ -76,10 +76,6 @@ box-sizing: border-box; } -.el-button--primary{ - -} - .login-main { margin: 0 auto; width: 65%; @@ -148,7 +144,6 @@ .el-input { input { - padding-bottom: 10px; text-indent: 5px; background: transparent; border: none; diff --git a/src/views/register/add.vue b/src/views/register/add.vue index 7dd21ad..05361ed 100644 --- a/src/views/register/add.vue +++ b/src/views/register/add.vue @@ -82,15 +82,19 @@ @@ -115,15 +119,17 @@ @@ -162,7 +168,7 @@
诉求类型 -
+
+
+ + +
@@ -370,6 +382,31 @@ import {addRegister,getStreetList,againResolve} from "@/api/register/register" import {getBaseList,getTypeList} from "@/api/base" export default { data() { + var checkNumber = (rule, value, callback) => { // 手机号验证 + if (!value) { + return callback(new Error('身份证号不能为空')); + } else { + const reg = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ + if (reg.test(value)) { + callback(); + } else { + return callback(new Error('请输入正确的身份证号')); + } + } + }; + var checkPhone = (rule,value,callback) =>{ + if(!value){ + return callback(new Error('联系方式不能为空')); + }else{ + const moblie=/^1(3|4|5|6|7|8|9)\d{9}$/; + const tel=/^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/ + if(moblie.test(value) || tel.test(value)){ + callback() + }else{ + return callback(new Error('请输入正确的联系方式')); + } + } + } return { form: { personNum: "", @@ -385,6 +422,14 @@ export default { ], problemDesc:[ { required: true, message: "请填写反应主要问题", trigger: "change" }, + ], + cardno:[ + {required:true,message:'请填写身份证号',trigger:'blur'}, + {validator: checkNumber, trigger: 'blur'} + ], + phone:[ + {required:true,message:'请填写联系方式',trigger:'blur'}, + {validator: checkPhone, trigger: 'blur'} ] }, formData: [ @@ -414,59 +459,7 @@ export default { } else if (this.$route.query.type == "edit") { this.title = "再次调解登记"; this.pageType = "edit"; - this.getAgainDetail() - // this.formData = [ - // { - // username: "张三", - // gender: "1", - // age: 20, - // cardno: "3708821548488178", - // address: "洋河镇", - // addressNow: "洋河镇", - // phone: "13564854126", - // }, - // { - // username: "李四", - // gender: "1", - // age: 20, - // cardno: "3708821548488178", - // address: "洋河镇", - // addressNow: "洋河镇", - // phone: "13564854126", - // }, - // { - // username: "王二狗", - // gender: "1", - // age: 20, - // cardno: "3708821548488178", - // address: "洋河镇", - // addressNow: "洋河镇", - // phone: "13564854126", - // }, - // { - // username: "王五", - // gender: "1", - // age: 20, - // cardno: "3708821548488178", - // address: "洋河镇", - // addressNow: "洋河镇", - // phone: "13564854126", - // }, - // ]; - // // this.form.number = this.formData.length - // this.form = { - // number: this.formData.length, - // id: "122555646684684", - // streetId: "胶州市", - // disputeId: "土地纠纷", - // disposeDept: "市住建局", - // hasProtocol: "无协议书", - // hasOpinion: "无处理意见", - // hasReviewOpinion: "无复查意见", - // legalPaper: "无法律文书", - // regTime: "2012-05-15 12:30", - // problemDesc: "矛盾描述...........", - // }; + this.getAgainDetail(); } }, computed: { @@ -556,43 +549,74 @@ export default { let params = {} if(this.formData.length !== 0){ let tmp = this.formData.filter(item => item.username !== '') - if(this.pageType == 'add'){ - params={ - visitors:tmp, - ...this.form - } - // console.log(params) - addRegister(params).then(res =>{ - if(res.data.code == 200){ - this.$message.success('提交成功！') - let { tag, key } = this.findTag(this.$route.fullPath); - this.$store.commit("DEL_TAG", tag); - if (tag.value === this.tag.value) { - tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个 - this.$router.push({ - path: "/register/index", - }); + console.log(tmp) + if(tmp.length !== 0){ + if(this.pageType == 'add'){ + let tmp1 = this.typeData.find(item => item.id == this.form.disputeId) + if(!tmp1){ + params = { + ...this.form, + visitors:tmp, + disputeName:this.form.disputeId, + disputeId:'' + } + }else{ + params={ + visitors:tmp, + ...this.form, + disputeId:this.form.disputeId } } - }) - }else if(this.pageType == 'edit'){ - params={ - ...this.form, - visitors:tmp, - } - addRegister(params).then(res =>{ - if(res.data.code == 200){ - this.$message.success('提交成功！') - let { tag, key } = this.findTag(this.$route.fullPath); - this.$store.commit("DEL_TAG", tag); - if (tag.value === this.tag.value) { - tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个 - this.$router.push({ - path: "/register/index", - }); + console.log(params) + addRegister(params).then(res =>{ + if(res.data.code == 200){ + this.$message.success('提交成功！') + let { tag, key } = this.findTag(this.$route.fullPath); + this.$store.commit("DEL_TAG", tag); + if (tag.value === this.tag.value) { + tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个 + this.$router.push({ + path: "/register/index", + }); + } + } + }) + }else if(this.pageType == 'edit'){ + params={ + ...this.form, + visitors:tmp, + } + let tmp1 = this.typeData.find(item => item.id == this.form.disputeId) + if(!tmp1){ + params = { + ...this.form, + visitors:tmp, + disputeName:this.form.disputeId, + disputeId:'' + } + }else{ + params={ + visitors:tmp, + ...this.form, + disputeId:this.form.disputeId } } - }) + addRegister(params).then(res =>{ + if(res.data.code == 200){ + this.$message.success('提交成功！') + let { tag, key } = this.findTag(this.$route.fullPath); + this.$store.commit("DEL_TAG", tag); + if (tag.value === this.tag.value) { + tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个 + this.$router.push({ + path: "/register/index", + }); + } + } + }) + } + }else{ + this.$message.error('登记人员列表不可为空') } }else{ this.$message.error('登记人员列表不可为空') @@ -636,6 +660,14 @@ export default { } .el-table{ width: 96% !important; + + /deep/ .is-required{ + margin-top:20px + } + + /deep/ .el-form-item__error{ + left:15px + } } /deep/ .btn_box { display: flex; diff --git a/src/views/register/index.vue b/src/views/register/index.vue index 44ba16c..ed075ec 100644 --- a/src/views/register/index.vue +++ b/src/views/register/index.vue @@ -15,7 +15,6 @@ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" - @on-load="onLoad" >