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

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

Browse Source
This commit was merged in pull request #53.
This commit is contained in:
gaogaoyujie
2024-04-07 14:35:50 +08:00
committed by Gitea
parent 52ae542c27 fe831c1549
commit 84ee84777d
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.js
+2 -2
View File
@@ -5,8 +5,8 @@ module.exports = {
// baseUrl: 'http://121.40.189.20:9001', // baseUrl: 'http://121.40.189.20:9001',
baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi', baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest', // baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest', // baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',
// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi', baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
// baseUrlZC: 'http://121.40.189.20:8001', // 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://172.16.1.24:8001',
pages/handlecase/component/confirmPayment.vue
+5 -2
View File
@@ -18,7 +18,7 @@
</view> </view>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="被申请人缴费:" name="feePayable" label-width="100px" v-if="annexTypeB"> <uni-forms-item label="被申请人缴费:" name="feePayable" label-width="100px" v-if="annexTypeB">
<view v-for="item in formData.caseAttachList"> <view v-for="item in formData.resCaseAttachList">
<uni-link v-if="item.annexType==9" :href="item.annexPath" color="#007BFF" <uni-link v-if="item.annexType==9" :href="item.annexPath" color="#007BFF"
:text="item.annexName"></uni-link> :text="item.annexName"></uni-link>
</view> </view>
@@ -132,7 +132,10 @@
this.formData.caseAttachList.forEach(res => { this.formData.caseAttachList.forEach(res => {
if (res.annexType == 4) { if (res.annexType == 4) {
this.annexTypeS = true this.annexTypeS = true
} else if (res.annexType == 9) { }
})
this.formData.resCaseAttachList.forEach(res => {
if (res.annexType == 9) {
this.annexTypeB = true this.annexTypeB = true
} }
}) })
pages/handlecase/component/newlyAddedCase.vue
+8 -8
View File
@@ -265,7 +265,7 @@ import constant from '../../../utils/constant.js'
birth: "", birth: "",
sex: "", sex: "",
group_order: 1, group_order: 1,
operatorFlag:0 operatorFlag:1
}, },
applicantAgent:{ applicantAgent:{
roleType:2, roleType:2,
@@ -281,7 +281,7 @@ import constant from '../../../utils/constant.js'
nationality:1, nationality:1,
birth:"", birth:"",
sex:"", sex:"",
operatorFlag:0 operatorFlag:1
} }
}], }],
res:[{ res:[{
@@ -300,7 +300,7 @@ import constant from '../../../utils/constant.js'
birth: "", birth: "",
sex: "", sex: "",
group_order: 1, group_order: 1,
operatorFlag:0 operatorFlag:1
}, },
resAgent:{ resAgent:{
roleType: 4, roleType: 4,
@@ -317,7 +317,7 @@ import constant from '../../../utils/constant.js'
birth: "", birth: "",
sex: "", sex: "",
group_order: 1, group_order: 1,
operatorFlag:0 operatorFlag:1
} }
}] }]
}, },
@@ -815,7 +815,7 @@ import constant from '../../../utils/constant.js'
birth: "", birth: "",
sex: "", sex: "",
group_order: 1, group_order: 1,
operatorFlag:0 operatorFlag:1
}, },
applicantAgent:{ applicantAgent:{
roleType:2, roleType:2,
@@ -831,7 +831,7 @@ import constant from '../../../utils/constant.js'
nationality:1, nationality:1,
birth:"", birth:"",
sex:"", sex:"",
operatorFlag:0 operatorFlag:1
} }
}) })
let idnexVal = "" let idnexVal = ""
@@ -874,7 +874,7 @@ import constant from '../../../utils/constant.js'
birth: "", birth: "",
sex: "", sex: "",
group_order: 1, group_order: 1,
operatorFlag:0 operatorFlag:1
}, },
resAgent:{ resAgent:{
roleType: 4, roleType: 4,
@@ -891,7 +891,7 @@ import constant from '../../../utils/constant.js'
birth: "", birth: "",
sex: "", sex: "",
group_order: 1, group_order: 1,
operatorFlag:0 operatorFlag:1
} }
}) })
}, },
pages/handlecase/component/payList.vue
+7 -12
View File
@@ -6,11 +6,11 @@
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseNum" placeholder="" /> <uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseNum" placeholder="" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="申请人：" name="applicantName" label-width="120px" required> <uni-forms-item label="申请人：" name="applicantName" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate.name" <uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate"
placeholder="" /> placeholder="" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required> <uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliateRes.name" <uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliateRes"
placeholder="" /> placeholder="" />
</uni-forms-item> </uni-forms-item>
<!-- <uni-forms-item label="案件标的：" name="caseSubjectAmount" label-width="120px" required> <!-- <uni-forms-item label="案件标的：" name="caseSubjectAmount" label-width="120px" required>
@@ -63,8 +63,8 @@
data() { data() {
return { return {
formData: {}, formData: {},
affiliate:{}, affiliate:"",
affiliateRes:{}, affiliateRes:"",
selectFlag: false, selectFlag: false,
rules: {}, rules: {},
payPlatforms: [{ payPlatforms: [{
@@ -101,17 +101,12 @@
getData(parms) { getData(parms) {
selectById(parms).then(res => { selectById(parms).then(res => {
this.formData = res.data this.formData = res.data
res.data.affiliate.applicant.forEach((item,index) =>{ this.affiliate = res.data.affiliate.applicant.map(item =>item.applicant.name).join(',')
if(item.applicant!=null){ this.affiliateRes = res.data.affiliate.res.map(item =>item.res.name).join(',')
this.affiliate = {name:item.applicant.name}
}
})
res.data.affiliate.applicant.forEach((item,index) =>{ res.data.affiliate.applicant.forEach((item,index) =>{
if(item.res!=null){ if(item.res!=null){
this.affiliateRes = {name:item.res.name} this.affiliateRes = {name:item.res.name}
} }
}) })
if(this.dataType.type==4){ if(this.dataType.type==4){
this.formDataVal ={ this.formDataVal ={
pages/handlecase/component/uploadEvidence.vue
+6 -2
View File
@@ -97,11 +97,11 @@
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="申请人：" name="applicantName" label-width="120px" required> <uni-forms-item label="申请人：" name="applicantName" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' <uni-easyinput :inputBorder="false" :disabled='true'
v-model="formData.affiliate.applicationName" placeholder="" /> v-model="affiliateApp" placeholder="" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required> <uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' <uni-easyinput :inputBorder="false" :disabled='true'
v-model="formData.affiliate.respondentName" placeholder="" /> v-model="affiliateRes" placeholder="" />
</uni-forms-item> </uni-forms-item>
<!-- <uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required> <!-- <uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden" <uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
@@ -279,6 +279,8 @@
defaultSelected: [], //默认选中项 defaultSelected: [], //默认选中项
serviceList: ['1', '2'], //传递给子组件的数据 serviceList: ['1', '2'], //传递给子组件的数据
current: 0, current: 0,
affiliateApp:"",
affiliateRes:"",
itemsT: ['案件详情', '案件资料'], itemsT: ['案件详情', '案件资料'],
styleType: 'button', styleType: 'button',
activeColor: '#007aff', activeColor: '#007aff',
@@ -467,6 +469,8 @@
id: parms id: parms
}).then(res => { }).then(res => {
this.formData = res.data this.formData = res.data
this.affiliateApp = res.data.affiliate.applicant.map(item =>item.applicant.name).join(',')
this.affiliateRes = res.data.affiliate.res.map(item =>item.res.name).join(',')
console.log(res, "KKKKKKKKKKKKKKKKKKKKK"); console.log(res, "KKKKKKKKKKKKKKKKKKKKK");
}) })
} }