新增订单 制票快捷时间选项

pages/my-order/my-order.nvue

@@ -21,8 +21,9 @@
 
 			<view class="conditon-block" :style="conditionTop" :class="{'conditon-block-auto':ishowDetail}">
 				<view class="filter-title">
-					<button type="default" class="filter-btn filter-btn-active"><text
-							class="filter-btn__text filter-btn-active__text">一周内</text></button>
+					<button type="default" class="filter-btn" :class="{'filter-btn-active':0 === filterActiveIndex}"
+						@tap="handleFilter('week')"><text class="filter-btn__text"
+							:class="{'filter-btn-active__text':0 === filterActiveIndex}">一周内</text></button>
 					<button type="default" @tap="handleFilter(item)" class="filter-btn"
 						:class="{'filter-btn-active':item === filterActiveIndex}" v-for="item in 3" :key='item'>
 						<text class="filter-btn__text"
@@ -43,7 +44,8 @@
 			<swiper ref="swiper1" class="tab-box" :current="tabIndex" :duration="300" @change="onswiperchange"
 				@transition="onswiperscroll" @animationfinish="animationfinish" @onAnimationEnd="animationfinish">
 				<swiper-item class="swiper-item" v-for="(page, index) in tabList" :key="index">
-					<orderPage :ref="'page' + index" class="page-item" :nid="page.newsid"></orderPage>
+					<orderPage :ref="'page' + index" class="page-item" :date-range="dateRange" :nid="page.newsid">
+					</orderPage>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -55,6 +57,10 @@
 		mapState
 	} from 'vuex'
 
+	import {
+		timeRangeFormat
+	} from '@/utils/date.js'
+
 	// #ifdef APP-PLUS
 	const dom = weex.requireModule('dom');
 	// #endif
@@ -107,6 +113,10 @@
 				_touchTabIndex: 0,
 				ishowDetail: false,
 				filterActiveIndex: 0,
+				dateRange: {
+					start: '',
+					end: ''
+				}
 			}
 		},
 		computed: {
@@ -135,6 +145,9 @@
 			this.tabListSize = {};
 			this._touchTabIndex = 0;
 
+			this.dateRange.start = timeRangeFormat('week')
+			this.dateRange.end = timeRangeFormat('now')
+
 			this.pageList = [];
 			for (let i = 0; i < this.tabList.length; i++) {
 				let item = this.$refs['page' + i]
@@ -160,6 +173,12 @@
 				this._touchTabIndex = index;
 				// #endif
 
+				// this.dateRange = {
+				// 	start: '',
+				// 	end: ''
+				// }
+				// this.filterActiveIndex = -1
+
 				this.switchTab(index);
 			},
 			onswiperchange(e) {
@@ -302,7 +321,8 @@
 				});
 			},
 			loadTabData(index) {
-				this.pageList[index].loadData();
+				this.pageList[index].refreshData()
+				// this.pageList[index].loadData(true, this.dateRange);
 			},
 			clearTabData(index) {
 				this.pageList[index].clear();
@@ -312,6 +332,18 @@
 			},
 			handleFilter(item) {
 				this.filterActiveIndex = item
+			},
+			handleFilter(item) {
+				if (item === 'week') {
+					this.filterActiveIndex = 0
+					this.dateRange.start = timeRangeFormat('week')
+				} else {
+					this.filterActiveIndex = item
+					this.dateRange.start = timeRangeFormat(item)
+				}
+				this.dateRange.end = timeRangeFormat('now')
+				this.pageList[this.tabIndex].refreshData()
+				// this.pageList[this.tabIndex].loadData(true, this.dateRange);
 			}
 		}
 	}

pages/my-order/order-page.nvue

@@ -53,6 +53,15 @@
 			nid: {
 				type: String,
 				default: ''
+			},
+			dateRange: {
+				type: Object,
+				default: () => {
+					return {
+						start: '',
+						end: ''
+					}
+				}
 			}
 		},
 		data() {
@@ -109,10 +118,10 @@
 			this.pullTimer = null;
 			this.condition.USER_BP = this.userInfo.code
 			this._isWidescreen = false;
-			this.loadData()
+			// this.loadData(true)
 		},
 		methods: {
-			loadData(refresh) {
+			loadData(refresh, dateRange) {
 				if (this.isLoading) {
 					return;
 				}
@@ -123,11 +132,19 @@
 				this.condition.PROCESS_TYPE[0].LOW = this.nid
 				let POSTING_DATE = []
 				let PROCESS_TYPE = []
-				if (this.condition.POSTING_DATE[0].LOW === '') {
-					POSTING_DATE = []
-				} else {
+				let dateParams = dateRange || this.dateRange
+				if (dateParams && dateParams.start) {
+					this.condition.POSTING_DATE[0].LOW = dateParams.start
+					this.condition.POSTING_DATE[0].HIGH = dateParams.end
 					POSTING_DATE = this.condition.POSTING_DATE
+				} else {
+					POSTING_DATE = []
 				}
+				// if (this.condition.POSTING_DATE[0].LOW === '') {
+				// 	POSTING_DATE = []
+				// } else {
+				// 	POSTING_DATE = this.condition.POSTING_DATE
+				// }
 
 				if (this.condition.PROCESS_TYPE[0].LOW === '') {
 					PROCESS_TYPE = [{
@@ -223,9 +240,9 @@
 				console.log('loadMore')
 				if (this.page.PAGE < this.loadParams.totalPage) {
 					this.page.PAGE++
-					this.loadData();
+					this.loadData(false);
 				} else {
-					this.loadingText = '--到底了--'
+					this.loadingText = '-- 到底了 --'
 				}
 			},
 			clear() {
@@ -256,7 +273,15 @@
 				this.pulling = true;
 				this.refreshing = true;
 				this.page.PAGE = 1
-				this.refreshText = "正在刷新...";
+				this.refreshText = "正在刷新..."
+				this.loadingText = '加载中...'
+				this.loadParams = {
+					total: 0,
+					totalPage: 1,
+					isDone: false,
+					isRefresh: false
+				}
+				this.page.PAGE = 1
 				this.loadData(true);
 			},
 			onrefresh(e) {

pages/produce-material/produce-material.nvue

@@ -3,8 +3,9 @@
 		<view class="status_bar" :style="navHeight"></view>
 		<view class="conditon-block" :style="conditionTop" :class="{'conditon-block-auto':ishowDetail}">
 			<view class="filter-title">
-				<button type="default" class="filter-btn filter-btn-active"><text
-						class="filter-btn__text filter-btn-active__text">一周内</text></button>
+				<button type="default" class="filter-btn" :class="{'filter-btn-active':0 === filterActiveIndex}"
+					@tap="handleFilter('week')"><text class="filter-btn__text"
+						:class="{'filter-btn-active__text':0 === filterActiveIndex}">一周内</text></button>
 				<button type="default" @tap="handleFilter(item)" class="filter-btn"
 					:class="{'filter-btn-active':item === filterActiveIndex}" v-for="item in 3" :key='item'><text
 						class="filter-btn__text"
@@ -60,6 +61,10 @@
 		apiGetProduceMaterialOrder
 	} from '@/servers/produceMaterial.js'
 
+	import {
+		timeRangeFormat
+	} from '@/utils/date.js'
+
 	export default {
 		components: {
 			uniList,
@@ -145,7 +150,8 @@
 			this.pullTimer = null;
 			this.condition.PARTNER = this.userInfo.code
 			this._isWidescreen = false;
-			this.loadData()
+			this.handleFilter('week')
+			this.loadData(true)
 		},
 		methods: {
 			loadData(refresh) {
@@ -160,6 +166,7 @@
 					...this.condition,
 					...this.page
 				}
+
 				apiGetProduceMaterialOrder(params).then((res) => {
 					console.log('loadData', res)
 					const {
@@ -224,6 +231,13 @@
 				this.pulling = true;
 				this.refreshing = true;
 				this.refreshText = "正在刷新...";
+				this.loadingText = '加载中...'
+				this.loadParams = {
+					total: 0,
+					totalPage: 1,
+					isDone: false,
+					isRefresh: false
+				}
 				this.page.PAGE = 1
 				this.loadData(true);
 			},
@@ -253,18 +267,23 @@
 					this.refreshText = "下拉可以刷新";
 				}
 			},
-			newGuid() {
-				let s4 = function() {
-					return (65536 * (1 + Math.random()) | 0).toString(16).substring(1);
-				}
-				return (s4() + s4() + "-" + s4() + "-4" + s4().substr(0, 3) + "-" + s4() + "-" + s4() + s4() + s4())
-					.toUpperCase();
-			},
 			handleShowDetail() {
 				this.ishowDetail = !this.ishowDetail
 			},
 			handleFilter(item) {
 				this.filterActiveIndex = item
+			},
+			handleFilter(item) {
+				if (item === 'week') {
+					this.filterActiveIndex = 0
+					this.condition.DATUM.LOW = timeRangeFormat('week')
+				} else {
+					this.filterActiveIndex = item
+					this.condition.DATUM.LOW = timeRangeFormat(item)
+
+				}
+				this.condition.DATUM.HIGH = timeRangeFormat('now')
+				this.loadData(true)
 			}
 		}
 	}

pages/produce-order/produce-order.nvue

@@ -150,7 +150,7 @@
 			this.condition.PARTNER = this.userInfo.code
 			this._isWidescreen = false;
 			this.handleFilter('week')
-			this.loadData()
+			this.loadData(true)
 			// console.log('2222', timeRangeFormat('now'))
 		},
 		methods: {
@@ -231,6 +231,13 @@
 				this.pulling = true;
 				this.refreshing = true;
 				this.refreshText = "正在刷新...";
+				this.loadingText = '加载中...'
+				this.loadParams = {
+					total: 0,
+					totalPage: 1,
+					isDone: false,
+					isRefresh: false
+				}
 				this.page.PAGE = 1
 				this.loadData(true);
 			},
@@ -273,7 +280,7 @@
 
 				}
 				this.condition.DATUM.HIGH = timeRangeFormat('now')
-				this.loadData()
+				this.loadData(true)
 			}
 		}
 	}

pages/ticket-order/order-page.nvue

@@ -53,6 +53,15 @@
 			nid: {
 				type: String,
 				default: ''
+			},
+			dateRange: {
+				type: Object,
+				default: () => {
+					return {
+						start: '',
+						end: ''
+					}
+				}
 			}
 		},
 		data() {
@@ -110,14 +119,28 @@
 				}
 			}
 		},
+		// watch: {
+		// 	'dateRange': {
+		// 		handler(val, old) {
+		// 			console.log('2222', val, old)
+		// 			if (val !== old) {
+		// 				this.condition.MAK_DATE[0].LOW = val.start
+		// 				this.condition.MAK_DATE[0].HIGH = val.end
+		// 				this.loadData()
+		// 			}
+		// 		},
+		// 		immediate: true,
+		// 		deep: true
+		// 	}
+		// },
 		created() {
 			this.pullTimer = null;
 			this.condition.PARTNER = this.userInfo.code
 			this._isWidescreen = false;
-			this.loadData()
+			// this.loadData(true)
 		},
 		methods: {
-			loadData(refresh) {
+			loadData(refresh, dateRange) {
 				if (this.isLoading) {
 					return;
 				}
@@ -127,11 +150,19 @@
 
 				let MAK_DATE = []
 				let INV_STATUS = []
-				if (this.condition.MAK_DATE[0].LOW === '') {
-					MAK_DATE = []
-				} else {
+				let dateParams = dateRange || this.dateRange
+				if (dateParams && dateParams.start) {
+					this.condition.MAK_DATE[0].LOW = dateParams.start
+					this.condition.MAK_DATE[0].HIGH = dateParams.end
 					MAK_DATE = this.condition.MAK_DATE
+				} else {
+					MAK_DATE = []
 				}
+				// if (this.condition.MAK_DATE[0].LOW === '') {
+				// 	MAK_DATE = []
+				// } else {
+				// 	MAK_DATE = this.condition.MAK_DATE
+				// }
 
 				if (this.nid === '') {
 					INV_STATUS = []
@@ -210,6 +241,13 @@
 				this.pulling = true;
 				this.refreshing = true;
 				this.refreshText = "正在刷新...";
+				this.loadingText = '加载中...'
+				this.loadParams = {
+					total: 0,
+					totalPage: 1,
+					isDone: false,
+					isRefresh: false
+				}
 				this.page.PAGE = 1
 				this.loadData(true);
 			},

pages/ticket-order/ticket-order.nvue

@@ -21,8 +21,9 @@
 
 			<view class="conditon-block" :style="conditionTop" :class="{'conditon-block-auto':ishowDetail}">
 				<view class="filter-title">
-					<button type="default" class="filter-btn filter-btn-active"><text
-							class="filter-btn__text filter-btn-active__text">一周内</text></button>
+					<button type="default" class="filter-btn" :class="{'filter-btn-active':0 === filterActiveIndex}"
+						@tap="handleFilter('week')"><text class="filter-btn__text"
+							:class="{'filter-btn-active__text':0 === filterActiveIndex}">一周内</text></button>
 					<button type="default" @tap="handleFilter(item)" class="filter-btn"
 						:class="{'filter-btn-active':item === filterActiveIndex}" v-for="item in 3" :key='item'>
 						<text class="filter-btn__text"
@@ -43,7 +44,8 @@
 			<swiper ref="swiper1" class="tab-box" :current="tabIndex" :duration="300" @change="onswiperchange"
 				@transition="onswiperscroll" @animationfinish="animationfinish" @onAnimationEnd="animationfinish">
 				<swiper-item class="swiper-item" v-for="(page, index) in tabList" :key="index">
-					<orderPage :ref="'page' + index" class="page-item" :nid="page.newsid"></orderPage>
+					<orderPage :ref="'page' + index" class="page-item" :date-range="dateRange" :nid="page.newsid">
+					</orderPage>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -55,6 +57,10 @@
 		mapState
 	} from 'vuex'
 
+	import {
+		timeRangeFormat
+	} from '@/utils/date.js'
+
 	// #ifdef APP-PLUS
 	const dom = weex.requireModule('dom');
 	// #endif
@@ -101,6 +107,10 @@
 				_touchTabIndex: 0,
 				ishowDetail: false,
 				filterActiveIndex: 0,
+				dateRange: {
+					start: '',
+					end: ''
+				}
 			}
 		},
 		computed: {
@@ -129,6 +139,9 @@
 			this.tabListSize = {};
 			this._touchTabIndex = 0;
 
+			this.dateRange.start = timeRangeFormat('week')
+			this.dateRange.end = timeRangeFormat('now')
+
 			this.pageList = [];
 			for (let i = 0; i < this.tabList.length; i++) {
 				let item = this.$refs['page' + i]
@@ -296,7 +309,8 @@
 				});
 			},
 			loadTabData(index) {
-				this.pageList[index].loadData();
+				this.pageList[index].refreshData()
+				// this.pageList[index].loadData(true, this.dateRange);
 			},
 			clearTabData(index) {
 				this.pageList[index].clear();
@@ -305,7 +319,16 @@
 				this.ishowDetail = !this.ishowDetail
 			},
 			handleFilter(item) {
-				this.filterActiveIndex = item
+				if (item === 'week') {
+					this.filterActiveIndex = 0
+					this.dateRange.start = timeRangeFormat('week')
+				} else {
+					this.filterActiveIndex = item
+					this.dateRange.start = timeRangeFormat(item)
+				}
+				this.dateRange.end = timeRangeFormat('now')
+				this.pageList[this.tabIndex].refreshData()
+				// this.pageList[this.tabIndex].loadData(true, this.dateRange);
 			}
 		}
 	}