shish 1 год назад
Родитель
Сommit
e26b949381
2 измененных файлов с 21 добавлено и 10 удалено
  1. 0 1
      ghsApp/src/admin/stat/classProfit.vue
  2. 21 9
      ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

+ 0 - 1
ghsApp/src/admin/stat/classProfit.vue

@@ -180,7 +180,6 @@ export default {
 				startTime: "",
 				startTime: "",
 				endTime: "",
 				endTime: "",
 				shopId: "",
 				shopId: "",
-				
 			},
 			},
 			profit:[],
 			profit:[],
 			tbSaleIncome:[],
 			tbSaleIncome:[],

+ 21 - 9
ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -1,11 +1,14 @@
 <template>
 <template>
 <view class="app-content">
 <view class="app-content">
 	<view class="ex-page">
 	<view class="ex-page">
+		<view class="top-bar">
+			 <DateSelect class="bar" top="0" @selectDateFn="selectDateFn" defaultShowName='选日期' /> 
+		</view>
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
 			<view class="space-view ex-table">
 				<block v-if="!$util.isEmpty(list.data)">
 				<block v-if="!$util.isEmpty(list.data)">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<view style="position:fixed;width:100%;top:0">
+						<view style="width:100%;">
 						<t-tr header>
 						<t-tr header>
 							<t-th><view style="width:130upx;color:#333333;font-size:30upx;font-weight:bold;">时间</view></t-th>
 							<t-th><view style="width:130upx;color:#333333;font-size:30upx;font-weight:bold;">时间</view></t-th>
 							<t-th><view style="width:120upx;color:#333333;font-size:30upx;font-weight:bold;">名称</view></t-th>
 							<t-th><view style="width:120upx;color:#333333;font-size:30upx;font-weight:bold;">名称</view></t-th>
@@ -14,7 +17,7 @@
 							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">剩余</view></t-th>
 							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">剩余</view></t-th>
 						</t-tr>
 						</t-tr>
 						</view>
 						</view>
-						<view style="margin-top:80upx;">
+						<view style="margin-top:20upx;">
 						<t-tr v-for="(item, index) in list.data" :key="index">
 						<t-tr v-for="(item, index) in list.data" :key="index">
 							<t-td align="center" color="info">
 							<t-td align="center" color="info">
 								<view style="width:130upx;color:#333333;font-size:28upx;" @click="goDetail(item)">
 								<view style="width:130upx;color:#333333;font-size:28upx;" @click="goDetail(item)">
@@ -67,13 +70,16 @@ import { getStockDetailApi } from "@/api/storehouse/stock";
 import { getInfoByOrderSn } from "@/api/order";
 import { getInfoByOrderSn } from "@/api/order";
 import { list,selectShop } from "@/mixins";
 import { list,selectShop } from "@/mixins";
 import {mapActions, mapGetters} from "vuex";
 import {mapActions, mapGetters} from "vuex";
+import DateSelect from "@/components/module/dateSelect";
 export default {
 export default {
-	components: { SelectList, AppWrapperEmpty},
+	components: { SelectList, AppWrapperEmpty,DateSelect},
 	mixins: [list,selectShop],
 	mixins: [list,selectShop],
 	computed: {		...mapGetters(["getDictionariesInfo","getLoginInfo"])	},
 	computed: {		...mapGetters(["getDictionariesInfo","getLoginInfo"])	},
 	data() {
 	data() {
 		return {
 		return {
-
+			searchTime:'',
+			startTime: "",
+			endTime: ""
 		};
 		};
 	},
 	},
 	onPullDownRefresh() {
 	onPullDownRefresh() {
@@ -93,6 +99,13 @@ export default {
 	},
 	},
 	methods: {
 	methods: {
 		...mapActions(['setUserShopAll']),
 		...mapActions(['setUserShopAll']),
+		selectDateFn(val){
+			this.resetList()
+			this.searchTime = val.searchTime
+			this.startTime = val.startTime
+			this.endTime = val.endTime
+			this.getStockList()
+		},
 		init(){
 		init(){
 			if(this.option.name){
 			if(this.option.name){
 				uni.setNavigationBarTitle({ title: this.option.name })
 				uni.setNavigationBarTitle({ title: this.option.name })
@@ -119,8 +132,7 @@ export default {
 			}
 			}
 		},
 		},
 		getStockList() {
 		getStockList() {
-			console.log(this.option)
-			return getStockDetailApi({id:this.option.id,page: this.list.page}).then(res => {
+			return getStockDetailApi({id:this.option.id,page: this.list.page,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime}).then(res => {
 				this.completes(res)
 				this.completes(res)
 			});
 			});
 		}
 		}
@@ -129,15 +141,15 @@ export default {
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .ex-page {
 .ex-page {
+	background: white;
+	padding-top:20upx;
 	height: 100%;
 	height: 100%;
 	display: flex;
 	display: flex;
 	flex-direction: column;
 	flex-direction: column;
 	.top-bar {
 	.top-bar {
-		position: absolute;
-		left: 0;
+		margin-bottom:30px;
 		display: flex;
 		display: flex;
 		width: 100%;
 		width: 100%;
-		// box-shadow: 0 5upx 5upx 5upx rgba($color: #000000, $alpha: 0.2);
 		z-index: 20;
 		z-index: 20;
 		.bar{
 		.bar{
 			width: 50%;
 			width: 50%;