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

This commit was merged in pull request #50.
This commit is contained in:
2024-03-27 10:28:34 +08:00
committed by Gitea
3 changed files with 156 additions and 114 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ module.exports = {
baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',
// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
// baseUrlZC: 'http://121.40.189.20:8001',
// baseUrlTJ: 'http://172.16.1.43:6001',
// baseUrlTJ: 'http://172.16.1.43:6001',
// baseUrl: 'http://172.16.1.24:8001',
// baseUrl: 'http://localhost:8080',
// baseUrl: 'http://192.168.3.18:9001',
+13 -3
View File
@@ -20,17 +20,21 @@
<view class="lable">
申请人:
</view>
<view class="main">
{{defalutVal.applicationName}}
<uni-tooltip :content="defalutVal.applicationName">
<view class="textHidden">
{{defalutVal.applicationName}}
</view>
</uni-tooltip>
</view>
<view class="listItem" style="margin-top:22rpx">
<view class="lable">
被申请人:
</view>
<view class="main">
<uni-tooltip :content="defalutVal.respondentName">
<view class="textHidden">
{{defalutVal.respondentName}}
</view>
</uni-tooltip>
</view>
<view class="listItem">
<view class="lable">
@@ -321,4 +325,10 @@
}
}
}
.textHidden{
width: 300rpx;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
</style>
+142 -110
View File
@@ -257,7 +257,7 @@ import constant from '../../../utils/constant.js'
home: "",
address: "",
idType: 0,
nationality: 1,
nationality: 0,
birth: "",
sex: "",
group_order: 1,
@@ -396,6 +396,7 @@ import constant from '../../../utils/constant.js'
})
getUserInfo().then(res => {
this.getUserInfoList = res.data
console.log(res.data.nationality)
if (this.formData.organizeFlag == 0) {
this.$set(this.formData.affiliate[indexs].applicant, 'name', res.data.nickName)
this.$set(this.formData.affiliate[indexs].applicant, 'idCard', res.data.idCard)
@@ -403,6 +404,13 @@ import constant from '../../../utils/constant.js'
this.$set(this.formData.affiliate[indexs].applicant, 'phone', res.data.phonenumber)
this.$set(this.formData.affiliate[indexs].applicant, 'idType', res.data.idType)
this.$set(this.formData.affiliate[indexs].applicant, 'nationality', res.data.nationality)
if(res.data.nationality == 0){
this.testVerify = true
this.rulesRespondentPhone[0].required = true;
}else if(res.data.nationality == 1){
this.testVerify = false
this.rulesRespondentPhone[0].required = false;
}
} else if (this.formData.organizeFlag == 1) {
console.log(this.formData.organizeFlag)
this.$set(this.formData.affiliate[indexs].applicantAgent, 'name', res.data.nickName)
@@ -426,32 +434,30 @@ import constant from '../../../utils/constant.js'
if (this.formZipData.affiliate) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate
.applicantHome);
this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate
.applicantAddress);
this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData
.affiliate.contactTelphoneAgent);
this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate
.nameAgent);
this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate
.agentEmail);
this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate
.respondentName);
this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate
.respondentPhone);
this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData
.affiliate.respondentIdentityNum);
this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData
.affiliate.respondentSex));
this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate
.respondentBirth);
this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate
.respondentHome);
this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate
.respondentEmail);
this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate
.compLegalPerson);
this.$set(this.formData.affiliate[0].applicant, 'home', this.formZipData.affiliate[0]
.applicant.home);
this.$set(this.formData.affiliate[0].applicant, 'address', this.formZipData.affiliate[0]
.applicant.address);
this.$set(this.formData.affiliate[0].applicantAgent, 'phone', this.formZipData
.affiliate[0].applicantAgent.phone);
this.$set(this.formData.affiliate[0].applicantAgent, 'name', this.formZipData.affiliate[0]
.applicantAgent.name);
this.$set(this.formData.affiliate[0].applicantAgent, 'email', this.formZipData.affiliate[0]
.applicantAgent.email);
this.$set(this.formData.affiliate[0].res, 'name', this.formZipData.affiliate[0]
.res.name);
this.$set(this.formData.affiliate[0].res, 'phone', this.formZipData.affiliate[0]
.res.phone);
this.$set(this.formData.affiliate[0].res, 'idCard', this.formZipData
.affiliate[0].res.idCard);
this.$set(this.formData.affiliate[0].res, 'sex', Number(this.formZipData
.affiliate[0].res.sex));
this.$set(this.formData.affiliate[0].res, 'birth', this.formZipData.affiliate[0]
.res.birth);
this.$set(this.formData.affiliate[0].res, 'home', this.formZipData.affiliate[0]
.res.home);
this.$set(this.formData.affiliate[0].res, 'email', this.formZipData.affiliate[0]
.res.email);
} else {
this.$set(this.formData.affiliate[indexs].applicantAgent, 'name', null)
this.$set(this.formData.affiliate[indexs].applicantAgent, 'email', null)
@@ -466,33 +472,33 @@ import constant from '../../../utils/constant.js'
if (this.formZipData.affiliate) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate, 'applicationName', this.formZipData.affiliate
.applicationName);
this.$set(this.formData.affiliate, 'code', this.formZipData.affiliate.code);
this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate
.applicantHome);
this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate
.applicantAddress);
this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate
.compLegalPerson);
this.$set(this.formData.affiliate, 'applicationEmail', this.formZipData.affiliate
.applicationEmail);
this.$set(this.formData.affiliate, 'applicationPhone', this.formZipData.affiliate
.applicationPhone);
this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate
.respondentName);
this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate
.respondentPhone);
this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData
.affiliate.respondentIdentityNum);
this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData
.affiliate.respondentSex));
this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate
.respondentBirth);
this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate
.respondentHome);
this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate
.respondentEmail);
this.$set(this.formData.affiliate[0].applicant, 'name', this.formZipData.affiliate[0]
.applicant.name);
this.$set(this.formData.affiliate[0].applicant, 'code', this.formZipData.affiliate[0].applicant.code);
this.$set(this.formData.affiliate[0].applicant, 'home', this.formZipData.affiliate[0]
.applicant.home);
this.$set(this.formData.affiliate[0].applicant, 'address', this.formZipData.affiliate[0]
.applicant.address);
this.$set(this.formData.affiliate[0].applicant, 'compLegalPerson', this.formZipData.affiliate[0]
.applicant.compLegalPerson);
this.$set(this.formData.affiliate[0].applicant, 'email', this.formZipData.affiliate[0]
.applicant.email);
this.$set(this.formData.affiliate[0].applicant, 'phone', this.formZipData.affiliate[0]
.applicant.phone);
this.$set(this.formData.affiliate[0].res, 'name', this.formZipData.affiliate[0]
.res.name);
this.$set(this.formData.affiliate[0].res, 'phone', this.formZipData.affiliate[0]
.res.phone);
this.$set(this.formData.affiliate[0].res, 'idCard', this.formZipData
.affiliate[0].res.idCard);
this.$set(this.formData.affiliate[0].res, 'sex', Number(this.formZipData
.affiliate[0].res.sex));
this.$set(this.formData.affiliate[0].res, 'birth', this.formZipData.affiliate[0]
.res.birth);
this.$set(this.formData.affiliate[0].res, 'home', this.formZipData.affiliate[0]
.res.home);
this.$set(this.formData.affiliate[0].res, 'email', this.formZipData.affiliate[0]
.res.email);
} else {
this.$set(this.formData.affiliate[indexs].applicant, 'name', null)
this.$set(this.formData.affiliate[indexs].applicant, 'idCard', null)
@@ -521,8 +527,25 @@ import constant from '../../../utils/constant.js'
/** 根据案件id获取对应信息 */
caseApplicationSelectByIdFn(data) {
caseApplicationSelectById(data).then(res => {
res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)
this.formData = res.data
let data = res.data
let indexs = ""
data.affiliate.forEach((item,index) =>{
indexs = index
if(!item.applicant){
item.applicant = {}
}
if(!item.applicantAgent){
item.applicantAgent = {}
}
if(!item.res){
item.res = {}
}
if(!item.resAgent){
item.resAgent = {}
}
})
data.affiliate[indexs].res.sex = Number(data.affiliate[indexs].res.sex)
this.formData = data
console.log(this.formData)
})
},
@@ -595,65 +618,74 @@ import constant from '../../../utils/constant.js'
duration: 1000
})
this.formZipData = result.data;
let idnexVal = ""
this.formData.affiliate.forEach((item,index)=>{
idnexVal = index
})
console.log(this.formZipData)
if (this.formData.organizeFlag == 0) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate
.applicantHome);
this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate
.applicantAddress);
this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData
.affiliate.contactTelphoneAgent);
this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate
.nameAgent);
this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate
.agentEmail);
this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate
.respondentName);
this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate
.respondentPhone);
this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData
.affiliate.respondentIdentityNum);
this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData
.affiliate.respondentSex));
this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate
.respondentBirth);
this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate
.respondentHome);
this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate
.respondentEmail);
this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate
.compLegalPerson);
this.$set(this.formData.affiliate[0].applicant, 'home', this.formZipData.affiliate[0]
.applicant.home);
this.$set(this.formData.affiliate[0].applicant, 'address', this.formZipData.affiliate[0]
.applicant.address);
this.$set(this.formData.affiliate[0].applicantAgent, 'phone', this.formZipData
.affiliate[0].applicantAgent.phone);
this.$set(this.formData.affiliate[0].applicantAgent, 'name', this.formZipData.affiliate[0]
.applicantAgent.name);
this.$set(this.formData.affiliate[0].applicantAgent, 'email', this.formZipData.affiliate[0]
.applicantAgent.email);
this.$set(this.formData.affiliate[0].res, 'name', this.formZipData.affiliate[0]
.res.name);
this.$set(this.formData.affiliate[0].res, 'phone', this.formZipData.affiliate[0]
.res.phone);
this.$set(this.formData.affiliate[0].res, 'idCard', this.formZipData
.affiliate[0].res.idCard);
this.$set(this.formData.affiliate[0].res, 'sex', Number(this.formZipData
.affiliate[0].res.sex));
this.$set(this.formData.affiliate[0].res, 'birth', this.formZipData.affiliate[0]
.res.birth);
this.$set(this.formData.affiliate[0].res, 'home', this.formZipData.affiliate[0]
.res.home);
this.$set(this.formData.affiliate[0].res, 'email', this.formZipData.affiliate[0]
.res.email);
// this.$set(this.formData.affiliate[0].resAgent, 'phone', this.formZipData
// .affiliate[0].resAgent.phone);
// this.$set(this.formData.affiliate[0].resAgent, 'name', this.formZipData.affiliate[0]
// .resAgent.name);
// this.$set(this.formData.affiliate[0].resAgent, 'email', this.formZipData.affiliate[0]
// .resAgent.email);
} else if (this.formData.organizeFlag == 1) {
this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
this.$set(this.formData, 'facts', this.formZipData.facts);
this.$set(this.formData.affiliate, 'applicationName', this.formZipData.affiliate
.applicationName);
this.$set(this.formData.affiliate, 'code', this.formZipData.affiliate.code);
this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate
.applicantHome);
this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate
.applicantAddress);
this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate
.compLegalPerson);
this.$set(this.formData.affiliate, 'applicationEmail', this.formZipData.affiliate
.applicationEmail);
this.$set(this.formData.affiliate, 'applicationPhone', this.formZipData.affiliate
.applicationPhone);
this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate
.respondentName);
this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate
.respondentPhone);
this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData
.affiliate.respondentIdentityNum);
this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData
.affiliate.respondentSex));
this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate
.respondentBirth);
this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate
.respondentHome);
this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate
.respondentEmail);
this.$set(this.formData.affiliate[0].applicant, 'name', this.formZipData.affiliate[0]
.applicant.name);
this.$set(this.formData.affiliate[0].applicant, 'code', this.formZipData.affiliate[0].applicant.code);
this.$set(this.formData.affiliate[0].applicant, 'home', this.formZipData.affiliate[0]
.applicant.home);
this.$set(this.formData.affiliate[0].applicant, 'address', this.formZipData.affiliate[0]
.applicant.address);
this.$set(this.formData.affiliate[0].applicant, 'compLegalPerson', this.formZipData.affiliate[0]
.applicant.compLegalPerson);
this.$set(this.formData.affiliate[0].applicant, 'email', this.formZipData.affiliate[0]
.applicant.email);
this.$set(this.formData.affiliate[0].applicant, 'phone', this.formZipData.affiliate[0]
.applicant.phone);
this.$set(this.formData.affiliate[0].res, 'name', this.formZipData.affiliate[0]
.res.name);
this.$set(this.formData.affiliate[0].res, 'phone', this.formZipData.affiliate[0]
.res.phone);
this.$set(this.formData.affiliate[0].res, 'idCard', this.formZipData
.affiliate[0].res.idCard);
this.$set(this.formData.affiliate[0].res, 'sex', Number(this.formZipData
.affiliate[0].res.sex));
this.$set(this.formData.affiliate[0].res, 'birth', this.formZipData.affiliate[0]
.res.birth);
this.$set(this.formData.affiliate[0].res, 'home', this.formZipData.affiliate[0]
.res.home);
this.$set(this.formData.affiliate[0].res, 'email', this.formZipData.affiliate[0]
.res.email);
}
uni.hideLoading();
},
@@ -752,7 +784,7 @@ import constant from '../../../utils/constant.js'
home: "",
address: "",
idType: 0,
nationality: 1,
nationality: 0,
birth: "",
sex: "",
group_order: 1,