Selaa lähdekoodia

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

gaogaoyujie 2 vuotta sitten
vanhempi
commit
84ee84777d

+ 2
- 2
config.js Näytä tiedosto

5
 	// baseUrl: 'http://121.40.189.20:9001',
5
 	// baseUrl: 'http://121.40.189.20:9001',
6
 	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
6
 	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
7
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
7
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
8
-	baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',
9
-	// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
8
+	// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',
9
+	baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
10
 	// baseUrlZC: 'http://121.40.189.20:8001',	
10
 	// baseUrlZC: 'http://121.40.189.20:8001',	
11
 	// baseUrlTJ: 'http://172.16.1.43:6001',                                 
11
 	// baseUrlTJ: 'http://172.16.1.43:6001',                                 
12
 	// baseUrl: 'http://172.16.1.24:8001',
12
 	// baseUrl: 'http://172.16.1.24:8001',

+ 5
- 2
pages/handlecase/component/confirmPayment.vue Näytä tiedosto

18
 					</view>
18
 					</view>
19
 				</uni-forms-item>
19
 				</uni-forms-item>
20
 				<uni-forms-item label="被申请人缴费:" name="feePayable" label-width="100px" v-if="annexTypeB">
20
 				<uni-forms-item label="被申请人缴费:" name="feePayable" label-width="100px" v-if="annexTypeB">
21
-					<view v-for="item in formData.caseAttachList">
21
+					<view v-for="item in formData.resCaseAttachList">
22
 						<uni-link v-if="item.annexType==9" :href="item.annexPath" color="#007BFF"
22
 						<uni-link v-if="item.annexType==9" :href="item.annexPath" color="#007BFF"
23
 							:text="item.annexName"></uni-link>
23
 							:text="item.annexName"></uni-link>
24
 					</view>
24
 					</view>
132
 					this.formData.caseAttachList.forEach(res => {
132
 					this.formData.caseAttachList.forEach(res => {
133
 						if (res.annexType == 4) {
133
 						if (res.annexType == 4) {
134
 							this.annexTypeS = true
134
 							this.annexTypeS = true
135
-						} else if (res.annexType == 9) {
135
+						}
136
+					})
137
+					this.formData.resCaseAttachList.forEach(res => {
138
+						if (res.annexType == 9) {
136
 							this.annexTypeB = true
139
 							this.annexTypeB = true
137
 						}
140
 						}
138
 					})
141
 					})

+ 8
- 8
pages/handlecase/component/newlyAddedCase.vue Näytä tiedosto

265
 									birth: "",
265
 									birth: "",
266
 									sex: "",
266
 									sex: "",
267
 									group_order: 1,
267
 									group_order: 1,
268
-									operatorFlag:0
268
+									operatorFlag:1
269
 								},
269
 								},
270
 								applicantAgent:{
270
 								applicantAgent:{
271
 									roleType:2,
271
 									roleType:2,
281
 									nationality:1,
281
 									nationality:1,
282
 									birth:"",
282
 									birth:"",
283
 									sex:"",
283
 									sex:"",
284
-									operatorFlag:0
284
+									operatorFlag:1
285
 								}	
285
 								}	
286
 							}],
286
 							}],
287
 							res:[{
287
 							res:[{
300
 									birth: "",
300
 									birth: "",
301
 									sex: "",
301
 									sex: "",
302
 									group_order: 1,
302
 									group_order: 1,
303
-									operatorFlag:0
303
+									operatorFlag:1
304
 								},
304
 								},
305
 								resAgent:{
305
 								resAgent:{
306
 									roleType: 4,
306
 									roleType: 4,
317
 									birth: "",
317
 									birth: "",
318
 									sex: "",
318
 									sex: "",
319
 									group_order: 1,
319
 									group_order: 1,
320
-									operatorFlag:0
320
+									operatorFlag:1
321
 								}
321
 								}
322
 							}]
322
 							}]
323
 					},
323
 					},
815
 						birth: "",
815
 						birth: "",
816
 						sex: "",
816
 						sex: "",
817
 						group_order: 1,
817
 						group_order: 1,
818
-						operatorFlag:0
818
+						operatorFlag:1
819
 					},
819
 					},
820
 					applicantAgent:{
820
 					applicantAgent:{
821
 						roleType:2,
821
 						roleType:2,
831
 						nationality:1,
831
 						nationality:1,
832
 						birth:"",
832
 						birth:"",
833
 						sex:"",
833
 						sex:"",
834
-						operatorFlag:0
834
+						operatorFlag:1
835
 					}
835
 					}
836
 				})
836
 				})
837
 				let idnexVal = ""
837
 				let idnexVal = ""
874
 						birth: "",
874
 						birth: "",
875
 						sex: "",
875
 						sex: "",
876
 						group_order: 1,
876
 						group_order: 1,
877
-						operatorFlag:0
877
+						operatorFlag:1
878
 					},
878
 					},
879
 					resAgent:{
879
 					resAgent:{
880
 						roleType: 4,
880
 						roleType: 4,
891
 						birth: "",
891
 						birth: "",
892
 						sex: "",
892
 						sex: "",
893
 						group_order: 1,
893
 						group_order: 1,
894
-						operatorFlag:0
894
+						operatorFlag:1
895
 					}
895
 					}
896
 				})
896
 				})
897
 			},
897
 			},

+ 7
- 12
pages/handlecase/component/payList.vue Näytä tiedosto

6
 					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseNum" placeholder="" />
6
 					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseNum" placeholder="" />
7
 				</uni-forms-item>
7
 				</uni-forms-item>
8
 				<uni-forms-item label="申请人:" name="applicantName" label-width="120px" required>
8
 				<uni-forms-item label="申请人:" name="applicantName" label-width="120px" required>
9
-					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate.name"
9
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate"
10
 						placeholder="" />
10
 						placeholder="" />
11
 				</uni-forms-item>
11
 				</uni-forms-item>
12
 				<uni-forms-item label="被申请人:" name="respondentName" label-width="120px" required>
12
 				<uni-forms-item label="被申请人:" name="respondentName" label-width="120px" required>
13
-					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliateRes.name"
13
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliateRes"
14
 						placeholder="" />
14
 						placeholder="" />
15
 				</uni-forms-item>
15
 				</uni-forms-item>
16
 				<!-- <uni-forms-item label="案件标的:" name="caseSubjectAmount" label-width="120px" required>
16
 				<!-- <uni-forms-item label="案件标的:" name="caseSubjectAmount" label-width="120px" required>
63
 		data() {
63
 		data() {
64
 			return {
64
 			return {
65
 				formData: {},
65
 				formData: {},
66
-				affiliate:{},
67
-				affiliateRes:{},
66
+				affiliate:"",
67
+				affiliateRes:"",
68
 				selectFlag: false,
68
 				selectFlag: false,
69
 				rules: {},
69
 				rules: {},
70
 				payPlatforms: [{
70
 				payPlatforms: [{
101
 			getData(parms) {
101
 			getData(parms) {
102
 				selectById(parms).then(res => {
102
 				selectById(parms).then(res => {
103
 					this.formData = res.data
103
 					this.formData = res.data
104
-					res.data.affiliate.applicant.forEach((item,index) =>{
105
-						if(item.applicant!=null){
106
-						this.affiliate = {name:item.applicant.name}	
107
-						}
108
-						
109
-					})
104
+					this.affiliate = res.data.affiliate.applicant.map(item =>item.applicant.name).join(',')
105
+					this.affiliateRes = res.data.affiliate.res.map(item =>item.res.name).join(',')
110
 					res.data.affiliate.applicant.forEach((item,index) =>{
106
 					res.data.affiliate.applicant.forEach((item,index) =>{
111
 						if(item.res!=null){
107
 						if(item.res!=null){
112
 							this.affiliateRes = {name:item.res.name}
108
 							this.affiliateRes = {name:item.res.name}
113
-						}
114
-						
109
+						}						
115
 					})
110
 					})
116
 					if(this.dataType.type==4){
111
 					if(this.dataType.type==4){
117
 						this.formDataVal ={
112
 						this.formDataVal ={

+ 6
- 2
pages/handlecase/component/uploadEvidence.vue Näytä tiedosto

97
 									</uni-forms-item>
97
 									</uni-forms-item>
98
 									<uni-forms-item label="申请人:" name="applicantName" label-width="120px" required>
98
 									<uni-forms-item label="申请人:" name="applicantName" label-width="120px" required>
99
 										<uni-easyinput :inputBorder="false" :disabled='true'
99
 										<uni-easyinput :inputBorder="false" :disabled='true'
100
-											v-model="formData.affiliate.applicationName" placeholder="" />
100
+											v-model="affiliateApp" placeholder="" />
101
 									</uni-forms-item>
101
 									</uni-forms-item>
102
 									<uni-forms-item label="被申请人:" name="respondentName" label-width="120px" required>
102
 									<uni-forms-item label="被申请人:" name="respondentName" label-width="120px" required>
103
 										<uni-easyinput :inputBorder="false" :disabled='true'
103
 										<uni-easyinput :inputBorder="false" :disabled='true'
104
-											v-model="formData.affiliate.respondentName" placeholder="" />
104
+											v-model="affiliateRes" placeholder="" />
105
 									</uni-forms-item>
105
 									</uni-forms-item>
106
 									<!-- <uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
106
 									<!-- <uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
107
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
107
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
279
 				defaultSelected: [], //默认选中项
279
 				defaultSelected: [], //默认选中项
280
 				serviceList: ['1', '2'], //传递给子组件的数据
280
 				serviceList: ['1', '2'], //传递给子组件的数据
281
 				current: 0,
281
 				current: 0,
282
+				affiliateApp:"",
283
+				affiliateRes:"",
282
 				itemsT: ['案件详情', '案件资料'],
284
 				itemsT: ['案件详情', '案件资料'],
283
 				styleType: 'button',
285
 				styleType: 'button',
284
 				activeColor: '#007aff',
286
 				activeColor: '#007aff',
467
 						id: parms
469
 						id: parms
468
 					}).then(res => {
470
 					}).then(res => {
469
 						this.formData = res.data
471
 						this.formData = res.data
472
+						this.affiliateApp = res.data.affiliate.applicant.map(item =>item.applicant.name).join(',')
473
+						this.affiliateRes = res.data.affiliate.res.map(item =>item.res.name).join(',')
470
 						console.log(res, "KKKKKKKKKKKKKKKKKKKKK");
474
 						console.log(res, "KKKKKKKKKKKKKKKKKKKKK");
471
 					})
475
 					})
472
 				}
476
 				}