From 9b78294b36a634baadd9e0700398672a55806c75 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 30 七月 2024 13:46:43 +0800
Subject: [PATCH] #

---
 pages/home/home.vue        |  106 ---
 pages/pakin/putDown.vue    |  500 ++++++++++++++++++
 pages/pakin/comb.vue       |  518 +++++++++++++++++++
 pages.json                 |   20 
 pages/pakin/pakin.vue      |  177 ++++--
 pages/locDetl/locDetl.vue  |  288 ++++++++++
 static/css/wms.css/wms.css |    4 
 7 files changed, 1,453 insertions(+), 160 deletions(-)

diff --git a/pages.json b/pages.json
index 99639b9..2d7d871 100644
--- a/pages.json
+++ b/pages.json
@@ -25,18 +25,36 @@
 			}
 		},
 		{
+			"path": "pages/locDetl/locDetl",
+			"style": {
+				"navigationBarTitleText": "搴撳瓨"
+			}
+		},
+		{
 			"path": "pages/mat/matQuery2",
 			"style": {
 				"navigationBarTitleText": "鐗╂枡"
 			}
 		},
 		{
-			"path": "pages/pakin/pakin",
+			"path": "pages/pakin/comb",
 			"style": {
 				"navigationBarTitleText": "缁� 鎵�"
 			}
 		},
 		{
+			"path": "pages/pakin/pakin",
+			"style": {
+				"navigationBarTitleText": "鍏� 搴�"
+			}
+		},
+		{
+			"path": "pages/pakin/putDown",
+			"style": {
+				"navigationBarTitleText": "鍑� 搴�"
+			}
+		},
+		{
 			"path": "pages/AGV/AGVPakin",
 			"style": {
 				"navigationBarTitleText": "AGV缁勬墭"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 0abd273..db39c3c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -25,109 +25,25 @@
 				elements: [],
 				elements2: [
 					{
-						title: '缁勬墭鍏ュ簱',
+						title: '缁勬墭',
 						name: 'pakin',
 						color: 'cyan',
+						cuIcon: 'pullup',
+						url: '/pakin/comb'
+					},
+					{
+						title: '鍏ュ簱',
+						name: 'Pakin',
+						color: 'red',
 						cuIcon: 'pullup',
 						url: '/pakin/pakin'
 					},
 					{
-						title: '鍐嶆鎷ｆ枡',
-						name: 'changePallet',
-						color: 'green',
-						cuIcon: 'order',
-						url: '/pakin/pickAgain'
-					},
-					{
-						title: '璁㈠崟鍏ュ簱',
-						name: 'orderPakin',
-						color: 'red',
-						cuIcon: 'pullup',
-						url: '/order/orderPakin'
-					},
-					{
-						title: 'Bom鍏ュ簱鍗�',
-						name: 'orderBomPakin',
-						color: 'red',
-						cuIcon: 'pullup',
-						url: '/order/orderBomPakin'
-					},
-					{
-						title: '缁勬墭涓婃灦',
-						name: 'putOn',
-						color: 'orange',
-						cuIcon: 'pullup',
-						url: '/pakin/putOn'
-					},
-					{
-						title: '鎵撳嵃',
-						name: 'print',
-						color: 'purple',
-						cuIcon: 'text',
-						url: '/print/print'
-					},
-					{
-						title: '璁㈠崟涓婃灦',
-						name: 'orderPutOn',
-						color: 'yellow',
-						cuIcon: 'pullup',
-						url: '/order/orderPutOn'
-					},
-					{
-						title: '璁㈠崟涓嬫灦',
-						name: 'orderPutDown',
+						title: '鍑哄簱',
+						name: 'PutDown',
 						color: 'olive',
 						cuIcon: 'pulldown',
-						url: '/order/orderPutDown'
-					},
-					{
-						title: '搴撳瓨鏌ヨ',
-						name: 'stockQuery',
-						color: 'green',
-						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: 'mergeStore',
-						color: 'olive',
-						cuIcon: 'order',
-						url: '/pakin/mergeStore'
-					},
-					{
-						title: '鎹㈡澘缁戝畾',
-						name: 'changePallet',
-						color: 'green',
-						cuIcon: 'order',
-						url: '/stock/changePallet'
+						url: '/pakin/putDown'
 					},
 					{
 						title: '閫�鍑虹櫥褰�',
diff --git a/pages/locDetl/locDetl.vue b/pages/locDetl/locDetl.vue
new file mode 100644
index 0000000..3386dec
--- /dev/null
+++ b/pages/locDetl/locDetl.vue
@@ -0,0 +1,288 @@
+<template>
+	<view>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" @input="selectloc()"/>
+		</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="findBySelect(item)">
+				<view class="tag">
+					<view style="display: flex;">
+						<view class="wms-tag" :style="baColor" >鍟嗗搧</view>
+					</view>
+				</view>
+				<view class="tag-item">搴撲綅鍙凤細 {{item.locNo}}</view>
+				<view class="tag-item">鍟嗗搧缂栫爜锛� {{item.matnr  ? item.matnr : '--'}}</view>
+				<view class="tag-item">鎵瑰彿锛� {{item.batch  ? item.batch : '--'}}</view>
+				<view class="tag-item">鑶滅被鍨嬶細 {{item.specs  ? item.specs : '--'}}</view>
+				<view class="tag-item">鐢熶骇鏃ユ湡锛� {{item.manuDate  ? item.manuDate : '--'}}</view>
+				<view class="tag-item">鍨嬪彿锛� {{item.model  ? item.model : '--'}}</view>
+				<view class="tag-item">瀹藉害锛� {{item.weight  ? item.weight : '--'}}</view>
+				<view class="tag-item">闀垮害锛� {{item.length  ? item.length : '--'}}</view>
+				<view class="tag-item">闈㈢Н锛� {{item.volume  ? item.volume : '--'}}</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');
+			// this.showTag(10009)
+		},
+		methods: {
+			selectloc(){
+				let that = this
+				that.matList = []
+				
+				uni.request({
+				    url: that.baseUrl + '/locDetl/pda/select',
+				    data: {
+						curr:that.curr,
+						limit: 20,
+						matnr: that.condition
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						console.log(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'})
+						}
+						
+					}
+				});
+			},
+			search() {
+				let that = this
+				that.tagList = []
+				that.matList = []
+				uni.request({
+				    url: that.baseUrl + '/mat/search/pda/auth',
+				    data: {
+						condition: that.condition
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						console.log(result);
+						var res = result.data
+						if (res.code === 200 ) {
+							that.matList = res.data
+							// that.save()
+						} 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) {
+						console.log(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.tagList = []
+								that.showMat(parentId)
+							}
+						} 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;
+				}
+				uni.request({
+				    url: that.baseUrl + '/mat/list/pda/page/auth',
+				    data: {
+						curr:that.curr,
+						limit: 20,
+						tagId: tagId
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						console.log(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'})
+						}
+						
+					}
+				});
+			},
+			findBySelect(matnr) {
+				this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: matnr});
+				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/pakin/comb.vue b/pages/pakin/comb.vue
new file mode 100644
index 0000000..c3cf06e
--- /dev/null
+++ b/pages/pakin/comb.vue
@@ -0,0 +1,518 @@
+<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="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">
+							<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.batch}}</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">{{item.manuDate}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鍨嬪彿锛�</view>
+						<view class="left-item">{{item.model}}</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">{{item.length}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">闈㈢Н锛�</view>
+						<view class="left-item">{{item.volume}}</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="specs"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鐢熶骇鏃ユ湡:</view>
+						<view class="popup-item-right"><input type="text" v-model="manuDate"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鍨嬪彿:</view>
+						<view class="popup-item-right"><input type="text" v-model="model"></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"><input type="text" v-model="length"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">闈㈢Н:</view>
+						<view class="popup-item-right"><input type="text" v-model="volume"></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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				barcode: '',
+				dataList: [],
+				count: 0,
+				rowNum: '',
+				matnr: '',
+				batch: '',
+				weight: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				removeNum: 0,
+				specs:'',
+				manuDate:'',
+				model:'',				
+				length:'',
+				volume:'',
+			}
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+		},
+		methods: {
+			messageToggle(type) {
+				this.msgType1 = type
+				this.$refs.message.open()
+			},
+			// barcode input 浜嬩欢
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.barcode.length
+					if (len != 8) {
+						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.barcodeFocus = false;
+				this.matFocus = false;
+				setTimeout(() => {
+					this.matnr = '';
+					this.matFocus = true;
+				}, 100);
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/mat/split',
+					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.checkMat(that.matData)
+						} 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'
+							})
+						}
+
+					}
+				});
+
+			},
+			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)
+				}
+				this.$forceUpdate() // 寮哄埗鍒锋柊
+			},
+			// 淇敼鎵瑰彿
+			revise(item, i) {
+				this.matnr = this.dataList[i].matnr				
+				this.batch = this.dataList[i].batch
+				this.weight = this.dataList[i].weight
+				this.specs = this.dataList[i].specs
+				this.manuDate = this.dataList[i].manuDate
+				this.model = this.dataList[i].model
+				this.length = this.dataList[i].length
+				this.volume = this.dataList[i].volume
+				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;
+				}				
+				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')
+							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.messageText = "閲嶇疆瀹屾垚"
+				this.messageToggle('success')
+			},
+			// 鍙栨秷閲嶇疆
+			resetClose() {
+
+			},
+			// 娓呯┖
+			resst() {
+				this.dataList = []
+				this.barcode = ''
+				this.barcodeFocuss()
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+
+	.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 {
+		height: 80rpx;
+		line-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 10px 0px rgba(0, 0, 0, 0.2);
+	}
+</style>
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index e185d06..5f535dd 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -7,13 +7,8 @@
 					@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 class="code-decs">绔欑偣:</view>
+				<uni-combox :candidates="staList" placeholder="璇烽�夋嫨鍏ュ簱绔欑偣" v-model="sta"></uni-combox>				
 			</view>
 		</view>
 		<view class="mat-list-title">
@@ -33,18 +28,32 @@
 						</view>
 					</view>
 					<view class="list-left-item">
-						<view class="desc">鍝佸悕锛�</view>
-						<view class="left-item">{{item.maktx}}</view>
+						<view class="desc">鎵瑰彿锛�</view>
+						<view class="left-item">{{item.batch}}</view>
 					</view>
 					<view class="list-left-item">
-						<view class="desc">瑙勬牸锛�</view>
+						<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 class="desc">鐢熶骇鏃ユ湡锛�</view>
+						<view class="left-item">{{item.manuDate}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鍨嬪彿锛�</view>
+						<view class="left-item">{{item.model}}</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">{{item.length}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">闈㈢Н锛�</view>
+						<view class="left-item">{{item.volume}}</view>
 					</view>
 					<!-- <view class="list-left-item">
 						<view class="desc">閲嶉噺锛�</view>
@@ -52,10 +61,10 @@
 							<uni-tag :text="item.weight" type="warning"></uni-tag>
 						</view>
 					</view> -->
-					<view class="list-left-item">
+					<!-- <view class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
-					</view>
+					</view> -->
 				</view>
 				<view class="list-right">
 					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
@@ -66,7 +75,7 @@
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
 			<button size="mini" @click="reset('warn')">閲嶇疆</button>
-			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">鍏ュ簱</button>
 		</view>
 		<!-- 寮圭獥 -->
 		<!-- 淇敼鏁伴噺 -->
@@ -86,16 +95,30 @@
 						<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 class="popup-item-left">鑶滅被鍨�:</view>
+						<view class="popup-item-right"><input type="text" v-model="specs"></view>
 					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鐢熶骇鏃ユ湡:</view>
+						<view class="popup-item-right"><input type="text" v-model="manuDate"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鍨嬪彿:</view>
+						<view class="popup-item-right"><input type="text" v-model="model"></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"><input type="text" v-model="length"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">闈㈢Н:</view>
+						<view class="popup-item-right"><input type="text" v-model="volume"></view>
+					</view>					
 					<view class="btn">
 						<view class="btn-left" @click="reviseClose">鍙栨秷</view>
 						<view class="btn-right" @click="reviseConfirm()">淇敼</view>
@@ -156,6 +179,13 @@
 				matFocus: false,
 				matData: '',
 				removeNum: 0,
+				specs:'',
+				manuDate:'',
+				model:'',				
+				length:'',
+				volume:'',
+				staList:[104],
+				sta:''
 			}
 		},
 		onLoad() {
@@ -165,7 +195,7 @@
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
 		},
-		methods: {
+		methods: {			
 			messageToggle(type) {
 				this.msgType1 = type
 				this.$refs.message.open()
@@ -174,6 +204,7 @@
 			barcodeInput() {
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
+					let that = this;
 					var len = this.barcode.length
 					if (len != 8) {
 						uni.showToast({
@@ -183,6 +214,45 @@
 						});
 						this.barcodeFocuss()
 						return;
+					}else{
+						uni.request({
+							url: that.baseUrl + '/waitPakin/selectByBarcode/list',
+							data: {
+								barcode: that.barcode
+							},
+							header: {
+								'token': uni.getStorageSync('token')
+							},
+							success(result) {
+								result = result.data
+								if (result.code === 200 && result.data) {
+									that.matData = result.data
+									for(var list in that.matData.records){
+										console.log(list)
+										that.checkMat(that.matData.records[list])
+									}
+									
+								} 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'
+									})
+								}
+						
+							}
+						});
 					}
 					this.focuss()
 				}, 200)
@@ -209,7 +279,7 @@
 			findMat() {
 				let that = this
 				uni.request({
-					url: that.baseUrl + '/mat/auth',
+					url: that.baseUrl + '/mat/split',
 					data: {
 						matnr: that.matnr
 					},
@@ -219,25 +289,8 @@
 					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
-									})
-								},
-								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-								events: {
-									matList: function(data) {
-										that.checkMat(data.data)
-										that.focuss()
-									},
-								},
-							});
+							that.matData = result.data							
+							that.checkMat(that.matData)
 						} else if (result.code == 403) {
 							uni.showToast({
 								title: result.msg,
@@ -317,10 +370,14 @@
 			},
 			// 淇敼鎵瑰彿
 			revise(item, i) {
-				this.matnr = this.dataList[i].matnr
-				this.count = this.dataList[i].anfme
+				this.matnr = this.dataList[i].matnr				
 				this.batch = this.dataList[i].batch
 				this.weight = this.dataList[i].weight
+				this.specs = this.dataList[i].specs
+				this.manuDate = this.dataList[i].manuDate
+				this.model = this.dataList[i].model
+				this.length = this.dataList[i].length
+				this.volume = this.dataList[i].volume
 				this.rowNum = i
 				this.eject()
 			},
@@ -364,7 +421,7 @@
 			combConfirm(type) {
 				this.msgType = type
 				this.title = '璀﹀憡'
-				this.content = '鏄惁鐜板湪缁勬墭!'
+				this.content = '鏄惁鐜板湪鍏ュ簱!'
 				this.$refs.combConfirm.open()
 			},
 			combClose() {
@@ -383,18 +440,16 @@
 					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;
-					}
+				if (that.sta === '') {
+					this.messageText = "璇烽�夋嫨绔欑偣"
+					this.messageToggle('error')
+					return;
 				}
 				uni.request({
-					url: that.baseUrl + '/mobile/comb/auth',
+					url: that.baseUrl + '/mobile/inbound/auth',
 					data: JSON.stringify({
 						barcode: that.barcode,
-						combMats: that.dataList
+						sta: that.sta
 					}),
 					method: 'POST',
 					header: {
@@ -404,11 +459,8 @@
 						var res = result.data
 						if (res.code === 200) {
 							that.resst();
-							that.messageText = "缁勬墭鎴愬姛"
-							that.messageToggle('success')
-							const innerAudioContext = uni.createInnerAudioContext();
-							innerAudioContext.src = '/static/music/pakinOk.mp3';
-							innerAudioContext.play()
+							that.messageText = "鐢熸垚鍏ュ簱浠诲姟鎴愬姛"
+							that.messageToggle('success')							
 						} else if (res.code == 403) {
 							that.messageText = res.msg
 							that.messageToggle('error')
@@ -444,6 +496,7 @@
 			resst() {
 				this.dataList = []
 				this.barcode = ''
+				this.sta = ''
 				this.barcodeFocuss()
 			},
 		}
diff --git a/pages/pakin/putDown.vue b/pages/pakin/putDown.vue
new file mode 100644
index 0000000..11d548b
--- /dev/null
+++ b/pages/pakin/putDown.vue
@@ -0,0 +1,500 @@
+<template>
+	<view>
+		<view class="code">
+			<view class="itemButton">
+				<button size="mini" type="primary" @click="selectMat()">鎻愬彇+</button>
+				<uni-combox :candidates="staList" placeholder="璇烽�夋嫨鍏ュ簱绔欑偣" v-model="sta"></uni-combox>
+			</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">{{item.locNo}}</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.batch}}</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">{{item.manuDate}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鍨嬪彿锛�</view>
+						<view class="left-item">{{item.model}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">瀹藉害锛�</view>
+						<view class="left-item">{{item.weight}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">闀垮害锛�</view>
+						<view class="left-item">{{item.length}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">闈㈢Н锛�</view>
+						<view class="left-item">{{item.volume}}</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="specs"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鐢熶骇鏃ユ湡:</view>
+						<view class="popup-item-right"><input type="text" v-model="manuDate"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鍨嬪彿:</view>
+						<view class="popup-item-right"><input type="text" v-model="model"></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"><input type="text" v-model="length"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">闈㈢Н:</view>
+						<view class="popup-item-right"><input type="text" v-model="volume"></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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				barcode: '',
+				dataList: [],
+				count: 0,
+				rowNum: '',
+				matnr: '',
+				batch: '',
+				weight: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				removeNum: 0,
+				specs:'',
+				manuDate:'',
+				model:'',				
+				length:'',
+				volume:'',
+				staList:[100,102,104,107,305],
+				sta:'',
+				item:''
+			}
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+		},
+		methods: {
+			messageToggle(type) {
+				this.msgType1 = type
+				this.$refs.message.open()
+			},
+			// barcode input 浜嬩欢
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.barcode.length
+					if (len != 8) {
+						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.barcodeFocus = false;
+				this.matFocus = false;
+				setTimeout(() => {
+					this.matnr = '';
+					this.matFocus = true;
+				}, 100);
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/mat/split',
+					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.checkMat(that.matData)
+						} 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'
+							})
+						}
+
+					}
+				});
+
+			},
+			selectMat() {
+				let that = this
+				uni.navigateTo({
+					url: "../locDetl/locDetl",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('commonUrl', {
+							commonUrl: ''
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.matData = data.data
+							that.checkMat(that.matData)
+						},
+					},
+
+
+				});
+				that.matnr = ''
+			},
+			checkMat(mat) {
+				var len = this.dataList.length
+				var add = true ,sameItem = false
+				for (var i = 0; i < len; i++) {
+					if (mat.locNo == this.dataList[i].locNo) {						
+						add = false
+					}
+				}
+				if (add) {
+					this.dataList.unshift(mat)
+				}
+				this.$forceUpdate() // 寮哄埗鍒锋柊
+			},
+			// 淇敼鎵瑰彿
+			revise(item, i) {
+				this.matnr = this.dataList[i].matnr				
+				this.batch = this.dataList[i].batch
+				this.weight = this.dataList[i].weight
+				this.specs = this.dataList[i].specs
+				this.manuDate = this.dataList[i].manuDate
+				this.model = this.dataList[i].model
+				this.length = this.dataList[i].length
+				this.volume = this.dataList[i].volume
+				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.dataList.length === 0) {
+					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+					this.messageToggle('error')
+					return;
+				}
+				if (that.sta === '') {
+					this.messageText = "璇烽�夋嫨绔欑偣"
+					this.messageToggle('error')
+					return;
+				}
+				uni.request({
+					url: that.baseUrl + '/mobile/outbound/auth',
+					data: JSON.stringify({
+						sta: 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.messageText = "閲嶇疆瀹屾垚"
+				this.messageToggle('success')
+			},
+			// 鍙栨秷閲嶇疆
+			resetClose() {
+
+			},
+			// 娓呯┖
+			resst() {
+				this.dataList = []
+				this.barcode = ''
+				this.sta = ''
+				this.barcodeFocuss()
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+	
+	.list:first-child {
+		margin-top: 220rpx;
+	}
+
+	.code {
+		width: 100%;
+		position: fixed;
+		min-height: 100rpx;
+		background-color: #FFF;
+		z-index: 10;
+	}
+	.itemButton {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;  
+		height: 100rpx;		
+		/* justify-content: flex-start; */
+		/* margin-left: 20rpx; */
+		border-bottom: 1px solid #DCDFE6;
+	}
+	.itemButton button {
+		/* width: 20%; */
+		margin: 0;
+	}
+	.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 {
+		height: 80rpx;
+		line-height: 80rpx;
+		width: 100%;
+		background-color: white;
+		position: fixed;
+		margin-top: 100rpx;
+		z-index: 9;
+		/* border-top: 1px solid #DCDFE6; */
+		text-align: center;
+		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+	}
+</style>
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 452c440..af00751 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -17,7 +17,7 @@
 	display: flex;
 	flex-direction: column;
 	margin-left: 20rpx;
-	width: 80vw;
+	width: 100vw;
 }
 .list-left-item {
 	min-height: 40rpx;
@@ -28,7 +28,7 @@
 	min-height: 40rpx;
 	display: flex;
 	align-items: center;
-	width: 25%;
+	width: 35%;
 }
 .left-item {
 	display: flex;

--
Gitblit v1.9.1