shish 2 ani în urmă
părinte
comite
6af561b93e

+ 4 - 2
ghsApp/src/admin/custom/rechargeChange.vue

@@ -6,7 +6,8 @@
 					<t-th>日期</t-th>
 					<t-th>日期</t-th>
 					<t-th>场景</t-th>
 					<t-th>场景</t-th>
 					<t-th>人员</t-th>
 					<t-th>人员</t-th>
-					<t-th>变动</t-th>
+					<t-th>状态</t-th>
+					<t-th>金额</t-th>
 					<t-th>充后余额</t-th>
 					<t-th>充后余额</t-th>
 					<t-th>备注</t-th>
 					<t-th>备注</t-th>
 				</t-tr>
 				</t-tr>
@@ -15,8 +16,9 @@
 						<t-td align="center" color="info"><view >{{ item.addTime.substr(5,11) }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.addTime.substr(5,11) }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.onlinePay == 2 ? '线上' : '线下'}}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.onlinePay == 2 ? '线上' : '线下'}}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.staffName }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.staffName }}</view></t-td>
+						<t-td align="center" color="info"><view >{{ item.payStatus == 1 ? '已付款' : '待付款' }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.amount }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.amount }}</view></t-td>
-						<t-td align="center" color="info"><view >{{ parseFloat(item.balance) }}</view></t-td>
+						<t-td align="center" color="info"><view >{{ item.payStatus == 1 ? parseFloat(item.balance):'' }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.remark }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.remark }}</view></t-td>
 					</t-tr>
 					</t-tr>
 				</view>
 				</view>

+ 3 - 3
hdApp/src/admin/ghs/rechargeChange.vue

@@ -4,20 +4,20 @@
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
 				<t-tr header>
 					<t-th>日期</t-th>
 					<t-th>日期</t-th>
-					<t-th>编号</t-th>
 					<t-th>人员</t-th>
 					<t-th>人员</t-th>
 					<t-th>场景</t-th>
 					<t-th>场景</t-th>
+					<t-th>状态</t-th>
 					<t-th>变动</t-th>
 					<t-th>变动</t-th>
 					<t-th>充后余额</t-th>
 					<t-th>充后余额</t-th>
 				</t-tr>
 				</t-tr>
 				<view v-for="(item, index) in list.data" :key="index" @click="goDetail(item)">
 				<view v-for="(item, index) in list.data" :key="index" @click="goDetail(item)">
 					<t-tr>
 					<t-tr>
 						<t-td align="center" color="info"><view >{{ item.addTime.substr(5,11) }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.addTime.substr(5,11) }}</view></t-td>
-						<t-td align="center" color="info"><view>{{ item.orderSn }}</view></t-td>
 						<t-td align="center" color="info"><view>{{ item.staffName }}</view></t-td>
 						<t-td align="center" color="info"><view>{{ item.staffName }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.onlinePay==2?'线上':'线下' }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.onlinePay==2?'线上':'线下' }}</view></t-td>
+						<t-td align="center" color="info"><view >{{ item.payStatus == 1 ? '已付款':'待付款' }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.amount }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.amount }}</view></t-td>
-						<t-td align="center" color="info"><view >{{ parseFloat(item.balance) }}</view></t-td>
+						<t-td align="center" color="info"><view >{{ item.payStatus == 1?parseFloat(item.balance):'' }}</view></t-td>
 					</t-tr>
 					</t-tr>
 				</view>
 				</view>
 			</t-table>
 			</t-table>