From 0732d75ccd82baffb35238949b11dbfb3614d790 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 九月 2023 13:45:15 +0800
Subject: [PATCH] Merge branch 'stwms2' of http://47.97.1.152:5880/r/wms_app into stwms2

---
 pages/stock/stockQuery.vue  |   15 
 pages/home/home.vue         |  153 +++++----
 pages/order/orderPutOn2.vue |    7 
 pages/order/orderList.vue   |   80 +++++
 pages/order/orderDetil.vue  |  137 ++++++++
 pages/order/orderPutOn3.vue |  530 +++++++++++++++++++++++++++++++++
 manifest.json               |    2 
 pages.json                  |   18 +
 pages/mat/matQuery.vue      |    1 
 pages/pakin/pakin.vue       |    2 
 static/css/wms.css/wms.css  |    4 
 11 files changed, 860 insertions(+), 89 deletions(-)

diff --git a/manifest.json b/manifest.json
index a690f72..4f8f32f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-    "versionName" : "2023062501",
+    "versionName" : "2023070701",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
diff --git a/pages.json b/pages.json
index 0ad18ff..e6057ec 100644
--- a/pages.json
+++ b/pages.json
@@ -97,6 +97,24 @@
 			}
 		},
 		{
+			"path": "pages/order/orderPutOn3",
+			"style": {
+				"navigationBarTitleText": "璁㈠崟缁勬墭3"
+			}
+		},
+		{
+			"path": "pages/order/orderList",
+			"style": {
+				"navigationBarTitleText": "璁㈠崟鍒楄〃"
+			}
+		},
+		{
+			"path": "pages/order/orderDetil",
+			"style": {
+				"navigationBarTitleText": "璁㈠崟璇︽儏"
+			}
+		},
+		{
 			"path": "pages/stock/changePallet",
 			"style": {
 				"navigationBarTitleText": "鎹㈡澘缁戝畾"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 67f9fc4..3b9b912 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,33 +24,40 @@
 				icon: '',
 				elements: [],
 				elements2: [
+					{
+						title: '缁勬墭鍏ュ簱',
+						name: 'pakin',
+						color: 'orange',
+						cuIcon: 'pullup',
+						url: '/pakin/pakin'
+					},
 					// {
-					// 	title: '缁勬墭鍏ュ簱',
-					// 	name: 'pakin',
+					// 	title: '璁㈠崟缁勬墭',
+					// 	name: 'orderPakin',
+					// 	color: 'blue',
+					// 	cuIcon: 'pullup',
+					// 	url: '/order/orderPakin'
+					// },
+					// {
+					// 	title: '缁勬墭涓婃灦',
+					// 	name: 'putOn',
 					// 	color: 'cyan',
 					// 	cuIcon: 'pullup',
-					// 	url: '/pakin/pakin'
+					// 	url: '/pakin/putOn'
 					// },
-					{
-						title: '璁㈠崟缁勬墭',
-						name: 'orderPakin',
-						color: 'blue',
-						cuIcon: 'pullup',
-						url: '/order/orderPakin'
-					},
-					{
-						title: '缁勬墭涓婃灦',
-						name: 'putOn',
-						color: 'cyan',
-						cuIcon: 'pullup',
-						url: '/pakin/putOn'
-					},
 					{
 						title: '璁㈠崟缁勬墭2',
 						name: 'putOn',
 						color: 'cyan',
 						cuIcon: 'pullup',
 						url: '/order/orderPutOn2'
+					},
+					{
+						title: '璁㈠崟缁勬墭3',
+						name: 'putOn',
+						color: 'cyan',
+						cuIcon: 'pullup',
+						url: '/order/orderPutOn3'
 					},
 					// {
 					// 	title: '鎵撳嵃',
@@ -59,62 +66,62 @@
 					// 	cuIcon: 'text',
 					// 	url: '/print/print'
 					// },
-					{
-						title: '璁㈠崟涓婃灦',
-						name: 'orderPutOn',
-						color: 'mauve',
-						cuIcon: 'pullup',
-						url: '/order/orderPutOn'
-					},
-					{
-						title: '璁㈠崟涓嬫灦',
-						name: 'orderPutDown',
-						color: 'pink',
-						cuIcon: 'pulldown',
-						url: '/order/orderPutDown'
-					},
-					{
-						title: '搴撳瓨鏌ヨ',
-						name: 'stockQuery',
-						color: 'brown',
-						cuIcon: 'check',
-						url: '/stock/stockQuery'
-					},
-					{
-						title: '鐩樼偣',
-						name: 'stockCheck',
-						color: 'red',
-						cuIcon: 'post',
-						url: '/stock/stockCheck'
-					},
-					{
-						title: '鍟嗗搧鎵撳嵃',
-						name: 'matList',
-						color: 'orange',
-						cuIcon: 'post',
-						url: '/mat/matList'
-					},
-					{
-						title: '琛ヨ揣',
-						name: 'restock',
-						color: 'yellow',
-						cuIcon: 'punch',
-						url: '/stock/restock'
-					},
-					{
-						title: '杞叏鏉�',
-						name: 'piking',
-						color: 'olive',
-						cuIcon: 'order',
-						url: '/pakin/piking'
-					},
-					{
-						title: '鎹㈡澘缁戝畾',
-						name: 'changePallet',
-						color: 'green',
-						cuIcon: 'order',
-						url: '/stock/changePallet'
-					},
+					// {
+					// 	title: '璁㈠崟涓婃灦',
+					// 	name: 'orderPutOn',
+					// 	color: 'mauve',
+					// 	cuIcon: 'pullup',
+					// 	url: '/order/orderPutOn'
+					// },
+					// {
+					// 	title: '璁㈠崟涓嬫灦',
+					// 	name: 'orderPutDown',
+					// 	color: 'pink',
+					// 	cuIcon: 'pulldown',
+					// 	url: '/order/orderPutDown'
+					// },
+					// {
+					// 	title: '搴撳瓨鏌ヨ',
+					// 	name: 'stockQuery',
+					// 	color: 'brown',
+					// 	cuIcon: 'check',
+					// 	url: '/stock/stockQuery'
+					// },
+					// {
+					// 	title: '鐩樼偣',
+					// 	name: 'stockCheck',
+					// 	color: 'red',
+					// 	cuIcon: 'post',
+					// 	url: '/stock/stockCheck'
+					// },
+					// {
+					// 	title: '鍟嗗搧鎵撳嵃',
+					// 	name: 'matList',
+					// 	color: 'orange',
+					// 	cuIcon: 'post',
+					// 	url: '/mat/matList'
+					// },
+					// {
+					// 	title: '琛ヨ揣',
+					// 	name: 'restock',
+					// 	color: 'yellow',
+					// 	cuIcon: 'punch',
+					// 	url: '/stock/restock'
+					// },
+					// {
+					// 	title: '杞叏鏉�',
+					// 	name: 'piking',
+					// 	color: 'olive',
+					// 	cuIcon: 'order',
+					// 	url: '/pakin/piking'
+					// },
+					// {
+					// 	title: '鎹㈡澘缁戝畾',
+					// 	name: 'changePallet',
+					// 	color: 'green',
+					// 	cuIcon: 'order',
+					// 	url: '/stock/changePallet'
+					// },
 					{
 						title: '閫�鍑虹櫥褰�',
 						name: 'logOut',
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index e3713f5..7f48ff1 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -91,7 +91,6 @@
 						'token':uni.getStorageSync('token'),
 				    },
 					success(result) {
-						console.log(result);
 						var res = result.data
 						if (res.code === 200 ) {
 							that.matList = res.data
diff --git a/pages/order/orderDetil.vue b/pages/order/orderDetil.vue
new file mode 100644
index 0000000..dab8390
--- /dev/null
+++ b/pages/order/orderDetil.vue
@@ -0,0 +1,137 @@
+<template>
+	<view >
+		<scroll-view>
+			<view class="detil-list" v-for="(item,i) in dataList" :key="i">
+				<view class="detil-list-checkbox">
+					<label>
+						<checkbox :value="check" :checked="item.checked" @click="set(i)"/>
+					</label>
+				</view>
+				<view class="detil-list-context">
+					<view class="flex-align-center">
+						<view>鍗曞彿锛�</view><view>{{item.orderNo}}</view>
+					</view>
+					<view class="flex-align-center">
+						<view>鏂欏彿锛�</view><view>{{item.matnr}}</view>
+					</view>
+					<view class="flex-align-center">
+						<view>鍚嶇О锛�</view><view>{{item.maktx}}</view>
+					</view>
+					<view class="flex-align-center">
+						<view>瑙勬牸锛�</view><view>{{item.specs}}</view>
+					</view>
+					<view class="flex-align-center">
+						<view>鎵瑰彿锛�</view><view>{{item.batch}}</view>
+					</view>
+					<view class="flex-align-center">
+						<view>閲嶉噺锛�</view><view>{{item.weight}}</view>
+					</view>
+					<view class="flex-align-center">
+						<view>鏁伴噺锛�</view><view>{{item.anfme}}</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+		<view class="buttom">
+			<button size="mini" type="primary" @click="back()">鎻愬彇</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dataList: [],
+				check: '',
+				baseUrl: '',
+				token: '',
+				orderNo: ''
+			}
+		},
+		onShow() {
+			let that = this
+			// #ifdef APP-NVUE
+			const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			// #endif
+			// #ifndef APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			// #endif
+			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+			eventChannel.on('orderNo', function(data) {
+				that.orderNo = data.orderNo
+				console.log(data);
+			})
+			
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.getOrderDetl();
+		},
+		methods: {
+			set(e) {
+				var ck = this.dataList[e].checked
+				this.dataList[e].checked = ck ? false:true
+			},
+			back() {
+				let that = this
+				let k;
+				let confirmList = [];
+				for(k in that.dataList) {
+					if(that.dataList[k].checked) {
+						confirmList.push(that.dataList[k])
+					}
+				}
+				this.getOpenerEventChannel().emit('orderList', {data: confirmList});
+				uni.navigateBack({
+					
+				})
+			},
+			getOrderDetl() {
+				console.log(this.orderNo);
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/order/list/orderNo',
+					data: {orderNo: that.orderNo} ,
+					method: 'GET',
+					success(res) {
+						res = res.data;
+						if (res.code === 200) {
+							that.dataList = res.data
+							for (var i = 0; i < that.dataList.length; i++) {
+								that.$set(that.dataList[i],'checked',false)
+							}
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	.detil-list {
+		background-color: #FFF;
+		border-radius: 10rpx;
+		margin: 10px;
+		display: flex;
+		align-items: center;
+		box-shadow: 0 0 5px 1px #e7e7e7;
+	}
+	.detil-list-checkbox {
+		width: 15%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.detil-list-context {
+		height: 100%;
+		width: 85%;
+	}
+	.flex-align-center {
+		display: flex;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/orderList.vue b/pages/order/orderList.vue
new file mode 100644
index 0000000..1e1e7ee
--- /dev/null
+++ b/pages/order/orderList.vue
@@ -0,0 +1,80 @@
+<template>
+	<view>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+		</view>
+		<scroll-view>
+			<view v-for="(item,i) in orderList" class="order-list">
+				<view @click="selectOrderNo(item)" class="order-item">
+					{{item}}
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				condition: '',
+				orderList: [],
+				checked: true
+			}
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.getOrderNoList()
+		},
+		methods: {
+			selectOrderNo(i) {
+				let that = this
+				this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: i});
+				uni.navigateBack({
+					
+				})
+					
+			},
+			getOrderNoList() {
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/order/list/all',
+					method: 'POST',
+					success(res) {
+						res = res.data
+						for (var i = 0; i < res.data.length; i++) {
+							that.orderList.push(res.data[i].order_no)
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	.order-list {
+		display: flex;
+		height: 100rpx;
+		align-items: center;
+		/* justify-content: center; */
+		margin: 10px;
+		background-color: #FFF;
+		border-radius: 10rpx;
+		box-shadow: 0 0 5px 1px #e7e7e7;
+		text-indent: 1em;
+		color: #606266;
+	}
+	.order-list:last-child {
+		margin-bottom: 10px;
+	}
+	.order-item {
+		display: flex;
+		height: 100%;
+		width: 100%;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/orderPutOn2.vue b/pages/order/orderPutOn2.vue
index 8da6f90..bca6b30 100644
--- a/pages/order/orderPutOn2.vue
+++ b/pages/order/orderPutOn2.vue
@@ -156,7 +156,7 @@
 				order: '',
 				barcode: '',
 				barcodeFocus: '',
-				dataList: [],
+				dataList: [{}],
 				checkedDataList: [],
 				count: 0,
 				rowNum: '',
@@ -176,11 +176,6 @@
 				orderNoList: [],
 				orderNo: '',
 			}
-		},
-		onShow() {
-			this.baseUrl = uni.getStorageSync('baseUrl');
-			this.token = uni.getStorageSync('token');
-			this.getOrderNoList()
 		},
 		methods: {
 			set(e) {
diff --git a/pages/order/orderPutOn3.vue b/pages/order/orderPutOn3.vue
new file mode 100644
index 0000000..f026aaa
--- /dev/null
+++ b/pages/order/orderPutOn3.vue
@@ -0,0 +1,530 @@
+<template>
+	<view>
+		<view class="code">
+			<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="orderNo" :focus="orderNoFocus" @input="findOrder()">
+				<view class="item-right">
+					<button></button>
+					<text style="text-align: right;color: #409EFF;" @click="selectOrder()">鎻愬彇+</text>
+					<uni-icons type="right" color="#c1c1c1"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<view class="mat-list-title">
+			<view style="width: 200rpx;"></view>
+			<view style="-webkit-flex: 1;flex: 1;">鍟嗗搧鍒楄〃</view>
+			<view style="width: 200rpx;"><button size="mini" type="primary" @click="getChecked">鎻愬彇</button></view>
+		</view>
+		<scroll-view>
+			<checkbox-group class="list" v-for="(item,i) in dataList" :key="i" @change="checkboxChange">
+				<view class="aside">
+					<checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
+				</view>
+				<view class="list-left" style="margin: 0;">
+					<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">
+							<uni-tag :text="item.orderNo" type="primary"></uni-tag>
+						</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>
+			</checkbox-group>
+		</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="matnr1" 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>
+			<!-- 鎻愮ず淇℃伅寮圭獥 -->
+			<uni-popup ref="message" type="message">
+				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				order: '',
+				barcode: '',
+				barcodeFocus: '',
+				dataList: [],
+				checkedDataList: [],
+				count: 0,
+				rowNum: '',
+				matnr: '',
+				matnr1: '',
+				batch: '',
+				weight: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				barcodeFocus: true,
+				orderNoFocus: false,
+				matData: '',
+				removeNum: 0,
+				orderNoList: [],
+				orderNo: '',
+			}
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+		},
+		methods: {
+			findOrder() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/order/list/orderNo',
+					data: {orderNo: that.orderNo} ,
+					method: 'GET',
+					success(res) {
+						res = res.data;
+						if (res.code === 200) {
+							uni.navigateTo({
+								url: "../order/orderDetil",
+								success: function(res) {
+									// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+									res.eventChannel.emit('orderNo', {
+										orderNo: that.orderNo
+									})
+								},
+								events: {
+									// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+									orderList: function(data) {
+										for(var item in data.data) {
+											that.dataList.push(data.data[item])
+										}
+										that.orderNo = ''
+									},
+								},
+							});
+						}
+					}
+				})
+			},
+			selectOrder() {
+				let that = this
+				uni.navigateTo({
+					url: "../order/orderList",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('commonUrl', {
+							commonUrl: ''
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.orderNo = data.data
+							console.log(that.orderNo);
+							that.findOrder(that.orderNo)
+						},
+					},
+				});
+			},
+			set(e) {
+				var ck = this.dataList[e].checked
+				this.dataList[e].checked = ck ? false:true
+			},
+			getChecked() {
+				var checkedList = []
+				for(var i = 0; i < this.dataList.length; i++) {
+					var t = !this.dataList[i].checked
+					if (this.dataList[i].checked) {
+						checkedList.push(this.dataList[i])
+					}
+				}
+				this.dataList = checkedList
+			},
+			getOrderDet() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/order/list/orderNo',
+					data: {orderNo: that.orderNo} ,
+					method: 'GET',
+					success(res) {
+						res = res.data;
+						if (res.code === 200) {
+							that.dataList = res.data
+							for (var i = 0; i < that.dataList.length; i++) {
+								that.$set(that.dataList[i],'checked',false)
+							}
+						}
+					}
+				})
+			},
+			checkboxChange: function (e) {
+			},
+			getOrderNoList() {
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/order/list/all',
+					method: 'POST',
+					success(res) {
+						res = res.data
+						for (var i = 0; i < res.data.length; i++) {
+							that.orderNoList.push(res.data[i].order_no)
+						}
+					}
+				})
+			},
+
+			messageToggle(type) {
+				this.msgType1 = type
+				this.$refs.message.open()
+			},
+			// barcode input 浜嬩欢
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.barcode.length
+					this.focuss()
+				}, 200)
+			},
+			// 鎵樼洏鐮佹湁璇噸缃�
+			barcodeFocuss() {
+				let that = this;
+				that.barcodeFocus = false;
+				setTimeout(() => {
+					that.barcode = '';
+					that.barcodeFocus = true;
+				}, 100);
+			},
+			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+			focuss() {
+				setTimeout(() => {
+					this.matnr = '';
+					this.matFocus = true;
+				}, 100);
+			},
+			combConfirm(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁鐜板湪缁勬墭!'
+				this.$refs.combConfirm.open()
+			},
+			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;
+				}
+				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;
+					}
+				}
+				uni.request({
+					url: that.baseUrl + '/mobile/comb/auth',
+					data: JSON.stringify({
+						barcode: that.barcode,
+						combMats: that.dataList
+					}),
+					method: 'POST',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.resst();
+							that.messageText = "缁勬墭鎴愬姛"
+							that.messageToggle('success')
+						} 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.orderNo = ''
+				this.barcode = ''
+				this.messageText = "閲嶇疆瀹屾垚"
+				this.messageToggle('success')
+			},
+			// 鍙栨秷閲嶇疆
+			resetClose() {
+
+			},
+			// 淇敼鎵瑰彿
+			revise(item, i) {
+				this.matnr1 = 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(i) {
+				this.messageText = "绉婚櫎鎴愬姛"
+				this.messageToggle('success')
+				this.dataList.splice(this.removeNum, 1)
+			},
+			reviseConfirm() {
+				this.dataList[this.rowNum].anfme = this.count
+				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
+				this.messageText = "淇敼鎴愬姛"
+				this.messageToggle('success')
+				this.$refs.revise.close()
+				this.$forceUpdate() // 寮哄埗鍒锋柊
+			},
+			reviseClose() {
+				this.$refs.revise.close()
+			},
+			changeValue(value) {
+				this.count = value
+			},
+			// 娓呯┖
+			resst() {
+				this.dataList = []
+				this.barcode = ''
+				this.barcodeFocuss()
+			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
+			// 鍙栨秷绉婚櫎
+			removeClose() {
+				this.$refs.alertDialog.close()
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+
+	.list {
+		display: flex;
+		min-height: 80rpx;
+		background-color: #FFF;
+		margin: 20rpx 20rpx;
+		border-radius: 20rpx;
+		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.2);
+	}
+
+	.list:first-child {
+		margin-top: 360rpx;
+	}
+
+	.list:last-child {
+		margin-bottom: 120rpx;
+	}
+
+	.aside {
+		width: 100rpx;
+		/* background-color: #303133; */
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.code {
+		width: 100%;
+		position: fixed;
+		min-height: 200rpx;
+		background-color: #FFF;
+		z-index: 10;
+	}
+
+	.item {
+		display: flex;
+		align-items: center;
+		height: 100rpx;
+		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 {
+		display: flex;
+		align-items: center;
+		height: 80rpx;
+		width: 100%;
+		background-color: white;
+		position: fixed;
+		margin-top: 200rpx;
+		z-index: 9;
+		/* border-top: 1px solid #DCDFE6; */
+		text-align: center;
+		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+		
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 456e187..483aa1d 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -141,7 +141,7 @@
 				baseUrl: '',
 				token: '',
 				barcode: '',
-				dataList: [],
+				dataList: [{}],
 				count: 0,
 				rowNum: '',
 				matnr: '',
diff --git a/pages/stock/stockQuery.vue b/pages/stock/stockQuery.vue
index 2270073..b31bc35 100644
--- a/pages/stock/stockQuery.vue
+++ b/pages/stock/stockQuery.vue
@@ -3,8 +3,12 @@
 		<!-- 鎼滅储妗� -->
 		<view class="code">
 			<view class="item">
-				<view class="code-decs">搴撲綅鍙�:</view>
+				<view class="code-decs">搴撲綅鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo">
+			</view>
+			<view class="item">
+				<view class="code-decs">鎵樼洏鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode">
 			</view>
 			<view class="item">
 				<view class="code-decs">鐗╂枡鍙�:</view>
@@ -88,6 +92,7 @@
 				baseUrl: '',
 				token: '',
 				locNo: null,
+				barcode: null,
 				matnr: null,
 				dataList: [],
 				msgType: '',
@@ -111,17 +116,16 @@
 						curr: 1,
 						limit: 100,
 						loc_no: that.locNo,
+						zpallet: that.barcode,
 						matnr: that.matnr
 					},
 					method:"GET",
 					success(result) {
-						console.log(result)
 						let res = result.data
 						let records = res.data.records
 						if (res.code == 200) {
 							if (records) {
 								that.dataList = records
-								console.log(that.dataList)
 							} else {
 								uni.showToast({
 									title: "鏆傛棤鏇村鏁版嵁",
@@ -153,6 +157,7 @@
 				this.dataList = []
 				this.matnr = ''
 				this.locNo = ''
+				this.barcode = ''
 				this.messageText = "閲嶇疆瀹屾垚"
 				this.messageToggle('success')
 			},
@@ -173,7 +178,7 @@
 	.code {
 		width: 100%;
 		position: fixed;
-		min-height: 200rpx;
+		min-height: 100rpx;
 		background-color: #FFF;
 		z-index: 10;
 	}
@@ -213,7 +218,7 @@
 		width: 100%;
 		background-color: white;
 		position: fixed;
-		margin-top: 200rpx;
+		margin-top: 300rpx;
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 28a39b8..34210d6 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -7,7 +7,7 @@
 	box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
 }
 .list:first-child {
-	margin-top: 310rpx;
+	margin-top: 420rpx;
 }
 .list:last-child {
 	margin-bottom: 120rpx;
@@ -53,7 +53,7 @@
 	justify-content: space-between;
 	height: 100rpx;
 	background-color: #FFF;
-	box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2) ;
+	box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.2) ;
 }
 .popup {
 	width: 80vw;

--
Gitblit v1.9.1