Browse Source

现金收费优化

tianhui 3 years ago
parent
commit
f6597af4f9

+ 9 - 6
pages/getout/getoutpage/getoutpage.vue

@@ -49,8 +49,8 @@
 				</view>
 			</view>
 			<view class="details-footer u-flex u-row-between">
-				<u-button type="primary" :disabled="detailModel.payAllbtn" @click="onPayAll">全部缴费</u-button>
-				<u-button type="warning" :disabled="detailModel.payOnebtn" @click="onPayThis">本次缴费</u-button>
+				<u-button type="primary" :disabled="detailModel.payAllbtn" @click="onPayAll(leaveDetail.oweAmount)">全部缴费</u-button>
+				<u-button type="warning" :disabled="detailModel.payOnebtn" @click="onPayThis(leaveDetail.payAmount)">本次缴费</u-button>
 				<view class="details-footer-btn bg-gray" @click="onPayCancel">取消</view>
 			</view>
 		</u-popup>
@@ -106,8 +106,8 @@
 		<u-popup class="popup cashPay-popup" v-model="showCash" :mask-close-able="false" mode="center" border-radius="20" width="90%">
 			<view class="popup-title">本次收到缴费</view>
 			<view class="popup-body u-flex">
-				<view  class="u-flex-1 "><u-input v-model="payParams.cashMoney" type="number" :border="true" :clearable="false" placeholder="请输入本次收到的金额(元)" /></view> 
-				<view class="u-flex-1 change">找零{{changeMoney}}元</view>
+				<view  class="u-flex-1 ">您确认已收取现金<span style="color: red;">{{paymoney}}</span>元吗?</view> 
+				<!-- <view class="u-flex-1 change">找零{{changeMoney}}元</view> -->
 			</view>
 			<view class="popup-footer u-flex">
 				<view class="popup-btn1" ><u-button type="primary" @click="consfimPayway">确认</u-button> </view>
@@ -131,6 +131,7 @@
 		},
 		data() {
 			return {
+				paymoney:'',
 				change:'',
 				price:'',
 				// cashMoney:'',
@@ -299,13 +300,15 @@
 					console.log('getOut ',err)
 				});
 			},
-			async onPayThis(){
+			async onPayThis(money){
+				this.paymoney = money;
 				this.detailModel.show = false;
 				this.showPayway = true;
 				this.payParams.orderList.push(this.leaveDetail.orderId);
 				// await this.confirmOut();
 			},
-			async onPayAll(){
+			async onPayAll(money){
+				this.paymoney = money;
 				this.detailModel.show = false;
 				this.showPayway = true;
 				this.payParams.orderList.push(this.leaveDetail.orderId);

+ 2 - 2
pages/ownersquery/ownersinfo/ownersinfo.vue

@@ -84,8 +84,8 @@
 		 <u-popup class="popup cashPay-popup" v-model="showCash" :mask-close-able="false" mode="center" border-radius="20" width="90%">
 		 	<view class="popup-title">本次收到缴费</view>
 		 	<view class="popup-body u-flex">
-				<view class="u-flex-1 "><u-input v-model="payParams.cashMoney" type="number" :border="true" :clearable="false" placeholder="请输入本次收到的金额(元)" /></view>
-		 		<view class="u-flex-1 change">找零{{changeMoney}}元</view>
+				<view class="u-flex-1 ">您确认已收取现金<span style="color: red;">{{payTipsItem.price}}</span>元吗?</view>
+		 		<!-- <view class="u-flex-1 change">找零{{changeMoney}}元</view> -->
 		 	</view>
 		 	<view class="popup-footer u-flex">
 		 		<view class="popup-btn1" ><u-button type="primary" @click="consfimPayway">确认</u-button> </view>