分类收支统计

ghsApp/src/admin/home/apply.vue

@@ -59,6 +59,7 @@ export default {
                         {name: "收入统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/kdIncome"},
                         {name: "花材销量",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/productSale"},
                         {name: "客户业绩",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/customSale"},
+                        {name: "收支分类",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/classProfit"},
                         {name: "供货商业绩",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/cgStat"},
                         {name: "采购人业绩",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/cgYj"},
                         {name: "采购花材",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/cgItem"},
@@ -66,8 +67,7 @@ export default {
                         {name: "库存总览",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/stock"},
                         {name: "损耗花材",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/wastage"},
                         {name: "损耗总览",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/waste"},
-                        {name: "结账跟踪",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/clear"},
-                        {name: "分类收支",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/classProfit"},
+                        {name: "结账跟踪",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/clear"}
                     ]
                 },
                 {

ghsApp/src/admin/stat/classProfit.vue

@@ -27,12 +27,42 @@
 							<t-td><view style="color:black;font-size:28upx;">{{profit.totalProfit}}</view></t-td>
 						</t-tr>
 						<t-tr>
-							<t-td align="center">
-								<view style="font-weight:bold;color:black;font-size:23upx;">
-									打包物流成本 {{profit.packFreight?parseFloat(profit.packFreight):0}} | 采购退款 {{profit.onlyRefundCg?parseFloat(profit.onlyRefundCg):0}} | 销售退款 {{profit.onlyRefund?parseFloat(profit.onlyRefund):0}}
-								</view>
-							</t-td>
+							<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.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;"></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;"></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.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;"></view></t-td>
+						</t-tr>
+
+						<view v-if="!$util.isEmpty(costList)">
+							<t-tr>
+								<t-td align="center">
+									<view style="color:black;font-size:25upx;font-weight:bold;">
+										特别收入统计：
+									</view>
+								</t-td>
+							</t-tr>
+						</view>
+						<view v-for="(it, idx) in costList" :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:30upx;">数量：{{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> </view> </t-td>
+							</t-tr>
+						</view>
+
 					</t-table>
 				</block>
 			</view>
@@ -75,6 +105,7 @@ export default {
 				
 			},
 			profit:[],
+			costList:[]
 		};
 	},
 	onPullDownRefresh() {
@@ -109,6 +140,7 @@ export default {
 			getClassProfit(this.params).then(res => {
 				uni.hideLoading()
 				that.profit = res.data
+				that.costList = res.data.costIncome||[]
 			});
 		}
 	}

ghsApp/src/admin/stat/kdIncome.vue

@@ -29,24 +29,6 @@
 								</view>
 							</t-td>
 						</t-tr>
-						<view v-if="!$util.isEmpty(costList)">
-							<t-tr>
-								<t-td align="center">
-									<view style="color:black;font-size:25upx;">
-										以上合计的总收入，已包含了以下细分收入
-									</view>
-								</t-td>
-							</t-tr>
-						</view>
-						<view v-for="(it, idx) in costList" :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:30upx;">数量：{{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> </view> </t-td>
-							</t-tr>
-						</view>
-
 
 					</t-table>
 				</block>
@@ -129,7 +111,6 @@ export default {
 				contain:0
 			},
 			profile:[],
-			costList:[],
 			totalIncome:0,
 			showDetailPop:false,
 			detailItem:[]
@@ -181,7 +162,6 @@ export default {
 			getStatKdProfile(this.params).then(res => {
 				uni.hideLoading()
 				that.profile = res.data.list||[]
-				that.costList = res.data.costIncome||[]
 				that.totalIncome = res.data.totalIncome
 			})
 		}

ghsApp/src/pages.json

@@ -269,7 +269,7 @@
 			"root": "admin/stat",
 			"pages": [
 				{"path": "profit","style": {"navigationBarTitleText": "利润表"}},
-				{"path": "classProfit","style": {"navigationBarTitleText": "分类收支"}},
+				{"path": "classProfit","style": {"navigationBarTitleText": "收支分类"}},
 				{"path": "productSale","style": {"navigationBarTitleText": "花材销量"}},
 				{"path": "kdIncome","style": {"navigationBarTitleText": "收入统计"}},
 				{"path": "customSale","style": {"navigationBarTitleText": "客户下单排行"}},