diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue index a004a4f..0e28319 100644 --- a/src/views/caseManagement/components/addCase.vue +++ b/src/views/caseManagement/components/addCase.vue @@ -139,7 +139,7 @@ - +
申请人
@@ -158,7 +158,7 @@ - + + + + + + + + + - + + + + + + + + + + + + + + - +
代理人
@@ -351,7 +394,7 @@ - +
被申请人
@@ -535,7 +578,27 @@ export default { getUserInfoList: {}, applicationFlag: null, showmediate: false, - formZipData: {} + formZipData: {}, + nationalityList: [ + { + value: '国内', + id: 0 + }, + { + value: '国外', + id: 1 + } + ], + idTypeList: [ + { + value: '身份证', + id: 0 + }, + { + value: '护照', + id: 1 + } + ] }; }, watch: { @@ -557,19 +620,19 @@ export default { }, addVisable(val) { if (val) { - if(this.addModifyData == 1){ + if (this.addModifyData == 1) { this.formData = { - affiliate: { - organizeFlag: 0, - respondentSex: 0, - }, - columnValueList: [], - caseAttachList: [], - }; - this.$set(this.formData.affiliate, "applicationName", this.getUserInfoList.nickName); - this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard); - this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email); - this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber); + affiliate: { + organizeFlag: 0, + respondentSex: 0, + }, + columnValueList: [], + caseAttachList: [], + }; + this.$set(this.formData.affiliate, "applicationName", this.getUserInfoList.nickName); + this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard); + this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email); + this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber); } this.activeName = "first"; this.showmediate = false; @@ -598,6 +661,8 @@ export default { this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard); this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email); this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber); + this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType); + this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality); }) }, /** 根据案件id获取对应信息 */ @@ -752,10 +817,11 @@ export default { this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth); this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome); this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail); + } else { + this.formData.affiliate.nameAgent = null; + this.formData.affiliate.agentEmail = null; + this.formData.affiliate.contactTelphoneAgent = null; } - // this.formData.affiliate.nameAgent = null; - // this.formData.affiliate.agentEmail = null; - // this.formData.affiliate.contactTelphoneAgent = null; } else if (val == 1) { this.$set(this.formData.affiliate, "nameAgent", this.getUserInfoList.nickName); this.$set(this.formData.affiliate, "agentEmail", this.getUserInfoList.email); @@ -764,10 +830,10 @@ export default { this.$set(this.formData.affiliate, 'organizeFlag', 1); this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims); this.$set(this.formData, 'facts', this.formZipData.facts); - this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName); - this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code); - this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail); - this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone); + this.$set(this.formData.affiliate, 'applicationName', this.formZipData.affiliate.applicationName); + this.$set(this.formData.affiliate, 'code', this.formZipData.affiliate.code); + this.$set(this.formData.affiliate, 'applicationEmail', this.formZipData.affiliate.applicationEmail); + this.$set(this.formData.affiliate, 'applicationPhone', this.formZipData.affiliate.applicationPhone); // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome); // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress); // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent); @@ -780,11 +846,12 @@ export default { this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth); this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome); this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail); + } else { + this.formData.affiliate.applicationName = null; + this.formData.affiliate.code = null; + this.formData.affiliate.applicationEmail = null; + this.formData.affiliate.applicationPhone = null; } - // this.formData.affiliate.applicationName = null; - // this.formData.affiliate.code = null; - // this.formData.affiliate.applicationEmail = null; - // this.formData.affiliate.applicationPhone = null; } this.$refs["ruleForm"].clearValidate() }, diff --git a/src/views/register.vue b/src/views/register.vue index 82b565e..f7e6b3a 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -19,11 +19,32 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -107,6 +128,8 @@ export default { confirmPassword: "", code: "", uuid: "", + nationality:0, + idType:0 }, registerRules: { userName: [ @@ -134,12 +157,12 @@ export default { message: '被申请人身份证号不能为空', trigger: 'blur', }, - { - pattern: - /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, - message: '请输入正确的身份证号码', - trigger: 'blur', - }, + // { + // pattern: + // /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, + // message: '请输入正确的身份证号码', + // trigger: 'blur', + // }, ], email: [ { required: true, trigger: "blur", message: "请再次输入您的密码" }, @@ -171,10 +194,36 @@ export default { verifyCode: [ { required: true, trigger: "blur", message: "请输入验证码" }, ], + idType: [ + { required: true, trigger: "blur", message: "请选择证件类型" }, + ], + nationality: [ + { required: true, trigger: "blur", message: "请选择国籍" }, + ], }, loading: false, captchaEnabled: true, - roleList: [] + roleList: [], + nationalityList:[ + { + value:'国内', + id:0 + }, + { + value:'国外', + id:1 + } + ], + idTypeList:[ + { + value:'身份证', + id:0 + }, + { + value:'护照', + id:1 + } + ] }; }, created() { diff --git a/vue.config.js b/vue.config.js index 10e5b5b..c4fc8c2 100644 --- a/vue.config.js +++ b/vue.config.js @@ -11,11 +11,11 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口 -const API = 'http://121.40.189.20:7001' //生产 +// const API = 'http://121.40.189.20:7001' //生产 // const API = 'http://121.40.189.20:6001' //测试 // const API = 'http://192.168.3.18:6001' //B // const API = 'http://172.16.0.237:6001' //Q -// const API = 'http://172.16.1.26:6001' //w +const API = 'http://172.16.1.26:6001' //w // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions