Merge branch 'gyj' of SH-Arbitrate/miniapp into dev

pages/handlecase/component/newlyAddedCase.vue

@@ -9,11 +9,11 @@
 				</uni-forms-item>
 				<uni-forms-item label="申请人调解请求:" name="arbitratClaims" label-width="120px" required
 					:rules="[{required: true,errorMessage: '申请人调解请求不能为空'}]">
-					<uni-easyinput v-model="formData.arbitratClaims" type="textarea" placeholder="请输入申请人调解请求" />
+					<uni-easyinput v-model="formData.arbitratClaims" type="textarea" placeholder="请输入申请人调解请求" :maxlength='3000' />
 				</uni-forms-item>
 				<uni-forms-item label="事实和理由:" name="facts" label-width="120px" required
 					:rules="[{required: true,errorMessage: '事实和理由不能为空'}]">
-					<uni-easyinput v-model="formData.facts" type="textarea" placeholder="请输入事实和理由" />
+					<uni-easyinput v-model="formData.facts" type="textarea" placeholder="请输入事实和理由" :maxlength='3000'/>
 				</uni-forms-item>
 				<uni-forms-item label="申请人案件证据资料上传:" name="headImage" label-width="120px">
 					<uni-file-picker ref="files" file-mediatype="all" return-type='object' v-model="fileList"
@@ -40,7 +40,7 @@
 					<uni-forms-item label="选择机构或自然人" label-width="120px" name="objectiJuris">
 						<uni-data-checkbox class='checkbox' :disabled="ids?true:false" :localdata="objectiJurisArr"
 							v-model="formData.affiliate.applicant[index].applicant.organizeFlag"
-							@change='clearValidate'></uni-data-checkbox>
+							@change='clearValidate($event,index)'></uni-data-checkbox>
 					</uni-forms-item>
 					<uni-forms-item label="是否操作人" label-width="120px"
 						v-if="formData.affiliate.applicant[index].applicant.organizeFlag==0" key="operatorFlag">
@@ -127,15 +127,16 @@
 						<uni-data-checkbox v-model="formData.affiliate.applicant[index].applicantAgent.operatorFlag"
 							:localdata="isProxyApplicant"></uni-data-checkbox>
 					</uni-forms-item>
-					<uni-forms-item label="联系电话:" label-width="120px">
+
+					<uni-forms-item label="联系电话:" label-width="120px" :name="['affiliate','applicant',index,'applicantAgent','phone']" :required="formData.affiliate.applicant[index].applicant.organizeFlag==0 ? agentRequired:true"  :rules="formData.affiliate.applicant[index].applicant.organizeFlag==1 ?rulesAgentPhone:[]">
 						<uni-easyinput v-model="formData.affiliate.applicant[index].applicantAgent.phone" type="text"
 							placeholder="请输入代理人联系电话" />
 					</uni-forms-item>
-					<uni-forms-item label="姓名:" label-width="120px">
+					<uni-forms-item label="姓名:" label-width="120px" :name="['affiliate','applicant',index,'applicantAgent','name']" :required="formData.affiliate.applicant[index].applicant.organizeFlag==0 ? agentName:true" :rules="rulesAgentName">
 						<uni-easyinput v-model="formData.affiliate.applicant[index].applicantAgent.name" type="text"
 							placeholder="请输入委托代理人姓名" />
 					</uni-forms-item>
-					<uni-forms-item label="邮箱:" label-width="120px">
+					<uni-forms-item label="邮箱:" label-width="120px" :name="['affiliate','applicant',index,'applicantAgent','email']" :required="formData.affiliate.applicant[index].applicant.organizeFlag==0 ? agentEmail :true" :rules="rulesAgentEmail">
 						<uni-easyinput v-model="formData.affiliate.applicant[index].applicantAgent.email" type="text"
 							placeholder="请输入代理人邮箱" />
 					</uni-forms-item>
@@ -149,7 +150,7 @@
 					<uni-forms-item label="选择机构或自然人" label-width="120px" name="objectiJuris">
 						<uni-data-checkbox class='checkbox' :disabled="ids?true:false" :localdata="objectiJurisArr"
 							v-model="formData.affiliate.res[index].res.organizeFlag"
-							@change='clearValidateRes'></uni-data-checkbox>
+							@change='clearValidateRes($event,index)'></uni-data-checkbox>
 					</uni-forms-item>
 					<uni-forms-item label="是否操作人" label-width="120px"
 						v-if="formData.affiliate.res[index].res.organizeFlag==0" key="operatorFlag">
@@ -239,15 +240,15 @@
 						<uni-data-checkbox v-model="formData.affiliate.res[index].resAgent.operatorFlag"
 							:localdata="isResApplicant"></uni-data-checkbox>
 					</uni-forms-item>
-					<uni-forms-item label="联系电话:" label-width="120px">
+					<uni-forms-item label="联系电话:" label-width="120px" :name="['affiliate','res',index,'resAgent','phone']" :required="formData.affiliate.res[index].res.organizeFlag==0 ? agentResPhone :true" :rules="rulesResPhone">
 						<uni-easyinput v-model="formData.affiliate.res[index].resAgent.phone" type="text"
 							placeholder="请输入代理人联系电话" />
 					</uni-forms-item>
-					<uni-forms-item label="姓名:" label-width="120px">
+					<uni-forms-item label="姓名:" label-width="120px" :name="['affiliate','res',index,'resAgent','name']" :required="formData.affiliate.res[index].res.organizeFlag==0 ?agentResName:true" :rules="rulesResName">
 						<uni-easyinput v-model="formData.affiliate.res[index].resAgent.name" type="text"
 							placeholder="请输入委托代理人姓名" />
 					</uni-forms-item>
-					<uni-forms-item label="邮箱:" label-width="120px">
+					<uni-forms-item label="邮箱:" label-width="120px" :name="['affiliate','res',index,'resAgent','email']" :required="formData.affiliate.res[index].res.organizeFlag==0 ?agentResEmail:true" :rules="rulesResEmail">
 						<uni-easyinput v-model="formData.affiliate.res[index].resAgent.email" type="text"
 							placeholder="请输入代理人邮箱" />
 					</uni-forms-item>
@@ -333,10 +334,7 @@
 				formData: {
 					organizeFlag: 0,
 					caseSource: "YC",
-					// affiliate: {
-					// 	roleType:1,	
-					// 	respondentSex: 0,
-					// },
+					facts:"",
 					affiliate: {
 						applicant: [{
 							applicant: {
@@ -418,10 +416,17 @@
 					caseAttachList: [],
 				},
 				testVerify: true,
+				agentRequired:false,
+				agentName:false,
+				agentEmail:false,
+				agentResPhone:false,
+				agentResName:false,
+				agentResEmail:false,
 				getUserInfoList: {},
 				ids: null,
 				tempFilePaths: null,
 				tempFilePathsZip: null,
+				lengths:null,
 				templateList: [],
 				objectiJurisArr: [{
 					text: '自然人',
@@ -449,6 +454,70 @@
 						errorMessage: '被申请人联系电话格式不正确'
 					}
 				],
+				// 申请代验证
+				rulesAgentPhone:[
+					{
+						required: true,
+						errorMessage: '联系电话不能为空'
+					},
+					{
+						pattern: '^[1][3,4,5,6,7,8,9][0-9]{9}$',
+						errorMessage: '联系电话格式不正确'
+					}
+				],
+				rulesAgentPhones:[
+					{
+						required: false,
+						errorMessage: '联系电话不能为空'
+					},
+					{
+						pattern: '^[1][3,4,5,6,7,8,9][0-9]{9}$',
+						errorMessage: '联系电话格式不正确'
+					}
+				],
+				rulesAgentName:[
+					{
+						required: false,
+						errorMessage: '姓名不能空',
+					}
+				],
+				rulesAgentEmail:[
+					{
+						required: false,
+						errorMessage: '邮箱不能为空'
+					},
+					{
+						pattern: '^\\S+?@\\S+?\\.\\S+?$',
+						errorMessage: '邮箱格式不正确'
+					}
+				],
+				// 被申请代理验证
+				rulesResPhone:[
+					{
+						required: false,
+						errorMessage: '联系电话不能为空'
+					},
+					{
+						pattern: '^[1][3,4,5,6,7,8,9][0-9]{9}$',
+						errorMessage: '联系电话格式不正确'
+					}
+				],
+				rulesResName:[
+					{
+						required: false,
+						errorMessage: '姓名不能空',
+					}
+				],
+				rulesResEmail:[
+					{
+						required: false,
+						errorMessage: '邮箱不能为空'
+					},
+					{
+						pattern: '^\\S+?@\\S+?\\.\\S+?$',
+						errorMessage: '邮箱格式不正确'
+					}
+				],
 				rulesPersonName: [{
 					'required': true,
 					errorMessage: '不能为空'
@@ -481,16 +550,18 @@
 		},
 		methods: {
 			submitReasont() {
-				this.$refs.form.validate().then(res => {
-					console.log("pppppppppppp")
-					if (this.ids) {
-						this.modifyData(this.formData)
-					} else {
-						this.insertFn(this.formData)
-					}
-
-				}).catch(err => {
-					console.log(err)
+				this.$nextTick(()=>{
+					this.$refs.form.validate().then(res => {
+						console.log("pppppppppppp")
+						if (this.ids) {
+							this.modifyData(this.formData)
+						} else {
+							this.insertFn(this.formData)
+						}
+					
+					}).catch(err => {
+						console.log(err)
+					})
 				})
 			},
 			// 获取新增默认值
@@ -501,6 +572,7 @@
 				})
 				getUserInfo().then(res => {
 					this.getUserInfoList = res.data
+					console.log(res.data)
 					if (this.formData.affiliate.applicant[indexs].applicant.organizeFlag == 0) {
 						this.$set(this.formData.affiliate.applicant[indexs].applicant, 'name', res.data.nickName)
 						this.$set(this.formData.affiliate.applicant[indexs].applicant, 'idCard', res.data.idCard)
@@ -515,6 +587,8 @@
 						this.$set(this.formData.affiliate.applicant[indexs].applicant, "birth", this
 							.getUserInfoList
 							.birth);
+						this.$set(this.formData.affiliate.applicant[indexs].applicant, 'address', res.data.address)
+						this.$set(this.formData.affiliate.applicant[indexs].applicant, 'home', res.data.home)
 						if (res.data.nationality == 0) {
 							this.testVerify = true
 							this.rulesRespondentPhone[0].required = true;
@@ -536,13 +610,12 @@
 
 				})
 			},
-			clearValidate(val) {
-				console.log(val.detail.value)
+			clearValidate(val,index) {
 				let indexs = ""
 				this.formData.affiliate.applicant.forEach((item, index) => {
 					indexs = index
 				})
-				if (val.detail.value == 0) {
+				if (val.detail.value == 0 && index == 0) {
 					this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.getUserInfoList.nickName)
 					this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', this.getUserInfoList.idCard)
 					this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.getUserInfoList.email)
@@ -552,9 +625,10 @@
 						.getUserInfoList.sex));
 					this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList
 						.birth);
+					this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.getUserInfoList.address)
+					this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.getUserInfoList.home)
 					if (this.formZipData.affiliate) {
 						this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
-						this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
 						this.$set(this.formData, 'facts', this.formZipData.facts);
 						this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate
 							.applicant[0]
@@ -574,12 +648,9 @@
 							.getUserInfoList.sex));
 						this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList
 							.birth);
-					} else {
-						this.$set(this.formData.affiliate.applicant[indexs].applicantAgent, 'name', null)
-						this.$set(this.formData.affiliate.applicant[indexs].applicantAgent, 'email', null)
-						this.$set(this.formData.affiliate.applicant[indexs].applicantAgent, 'phone', null)
-					}
-				} else if (val.detail.value == 1) {
+					} 
+					
+				} else if (val.detail.value == 1 && index == 0) {
 					this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.getUserInfoList
 						.nickName)
 					this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.getUserInfoList
@@ -587,8 +658,6 @@
 					this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.getUserInfoList
 						.phonenumber)
 					if (this.formZipData.affiliate) {
-
-						this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 1);
 						this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
 						this.$set(this.formData, 'facts', this.formZipData.facts);
 						this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate
@@ -611,20 +680,42 @@
 						this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData.affiliate
 							.applicant[0]
 							.applicant.phone);
-					} else {
-						this.$set(this.formData.affiliate.applicant[0].applicant, 'name', null)
-						this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null)
-						this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null)
-						this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null)
-					}
+					} 
+				}
+				if(val.detail.value == 0){
+					this.$set(this.formData.affiliate.applicant[index].applicantAgent, 'name', null)
+					this.$set(this.formData.affiliate.applicant[index].applicantAgent, 'email', null)
+					this.$set(this.formData.affiliate.applicant[index].applicantAgent, 'phone', null)
+					/* this.rulesAgentPhone[0].required = false;
+					this.agentRequired = false;
+					this.agentName = false;
+					this.rulesAgentName[0].required = false;
+					this.rulesAgentEmail[0].required = false;
+					this.agentEmail = false; */
+				}else if(val.detail.value == 1){
+					this.$set(this.formData.affiliate.applicant[index].applicant, 'name', null)
+					this.$set(this.formData.affiliate.applicant[index].applicant, 'idCard', null)
+					this.$set(this.formData.affiliate.applicant[index].applicant, 'email', null)
+					this.$set(this.formData.affiliate.applicant[index].applicant, 'phone', null)
+					this.$set(this.formData.affiliate.applicant[index].applicant, 'address', null)
+					this.$set(this.formData.affiliate.applicant[index].applicant, 'home', null)
+					/* this.rulesAgentPhone[0].required = true;
+					this.agentRequired = true;
+					this.agentName = true;
+					this.rulesAgentName[0].required = true;
+					this.rulesAgentEmail[0].required = true;
+					this.agentEmail = true; */
 				}
 				this.$refs["form"].clearValidate()
 			},
 			// 被申请人机构和自然人
-			clearValidateRes(val) {
+			clearValidateRes(val,index) {
 				console.log(this.formData.affiliate.res[0].res)
-				if (val.detail.value == 0) {
+				if (val.detail.value == 0 && index==0) {
 					if (this.formZipData.affiliate) {
+						this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate
+							.res[0]
+							.res.name);
 						this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0]
 							.res.phone);
 						this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData
@@ -638,8 +729,9 @@
 						this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0]
 							.res.email);
 					}
-
-				} else if (val.detail.value == 1) {
+					
+					
+				} else if (val.detail.value == 1 && index == 0) {
 					if (this.formZipData.affiliate) {
 						this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate
 							.res[0]
@@ -651,6 +743,24 @@
 							.res[0]
 							.res.code);
 					}
+					
+				}
+				if(val.detail.value == 0){
+					// this.rulesResPhone[0].required = false;
+					// this.agentResPhone = false;
+					// this.rulesResName[0].required = false;
+					// this.agentResName = false;
+					// this.rulesResEmail[0].required = false;
+					// this.agentResEmail = false;
+				}else if(val.detail.value == 1){
+					this.$set(this.formData.affiliate.res[index].res, 'name', null)
+					this.$set(this.formData.affiliate.res[index].res, 'home', null)
+					// this.rulesResPhone[0].required = true;
+					// this.agentResPhone = true;
+					// this.rulesResName[0].required = true;
+					// this.agentResName = true;
+					// this.rulesResEmail[0].required = true;
+					// this.agentResEmail = true;
 				}
 				this.$refs["form"].clearValidate()
 			},
@@ -672,14 +782,24 @@
 					let data = res.data
 					console.log(res.data)
 					let indexs = ""
-					data.affiliate.applicant.forEach((item, index) => {
-						if (!item.applicant) {
-							item.applicant = {}
-						}
-						if (!item.applicantAgent) {
-							item.applicantAgent = {}
-						}
-					})
+					if (data.affiliate.applicant.length == 0) {
+						data.affiliate.applicant.push({
+							applicant: {},
+							applicantAgent: {}
+						})
+					} else {
+						data.affiliate.applicant.forEach((item, index) => {
+							if (!item.applicant) {
+								item.applicant = {}
+							} else {
+								data.affiliate.applicant[index].applicant.sex = Number(data.affiliate.applicant[index].applicant
+									.sex)
+							}
+							if (!item.applicantAgent) {
+								item.applicantAgent = {}
+							}
+						})
+					}
 					if (data.affiliate.res.length == 0) {
 						data.affiliate.res.push({
 							res: {},
@@ -784,9 +904,10 @@
 							duration: 1000
 						})
 						this.formZipData = result.data;
+						console.log(result.data)
+						this.$set(this.formData, 'arbitratClaims', result.data.arbitratClaims);
+						this.$set(this.formData, 'facts', result.data.facts);
 						if (this.formData.affiliate.applicant[0].applicant.organizeFlag == 0) {
-							this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
-							this.$set(this.formData, 'facts', this.formZipData.facts);
 							this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData
 								.affiliate.applicant[0]
 								.applicant.home);
@@ -803,8 +924,6 @@
 								.formZipData.affiliate.applicant[0]
 								.applicantAgent.email);
 						} else if (this.formData.affiliate.applicant[0].applicant.organizeFlag == 1) {
-							this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
-							this.$set(this.formData, 'facts', this.formZipData.facts);
 							this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData
 								.affiliate.applicant[0]
 								.applicant.name);
@@ -982,33 +1101,6 @@
 						organizeFlag: 0,
 					}
 				})
-				let idnexVal = ""
-				this.formData.affiliate.applicant.forEach((item, index) => {
-					idnexVal = index
-				})
-				getUserInfo().then(res => {
-					this.getUserInfoList = res.data
-					if (this.formData.affiliate.applicant[idnexVal].applicant.organizeFlag == 0) {
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicant, 'name', res.data.nickName)
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicant, 'idCard', res.data.idCard)
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicant, 'email', res.data.email)
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicant, 'phone', res.data
-							.phonenumber)
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicant, 'idType', res.data.idType)
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicant, 'nationality', res.data
-							.nationality)
-					} else if (this.formData.affiliate.applicant[idnexVal].applicant.organizeFlag == 1) {
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicantAgent, 'name', res.data
-							.nickName)
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicantAgent, 'email', res.data
-							.email)
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicantAgent, 'phone', res.data
-							.phonenumber)
-						this.$set(this.formData.affiliate.applicant[idnexVal].applicantAgent, 'nationality', res
-							.data.nationality)
-					}
-
-				})
 			},
 			// 新增多个被申请人和代理人
 			addRespondent() {