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: 'https://api.xayunmei.com/zhongcaiapitest',
 		},
 		onLaunch: function() {
 			this.initApp();

api/handlecase/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询被申请人案件列表
 export function respondentList(data) {
 	return request({
-		'url': '/evidence/all',
+		'url': '/caseApplication/list',
 		method: 'get',
 		params: data
 	})
@@ -185,3 +185,27 @@ export function msCaseSign(data) {
 		data: data,
 	})
 }
+//证件类型
+export function idType(data) {
+	return request({
+		url: '/system/dict/data/type/id_type',
+		method: 'get',
+		params: data
+	})
+}
+//删除上传按钮
+export function deleteFile(data) {
+	return request({
+		url: "/evidence/deleteFile",
+		method: "post",
+		data: data,
+	})
+}
+// 仲裁案件详情
+export function selectCaseApplication(data) {
+	return request({
+		url: "/caseApplication/selectCaseApplication",
+		method: "post",
+		data: data,
+	})
+}

api/login.js

@@ -94,3 +94,11 @@ export function wxregister(data) {
 		data: data
 	})
 }
+// 获取证件类型
+export function idType(data){
+	return request({
+		url: '/system/dict/data/type/id_type',
+		method: 'get',
+		params: data
+	})
+}

config.js

@@ -2,11 +2,11 @@
 module.exports = {
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
 	// baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
-	// baseUrl: 'http://121.40.189.20:9001',
-	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
-	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
-	baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',
-	// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
+	// 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',
+	baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
 	// baseUrlZC: 'http://121.40.189.20:8001',	
 	// baseUrlTJ: 'http://172.16.1.43:6001',
 	// baseUrl: 'http://172.16.1.24:8001',

manifest.json

@@ -49,7 +49,9 @@
 			"postcss": true
 		},
 		"optimization": {
+			"subPackages": {
 				"subPackages": true
+			}
 		},
 		"usingComponents": true,
 		"permission": {}

pages.json

@@ -1,4 +1,5 @@
 {
+	"lazyCodeLoading":"requiredComponents",
 	"pages": [{
 			"path": "pages/switchSystem",
 			"style": {
@@ -98,6 +99,12 @@
 				"navigationBarTitleText": "案件信息"
 			}
 		},
+		{
+			"path": "pages/handlecase/component/caseDetails",
+			"style": {
+				"navigationBarTitleText": "案件详情"
+			}
+		},
 		{
 			"path": "pages/handlecase/component/confirmPayment",
 			"style": {
@@ -255,4 +262,5 @@
 		"navigationBarTitleText": "RuoYi",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
+	
 }

pages/handlecase/component/caseDetails.vue

@@ -0,0 +1,385 @@
+<template>
+	<view class="">
+		<uni-section title="  ">
+			<!-- 选项卡 -->
+			<view>
+				<uni-segmented-control :current="current" :values="itemsT" :style-type="styleType"
+					:active-color="activeColor" @clickItem="onClickItem" />
+			</view>
+			<view class="" v-show="current === 0">
+				<view class="conent">
+					<view class="assignrbitrators">
+						<uni-forms ref="form" :modelValue="formData" :rules="rules">
+							<uni-section title="案件信息" type="line" padding></uni-section>
+							<uni-forms-item label="案件名称:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.caseName" placeholder="请输入案件名称"/>
+							</uni-forms-item>
+							<uni-forms-item label="案件标的:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.caseSubjectAmount" placeholder="请输入案件标的"/>
+							</uni-forms-item>
+							<uni-forms-item label="借款开始日期" label-width="100px">
+								<uni-datetime-picker :disabled='true' v-model="formData.loanStartDate" 
+									type="date" :clear-icon="false" />
+							</uni-forms-item>
+							<uni-forms-item label="借款结束日期" label-width="100px">
+								<uni-datetime-picker :disabled='true' v-model="formData.loanEndDate"
+									type="date" :clear-icon="false" />
+							</uni-forms-item>
+							<uni-forms-item label="合同编号:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.contractNumber" placeholder="请输入"/>
+							</uni-forms-item>
+							<uni-forms-item label="申请人主张欠本金:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.claimPrinciOwed" placeholder="请输入"/>
+							</uni-forms-item>
+							<uni-forms-item label="申请人主张欠利息:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.claimInterestOwed" placeholder="请输入"/>
+							</uni-forms-item>
+							<uni-forms-item label="申请人主张违约金:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.claimLiquidDamag" placeholder="请输入"/>
+							</uni-forms-item>
+							<uni-forms-item label="申请人请求仲裁庭裁决:" label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.requestRule" type="textarea" placeholder="请输入申请人请求仲裁庭裁决" :maxlength='3000' />
+							</uni-forms-item>
+							<uni-forms-item label="申请人仲裁请求:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.arbitratClaims" type="textarea" placeholder="请输入申请人仲裁请求" :maxlength='3000' />
+							</uni-forms-item>
+							<uni-forms-item label="事实和理由:" name="arbitratClaims" label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.arbitratClaims" type="textarea" placeholder="请输入事实和理由" :maxlength='3000' />
+							</uni-forms-item>
+							<uni-forms-item label="是否财产保全申请" label-width="100px">
+								<uni-data-checkbox :disabled='true' v-model="formData.properPreser"
+									:localdata="isPropertyPreservation"></uni-data-checkbox>
+							</uni-forms-item>
+							<uni-forms-item label="是否书面审理" label-width="100px">
+								<uni-data-checkbox :disabled='true' v-model="formData.applicantIsWrittenHear"
+									:localdata="isAdjudicate"></uni-data-checkbox>
+							</uni-forms-item>
+							<uni-forms-item label="裁决书模板" label-width="100px">
+								<uni-data-select :disabled='true' v-model="formData.templateId"
+									:localdata="rulingTemplate"></uni-data-select>
+							</uni-forms-item>
+							<uni-section title="申请人的主体信息" type="line" padding></uni-section>
+							<!-- 申请人信息 -->
+							<view class="" v-for="(item,index) in formData.affiliate.applicant">
+								<uni-forms-item label="选择机构或自然人" label-width="100px">
+									<uni-data-checkbox :disabled='true' v-model="item.applicant.organizeFlag" class='checkbox' :localdata="objectiJurisArr"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="是否操作人" label-width="100px">
+									<uni-data-checkbox :disabled='true'  v-model="item.applicant.operatorFlag"
+										:localdata="isProxyApplicant"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item :label="item.applicant.organizeFlag==0 ? '申请人':'申请机构'"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.name" placeholder="请输入"/>
+								</uni-forms-item>
+								<uni-forms-item label="证件类型" label-width="100px" v-if="item.applicant.organizeFlag==0">
+									<uni-data-select :disabled='true' v-model="item.applicant.idType" :localdata="certificate"></uni-data-select>
+								</uni-forms-item>
+								<uni-forms-item label="国籍" label-width="100px">
+									<uni-data-select :disabled='true' v-model="item.applicant.nationality"
+										:localdata="nationality"></uni-data-select>
+								</uni-forms-item>
+								<uni-forms-item label="统一社会信用代码:"  v-if="item.applicant.organizeFlag==1"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.code" placeholder="请输入代码"/>
+								</uni-forms-item>
+								<uni-forms-item label="身份证号码:"  v-if="item.applicant.organizeFlag==0" label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.idCard" placeholder="请输入身份证号码"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系电话:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.phone" placeholder="请输入联系电话"/>
+								</uni-forms-item>
+								<uni-forms-item label="邮箱:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.email" placeholder="请输入邮箱"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系地址:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.address" placeholder="请输入联系地址"/>
+								</uni-forms-item>
+								<uni-forms-item label="申请人住所:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.home" placeholder="请输入申请人住所"/>
+								</uni-forms-item>
+								<uni-forms-item label="法人代表:"  v-if="item.applicant.organizeFlag==1" label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.compLegalPerson" placeholder="请输入法人代表"/>
+								</uni-forms-item>
+								<uni-forms-item label="申请人性别"  v-if="item.applicant.organizeFlag==0" label-width="100px" required>
+									<uni-data-checkbox class='checkbox'v-model="item.applicant.sex"
+										:localdata="respondentSexy"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="出生年月日"  v-if="item.applicant.organizeFlag==0" label-width="100px">
+									<uni-datetime-picker :disabled='true' v-model="item.applicant.birth" type="date" :clear-icon="false" />
+								</uni-forms-item>
+								<uni-section title="代理人信息" type="line" padding></uni-section>
+								<uni-forms-item label="是否操作人" label-width="100px">
+									<uni-data-checkbox :disabled='true'  v-model="item.applicantAgent.operatorFlag"
+										:localdata="isProxyApplicant"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="姓名:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicantAgent.name" placeholder="请输入姓名"/>
+								</uni-forms-item>
+								<uni-forms-item label="邮箱:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicantAgent.email" placeholder="请输入邮箱"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系电话:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicantAgent.phone" placeholder="请输入联系电话"/>
+								</uni-forms-item>
+							</view>
+							<!-- 被申请人信息 -->
+							<uni-section title="被申请人主题信息" type="line" padding></uni-section>
+							<view class="" v-for="(item,index) in formData.affiliate.res">
+								<uni-forms-item label="选择机构或自然人" label-width="100px">
+									<uni-data-checkbox :disabled='true' v-model="item.res.organizeFlag" class='checkbox' :localdata="objectiJurisArr"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="是否操作人" label-width="100px">
+									<uni-data-checkbox :disabled='true' v-model="item.res.operatorFlag"
+										:localdata="isProxyApplicant"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item :label="item.res.organizeFlag==0 ? '被申请人':'申请机构'"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.name" placeholder="请输入姓名"/>
+								</uni-forms-item>
+								<uni-forms-item label="证件类型"  v-if="item.res.organizeFlag==0" label-width="100px" required>
+									<uni-data-select :disabled='true' v-model="item.res.idType" :localdata="certificate"></uni-data-select>
+								</uni-forms-item>
+								<uni-forms-item label="国籍" label-width="100px" required>
+									<uni-data-select :disabled='true' v-model="item.res.nationality"
+										:localdata="nationality"></uni-data-select>
+								</uni-forms-item>
+								<uni-forms-item label="身份证号:" v-if="item.res.organizeFlag==0" label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.idCard" placeholder="请输入身份证号"/>
+								</uni-forms-item>
+								<uni-forms-item label="统一社会信用代码:" v-if="item.res.organizeFlag==1" label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.code" placeholder="请输入统一社会信用代码"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系电话:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.phone" placeholder="请输入联系电话"/>
+								</uni-forms-item>
+								<uni-forms-item label="邮箱:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.email" placeholder="请输入邮箱"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系地址:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.address" placeholder="请输入联系地址"/>
+								</uni-forms-item>
+								<uni-forms-item label="被申请人住所:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.home" placeholder="请输入被申请人住所"/>
+								</uni-forms-item>
+								<uni-forms-item label="被申请人性别"label-width="100px" required v-if="item.res.organizeFlag==0">
+									<uni-data-checkbox :disabled='true' class='checkbox'v-model="item.res.sex"
+										:localdata="respondentSexy"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="出生年月日" label-width="100px" v-if="item.res.organizeFlag==0">
+									<uni-datetime-picker :disabled='true' v-model="item.res.birth" type="date" :clear-icon="false" />
+								</uni-forms-item>
+								<uni-section title="代理信息" type="line" padding></uni-section>
+								<uni-forms-item label="是否操作人" label-width="100px">
+									<uni-data-checkbox  v-model="item.resAgent.operatorFlag"
+										:localdata="isProxyApplicant"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="姓名:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.resAgent.name" placeholder="请输入姓名"/>
+								</uni-forms-item>
+								<uni-forms-item label="邮箱:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.resAgent.email" placeholder="请输入邮箱"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系电话:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.resAgent.phone" placeholder="请输入联系电话"/>
+								</uni-forms-item>
+							</view>	
+						</uni-forms>
+					</view>
+				</view>
+			</view>
+			<view class="" v-show="current === 1">
+				<view class="" style="margin-top: 50rpx;">
+					<view>申请人</view>
+					<view v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==2" :href="item.annexPath" color="#007BFF"
+							:text="item.fileName"></uni-link>
+					</view>
+					<view>被申请人</view>
+					<view v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==6" :href="item.annexPath" color="#007BFF"
+							:text="item.fileName"></uni-link>
+					</view>
+				</view>
+				<view class="" style="margin-top: 40rpx;">
+					<view>仲裁申请书</view>
+					<view v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==1" :href="item.annexPath" color="#007BFF"
+							:text="item.fileName"></uni-link>
+					</view>
+				</view>
+			</view>
+		</uni-section>
+		
+	</view>
+	
+</template>
+
+<script>
+	import {getTemplate,idType,selectCaseApplication} from '../../../api/handlecase/index.js'
+	import config from '@/config'
+	const baseUrl = config.baseUrlZC
+	export default {
+		data(){
+			return{
+				formData:{
+					affiliate:[
+						
+					]
+				},
+				rules: {},
+				caseDetailId:null,
+				current: 0,
+				itemsT: ['案件详情', '案件资料'],
+				activeColor: '#007aff',
+				styleType: 'button',
+				isPropertyPreservation: [{
+						value: 1,
+						text: "是"
+					},
+					{
+						value: 0,
+						text: "否"
+					},
+				],
+				isAdjudicate: [{
+						value: 1,
+						text: "是"
+					},
+					{
+						value: 0,
+						text: "否"
+					},
+				],
+				objectiJurisArr: [{
+					text: '自然人',
+					value: 0
+				}, {
+					text: '机构',
+					value: 1
+				}],
+				isProxyApplicant: [{
+						value: 1,
+						text: "是"
+					},
+					{
+						value: 0,
+						text: "否"
+					},
+				],
+				respondentSexy: [{
+					text: '女',
+					value: 1
+				}, {
+					text: '男',
+					value: 0
+				}],
+				rulingTemplate:[],
+				certificate: [],
+				nationality: [{
+						value: 0,
+						text: "境内"
+					},
+					{
+						value: 1,
+						text: "境外"
+					},
+				],
+			}
+		},
+		methods:{
+			/** 获取裁决书模板 */
+			getTemplateFn(data) {
+				getTemplate(data).then((res) => {
+					console.log(res)
+					res.rows.forEach(item => {
+						this.rulingTemplate.push({
+							value: item.id,
+							text: item.temName
+						})
+					})
+				});
+			},
+			// 获取证件类型
+			getIdType() {
+				idType().then(res => {
+					console.log(res)
+					res.data.forEach(item => {
+						this.certificate.push({
+							value: item.dictSort,
+							text: item.dictLabel
+						})
+					})
+				})
+			},
+			onClickItem(e) {
+				if (this.current !== e.currentIndex) {
+					this.current = e.currentIndex
+				}
+			},
+			// 获取案件详情
+			getSelectCaseApplication(ids){
+				selectCaseApplication({id:ids}).then(res=>{
+					console.log(res.data.affiliate.applicant)
+					let data = res.data
+					if (data.affiliate.applicant.length == 0) {
+						data.affiliate.applicant.push({
+							applicant: {},
+							applicantAgent: {}
+						})
+					} else {
+						data.affiliate.applicant.forEach((item, index) => {
+							if (!item.applicant) {
+								item.applicant = {}
+							} else {
+								data.affiliate.applicant[index].applicant.sex = Number(data.affiliate.applicant[index].applicant
+									.sex)
+							}
+							if (!item.applicantAgent) {
+								item.applicantAgent = {}
+							}
+						})
+					}
+					if (data.affiliate.res.length == 0) {
+						data.affiliate.res.push({
+							res: {},
+							resAgent: {}
+						})
+					} else {
+						data.affiliate.res.forEach((item, index) => {
+							if (!item.res) {
+								item.res = {}
+							} else {
+								data.affiliate.res[index].res.sex = Number(data.affiliate.res[index].res
+									.sex)
+							}
+							if (!item.resAgent) {
+								item.resAgent = {}
+							}
+						})
+					}
+					this.formData = data
+					if (res.data.caseAttachList.length > 0) {
+						res.data.caseAttachList.forEach(item => {
+							let names = item.annexPath.split('_')
+							item['fileName'] = names[names.length - 1]
+							item.annexPath = baseUrl + item.annexPath
+						})
+					}
+				})
+			}
+		},
+		onLoad(data){
+			this.getTemplateFn()
+			this.getIdType()
+			this.getSelectCaseApplication(data.id)
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #ffffff;
+	}
+	.assignrbitrators {
+		margin: 30rpx;
+	}
+	
+</style>

pages/handlecase/component/confirmPayment.vue

@@ -18,7 +18,7 @@
 					</view>
 				</uni-forms-item>
 				<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"
 							:text="item.annexName"></uni-link>
 					</view>
@@ -132,7 +132,10 @@
 					this.formData.caseAttachList.forEach(res => {
 						if (res.annexType == 4) {
 							this.annexTypeS = true
-						} else if (res.annexType == 9) {
+						}
+					})
+					this.formData.resCaseAttachList.forEach(res => {
+						if (res.annexType == 9) {
 							this.annexTypeB = true
 						}
 					})

pages/handlecase/component/list.vue

@@ -20,23 +20,27 @@
 			<view class="lable">
 				申请人：
 			</view>
-			<view class="main">
+			<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">
 				案件状态：
 			</view>
-			<view class="main">
+			<view class="main" v-if="defalutVal.caseStatusName">
 				{{defalutVal.caseStatusName}}
 			</view>
 		</view>
@@ -49,14 +53,15 @@
 			<button class="btnItem" type="primary" size="mini" @tap="caseDetail">选择调解员</button> -->
 			<button class="btnItem" type="primary" @tap="clickType(item.id)" size="mini" v-for="(item) in buttonList"
 				:key="item.id"
-				v-if="item.id == defalutVal.caseFlowId && checkPermi([item.buttonAuthFlag])">{{ item.nodeName }}</button>
+				v-if="item.id == defalutVal.caseFlowId && checkPermi([item.buttonAuthFlag])&& (defalutVal.appOperatorFlag == 1 || defalutVal.resOperatorFlag == 1 || defalutVal.otherFlag == 1 || defalutVal.agentFlag == 1 || defalutVal.mediatorFlag == 1)">{{ item.nodeName }}</button>
 			<!-- <button class="btnItem" type="primary" size="mini" @tap="confirmationEvidence">确认证据</button>
 			<button class="btnItem" type="primary" size="mini" @tap="isAssignrbitrators">是否指派仲裁员</button>
 			<button class="btnItem" type="primary" size="mini" @tap="isAssignrbitrators">是否指派仲裁员</button>
 			<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 type="primary" class="btnItem" size="mini" @tap="caseDetails">案件详情</button>
+			<button v-if="defalutVal.caseStatus==4 && checkPermi(['caseManagement:list:examin'])" class="btnItem" type="primary" size="mini" @tap="caseCrossExamin">案件质证</button>
 		</view>
 	</view>
 </template>
@@ -148,6 +153,12 @@
 					url: `/pages/handlecase/component/uploadEvidence?id=${this.defalutVal.id}`
 				})
 			},
+			// 仲裁案件详情
+			caseDetails(){
+				uni.navigateTo({
+					url:`/pages/handlecase/component/caseDetails?id=${this.defalutVal.id}`
+				})
+			},
 			// 缴费
 			clickPay(type) {
 				uni.navigateTo({
@@ -277,7 +288,9 @@
 				});
 			},
 		},
-		created() {}
+		created() {
+			console.log(this.defalutVal)
+		}
 	}
 </script>
 
@@ -321,4 +334,11 @@
 			}
 		}
 	}
+
+	.textHidden {
+		width: 300rpx;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
 </style>

pages/handlecase/component/payList.vue

@@ -6,11 +6,11 @@
 					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseNum" placeholder="" />
 				</uni-forms-item>
 				<uni-forms-item label="申请人：" name="applicantName" label-width="120px" required>
-					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate.applicationName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate"
 						placeholder="" />
 				</uni-forms-item>
 				<uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required>
-					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate.respondentName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliateRes"
 						placeholder="" />
 				</uni-forms-item>
 				<!-- <uni-forms-item label="案件标的：" name="caseSubjectAmount" label-width="120px" required>
@@ -63,7 +63,8 @@
 		data() {
 			return {
 				formData: {},
-				affiliate:{},
+				affiliate:"",
+				affiliateRes:"",
 				selectFlag: false,
 				rules: {},
 				payPlatforms: [{
@@ -100,8 +101,13 @@
 			getData(parms) {
 				selectById(parms).then(res => {
 					this.formData = res.data
-					this.affiliate = res.data.affiliate
-					console.log(this.formData)
+					this.affiliate = res.data.affiliate.applicant.map(item =>item.applicant.name).join(',')
+					this.affiliateRes = res.data.affiliate.res.map(item =>item.res.name).join(',')
+					res.data.affiliate.applicant.forEach((item,index) =>{
+						if(item.res!=null){
+							this.affiliateRes = {name:item.res.name}
+						}						
+					})
 					if(this.dataType.type==4){
 						this.formDataVal ={
 							annexType: 4,
@@ -160,7 +166,6 @@
 							annexId: data.annexId,
 							annexName: data.fileName
 						});
-						// console.log(this.submitForm, "OOOOOOOOOOOOOOOOOOOOOOOOO");
 						uni.showToast({
 							title: '上传成功',
 							icon: 'none',

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-file-picker ref="files" :auto-upload="false" @select="select" :limit='1' />
-												</uni-forms-item> -->
+									<uni-forms-item label="上传证据" name="headImage" label-width="120px" v-if="caseFlag">
+													<uni-file-picker ref="files" :auto-upload="false" @select="select"   @delete="handleClose" :limit='1' />
+												</uni-forms-item>
 									<uni-forms-item label="是否书面审理" label-width="120px" name="respondentIsWrittenHear"
 										required>
 										<uni-data-checkbox class='checkbox' v-model="subnitForm.respondentIsWrittenHear"
@@ -97,11 +97,11 @@
 									</uni-forms-item>
 									<uni-forms-item label="申请人：" name="applicantName" label-width="120px" required>
 										<uni-easyinput :inputBorder="false" :disabled='true'
-											v-model="formData.affiliate.applicationName" placeholder="" />
+											v-model="affiliateApp" placeholder="" />
 									</uni-forms-item>
 									<uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required>
 										<uni-easyinput :inputBorder="false" :disabled='true'
-											v-model="formData.affiliate.respondentName" placeholder="" />
+											v-model="affiliateRes" placeholder="" />
 									</uni-forms-item>
 									<!-- <uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
@@ -207,19 +207,19 @@
 				<view class="" v-if="sysType == 1">
 					<view class="" style="margin-top: 50rpx;">
 						<view>申请人</view>
-						<view v-for="item in formData.evidenceMaterialList">
+						<view v-for="item in formData.caseAttachList">
 							<uni-link v-if="item.annexType==2" :href="item.annexPath" color="#007BFF"
 								:text="item.fileName"></uni-link>
 						</view>
 						<view>被申请人</view>
-						<view v-for="item in formData.evidenceMaterialList">
+						<view v-for="item in formData.caseAttachList">
 							<uni-link v-if="item.annexType==6" :href="item.annexPath" color="#007BFF"
 								:text="item.fileName"></uni-link>
 						</view>
 					</view>
 					<view class="" style="margin-top: 40rpx;">
 						<view>仲裁申请书</view>
-						<view v-for="item in formData.evidenceMaterialList">
+						<view v-for="item in formData.caseAttachList">
 							<uni-link v-if="item.annexType==1" :href="item.annexPath" color="#007BFF"
 								:text="item.fileName"></uni-link>
 						</view>
@@ -259,7 +259,9 @@
 		arbitratorList,
 		evidenceCrossexami,
 		selectById,
-		updateBooking
+		updateBooking,
+		deleteFile,
+		selectCaseApplication
 	} from '../../../api/handlecase/index.js'
 	import {
 		uploadImage
@@ -269,6 +271,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 {
@@ -279,6 +282,8 @@
 				defaultSelected: [], //默认选中项
 				serviceList: ['1', '2'], //传递给子组件的数据
 				current: 0,
+				affiliateApp:"",
+				affiliateRes:"",
 				itemsT: ['案件详情', '案件资料'],
 				styleType: 'button',
 				activeColor: '#007aff',
@@ -393,6 +398,7 @@
 					this.subnitForm.adjudicaCounterReason = this.reasontFormData.reasont
 					this.$refs.popup.close()
 					this.reasontFormData.reasont = ''
+					
 				} else {
 					this.$modal.msgError("请输入反意理由")
 				}
@@ -447,32 +453,38 @@
 			},
 			getData(parms) {
 				if (this.sysType == 1) {
-					respondentDetail(parms).then(res => {
-						if (res.data.evidenceMaterialList.length > 0) {
-							res.data.evidenceMaterialList.forEach(item => {
-								let names = item.annexPath.split('_')
-								item['fileName'] = names[names.length - 1]
-								item.annexPath = baseUrl + item.annexPath
-							})
-						}
+					
+					selectCaseApplication({id:parms}).then(res => {
+						console.log(res)
 						this.formData = res.data
 						this.formData.loanEndDate = moment(this.formData.loanEndDate).format(
 							'YYYY-MM-DD HH:mm:ss');
 						this.formData.loanStartDate = moment(this.formData.loanStartDate).format(
 							'YYYY-MM-DD HH:mm:ss');
 						this.formData.id = this.formData.id + ''
+						if (res.data.caseAttachList.length > 0) {
+							res.data.caseAttachList.forEach(item => {
+								let names = item.annexPath.split('_')
+								item['fileName'] = names[names.length - 1]
+								item.annexPath = baseUrl + item.annexPath
+							})
+						}
+						
 					})
 				} else if (this.sysType == 2) {
 					selectById({
 						id: parms
 					}).then(res => {
 						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");
 					})
 				}
 			},
 			// 文件上传
 			select(e) {
+				console.log(e)
 				this.tempFilePaths = e.tempFilePaths;
 				// loading
 				uni.showLoading({
@@ -510,6 +522,14 @@
 					}
 				})
 			},
+			// 上传删除
+			handleClose(filelds){
+				console.log("关闭",filelds)
+				deleteFile({fileIds:[filelds.tempFile.uuid]}).then(res=>{
+					console.log(res)
+				})
+				
+			},
 			// 获取仲裁员列表
 			getArbitratorList(val) {
 				arbitratorList({caseAppliId: val}).then(res => {
@@ -551,6 +571,7 @@
 				}
 				if (this.sysType == 1) {
 					this.$refs.form.validate().then(res => {
+						console.log(this.subnitForm)
 						this.evidenceCrossexamiFn(this.subnitForm)
 					}).catch(err => {
 						console.log('表单错误信息：', err);
@@ -585,18 +606,22 @@
 			evidenceList() {
 				console.log(this.formData.evidenceMaterialList)
 				this.$tab.navigateTo(
-					`/pages/handlecase/component/evidenceList?title=证据清单&evidenceList=${encodeURIComponent(JSON.stringify(this.formData.evidenceMaterialList))}`
+					`/pages/handlecase/component/evidenceList?title=证据清单&evidenceList=${encodeURIComponent(JSON.stringify(this.formData.caseAttachList))}`
 				)
 			},
 		},
 		onLoad(data) {
 			this.sysType = uni.getStorageSync('sysType')
 			this.getData(data.id);
+			console.log(this.subnitForm)
 			this.subnitForm.caseId = Number(data.id);
+			if(this.sysType==2){
 				this.getArbitratorList(data.id)
 			}
 			
 		}
+
+	}
 </script>
 
 <style lang="scss">

pages/handlecase/index.vue

@@ -29,7 +29,7 @@
 			return {
 				caseList: [],
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 50,
 				sysType: null,
 				total: null,
 				buttonList: []
@@ -55,67 +55,14 @@
 				if (this.sysType == 1) {
 					respondentList(parms).then(res => {
 						// this.caseList = res.rows;
-						if (res.data) {
-							this.caseList = [...this.caseList, ...res.data];
+						if (res.rows) {
+							this.caseList = [...this.caseList, ...res.rows];
 						} else {
 							this.caseList = []
 						}
 
-						this.caseList.forEach(item => {
-							switch (item.caseStatus) {
-								case 0:
-									item.caseStatusName = '立案申请'
-									break;
-								case 1:
-									item.caseStatusName = '待缴费'
-									break;
-								case 2:
-									item.caseStatusName = '待缴费确认'
-									break;
-								case 3:
-									item.caseStatusName = '待确认是否应诉'
-									break;
-								case 4:
-									item.caseStatusName = '待确认证据'
-									break;
-								case 5:
-									item.caseStatusName = '待确定是否指派仲裁员'
-									break;
-								case 6:
-									item.caseStatusName = '待组庭'
-									break;
-								case 7:
-									item.caseStatusName = '待组庭确定'
-									break;
-								case 8:
-									item.caseStatusName = '待组庭审核'
-									break;
-								case 9:
-									item.caseStatusName = '待选择仲裁方式'
-									break;
-								case 10:
-									item.caseStatusName = '待开庭'
-									break;
-								case 11:
-									item.caseStatusName = '待生成仲裁文书'
-									break;
-								case 12:
-									item.caseStatusName = '待确认仲裁文书'
-									break;
-								case 13:
-									item.caseStatusName = '待仲裁文书用印'
-									break;
-								case 14:
-									item.caseStatusName = '待仲裁文书用印审核'
-									break;
-								case 15:
-									item.caseStatusName = '待仲裁文书送达'
-									break;
-								case 16:
-									item.caseStatusName = '待案件归档'
-									break;
-							}
-						})
+						console.log(res.rows,this.caseList)
+						
 					})
 				} else if (this.sysType == 2) {
 					parms.miniProgressFlag = 1;
@@ -127,6 +74,7 @@
 							this.caseList = []
 						}
 					})
+					
 				}
 
 			},
@@ -161,7 +109,6 @@
 					obj = {
 						pageNum: this.pageNum,
 						pageSize: this.pageSize,
-						caseStatus: 4
 					}
 				} else if (this.sysType == 2) {
 					obj = {
@@ -170,7 +117,7 @@
 					}
 				}
 				this.getList(obj)
-			}
+			},
 		},
 		onShow() {
 			this.buttonList = []
@@ -180,7 +127,6 @@
 				obj = {
 					pageNum: this.pageNum,
 					pageSize: this.pageSize,
-					caseStatus: 4
 				}
 			} else if (this.sysType == 2) {
 				obj = {
@@ -201,6 +147,11 @@
 			// 	caseStatus:4
 			// }
 			// this.getList(obj)
+		},
+		onUnload(){
+				uni.reLaunch({
+					url: '/pages/work/index'
+				})
 		}
 		
 	}

pages/index.vue

@@ -54,7 +54,7 @@
 		    <view class="badge">{{dataCount.caseApplyEvidence}}</view>
 		    <view class="cardMain">
 		    </view>
-		    <view class="cardMain">
+		    <view class="cardMain" style="margin-top: 75rpx;">
 		      <view class="imgTitle">待案件质证</view>
 		    </view>    
 		</view>

pages/login.vue

@@ -6,7 +6,7 @@
 			<text class="title">仲裁平台</text>
 		</view>
 		<view class="logo-content align-center justify-center flex" v-if="logSyste==2">
-			<image style="width: 100rpx;height: 100rpx;" src="../static/refree.png" mode="widthFix">
+			<image style="width: 100rpx;height: 100rpx;" src="https://txroom.xayunmei.com/refree.png" mode="widthFix">
 			</image>
 			<text class="title">调解平台</text>
 		</view>
@@ -234,8 +234,10 @@
 					width: 200rpx;
 				}
 			}
+
 			.ageen-read {
 				margin-top: 65rpx;
+
 				.agreen-text {
 					padding-left: 20rpx;
 					color: #999;

pages/realName.vue

@@ -1,7 +1,10 @@
 <template>
 	<view class="page-body">
 		<view class="action-btn">
-		  <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">点击进行实名认证</button>
+		  <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">点击身份证实名认证</button>
+		</view>
+		<view class="action-btn">
+		  <button @click="handlePassport()" class="register-btn cu-btn block bg-blue lg round">点击护照实名注册</button>
 		</view>
 	</view>
 </template>
@@ -17,7 +20,8 @@
 	export default{
 		data(){
 			return{
-				eidToken: ""
+				eidToken: "",
+				vals:1
 			}
 		},
 		methods:{
@@ -58,6 +62,12 @@
 						})
 					},
 				});
+			},
+			// 点击护照注册
+			handlePassport(){
+				uni.navigateTo({
+					url: `/pages/register?valus=${this.vals}`
+				});
 			}
 		},
 		onLoad() {

pages/register.vue

@@ -3,7 +3,8 @@
 		<view class="logo-content align-center justify-center flex">
 			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
 			</image>
-			<text class="title">仲裁系统注册</text>
+			<text class="title" v-if="sysType==1">仲裁系统注册</text>
+			<text class="title" v-if="sysType==2">调解系统注册</text>
 		</view>
 		<view class="login-form-content">
 			<view class="input-item flex align-center" style="width: 60%;margin: 0px;">
@@ -19,9 +20,24 @@
 				<input v-model="registerForm.verifyCode" class="input" type="number" placeholder="请输入手机验证码"
 					maxlength="30" />
 			</view>
+			<view class="input-item flex align-center">
+				<uni-data-select
+						style="text-align: left;width: 200px;"
+						v-model="registerForm.idType"
+				       :localdata="certificate"
+					   @change="certificateValue"
+				     ></uni-data-select>
+			</view>
+			<view class="input-item flex align-center">
+				<uni-data-select
+						style="text-align: left;width: 200px;d"
+						v-model="registerForm.nationality"
+				       :localdata="nationality"
+				     ></uni-data-select>
+			</view>
 			<view class="input-item flex align-center">
 				<!-- <view class="iconfont icon-user icon"></view> -->
-				<input v-model="registerForm.identityNo" class="input" type="text" placeholder="请输入身份证号"
+				<input v-model="registerForm.identityNo" class="input" type="text" placeholder="请输入证件号码"
 					maxlength="30" />
 			</view>
 			<view class="input-item flex align-center">
@@ -68,8 +84,10 @@
 		getCodeImg,
 		register,
 		sendCode,
-		wxregister
+		wxregister,
+		idType
 	} from '@/api/login'
+import constant from '../utils/constant'
 
 	export default {
 		data() {
@@ -87,23 +105,22 @@
 					uuid: '',
 					name: '',
 					identityNo: "",
-					id: ""
-				}
+					id: "",
+					idType:0,
+					nationality:0
+				},
+				sysType:null,
+				certificate: [],
+				nationality: [
+					{ value: 0, text: "境内" },
+					{ value: 1, text: "境外" },
+				],
+				passportVal:{}
 			}
 		},
 		created() {
 			this.getCode()
 		},
-		onLoad(option) {
-			let {
-				params
-			} = option
-			// this.improvedetail = JSON.parse(improvedetail)
-			let paramsObj = JSON.parse(params);
-			this.registerForm.name = paramsObj.nickName;
-			this.registerForm.identityNo = paramsObj.idCard
-			this.registerForm.id = paramsObj.id
-		},
 		methods: {
 			// 获取手机验证码
 			getCodeNumber(data) {
@@ -196,8 +213,39 @@
 				this.$store.dispatch('GetInfo').then(res => {
 					this.$tab.reLaunch('/pages/index')
 				})
+			},
+			certificateValue(e){
+				// this.registerForm.idType = e
+			},
+			// 获取证件类型
+			getIdType(){
+				idType().then(res=>{
+					res.data.forEach(item=>{
+						 this.certificate.push({value:item.dictSort,text:item.dictLabel})
+					})
+					console.log(this.certificate)
+				})
 			}
+		},
+		onLoad(option) {
+			this.sysType = uni.getStorageSync('sysType');
+			// this.passportVal = option;
+			console.log(option)
+			if(option.valus==1){
+				this.registerForm.idType =0
+				this.registerForm.nationality =0
+			}else{
+				let {
+					params
+				} = option
+				// this.improvedetail = JSON.parse(improvedetail)
+				let paramsObj = JSON.parse(params);
+				this.registerForm.name = paramsObj.nickName;
+				this.registerForm.identityNo = paramsObj.idCard
+				this.registerForm.id = paramsObj.id
 			}
+			this.getIdType()
+		},
 	}
 </script>
 
@@ -205,7 +253,19 @@
 	page {
 		background-color: #ffffff;
 	}
-
+	::v-deep .uni-select[data-v-6b64008e]{
+		border: none;
+	}
+	::v-deep .uni-icons[data-v-a2e81f6e]{
+		display: none;
+	}
+	.uni-icons{
+		display: none;
+	}
+	// ::v-deep .uni-select{
+	// 	border: none;
+	// 	width: 200%;
+	// }
 	.normal-login-container {
 		width: 100%;
 		background-color: #ffffff;

pages/work/index.vue

@@ -11,7 +11,8 @@
 			</swiper>
 		</uni-swiper-dot>
 		<!-- 调解轮播图 -->
-		<uni-swiper-dot v-if="sysType==2" class="uni-swiper-dot-box" :info="refreesVal" :current="current" field="content">
+		<uni-swiper-dot v-if="sysType==2" class="uni-swiper-dot-box" :info="refreesVal" :current="current"
+			field="content">
 			<swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
 				<swiper-item v-for="(item, index) in refreesVal" :key="index">
 					<view class="swiper-item" @click="clickBannerItem(item)">
@@ -124,15 +125,13 @@
 						image: 'https://img.tukuppt.com/bg_grid/00/81/07/DGEl4suqeV.jpg!/fh/350'
 					}
 				],
-				refreesVal :[
-					{
-					image:'../../static/tiaojie1.png'
+				refreesVal: [{
+					image: 'https://txroom.xayunmei.com/tiaojie1.png'
 				}, {
-						image:'../../static/tiaojie2.png'
+					image: 'https://txroom.xayunmei.com/tiaojie2.png'
 				}, {
-						image:'../../static/tiaojie4.png'
-					}
-				],
+					image: 'https://txroom.xayunmei.com/tiaojie4.png'
+				}],
 				certificationStatus: "",
 				eidToken: "",
 				sysType: null

unpackage/dist/dev/mp-weixin/project.config.json

@@ -19,7 +19,7 @@
     "condition": false
   },
   "compileType": "miniprogram",
-  "libVersion": "3.1.1",
+  "libVersion": "3.4.3",
   "appid": "wx91cb8459dca561b4",
   "projectname": "智慧仲裁",
   "condition": {},

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -3,6 +3,6 @@
   "projectname": "miniapp",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   }
 }