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

api/handlecase/index.js

@@ -153,7 +153,7 @@ export function selectPaymentDetail(data) {
     params: data
   })
 }
-// 缴费确认
+// 申请人缴费确认
 export function confirmPaid(data) {
 	return request({
 		url: '/pay/confirmPaid',
@@ -169,3 +169,11 @@ export function getUserInfo(data) {
     params: data
   })
 }
+// 被申请人缴费确认
+export function resConfirmPaid(data) {
+	return request({
+		url: '/pay/resConfirmPaid',
+		method: 'post',
+		data: data
+	})
+}

pages/handlecase/component/confirmPayment.vue

@@ -23,6 +23,17 @@
 							:text="item.annexName"></uni-link>
 					</view>
 				</uni-forms-item>
+				<uni-forms-item label="是否缴费通过" label-width="120px" name="yesOrNo">
+					<uni-data-checkbox class='checkbox' 
+						:localdata="yesOrNoObject"
+						v-model="yesOrNo"
+						@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="请输入驳回原因" />
+				</uni-forms-item>
 			</uni-forms>
 			<view class="determine" style="text-align: center;">	
 				<button  class="mini-btn" 
@@ -37,28 +48,73 @@
 </template>
 
 <script>
-	import {selectPaymentDetail,confirmPaid} from '../../../api/handlecase/index.js'
+	import {selectPaymentDetail,confirmPaid,resConfirmPaid} from '../../../api/handlecase/index.js'
 	export default {
 		data() {
 			return {
-				formData:{},
+				yesOrNo:1,
+				formData:{
+					reason:""
+				},
 				rules:{},
 				paymentConfirm:{},
 				annexTypeS:false,
-				annexTypeB:false
+				annexTypeB:false,
+				yesOrNoObject: [{
+					text: '同意',
+					value: 1
+				}, {
+					text: '拒绝',
+					value: 0
+				}],
+				refusedisabled:false
 			}
 		},
 		methods:{
-			// 确认缴费
 			confirmPayment(){
+				this.$refs.form.validate().then(res=>{
+						if(this.paymentConfirm.caseFlowId==3){
+							this.confirmPaymentApplicant()
+						}else if(this.paymentConfirm.caseFlowId==44){
+							this.confirmPaymentRespondent()
+						}
+						console.log(this.paymentConfirm.caseFlowId)
+					}).catch(err =>{
+						
+				})
+			},
+			// 申请人确认缴费
+			confirmPaymentApplicant(){
 				let vals = {
 					caseId:this.paymentConfirm.id,
 					batchNumber:"",
-					caseFlowId:this.paymentConfirm.caseFlowId
+					caseFlowId:this.paymentConfirm.caseFlowId,
+					yesOrNo:this.yesOrNo,
+					reason:this.formData.reason
 				}
 				confirmPaid(vals).then(res =>{
 					uni.showToast({
-						title: '缴费确认成功',
+						title: '申请人缴费确认成功',
+						icon: 'none',
+						duration: 1000
+					})
+					uni.navigateBack({
+						delta: 1
+					})
+				})
+			},
+			// 被申请人缴费确认
+			confirmPaymentRespondent(){
+				let vals = {
+					caseId:this.paymentConfirm.id,
+					batchNumber:"",
+					caseFlowId:this.paymentConfirm.caseFlowId,
+					yesOrNo:this.yesOrNo,
+					reason:this.formData.reason
+				}
+				resConfirmPaid(vals).then(res =>{
+					uni.showToast({
+						title: '被申请人缴费确认成功',
 						icon: 'none',
 						duration: 1000
 					})
@@ -80,6 +136,14 @@
 					})
 			    })
 			}, 
+			clearValidate(val){
+				 this.yesOrNo=val.detail.value
+				if(val.detail.value==0){
+					this.refusedisabled = true
+				}else{
+					this.refusedisabled = false
+				}
+			}
 		},
 		onLoad(data) {
 			this.paymentConfirm = data

pages/handlecase/component/payList.vue

@@ -20,6 +20,9 @@
 				<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-easyinput :inputBorder="false" :disabled='true' v-model="formData.reason" placeholder="" />
+				</uni-forms-item>
 			</view>
 		</uni-forms>
 		<uni-forms-item label="缴费方式">