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

pages/handlecase/component/newlyAddedCase.vue

@@ -127,16 +127,15 @@
 						<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" :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-forms-item label="联系电话:" label-width="120px" :name="['affiliate','applicant',index,'applicantAgent','phone']" :required="formData.affiliate.applicant[index].applicant.organizeFlag==0 ? false: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" :name="['affiliate','applicant',index,'applicantAgent','name']" :required="formData.affiliate.applicant[index].applicant.organizeFlag==0 ? agentName:true" :rules="rulesAgentName">
+					</uni-forms-item> 
+					<uni-forms-item label="姓名:" label-width="120px" :name="['affiliate','applicant',index,'applicantAgent','name']" :required="formData.affiliate.applicant[index].applicant.organizeFlag==0 ? false:true" :rules="formData.affiliate.applicant[index].applicant.organizeFlag==1 ?rulesAgentName:[]">
 						<uni-easyinput v-model="formData.affiliate.applicant[index].applicantAgent.name" type="text"
 							placeholder="请输入委托代理人姓名" />
 					</uni-forms-item>
-					<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-forms-item label="邮箱:" label-width="120px" :name="['affiliate','applicant',index,'applicantAgent','email']" :required="formData.affiliate.applicant[index].applicant.organizeFlag==0 ? false :true" :rules="formData.affiliate.applicant[index].applicant.organizeFlag==1 ? rulesAgentEmail:[]">
 						<uni-easyinput v-model="formData.affiliate.applicant[index].applicantAgent.email" type="text"
 							placeholder="请输入代理人邮箱" />
 					</uni-forms-item>
@@ -240,15 +239,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" :name="['affiliate','res',index,'resAgent','phone']" :required="formData.affiliate.res[index].res.organizeFlag==0 ? agentResPhone :true" :rules="rulesResPhone">
+					<uni-forms-item label="联系电话:" label-width="120px" :name="['affiliate','res',index,'resAgent','phone']" :required="formData.affiliate.res[index].res.organizeFlag==0 ? false :true" :rules="formData.affiliate.res[index].res.organizeFlag==1?rulesResPhone:[]">
 						<uni-easyinput v-model="formData.affiliate.res[index].resAgent.phone" type="text"
 							placeholder="请输入代理人联系电话" />
 					</uni-forms-item>
-					<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-forms-item label="姓名:" label-width="120px" :name="['affiliate','res',index,'resAgent','name']" :required="formData.affiliate.res[index].res.organizeFlag==0 ?false:true" :rules="formData.affiliate.res[index].res.organizeFlag==1?rulesResName:[]">
 						<uni-easyinput v-model="formData.affiliate.res[index].resAgent.name" type="text"
 							placeholder="请输入委托代理人姓名" />
 					</uni-forms-item>
-					<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-forms-item label="邮箱:" label-width="120px" :name="['affiliate','res',index,'resAgent','email']" :required="formData.affiliate.res[index].res.organizeFlag==0 ?false:true" :rules="formData.affiliate.res[index].res.organizeFlag==1?rulesResEmail:[]">
 						<uni-easyinput v-model="formData.affiliate.res[index].resAgent.email" type="text"
 							placeholder="请输入代理人邮箱" />
 					</uni-forms-item>
@@ -465,25 +464,15 @@
 						errorMessage: '联系电话格式不正确'
 					}
 				],
-				rulesAgentPhones:[
-					{
-						required: false,
-						errorMessage: '联系电话不能为空'
-					},
-					{
-						pattern: '^[1][3,4,5,6,7,8,9][0-9]{9}$',
-						errorMessage: '联系电话格式不正确'
-					}
-				],
 				rulesAgentName:[
 					{
-						required: false,
+						required: true,
 						errorMessage: '姓名不能空',
 					}
 				],
 				rulesAgentEmail:[
 					{
-						required: false,
+						required: true,
 						errorMessage: '邮箱不能为空'
 					},
 					{
@@ -494,7 +483,7 @@
 				// 被申请代理验证
 				rulesResPhone:[
 					{
-						required: false,
+						required: true,
 						errorMessage: '联系电话不能为空'
 					},
 					{
@@ -504,13 +493,13 @@
 				],
 				rulesResName:[
 					{
-						required: false,
+						required: true,
 						errorMessage: '姓名不能空',
 					}
 				],
 				rulesResEmail:[
 					{
-						required: false,
+						required: true,
 						errorMessage: '邮箱不能为空'
 					},
 					{
@@ -706,6 +695,7 @@
 					this.rulesAgentEmail[0].required = true;
 					this.agentEmail = true; */
 				}
+				this.$refs.form.setRules()
 				this.$refs["form"].clearValidate()
 			},
 			// 被申请人机构和自然人
@@ -746,22 +736,12 @@
 					
 				}
 				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.setRules()
 				this.$refs["form"].clearValidate()
 			},
 			/** 获取裁决书模板 */