Sfoglia il codice sorgente

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

gaogaoyujie 2 anni fa
parent
commit
2bfee9568b

+ 1
- 1
App.vue Vedi File

10
 	export default {
10
 	export default {
11
 		globalData: {
11
 		globalData: {
12
 			// requestUrl: 'https://api.xayunmei.com/zhongcaiapi',
12
 			// requestUrl: 'https://api.xayunmei.com/zhongcaiapi',
13
-			requestUrl: 'http://121.40.189.20:9001',
13
+			requestUrl: 'http://121.40.189.20:8001',
14
 		},
14
 		},
15
 		onLaunch: function() {
15
 		onLaunch: function() {
16
 			this.initApp();
16
 			this.initApp();

+ 8
- 0
api/handlecase/index.js Vedi File

192
 		method: 'get',
192
 		method: 'get',
193
 		params: data
193
 		params: data
194
 	})
194
 	})
195
+}
196
+//删除上传按钮
197
+export function deleteFile(data) {
198
+	return request({
199
+		url: "/evidence/deleteFile",
200
+		method: "post",
201
+		data: data,
202
+	})
195
 }
203
 }

+ 1
- 1
config.js Vedi File

2
 module.exports = {
2
 module.exports = {
3
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
3
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
4
 	// baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
4
 	// baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
5
-	// baseUrl: 'http://121.40.189.20:9001',
5
+	// baseUrlZC: 'http://172.16.1.26:8001',
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',
8
 	// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',

+ 4
- 2
pages/handlecase/component/list.vue Vedi File

60
 			<button class="btnItem" type="primary" size="mini" @tap="chooseMethod">选择仲裁方式</button> -->
60
 			<button class="btnItem" type="primary" size="mini" @tap="chooseMethod">选择仲裁方式</button> -->
61
 		</view>
61
 		</view>
62
 		<view class="btn" v-if="sysType == 1">
62
 		<view class="btn" v-if="sysType == 1">
63
-			<button class="btnItem" type="primary" size="mini" @tap="caseCrossExamin">案件质证</button>
63
+			<button v-if="defalutVal.caseStatus==4" class="btnItem" type="primary" size="mini" @tap="caseCrossExamin">案件质证</button>
64
 		</view>
64
 		</view>
65
 	</view>
65
 	</view>
66
 </template>
66
 </template>
281
 				});
281
 				});
282
 			},
282
 			},
283
 		},
283
 		},
284
-		created() {}
284
+		created() {
285
+			console.log(this.defalutVal)
286
+		}
285
 	}
287
 	}
286
 </script>
288
 </script>
287
 
289
 

+ 24
- 7
pages/handlecase/component/uploadEvidence.vue Vedi File

56
 										<uni-easyinput :inputBorder="false" :disabled='true'
56
 										<uni-easyinput :inputBorder="false" :disabled='true'
57
 											v-model="formData.claimLiquidDamag" placeholder="" />
57
 											v-model="formData.claimLiquidDamag" placeholder="" />
58
 									</uni-forms-item>
58
 									</uni-forms-item>
59
-									<!-- <uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
59
+									<uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
60
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
60
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
61
 														:localdata="maintenancetypeArr" @change='uploadEvidenceChange'></uni-data-checkbox>
61
 														:localdata="maintenancetypeArr" @change='uploadEvidenceChange'></uni-data-checkbox>
62
-												</uni-forms-item> -->
62
+												</uni-forms-item>
63
 									<!-- <uni-forms-item label="是否需要开庭审理" label-width="120px" name="openCourtHear" required>
63
 									<!-- <uni-forms-item label="是否需要开庭审理" label-width="120px" name="openCourtHear" required>
64
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.openCourtHear"
64
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.openCourtHear"
65
 														:localdata="arbitrationmethodArr" @change='arbitrationmethod'></uni-data-checkbox>
65
 														:localdata="arbitrationmethodArr" @change='arbitrationmethod'></uni-data-checkbox>
77
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.adjudicaCounter"
77
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.adjudicaCounter"
78
 														:localdata="adjudicaCounterArr"></uni-data-checkbox>
78
 														:localdata="adjudicaCounterArr"></uni-data-checkbox>
79
 												</uni-forms-item> -->
79
 												</uni-forms-item> -->
80
-									<!-- <uni-forms-item label="上传证据" name="headImage" label-width="120px" v-if="caseFlag">
81
-													<uni-file-picker ref="files" :auto-upload="false" @select="select" :limit='1' />
82
-												</uni-forms-item> -->
80
+									<uni-forms-item label="上传证据" name="headImage" label-width="120px" v-if="caseFlag">
81
+													<uni-file-picker ref="files" :auto-upload="false" @select="select"   @delete="handleClose" :limit='1' />
82
+												</uni-forms-item>
83
 									<uni-forms-item label="是否书面审理" label-width="120px" name="respondentIsWrittenHear"
83
 									<uni-forms-item label="是否书面审理" label-width="120px" name="respondentIsWrittenHear"
84
 										required>
84
 										required>
85
 										<uni-data-checkbox class='checkbox' v-model="subnitForm.respondentIsWrittenHear"
85
 										<uni-data-checkbox class='checkbox' v-model="subnitForm.respondentIsWrittenHear"
259
 		arbitratorList,
259
 		arbitratorList,
260
 		evidenceCrossexami,
260
 		evidenceCrossexami,
261
 		selectById,
261
 		selectById,
262
-		updateBooking
262
+		updateBooking,
263
+		deleteFile
263
 	} from '../../../api/handlecase/index.js'
264
 	} from '../../../api/handlecase/index.js'
264
 	import {
265
 	import {
265
 		uploadImage
266
 		uploadImage
269
 	} from '@/utils/auth'
270
 	} from '@/utils/auth'
270
 	import moment from 'moment'
271
 	import moment from 'moment'
271
 	import config from '@/config'
272
 	import config from '@/config'
273
+import constant from '../../../utils/constant.js'
272
 	const baseUrl = config.baseUrlZC
274
 	const baseUrl = config.baseUrlZC
273
 	const app = getApp()
275
 	const app = getApp()
274
 	export default {
276
 	export default {
395
 					this.subnitForm.adjudicaCounterReason = this.reasontFormData.reasont
397
 					this.subnitForm.adjudicaCounterReason = this.reasontFormData.reasont
396
 					this.$refs.popup.close()
398
 					this.$refs.popup.close()
397
 					this.reasontFormData.reasont = ''
399
 					this.reasontFormData.reasont = ''
400
+					
398
 				} else {
401
 				} else {
399
 					this.$modal.msgError("请输入反意理由")
402
 					this.$modal.msgError("请输入反意理由")
400
 				}
403
 				}
477
 			},
480
 			},
478
 			// 文件上传
481
 			// 文件上传
479
 			select(e) {
482
 			select(e) {
483
+				console.log(e)
480
 				this.tempFilePaths = e.tempFilePaths;
484
 				this.tempFilePaths = e.tempFilePaths;
481
 				// loading
485
 				// loading
482
 				uni.showLoading({
486
 				uni.showLoading({
514
 					}
518
 					}
515
 				})
519
 				})
516
 			},
520
 			},
521
+			// 上传删除
522
+			handleClose(filelds){
523
+				console.log("关闭",filelds)
524
+				deleteFile({fileIds:[filelds.tempFile.uuid]}).then(res=>{
525
+					console.log(res)
526
+				})
527
+				
528
+			},
517
 			// 获取仲裁员列表
529
 			// 获取仲裁员列表
518
 			getArbitratorList(val) {
530
 			getArbitratorList(val) {
519
 				arbitratorList({caseAppliId: val}).then(res => {
531
 				arbitratorList({caseAppliId: val}).then(res => {
555
 				}
567
 				}
556
 				if (this.sysType == 1) {
568
 				if (this.sysType == 1) {
557
 					this.$refs.form.validate().then(res => {
569
 					this.$refs.form.validate().then(res => {
570
+						console.log(this.subnitForm)
558
 						this.evidenceCrossexamiFn(this.subnitForm)
571
 						this.evidenceCrossexamiFn(this.subnitForm)
559
 					}).catch(err => {
572
 					}).catch(err => {
560
 						console.log('表单错误信息:', err);
573
 						console.log('表单错误信息:', err);
596
 		onLoad(data) {
609
 		onLoad(data) {
597
 			this.sysType = uni.getStorageSync('sysType')
610
 			this.sysType = uni.getStorageSync('sysType')
598
 			this.getData(data.id);
611
 			this.getData(data.id);
612
+			console.log(this.subnitForm)
599
 			this.subnitForm.caseId = Number(data.id);
613
 			this.subnitForm.caseId = Number(data.id);
600
-			this.getArbitratorList(data.id)
614
+			if(this.sysType==2){
615
+				this.getArbitratorList(data.id)
616
+			}
617
+			
601
 		}
618
 		}
602
 
619
 
603
 	}
620
 	}

+ 1
- 1
pages/handlecase/index.vue Vedi File

76
 									item.caseStatusName = '待确认是否应诉'
76
 									item.caseStatusName = '待确认是否应诉'
77
 									break;
77
 									break;
78
 								case 4:
78
 								case 4:
79
-									item.caseStatusName = '待确认证据'
79
+									item.caseStatusName = '待案件质证'
80
 									break;
80
 									break;
81
 								case 5:
81
 								case 5:
82
 									item.caseStatusName = '待确定是否指派仲裁员'
82
 									item.caseStatusName = '待确定是否指派仲裁员'