统计

hdApp/src/admin/home/workbench.vue

@@ -18,13 +18,13 @@
       <div class="user-top">
         <div class="app-size-28">今日概况</div>
       </div>
-      <div class="income-amount" @click="goToIncome">
+      <div class="income-amount" @click="goToProfit">
         <div>收入</div>
         <div class="price">{{ $util.numberFormat(data.todayData.income) }}</div>
       </div>
       <div class="user-bottom">
         <navigator url="/admin/home/order" open-type="switchTab" class="info-list">
-          <div class="info-list-name">开单</div>
+          <div class="info-list-name">订单</div>
           <div class="info-list-value">
             {{ $util.numberFormat(data.todayData.order) || 0 }}
           </div>
@@ -36,13 +36,49 @@
           </div>
         </div>
         <div class="info-list" @click="goToExpend" >
-          <div class="info-list-name">支出</div>
+          <div class="info-list-name">损耗</div>
           <div class="info-list-value">
-            {{ $util.numberFormat(data.todayData.out) || 0 }}
+            {{ $util.numberFormat(data.todayData.wastage) || 0 }}
           </div>
         </div>
       </div>
     </div>
+
+		<div class="module-com order-wrap" @click="pageTo({url:'/admin/stat/kdIncome'})">
+			<div class="total-blo">
+				<div class="total-list2"> 
+					<div class="app-color-3">系统收款</div>
+					<div class="list-num">
+						<view>{{countStat.systemCount||0}}</view>
+						<view>{{countStat.systemIncome?parseFloat(countStat.systemIncome):0}}</view>
+					</div>
+				</div>
+				<div class="total-list2"> 
+					<div class="app-color-3">员工收款</div>
+					<div class="list-num">
+						<view>{{countStat.kfWxCount||0}}</view>
+						<view>{{countStat.kfWxIncome?parseFloat(countStat.kfWxIncome):0}}</view>
+					</div> 
+				</div>
+				<div class="total-list2"> 
+					<div class="app-color-3">现金收款</div>
+					<div class="list-num">
+						<view>{{countStat.cashCount||0}}</view>
+						<view>{{countStat.cashIncome?parseFloat(countStat.cashIncome):0}}</view>
+					</div> 
+				</div>
+				<div class="total-list2"> 
+					<div class="app-color-3">欠款</div>
+					<div class="list-num">
+						<view>{{countStat.debtCount||0}}</view>
+						<view>{{countStat.debtIncome?parseFloat(countStat.debtIncome):0}}</view>
+					</div> 
+				</div>
+			</div>
+		</div>
+
+</template>
+
     <div class="module-com news-wrap">
       <div class="news-list" v-for="(item, index) in data.notice" :key="index" @click="noticeFn(item)" >
         <div class="news-left">
@@ -55,8 +91,6 @@
         </div>
       </div>
     </div>
-</template>
-
 
     <view class="module-com">
       <view class="tabs-head_bx">
@@ -163,7 +197,7 @@
 <script>
 import { mapGetters, mapState } from "vuex";
 import { getWeixinId } from "@/api/invite";
-import { getStat } from '@/api/console'
+import { getStat,getStrokeCount } from '@/api/console'
 import { getShopInfo } from "@/utils/auth";
 import { consoleIndex } from "@/api/workbench";
 import NotLogin from "@/components/not-login";
@@ -214,7 +248,8 @@ export default {
       kdSrc: `${this.$constant.imgUrl}/ghs/home/zzkd.jpg`,
       supplierList: [],
       //登录状态 0未登录 1登录仅用到了采购 2登录用到完整功能
-      loginStyle :0
+      loginStyle :0,
+      countStat:{systemIncome:0,systemCount:0,debtCount:0,debtIncome:0,kfWxCount:0,kfWxIncome:0}
     };
   },
   computed: {
@@ -254,6 +289,11 @@ export default {
           }
       }
 
+      this.showShopName()
+
+  },
+  methods: {
+    showShopName(){
       getShopInfo().then(res => {
         if(res.name){
           uni.setNavigationBarTitle({ title: res.name })
@@ -261,8 +301,7 @@ export default {
           uni.setNavigationBarTitle({ title: '店铺' })
         }
       })
-  },
-  methods: {
+    },
     suggest(){
       let that = this
       that.$util.confirmModal({content:'请添加客服微信反馈',okText:'复制微信'},() => {
@@ -350,28 +389,29 @@ export default {
           this.data = res.data;
         })
 
+        getStrokeCount().then(res=>{
+          if(res.code == 1){
+            this.countStat = res.data
+          }
+        })
+
         getStat().then(res=>{
           if(res.code == 1){
             that.overview = res.data.overview
           }
         })
 
+        this.showShopName()
+
     },
-    //通知处理
     noticeFn (item) {
       this.$util.pageTo({ url: item.page })
     },
-    //支出
     goToExpend () {
       uni.navigateTo({ url: '/pagesStore/me/expend' })
     },
-    //收入
-    goToIncome () {
-      uni.navigateTo({ url: '/pagesStore/me/income' })
-    },
-    //续费
-    renewFn () {
-      this.$util.pageTo({ url: "/pagesClient/official/index", query: { pay: 1 }, type: 2 })
+    goToProfit () {
+      this.$util.pageTo({ url: '/admin/stat/profit' })
     },
     goToMallPt (url) {
       let self = this
@@ -491,35 +531,55 @@ export default {
 // 总览
 .total-wrap,
 .order-wrap {
-  .total-tit {
-    padding: 18upx 0 18upx 20upx;
-    border-bottom: 1px solid $borderColor;
-    font-weight: 600;
-    font-size: 24upx;
-    color: #333333;
-  }
-  .total-blo {
-    @include disFlex(center, space-between);
-    flex-wrap: wrap;
-    padding: 30upx 0 40upx;
-    .total-list {
-      width: 33%;
-      text-align: center;
-      margin: 20upx 0upx;
-      border-right: 1px solid $borderColor;
-      .list-num {
-        margin-bottom: 8upx;
-        font-size: 36upx;
-        font-weight: bold;
-      }
-    }
-    .total-list:nth-child(3n) {
-      border-right: none;
-    }
-    .total-list:nth-child(n + 4) {
-      padding-bottom: 0;
-    }
-  }
+	.total-tit {
+		padding: 18upx 0 18upx 20upx;
+		border-bottom: 1upx solid $borderColor;
+		font-weight: 600;
+		font-size: 24upx;
+		color: #333333;
+	}
+	.total-blo {
+		@include disFlex(center, space-between);
+		flex-wrap: wrap;
+		padding: 20upx 0 0;
+		.total-list {
+			width: 33%;
+			text-align: center;
+			margin: 20upx 0upx;
+			border-right: 1upx solid $borderColor;
+			.list-num {
+				margin-bottom: 8upx;
+				font-size: 36upx;
+				font-weight: bold;
+			}
+		}
+		.total-list:nth-child(3n) {
+			border-right: none;
+		}
+		.total-list:nth-child(n + 4) {
+			padding-bottom: 0;
+		}
+
+		.total-list2 {
+			width: 24%;
+			text-align: center;
+			margin: 20upx 0upx;
+			border-right: 1upx solid $borderColor;
+			.list-num {
+				margin-top:10upx;
+				margin-bottom:8upx;
+				font-size:26upx;
+				font-weight:normal;
+			}
+		}
+		.total-list2:nth-child(4n) {
+			border-right: none;
+		}
+		.total-list2:nth-child(n + 4) {
+			padding-bottom: 0;
+		}
+
+	}
 }
 .tabs-head_bx {
   display: flex;

hdApp/src/admin/stat/profit.vue

@@ -13,19 +13,23 @@
 							<t-th>金额</t-th>
 							<t-th>操作</t-th>
 						</t-tr>
-						<t-tr v-for="(item, inIndex) in profit.income" :key="inIndex">
-							<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>
-						</t-tr>
-						<!--同个节点v-for key重复会报错，所以再包一层-->
-						<view>
-							<t-tr v-for="(item, exIndex) in profit.expend" :key="exIndex">
+						<block v-for="(item, inIndex) in profit.income" :key="inIndex">
+							<t-tr v-if="item.id !='pf'">
 								<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>
+								<t-td><view style="color:black;font-size:30upx;">{{item.amount}}</view></t-td>
 								<t-td><view>-</view></t-td>
 							</t-tr>
+						</block>
+						<!--同个节点v-for key重复会报错，所以再包一层-->
+						<view>
+							<block v-for="(item, exIndex) in profit.expend" :key="exIndex">
+								<t-tr v-if="item.id != 'pfSendCost'">
+									<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>
+									<t-td><view>-</view></t-td>
+								</t-tr>
+							</block>
 						</view>
 						<t-tr>
 							<t-td align="center">
@@ -41,6 +45,7 @@
 								</t-td>
 							</t-tr>
 						</block>
+
 					</t-table>
 				</block>
 			</view>

hdApp/src/api/console/index.js

@@ -2,4 +2,8 @@ import https from '@/plugins/luch-request_0.0.7/request'
 
 export const getStat = async data => {
 	return https.get('/console/stat', data)
+}
+
+export const getStrokeCount = async data => {
+	return https.get('/console/stroke-count', data)
 }