Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into hcb

api/handlecase/index.js

@@ -124,7 +124,7 @@ export function updateComfire(data) {
 //提交案件
 export function caseAppSubmit(data) {
 	return request({
-		'url': `/caseApplication/submit`,
+		url: '/caseApplication/submit',
 		method: 'post',
 		data: data
 	})
@@ -136,4 +136,28 @@ export function caseApplicationSelectById(data) {
     method: 'get',
     params: data
   })
-}
+}
+// 删除案件
+export function caseDelete(data) {
+	return request({
+		url: '/caseApplication/delete',
+		method: 'post',
+		data: data
+	})
+}
+//   案件id查询缴费清单
+export function selectPaymentDetail(data) {
+  return request({
+    url: '/pay/selectPaymentDetail',
+    method: 'get',
+    params: data
+  })
+}
+// 缴费确认
+export function confirmPaid(data) {
+	return request({
+		url: '/pay/confirmPaid',
+		method: 'post',
+		data: data
+	})
+}

pages.json

@@ -98,6 +98,12 @@
 				"navigationBarTitleText": "案件信息"
 			}
 		},
+		{
+			"path": "pages/handlecase/component/confirmPayment",
+			"style": {
+				"navigationBarTitleText": "确认缴费"
+			}
+		},
 		{
 			"path": "pages/handlecase/component/payList",
 			"style": {

pages/handlecase/component/confirmPayment.vue

@@ -0,0 +1,89 @@
+<template>
+	<view class="conent">
+		<view class="assignrbitrators">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules">
+				<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="feePayable" label-width="80px">
+					<uni-easyinput v-model="formData.feePayable" type="text" :disabled='true' placeholder="请输入缴费金额" />
+				</uni-forms-item>
+				<uni-forms-item label="申请人缴费:" name="feePayable" label-width="90px">
+					<view v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==4" :href="item.annexPath" color="#007BFF"
+							:text="item.annexName"></uni-link>
+					</view>
+				</uni-forms-item>	
+				<uni-forms-item label="被申请人缴费:" name="feePayable" label-width="100px">
+					<view v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==9" :href="item.annexPath" color="#007BFF"
+							:text="item.annexName"></uni-link>
+					</view>
+				</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>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {selectPaymentDetail,confirmPaid} from '../../../api/handlecase/index.js'
+	export default {
+		data() {
+			return {
+				formData:{},
+				rules:{},
+				paymentConfirm:{}
+			}
+		},
+		methods:{
+			// 确认缴费
+			confirmPayment(){
+				let vals = {
+					caseId:this.paymentConfirm.id,
+					batchNumber:"",
+					caseFlowId:this.paymentConfirm.caseFlowId
+				}
+				confirmPaid(vals).then(res =>{
+					uni.showToast({
+						title: '缴费确认成功',
+						icon: 'none',
+						duration: 1000
+					})
+					uni.navigateBack({
+						delta: 1
+					})
+				})
+			},
+			// 缴费详情
+			paymentDetails(val) {
+			    selectPaymentDetail(val).then(res => {
+			        this.formData = res.data;
+			    })
+			},        
+		},
+		onLoad(data) {
+			this.paymentConfirm = data
+			this.paymentDetails({id:data.id})
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #ffffff;
+	}
+	.assignrbitrators{
+		margin: 30rpx;
+	}
+</style>

pages/handlecase/component/list.vue

@@ -41,8 +41,8 @@
 			</view>
 		</view>
 		<view class="btn" v-if="sysType == 2">
-			<button class="btnItem" type="primary" size="mini" @tap="modify">修改</button>
-			<button class="btnItem" type="primary" size="mini" @tap="deleteCase">删除</button>
+			<button class="btnItem" type="primary" size="mini" @tap="modify" v-if="checkPermi(['caseManagement:list:edit'])">修改</button>
+			<button class="btnItem" type="primary" size="mini" @tap="deleteCase" v-if="checkPermi(['caseManagement:list:delete'])">删除</button>
 			<!-- <button class="btnItem" type="primary" size="mini" @tap="clickPay">申请人缴费</button>
 			<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"
@@ -59,12 +59,13 @@
 <script>
 	import {
 		queryCaseFlowInfo,
-		caseAppSubmit
+		caseAppSubmit,
+		caseDelete
 	} from '@/api/handlecase/index.js'
 	export default {
 		data() {
 			return {
-
+				
 			}
 		},
 		props: {
@@ -91,6 +92,7 @@
 					// 缴费
 					this.clickPay()
 				} else if (type == 3 || type == 45) {
+					this.confirmPayments()
 					// 确认缴费
 				} else if (type == 4) {
 					// 受理分配
@@ -132,49 +134,58 @@
 					url: `/pages/handlecase/component/uploadEvidence?id=${this.defalutVal.id}`
 				})
 			},
+			// 缴费
 			clickPay() {
 				uni.navigateTo({
 					url: `/pages/handlecase/component/payList?id=${this.defalutVal.id}`
 				})
 			},
+			// 确认缴费
+			confirmPayments(){
+				uni.navigateTo({
+					url: `/pages/handlecase/component/confirmPayment?id=${this.defalutVal.id}&caseFlowId=${this.defalutVal.caseFlowId}`
+				})
+			},
 			/**提交案件*/
 			onsubmitRow() {
 				caseAppSubmit().then(res => {
 					uni.showToast({
-						title: '成功',
+						title: '提交成功',
 						icon: 'none',
 						duration: 1000
 					})
-					this.$emit("getList");
+					uni.navigateBack({
+						delta: 1
+					})
+					//this.$emit("getList");
 				})
 			},
 			// 修改
 			modify() {
-				uni.redirectTo({
+				uni.navigateTo({
 					url: `/pages/handlecase/component/newlyAddedCase?id=${this.defalutVal.id}`,
 				})
 			},
 			/*删除*/
 			deleteCase() {
-				console.log("PPPPPPPPPPPPPPPPPPPPPPPP");
-			},
-			/*提交*/
-			/**查询按钮列表 */
-			getButtonList() {
-				queryCaseFlowInfo({
-					pageNum: 1,
-					pageSize: 100000
-				}).then(res => {
-					res.rows.forEach(item => {
-						if (item.id != 11 && item.id != 17) {
-							this.buttonList.push(item)
-						}
-					});
+				let objValue ={
+					id : this.defalutVal.id,
+					batchNumber:"",
+					caseFlowId:this.defalutVal.caseFlowId
+				}
+				caseDelete(objValue).then(res =>{
+					uni.showToast({
+						title: '删除成功',
+						icon: 'none',
+						duration: 1000
+					})
+					uni.navigateBack({
+						delta: 1
+					})
 				})
 			},
 		},
 		created() {
-			// this.getButtonList()
 		}
 	}
 </script>

pages/handlecase/component/newlyAddedCase.vue

@@ -24,7 +24,7 @@
 					<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" :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='9' />
 				</uni-forms-item>
 				<uni-section title="双方信息" type="line" padding></uni-section>
 				<uni-forms-item label="选择机构或自然人" label-width="120px" name="objectiJuris">
@@ -202,6 +202,7 @@
 							value: 0
 						}
 					],
+					fileList: {},
 					rules:{},
 					rulesappName: [
 						{  
@@ -342,8 +343,9 @@
 							let result = JSON.parse(res.data)
 							 this.formData.caseAttachList.push({
 							        annexId: result.annexId,
+									annexName: result.fileName
 							  });
-							console.log(result.annexId)
+							console.log(result.fileName)
 							uni.showToast({
 								title: '上传成功',
 								icon: 'none',

pages/handlecase/index.vue

@@ -170,7 +170,8 @@
 				this.getList(obj)
 			}
 		},
-		onLoad() {
+		onShow() {
+			this.buttonList = []
 			this.sysType = uni.getStorageSync('sysType');
 			let obj = {}
 			if (this.sysType == 1) {