Browse Source

组长查看-未支付、未上架订单

linbl 6 months ago
parent
commit
a21cefbff0
3 changed files with 367 additions and 8 deletions
  1. 24 8
      pages.json
  2. 171 0
      pages/market/one/leader/noPayOrder.vue
  3. 172 0
      pages/market/one/leader/noUpOrder.vue

+ 24 - 8
pages.json

@@ -379,14 +379,14 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, 
+		},
 		{
 			"path": "pages/market/one/enterprise/Order",
 			"style": {
 				"navigationBarTitleText": "销售订单",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/market/one/enterprise/detail",
@@ -394,16 +394,16 @@
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false
 			}
-		
-		}, 
+
+		},
 		{
 			"path": "pages/market/one/enterprise/person-list",
 			"style": {
 				"navigationBarTitleText": "购买边民列表",
 				"enablePullDownRefresh": false
 			}
-		
-		}, 
+
+		},
 		{
 			"path": "pages/market/one/merchant/order/vehice",
 			"style": {
@@ -605,9 +605,25 @@
 		        "navigationBarTitleText": "商品上架",
 		        "enablePullDownRefresh": false
 		    }
-		
+
+		},
+		{
+			"path": "pages/market/one/leader/noPayOrder",
+			"style": {
+				"navigationBarTitleText": "未支付订单",
+				"enablePullDownRefresh": true
+			}
+
+		},
+		{
+			"path": "pages/market/one/leader/noUpOrder",
+			"style": {
+				"navigationBarTitleText": "未上架订单",
+				"enablePullDownRefresh": true
+			}
+
 		}
-    ],
+	],
 	"tabBar": {
 		"color": "#7A7E83",
 		"selectedColor": "#4581fb",

+ 171 - 0
pages/market/one/leader/noPayOrder.vue

@@ -0,0 +1,171 @@
+<template>
+	<view>
+		<!--<view class="tab">
+			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
+		</view>-->
+		<view class="goodsList">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="title">{{ item.enterpriseName }}
+					<!--<view class="state"
+						v-if="item.finishStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>未过卡3</text>
+					</view>
+					<view class="state"
+						v-if="item.finishStatus == 1">
+						<text class="icon">&#xe830;</text>
+						<text>已过卡3</text>
+					</view>-->
+				</view>
+				<view class="con">
+					<view class="productName omit">{{ item.goodsNames }}</view>
+					<view class="desc omit">
+						<text>重量 {{ item.totalWeight }}{{ item.goodsUnit }}</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price">¥ {{ item.totalPrice }}</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">{{ item.createTime }}</view>
+				</view>
+			</view>
+			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
+			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				user: {},
+				tab: [{
+						name: '全部',
+						peopleConfirmStatus: '', //边民确认状态
+						cooperEntrustStatus: '', //互助委托申报确认状态
+						applyConfirmStatus: '', //进口申报确认状态
+						finishStatus: '', //订单完成状态
+						resaleStatus: '' //订单转售状态
+					},
+					{
+						name: '未过卡3',
+						finishStatus: 0,
+					},
+					{
+						name: '已过卡3',
+						finishStatus: 1,
+
+					},
+				],
+				param: {
+					pageNo: 1,
+					pageSize: 10,
+					Sxb010Status: 0
+				},
+				list: [],
+				loadMore: true,
+				id: '',
+				flag: '',
+			};
+		},
+		onLoad() {
+			this.user = this.getUser()
+			uni.$on('face', res => {
+				if (this.flag == 1) {
+					this.http.request({
+						url: '/level-one-server/app/TbOrder/confirmOrder',
+						data: {
+							orderId: this.id
+						},
+						success: resp => {
+							uni.showToast({
+								title: '订单确认成功'
+							});
+							this.refresh();
+						}
+					});
+				} else if (this.flag == 2) {
+					this.http.request({
+						url: '/level-one-server/app/TbOrder/applyOrder',
+						data: {
+							orderId: this.id
+						},
+						success: resp => {
+							uni.showToast({
+								title: '进口申报确认成功'
+							});
+							this.refresh();
+						}
+					});
+				}
+			})
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/getPeopleOrderList',
+					loading: 'false',
+					data: this.param,
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						if (res.data.data) {
+							this.list = res.data.data;
+						}
+					}
+				});
+			},
+			// 点击tab切换
+			click(e) {
+				console.log(e);
+				this.param.peopleConfirmStatus = e.peopleConfirmStatus;
+				this.param.cooperEntrustStatus = e.cooperEntrustStatus;
+				this.param.applyConfirmStatus = e.applyConfirmStatus;
+				this.param.finishStatus = e.finishStatus;
+				this.param.resaleStatus = e.resaleStatus;
+				this.param.upStatus = e.upStatus;
+				this.refresh();
+			},
+			detail(item) {
+				uni.navigateTo({
+					url: '/pages/market/one/leader/detail?id=' + item.id
+				});
+			},
+			// 刷新数据
+			refresh() {
+				this.loadMore = true;
+				this.param.pageNo = 1;
+				this.list = [];
+				this.getData();
+			}
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			setTimeout(() => {
+				this.refresh();
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉加载
+		onReachBottom() {
+			if (this.loadMore) {
+				this.param.pageNo++;
+				this.getData();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: $pg;
+	}
+
+	.state {
+		margin-right: -70px;
+	}
+</style>

+ 172 - 0
pages/market/one/leader/noUpOrder.vue

@@ -0,0 +1,172 @@
+<template>
+	<view>
+		<!--<view class="tab">
+			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
+		</view>-->
+		<view class="goodsList">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="title">{{ item.enterpriseName }}
+					<!--<view class="state"
+						v-if="item.finishStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>未过卡3</text>
+					</view>
+					<view class="state"
+						v-if="item.finishStatus == 1">
+						<text class="icon">&#xe830;</text>
+						<text>已过卡3</text>
+					</view>-->
+				</view>
+				<view class="con">
+					<view class="productName omit">{{ item.goodsNames }}</view>
+					<view class="desc omit">
+						<text>重量 {{ item.totalWeight }}{{ item.goodsUnit }}</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price">¥ {{ item.totalPrice }}</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">{{ item.createTime }}</view>
+				</view>
+			</view>
+			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
+			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				user: {},
+				tab: [{
+						name: '全部',
+						peopleConfirmStatus: '', //边民确认状态
+						cooperEntrustStatus: '', //互助委托申报确认状态
+						applyConfirmStatus: '', //进口申报确认状态
+						finishStatus: '', //订单完成状态
+						resaleStatus: '' //订单转售状态
+					},
+					{
+						name: '未过卡3',
+						finishStatus: 0,
+					},
+					{
+						name: '已过卡3',
+						finishStatus: 1,
+
+					},
+				],
+				param: {
+					pageNo: 1,
+					pageSize: 10,
+					finishStatus: 1,
+					upStatus: 1
+				},
+				list: [],
+				loadMore: true,
+				id: '',
+				flag: '',
+			};
+		},
+		onLoad() {
+			this.user = this.getUser()
+			uni.$on('face', res => {
+				if (this.flag == 1) {
+					this.http.request({
+						url: '/level-one-server/app/TbOrder/confirmOrder',
+						data: {
+							orderId: this.id
+						},
+						success: resp => {
+							uni.showToast({
+								title: '订单确认成功'
+							});
+							this.refresh();
+						}
+					});
+				} else if (this.flag == 2) {
+					this.http.request({
+						url: '/level-one-server/app/TbOrder/applyOrder',
+						data: {
+							orderId: this.id
+						},
+						success: resp => {
+							uni.showToast({
+								title: '进口申报确认成功'
+							});
+							this.refresh();
+						}
+					});
+				}
+			})
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/getPeopleOrderList',
+					loading: 'false',
+					data: this.param,
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						if (res.data.data) {
+							this.list = res.data.data;
+						}
+					}
+				});
+			},
+			// 点击tab切换
+			click(e) {
+				console.log(e);
+				this.param.peopleConfirmStatus = e.peopleConfirmStatus;
+				this.param.cooperEntrustStatus = e.cooperEntrustStatus;
+				this.param.applyConfirmStatus = e.applyConfirmStatus;
+				this.param.finishStatus = e.finishStatus;
+				this.param.resaleStatus = e.resaleStatus;
+				this.param.upStatus = e.upStatus;
+				this.refresh();
+			},
+			detail(item) {
+				uni.navigateTo({
+					url: '/pages/market/one/leader/detail?id=' + item.id
+				});
+			},
+			// 刷新数据
+			refresh() {
+				this.loadMore = true;
+				this.param.pageNo = 1;
+				this.list = [];
+				this.getData();
+			}
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			setTimeout(() => {
+				this.refresh();
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉加载
+		onReachBottom() {
+			if (this.loadMore) {
+				this.param.pageNo++;
+				this.getData();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: $pg;
+	}
+
+	.state {
+		margin-right: -70px;
+	}
+</style>