数据统计

ghsApp/src/admin/stat/kdIncome.vue

@@ -33,7 +33,7 @@
 						<t-tr v-if="Number(payCodeIncome)>0">
 							<t-td align="center">
 								<view style="font-weight:bold;color:red;font-size:30upx;">
-									以上收入还要减掉收款码收入的 ￥{{ payCodeIncome }}
+									以上还要减掉重复登记的收款码收入 ￥{{ payCodeIncome }}
 								</view>
 							</t-td>
 						</t-tr>

hdApp/src/admin/stat/kdIncome.vue

@@ -28,6 +28,32 @@
 								</view>
 							</t-td>
 						</t-tr>
+
+						<t-tr v-if="Number(payCodeIncome)>0">
+							<t-td align="center">
+								<view style="font-weight:bold;color:red;font-size:30upx;">
+									以上还要减掉重复登记的收款码收入 ￥{{ payCodeIncome }}
+								</view>
+							</t-td>
+						</t-tr>
+
+						<view v-if="!$util.isEmpty(staffAmountList)">
+							<t-tr>
+								<t-td></t-td>
+								<t-td></t-td>
+								<t-td></t-td>
+								<t-td></t-td>
+							</t-tr>
+							<view v-for="(it, idx) in staffAmountList" :key="idx">
+							<t-tr>
+								<t-td><view style="width:180upx;color:black;font-size:26upx;">{{it.staffName?it.staffName:'未命名'}}</view></t-td>
+								<t-td><view style="color:black;font-size:26upx;">数量 {{it.num?it.num:0}}</view></t-td>
+								<t-td><view style="color:black;font-size:28upx;">¥{{it.amount?parseFloat(it.amount):0}}</view></t-td>
+								<t-td> <view> </view> </t-td>
+							</t-tr>
+							</view>
+						</view>
+
 					</t-table>
 				</block>
 			</view>
@@ -95,6 +121,7 @@ export default {
 			nowTime: "",
 			showTimeDropdown: false,
 			nowShop: "",
+			payCodeIncome:0,
 			showShopDropdown: false,
 			dataList: [],
 			params:{
@@ -108,7 +135,8 @@ export default {
 			profile:[],
 			totalIncome:0,
 			showDetailPop:false,
-			detailItem:[]
+			detailItem:[],
+			staffAmountList:[]
 		};
 	},
 	onPullDownRefresh() {
@@ -155,7 +183,9 @@ export default {
 			getStatKdProfile(this.params).then(res => {
 				uni.hideLoading()
 				that.profile = res.data.list
+				that.payCodeIncome = res.data.payCodeIncome ? parseFloat(res.data.payCodeIncome) : 0
 				that.totalIncome = res.data.totalIncome
+				that.staffAmountList = res.data.staffAmountList
 			});
 		}
 	}

hdApp/src/admin/stat/profit.vue

@@ -14,7 +14,7 @@
 							<t-th>操作</t-th>
 						</t-tr>
 						<block v-for="(item, inIndex) in profit.income" :key="inIndex">
-							<t-tr v-if="item.id !='pf'">
+							<t-tr>
 								<t-td><view style="color:black;font-size:30upx;">{{item.name}}</view></t-td>
 								<t-td><view style="color:black;font-size:30upx;">{{item.amount}}</view></t-td>
 								<t-td><view>-</view></t-td>
@@ -23,7 +23,7 @@
 						<!--同个节点v-for key重复会报错，所以再包一层-->
 						<view>
 							<block v-for="(item, exIndex) in profit.expend" :key="exIndex">
-								<t-tr v-if="item.id != 'pfSendCost'">
+								<t-tr>
 									<t-td><view style="color:black;font-size:30upx;">{{item.name}}</view></t-td>
 									<t-td v-if="item.amount==0"><view style="color:black;font-size:30upx;">0</view></t-td>
 									<t-td v-else><view style="color:black;font-size:30upx;">-{{item.amount}}</view></t-td>
@@ -36,6 +36,15 @@
 								<view style="font-weight:bold;color:black;font-size:32upx;">利润 ¥{{profit.balance||0}}</view>
 							</t-td>
 						</t-tr>
+						<block v-if="Number(profit.payCodeIncome)>0">
+							<t-tr>
+								<t-td align="center">
+									<view style="font-weight:bold;color:red;font-size:30upx;">
+										以上利润还要减掉收款码收入的 ￥{{ profit.payCodeIncome }}
+									</view>
+								</t-td>
+							</t-tr>
+						</block>
 						<block v-if="profit.wastagePrice && Number(profit.wastagePrice)>0">
 							<t-tr>
 								<t-td align="center">