解决冲突更改
This commit is contained in:
gyj
@@ -15,7 +15,7 @@
|
||||
<div class="caseInfo">案件信息：</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<el-col :span="24" v-if="buttonFlag">
|
||||
<el-col :span="24" v-if="buttonFlag">
|
||||
<el-form-item label="压缩包导入">
|
||||
<el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip'
|
||||
:limit="1" :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip">
|
||||
@@ -88,7 +88,7 @@
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" v-if="modelFlag&&labelShowMediate">
|
||||
<el-col :span="24" v-if="modelFlag && labelShowMediate">
|
||||
<el-form-item label="调解后调解书:">
|
||||
<div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 13">
|
||||
<div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
|
||||
@@ -121,7 +121,7 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
<el-col :span="24" v-if="buttonFlag">
|
||||
<el-col :span="24" v-if="buttonFlag">
|
||||
<el-button type="primary" icon="el-icon-circle-plus-outline" @click='addApplicant'
|
||||
style="margin-bottom: 40px;">新增申请人信息</el-button>
|
||||
</el-col>
|
||||
@@ -135,7 +135,8 @@
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="选择机构或自然人">
|
||||
<el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag" @change="clearValidate($event,index)">
|
||||
<el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag"
|
||||
@change="clearValidate($event, index)">
|
||||
<el-radio :label="0">自然人</el-radio>
|
||||
<el-radio :label="1">机构</el-radio>
|
||||
</el-radio-group>
|
||||
@@ -342,7 +343,7 @@
|
||||
},
|
||||
]">
|
||||
<el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
|
||||
</el-form-item>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
|
||||
<el-form-item v-if="addModifyData==2 && !item.applicantAgent.phone?false:true" label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'">
|
||||
@@ -404,12 +405,12 @@
|
||||
<el-input v-model="item.applicantAgent.email" placeholder="请输入代理人邮箱" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="buttonFlag">
|
||||
<el-button v-if="index >=1?true:false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
|
||||
<el-col :span="12" v-if="buttonFlag">
|
||||
<el-button v-if="index >= 1 ? true : false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
|
||||
@click='deleteApplicant(item)'>删除</el-button>
|
||||
</el-col>
|
||||
</div>
|
||||
<el-col :span="24" v-if="buttonFlag">
|
||||
<el-col :span="24" v-if="buttonFlag">
|
||||
<el-button type="primary" icon="el-icon-circle-plus-outline" @click='addRes'
|
||||
style="margin-bottom: 40px;">新增被申请人信息</el-button>
|
||||
</el-col>
|
||||
@@ -423,7 +424,8 @@
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="选择机构或自然人">
|
||||
<el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag" @change="clearValidateRes($event,index)">
|
||||
<el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag"
|
||||
@change="clearValidateRes($event, index)">
|
||||
<el-radio :label="0">自然人</el-radio>
|
||||
<el-radio :label="1">机构</el-radio>
|
||||
</el-radio-group>
|
||||
@@ -547,8 +549,7 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="item.res.organizeFlag == 0">
|
||||
<el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
|
||||
:rules="[
|
||||
<el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'" :rules="[
|
||||
{
|
||||
required: true,
|
||||
message: '被申请人身份证号不能为空',
|
||||
@@ -693,8 +694,8 @@
|
||||
<el-input type="textarea" v-model="item.value"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="buttonFlag">
|
||||
<el-button v-if="index >=1?true:false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
|
||||
<el-col :span="12" v-if="buttonFlag">
|
||||
<el-button v-if="index >= 1 ? true : false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
|
||||
@click='deleteRes(item)'>删除</el-button>
|
||||
</el-col>
|
||||
</div>
|
||||
@@ -870,7 +871,7 @@ export default {
|
||||
getUserInfoList: {},
|
||||
applicationFlag: null,
|
||||
showmediate: false,
|
||||
labelShowMediate:false,
|
||||
labelShowMediate: false,
|
||||
showEvidence: false,//是否显示证据
|
||||
mediationApplication: false,
|
||||
formZipData: {},
|
||||
@@ -1098,7 +1099,7 @@ export default {
|
||||
this.showmediate = true
|
||||
} else if (item.annexType == 3) {
|
||||
this.mediationApplication = true
|
||||
} else if(item.annexType == 13){
|
||||
} else if (item.annexType == 13) {
|
||||
this.labelShowMediate = true
|
||||
}
|
||||
});
|
||||
@@ -1237,12 +1238,18 @@ export default {
|
||||
// this.$set(item,"organizeFlag",0);
|
||||
// this.$set(item,"roleType",2)
|
||||
item.applicantAgent.organizeFlag = 0;
|
||||
if (item.applicantAgent == null || item.applicantAgent == undefined) {
|
||||
item["applicantAgent"] = {}
|
||||
}
|
||||
item.applicantAgent['roleType'] = 2;
|
||||
})
|
||||
this.formData.affiliate.res.forEach((item) => {
|
||||
// this.$set(item,"organizeFlag",0);
|
||||
// this.$set(item,"roleType",4)
|
||||
item.resAgent.organizeFlag = 0;
|
||||
if (item.resAgent == null || item.resAgent == undefined) {
|
||||
item["resAgent"] = {}
|
||||
}
|
||||
item.resAgent['roleType'] = 4;
|
||||
})
|
||||
this.modifyData(this.formData);
|
||||
@@ -1252,99 +1259,99 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
clearValidate(val,index) {
|
||||
if(index==0){
|
||||
if (val == 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);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
|
||||
if (this.formZipData.affiliate) {
|
||||
// this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
|
||||
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
|
||||
this.$set(this.formData, 'facts', this.formZipData.facts);
|
||||
clearValidate(val, index) {
|
||||
if (index == 0) {
|
||||
if (val == 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);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
|
||||
if (this.formZipData.affiliate) {
|
||||
// this.$set(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, "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);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
|
||||
|
||||
} else {
|
||||
this.formData.affiliate.applicant[0].applicantAgent.name = null;
|
||||
this.formData.affiliate.applicant[0].applicantAgent.email = null;
|
||||
this.formData.affiliate.applicant[0].applicantAgent.phone = null;
|
||||
}
|
||||
} else if (val == 1) {
|
||||
this.$set(this.formData.affiliate.applicant[0].applicantAgent, "name", this.getUserInfoList.nickName);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicantAgent, "email", this.getUserInfoList.email);
|
||||
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.applicant[0]
|
||||
.applicant.name);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData
|
||||
.affiliate.applicant[0].applicant.code);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData
|
||||
.affiliate.applicant[0]
|
||||
.applicant.home);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this
|
||||
.formZipData.affiliate.applicant[0]
|
||||
.applicant.address);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this
|
||||
.formZipData.affiliate.applicant[0]
|
||||
.applicant.compLegalPerson);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData
|
||||
.affiliate.applicant[0]
|
||||
.applicant.email);
|
||||
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);
|
||||
} else {
|
||||
this.formData.affiliate.applicant[0].applicantAgent.name = null;
|
||||
this.formData.affiliate.applicant[0].applicantAgent.email = null;
|
||||
this.formData.affiliate.applicant[0].applicantAgent.phone = null;
|
||||
}
|
||||
} else if (val == 1) {
|
||||
this.$set(this.formData.affiliate.applicant[0].applicantAgent, "name", this.getUserInfoList.nickName);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicantAgent, "email", this.getUserInfoList.email);
|
||||
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.applicant[0]
|
||||
.applicant.name);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData
|
||||
.affiliate.applicant[0].applicant.code);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData
|
||||
.affiliate.applicant[0]
|
||||
.applicant.home);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this
|
||||
.formZipData.affiliate.applicant[0]
|
||||
.applicant.address);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this
|
||||
.formZipData.affiliate.applicant[0]
|
||||
.applicant.compLegalPerson);
|
||||
this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData
|
||||
.affiliate.applicant[0]
|
||||
.applicant.email);
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
this.$refs["ruleForm"].clearValidate()
|
||||
},
|
||||
clearValidateRes(val,index) {
|
||||
if(index==0){
|
||||
clearValidateRes(val, index) {
|
||||
if (index == 0) {
|
||||
if (val == 0) {
|
||||
if (this.formZipData.affiliate) {
|
||||
// this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
|
||||
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.affiliate.res[0].res.idCard);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
|
||||
this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
|
||||
if (this.formZipData.affiliate) {
|
||||
// this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
|
||||
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.affiliate.res[0].res.idCard);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
|
||||
this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
|
||||
}
|
||||
} else if (val == 1) {
|
||||
if (this.formZipData.affiliate) {
|
||||
// this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
|
||||
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.affiliate.res[0].res.idCard);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
|
||||
this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
|
||||
}
|
||||
this.$set(this.formData.affiliate.res[0].res, 'name', null)
|
||||
this.$set(this.formData.affiliate.res[0].res, 'home', null)
|
||||
}
|
||||
} else if (val == 1) {
|
||||
if (this.formZipData.affiliate) {
|
||||
// this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
|
||||
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.affiliate.res[0].res.idCard);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
|
||||
this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
|
||||
this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
|
||||
}
|
||||
this.$set(this.formData.affiliate.res[0].res, 'name', null)
|
||||
this.$set(this.formData.affiliate.res[0].res, 'home', null)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
this.$refs["ruleForm"].clearValidate()
|
||||
},
|
||||
cancel() {
|
||||
|
||||
@@ -168,6 +168,7 @@ export default {
|
||||
},
|
||||
filedata: {
|
||||
annexType: 7,
|
||||
isMediaBook:1,
|
||||
},
|
||||
fileList: [],
|
||||
attachList: [],
|
||||
@@ -217,7 +218,7 @@ export default {
|
||||
},
|
||||
/**上传地址*/
|
||||
UploadUrl() {
|
||||
return window.location.origin + "/API/common/upload";
|
||||
return window.location.origin + "/API/video/upload";
|
||||
},
|
||||
handlePreview(file) {
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user