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

App.vue

@@ -10,7 +10,7 @@
 	export default {
 		globalData: {
 			// requestUrl: 'https://api.xayunmei.com/zhongcaiapi',
-			requestUrl: 'http://121.40.189.20:9001',
+			requestUrl: 'http://121.40.189.20:8001',
 		},
 		onLaunch: function() {
 			this.initApp();

api/handlecase/index.js

@@ -192,4 +192,12 @@ export function idType(data) {
 		method: 'get',
 		params: data
 	})
+}
+//删除上传按钮
+export function deleteFile(data) {
+	return request({
+		url: "/evidence/deleteFile",
+		method: "post",
+		data: data,
+	})
 }

config.js

@@ -2,7 +2,7 @@
 module.exports = {
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
 	// baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
-	// baseUrl: 'http://121.40.189.20:9001',
+	// baseUrlZC: 'http://172.16.1.26:8001',
 	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
 	// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',

pages/handlecase/component/list.vue

@@ -60,7 +60,7 @@
 			<button class="btnItem" type="primary" size="mini" @tap="chooseMethod">选择仲裁方式</button> -->
 		</view>
 		<view class="btn" v-if="sysType == 1">
-			<button class="btnItem" type="primary" size="mini" @tap="caseCrossExamin">案件质证</button>
+			<button v-if="defalutVal.caseStatus==4" class="btnItem" type="primary" size="mini" @tap="caseCrossExamin">案件质证</button>
 		</view>
 	</view>
 </template>
@@ -281,7 +281,9 @@
 				});
 			},
 		},
-		created() {}
+		created() {
+			console.log(this.defalutVal)
+		}
 	}
 </script>
 

pages/handlecase/component/uploadEvidence.vue

@@ -56,10 +56,10 @@
 										<uni-easyinput :inputBorder="false" :disabled='true'
 											v-model="formData.claimLiquidDamag" placeholder="" />
 									</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"
 														:localdata="maintenancetypeArr" @change='uploadEvidenceChange'></uni-data-checkbox>
-												</uni-forms-item> -->
+												</uni-forms-item>
 									<!-- <uni-forms-item label="是否需要开庭审理" label-width="120px" name="openCourtHear" required>
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.openCourtHear"
 														:localdata="arbitrationmethodArr" @change='arbitrationmethod'></uni-data-checkbox>
@@ -77,9 +77,9 @@
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.adjudicaCounter"
 														:localdata="adjudicaCounterArr"></uni-data-checkbox>
 												</uni-forms-item> -->
-									<!-- <uni-forms-item label="上传证据" name="headImage" label-width="120px" v-if="caseFlag">
+									<uni-forms-item label="上传证据" name="headImage" label-width="120px" v-if="caseFlag">
-													<uni-file-picker ref="files" :auto-upload="false" @select="select" :limit='1' />
+													<uni-file-picker ref="files" :auto-upload="false" @select="select"   @delete="handleClose" :limit='1' />
-												</uni-forms-item> -->
+												</uni-forms-item>
 									<uni-forms-item label="是否书面审理" label-width="120px" name="respondentIsWrittenHear"
 										required>
 										<uni-data-checkbox class='checkbox' v-model="subnitForm.respondentIsWrittenHear"
@@ -259,7 +259,8 @@
 		arbitratorList,
 		evidenceCrossexami,
 		selectById,
-		updateBooking
+		updateBooking,
+		deleteFile
 	} from '../../../api/handlecase/index.js'
 	import {
 		uploadImage
@@ -269,6 +270,7 @@
 	} from '@/utils/auth'
 	import moment from 'moment'
 	import config from '@/config'
+import constant from '../../../utils/constant.js'
 	const baseUrl = config.baseUrlZC
 	const app = getApp()
 	export default {
@@ -395,6 +397,7 @@
 					this.subnitForm.adjudicaCounterReason = this.reasontFormData.reasont
 					this.$refs.popup.close()
 					this.reasontFormData.reasont = ''
+					
 				} else {
 					this.$modal.msgError("请输入反意理由")
 				}
@@ -477,6 +480,7 @@
 			},
 			// 文件上传
 			select(e) {
+				console.log(e)
 				this.tempFilePaths = e.tempFilePaths;
 				// loading
 				uni.showLoading({
@@ -514,6 +518,14 @@
 					}
 				})
 			},
+			// 上传删除
+			handleClose(filelds){
+				console.log("关闭",filelds)
+				deleteFile({fileIds:[filelds.tempFile.uuid]}).then(res=>{
+					console.log(res)
+				})
+				
+			},
 			// 获取仲裁员列表
 			getArbitratorList(val) {
 				arbitratorList({caseAppliId: val}).then(res => {
@@ -555,6 +567,7 @@
 				}
 				if (this.sysType == 1) {
 					this.$refs.form.validate().then(res => {
+						console.log(this.subnitForm)
 						this.evidenceCrossexamiFn(this.subnitForm)
 					}).catch(err => {
 						console.log('表单错误信息：', err);
@@ -596,8 +609,12 @@
 		onLoad(data) {
 			this.sysType = uni.getStorageSync('sysType')
 			this.getData(data.id);
+			console.log(this.subnitForm)
 			this.subnitForm.caseId = Number(data.id);
-			this.getArbitratorList(data.id)
+			if(this.sysType==2){
+				this.getArbitratorList(data.id)
+			}
+			
 		}
 
 	}

pages/handlecase/index.vue

@@ -76,7 +76,7 @@
 									item.caseStatusName = '待确认是否应诉'
 									break;
 								case 4:
-									item.caseStatusName = '待确认证据'
+									item.caseStatusName = '待案件质证'
 									break;
 								case 5:
 									item.caseStatusName = '待确定是否指派仲裁员'