From 513be798a677672644770e2b2f7025b6d4d20414 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期三, 07 九月 2022 14:44:04 +0800
Subject: [PATCH] 完善登录,登录授权

---
 pages/jihua/jihua.vue |  682 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 423 insertions(+), 259 deletions(-)

diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index a69473b..6ae6f05 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -1,260 +1,424 @@
-<template>
-	<view class="jihua-wrap">
-		<view class="qiehuan-box">
-			 <u-tabs :list="tabList" @click="tabClick"></u-tabs>
-		</view>
-		<view class="jihua-main">
-			<view class="shaixuan-box">
-				<u-radio-group v-model="radioValue" @change="groupChange">
-					<u-radio style="margin-right: 30rpx;" shape="square" label="鍏ㄩ儴" name="鍏ㄩ儴"></u-radio>
-					<u-radio style="margin-right: 30rpx;" shape="square" label="宸茶缃殑璁″垝" name="宸茶缃殑璁″垝"></u-radio>
-					<!-- <u-radio shape="square" label="鏈缃殑璁″垝" name="鏈缃殑璁″垝"></u-radio> -->
-				</u-radio-group>
-			</view>
-			<div class="main-inside">
-				<view class="main-block-box" v-for="(item,index) in fyData" :key="item.id">
-					<view class="jihua-main-line">
-						<view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName}}</view>
-					</view>
-					<view class="jihua-main-line">
-						<view class="main-flex">
-						   <view>鐓ょ锛歿{item.coalName}}</view>
-						   <view>鍓╀綑閲忥細{{item.executiveSurplus}}</view>
-						</view>
-					</view>
-					<view class="jihua-main-line">
-						<view class="main-flex">
-							<view class="carNum-box">
-								<view>璁″垝杞︽暟锛�</view>
-								<u--input
-								    focus
-								    placeholder="璇疯緭鍏ュ彂杩愯溅鏁�"
-								    border="surround"
-								    v-model="item.numPlan"
-								    @change="change"
-								  ></u--input>
-							</view>
-							<view>瀹為檯鍙戣溅鏁帮細{{item.numReal}}</view>
-						</view>
-					</view>
-				</view>
-			</div>
-		</view>
-	    <u-button class="xiugai-btn" type="primary" text="鎻愪氦" @click="dataFormSubmit"></u-button>
-	</view>
-</template>
-
-<script>
-	
-	export default {
-		data() {
-			return {
-				radioValue: '鍏ㄩ儴',
-				tabList: [{
-					name: '浠婃棩鍙戣繍璁″垝'
-				},{
-					name: '鏄庢棩鍙戣繍璁″垝'
-				}],
-				carValue:0,
-				fyData: [],
-				info: {
-					shippingDate: this.todayDate()
-				},
-				isTomJihua:'',
-			}
-		},
-		onShow() {
-			this.init()
-		},
-		methods: {
-			init() {
-				this.fyList()
-			},
-			dataFormSubmit() { //鎻愪氦璁㈠崟
-				this.$reqPost('addObj',JSON.stringify(this.fyData)).then(res => {
-					
-				})
-			},
-			groupChange(n) {
-				console.log(n,'n================')
-				this.isTomJihua = n
-				if(n == '宸茶缃殑璁″垝') {
-					this.xscarshippingdayplan()
-				}else {
-					this.fyList()
-				}
-			},
-			todayDate() {
-				let yes = new Date().getTime()
-				let date = new Date(yes)
-				let y = date.getFullYear()
-				let m = date.getMonth() + 1
-				m = m < 10 ? ('0'+ m) : m
-				let d = date.getDate()
-				d = d < 10 ? ('0' + d) : d
-				const time =  y + '-' + m + '-' + d
-				console.log('todayDate---------',time)
-				return time
-			},
-		    tomorrowDate() {
-			   let yes = new Date().getTime() +  60 * 24 * 60 * 1000
-			   let date = new Date(yes)
-			   let y = date.getFullYear()
-			   let m = date.getMonth() + 1
-			   m = m < 10 ? ('0'+ m) : m
-			   let d = date.getDate()
-			   d = d < 10 ? ('0' + d) : d
-			   const time =  y + '-' + m + '-' + d
-			   console.log('tomorrowDate---------222',time)
-			   return time
-		    },
-			fyList() {
-				let compId = uni.getStorageSync('userInfo').compId
-				let params = {
-					current: 1,
-					size: 100,
-					status: 2,
-					trainType: 1,
-					compId: compId
-				}
-				this.$reqGet('fyList',params).then(res => {
-					if(res.code == 0) {
-						this.fyData = res.data
-					}
-				})
-			},
-			xscarshippingdayplan() {
-				let params = {
-					current: 1,
-					size: 50,
-					shippingDate: this.info.shippingDate
-				}
-				this.$reqGet('xscarshippingdayplan', params).then(res => {
-					if(res.code == 0) {
-						this.fyData = res.data.records
-					}
-				})
-			},
-			tabClick(item) {  //鍒囨崲浠婃棩鍜屾槑鏃�
-				console.log(item.name,'item==========')
-				if(item.index == 1) {
-					this.info.shippingDate = this.tomorrowDate()
-					if(this.isTomJihua == '宸茶缃殑璁″垝') {
-						this.xscarshippingdayplan()
-					}else {
-						this.fyList()
-					}
-					
-				}else {
-					this.info.shippingDate = this.todayDate()
-					if(this.isTomJihua == '宸茶缃殑璁″垝') {
-						this.xscarshippingdayplan()
-					}else {
-						this.fyList()
-					}
-				}
-				
-			},
-			change() {
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	::v-deep{
-		.u-tabs__wrapper__nav{
-			padding-left: vww(75.5)
-		}
-		.u-radio__text{
-			span{
-				font-size: vww(14);
-			}
-		}
-		.u-radio-group--row{
-			height: 100%;
-		}
-		.u-radio__icon-wrap{
-			width: vww(14)!important;
-			height: vww(14)!important;;
-		}
-		
-	}
-	.qiehuan-box{
-		position: sticky;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 100%;
-		z-index: 1;
-		background-color: #fff;
-	}
-	.jihua-wrap{
-		width: 100%;
-		height: 100%;
-		overflow-y: auto;
-		display: flex;
-		flex-direction: column;
-		.xiugai-btn{
-			position: absolute;
-			left: 50%;
-			bottom: vww(20);
-			width: vww(200);
-			transform: translateX(-50%);
-		}
-	}
-	.jihua-main{
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		padding:vww(0) vww(10);
-		box-sizing: border-box;
-		.main-inside{
-			width: 100%;
-			height: calc(100% - vww(44));
-		}
-		.shaixuan-box{
-			height: vww(40);
-			position: sticky;
-			top: vww(44);
-			left: 0;
-			right: 0;
-			width: 100%;
-			z-index: 1;
-			background-color: #fff;
-		}
-		.main-block-box{
-			box-shadow: 0 0 8px rgba(0,0,0,0.1);
-			height: vww(120);
-			padding: vww(10);
-			box-sizing: border-box;
-			margin-top: vww(15);
-			border-radius: vww(5);
-			.jihua-main-line{
-				width: 100%;
-				display: flex;
-				view{
-					font-size: vww(14);
-					line-height: 2;
-				}
-				.name{
-					font-weight: 600!important;
-				}
-				.main-flex{
-					width: 100%;
-					display: flex;
-					justify-content: space-between;
-					.carNum-box{
-						display: flex;
-						.u-input{
-							height: vww(20);
-							width: vww(100);
-						}
-					}
-				}
-			}
-		
-		}
-	}
+<template>
+	<view class="jihua-wrap">
+		<view class="qiehuan-box"><u-tabs :list="tabList" @click="tabClick"></u-tabs></view>
+		<view class="jihua-main">
+			<view class="shaixuan-box">
+				<u-radio-group v-model="radioValue" @change="groupChange">
+					<u-radio style="margin-right: 30rpx;" shape="square" label="鍏ㄩ儴" name="鍏ㄩ儴"></u-radio>
+					<u-radio style="margin-right: 30rpx;" shape="square" label="宸茶缃殑璁″垝" name="宸茶缃殑璁″垝"></u-radio>
+					<!-- <u-radio shape="square" label="鏈缃殑璁″垝" name="鏈缃殑璁″垝"></u-radio> -->
+				</u-radio-group>
+			</view>
+			<view class="main-inside">
+				<view v-if="isTomJihua == '鍏ㄩ儴'">
+					<u-empty
+					    v-if="fyData.length == 0"
+					  	mode="data"
+							icon="http://cdn.uviewui.com/uview/empty/data.png"
+							class="empty-container"
+					  >
+					</u-empty>
+					<view class="main-block-box" v-for="(item, index) in fyData" :key="item.id">
+						<view class="jihua-main-line">
+							<!-- <view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view> -->
+							<view class="name">鏀惰揣鍗曚綅锛歿{ item.customerAddressName || '' }}</view>
+						</view>
+						<view class="jihua-main-line">
+							<view class="main-flex">
+								<view>鐓ょ锛歿{ item.coalName || '' }}</view>
+								<view>鍓╀綑閲忥細{{ item.executiveSurplus || '' }}</view>
+							</view>
+						</view>
+						<view class="jihua-main-line">
+							<view class="main-flex">
+								<view class="carNum-box">
+									<view>璁″垝杞︽暟锛�</view>
+									<u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputChange"></u--input>
+								</view>
+								<view>瀹為檯鍙戣溅鏁帮細{{ item.numReal || '' }}</view>
+							</view>
+						</view>
+					</view>
+					<u-button class="xiugai-btn" type="primary" text="鎻愪氦" @click="dataFormSubmit"></u-button>
+				</view>
+				<view v-if="isTomJihua == '宸茶缃殑璁″垝'">
+					<u-empty
+					    v-if="fyData.length == 0"
+					  	mode="data"
+							icon="http://cdn.uviewui.com/uview/empty/data.png"
+							class="empty-container"
+					  >
+					</u-empty>
+					<view class="main-block-box" v-for="(item, index) in fyData" :key="item.id">
+						<view class="jihua-main-line">
+							<view class="name">瀹㈡埛鍚嶇О锛歿{ item.customerName || '' }}</view>
+						</view>
+						<view class="jihua-main-line">
+							<view class="main-flex">
+								<view>鐓ょ锛歿{ item.order.coalName || '' }}</view>
+								<view>鍓╀綑閲忥細{{ item.order.executiveSurplus || '' }}</view>
+							</view>
+						</view>
+						<view class="jihua-main-line">
+							<view class="main-flex">
+								<view class="carNum-box">
+									<view>璁″垝杞︽暟锛�</view>
+									<u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputTotalChange(item)"></u--input>
+								</view>
+								<view>瀹為檯鍙戣溅鏁帮細{{ item.order.numReal == null ? '鏆傛棤' : item.order.numReal }}</view>
+							</view>
+						</view>
+					</view>
+					<u-button class="xiugai-btn" type="primary" text="淇敼" @click="getOrderCarNum"></u-button>
+				</view>
+				
+			</view>
+		</view>
+		<view class="back-top-container">
+			<u-back-top :scroll-top="scrollTop" icon="arrow-up" mode='square'></u-back-top>
+		</view>	
+		<!-- 鑿滃崟鏍� -->
+		<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
+	</view>
+</template>
+
+<script>
+import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
+export default {
+	components: {
+		popupMenu
+	},
+	data() {
+		return {
+			radioValue: '鍏ㄩ儴',
+			tabList: [
+				{
+					name: '浠婃棩鍙戣繍璁″垝'
+				},
+				{
+					name: '鏄庢棩鍙戣繍璁″垝'
+				}
+			],
+			carValue: 0,
+			fyData: [],
+			fyData2: [],
+			info: {
+				shippingDate: this.todayDate()
+			},
+			isTomJihua: '鍏ㄩ儴',
+			editRow: '', //淇敼琛岀殑琛�
+			menuShow: false,
+			scrollTop: 0 // 杩斿洖椤堕儴鎸夐挳缁戝畾
+		};
+	},
+	onShow() {
+		if (this.menuShow == true) {
+			this.$refs.menuRef.menuClick();
+		}
+		this.init();
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop;
+	},	
+	// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
+	onNavigationBarButtonTap(e) {
+		// console.log(e);
+		this.$refs.menuRef.menuClick();
+	},
+	methods: {
+		init() {
+			this.fyList();
+		},
+		menushow(e) {
+			this.menuShow = e;
+		},
+		dataFormSubmit() {
+			//鎻愪氦璁㈠崟
+			this.fyData.forEach(e => {
+				e.shippingDate = this.info.shippingDate;
+				if (e.planId && !e.numPlan) {
+					e.numPlan = -1; //鍒犻櫎璁剧疆涓虹┖鐨勮鍒�
+				}
+				let orderId = e.id;
+				e.id = e.planId;
+				e.orderId = orderId;
+			});
+			this.$reqPost('addObj', this.fyData).then(res => {
+				this.$u.toast('娣诲姞鎴愬姛');
+				this.fyList();
+			});
+		},
+		getOrderCarNum() {
+			//淇敼
+			this.$reqPost('setCarNums', this.editRow).then(res => {
+				this.$u.toast('淇敼鎴愬姛');
+				this.xscarshippingdayplan();
+			});
+		},
+		groupChange(n) {
+			console.log(n, 'n================');
+			this.isTomJihua = n;
+			if (n == '宸茶缃殑璁″垝') {
+				this.xscarshippingdayplan();
+			} else {
+				this.fyList();
+			}
+		},
+		todayDate() {
+			let yes = new Date().getTime();
+			let date = new Date(yes);
+			let y = date.getFullYear();
+			let m = date.getMonth() + 1;
+			m = m < 10 ? '0' + m : m;
+			let d = date.getDate();
+			d = d < 10 ? '0' + d : d;
+			const time = y + '-' + m + '-' + d;
+			console.log('todayDate---------', time);
+			return time;
+		},
+		tomorrowDate() {
+			let yes = new Date().getTime() + 60 * 24 * 60 * 1000;
+			let date = new Date(yes);
+			let y = date.getFullYear();
+			let m = date.getMonth() + 1;
+			m = m < 10 ? '0' + m : m;
+			let d = date.getDate();
+			d = d < 10 ? '0' + d : d;
+			const time = y + '-' + m + '-' + d;
+			console.log('tomorrowDate---------222', time);
+			return time;
+		},
+
+		fyList() {
+			//鍒楄〃鏌ヨ
+			uni.showLoading({
+				title: '姝e湪鍔犺浇...'
+			});
+			let compId = uni.getStorageSync('userInfo').compId;
+
+			let params = {
+				current: 1,
+				size: 100,
+				status: 2,
+				trainType: 1,
+				compId: compId
+			};
+			this.$reqGet('fyList', params).then(res => {
+				if (res.code == 0) {
+					this.xscarshippingdayplan(res.data);
+				}
+			});
+		},
+		xscarshippingdayplan(allList) {
+			//宸茬粡璁剧疆鐨�
+			console.log(allList, 'allList==========');
+			let params = {
+				current: 1,
+				size: 50,
+				shippingDate: this.info.shippingDate
+			};
+			this.$reqGet('xscarshippingdayplan', params)
+				.then(res => {
+					if (res.code == 0) {
+						if (!allList) {
+							this.fyData = res.data.records;
+							console.log(this.fyData, 'this.fyData=========11111111');
+						} else {
+							let l = res.data.records;
+							allList.forEach(e => {
+								l.forEach(ee => {
+									if (e.id == ee.orderId) {
+										e.numPlan = ee.numPlan;
+										e.numReal = ee.numReal;
+										e.planId = ee.id;
+										if (ee.carNums != null) {
+											e.carNums = ee.carNums;
+										}
+									}
+								});
+							});
+							this.fyData = allList;
+							console.log(this.fyData, 'this.fyData=========22222222');
+						}
+						console.log(this.fyData, 'this.fyData=========333333333');
+						uni.hideLoading();
+					}
+				})
+				.catch(e => {
+					uni.hideLoading();
+				});
+		},
+		tabClick(item) {
+			//鍒囨崲浠婃棩鍜屾槑鏃�
+			console.log(item, 'item==========');
+			if (item.index == 1) {
+				this.info.shippingDate = this.tomorrowDate();
+				if (this.isTomJihua == '宸茶缃殑璁″垝') {
+					this.xscarshippingdayplan();
+				} else {
+					this.fyList();
+				}
+			} else {
+				this.info.shippingDate = this.todayDate();
+				if (this.isTomJihua == '宸茶缃殑璁″垝') {
+					this.xscarshippingdayplan();
+				} else {
+					this.fyList();
+				}
+			}
+		},
+		inputChange(val) {
+			console.log(val);
+		},
+		inputTotalChange(val) {
+			console.log(val, 'val2=======val2');
+			this.editRow = val;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep {
+	.u-tabs__wrapper__nav {
+		padding-left: vww(75.5);
+	}
+
+	.u-radio__text {
+		span {
+			font-size: vww(14);
+		}
+	}
+	.u-radio {
+		margin-right: vww(10);
+	}
+	.u-radio__text {
+		font-size: vww(14) !important;
+	}
+	.u-input {
+		height: vww(16);
+		width: vww(100);
+		z-index: 1;
+	}
+	.u-button {
+		position: fixed !important;
+		left: 50%;
+		bottom: vww(20);
+		width: vww(200) !important;
+		transform: translateX(-50%);
+		border-radius: vww(20);
+		z-index: 9999;
+	}
+	.u-radio-group--row {
+		height: 100%;
+		width: 100%;
+		display: flex;
+		justify-content: right;
+	}
+
+	.u-radio__icon-wrap {
+		width: vww(18) !important;
+		height: vww(18) !important;
+	}
+	.u-icon__icon {
+		font-size: vww(12) !important;
+		line-height: vww(12) !important;
+	}
+	.u-empty{
+		width:100%;
+		height:vww(300);
+	}
+}
+
+.qiehuan-box {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	width: 100%;
+	height: vww(44);
+	z-index: 10;
+	background-color: #fff;
+}
+
+.jihua-wrap {
+	width: 100%;
+	height: 100%;
+	// overflow-y: auto; // 浼氬紩璧烽敭鐩樺脊鍑洪〉闈㈠竷灞�
+	display: flex;
+	flex-direction: column;
+
+	// .xiugai-btn {
+	// 	position: absolute;
+	// 	left: 50%;
+	// 	bottom: vww(20);
+	// 	width: vww(200);
+	// 	transform: translateX(-50%);
+	// 	border-radius: vww(20);
+	// }
+}
+
+.jihua-main {
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+	padding: vww(44) vww(10) vww(70) vww(10);
+	box-sizing: border-box;
+	.main-inside {
+		width: 100%;
+		height: calc(100% - vww(44));
+	}
+
+	.shaixuan-box {
+		height: vww(40);
+		position: sticky;
+		top: vww(44);
+		left: 0;
+		right: 0;
+		width: 100%;
+		z-index: 10;
+		background-color: #fff;
+	}
+
+	.main-block-box {
+		box-shadow: 0px 0px 8px 0px rgba(216, 218, 238, 0.8);
+		height: vww(120);
+		padding: vww(10);
+		box-sizing: border-box;
+		margin-top: vww(12);
+		border-radius: vww(8);
+		&:first-child {
+			margin-top: vww(5);
+		}
+		.jihua-main-line {
+			width: 100%;
+			display: flex;
+
+			view {
+				font-size: vww(14);
+			}
+
+			.name {
+				font-weight: 600 !important;
+			}
+
+			.main-flex {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				view {
+					font-size: vww(14);
+					line-height: vww(32);
+				}
+				.carNum-box {
+					display: flex;
+					view {
+						font-size: vww(14);
+						line-height: vww(32);
+					}
+				}
+			}
+		}
+	}
+}
 </style>

--
Gitblit v1.9.1