From 64a7f738aadbf552bfb1ce24c46b1924767bf526 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 05 九月 2023 16:00:16 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/pages/index/index.vue |  295 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 170 insertions(+), 125 deletions(-)

diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 9c02c28..2c7dd0c 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -10,21 +10,22 @@
 					寰呭姙</view>
 				<view class="cY">
 					<u-search placeholder="鎼滅储鍏抽敭瀛�" bgColor="#f7f7f7" :showAction="false" @search="scrolltoupper"
-						shape="square" v-model="searchForm.name"></u-search>
+						shape="square" v-model="searchForm.mixParam"></u-search>
 					<image src="../../static/filter@2x.png" class="img48 ml20" @click="filterAction" mode=""></image>
 				</view>
 				<view class="cY mt30">
-					<view class="sbtn rd8" :class="searchForm.status==0?'sbtn_green':'sbtn_black_rim'"
-						@click="selectType(0)">寰呭姙</view>
-					<view class="sbtn rd8 ml20" :class="searchForm.status==1?'sbtn_green':'sbtn_black_rim'"
-						@click="selectType(1)">宸插姙</view>
+					<view v-for="item in tagList" :key="item.id" class="sbtn rd8 mr10"
+						:class="searchForm.status==item.id?'sbtn_green':'sbtn_black_rim'" @click="selectType(item.id)">
+						{{`${item.name}(${item.num})`}}
+					</view>
 				</view>
 			</view>
 		</u-sticky>
-
-		<u-list :showScrollbar="false" @scrolltolower="scrolltolower" @scrolltoupper="scrolltoupper"
-			:height="windowHeight - (statusbarHeight + navHeight + 120) + 'px'">
-			<u-list-item v-for="(item, index) in projectList" :key="index">
+		<scroll-view v-if="projectList.length" :style="windowHeight - (statusbarHeight + navHeight + 120) + 'px'"
+			scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
+			refresher-background="lightgreen" @refresherpulling="scrolltolower" @refresherrefresh="scrolltoupper"
+			@refresherrestore="onRestore" @refresherabort="onAbort">
+			<view v-for="(item, index) in projectList" :key="index">
 				<view class="box_list">
 					<view class="box_list_item" @click="jump(item)">
 						<view class="box_list_item_icon">
@@ -41,16 +42,16 @@
 						</view>
 					</view>
 				</view>
-			</u-list-item>
-		</u-list>
+			</view>
+		</scroll-view>
+		<view v-else class="tc c6">鏆傛棤鏁版嵁...</view>
 		<u-popup :show="show" @close="close" :round="8" zIndex="20000">
 			<view class="rp p40 contanir">
 				<view class="c2 b">绫诲瀷</view>
 				<view class="content">
 					<u-grid col="2" :border="false">
 						<u-grid-item v-for="item in types" :key="item.id">
-							<view class="ptb20 c9 type-style tc rd10"
-								:class="type===item.id?'sbtn_green':'sbtn_gray'"
+							<view class="ptb20 c9 type-style tc rd10" :class="type===item.id?'sbtn_green':'sbtn_gray'"
 								@click="type=item.id">{{ item.name }}</view>
 						</u-grid-item>
 					</u-grid>
@@ -67,6 +68,10 @@
 
 <script>
 	import myTabbar from "@/components/myTabber.vue"
+	import {
+		getList,
+		pageCount
+	} from '@/util/api/agencyAPI'
 	import {
 		mapState
 	} from 'vuex'
@@ -115,157 +120,197 @@
 						id: 8,
 						name: '瀹㈤��/杩斿搧鍥炲巶妫�楠�'
 					}
-				],
+				],
+				tagList: [{
+						id: 0,
+						name: '寰呭姙',
+						num: 0
+					},
+					{
+						id: 1,
+						name: '宸插姙',
+						num: 0
+					}
+				],
 				type: '',
 				searchForm: {
-					name: '',
+					mixParam: '',
 					status: 0,
 					type: ''
 				},
-				projectList: [{
-						title: '212132',
-						createTime: '2023-08-28',
-						content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
-					},
-					{
-						title: '212132',
-						createTime: '2023-08-28',
-						content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
-					},
-					{
-						title: '212132',
-						createTime: '2023-08-28',
-						content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
-					},
-					{
-						title: '212132',
-						createTime: '2023-08-28',
-						content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
-					},
-				]
+				page: {
+					total: 0,
+					capacity: 10,
+					page: 1,
+				},
+				projectList: []
 			}
 		},
 		computed: {
 			...mapState(['statusbarHeight', 'navHeight']),
 		},
+		async mounted() {
+			await this.$store.dispatch('getUpcomingNum')
+			this.tagList[0].num = this.$store.state.upcomingNum.d
+			this.tagList[1].num = this.$store.state.upcomingNum.y
+		},
 		onLoad() {
 			uni.getSystemInfo({
 				success: res => {
 					this.windowHeight = res.windowHeight
+
 				}
 			})
-
-			var that = this
-			uni.login({
-				provider: 'weixin',
-				success: function(loginRes) {
-					// console.log(loginRes);
-					that.code = loginRes.code
-				}
-			});
+			this.loadData()
 		},
 		methods: {
-			scrolltolower() {},
-			scrolltoupper() {},
+			loadData() {
+				getList({
+						model: this.searchForm,
+						...this.page
+					})
+					.then(res => {
+						let data = res.data
+						if (data.page == 1) {
+							this.projectList = []
+						}
+						this.page.page = data.page
+						this.page.total = data.total
+						this.projectList.push(...data.records)
+					})
+					.catch(err => {
+
+					})
+			},
+			onRestore() {
+				this.triggered = 'restore'; // 闇�瑕侀噸缃�
+				console.log("onRestore");
+			},
+			onAbort() {
+				console.log("onAbort");
+			},
+			scrolltolower() {
+				this.page.page = 1
+				this.loadData()
+			},
+			scrolltoupper() {
+				this.page.page += 1
+				this.loadData()
+			},
 			selectType(status) {
 				if (this.searchForm.status == status) return
 				this.searchForm.status = status
-				this.scrolltoupper()
+				this.scrolltolower()
 			},
 			jump(item) {
-				if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 璺宠浆鍑哄簱(杞簱鍗�)
-					router.push({
-						name: 'issueOperation',
+				if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 璺宠浆鍑哄簱(杞簱鍗�)
+				  uni.navigateTo({
+				  	url: 'pages/OutOperation/OutOperation',
 						query: {
 							id: item.objId,
 							dbid: item.id,
 							type: 7
-						}
-					})
+						}
+				  })
+					// router.push({
+					// 	name: 'issueOperation',
+					// 	query: {
+					// 		id: item.objId,
+					// 		dbid: item.id,
+					// 		type: 7
+					// 	}
+					// })
 				} else if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 1) {
-					router.push({
-						name: 'wTransferDetail',
-						query: {
-							id: item.objId,
-							status: item.status,
-							type: item.type,
-							dbid: item.id
-						}
-					})
-					// router.push({ name: 'wTransferDetail', query: { id: item.objId, status: 0, type: item.type, dbid: item.id } })
+					// router.push({
+					// 	name: 'wTransferDetail',
+					// 	query: {
+					// 		id: item.objId,
+					// 		status: item.status,
+					// 		type: item.type,
+					// 		dbid: item.id
+					// 	}
+					// })
 				} else if ((item.type === 1 || item.type === 4 || item.type === 6) && item.status === 0) { // 璺宠浆鍏ュ簱(杞簱鍗�)
 					if (item.type === 4) { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
-						router.push({
-							name: 'completionDetails',
-							query: {
-								id: item.objId,
-								dbid: item.id,
-								type: 7,
-								isShow: 1,
-								Type: item.type
-							}
-						})
+						// router.push({
+						// 	name: 'completionDetails',
+						// 	query: {
+						// 		id: item.objId,
+						// 		dbid: item.id,
+						// 		type: 7,
+						// 		isShow: 1,
+						// 		Type: item.type
+						// 	}
+						// })
 						return
-					}
-					router.push({
-						name: 'warehousing',
-						query: {
-							id: item.objId,
-							dbid: item.id,
-							type: 7
-						}
+					}
+					uni.navigateTo({
+						url: '/pages/InOperation/InOperation',
+						query: {
+							id: item.objId,
+							dbid: item.id,
+							type: 7
+						}
 					})
+					// router.push({
+					// 	name: 'warehousing',
+					// 	query: {
+					// 		id: item.objId,
+					// 		dbid: item.id,
+					// 		type: 7
+					// 	}
+					// })
 				} else if ((item.type === 1 || item.type === 4 || item.type === 6) && item.status === 1) {
 					if (item.type === 4) { // 璺宠洓瀹屽伐鍏ュ簱璇︽儏
-						router.push({
-							name: 'completionDetails',
-							query: {
-								id: item.objId,
-								dbid: item.id,
-								type: 7,
-								isShow: 2
-							}
-						})
+						// router.push({
+						// 	name: 'completionDetails',
+						// 	query: {
+						// 		id: item.objId,
+						// 		dbid: item.id,
+						// 		type: 7,
+						// 		isShow: 2
+						// 	}
+						// })
 						return
 					}
-					router.push({
-						name: 'wTransferDetail',
-						query: {
-							id: item.objId
-						}
-					})
+					// router.push({
+					// 	name: 'wTransferDetail',
+					// 	query: {
+					// 		id: item.objId
+					// 	}
+					// })
 				} else if (item.type === 3 && item.status === 0) { // 纭澶囨枡
-					router.push({
-						name: 'orderStock',
-						query: {
-							id: item.objId,
-							dbid: item.id
-						}
-					})
+					// router.push({
+					// 	name: 'orderStock',
+					// 	query: {
+					// 		id: item.objId,
+					// 		dbid: item.id
+					// 	}
+					// })
 				} else if (item.type === 3 && item.status === 1) { // 澶囨枡锛堣浆搴撳崟璇︽儏锛�
 					// router.push({ name: 'wInboundDetail', query: { id: item.objId } })
-					router.push({
-						name: 'wTransferDetail',
-						query: {
-							id: item.objId
-						}
-					})
+					// router.push({
+					// 	name: 'wTransferDetail',
+					// 	query: {
+					// 		id: item.objId
+					// 	}
+					// })
 				} else if (item.type === 9 && item.status === 0) { // 璋冩暣鍏ュ簱(鍏ュ簱鍗�)
-					router.push({
-						name: 'warehousing',
-						query: {
-							id: item.objId,
-							dbid: item.id,
-							type: 9
-						}
-					})
+					// router.push({
+					// 	name: 'warehousing',
+					// 	query: {
+					// 		id: item.objId,
+					// 		dbid: item.id,
+					// 		type: 9
+					// 	}
+					// })
 				} else if (item.type === 9 && item.status === 1) {
-					router.push({
-						name: 'wInboundDetail',
-						query: {
-							id: item.objId
-						}
-					})
+					// router.push({
+					// 	name: 'wInboundDetail',
+					// 	query: {
+					// 		id: item.objId
+					// 	}
+					// })
 				}
 			},
 			filterAction() {
@@ -274,12 +319,12 @@
 			close() {
 				this.show = false
 			},
-			resetType() {
+			resetType() {
 				this.type = ''
 				this.searchForm.type = ''
 				this.confirm()
 			},
-			confirm() {
+			confirm() {
 				this.searchForm.type = this.type
 				this.show = false
 				this.scrolltoupper()

--
Gitblit v1.9.3