From 18c29958c294b3b8bade49f3498a3be83a6577a8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 18 三月 2024 12:45:42 +0800
Subject: [PATCH] #

---
 pages/home/home.vue         |    7 
 pages/pakin/goodsUp3.vue    |  658 ++++++++++++++++++++++++++++++++++++++
 pages.json                  |   22 +
 pages/mat/matQuery2.vue     |  260 +++++++++++++++
 pages/pakin/sourceMenu2.vue |   68 ++++
 5 files changed, 1,015 insertions(+), 0 deletions(-)

diff --git a/pages.json b/pages.json
index 2e8fc0f..221b01e 100644
--- a/pages.json
+++ b/pages.json
@@ -49,6 +49,12 @@
 			}
 		},
 		{
+			"path": "pages/pakin/goodsUp3",
+			"style": {
+				"navigationBarTitleText": "鏉＄爜涓婃灦2"
+			}
+		},
+		{
 			"path": "pages/pakin/goodsDown",
 			"style": {
 				"navigationBarTitleText": "骞冲簱涓嬫灦"
@@ -177,6 +183,22 @@
 				"navigationBarTitleText" : "鏉ユ簮鍦�",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/pakin/sourceMenu2",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鏉ユ簮鍦�",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/mat/matQuery2",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐗╂枡鍒楄〃",
+				"enablePullDownRefresh" : false
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 927981c..91ddc07 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -37,6 +37,13 @@
 						color: 'cyan',
 						cuIcon: 'pullup',
 						url: '/pakin/sourceMenu'
+					}
+					,{
+						title: '鏉＄爜涓婃灦2',
+						name: 'GoodsUp2',
+						color: 'cyan',
+						cuIcon: 'pullup',
+						url: '/pakin/sourceMenu2'
 					},
 					{
 						title: '骞冲簱涓嬫灦',
diff --git a/pages/mat/matQuery2.vue b/pages/mat/matQuery2.vue
new file mode 100644
index 0000000..b42ac48
--- /dev/null
+++ b/pages/mat/matQuery2.vue
@@ -0,0 +1,260 @@
+<template>
+	<view>
+		<!-- 鎼滅储妗� -->
+		<view class="search-bar">
+			<uni-search-bar v-model="condition" 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="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.origin  ? item.origin : '--'}}</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,
+				origin:''
+			}
+		},
+		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('item', function(data) {
+				console.log(data.item);
+				that.origin = data.item
+				console.log(that.origin);
+			})
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');			
+			this.showMat(1)
+		},
+		methods: {
+			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) {
+						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) {
+						that.tagList = null
+						that.matList = []						
+						var res = result.data
+						if (res.code === 200) {
+							if (res.records != null && res.records.length > 0) {
+								that.tagList = res.data.records
+							} 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/auth',
+				    data: {
+						curr:that.curr,
+						limit: 20,
+						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'})
+						}
+						
+					}
+				});
+			},
+			findBySelect(item) {
+				let that = this
+				uni.navigateTo({
+					url: "../pakin/goodsUp3",
+					success: function(res) {
+						console.log(item);
+						console.log(that.origin);
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('item', {
+							item: item
+						})
+						res.eventChannel.emit('orgin', {
+							orgin: that.origin
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							// that.matnr = data.data
+							// that.input(that.matnr)
+						},
+					},
+				
+				
+				});
+				
+			}
+		}
+	}
+</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/goodsUp3.vue b/pages/pakin/goodsUp3.vue
new file mode 100644
index 0000000..392abf6
--- /dev/null
+++ b/pages/pakin/goodsUp3.vue
@@ -0,0 +1,658 @@
+<template>
+	<view>
+		<view class="code">
+			<view class="item">
+				<view class="code-decs">鏉＄爜:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="code" :focus="barcodeFocus" @input="findCode()">
+			</view>
+			<view class="item">
+				<view class="code-decs">璐т富:</view>
+				<uni-combox :candidates="ownerList" placeholder="璇烽�夋嫨璐т富"  v-model="owner"></uni-combox>
+			</view>
+			<view class="item">
+				<view class="code-decs">搴撲綅鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" >
+			</view>
+			<!-- <view class="item">
+				<view class="code-decs">鐗╂枡鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="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">
+							{{item.matnr}}
+						</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.origin}}</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.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="locNo"></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" style="border: none;justify-content: center;">
+							<uni-number-box :value="count" :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="adjust" @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: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				orderNo:'',
+				locNo:'',
+				orderNoList: [],
+				code:'',
+				origin:'',
+				ownerList: [],
+				owner: '',
+				orgin2:''
+				
+			}
+		},
+		onLoad() {
+			// 娌″暐鐢ㄤ簡
+			let that = this
+			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			
+			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+			eventChannel.on('item', function(data) {
+				console.log(data.item);				
+				that.origin = data.item
+				
+			})
+			
+			eventChannel.on('orgin', function(data) {
+				console.log(data.orgin);
+				that.origin2 = data.orgin
+			})
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.getOrderNoList()
+			this.getOwnerList()
+		},
+		methods: {
+			findCode(){
+				let that = this
+				console.log(that.origin.matnr)
+				uni.request({
+					url: that.baseUrl + '/mobile/manDetl/in/origin/origin2',
+					header: { 'token':uni.getStorageSync('token') ,
+					"content-type":"application/x-www-form-urlencoded"},
+					data: {
+						code: that.code,
+						origin: that.origin2,
+						m: that.origin.matnr
+					},
+					method: 'GET',
+					success(res) {
+						res = res.data
+						if (res.code === 200) {
+							let item = {matnr:res.data.matnr,batch:res.data.batch,weight:res.data.anfme}
+							let matnr = {}
+							that.findMat2(res.data.matnr).then(result=>{
+								result['batch'] = res.data.batch
+								result['anfme'] = res.data.anfme
+								result.weight = res.data.weight
+								that.dataList.push(result)
+							})
+							
+							that.barcodeFocus = false
+							setTimeout(()=>{
+								that.code = ''
+								that.barcodeFocus = true
+							})
+						}
+					}
+				})
+			},
+			async findMat2(matnr) {
+				let that = this
+				let item = {}
+				let abb = await uni.request({
+					url: that.baseUrl + '/mat/auth',
+					data: {
+						matnr: matnr
+					},
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					
+				}).then((result)=> {
+					item = result.data.data
+				})
+				return item
+			},
+			messageToggle(type) {
+				this.msgType1 = type
+				this.$refs.message.open()
+			},
+			getOrderNoList() {
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/originRule/list/all',
+					method: 'POST',
+					success(res) {
+						res = res.data
+						for (var i = 0; i < res.data.length; i++) {
+							that.orderNoList.push(res.data[i])
+						}
+					}
+				})
+			},
+			getOwnerList(){
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/locOwnerQuery/auth',
+					header: {
+						'token':uni.getStorageSync('token')
+					},
+					method: 'POST',
+					success(res) {
+						res = res.data
+						res.data.forEach((item,index) => {
+							that.ownerList.push(item.value)
+						})
+					}
+				})
+			},
+			// 鏍规嵁鎵樼洏鐮佹悳绱�
+			search() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/manlocDetl/orderNo',
+					header: {
+						'token':uni.getStorageSync('token')
+					},
+					data: {orderNo: that.orderNo},
+					method:'GET',
+					success(res) {
+						console.log(res);
+						res = res.data
+						if(res.code === 200){
+							for(var i = 0; i < res.data.length;i++){
+								that.dataList.push(res.data[i])
+							}
+						} 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'})
+						}
+					}
+					
+				})
+			},
+			
+			// 鎵樼洏鐮佹湁璇噸缃�
+			barcodeFocuss() {
+				let that = this;
+				that.barcodeFocus = false;
+				setTimeout(() => {
+					that.code = '';
+					that.barcodeFocus = true;
+				}, 100);
+			},
+			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+			focuss() {
+				// #ifdef APP
+				let that = this;
+				that.focus = false;
+				setTimeout(() => {
+					that.matnr = '';
+					that.focus = true;
+				}, 100);
+				// #endif
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/mat/auth',
+					data: {
+						matnr: that.matnr
+					},
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						result = result.data
+						if (result.code === 200 && result.data) {
+							that.matData = result.data
+							that.matnr = ''
+							that.matData['batch'] = ''
+							uni.navigateTo({
+								url: "../mat/matSelected",
+								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+								success: function(res) {
+									res.eventChannel.emit('mat', {
+										data: result.data
+									})
+								},
+								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+								events: {
+									matList: function(data) {
+										// that.checkMat(data.data)
+										for(let i = 0; i < data.data.count; i++) {
+											// that.checkMat(data.data)
+											that.dataList.unshift(data.data.mat)
+										}
+									},
+								},
+							});
+						} 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)
+				}
+				console.log(len);
+			},
+			// 淇敼鎵瑰彿
+			revise(item, i) {
+				this.matnr = this.dataList[i].matnr
+				this.count = this.dataList[i].anfme
+				this.batch = this.dataList[i].batch
+				this.locNo = this.dataList[i].locNo
+				this.rowNum = i
+				this.eject()
+			},
+			eject(type) {
+				this.type = type
+				this.$refs.revise.open(type)
+			},
+			// 鍒楄〃绉婚櫎鎸夐挳
+			remove(item, i, type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+				this.$refs.alertDialog.open(i)
+			},
+			// 纭绉婚櫎
+			removeConfirm(i) {
+				this.messageText = "绉婚櫎鎴愬姛"
+				this.messageToggle('success')
+				this.dataList.splice(i, 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].locNo = this.locNo
+				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()
+			},
+			reset(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁閲嶇疆!'
+				this.$refs.resetConfirm.open()
+			},
+			// 纭閲嶇疆
+			resetConfirm() {
+				this.dataList = []
+				this.barcode = ''
+				this.messageText = "閲嶇疆瀹屾垚"
+				this.messageToggle('success')
+			},
+			// 鍙栨秷閲嶇疆
+			resetClose() {
+
+			},
+			// 娓呯┖
+			resst() {
+				this.dataList = []
+				this.barcode = ''
+				this.locNo = ''
+				this.owner = ''
+				this.barcodeFocuss()
+			},
+			adjust() {
+				uni.vibrateShort();
+				let that = this;
+				// if (that.code === '') {
+				// 	this.messageText = "璇疯緭鍏ユ潯鐮�"
+				// 	this.messageToggle('error')
+				// 	return;
+				// }
+				// if (that.origin === '') {
+				// 	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/manDetl/in/no/origin',
+					data: JSON.stringify({						
+						locNo:that.locNo,
+						combMats: that.dataList,
+						owner: that.owner
+					}),
+					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')
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+
+	.code {
+		width: 100%;
+		position: fixed;
+		min-height: 300rpx;
+		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: 300rpx;
+		z-index: 9;
+		/* border-top: 1px solid #DCDFE6; */
+		text-align: center;
+		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+	}
+	
+	.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: 440rpx;
+	}
+	
+	.list:last-child {
+		margin-bottom: 120rpx;
+	}
+	.list-left-item{
+		margin-bottom: 2px;
+	}
+</style>
diff --git a/pages/pakin/sourceMenu2.vue b/pages/pakin/sourceMenu2.vue
new file mode 100644
index 0000000..c77fa7f
--- /dev/null
+++ b/pages/pakin/sourceMenu2.vue
@@ -0,0 +1,68 @@
+<template>
+	<view>
+		<view class="card" v-for="item in menuList" @click="chose(item)">
+			{{item}}
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				menuList: []
+			}
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.getOrderNoList()
+		},
+		methods: {
+			getOrderNoList() {
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/originRule/list/all',
+					method: 'POST',
+					success(res) {
+						res = res.data
+						that.menuList = res.data
+					}
+				})
+			},
+			chose(item) {
+				let that = this
+				uni.navigateTo({
+					url: "../mat/matQuery2",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('item', {
+							item: item
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							// that.matnr = data.data
+							// that.input(that.matnr)
+						},
+					},
+				
+				
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.card {
+		margin: 20rpx;
+		padding: 30rpx;
+		background-color: #157ec1;
+		border-radius: 20rpx;
+		color: #FFF;
+	}
+</style>

--
Gitblit v1.9.1