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

修改测试bug

Browse Source
This commit is contained in:
hanchaobo
2024-04-19 15:54:21 +08:00
parent e00f712efb
commit 4e86daeb5a
4 changed files with 83 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/components/addCase.vue
+41 -39
View File
@@ -112,7 +112,7 @@
</el-radio-group>
</el-form-item>
</el-col> -->
<el-col :span="24">
<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>
@@ -133,7 +133,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 1">
<el-form-item label="申请机构名称" :prop="'affiliate.applicant.' + index + '.applicant.name'" :rules="[
<el-form-item label="机构名称" :prop="'affiliate.applicant.' + index + '.applicant.name'" :rules="[
{
required: true,
message: '申请机构名称不能为空',
@@ -227,14 +227,14 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label-width="140px" label="申请人出生年月："
<el-form-item label-width="140px" label="出生年月："
:prop="'affiliate.applicant.' + index + '.applicant.birth'">
<el-date-picker disabled v-model="item.applicant.birth" type="date" placeholder="被申请人出生年月日">
<el-date-picker disabled v-model="item.applicant.birth" type="date" placeholder="申请人出生年月日">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="被申请人性别：" :prop="'affiliate.applicant.' + index + '.applicant.sex'" :rules="[
<el-form-item label="性别：" :prop="'affiliate.applicant.' + index + '.applicant.sex'" :rules="[
{
required: true,
message: '请选择性别',
@@ -247,7 +247,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="申请人邮箱" :prop="'affiliate.applicant.' + index + '.applicant.email'" :rules="[
<el-form-item label="邮箱" :prop="'affiliate.applicant.' + index + '.applicant.email'" :rules="[
{
required: true,
message: '申请人邮箱不能为空',
@@ -264,7 +264,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="申请人电话" :prop="'affiliate.applicant.' + index + '.applicant.phone'" :rules="formData.affiliate.nationality == 0 ? [
<el-form-item label="电话" :prop="'affiliate.applicant.' + index + '.applicant.phone'" :rules="formData.affiliate.nationality == 0 ? [
{
required: true,
message: '申请人联系电话不能为空',
@@ -291,7 +291,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请人住所" :prop="'affiliate.applicant.' + index + '.applicant.home'" :rules="[
<el-form-item label="住所" :prop="'affiliate.applicant.' + index + '.applicant.home'" :rules="[
{
required: true,
message: '申请人住所不能为空',
@@ -302,7 +302,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请人联系地址" :prop="'affiliate.applicant.' + index + '.applicant.address'" :rules="[
<el-form-item label="联系地址" :prop="'affiliate.applicant.' + index + '.applicant.address'" :rules="[
{
required: true,
message: '申请人联系地址不能为空',
@@ -320,7 +320,7 @@
<el-divider></el-divider>
</el-col>
<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,
message: '代理人联系电话不能为空',
@@ -336,12 +336,12 @@
</el-form-item>
</el-col>
<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'">
<el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 1">
<el-form-item label="代理人姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'" :rules="[
<el-form-item label="姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'" :rules="[
{
required: true,
message: '代理人姓名不能为空',
@@ -352,7 +352,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="代理人姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'">
<el-form-item label="姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'">
<el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
</el-form-item>
</el-col>
@@ -367,7 +367,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 1">
<el-form-item label="代理人邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
<el-form-item label="邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
{
required: true,
message: '代理人邮箱不能为空',
@@ -384,7 +384,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.applicant.organizeFlag == 0">
<el-form-item label="代理人邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
<el-form-item label="邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
{
pattern:
/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
@@ -395,12 +395,12 @@
<el-input v-model="item.applicantAgent.email" placeholder="请输入代理人邮箱" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" v-if="buttonFlag">
<el-button type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
@click='deleteApplicant(item)'>删除</el-button>
</el-col>
</div>
<el-col :span="24">
<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>
@@ -421,7 +421,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="被申请人姓名" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
<el-form-item label="被申请人" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
{
required: true,
message: '被申请人姓名不能为空',
@@ -432,14 +432,14 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 1">
<el-form-item label="被申请机构名称" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
<el-form-item label="机构名称" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
{
required: true,
message: '被申请机构名称不能为空',
message: '机构名称不能为空',
trigger: 'blur',
},
]">
<el-input v-model="item.res.name" placeholder="请输入被申请机构名称" />
<el-input v-model="item.res.name" placeholder="请输入机构名称" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
@@ -483,7 +483,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.phone'" :rules="[
<el-form-item label-width="140px" label="联系电话" :prop="'affiliate.res.' + index + '.res.phone'" :rules="[
{
required: true,
message: '被申请人联系电话不能为空',
@@ -499,29 +499,29 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label-width="150px" label="被申请人住所" :prop="'affiliate.res.' + index + '.res.home'" :rules="[
<el-form-item label-width="150px" label="住所" :prop="'affiliate.res.' + index + '.res.home'" :rules="[
{
required: true,
message: '被申请人住所不能为空',
message: '住所不能为空',
trigger: 'blur',
},
]">
<el-input v-model="item.res.home" placeholder="请输入被申请人住所" />
<el-input v-model="item.res.home" placeholder="请输入住所" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="被申请联系地址" :prop="'affiliate.res.' + index + '.res.address'" :rules="[
<el-form-item label="联系地址" :prop="'affiliate.res.' + index + '.res.address'" :rules="[
{
required: true,
message: '申请人联系地址不能为空',
message: '联系地址不能为空',
trigger: 'blur',
},
]">
<el-input v-model="item.res.address" placeholder="请输入被申请人联系地址" />
<el-input v-model="item.res.address" placeholder="请输入联系地址" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="被申请人邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
<el-form-item label="邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
{
required: true,
message: '被申请人邮箱不能为空',
@@ -538,7 +538,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'"
<el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
:rules="[
{
required: true,
@@ -578,13 +578,13 @@
</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.birth'">
<el-form-item label-width="140px" label="出生年月：" :prop="'affiliate.res.' + index + '.res.birth'">
<el-date-picker disabled v-model="item.res.birth" type="date" placeholder="被申请人出生年月日">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="被申请人性别：" :prop="'affiliate.res.' + index + '.res.sex'" :rules="[
<el-form-item label="性别：" :prop="'affiliate.res.' + index + '.res.sex'" :rules="[
{
required: true,
message: '请选择性别',
@@ -604,7 +604,7 @@
<el-divider></el-divider>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 1">
<el-form-item label="代理人联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'" :rules="[
<el-form-item label="联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'" :rules="[
{
required: true,
message: '代理人联系电话不能为空',
@@ -620,12 +620,12 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="代理人联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'">
<el-form-item label="联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'">
<el-input v-model="item.resAgent.phone" placeholder="请输入代理人联系电话" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 1">
<el-form-item label="代理人姓名" :prop="'affiliate.res.' + index + '.resAgent.name'" :rules="[
<el-form-item label="姓名" :prop="'affiliate.res.' + index + '.resAgent.name'" :rules="[
{
required: true,
message: '代理人姓名不能为空',
@@ -646,12 +646,12 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="代理人姓名" :prop="'affiliate.res.' + index + '.resAgent.name'">
<el-form-item label="姓名" :prop="'affiliate.res.' + index + '.resAgent.name'">
<el-input v-model="item.resAgent.name" placeholder="请输入代理人姓名" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 1">
<el-form-item label="代理人邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
<el-form-item label="邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
{
required: true,
message: '代理人邮箱不能为空',
@@ -668,7 +668,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="item.res.organizeFlag == 0">
<el-form-item label="代理人邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
<el-form-item label="邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
{
pattern:
/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
@@ -684,7 +684,7 @@
<el-input type="textarea" v-model="item.value"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" v-if="buttonFlag">
<el-button type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
@click='deleteRes(item)'>删除</el-button>
</el-col>
@@ -1007,6 +1007,8 @@ export default {
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);
this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex);
this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth);
}
this.activeName = "first";
this.showmediate = false;
src/views/caseManagement/components/mediation.vue
+12 -5
View File
@@ -57,7 +57,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="是否用印申请" v-if="formData.mediaResult == 1">
<el-radio-group v-model="sealFlag">
<el-radio-group v-model="formData.sealFlag" :disabled="!selectRoido">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
@@ -156,7 +156,8 @@ export default {
// isReconci:0,
formData: {
affiliate: {},
mediaResult:1
mediaResult:1,
sealFlag:1,
},
user: "",
userId: null,
@@ -177,7 +178,8 @@ export default {
},
watch: {
mediationVisable(val) {
this.formData.mediaResult = 1
this.formData.mediaResult = 1;
this.formData.sealFlag = 1;
this.recordArr = [];
this.recordArrMediate = [];
if (this.mediationData.mediationMethod == "1") {
@@ -238,8 +240,12 @@ export default {
this.formData = res.data;
this.formData.mediaResult = 1;
}
console.log(this.formData)
if(res.data.sealFlag==1||res.data.sealFlag==0){
this.formData = res.data;
}else{
this.formData = res.data;
this.formData.sealFlag = 1;
}
this.applicateArr = res.data.caseAttachList;
res.data.caseAttachList.forEach(item => {
if (item.annexType == 6) {
@@ -282,6 +288,7 @@ export default {
caseFlowId: this.mediationData.caseFlowId,
batchNumber: "",
mediaResult: this.formData.mediaResult,
sealFlag:this.formData.sealFlag
}).then(res => {
caseApplicationSelectById({
id: this.mediationData.id
src/views/register.vue
+4 -4
View File
@@ -39,8 +39,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="identityNo" v-if="registerForm.idType === 0">
<el-input v-model="registerForm.identityNo" type="text" auto-complete="off" placeholder="身份证号码">
<el-form-item prop="identityNo">
<el-input v-model="registerForm.identityNo" type="text" auto-complete="off" placeholder="证件号码">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
@@ -169,7 +169,7 @@ export default {
identityNo: [
{
required: true,
message: '被申请人身份证号不能为空',
message: '证件号码不能为空',
trigger: 'blur',
},
// {
@@ -180,7 +180,7 @@ export default {
// },
],
email: [
{ required: true, trigger: "blur", message: "请再次输入您的密码" },
{ required: true, trigger: "blur", message: "请输入您的邮箱" },
{
pattern:
/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
src/views/system/user/index.vue
+7
View File
@@ -189,6 +189,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证件号码" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入证件号码" maxlength="18" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">