收支分类

ghsApp/src/admin/stat/classProfit.vue

@@ -20,47 +20,82 @@
 							<t-td><view>{{item.expend}}</view></t-td>
 							<t-td><view>{{item.profit}}</view></t-td>
 						</t-tr>
-						<t-tr>
-							<t-td><view style="color:black;font-size:28upx;">【合计】</view></t-td>
-							<t-td><view style="color:black;font-size:28upx;">{{profit.totalIncome}}</view></t-td>
-							<t-td><view style="color:black;font-size:28upx;">{{profit.totalExpend}}</view></t-td>
-							<t-td><view style="color:black;font-size:28upx;">{{profit.totalProfit}}</view></t-td>
-						</t-tr>
 						<t-tr>
 							<t-td><view style="color:black;font-size:24upx;font-weight:bold;">物流打包费</view></t-td>
+							<t-td><view style="color:black;font-size:24upx;">0</view></t-td>
 							<t-td><view style="color:black;font-size:24upx;">{{profit.packFreight?parseFloat(profit.packFreight):0}}</view></t-td>
-							<t-td><view style="color:black;font-size:24upx;color:#3385FF;">利润应减</view></t-td>
-							<t-td><view style="color:black;font-size:24upx;color:#3385FF;">此项(-)</view></t-td>
+							<t-td><view style="color:black;font-size:24upx;">0</view></t-td>
 						</t-tr>
 						<t-tr>
 							<t-td><view style="color:black;font-size:24upx;font-weight:bold;">采购仅退款</view></t-td>
 							<t-td><view style="color:black;font-size:24upx;">{{profit.onlyRefundCg?parseFloat(profit.onlyRefundCg):0}}</view></t-td>
-							<t-td><view style="color:black;font-size:24upx;color:#3385FF;">利润应加</view></t-td>
-							<t-td><view style="color:black;font-size:24upx;color:#3385FF;">此项(+)</view></t-td>
+							<t-td><view style="color:black;font-size:24upx;">0</view></t-td>
+							<t-td><view style="color:black;font-size:24upx;">0</view></t-td>
 						</t-tr>
 						<t-tr>
 							<t-td><view style="color:black;font-size:24upx;font-weight:bold;">销售仅退款</view></t-td>
+							<t-td><view style="color:black;font-size:24upx;">0</view></t-td>
 							<t-td><view style="color:black;font-size:24upx;">{{profit.onlyRefund?parseFloat(profit.onlyRefund):0}}</view></t-td>
-							<t-td><view style="color:black;font-size:24upx;color:#3385FF;">利润应减</view></t-td>
-							<t-td><view style="color:black;font-size:24upx;color:#3385FF;">此项(-)</view></t-td>
+							<t-td><view style="color:black;font-size:24upx;">0</view></t-td>
 						</t-tr>
-
-						<view v-if="!$util.isEmpty(costList)">
+						<t-tr>
+							<t-td><view style="color:black;font-size:24upx;font-weight:bold;">【汇总金额】</view></t-td>
+							<t-td><view style="color:black;font-size:28upx;">{{profit.totalIncome}}</view></t-td>
+							<t-td><view style="color:black;font-size:28upx;">{{profit.totalExpend}}</view></t-td>
+							<t-td><view style="color:black;font-size:28upx;">{{profit.totalProfit}}</view></t-td>
+						</t-tr>
+						<view v-if="!$util.isEmpty(tbSaleIncome)">
+							<t-tr>
+								<t-td></t-td>
+								<t-td></t-td>
+								<t-td></t-td>
+								<t-td></t-td>
+							</t-tr>
 							<t-tr>
 								<t-td align="center">
-									<view style="color:black;font-size:25upx;font-weight:bold;">
-										特别收入统计：
+									<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 v-for="(it, idx) in tbSaleIncome" :key="idx">
+							<t-tr>
+								<t-td><view style="width:180upx;color:black;font-size:26upx;">{{it.name}}</view></t-td>
+								<t-td><view style="color:black;font-size:26upx;">数量 {{it.num}}</view></t-td>
+								<t-td><view style="color:black;font-size:28upx;">¥{{it.price?parseFloat(it.price):0}}</view></t-td>
+								<t-td> <view> </view> </t-td>
 							</t-tr>
+							</view>
 						</view>
-						<view v-for="(it, idx) in costList" :key="idx">
+
+						<view v-if="!$util.isEmpty(tbCgIncome)">
+							<t-tr>
+								<t-td></t-td>
+								<t-td></t-td>
+								<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 v-for="(it, idx) in tbCgIncome" :key="idx">
 							<t-tr>
-								<t-td><view style="width:180upx;color:black;font-size:30upx;">{{it.name}}</view></t-td>
-								<t-td><view style="color:black;font-size:28upx;">数量 {{it.num}}</view></t-td>
-								<t-td><view style="color:black;font-size:30upx;">¥{{it.price?parseFloat(it.price):0}}</view></t-td>
+								<t-td><view style="width:180upx;color:black;font-size:26upx;">{{it.name}}</view></t-td>
+								<t-td><view style="color:black;font-size:26upx;">数量 {{it.num}}</view></t-td>
+								<t-td><view style="color:black;font-size:28upx;">¥{{it.price?parseFloat(it.price):0}}</view></t-td>
 								<t-td> <view> </view> </t-td>
 							</t-tr>
+							</view>
 						</view>
 
 					</t-table>
@@ -105,7 +140,8 @@ export default {
 				
 			},
 			profit:[],
-			costList:[]
+			tbSaleIncome:[],
+			tbCgIncome:[]
 		};
 	},
 	onPullDownRefresh() {
@@ -140,7 +176,8 @@ export default {
 			getClassProfit(this.params).then(res => {
 				uni.hideLoading()
 				that.profit = res.data
-				that.costList = res.data.costIncome||[]
+				that.tbSaleIncome = res.data.tbSaleIncome?res.data.tbSaleIncome:[]
+				that.tbCgIncome = res.data.tbCgIncome ? res.data.tbCgIncome : []
 			});
 		}
 	}