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

pages/handlecase/component/confirmPayment.vue

@@ -5,10 +5,9 @@
 				<uni-forms-item label="案件编号:" name="caseNum" label-width="80px">
 					<uni-easyinput v-model="formData.caseNum" type="text" :disabled='true' placeholder="请输入案件编号" />
 				</uni-forms-item>
-				<uni-forms-item label="案件标的:" name="caseSubjectAmount" label-width="80px">
-					<uni-easyinput v-model="formData.caseSubjectAmount" type="text" :disabled='true'
-						placeholder="请输入案件标的" />
-				</uni-forms-item>
+				<!-- <uni-forms-item label="案件标的:" name="caseSubjectAmount" label-width="80px">
+					<uni-easyinput v-model="formData.caseSubjectAmount" type="text" :disabled='true' placeholder="请输入案件标的" />
+				</uni-forms-item> -->
 				<uni-forms-item label="缴费金额:" name="feePayable" label-width="80px">
 					<uni-easyinput v-model="formData.feePayable" type="text" :disabled='true' placeholder="请输入缴费金额" />
 				</uni-forms-item>
@@ -29,14 +28,18 @@
 						@change='clearValidate'></uni-data-checkbox>
 				</uni-forms-item>
 				<uni-forms-item label="驳回原因:" name="reason" label-width="120px" required v-if="refusedisabled"
-					:rules="[{'required': true,errorMessage: '驳回原因不能为空'}]">
-					<uni-easyinput v-model="formData.reason" type="textarea" placeholder="请输入驳回原因" />
+				:rules="[{required: true,errorMessage: '驳回原因不能为空'}]"
+				>
+					<uni-easyinput  v-model="formData.reason" type="textarea" placeholder="请输入驳回原因" />
 				</uni-forms-item>
 			</uni-forms>
-			<view class="determine" style="text-align: center;">
-				<button class="mini-btn" type="primary" size="mini" @tap="confirmPayment">确认缴费</button>
-				<button style="margin-left:30rpx;" class="mini-btn" type="default" size="mini"
-					@tap="cencalBut">取消</button>
+			<view class="determine" style="text-align: center;">	
+				<button  class="mini-btn" 
+				type="primary" size="mini" 
+				@tap="confirmPayment">确认</button>
+				<button style="margin-left:30rpx;" class="mini-btn" 
+				type="default" size="mini" 
+				@tap="cencalBut">取消</button>
 			</view>
 		</view>
 	</view>
@@ -69,17 +72,17 @@
 				refusedisabled: false
 			}
 		},
-		methods: {
-			confirmPayment() {
-				this.$refs.form.validate().then(res => {
-					if (this.paymentConfirm.caseFlowId == 3) {
-						this.confirmPaymentApplicant()
-					} else if (this.paymentConfirm.caseFlowId == 45) {
-						this.confirmPaymentRespondent()
-					}
-					console.log(this.paymentConfirm.caseFlowId)
-				}).catch(err => {
-
+		methods:{
+			confirmPayment(){
+				this.$refs.form.validate().then(res=>{
+						if(this.paymentConfirm.caseFlowId==3){
+							this.confirmPaymentApplicant()
+						}else if(this.paymentConfirm.caseFlowId==45){
+							this.confirmPaymentRespondent()
+						}
+						console.log(this.paymentConfirm.caseFlowId)
+					}).catch(err =>{
+						
 				})
 			},
 			// 申请人确认缴费
@@ -97,8 +100,8 @@
 						icon: 'none',
 						duration: 1000
 					})
-					uni.navigateBack({
-						delta: 1
+					uni.navigateTo({
+						url:'/pages/handlecase/index'
 					})
 				})
 			},
@@ -117,8 +120,8 @@
 						icon: 'none',
 						duration: 1000
 					})
-					uni.navigateBack({
-						delta: 1
+					uni.navigateTo({
+						url:'/pages/handlecase/index'
 					})
 				})
 			},

pages/handlecase/component/list.vue

@@ -159,7 +159,9 @@
 						icon: 'none',
 						duration: 1000
 					})
-					this.$router.go(0)
+					uni.navigateTo({
+						url:'/pages/handlecase/index'
+					})
 					//this.$emit("getList");
 				})
 			},
@@ -176,7 +178,16 @@
 					batchNumber:"",
 					caseFlowId:this.defalutVal.caseFlowId
 				}
-				this.$emit('pDeleteCase',objValue)
+				caseDelete(objValue).then(res =>{
+					uni.showToast({
+						title: '删除成功',
+						icon: 'none',
+						duration: 1000
+					})
+					uni.navigateTo({
+						url:'/pages/handlecase/index'
+					})
+				}) 
 			},
 		},
 		created() {

pages/handlecase/component/newlyAddedCase.vue

@@ -4,27 +4,27 @@
 			<uni-forms ref="form" :modelValue="formData" :rules="rules">
 				<uni-section title="案件信息" type="line" padding></uni-section>
 				<uni-forms-item label="申请人调解请求:" name="arbitratClaims" label-width="120px" required
-				:rules="[{'required': true,errorMessage: '申请人调解请求不能为空'}]"
+				:rules="[{required: true,errorMessage: '申请人调解请求不能为空'}]"
 				>
 					<uni-easyinput  v-model="formData.arbitratClaims" type="textarea" placeholder="请输入申请人调解请求" />
 				</uni-forms-item>
 				<uni-forms-item label="事实和理由:" name="facts" label-width="120px" required
-				:rules="[{'required': true,errorMessage: '事实和理由不能为空'}]"
+				:rules="[{required: true,errorMessage: '事实和理由不能为空'}]"
 				>
 					<uni-easyinput v-model="formData.facts" type="textarea" placeholder="请输入事实和理由" />
 				</uni-forms-item>
 				<!-- <uni-forms-item label="案件标的:" name="caseSubjectAmount" label-width="120px" required
-				:rules="[{'required': true,errorMessage: '案件标的不能为空'}]"
+				:rules="[{required: true,errorMessage: '案件标的不能为空'}]"
 				>
 					<uni-easyinput v-model="formData.caseSubjectAmount" type="text" placeholder="请输入案件标的" />
 				</uni-forms-item>
 				<uni-forms-item label="模板:" name="templateId" label-width="120px" required 
-				:rules="[{'required': true,errorMessage: '模板不能为空'}]"
+				:rules="[{required: true,errorMessage: '模板不能为空'}]"
 				>
 					<uni-data-select :localdata="templateList" v-model="formData.templateId"></uni-data-select>
 				</uni-forms-item> -->
 				<uni-forms-item label="申请人案件证据资料上传:" name="headImage" label-width="120px">
-							<uni-file-picker ref="files" file-mediatype="all" return-type='object' v-model="fileList" :auto-upload="false" @select="select" :limit='9' />
+							<uni-file-picker ref="files" file-mediatype="all" return-type='object' v-model="fileList" :auto-upload="false" @select="select" :limit='1' />
 				</uni-forms-item>
 				<uni-section title="双方信息" type="line" padding></uni-section>
 				<uni-forms-item label="选择机构或自然人" label-width="120px" name="objectiJuris">
@@ -42,35 +42,29 @@
 				</uni-forms-item>
 				
 				<uni-forms-item label="申请人邮箱:" v-if="formData.affiliate.organizeFlag==0" name="affiliate.applicationEmail" label-width="120px" required
-				:rules="[
-					{'required': true,errorMessage: '申请人邮箱不能为空'},
-					{pattern:'^\\S+?@\\S+?\\.\\S+?$',errorMessage:'邮箱格式不正确'}
-					]"
+				
 				>
 					<uni-easyinput v-model="formData.affiliate.applicationEmail"
 					:disabled="disabledApplicat"
 					 type="text" placeholder="请输入申请人邮箱" />
 				</uni-forms-item>
 				<uni-forms-item label="申请人电话:" v-if="formData.affiliate.organizeFlag==0" name="affiliate.applicationPhone" label-width="120px" required 
-				:rules="[
-					{'required': true,errorMessage: '申请人电话不能为空'},
-					{pattern:'^[1][3,4,5,6,7,8,9][0-9]{9}$',errorMessage:'申请人电话格式不正确'}
-					]"
+				
 				>
 					<uni-easyinput v-model="formData.affiliate.applicationPhone" :disabled="disabledApplicat" type="text" placeholder="请输入申请人电话" />
 				</uni-forms-item>
-				<uni-forms-item label="法定代表人:" name="affiliate.compLegalPerson" label-width="120px" required
-				:rules="[{'required': true,errorMessage: '法定代表人不能为空'}]"
+				<uni-forms-item label="法定代表人:" v-if="formData.affiliate.organizeFlag==1" name="affiliate.compLegalPerson" label-width="120px" required
+				
 				>
 					<uni-easyinput v-model="formData.affiliate.compLegalPerson" type="text" placeholder="请输入法定代表人" />
 				</uni-forms-item>
 				<uni-forms-item label="申请人住所:" name="affiliate.applicantHome" label-width="120px" required
-				:rules="[{'required': true,errorMessage: '申请人住所不能为空'}]"
+				:rules="[{required: true,errorMessage: '申请人住所不能为空'}]"
 				>
 					<uni-easyinput v-model="formData.affiliate.applicantHome" type="text" placeholder="请输入申请人住所" />
 				</uni-forms-item>
 				<uni-forms-item label="申请人联系地址:" name="affiliate.applicantAddress" label-width="120px" required
-				:rules="[{'required': true,errorMessage: '申请人联系地址不能为空'}]"
+				:rules="[{required: true,errorMessage: '申请人联系地址不能为空'}]"
 				>
 					<uni-easyinput v-model="formData.affiliate.applicantAddress" type="text" placeholder="请输入申请人联系地址" />
 				</uni-forms-item>
@@ -84,13 +78,13 @@
 					<uni-easyinput v-model="formData.affiliate.agentEmail" :disabled="disabledVal" type="text" placeholder="请输入代理人邮箱" />
 				</uni-forms-item>
 				<uni-forms-item label="被申请人姓名:" name="affiliate.respondentName" label-width="120px" required
-				:rules="[{'required': true,errorMessage: '被申请人姓名不能为空'}]"
+				:rules="[{required: true,errorMessage: '被申请人姓名不能为空'}]"
 				>
 					<uni-easyinput v-model="formData.affiliate.respondentName" type="text" placeholder="请输入被申请人姓名" />
 				</uni-forms-item>
 				<uni-forms-item label="被申请人联系电话:" name="affiliate.respondentPhone" label-width="120px" required
 				:rules="[
-					{'required': true,errorMessage: '被申请人联系电话不能为空'},
+					{required: true,errorMessage: '被申请人联系电话不能为空'},
 					{pattern:'^[1][3,4,5,6,7,8,9][0-9]{9}$',errorMessage:'被申请人联系电话格式不正确'}
 					]"
 				>
@@ -98,7 +92,7 @@
 				</uni-forms-item>
 				<uni-forms-item label="被申请人身份证号:" name="affiliate.respondentIdentityNum" label-width="120px" required
 				:rules="[
-					{'required': true,errorMessage: '被申请人身份证号不能为空'},
+					{required: true,errorMessage: '被申请人身份证号不能为空'},
 					{pattern:'^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$',errorMessage:'被申请人身份证格式错误'}
 					
 					]"
@@ -115,13 +109,13 @@
 					<uni-datetime-picker v-model="formData.affiliate.respondentBirth" :disabled='true' type="date" :clear-icon="false" />
 				</uni-forms-item>
 				<uni-forms-item label="被申请人住所:" name="affiliate.respondentHome" label-width="120px" required
-				:rules="[{'required': true,errorMessage: '被申请人住所不能为空'}]"
+				:rules="[{required: true,errorMessage: '被申请人住所不能为空'}]"
 				>
 					<uni-easyinput v-model="formData.affiliate.respondentHome" type="text" placeholder="请输入被申请人住所" />
 				</uni-forms-item>
 				<uni-forms-item label="被申请人邮箱:" name="affiliate.respondentEmail" label-width="120px" required
 				:rules="[
-					{'required': true,errorMessage: '被申请人邮箱不能为空'},
+					{required: true,errorMessage: '被申请人邮箱不能为空'},
 					{pattern:'^\\S+?@\\S+?\\.\\S+?$',errorMessage:'邮箱格式不正确'}
 					
 					]"	
@@ -232,6 +226,7 @@
 		methods:{
 			submitReasont(){
 				this.$refs.form.validate().then(res=>{
+					console.log(this.ids)
 						if(this.ids){
 							this.modifyData(this.formData)
 						}else{
@@ -339,8 +334,8 @@
 				        	icon: 'none',
 				        	duration: 1000
 				        })
-				        uni.navigateBack({
-				        	delta: 1
+				        uni.navigateTo({
+				        	url:'../index'
 				        })
 				      });
 				},

pages/handlecase/component/payList.vue

@@ -13,14 +13,14 @@
 					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.affiliate.respondentName"
 						placeholder="" />
 				</uni-forms-item>
-				<uni-forms-item label="案件标的：" name="caseSubjectAmount" label-width="120px" required>
+				<!-- <uni-forms-item label="案件标的：" name="caseSubjectAmount" label-width="120px" required>
 					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseSubjectAmount"
 						placeholder="" />
-				</uni-forms-item>
+				</uni-forms-item> -->
 				<uni-forms-item label="应缴费用：" name="feePayable" label-width="120px" required>
 					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.feePayable" placeholder="" />
 				</uni-forms-item>
-				<uni-forms-item label="驳回原因：" name="reason" label-width="120px" required>
+				<uni-forms-item label="驳回原因：" name="reason" label-width="120px" required v-if="formData.reason">
 					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.reason" placeholder="" />
 				</uni-forms-item>
 			</view>

pages/handlecase/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="handlecase">
 		<view class="" v-if="sysType == 2">
-			<button type="primary" @tap="newlyAddedCases">新增案件</button>
+			<button type="primary" @tap="newlyAddedCases"  v-if="checkPermi(['caseManagement:list:add'])">新增案件</button>
 		</view>
 		<List class="caseList" @pDeleteCase='deleteCase' v-for="(item,index) in caseList" :defalutVal='item'
 			:buttonList='buttonList' :key="index" :sysType='sysType'>
@@ -17,8 +17,7 @@
 	import {
 		respondentList,
 		caseApplicationTj,
-		queryCaseFlowInfo,
-		caseDelete
+		queryCaseFlowInfo
 	} from '../../api/handlecase/index.js'
 	import LuanqingEmpty from "@/components/luanqing-empty.vue"
 	export default {
@@ -131,17 +130,6 @@
 				}
 
 			},
-			deleteCase(objValue) {
-				caseDelete(objValue).then(res => {
-					uni.showToast({
-						title: '删除成功',
-						icon: 'none',
-						duration: 1000
-					})
-
-				})
-				this.$router.go(0)
-			},
 			// 新增案件
 			newlyAddedCases() {
 				uni.navigateTo({

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

@@ -1,8 +1,8 @@
-{
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "miniapp",
-  "setting": {
-    "compileHotReLoad": true,
-    "urlCheck": false
-  }
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "miniapp",
+  "setting": {
+    "compileHotReLoad": true,
+    "urlCheck": false
+  }
 }