统计

ghsApp/src/admin/home/workbench.vue

@@ -8,7 +8,7 @@
 				<div class="app-size-28">今日概况</div>
 			</div>
 			<div class="income-amount">
-				<div>销售收入</div>
+				<div>收入</div>
 				<div class="price">{{ $util.numberFormat(data.todayData.income) }}</div>
 			</div>
 			<div class="user-bottom">

ghsApp/src/admin/stat/kdIncome.vue

@@ -1,28 +1,29 @@
 <template>
 <view class="app-content">
 	<view class="ex-page">
-		<view class="top-bar">
-			<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
-		</view>
-
+		<!-- <view class="top-bar"><DateSelect class="bar" top="0" @selectDateFn="selectDateFn" /></view> -->
+		<view class="top-bar" style="margin-left:100upx;">今天</view>
 		<view  class="main-view">
 			<view class="space-view ex-table">
 				<block>
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<t-tr header><t-th>收款方式</t-th><t-th>收入金额</t-th><t-th>退款金额</t-th></t-tr>
-
+						<t-tr header><t-th>渠道</t-th><t-th>笔数</t-th><t-th>金额</t-th><t-th>操作</t-th></t-tr>
 						<view v-for="(item, index) in profile" :key="index">
 							<t-tr>
 								<t-td><view>{{item.name}}</view></t-td>
+								<t-td><view>123</view></t-td>
 								<t-td><view>{{item.kd}}</view></t-td>
-								<t-td><view>{{item.refund}}</view></t-td>
+								<t-td>
+									<view>
+										<button class="admin-button-com middel blue" @click="getDetail()">查明细</button>
+									</view>
+								</t-td>
 							</t-tr>
 						</view>
-
 					</t-table>
 				</block>
 			</view>
-			<view class="act-income">扣除退款后收入：¥{{income}}</view>
+			<view class="act-income">合计 ¥{{income}}</view>
 		</view>
 	</view>
 </view>
@@ -38,7 +39,9 @@ import {mapActions, mapGetters} from "vuex";
 export default {
 	components: { SelectList, AppWrapperEmpty,ShopSelect,DateSelect},
 	mixins: [list],
-	computed: {		...mapGetters(["getDictionariesInfo","getLoginInfo"])	},
+	computed: {		
+		...mapGetters(["getDictionariesInfo","getLoginInfo"])
+	},
 	data() {
 		return {
 			isShow:false,
@@ -51,26 +54,6 @@ export default {
 			showTimeDropdown: false,
 			nowShop: "",
 			showShopDropdown: false,
-			columns: [
-				{
-					name: "姓名",
-					dataIndex: "name",
-					color: "info"
-				},
-				{
-					name: "开单额",
-					dataIndex: "amount",
-					color: "info",
-					width: 120,
-					align: "center"
-				},
-				{
-					name: "开单数",
-					dataIndex: "num",
-					color: "info",
-					align: "center"
-				}
-			],
 			dataList: [],
 			params:{
 				itemId: '',
@@ -95,6 +78,9 @@ export default {
 		this.shopId = this.getLoginInfo.shopId;
 	},
 	methods: {
+		getDetail(){
+			this.$util.confirmModal({title:'明细',content:'批发：30，零售50，欠款 90，欠款 90，欠款 90，欠款 90，欠款 90'},() => { })
+		},
 		...mapActions(['setUserShopAll']),
 		//选择分店
 		selectShopFn(val){
@@ -152,10 +138,12 @@ export default {
 			background-color: #fff;
 		}
 		.act-income{
-			margin-left:60upx;
 			margin-top:30upx;
-			font-size:30upx;
+			margin-bottom:30upx;
+			font-size:25upx;
 			color:rgb(92, 91, 91);
+			text-align:center;
+			font-weight:bold;
 		}
 		.ex-info {
 			padding: 30upx;

ghsApp/src/admin/stat/profit.vue

@@ -1,9 +1,8 @@
 <template>
 <view class="app-content">
 	<view class="ex-page">
-		<view class="top-bar">
-			<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
-		</view>
+		<!-- <view class="top-bar"> <DateSelect class="bar" top="0" @selectDateFn="selectDateFn" /> </view> -->
+		<view class="top-bar" style="margin-left:100upx;">今天</view>
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
 				<block>
@@ -18,7 +17,7 @@
 						<t-tr v-for="(item, inIndex) in profit.income" :key="inIndex">
 							<t-td><view>{{item.name}}</view></t-td>
 							<t-td><view>{{item.amount}}</view></t-td>
-							<t-td><view></view></t-td>
+							<t-td><view>-</view></t-td>
 						</t-tr>
 						<!--同个节点v-for key重复会报错，所以再包一层-->
 						<view>
@@ -26,11 +25,11 @@
 								<t-td><view>{{item.name}}</view></t-td>
 								<t-td v-if="item.amount==0"><view>0</view></t-td>
 								<t-td v-else><view>-{{item.amount}}</view></t-td>
-								<t-td><view></view></t-td>
+								<t-td><view>-</view></t-td>
 							</t-tr>
 							</view>
 						<t-tr>
-							<t-td align="center"><view style="font-weight:bold;color:black;">合计：{{profit.balance||0}}</view></t-td>
+							<t-td align="center"><view style="font-weight:bold;color:black;">合计 ¥{{profit.balance||0}}</view></t-td>
 						</t-tr>
 
 					</t-table>