From 1ae4309fe4fbc19dcdcaa28b1193a2737299b900 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 11 十月 2024 13:20:33 +0800
Subject: [PATCH] #

---
 pages/home/home.vue                           |   25 
 pages/mat/matQueryByOrder.vue                 |  147 +++
 pages/pakin/WarehouseOutMergeBoardMany.vue    |  631 +++++++++++++++++
 pages/pakin/WarehousePickOutParallelBoard.vue |  632 +++++++++++++++++
 pages.json                                    |   53 +
 pages/mat/matInformation.vue                  |  268 +++++++
 pages/order/orderListPickBoard.vue            |  118 +++
 pages/mat/showMatInformation.vue              |  137 +++
 pages/order/orderPickConfirm.vue              |    6 
 pages/order/zlOrderPakin.vue                  |   26 
 pages/order/mergeBoardManyTimes.vue           |  118 +++
 11 files changed, 2,142 insertions(+), 19 deletions(-)

diff --git a/pages.json b/pages.json
index c49f4f3..6124dea 100644
--- a/pages.json
+++ b/pages.json
@@ -32,6 +32,12 @@
 			}
 		},
 		{
+			"path": "pages/mat/matQueryByOrder",
+			"style": {
+				"navigationBarTitleText": "鐗╂枡"
+			}
+		},
+		{
 			"path": "pages/pakin/pakin",
 			"style": {
 				// "navigationBarTitleText": "缁� 鎵�"
@@ -222,10 +228,40 @@
 			}
 		},
 		{
+			"path" : "pages/order/orderListPickBoard",
+			"style" : 
+			{
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/order/mergeBoardManyTimes",
+			"style" : 
+			{
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			"path" : "pages/pakin/WarehouseOutParallelBoard",
 			"style" : 
 			{
 				"navigationBarTitleText" : "骞舵澘閫斾腑鎷ｆ枡鍑哄簱",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/pakin/WarehousePickOutParallelBoard",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鎷ｆ枡閫斾腑骞舵澘鍏ュ簱",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/pakin/WarehouseOutMergeBoardMany",
+			"style" : 
+			{
+				"navigationBarTitleText" : "骞舵澘閫斾腑鍐嶆骞舵澘",
 				"enablePullDownRefresh" : false
 			}
 		},
@@ -259,12 +295,27 @@
 			"path" : "pages/order/orderList",
 			"style" : 
 			{
-				// "navigationBarTitleText" : "骞冲簱涓嬫灦",
+				"navigationBarTitleText" : "骞冲簱涓嬫灦",
 				// "enablePullDownRefresh" : false
 				"navigationStyle": "custom"
 			}
 		},
 		{
+			"path" : "pages/mat/matInformation",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍟嗗搧淇℃伅鏌ヨ"
+				// "enablePullDownRefresh" : false,
+			}
+		},
+		{
+			"path" : "pages/mat/showMatInformation",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍟嗗搧淇℃伅鏌ヨ"
+			}
+		},
+		{
 			"path" : "pages/order/orderDetlList",
 			"style" : 
 			{
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5a34482..18feabd 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -67,7 +67,7 @@
 						name: 'orderPutOn',
 						color: 'yellow',
 						cuIcon: 'pullup',
-						url: '/order/orderPutOn'
+						url: '/order/orderList'
 					},
 					{
 						title: '璁㈠崟缁勬墭',
@@ -85,10 +85,24 @@
 					},
 					{
 						title: '骞舵澘閫斾腑鎷ｆ枡',
-						name: 'orderListParallelBoard',
+						name: 'ParallelBoard',
 						color: 'green',
 						cuIcon: 'pulldown',
 						url: '/order/orderListParallelBoard'
+					},
+					{
+						title: '鎷ｆ枡閫斾腑骞舵澘',
+						name: 'PickBoard',
+						color: 'orange',
+						cuIcon: 'pulldown',
+						url: '/order/orderListPickBoard'
+					},
+					{
+						title: '澶氭骞舵澘',
+						name: 'BoardMany',
+						color: 'yellow',
+						cuIcon: 'pulldown',
+						url: '/order/mergeBoardManyTimes'
 					},
 					{
 						title: '鍒朵护鍏ュ簱',
@@ -97,6 +111,13 @@
 						cuIcon: 'pulldown',
 						url: '/order/zlOrderPakin'
 					},
+					{
+						title: '鍟嗗搧淇℃伅鏌ヨ',
+						name: 'MatInformation',
+						color: 'red',
+						cuIcon: 'pulldown',
+						url: '/mat/matInformation'
+					},
 					// {
 					// 	title: '搴撳瓨鏌ヨ',
 					// 	name: 'stockQuery',
diff --git a/pages/mat/matInformation.vue b/pages/mat/matInformation.vue
new file mode 100644
index 0000000..457ec20
--- /dev/null
+++ b/pages/mat/matInformation.vue
@@ -0,0 +1,268 @@
+<template>
+	<view>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+		</view>
+		<scroll-view>
+			<view class="tag-list" v-for="(item,i) in tagList" :key="i" @click="showTag(item.id)">
+				<view class="tag">
+					<view style="display: flex;">
+						<view class="wms-tag" :style="baColor" >鍒嗙被</view>
+					</view>
+				</view>
+				<view class="tag-item">{{item.name}}</view>
+			</view>
+		</scroll-view>
+		<view>
+			<view class="tag-list" v-for="(item,i) in matList" :key="i" @click="showMatInformation(item)">
+				<view class="tag">
+					<view style="display: flex;">
+						<view class="wms-tag" :style="baColor" >鍟嗗搧</view>
+					</view>
+				</view>
+				<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
+				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx  ? item.maktx : '--'}}</view>
+				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs  ? item.specs : '--'}}</view>
+			</view>
+		</view>
+		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tagList: [],
+				matList: [],
+				reload: false,
+				curr:1,
+				tag: '鍒嗙被',
+				baColor: "background-color: #0081ff;",
+				desc: '鍟嗗搧缂栧彿:',
+				baseUrl: '',
+				token: '',
+				status: 'more',
+				contentText: {
+					contentdown: '涓婃媺鍔犺浇鏇村',
+					contentrefresh: '鍔犺浇涓�',
+					contentnomore: '娌℃湁鏇村'
+				},
+				// 褰撳墠tagId
+				tagIdNow: 1
+			}
+		},
+		onReachBottom() {
+			this.status = 'more';
+			this.showMat(this.tagIdNow);
+		},
+		onLoad() {
+			// 娌″暐鐢ㄤ簡
+			let that = this
+			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			
+			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+			eventChannel.on('commonUrl', function(data) {
+				that.commonUrl = data.commonUrl
+			})
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.showTag(1)
+		},
+		methods: {
+			search(e) {
+				let that = this
+				uni.request({
+				    url: that.baseUrl + '/mat/pad/search',
+				    data: {
+						matnr: e.value
+				    },
+					method: "GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.matList = res.data;
+						} 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'})
+						}
+						
+					}
+				});
+			},
+			showTag(parentId) {
+				let that = this
+				uni.request({
+				    url: that.baseUrl + '/tag/list/pda/auth',
+					header: {
+						'token':uni.getStorageSync('token'),
+					},
+				    data: {
+						limit: 100000,
+						parentId: parentId
+				    },
+					header: {
+						'token':uni.getStorageSync('token'),
+					},
+					success(result) {
+						that.tagList = null
+						that.matList = []
+						var res = result.data
+						if (res.code === 200) {
+							if (res.data != null && res.data.length > 0) {
+								that.tagList = res.data
+							} else {
+								that.showMat(parentId)
+							}
+							that.baColor = "background-color: #0081ff;"
+						} 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'})
+						}
+					}
+				});
+			},
+			showMat(tagId) {
+				let that = this
+				that.tagIdNow = tagId
+				if (tagId == null || tagId == '' || tagId == undefined) {
+					return;
+				}
+				// wms绔� 琛ユ帴鍙�
+				// @RequestMapping(value = "/mat/list/pda/page/auth")
+				// @ManagerAuth
+				// public R pdaPageList(@RequestParam(required = true)Long tagId,
+				// 					 @RequestParam(defaultValue = "1")Integer curr,
+				// 					 @RequestParam(defaultValue = "10")Integer limit){
+				// 	EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+				// 	wrapper.eq("tag_id", tagId);
+				// 	wrapper.orderBy("create_time", false);
+				// 	return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
+				// }
+				uni.request({
+				    url: that.baseUrl + '/mat/list/pda/page/auth',
+				    data: {
+						curr:that.curr,
+						limit: 100,
+						tagId: tagId
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						that.tagList = null
+						var res = result.data
+						if (res.code === 200) {
+							if (res.data.records != null && res.data.records.length > 0) {
+								let list = res.data.records
+								that.matList = that.reload ? list : that.matList.concat(list);
+								that.curr = that.curr + 1
+							}
+							if (res.data.records.length == 0) {
+								that.status = 'noMore'
+							}
+							that.baColor = "background-color: #1cbbb4;"
+						} 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'})
+						}
+						
+					}
+				});
+			},
+			toPrint(item) {
+				let that = this
+				uni.navigateTo({
+					url: "../print/print",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('data', {
+							data: item
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.matnr = data.data
+							that.findMat(that.matnr)
+						},
+					},
+				
+				
+				});
+			},
+			showMatInformation(item) {
+				let that = this
+				uni.navigateTo({
+					url: "./showMatInformation",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('data', {
+							data: item
+						})
+					},
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	.tag-list {
+		width: 94%;
+		min-height: 160rpx;
+		margin: 10px auto;
+		background-color: #FFF;
+		border-radius: 5px;
+		box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
+	}
+	.tag {
+		display: flex;
+		flex-direction: column;
+		min-height: 80rpx;
+		border-bottom: 1px solid #e2e2e2;
+	}
+	.wms-tag {
+		min-width: 60rpx;
+		margin-left: 50rpx;
+		margin-top: 30rpx;
+		color: #FFF;
+		font-size: 14px;
+		padding: 4rpx 12rpx;
+	}
+	.tag-item {
+		width: 100%;
+		min-height: 60rpx;
+		line-height: 2;
+		padding-left: 50rpx;
+		color: #606266;
+		font-size: 14px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mat/matQueryByOrder.vue b/pages/mat/matQueryByOrder.vue
new file mode 100644
index 0000000..ca5d16e
--- /dev/null
+++ b/pages/mat/matQueryByOrder.vue
@@ -0,0 +1,147 @@
+<template>
+	<view>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆璁㈠崟鍙�" bgColor="#EEEEEE" @input="search" />
+		</view>
+		<view>
+			<view class="tag-list" v-for="(item,i) in matList" :key="i" @click="findBySelect(item)">
+				<view class="tag">
+					<view style="display: flex;">
+						<view class="wms-tag" :style="baColor" >鍟嗗搧</view>
+					</view>
+				</view>
+				<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
+				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx  ? item.maktx : '--'}}</view>
+				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs  ? item.specs : '--'}}</view>
+				<view class="tag-item">鏁伴噺锛� {{item.anfme  ? item.anfme : '--'}}</view>
+			</view>
+		</view>
+		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tagList: [],
+				matList: [],
+				condition: '',
+				reload: false,
+				curr:1,
+				tag: '鍒嗙被',
+				baColor: "background-color: #0081ff;",
+				desc: '鍟嗗搧缂栧彿:',
+				baseUrl: '',
+				token: '',
+				status: 'more',
+				contentText: {
+					contentdown: '涓婃媺鍔犺浇鏇村',
+					contentrefresh: '鍔犺浇涓�',
+					contentnomore: '娌℃湁鏇村'
+				},
+				// 褰撳墠tagId
+				tagIdNow: 1
+			}
+		},
+		onReachBottom() {
+			this.status = 'more';
+			if (this.tagList == null) {
+				this.showMat(this.tagIdNow);
+			}
+		},
+		onLoad() {
+			// 娌″暐鐢ㄤ簡
+			let that = this
+			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			
+			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+			eventChannel.on('commonUrl', function(data) {
+				that.commonUrl = data.commonUrl
+			})
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+		},
+		methods: {
+			search() {
+				let that = this
+				that.tagList = []
+				that.matList = []
+				uni.request({
+				    url: that.baseUrl + '/orderDetl/forOrderNo/mergePakin/v1',
+				    data: {
+						orderNo: that.condition
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						var res = result.data
+						if (res.code === 200 ) {
+							let tmp = res.data;
+							tmp.forEach((item) => {
+								item.maxNum = item.anfme;
+							})
+							that.matList = tmp;
+						} 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'})
+						}
+					}
+				});
+			},
+			findBySelect(item) {
+				this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: item});
+				uni.navigateBack({
+					
+				})
+				
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	.tag-list {
+		width: 94%;
+		min-height: 160rpx;
+		margin: 10px auto;
+		background-color: #FFF;
+		border-radius: 5px;
+		box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
+	}
+	.tag {
+		display: flex;
+		flex-direction: column;
+		min-height: 80rpx;
+		border-bottom: 1px solid #e2e2e2;
+	}
+	.wms-tag {
+		min-width: 60rpx;
+		margin-left: 50rpx;
+		margin-top: 30rpx;
+		color: #FFF;
+		font-size: 14px;
+		padding: 4rpx 12rpx;
+	}
+	.tag-item {
+		width: 100%;
+		min-height: 60rpx;
+		line-height: 2;
+		padding-left: 50rpx;
+		color: #606266;
+		font-size: 14px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mat/showMatInformation.vue b/pages/mat/showMatInformation.vue
new file mode 100644
index 0000000..87c0b12
--- /dev/null
+++ b/pages/mat/showMatInformation.vue
@@ -0,0 +1,137 @@
+<template>
+	<view>
+		<view>
+			<view class="tag-list">
+				<view class="tag">
+					<view style="display: flex;">
+						<view class="wms-tag" :style="baColor" >鍟嗗搧</view>
+					</view>
+				</view>
+				<view v-if="matItem != null">
+					<view class="tag-item">鍟嗗搧缂栧彿锛� {{matItem.matnr  ? matItem.matnr : '--'}}</view>
+					<view class="tag-item">鍟嗗搧鍚嶇О锛� {{matItem.maktx  ? matItem.maktx : '--'}}</view>
+					<view class="tag-item">鍟嗗搧瑙勬牸锛� {{matItem.specs  ? matItem.specs : '--'}}</view>
+				</view>
+			</view>
+			
+			<view class="tag-list" v-for="(item,index) in locList" :key="index">
+				<view class="tag">
+					<view style="display: flex;">
+						<view class="wms-tag" :style="baColor2">搴撳瓨</view>
+					</view>
+				</view>
+				<view>
+					<view class="tag-item">搴撲綅鍙凤細 {{item.locNo  ? item.locNo : '--'}}</view>
+					<view class="tag-item">鎵樼洏鐮侊細 {{item.zpallet  ? item.zpallet : '--'}}</view>
+					<view class="tag-item">鏁伴噺锛� {{item.anfme  ? item.anfme : '--'}}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				matItem: null,
+				locList: [],
+				reload: false,
+				curr:1,
+				tag: '鍒嗙被',
+				baColor: "background-color: #0081ff;",
+				baColor2: "background-color: #00aaff;",
+				desc: '鍟嗗搧缂栧彿:',
+				baseUrl: '',
+				token: '',
+				status: 'more',
+				contentText: {
+					contentdown: '涓婃媺鍔犺浇鏇村',
+					contentrefresh: '鍔犺浇涓�',
+					contentnomore: '娌℃湁鏇村'
+				},
+			}
+		},
+		onLoad() {
+			let that = this
+			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			
+			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+			eventChannel.on('data', function(data) {
+				that.matItem = data.data;
+			})
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			
+			this.searchLoc()
+		},
+		methods: {
+			searchLoc() {
+				let that = this
+				uni.request({
+				    url: that.baseUrl + '/mat/pad/searchLoc',
+				    data: {
+						matnr: that.matItem.matnr
+				    },
+					method: "GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.locList = res.data;
+						} 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'})
+						}
+						
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	.tag-list {
+		width: 94%;
+		min-height: 160rpx;
+		margin: 10px auto;
+		background-color: #FFF;
+		border-radius: 5px;
+		box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
+	}
+	.tag {
+		display: flex;
+		flex-direction: column;
+		min-height: 80rpx;
+		border-bottom: 1px solid #e2e2e2;
+	}
+	.wms-tag {
+		min-width: 60rpx;
+		margin-left: 50rpx;
+		margin-top: 30rpx;
+		color: #FFF;
+		font-size: 14px;
+		padding: 4rpx 12rpx;
+	}
+	.tag-item {
+		width: 100%;
+		min-height: 60rpx;
+		line-height: 2;
+		padding-left: 50rpx;
+		color: #606266;
+		font-size: 14px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/mergeBoardManyTimes.vue b/pages/order/mergeBoardManyTimes.vue
new file mode 100644
index 0000000..cab4db9
--- /dev/null
+++ b/pages/order/mergeBoardManyTimes.vue
@@ -0,0 +1,118 @@
+<template>
+	<view>
+		<view class="status_bar">
+			<!-- 杩欓噷鏄姸鎬佹爮 -->
+		</view>
+		<uni-nav-bar left-icon="left" background-color="#f8f8f8" title="澶氭骞舵澘" @clickLeft="back"  :fixed="true"
+			:border="false" rightWidth="160rpx" leftWidth="160rpx"
+			>
+			<block slot="right">
+				<view class="city">
+					<view>
+						<text class="uni-nav-bar-text">{{store}}</text>
+					</view>
+				</view>
+			</block>
+		 </uni-nav-bar>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="wrkNo" placeholder=" 杈撳叆鎵樼洏鐮�" bgColor="#EEEEEE" @input="search" />
+		</view>
+		<view class="card" v-for="item in menuList" @click="chose(item.barcode)">
+			<view class="item">宸ヤ綔鍙凤細{{item.wrkNo}}</view>
+			<view class="item">鎵樼洏鐮侊細{{item.barcode}}</view>
+			<view class="item">搴撲綅鍙凤細{{item.sourceLocNo}}</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				storeId: 0,
+				store: '',
+				wrkNo: '',
+				menuList: []
+			}
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.storeId = uni.getStorageSync('store')
+			if (this.storeId == 1) {
+				this.store = '瀹佹尝浠�'
+			}
+			if (this.storeId == 2) {
+				this.store = '鏂版槍浠�'
+			}
+			this.getOrderNoList()
+		},
+		methods: {
+			back() {
+				uni.navigateBack({})
+			},
+			getOrderNoList() {
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/mobile/barcode/list/all',
+					data: "",
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					method: 'POST',
+					success(res) {
+						res = res.data
+						that.menuList = res.data
+					}
+				})
+			},
+			search() {
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/mobile/barcode/list/all',
+					data: that.wrkNo,
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					method: 'POST',
+					success(res) {
+						res = res.data
+						that.menuList = res.data
+					}
+				})
+			},
+			chose(item) {
+				let that = this
+				uni.navigateTo({
+					url: "../pakin/WarehouseOutMergeBoardMany",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('data', {
+							barcode: item
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							// that.matnr = data.data
+							that.input(that.matnr)
+						},
+					},
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	.card {
+		margin: 20rpx;
+		padding: 30rpx;
+		background-color: #157ec1;
+		border-radius: 20rpx;
+		color: #FFF;
+	}
+</style>
diff --git a/pages/order/orderListPickBoard.vue b/pages/order/orderListPickBoard.vue
new file mode 100644
index 0000000..1570d41
--- /dev/null
+++ b/pages/order/orderListPickBoard.vue
@@ -0,0 +1,118 @@
+<template>
+	<view>
+		<view class="status_bar">
+			<!-- 杩欓噷鏄姸鎬佹爮 -->
+		</view>
+		<uni-nav-bar left-icon="left" background-color="#f8f8f8" title="鎷ｆ枡閫斾腑骞舵澘" @clickLeft="back"  :fixed="true"
+			:border="false" rightWidth="160rpx" leftWidth="160rpx"
+			>
+			<block slot="right">
+				<view class="city">
+					<view>
+						<text class="uni-nav-bar-text">{{store}}</text>
+					</view>
+				</view>
+			</block>
+		 </uni-nav-bar>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="wrkNo" placeholder=" 杈撳叆鎵樼洏鐮�" bgColor="#EEEEEE" @input="search" />
+		</view>
+		<view class="card" v-for="item in menuList" @click="chose(item.sourceLocNo)">
+			<view class="item">宸ヤ綔鍙凤細{{item.wrkNo}}</view>
+			<view class="item">鎵樼洏鐮侊細{{item.barcode}}</view>
+			<view class="item">搴撲綅鍙凤細{{item.sourceLocNo}}</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				storeId: 0,
+				store: '',
+				wrkNo: '',
+				menuList: []
+			}
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.storeId = uni.getStorageSync('store')
+			if (this.storeId == 1) {
+				this.store = '瀹佹尝浠�'
+			}
+			if (this.storeId == 2) {
+				this.store = '鏂版槍浠�'
+			}
+			this.getOrderNoList()
+		},
+		methods: {
+			back() {
+				uni.navigateBack({})
+			},
+			getOrderNoList() {
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/mobile/barcode/list/pick',
+					data: "",
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					method: 'POST',
+					success(res) {
+						res = res.data
+						that.menuList = res.data
+					}
+				})
+			},
+			search() {
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/mobile/barcode/list/pick',
+					data: that.wrkNo,
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					method: 'POST',
+					success(res) {
+						res = res.data
+						that.menuList = res.data
+					}
+				})
+			},
+			chose(item) {
+				let that = this
+				uni.navigateTo({
+					url: "../pakin/WarehousePickOutParallelBoard",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('locNo', {
+							locNo: item
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							// that.matnr = data.data
+							that.input(that.matnr)
+						},
+					},
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	.card {
+		margin: 20rpx;
+		padding: 30rpx;
+		background-color: #157ec1;
+		border-radius: 20rpx;
+		color: #FFF;
+	}
+</style>
diff --git a/pages/order/orderPickConfirm.vue b/pages/order/orderPickConfirm.vue
index 64bee42..4f3e23a 100644
--- a/pages/order/orderPickConfirm.vue
+++ b/pages/order/orderPickConfirm.vue
@@ -66,13 +66,13 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
-					<!-- <view class="list-left-item">
+					<view class="list-left-item" v-if="!showChecked">
 						<view class="desc">鍙敤鏁伴噺锛�</view>
 						<view class="left-item">
 							{{item.count}}
 						</view>
-					</view> -->
-					<view class="list-left-item">
+					</view>
+					<view class="list-left-item" v-else>
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.useCount}}</view>
 					</view>
diff --git a/pages/order/zlOrderPakin.vue b/pages/order/zlOrderPakin.vue
index fb75a3a..fb24c9a 100644
--- a/pages/order/zlOrderPakin.vue
+++ b/pages/order/zlOrderPakin.vue
@@ -196,8 +196,8 @@
 				bomCode: '',
 				bomCodeFocus: true,
 				maxAn: 0,
-				ck1: false,
-				ck2: true,
+				ck1: true,
+				ck2: false,
 				fullPlt: 'N',
 				decrees_a: {
 					locNo: '',
@@ -208,10 +208,10 @@
 			}
 		},
 		onLoad() {
-			this.dataList = uni.getStorageSync('zlPakinDataList')
-			if (this.dataList === '') {
-				this.dataList = []
-			}
+			// this.dataList = uni.getStorageSync('zlPakinDataList')
+			// if (this.dataList === '') {
+			// 	this.dataList = []
+			// }
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
@@ -290,7 +290,7 @@
 				}, 100);
 			},
 			// 妫�楠屽綋鍓嶇墿鏂欐槸鍚︽槸鍦ㄥ綋鍓岯om琛ㄤ腑
-			checkBom() {
+			checkBom(mat) {
 				let _this = this
 				uni.request({
 					url: _this.baseUrl + '/mobile/pda/decrees/check',
@@ -306,7 +306,8 @@
 						if (res.code === 200) {
 							switch(res.data.status) {
 								case 1:
-									_this.findMat()
+									// _this.findMat()
+									_this.checkMat(mat)
 									break;
 								case 2:
 									// 鐩稿悓鍒朵护璐х墿琛ヨ揣
@@ -396,7 +397,7 @@
 			selectMat() {
 				let that = this
 				uni.navigateTo({
-					url: "../mat/matQuery",
+					url: "../mat/matQueryByOrder",
 					success: function(res) {
 						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
 						res.eventChannel.emit('commonUrl', {
@@ -406,12 +407,10 @@
 					events: {
 						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
 						acceptDataFromOpenedPage: function(data) {
-							that.matnr = data.data
-							that.checkBom(that.matnr)
+							that.matnr = data.data.matnr
+							that.checkBom(data.data)
 						},
 					},
-
-
 				});
 				that.matnr = ''
 			},
@@ -559,6 +558,7 @@
 							innerAudioContext.play()
 							that.dataList = []
 							uni.setStorageSync('zlPakinDataList', that.dataList);
+							uni.showToast({ title: '缁勬墭鎴愬姛', icon: "success", position: 'top' })
 						} else if (res.code == 403) {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 							setTimeout(() => {
diff --git a/pages/pakin/WarehouseOutMergeBoardMany.vue b/pages/pakin/WarehouseOutMergeBoardMany.vue
new file mode 100644
index 0000000..a2f15ee
--- /dev/null
+++ b/pages/pakin/WarehouseOutMergeBoardMany.vue
@@ -0,0 +1,631 @@
+<template>
+	<view>
+		<view class="code">			
+			<view class="item">
+				<view class="code-decs" style="width: 100%;">鎵樼洏鐮�:{{barcode}}</view>		
+			</view>
+			<view class="item">
+				<view class="code-decs">璁㈠崟鍙�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="barcodeFocus"
+					@input="barcodeInput()">
+			</view>
+		</view>
+		<view class="mat-list-title">
+			<view style="margin-top: 5px;">鍟嗗搧鍒楄〃</view>
+			<view>
+				<button size="mini" type="primary" @click="getChecked">鎻愬彇</button>
+				<!-- <button style="margin-left: 10px;" size="mini" type="primary" @click="reset()">娓呯┖</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: [],
+				showChecked: false,
+				count: 0,
+				rowNum: '',
+				matnr: '',
+				matnr1: '',
+				batch: '',
+				weight: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				removeNum: 0,
+				orderNoList: [],
+				orderNo: '',
+				item:'',
+				locNo:''
+			}
+		},
+		onLoad() {
+			let that = this
+			const eventChannel = that.getOpenerEventChannel();
+			eventChannel.on('data', function(data) {
+				that.barcode = data.barcode
+			})
+			
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.getOrderNoList()
+		},
+		methods: {
+			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])
+					}
+				}
+				
+				if(checkedList.length == 0) {
+					this.messageText = "璇烽�夋嫨骞舵澘鐗╂枡"
+					this.messageToggle('error')
+					return;
+				}
+				
+				this.dataList = checkedList
+				this.showChecked = true
+			},
+			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',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					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() {
+				let that = this
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {									
+					uni.request({
+						url: that.baseUrl + '/orderDetl/forOrderNo/mergePakin/v1',
+						data: {
+							orderNo: that.orderNo
+						},						
+						header: {
+							'token': uni.getStorageSync('token')
+						},
+						success(result) {
+							var res = result.data
+							if (res.code === 200) {
+								console.log("res.data");
+								console.log(res.data);
+								that.dataList = res.data;
+							} else if (res.code == 403) {
+								that.dataList = [];
+								that.messageText = res.msg
+								that.messageToggle('error')
+								setTimeout(() => {
+									uni.reLaunch({
+										url: '../login/login'
+									});
+								}, 1000);
+							} else {
+								that.dataList = [];
+								that.messageText = res.msg
+								that.messageToggle('error')
+							}
+						}
+					});
+					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);
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				var matnr = that.matnr.split(";")
+				that.order = matnr[0]
+				that.matnr = matnr[1]
+				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'] = ''
+							result.data.batch = matnr[2]
+							uni.navigateTo({
+								url: "../mat/matSelected",
+								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+								success: function(res) {
+									res.eventChannel.emit('mat', {
+										data: result.data
+									})
+								},
+								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+								events: {
+									matList: function(data) {
+										that.checkMat(data.data)
+										that.focuss()
+									},
+								},
+							});
+						} else if (result.code == 403) {
+							uni.showToast({
+								title: result.msg,
+								icon: "none",
+								position: 'top'
+							})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({
+								title: result.msg,
+								icon: "none",
+								position: 'top'
+							})
+						}
+
+					}
+				});
+
+			},
+			checkMat(mat) {
+				mat['orderNo'] = this.order
+				var len = this.dataList.length
+				var add = true,
+					sameItem = false
+				for (var i = 0; i < len; i++) {
+					if (mat.orderNo != this.dataList[i].orderNo) {
+						add = true
+						break;
+					} else {
+						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)
+				}
+			},
+			combConfirm(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁鐜板湪骞舵澘!'
+				this.$refs.combConfirm.open()
+			},
+			comb() {
+				uni.vibrateShort();
+				let that = this;
+				if (that.orderNo === '') {
+					this.messageText = "璇疯緭鍏ヨ鍗曞彿"
+					this.messageToggle('error')
+					return;
+				}
+				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/pda/WarehouseOutMergeBoardMany/v1',
+					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.orderNo = ""
+							that.dataList = []
+							// 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.locNo = ''				
+				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.locNo = ''
+				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: 120rpx;
+		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/WarehousePickOutParallelBoard.vue b/pages/pakin/WarehousePickOutParallelBoard.vue
new file mode 100644
index 0000000..c2e507e
--- /dev/null
+++ b/pages/pakin/WarehousePickOutParallelBoard.vue
@@ -0,0 +1,632 @@
+<template>
+	<view>
+		<view class="code">			
+			<view class="item">
+				<view class="code-decs" style="width: 100%;">搴撲綅鍙�:{{locNo}}</view>		
+			</view>
+			<view class="item">
+				<view class="code-decs">璁㈠崟鍙�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="barcodeFocus"
+					@input="barcodeInput()">
+			</view>
+		</view>
+		<view class="mat-list-title">
+			<view style="margin-top: 5px;">鍟嗗搧鍒楄〃</view>
+			<view>
+				<button size="mini" type="primary" @click="getChecked">鎻愬彇</button>
+				<!-- <button style="margin-left: 10px;" size="mini" type="primary" @click="reset()">娓呯┖</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: [],
+				showChecked: false,
+				count: 0,
+				rowNum: '',
+				matnr: '',
+				matnr1: '',
+				batch: '',
+				weight: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				removeNum: 0,
+				orderNoList: [],
+				orderNo: '',
+				item:'',
+				locNo:''
+			}
+		},
+		onLoad() {
+			let that = this
+			const eventChannel = that.getOpenerEventChannel();
+			eventChannel.on('locNo', function(data) {
+				that.locNo = data.locNo
+			})
+			
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.getOrderNoList()
+		},
+		methods: {
+			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])
+					}
+				}
+				
+				if(checkedList.length == 0) {
+					this.messageText = "璇烽�夋嫨骞舵澘鐗╂枡"
+					this.messageToggle('error')
+					return;
+				}
+				
+				this.dataList = checkedList
+				this.showChecked = true
+			},
+			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',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					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() {
+				let that = this
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {									
+					uni.request({
+						url: that.baseUrl + '/orderDetl/forOrderNo/mergePakin/v1',
+						data: {
+							orderNo: that.orderNo
+						},						
+						header: {
+							'token': uni.getStorageSync('token')
+						},
+						success(result) {
+							var res = result.data
+							if (res.code === 200) {
+								console.log("res.data");
+								console.log(res.data);
+								that.dataList = res.data;
+							} else if (res.code == 403) {
+								that.dataList = [];
+								that.messageText = res.msg
+								that.messageToggle('error')
+								setTimeout(() => {
+									uni.reLaunch({
+										url: '../login/login'
+									});
+								}, 1000);
+							} else {
+								that.dataList = [];
+								that.messageText = res.msg
+								that.messageToggle('error')
+							}
+						}
+					});
+					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);
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				var matnr = that.matnr.split(";")
+				that.order = matnr[0]
+				that.matnr = matnr[1]
+				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'] = ''
+							result.data.batch = matnr[2]
+							uni.navigateTo({
+								url: "../mat/matSelected",
+								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+								success: function(res) {
+									res.eventChannel.emit('mat', {
+										data: result.data
+									})
+								},
+								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+								events: {
+									matList: function(data) {
+										that.checkMat(data.data)
+										that.focuss()
+									},
+								},
+							});
+						} else if (result.code == 403) {
+							uni.showToast({
+								title: result.msg,
+								icon: "none",
+								position: 'top'
+							})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({
+								title: result.msg,
+								icon: "none",
+								position: 'top'
+							})
+						}
+
+					}
+				});
+
+			},
+			checkMat(mat) {
+				mat['orderNo'] = this.order
+				var len = this.dataList.length
+				var add = true,
+					sameItem = false
+				for (var i = 0; i < len; i++) {
+					if (mat.orderNo != this.dataList[i].orderNo) {
+						add = true
+						break;
+					} else {
+						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)
+				}
+			},
+			combConfirm(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁鐜板湪骞舵澘!'
+				this.$refs.combConfirm.open()
+			},
+			comb() {
+				uni.vibrateShort();
+				let that = this;
+				if (that.orderNo === '') {
+					this.messageText = "璇疯緭鍏ヨ鍗曞彿"
+					this.messageToggle('error')
+					return;
+				}
+				if (that.locNo === '') {
+					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/pda/WarehouseOutPickMerge/v1',
+					data: JSON.stringify({
+						locNo: that.locNo,
+						orderNo: that.orderNo,
+						combMats: that.dataList
+					}),
+					method: 'POST',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.orderNo = ""
+							that.dataList = []
+							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.locNo = ''				
+				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.locNo = ''
+				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: 120rpx;
+		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

--
Gitblit v1.9.1