From 655bb2dc1399d1b6c3afd89be56cce178745cd07 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 13 三月 2024 08:29:50 +0800
Subject: [PATCH] #

---
 pages/phyz/AGV/AGVPakin.vue |  654 ++++++++++++++++++++++++++++++++++++++++
 static/img/newLogo.png      |    0 
 pages.json                  |   16 +
 pages/home/menuHome.vue     |   18 
 pages/home/testView.vue     |  262 ++++++++++++++++
 5 files changed, 941 insertions(+), 9 deletions(-)

diff --git a/pages.json b/pages.json
index 0b4f2f5..470c1e7 100644
--- a/pages.json
+++ b/pages.json
@@ -394,6 +394,22 @@
 				"navigationBarTitleText" : "骞冲簱鏃犳墭涓婃灦",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/home/testView",
+			"style" : 
+			{
+				"navigationBarTitleText" : "娴嬭瘯",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/phyz/AGV/AGVPakin",
+			"style" : 
+			{
+				"navigationBarTitleText" : "AGV缁勬墭",
+				"enablePullDownRefresh" : false
+			}
 		}
 		
 		
diff --git a/pages/home/menuHome.vue b/pages/home/menuHome.vue
index 1ac1ba0..141a272 100644
--- a/pages/home/menuHome.vue
+++ b/pages/home/menuHome.vue
@@ -32,14 +32,14 @@
 						// cuIcon: 'pullup',
 						url: `/home/agvManage`
 					},
-					{
-						title: '鍥涢」搴撶鐞�',
-						name: 'FourWayManage',
-						color: 'blue',
-						// cuIcon: 'pullup',
-						url: `/home/fourWayManage` 
-					},
-					{
+					// {
+					// 	title: '娴嬭瘯',
+					// 	name: 'testView',
+					// 	color: 'blue',
+					// 	// cuIcon: 'pullup',
+					// 	url: `/home/testView` 
+					// },
+					/* {
 						title: '骞充粨绠＄悊',
 						name: 'basicStore',
 						color: 'mauve',
@@ -52,7 +52,7 @@
 						color: 'brown',
 						// cuIcon: 'pullup',
 						url: '/home/other'
-					},
+					}, */
 					{
 						title: '閫�鍑虹櫥褰�',
 						name: 'logOut',
diff --git a/pages/home/testView.vue b/pages/home/testView.vue
new file mode 100644
index 0000000..a0e4122
--- /dev/null
+++ b/pages/home/testView.vue
@@ -0,0 +1,262 @@
+<template>
+	<view>
+		<scroll-view scroll-y class="page">
+			<view class="nav-list">
+				<navigator hover-class='none' :url="'/pages' + item.url" class="nav-li" navigateTo
+					:class="'bg-'+item.color" :style="[{animation: 'show ' + ((index+1)*0.2+1) + 's 1'}]"
+					v-for="(item,index) in elements" :key="index">
+					<view class="nav-title">{{item.title}}</view>
+					<view class="nav-name">{{item.name}}</view>
+					<text :class="'cuIcon-' + item.cuIcon"></text>
+				</navigator>
+			</view>
+			<view class="cu-tabbar-height"></view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				icon: '',
+				elements: [],
+				project: 'tzsk',
+				elements2: [
+					{
+						title: 'AGV缁勬墭',
+						name: 'AGVPakin',
+						color: 'blue',
+						// cuIcon: 'pullup',
+						url: `/tzsk/AGV/AGVPakin`
+					},
+					{
+						title: 'AGV鐩樼偣/鎷ｆ枡',
+						name: 'AGVPick',
+						color: 'cyan',
+						// cuIcon: 'pullup',
+						url: `/tzsk/AGV/AGVPick` 
+					},
+					
+					{
+						title: 'AGV涓婃灦缁戝畾',
+						name: 'AGVPakinBing',
+						color: 'mauve',
+						// cuIcon: 'pullup',
+						url: '/tzsk/AGV/AGVPakinBing'
+					},
+					{
+						title: 'AGV鍚姩鍏ュ簱',
+						name: 'AGVStart',
+						color: 'pink',
+						// cuIcon: 'pullup',
+						url: '/tzsk/AGV/AGVStart'
+					},
+					{
+						title: 'AGV涓婃灦缁勬墭',
+						name: 'AGVPakinOn',
+						color: 'brown',
+						// cuIcon: 'pullup',
+						url: '/tzsk/AGV/AGVPakinOn'
+					},
+					{
+						title: 'AGV瀹瑰櫒绂诲満',
+						name: 'AGVContainerMove',
+						color: 'cyan',
+						// cuIcon: 'pullup',
+						url: '/tzsk/AGV/AGVContainerMove'
+					},
+					{
+						title: 'AGV鏉＄爜',
+						name: 'AGVCode',
+						color: 'cyan',
+						// cuIcon: 'pullup',
+						url: '/tzsk/AGV/AGVCode'
+					},
+				],
+				colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
+			};
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.project = uni.getStorageSync('project')
+			this.getAuth()
+			this.backGroundRepeat()
+		},
+		methods: {
+			backGroundRepeat() {
+				let len = this.colorList.length
+				let i = 0
+				for (let k in this.elements2) {
+					if (i == len) {
+						i = 0
+					}
+					this.elements2[k].color = this.colorList[i]
+					i++
+				}
+			},
+			getAuth() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/menu/pda/auth',
+					data: {},
+					header: { 'token': uni.getStorageSync('token') },
+					method: 'POST',
+					success(res) {
+						console.log(res);
+						if (res.statusCode === 404) {
+							that.elements = that.elements2
+							return
+						}
+						res = res.data
+						that.elements = []
+						if (res.code === 200) {
+							if (res.data == undefined || res.data == null || res.data == "") {
+								that.elements = that.elements2
+								return
+							}
+							for (var i = 0; i < res.data.length; i++) {
+								if (res.data.length < 0) {
+									break;
+								}
+								that.getIcon(res.data[i].title)
+								that.elements.unshift({
+									title: res.data[i].name,
+									name: res.data[i].title,
+									color: that.colorList[i],
+									cuIcon: that.icon,
+									url: `/${that.project}${res.data[i].action}`
+								})
+							}
+							that.elements.push({
+								title: '閫�鍑虹櫥褰�',
+								name: 'logOut',
+								color: 'grey',
+								cuIcon: 'exit',
+								url: '/login/logOut'
+							})
+						} else if (res.code === 403) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								position: 'top'
+							})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else if(res.status === 404) {
+							that.elements = that.elements2
+							// uni.showToast({
+							// 	title: '榛樿涓婚〉',
+							// 	icon: "none",
+							// 	position: 'top'
+							// })
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								position: 'top'
+							})
+						}
+					},
+					fail(err) {
+						console.log(err);
+					}
+				})
+			},
+			getIcon(e) {
+				const ways = ['pakin','orderPakin','orderPutOn']
+				if (ways.includes(e)) {
+					this.icon = 'pullup'
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+	.page {
+		height: 100vh;
+	}
+
+	.bg-red {
+		background-color: #e54d42;
+		color: #ffffff;
+	}
+
+	.bg-orange {
+		background-color: #f37b1d;
+		color: #ffffff;
+	}
+
+	.bg-yellow {
+		background-color: #fbbd08;
+		color: #333333;
+	}
+
+	.bg-olive {
+		background-color: #8dc63f;
+		color: #ffffff;
+	}
+
+	.bg-green {
+		background-color: #39b54a;
+		color: #ffffff;
+	}
+
+	.bg-cyan {
+		background-color: #1cbbb4;
+		color: #ffffff;
+	}
+
+	.bg-blue {
+		background-color: #0081ff;
+		color: #ffffff;
+	}
+
+	.bg-purple {
+		background-color: #6739b6;
+		color: #ffffff;
+	}
+
+	.bg-mauve {
+		background-color: #9c26b0;
+		color: #ffffff;
+	}
+
+	.bg-pink {
+		background-color: #e03997;
+		color: #ffffff;
+	}
+
+	.bg-brown {
+		background-color: #a5673f;
+		color: #ffffff;
+	}
+
+	.bg-grey {
+		background-color: #8799a3;
+		color: #ffffff;
+	}
+
+	.bg-gray {
+		background-color: #f0f0f0;
+		color: #333333;
+	}
+
+	.bg-black {
+		background-color: #333333;
+		color: #ffffff;
+	}
+
+	.bg-white {
+		background-color: #ffffff;
+		color: #666666;
+	}
+</style>
+
diff --git a/pages/phyz/AGV/AGVPakin.vue b/pages/phyz/AGV/AGVPakin.vue
new file mode 100644
index 0000000..a30572b
--- /dev/null
+++ b/pages/phyz/AGV/AGVPakin.vue
@@ -0,0 +1,654 @@
+<template>
+	<view>
+		<view class="code">
+			<view class="item">
+				<view class="code-decs">璁㈠崟鍙�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+					@input="findOrder()">
+			</view>
+			<view class="item">
+				<view class="code-decs">鏂欑鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+					@input="barcodeInput()">
+			</view>
+			<view class="item">
+				<view class="code-decs">鐗╂枡鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+				<view class="item-right">
+					<button></button>
+					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
+					<uni-icons type="right" color="#c1c1c1"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<view class="mat-list-title">
+			鍟嗗搧鍒楄〃
+		</view>
+		<scroll-view>
+			<view class="list" v-for="(item,i) in dataList" :key="i">
+				<view class="list-left">
+					<view class="list-left-item">
+						<view class="desc">No锛�</view>
+						<view class="left-item">{{i + 1}}</view>
+					</view>
+					<!-- <view class="list-left-item">
+						<view class="desc">绠辩爜锛�</view>
+						<view class="left-item">
+							<input type="text" v-model="item.containerCode">
+							<uni-tag :text="item.containerCode" type="primary"></uni-tag>
+						</view>
+					</view> -->
+					<!-- <view class="list-left-item">
+						<view class="desc">閿�鍞崟鍙凤細</view>
+						<view class="left-item">
+							<input type="text" v-model="item.csocode">
+						</view>
+					</view> -->
+					<!-- <view class="list-left-item">
+						<view class="desc">璁㈠崟琛屽彿锛�</view>
+						<view class="left-item">
+							<input type="text" v-model="item.isoseq">
+						</view>
+					</view> -->
+					<view class="list-left-item">
+						<view class="desc">鏂欏彿锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.matnr" type="primary"></uni-tag>
+						</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鍝佸悕锛�</view>
+						<view class="left-item">{{item.maktx}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">瑙勬牸锛�</view>
+						<view class="left-item">{{item.specs}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鎵瑰彿锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.batch" type="warning"></uni-tag>
+						</view>
+					</view>
+					<!-- <view class="list-left-item">
+						<view class="desc">閲嶉噺锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.weight" type="warning"></uni-tag>
+						</view>
+					</view> -->
+					<view class="list-left-item">
+						<view class="desc">鏁伴噺锛�</view>
+						<view class="left-item">{{item.anfme}}</view>
+					</view>
+				</view>
+				<view class="list-right">
+					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
+					<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+		<view class="buttom">
+			<button size="mini" @click="reset('warn')">閲嶇疆</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+		</view>
+		<!-- 寮圭獥 -->
+		<!-- 淇敼鏁伴噺 -->
+		<view>
+			<uni-popup ref="revise" type="dialog">
+				<view class="popup">
+					<!-- 鏍囬 -->
+					<view class="title">淇敼</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鏂欏彿:</view>
+						<view class="popup-item-right">
+							<input type="text" v-model="matnr" disabled="true"
+								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+						</view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鎵瑰彿:</view>
+						<view class="popup-item-right"><input type="text" v-model="batch"></view>
+					</view>
+					<!-- <view class="popup-item">
+						<view class="popup-item-left">閲嶉噺:</view>
+						<view class="popup-item-right"><input type="text" v-model="weight"></view>
+					</view> -->
+					<view class="popup-item">
+						<view class="popup-item-left">鏁伴噺:</view>
+						<view class="popup-item-right" style="border: none;justify-content: center;">
+							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
+						</view>
+					</view>
+					<view class="btn">
+						<view class="btn-left" @click="reviseClose">鍙栨秷</view>
+						<view class="btn-right" @click="reviseConfirm()">淇敼</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<!-- 绉婚櫎纭 -->
+		<view>
+			<!-- 鎻愮ず绐楃ず渚� -->
+			<uni-popup ref="alertDialog" type="dialog">
+				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<view>
+			<!-- 鎻愮ず淇℃伅寮圭獥 -->
+			<uni-popup ref="message" type="message">
+				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+			</uni-popup>
+		</view>
+		<!-- 纭缁勬墭 -->
+		<view>
+			<uni-popup ref="combConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="comb" @close="combClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<!-- 纭閲嶇疆 -->
+		<view>
+			<uni-popup ref="resetConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		
+		<view class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
+			<image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				barcode: '',
+				orderNo: '',
+				dataList: [],
+				count: 0,
+				rowNum: '',
+				matnr: '',
+				batch: '',
+				weight: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				orderNoFocus: true,
+				barcodeFocus: false,
+				matFocus: false,
+				matData: '',
+				removeNum: 0,
+				tempOrderInfo: {csocode: '',isoseq: ''},
+				hide: true,
+				hidebg: 'kb-bgtr'
+			}
+		},
+		onLoad() {
+			// #ifdef APP
+			setInterval(()=>{
+				if (this.hide) {
+					uni.hideKeyboard()
+				} else {
+					
+				}
+			},20)
+			// #endif
+		},
+		onBackPress() {
+			this.hide = false
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+		},
+		methods: {
+			hideKeyboard() {
+				this.hide = this.hide ? false : true
+				if (this.hide) {
+					this.hidebg = 'kb-bgtr'
+				} else {
+					this.hidebg = 'kb-bgfa'
+				}
+			},
+			// 鏍规嵁璁㈠崟鍙疯繑鍥炲晢鍝佽鎯�
+			findOrder() {
+				let that = this
+				that.tempOrderInfo.csocode = ''
+				that.tempOrderInfo.isoseq = ''
+				uni.request({
+					url: that.baseUrl + '/mobile/order/search/orderNo/auth',
+					header: {'token': uni.getStorageSync('token')},
+					data: {
+						orderNo: that.orderNo
+					},
+					success(res) {
+						res = res.data
+						console.log(res);
+						if (res.code === 200) {
+							if(res.data && res.data[0].combMats) {
+								for (let i = 0; i < res.data[0].combMats.length; i++) {
+									that.checkMat(res.data[0].combMats[i])
+								}
+								that.orderNoFocus = false
+								setTimeout(() => {
+									that.barcodeFocus = true
+								}, 10);
+							} else {
+								// uni.showToast({
+								// 	title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
+								// 	icon: "none",
+								// 	position: 'top'
+								// })
+							}
+						} else if (res.code == 403) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								position: 'top'
+							})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								position: 'top'
+							})
+						}
+					}
+				})
+			},
+			messageToggle(type) {
+				this.msgType1 = type
+				this.$refs.message.open()
+			},
+			// barcode input 浜嬩欢
+			orderNoInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.orderNo.length
+					this.barcodeFocuss()
+				}, 200)
+			},
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				if (this.barcode.split('_')[1]) {
+					this.barcode = this.barcode.split('_')[1]
+				} 
+				// this.barcode = this.barcode.split('_')[1]
+				setTimeout(() => {
+					let len = this.barcode.length
+					if (len != 10) {
+						uni.showToast({
+							title: '鏂欑鐮佹湁璇閲嶈瘯',
+							icon: "none",
+							position: 'top'
+						});
+						this.barcodeFocuss()
+						return;
+					}
+					this.focuss()
+				}, 200)
+			},
+			// 鎵樼洏鐮佹湁璇噸缃�
+			barcodeFocuss() {
+				let that = this;
+				that.barcodeFocus = false;
+				setTimeout(() => {
+					that.barcode = '';
+					that.barcodeFocus = true;
+				}, 100);
+			},
+			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+			focuss() {
+				this.focus = false;
+				setTimeout(() => {
+					this.matnr = '';
+					this.matFocus = true;
+				}, 100);
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				// 鍒ゆ柇鐗╂枡闀垮害鏄惁涓�1
+				// if (that.dataList.length >= 1) {
+				// 	this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+				// 	this.messageToggle('warn')
+				// 	that.matnr = ''
+				// 	return
+				// }
+				uni.request({
+					url: that.baseUrl + '/mat/auth',
+					data: { matnr: that.matnr },
+					header: { 'token': uni.getStorageSync('token') },
+					success(result) {
+						result = result.data
+						if (result.code === 200 && result.data) {
+							that.matData = result.data
+							that.matnr = ''
+							that.matData['batch'] = ''
+							uni.navigateTo({
+								url: "../../mat/matSelected",
+								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+								success: function(res) {
+									res.eventChannel.emit('mat', {
+										data: result.data,
+										// tempOrderInfo: that.tempOrderInfo
+									})
+								},
+								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+								events: {
+									matList: function(data) {
+										data.data['csocode'] = ''
+										data.data['isoseq'] = ''
+										that.checkMat(data.data)
+										that.focuss()
+									},
+								},
+							});
+						} else if (res.code == 403) {
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								position: 'top'
+							})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: "none",
+								position: 'top'
+							})
+						}
+
+					}
+				});
+
+			},
+			selectMat() {
+				let that = this
+				uni.navigateTo({
+					url: "../../mat/matQuery",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('commonUrl', {
+							commonUrl: ''
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.matnr = data.data
+							that.findMat(that.matnr)
+						},
+					},
+
+
+				});
+				that.matnr = ''
+			},
+			checkMat(mat) {
+				var len = this.dataList.length
+				var add = true ,sameItem = false
+				for (var i = 0; i < len; i++) {
+					if (mat.matnr == this.dataList[i].matnr) {
+						for (var j = 0; j < len; j++) {
+							if (mat.batch == this.dataList[j].batch) {
+								sameItem = true
+							}
+						}
+						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
+						if (mat.batch != this.dataList[i].batch) {
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							if (sameItem) {
+								add = false
+							} else {
+								add = true
+							}
+							
+						} else {
+							// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+							this.dataList[i].anfme += mat.anfme
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							add = false
+						}
+					}
+				}
+				if (add) {
+					this.dataList.unshift(mat)
+				}
+			},
+			// 淇敼鎵瑰彿
+			revise(item, i) {
+				this.matnr = this.dataList[i].matnr
+				this.count = this.dataList[i].anfme
+				this.batch = this.dataList[i].batch
+				this.weight = this.dataList[i].weight
+				this.rowNum = i
+				this.eject()
+			},
+			eject(type) {
+				this.type = type
+				this.$refs.revise.open(type)
+			},
+			// 鍒楄〃绉婚櫎鎸夐挳
+			remove(item, i, type) {
+				this.removeNum  = i
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+				this.$refs.alertDialog.open(i)
+			},
+			// 纭绉婚櫎
+			removeConfirm() {
+				this.messageText = "绉婚櫎鎴愬姛"
+				this.messageToggle('success')
+				this.dataList.splice(this.removeNum, 1)
+			},
+			// 鍙栨秷绉婚櫎
+			removeClose() {
+				this.$refs.alertDialog.close()
+			},
+			reviseConfirm() {
+				this.dataList[this.rowNum].anfme = this.count
+				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
+				this.matnr = ''
+				this.messageText = "淇敼鎴愬姛"
+				this.messageToggle('success')
+				this.$refs.revise.close()
+			},
+			reviseClose() {
+				this.$refs.revise.close()
+			},
+			changeValue(value) {
+				this.count = value
+			},
+			combConfirm(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁鐜板湪缁勬墭!'
+				this.$refs.combConfirm.open()
+			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
+			comb() {
+				uni.vibrateShort();
+				let that = this;
+				if (that.barcode === '') {
+					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+					this.messageToggle('error')
+					return;
+				}
+				if (that.dataList.length === 0) {
+					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+					this.messageToggle('error')
+					return;
+				}
+				// if (that.dataList.length > 1) {
+				// 	this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+				// 	this.messageToggle('error')
+				// 	return;
+				// }
+				for (var i = 0; i < that.dataList.length; i++) {
+					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+						this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+						this.messageToggle('error')
+						return;
+					}
+				}
+				console.log(that.dataList);
+				console.log(that.barcode);
+				console.log(that.orderNo);
+				// return
+				uni.request({
+					url: that.baseUrl + '/agvMobile/comb/auth',
+					data: JSON.stringify({
+						orderNo: that.orderNo,
+						barcode: that.barcode,
+						combMats: that.dataList
+					}),
+					method: 'POST',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.dataList = []
+							that.findOrder()
+							// that.resst();
+							that.barcode = ''
+							that.messageText = "缁勬墭鎴愬姛"
+							that.messageToggle('success')
+							const innerAudioContext = uni.createInnerAudioContext();
+							innerAudioContext.src = '/static/music/pakinOk.mp3';
+							innerAudioContext.play()
+						} else if (res.code == 403) {
+							that.messageText = res.msg
+							that.messageToggle('error')
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							that.messageText = res.msg
+							that.messageToggle('error')
+						}
+					}
+				});
+			},
+			reset(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁閲嶇疆!'
+				this.$refs.resetConfirm.open()
+			},
+			// 纭閲嶇疆
+			resetConfirm() {
+				this.dataList = []
+				this.barcode = ''
+				this.orderNo = ''
+				this.messageText = "閲嶇疆瀹屾垚"
+				this.messageToggle('success')
+			},
+			// 鍙栨秷閲嶇疆
+			resetClose() {
+
+			},
+			// 娓呯┖
+			resst() {
+				this.dataList = []
+				this.barcode = ''
+				this.orderNo = ''
+				this.barcodeFocuss()
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../../static/css/wms.css/wms.css');
+
+	.keyboard{
+		width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
+			top: 5px;right: 5px; border-radius: 50%;
+			display: flex;align-items: center;justify-content: center;
+	}
+	.kb-bgtr {
+		background-color: #55557f;
+	}
+	.kb-bgfa {
+		background-color: #00aeec;
+	}
+
+	.list:first-child {
+		margin-top: 340rpx;
+	}
+	.code {
+		width: 100%;
+		position: fixed;
+		min-height: 200rpx;
+		background-color: #FFF;
+		z-index: 10;
+	}
+
+	.item {
+		display: flex;
+		align-items: center;
+		height: 70rpx;
+		margin-left: 20rpx;
+		border-bottom: 1px solid #DCDFE6;
+	}
+
+	.item input {
+		height: 50rpx;
+		line-height: 50rpx;
+		/* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
+		font-size: 36upx;
+		font-family: PingFang SC;
+		width: 55vw;
+
+	}
+
+	.code-decs {
+		width: 20vw;
+		font-size: 18px;
+		color: #303133;
+	}
+
+	.item-right {
+		margin-left: auto;
+		margin-right: 20rpx;
+	}
+
+	.mat-list-title {
+		height: 80rpx;
+		line-height: 80rpx;
+		width: 100%;
+		background-color: white;
+		position: fixed;
+		margin-top: 210rpx;
+		z-index: 9;
+		/* border-top: 1px solid #DCDFE6; */
+		text-align: center;
+		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+	}
+</style>
diff --git a/static/img/newLogo.png b/static/img/newLogo.png
new file mode 100644
index 0000000..71dd632
--- /dev/null
+++ b/static/img/newLogo.png
Binary files differ

--
Gitblit v1.9.1