wms_app.git - Gitblit

			@@ -2,6 +2,11 @@
			<view>
			<view class="code">
			<view class="item">
			<view class="code-decs">单据编号:</view>
			<input type="text" placeholder=" 扫码 / 输入" v-model="orderNo"
			@input="barcodeInput()">
			</view>
			<view class="item">
			<view class="code-decs">托盘码:</view>
			<input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
			@input="barcodeInput()">
			@@ -67,9 +72,13 @@
			<view class="desc">数量：</view>
			<view class="left-item">{{item.anfme}}</view>
			</view>
			<view class="list-left-item">
			<view class="desc">条码：</view>
			<view class="left-item">{{item.threeCode}}</view>
			</view>
			</view>
			<view class="list-right">
			<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
			<!-- <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>
			@@ -163,7 +172,8 @@
			messageText: '',
			title: '',
			content: '',
			barcodeFocus: true,
			orderNoFocus: true,
			barcodeFocus: false,
			matFocus: false,
			matData: '',
			removeNum: 0,
			@@ -222,14 +232,16 @@
			this.matFocus = true;
			}, 100);
			},

			// 搜索物料
			findMat() {
			let that = this
			let m = that.matnr.split(";")
			let matnr1 = m[0].slice(3)
			let batch1 = m[1].slice(3)
			let matnr1 = that.matnr
			// let m = that.matnr.split(";")
			// let matnr1 = m[0].slice(3)
			// let batch1 = m[1].slice(3)
			uni.request({
			url: that.baseUrl + '/mat/auth',
			url: that.baseUrl + '/mat/tiaoma/auth',
			data: {
			matnr: matnr1
			},
			@@ -241,24 +253,28 @@
			if (result.code === 200 && result.data) {
			that.matData = result.data
			that.matnr = ''
			that.matData['batch'] = ''
			result.data['batch'] = batch1
			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.matData['batch'] = result.data.unit
			that.matData['anfme'] = result.data.safeQty
			that.matData['threeCode'] = result.data.memo

			that.checkMat(that.matData)
			that.focuss()
			},
			},
			});
			// 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,
			@@ -307,30 +323,30 @@
			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
			}
			// 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
			}
			}
			}
			// } else {
			// // 相同物料相同批号数量累加
			// this.dataList[i].anfme += mat.anfme
			// this.$forceUpdate() // 强制刷新
			// add = false
			// }
			// }
			// }
			if (add) {
			this.dataList.unshift(mat)
			}
			@@ -393,6 +409,11 @@
			comb() {
			uni.vibrateShort();
			let that = this;
			if (that.orderNo === '') {
			this.messageText = "请扫描订单编号"
			this.messageToggle('error')
			return;
			}
			if (that.barcode === '') {
			this.messageText = "请扫描托盘条码"
			this.messageToggle('error')
			@@ -414,6 +435,7 @@
			url: that.baseUrl + '/mobile/comb/auth',
			data: JSON.stringify({
			barcode: that.barcode,
			orderNo: that.orderNo,
			combMats: that.dataList
			}),
			method: 'POST',