From 26a240a9fde1e7911a69f92b33f9d3e3039cadd5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 10:55:34 +0800
Subject: [PATCH] #
---
pages/order/orderPutOn.vue | 166 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 123 insertions(+), 43 deletions(-)
diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index 3a17edd..3af4379 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -1,23 +1,16 @@
<template>
<view>
<view class="code">
- <!-- <view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="order" :focus="orderFocus"
- @input="orderInput()" disabled>
- </view> -->
- <view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
- @confirm="barcodeInput()">
- </view>
<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>
@@ -58,6 +51,12 @@
</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>
@@ -71,7 +70,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>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -87,14 +86,18 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <view class="popup-item">
+ <!-- <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" :max="9999999" color="#747474" @change="changeValue" />
+ <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -118,7 +121,7 @@
<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"
@@ -148,7 +151,6 @@
baseUrl: '',
token: '',
order: '',
- orderFocus: true,
barcode: '',
barcodeFocus: '',
dataList: [],
@@ -157,14 +159,16 @@
matnr: '',
matnr1: '',
batch: '',
+ weight: '',
msgType1: 'success',
msgType: 'success',
messageText: '',
title: '',
content: '',
barcodeFocus: false,
- matFocus: false,
- matData: ''
+ matFocus: true,
+ matData: '',
+ removeNum: 0,
}
},
onShow() {
@@ -175,6 +179,30 @@
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ this.focuss()
+ }, 200)
+ },
+ // 鎵樼洏鐮佹湁璇噸缃�
+ barcodeFocuss() {
+ let that = this;
+ that.barcodeFocus = false;
+ setTimeout(() => {
+ that.barcode = '';
+ that.barcodeFocus = true;
+ }, 100);
+ },
+ // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+ focuss() {
+ setTimeout(() => {
+ this.matnr = '';
+ this.matFocus = true;
+ }, 100);
},
// 鎼滅储鐗╂枡
findMat() {
@@ -209,6 +237,7 @@
events: {
matList: function(data) {
that.checkMat(data.data)
+ that.focuss()
},
},
});
@@ -235,33 +264,56 @@
});
},
+ // 鎺ㄨ崘搴撲綅
+ recommendLoc() {
+ let that = this
+ that.recommendLocs = []
+ uni.request({
+ url: that.baseUrl + '/node/recommendLoc',
+ data: {matnr: that.matnr},
+ header: {'token': uni.getStorageSync('token')},
+ success(res) {
+ res = res.data
+ if (res.code == 200 && res.data) {
+ that.recommendLocs = res.data
+ }
+ }
+
+ })
+ },
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.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
- sameItem = true
+ 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
+ // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
+ if (mat.batch != this.dataList[i].batch) {
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ if (sameItem) {
+ add = false
+ } else {
+ add = true
+ }
+
} else {
- add = true
+ // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+ 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)
@@ -270,14 +322,14 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪涓婃灦!'
this.$refs.combConfirm.open()
},
comb() {
uni.vibrateShort();
let that = this;
if (that.barcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ this.messageText = "璇锋坊鍔犲簱浣嶇爜"
this.messageToggle('error')
return;
}
@@ -288,15 +340,15 @@
}
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.messageText = that.dataList[i].matnr + '涓婃灦鏁伴噺涓嶈兘涓�0'
this.messageToggle('error')
return;
}
}
uni.request({
- url: that.baseUrl + '/mobile/comb/auth',
+ url: that.baseUrl + '/mobile/manDetl/in',
data: JSON.stringify({
- locno: that.barcode,
+ locNo: that.barcode,
combMats: that.dataList
}),
method: 'POST',
@@ -307,7 +359,7 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "涓婃灦鎴愬姛"
that.messageToggle('success')
} else if (res.code == 403) {
that.messageText = res.msg
@@ -347,6 +399,7 @@
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()
},
@@ -356,6 +409,7 @@
},
// 鍒楄〃绉婚櫎鎸夐挳
remove(item, i, type) {
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
@@ -365,11 +419,12 @@
removeConfirm(i) {
this.messageText = "绉婚櫎鎴愬姛"
this.messageToggle('success')
- this.dataList.splice(i, 1)
+ 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()
@@ -381,12 +436,37 @@
changeValue(value) {
this.count = value
},
+ // 娓呯┖
+ resst() {
+ this.dataList = []
+ this.barcode = ''
+ this.recommendLocs = []
+ this.barcodeFocuss()
+ },
+ combClose() {
+ this.$refs.combConfirm.close()
+ },
+ // 鍙栨秷绉婚櫎
+ removeClose() {
+ this.$refs.alertDialog.close()
+ },
}
}
</script>
<style>
@import url('../../static/css/wms.css/wms.css');
+ .popup-content {
+ /* height: 90vh; */
+ height: 90vh;
+ width: 200px;
+ }
+ .recommend {
+ width: 300rpx;
+ height: 100rpx;
+ text-align: center;
+ line-height: 100rpx;
+ }
.list {
display: flex;
min-height: 80rpx;
--
Gitblit v1.9.1