SH-Arbitrate/Mediation-Frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

Browse Source
This commit was merged in pull request #118.
This commit is contained in:
hanchaobo
2024-05-06 10:00:10 +08:00
committed by Gitea
parent 18e07846a5 61f6cd4742
commit b7705af7e0
3 changed files with 118 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/components/addCase.vue
+114 -107
View File
@@ -15,7 +15,7 @@
<div class="caseInfo">案件信息：</div> <div class="caseInfo">案件信息：</div>
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
<el-col :span="24" v-if="buttonFlag"> <el-col :span="24" v-if="buttonFlag">
<el-form-item label="压缩包导入"> <el-form-item label="压缩包导入">
<el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip' <el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip'
:limit="1" :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip"> :limit="1" :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip">
@@ -88,7 +88,7 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="modelFlag&&labelShowMediate"> <el-col :span="24" v-if="modelFlag && labelShowMediate">
<el-form-item label="调解后调解书:"> <el-form-item label="调解后调解书:">
<div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 13"> <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)"> <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
@@ -121,7 +121,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> --> </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' <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addApplicant'
style="margin-bottom: 40px;">新增申请人信息</el-button> style="margin-bottom: 40px;">新增申请人信息</el-button>
</el-col> </el-col>
@@ -135,7 +135,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择机构或自然人"> <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="0">自然人</el-radio>
<el-radio :label="1">机构</el-radio> <el-radio :label="1">机构</el-radio>
</el-radio-group> </el-radio-group>
@@ -329,20 +330,20 @@
<el-divider></el-divider> <el-divider></el-divider>
</el-col> </el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 1"> <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
<el-form-item label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'" :rules="[ <el-form-item label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'" :rules="[
{ {
required: true, required: true,
message: '代理人联系电话不能为空', message: '代理人联系电话不能为空',
trigger: 'blur', trigger: 'blur',
}, },
{ {
pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/, pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
message: '请输入正确的手机号码', message: '请输入正确的手机号码',
trigger: 'blur', trigger: 'blur',
}, },
]"> ]">
<el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" /> <el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0"> <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'"> <el-form-item label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'">
@@ -404,12 +405,12 @@
<el-input v-model="item.applicantAgent.email" placeholder="请输入代理人邮箱" /> <el-input v-model="item.applicantAgent.email" placeholder="请输入代理人邮箱" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="buttonFlag"> <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-button v-if="index >= 1 ? true : false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
@click='deleteApplicant(item)'>删除</el-button> @click='deleteApplicant(item)'>删除</el-button>
</el-col> </el-col>
</div> </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' <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addRes'
style="margin-bottom: 40px;">新增被申请人信息</el-button> style="margin-bottom: 40px;">新增被申请人信息</el-button>
</el-col> </el-col>
@@ -423,7 +424,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择机构或自然人"> <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="0">自然人</el-radio>
<el-radio :label="1">机构</el-radio> <el-radio :label="1">机构</el-radio>
</el-radio-group> </el-radio-group>
@@ -547,8 +549,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0"> <el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'" <el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'" :rules="[
:rules="[
{ {
required: true, required: true,
message: '被申请人身份证号不能为空', message: '被申请人身份证号不能为空',
@@ -693,8 +694,8 @@
<el-input type="textarea" v-model="item.value"></el-input> <el-input type="textarea" v-model="item.value"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="buttonFlag"> <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-button v-if="index >= 1 ? true : false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
@click='deleteRes(item)'>删除</el-button> @click='deleteRes(item)'>删除</el-button>
</el-col> </el-col>
</div> </div>
@@ -870,7 +871,7 @@ export default {
getUserInfoList: {}, getUserInfoList: {},
applicationFlag: null, applicationFlag: null,
showmediate: false, showmediate: false,
labelShowMediate:false, labelShowMediate: false,
showEvidence: false,//是否显示证据 showEvidence: false,//是否显示证据
mediationApplication: false, mediationApplication: false,
formZipData: {}, formZipData: {},
@@ -1098,7 +1099,7 @@ export default {
this.showmediate = true this.showmediate = true
} else if (item.annexType == 3) { } else if (item.annexType == 3) {
this.mediationApplication = true this.mediationApplication = true
} else if(item.annexType == 13){ } else if (item.annexType == 13) {
this.labelShowMediate = true this.labelShowMediate = true
} }
}); });
@@ -1237,13 +1238,19 @@ export default {
// this.$set(item,"organizeFlag",0); // this.$set(item,"organizeFlag",0);
// this.$set(item,"roleType",2) // this.$set(item,"roleType",2)
item.applicantAgent.organizeFlag = 0; item.applicantAgent.organizeFlag = 0;
if (item.applicantAgent == null || item.applicantAgent == undefined) {
item["applicantAgent"] = {}
}
item.applicantAgent['roleType'] = 2; item.applicantAgent['roleType'] = 2;
}) })
this.formData.affiliate.res.forEach((item) => { this.formData.affiliate.res.forEach((item) => {
// this.$set(item,"organizeFlag",0); // this.$set(item,"organizeFlag",0);
// this.$set(item,"roleType",4) // this.$set(item,"roleType",4)
item.resAgent.organizeFlag = 0; item.resAgent.organizeFlag = 0;
item.applicantAgent['roleType'] = 4; if (item.resAgent == null || item.resAgent == undefined) {
item["resAgent"] = {}
}
item.resAgent['roleType'] = 4;
}) })
this.modifyData(this.formData); this.modifyData(this.formData);
} else if (this.addModifyData == 1) { } else if (this.addModifyData == 1) {
@@ -1252,99 +1259,99 @@ export default {
} }
}); });
}, },
clearValidate(val,index) { clearValidate(val, index) {
if(index==0){ if (index == 0) {
if (val == 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, "name", this.getUserInfoList.nickName);
this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard); 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, "email", this.getUserInfoList.email);
this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber); 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, "idType", this.getUserInfoList.idType);
this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality); 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 { } else {
this.formData.affiliate.applicant[0].applicantAgent.name = null; this.formData.affiliate.applicant[0].applicantAgent.name = null;
this.formData.affiliate.applicant[0].applicantAgent.email = null; this.formData.affiliate.applicant[0].applicantAgent.email = null;
this.formData.affiliate.applicant[0].applicantAgent.phone = null; this.formData.affiliate.applicant[0].applicantAgent.phone = null;
} }
} else if (val == 1) { } else if (val == 1) {
this.$set(this.formData.affiliate.applicant[0].applicantAgent, "name", this.getUserInfoList.nickName); 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, "email", this.getUserInfoList.email);
this.$set(this.formData.affiliate.applicant[0].applicantAgent, "phone", this.getUserInfoList.phonenumber); this.$set(this.formData.affiliate.applicant[0].applicantAgent, "phone", this.getUserInfoList.phonenumber);
if (this.formZipData.affiliate) { if (this.formZipData.affiliate) {
// this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 1); // this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 1);
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims); this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts); this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData
.affiliate.applicant[0] .affiliate.applicant[0]
.applicant.name); .applicant.name);
this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData
.affiliate.applicant[0].applicant.code); .affiliate.applicant[0].applicant.code);
this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData
.affiliate.applicant[0] .affiliate.applicant[0]
.applicant.home); .applicant.home);
this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this
.formZipData.affiliate.applicant[0] .formZipData.affiliate.applicant[0]
.applicant.address); .applicant.address);
this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this
.formZipData.affiliate.applicant[0] .formZipData.affiliate.applicant[0]
.applicant.compLegalPerson); .applicant.compLegalPerson);
this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData
.affiliate.applicant[0] .affiliate.applicant[0]
.applicant.email); .applicant.email);
this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData
.affiliate.applicant[0] .affiliate.applicant[0]
.applicant.phone); .applicant.phone);
} else { } else {
this.$set(this.formData.affiliate.applicant[0].applicant, 'name', null); 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, 'idCard', null);
this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null); this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null);
this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null); this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null);
}
} }
} }
}
this.$refs["ruleForm"].clearValidate() this.$refs["ruleForm"].clearValidate()
}, },
clearValidateRes(val,index) { clearValidateRes(val, index) {
if(index==0){ if (index == 0) {
if (val == 0) { if (val == 0) {
if (this.formZipData.affiliate) { if (this.formZipData.affiliate) {
// this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0); // 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, '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, '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, '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, '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, '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, '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, '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() this.$refs["ruleForm"].clearValidate()
}, },
cancel() { cancel() {
src/views/caseManagement/components/mediation.vue
+2 -1
View File
@@ -168,6 +168,7 @@ export default {
}, },
filedata: { filedata: {
annexType: 7, annexType: 7,
isMediaBook:1,
}, },
fileList: [], fileList: [],
attachList: [], attachList: [],
@@ -217,7 +218,7 @@ export default {
}, },
/**上传地址*/ /**上传地址*/
UploadUrl() { UploadUrl() {
return window.location.origin + "/API/common/upload"; return window.location.origin + "/API/video/upload";
}, },
handlePreview(file) { handlePreview(file) {
}, },
vue.config.js
+2 -2
View File
@@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 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://121.40.189.20:6001' //测试
// const API = 'http://192.168.3.18:6001' //B // const API = 'http://192.168.3.18:6001' //B
// const API = 'http://172.16.0.237:6001' //Q // 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