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

pages/handlecase/component/confirmPayment.vue

@@ -6,7 +6,8 @@
 					<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-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="请输入缴费金额" />
@@ -24,23 +25,17 @@
 					</view>
 				</uni-forms-item>
 				<uni-forms-item label="是否缴费通过" label-width="120px" name="yesOrNo">
-					<uni-data-checkbox class='checkbox' 
+					<uni-data-checkbox class='checkbox' :localdata="yesOrNoObject" v-model="yesOrNo"
-						: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: '驳回原因不能为空'}]"
+					: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" 
+				<button class="mini-btn" type="primary" size="mini" @tap="confirmPayment">确认缴费</button>
-				type="primary" size="mini" 
+				<button style="margin-left:30rpx;" class="mini-btn" type="default" size="mini"
-				@tap="confirmPayment">确认缴费</button>
-				<button style="margin-left:30rpx;" class="mini-btn" 
-				type="default" size="mini" 
 					@tap="cencalBut">取消</button>
 			</view>
 		</view>
@@ -48,18 +43,22 @@
 </template>
 
 <script>
-	import {selectPaymentDetail,confirmPaid,resConfirmPaid} from '../../../api/handlecase/index.js'
+	import {
+		selectPaymentDetail,
+		confirmPaid,
+		resConfirmPaid
+	} from '../../../api/handlecase/index.js'
 	export default {
 		data() {
 			return {
-				yesOrNo:1,
+				yesOrNo: 1,
-				formData:{
+				formData: {
-					reason:""
+					reason: ""
 				},
-				rules:{},
+				rules: {},
-				paymentConfirm:{},
+				paymentConfirm: {},
-				annexTypeS:false,
+				annexTypeS: false,
-				annexTypeB:false,
+				annexTypeB: false,
 				yesOrNoObject: [{
 					text: '同意',
 					value: 1
@@ -67,32 +66,32 @@
 					text: '拒绝',
 					value: 0
 				}],
-				refusedisabled:false
+				refusedisabled: false
 			}
 		},
-		methods:{
+		methods: {
-			confirmPayment(){
+			confirmPayment() {
-				this.$refs.form.validate().then(res=>{
+				this.$refs.form.validate().then(res => {
-						if(this.paymentConfirm.caseFlowId==3){
+					if (this.paymentConfirm.caseFlowId == 3) {
 						this.confirmPaymentApplicant()
-						}else if(this.paymentConfirm.caseFlowId==44){
+					} else if (this.paymentConfirm.caseFlowId == 45) {
 						this.confirmPaymentRespondent()
 					}
 					console.log(this.paymentConfirm.caseFlowId)
-					}).catch(err =>{
+				}).catch(err => {
 
 				})
 			},
 			// 申请人确认缴费
-			confirmPaymentApplicant(){
+			confirmPaymentApplicant() {
 				let vals = {
-					caseId:this.paymentConfirm.id,
+					caseId: this.paymentConfirm.id,
-					batchNumber:"",
+					batchNumber: "",
-					caseFlowId:this.paymentConfirm.caseFlowId,
+					caseFlowId: this.paymentConfirm.caseFlowId,
-					yesOrNo:this.yesOrNo,
+					yesOrNo: this.yesOrNo,
-					reason:this.formData.reason
+					reason: this.formData.reason
 				}
-				confirmPaid(vals).then(res =>{
+				confirmPaid(vals).then(res => {
 					uni.showToast({
 						title: '申请人缴费确认成功',
 						icon: 'none',
@@ -104,15 +103,15 @@
 				})
 			},
 			// 被申请人缴费确认
-			confirmPaymentRespondent(){
+			confirmPaymentRespondent() {
 				let vals = {
-					caseId:this.paymentConfirm.id,
+					caseId: this.paymentConfirm.id,
-					batchNumber:"",
+					batchNumber: "",
-					caseFlowId:this.paymentConfirm.caseFlowId,
+					caseFlowId: this.paymentConfirm.caseFlowId,
-					yesOrNo:this.yesOrNo,
+					yesOrNo: this.yesOrNo,
-					reason:this.formData.reason
+					reason: this.formData.reason
 				}
-				resConfirmPaid(vals).then(res =>{
+				resConfirmPaid(vals).then(res => {
 					uni.showToast({
 						title: '被申请人缴费确认成功',
 						icon: 'none',
@@ -127,27 +126,29 @@
 			paymentDetails(val) {
 				selectPaymentDetail(val).then(res => {
 					this.formData = res.data;
-					this.formData.caseAttachList.forEach(res =>{
+					this.formData.caseAttachList.forEach(res => {
-						if(res.annexType==4){
+						if (res.annexType == 4) {
 							this.annexTypeS = true
-						}else if(res.annexType==9){
+						} else if (res.annexType == 9) {
 							this.annexTypeB = true
 						}
 					})
 				})
 			},
-			clearValidate(val){
+			clearValidate(val) {
-				 this.yesOrNo=val.detail.value
+				this.yesOrNo = val.detail.value
-				if(val.detail.value==0){
+				if (val.detail.value == 0) {
 					this.refusedisabled = true
-				}else{
+				} else {
 					this.refusedisabled = false
 				}
 			}
 		},
 		onLoad(data) {
 			this.paymentConfirm = data
-			this.paymentDetails({id:data.id})
+			this.paymentDetails({
+				id: data.id
+			})
 		}
 	}
 </script>
@@ -156,7 +157,8 @@
 	page {
 		background-color: #ffffff;
 	}
-	.assignrbitrators{
+
+	.assignrbitrators {
 		margin: 30rpx;
 	}
 </style>

pages/handlecase/index.vue

@@ -3,8 +3,8 @@
 		<view class="" v-if="sysType == 2">
 			<button type="primary" @tap="newlyAddedCases">新增案件</button>
 		</view>
-		<List class="caseList" @pDeleteCase='deleteCase'  v-for="(item,index) in caseList" :defalutVal='item' :buttonList='buttonList' :key="index"
+		<List class="caseList" @pDeleteCase='deleteCase' v-for="(item,index) in caseList" :defalutVal='item'
-			:sysType='sysType'>
+			:buttonList='buttonList' :key="index" :sysType='sysType'>
 		</List>
 		<view class="emptyBox" v-if="caseList.length == 0">
 			<luanqing-empty :show="true" textColor="#000"></luanqing-empty>
@@ -52,6 +52,7 @@
 			},
 			getList(parms) {
 				console.log(111)
+				this.caseList = [];
 				if (this.sysType == 1) {
 					respondentList(parms).then(res => {
 						// this.caseList = res.rows;
@@ -130,8 +131,8 @@
 				}
 
 			},
-			deleteCase(objValue){
+			deleteCase(objValue) {
-				caseDelete(objValue).then(res =>{
+				caseDelete(objValue).then(res => {
 					uni.showToast({
 						title: '删除成功',
 						icon: 'none',

unpackage/dist/dev/mp-weixin/app.json

@@ -6,6 +6,7 @@
     "pages/work/index",
     "pages/handlecase/index",
     "pages/handlecase/component/uploadEvidence",
+    "pages/handlecase/component/confirmPayment",
     "pages/handlecase/component/payList",
     "pages/handlecase/component/evidenceList",
     "pages/handlecase/component/obligations",