shish 2 лет назад
Родитель
Сommit
fcf28af69e
1 измененных файлов с 55 добавлено и 22 удалено
  1. 55 22
      ghsApp/src/admin/stat/classProfit.vue

+ 55 - 22
ghsApp/src/admin/stat/classProfit.vue

@@ -59,7 +59,9 @@
 							<t-td><view style="color:black;font-size:28upx;color:#3385FF;">{{profit.totalExpend}}</view></t-td>
 							<t-td><view style="color:black;font-size:28upx;color:#3385FF;">{{profit.totalProfit}}</view></t-td>
 						</t-tr>
-						<view style="margin-left:50upx;">以上暂未统计零售端【花掌柜】数据</view>
+
+						<view style="margin-left:60upx;">以上暂未统计零售端【花掌柜】数据</view>
+
 						<view v-if="!$util.isEmpty(tbSaleIncome)">
 							<t-tr>
 								<t-td></t-td>
@@ -67,16 +69,7 @@
 								<t-td></t-td>
 								<t-td></t-td>
 							</t-tr>
-							<t-tr>
-								<t-td align="center">
-									<view style="color:black;font-size:24upx;font-weight:bold;">
-										销售单项统计
-									</view>
-								</t-td>
-								<t-td></t-td>
-								<t-td></t-td>
-								<t-td></t-td>
-							</t-tr>
+							<view style="margin-left:60upx;font-size:26upx;font-weight:bold;margin-bottom:10upx;">销售单项统计</view>
 							<view v-for="(it, idx) in tbSaleIncome" :key="idx">
 							<t-tr>
 								<t-td><view style="width:180upx;color:black;font-size:26upx;">{{it.name?it.name:'未命名'}}</view></t-td>
@@ -94,16 +87,7 @@
 								<t-td></t-td>
 								<t-td></t-td>
 							</t-tr>
-							<t-tr>
-								<t-td align="center">
-									<view style="color:black;font-size:24upx;font-weight:bold;">
-										采购单项统计
-									</view>
-								</t-td>
-								<t-td></t-td>
-								<t-td></t-td>
-								<t-td></t-td>
-							</t-tr>
+							<view style="margin-left:60upx;font-size:26upx;font-weight:bold;margin-bottom:10upx;">采购单项统计</view>
 							<view v-for="(it, idx) in tbCgIncome" :key="idx">
 							<t-tr>
 								<t-td><view style="width:180upx;color:black;font-size:26upx;">{{it.name}}</view></t-td>
@@ -113,6 +97,49 @@
 							</t-tr>
 							</view>
 						</view>
+						<t-tr>
+							<t-td></t-td>
+							<t-td></t-td>
+							<t-td></t-td>
+							<t-td></t-td>
+						</t-tr>
+
+						<view style="margin-left:60upx;">---------------------------</view>
+
+						<view v-if="!$util.isEmpty(tbSaleIncomeStaff)">
+							<view style="margin-left:60upx;font-size:26upx;font-weight:bold;margin-bottom:10upx;">销售单项统计(按人)</view>
+							<view v-for="(it, idx) in tbSaleIncomeStaff" :key="idx">
+								<view v-for="(itSon, idxSon) in it" :key="idxSon">
+									<t-tr>
+										<t-td><view style="width:180upx;color:black;font-size:26upx;">{{itSon.name?itSon.name:'未命名'}}</view></t-td>
+										<t-td><view style="color:black;font-size:26upx;">数量 {{itSon.num?itSon.num:0}}</view></t-td>
+										<t-td><view style="color:black;font-size:28upx;">¥{{itSon.price?parseFloat(itSon.price):0}}</view></t-td>
+										<t-td> <view style="color:black;font-size:28upx;">{{ itSon.staffName||'' }}</view> </t-td>
+									</t-tr>
+								</view>	
+							</view>
+						</view>
+
+						<view v-if="!$util.isEmpty(tbCgIncomeStaff)">
+							<t-tr>
+								<t-td></t-td>
+								<t-td></t-td>
+								<t-td></t-td>
+								<t-td></t-td>
+							</t-tr>
+							<view style="margin-left:60upx;font-size:26upx;font-weight:bold;margin-bottom:10upx;">采购单项统计(按人)</view>
+							<view v-for="(it, idx) in tbCgIncomeStaff" :key="idx">
+								<view v-for="(itSon, idxSon) in it" :key="idxSon">
+									<t-tr>
+										<t-td><view style="width:180upx;color:black;font-size:26upx;">{{itSon.name}}</view></t-td>
+										<t-td><view style="color:black;font-size:26upx;">数量 {{itSon.num}}</view></t-td>
+										<t-td><view style="color:black;font-size:28upx;">¥{{itSon.price?parseFloat(itSon.price):0}}</view></t-td>
+										<t-td><view style="color:black;font-size:28upx;">{{ itSon.staffName||'' }}</view></t-td>
+									</t-tr>
+								</view>
+							</view>
+						</view>
+
 
 					</t-table>
 				</block>
@@ -157,7 +184,9 @@ export default {
 			},
 			profit:[],
 			tbSaleIncome:[],
-			tbCgIncome:[]
+			tbCgIncome:[],
+			tbSaleIncomeStaff:[],
+			tbCgIncomeStaff:[]
 		};
 	},
 	onPullDownRefresh() {
@@ -190,12 +219,16 @@ export default {
 			let that = this
 			that.tbSaleIncome = []
 			that.tbCgIncome = []
+			that.tbSaleIncomeStaff = []
+			that.tbCgIncomeStaff = []
 			uni.showLoading({mask:true})
 			getClassProfit(this.params).then(res => {
 				uni.hideLoading()
 				that.profit = res.data
 				that.tbSaleIncome = res.data.tbSaleIncome?res.data.tbSaleIncome:[]
 				that.tbCgIncome = res.data.tbCgIncome ? res.data.tbCgIncome : []
+				that.tbSaleIncomeStaff = res.data.tbSaleIncomeStaff?res.data.tbSaleIncomeStaff:[]
+				that.tbCgIncomeStaff = res.data.tbCgIncomeStaff ? res.data.tbCgIncomeStaff : []
 				that.$forceUpdate()
 			});
 		}