预订单

ghsApp/src/admin/home/workbench.vue

@@ -114,12 +114,16 @@ export default {
 			tabsData: [
 				{ name: "商城", img: 'ghs/home/shop.png', url: "/admin/home/mall" },
 				{ name: "改价", img: 'ghs/home/gj.png', url: "/admin/changePrice/list" },
+				{ name: "花材", img: 'ghs/home/hcgl.png', url: "/admin/item/list" },
+				{name: "供应商", img: 'ghs/home/icon_ghs.png', url: '/pagesPurchase/supplier'},
 				{ name: "采购单", img: 'ghs/home/icon_caigou.png', url: "/pagesPurchase/order" },
 				{ name: "报损单", img: 'ghs/home/kcyjs.png', url: "/admin/breakage/list" },
 				{ name: "预订单", img: 'ghs/home/kcyjs.png', url: "/admin/order/statBook" },
-				{ name: "花材", img: 'ghs/home/hcgl.png', url: "/admin/item/list" },
 				{ name: "调拨出库", img: 'ghs/home/dbck.png', url: "/pagesStorehouse/allot/allotEx" },
-				{ name: "调拨入库", img: 'ghs/home/dbrk.png', url: "/pagesStorehouse/allot/allotPut" }
+				{ name: "调拨入库", img: 'ghs/home/dbrk.png', url: "/pagesStorehouse/allot/allotPut" },
+				{name : "员工", img: "ghs/home/yggl.png", url : "/admin/staff/list"},
+				{name : "销售结账单", img : "ghs/home/kcyjs.png", url : "/admin/clear/customList"},
+				{name : "采购结账单", img : "ghs/home/kcyjs.png", url : "/admin/clear/list"},
 			],
 			totalData: [
 				{ name: "客户数", value: 0, url:'/admin/home/member', type:4 },

ghsApp/src/admin/order/statBook.vue

@@ -9,14 +9,13 @@
 
 		<view class="top-bar">
 			<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
-			<ShopSelect class="bar" top="0" @selectShopFn="selectShopFn" />
 		</view>
 
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
-				<block v-if="!$util.isEmpty(profile)">
-					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<t-tr header><t-th>日期</t-th><t-th>花材</t-th><t-th>数量</t-th><t-th>明细</t-th></t-tr>
+				<t-table :headerBackgroundColor="'#F0F2F6'">
+					<t-tr header><t-th>日期</t-th><t-th>花材</t-th><t-th>数量</t-th><t-th>明细</t-th></t-tr>
+					<template v-if="!$util.isEmpty(profile)">
 						<view v-for="(item, index) in profile" :key="index" @click="goDetail(item)">
 							<t-tr>
 								<t-td><view>{{item.time.substr(4,4)}}</view></t-td>
@@ -25,8 +24,8 @@
 								<t-td><view><text style="color:#3385FF">查看</text></view></t-td>
 							</t-tr>
 						</view>
-					</t-table>
-				</block>
+					</template>
+				</t-table>
 			</view>
 		</scroll-view>
 		</view>
@@ -135,6 +134,7 @@ export default {
 					that.filterStat()
 				}else{
 					that.storageData=[]
+					that.profile = []
 				}
 			});
 		}

ghsApp/src/admin/order/statKhBook.vue

@@ -1,34 +1,34 @@
 <template>
-<view class="app-content">
-	<view class="ex-page">
-    <view class="input-wrap_box">
-      <view>
-        <AppSearchModule placeholder="输入英文字母搜索" @input="searchFn"/>
-      </view>
-    </view>
+	<view class="app-content">
+		<view class="ex-page">
+			<view class="input-wrap_box">
+			<view>
+				<AppSearchModule placeholder="输入英文字母搜索" @input="searchFn"/>
+			</view>
+			</view>
 
-	<view class="top-bar">
-		<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
-	</view>
+			<view class="top-bar">
+				<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
+			</view>
 
-		<scroll-view scroll-y scroll-with-animation class="main-view">
-			<view class="space-view ex-table">
-				<block v-if="!$util.isEmpty(profile)">
+			<view scroll-y scroll-with-animation class="main-view">
+				<view class="space-view ex-table">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<t-tr header><t-th>花材</t-th><t-th>数量</t-th><t-th>金额</t-th></t-tr>
-						<view v-for="(item, index) in profile" :key="index" @click="goDetail(item)">
-							<t-tr>
-								<t-td><view>{{item.name}}</view></t-td>
-								<t-td><view>{{parseFloat(item.num)}}</view></t-td>
-								<t-td><view>{{parseFloat(item.amount)}}</view></t-td>
-							</t-tr>
-						</view>
+						<template v-if="!$util.isEmpty(profile)">
+							<view v-for="(item, index) in profile" :key="index" @click="goDetail(item)">
+								<t-tr>
+									<t-td><view>{{item.name}}</view></t-td>
+									<t-td><view>{{parseFloat(item.num)}}</view></t-td>
+									<t-td><view>{{parseFloat(item.amount)}}</view></t-td>
+								</t-tr>
+							</view>
+						</template>
 					</t-table>
-				</block>
+				</view>
 			</view>
-		</scroll-view>
+		</view>
 	</view>
-</view>
 </template>
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
@@ -37,12 +37,14 @@ import { getStatItemProfit } from "@/api/statistics/index";
 import { list } from "@/mixins";
 import ShopSelect from "@/components/module/shopSelect";
 import DateSelect from "@/components/module/dateSelect";
-import {mapActions, mapGetters} from "vuex";
+import {mapGetters} from "vuex";
 import AppSearchModule from "@/components/module/app-search";
 export default {
 	components: { SelectList, AppWrapperEmpty,ShopSelect,DateSelect,AppSearchModule},
 	mixins: [list],
-	computed: {		...mapGetters(["getDictionariesInfo","getLoginInfo"])	},
+	computed: {		
+		...mapGetters(["getDictionariesInfo","getLoginInfo"])
+	},
 	data() {
 		return {
 			isShow:false,
@@ -98,7 +100,6 @@ export default {
 		this.shopId = this.getLoginInfo.shopId;
 	},
 	methods: {
-		...mapActions(['setUserShopAll']),
 		searchFn(e){
 			this.searchContent = e;
 			this.filterStat()
@@ -134,14 +135,17 @@ export default {
 		},
 		getStatList() {
 			let that = this
-			uni.showLoading()
+			uni.showLoading({mask:true})
 			getStatItemProfit(this.params).then(res => {
 				uni.hideLoading()
 				if (!this.$util.isEmpty(res.data.list)) {
+					console.log('3333344444')
 					that.storageData = res.data.list
 					that.filterStat()
 				}else{
+					console.log('33333')
 					that.storageData=[]
+					that.profile = []
 				}
 			});
 		}
@@ -160,7 +164,7 @@ export default {
 		left: 0;
 		display: flex;
 		width: 100%;
-		top:116upx;
+		top:153upx;
 		z-index: 20;
 		.bar{
 			width: 50%;