From 8612a51658c093e2900db1d552300826d72a8d6c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 25 九月 2025 14:26:18 +0800
Subject: [PATCH] 1
---
pages/order/orderPakin3.vue | 251 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 217 insertions(+), 34 deletions(-)
diff --git a/pages/order/orderPakin3.vue b/pages/order/orderPakin3.vue
index f56b462..b5afc62 100644
--- a/pages/order/orderPakin3.vue
+++ b/pages/order/orderPakin3.vue
@@ -1,10 +1,17 @@
<template>
<view>
<view class="code">
+ <!-- <view class="combox">
+ <view style="flex: 1;"><uni-combox :candidates="orderNoList" placeholder="璇烽�夋嫨璁㈠崟" v-model="orderNo"
+ @input="getOrderDet"></uni-combox></view>
+ <view style="width: 80px;display: flex;align-items: center;justify-content: center;"><button size="mini"
+ type="primary" @click="findOrder()">妫�绱�</button></view>
+ </view> -->
<view class="item">
<view class="code-decs">璁㈠崟鍙�:</view>
<view style="flex: 1;">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus" @input="findOrder()">
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+ @input="findOrder()">
</view>
<view style="height:100%;line-height:2;width:40rpx;margin-right: 20rpx;">
<uni-icons type="clear" color="#c1c1c1" @click="clearOrderNo()"></uni-icons>
@@ -16,6 +23,10 @@
@input="barcodeInput()">
</view>
<view class="item">
+ <view class="code-decs">浠撳簱:</view>
+ <uni-combox :candidates="floorList" placeholder="璇烽�夋嫨浠撳簱" v-model="floor"></uni-combox>
+ </view>
+ <!-- <view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
@@ -23,18 +34,18 @@
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
<uni-icons type="right" color="#c1c1c1"></uni-icons>
</view>
- </view>
+ </view> -->
</view>
- <view class="mat-list-title">
+<!-- <view class="mat-list-title">
鍟嗗搧鍒楄〃
- </view>
+ </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">No锛�</view>
+ <view class="left-item">{{i + 1}}</view>
+ </view> -->
<view class="list-left-item">
<view class="desc">缂栫爜锛�</view>
<view class="left-item">
@@ -56,11 +67,11 @@
</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="desc">閲嶉噺锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.weight" type="warning"></uni-tag>
+ </view>
+ </view> -->
<view class="list-left-item">
<view class="left-item">鏈鍏ュ簱鏁伴噺锛歿{item.enterCount}}</view>
</view>
@@ -74,10 +85,12 @@
</view>
</view>
</scroll-view>
+
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
+ <view class="buttom">銆�
<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+ <button size="mini" @click="reset()">閲嶇疆</button>
+ <button size="mini" type="primary" @click="combConfirmAndFillEmptyPallets('warn')">缁勬墭骞惰ˉ绌烘墭鐩�</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -95,7 +108,8 @@
</view>
<view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
+ <view class="popup-item-right"><input type="text" disabled="true" v-model="batch"
+ style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;"></view>
</view>
<!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
@@ -104,7 +118,8 @@
<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" />
+ <uni-number-box :value="count" :step='1' :max="9999999" color="#747474"
+ @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -135,6 +150,13 @@
@confirm="comb" @close="combClose"></uni-popup-dialog>
</uni-popup>
</view>
+ <view>
+ <uni-popup ref="combConfirmAndFillEmptyPallets" type="dialog">
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+ @confirm="combAndFillEmptyPallets" @close="combClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+
<!-- 纭閲嶇疆 -->
<view>
<uni-popup ref="resetConfirm" type="dialog">
@@ -152,6 +174,7 @@
baseUrl: '',
token: '',
barcode: '',
+ orderNoList: [],
orderNo: '',
dataList: [],
count: 0,
@@ -169,6 +192,8 @@
matFocus: false,
matData: '',
removeNum: 0,
+ floorList: [],
+ floor: '',
enterCount: 0
}
},
@@ -178,19 +203,92 @@
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
+ this.getSite();
+ this.getOrderDet();
},
methods: {
+ getOrderDet() {
+ let _this = this
+ // if (_this.orderNo.length == 0) {
+ // _this.orderList = []
+ // _this.orderNoList = []
+ // return
+ // }
+ uni.request({
+ url: `${_this.baseUrl}/mobile/getOrderNo/auth?orderNo=` + _this.orderNo,
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ method: 'GET',
+ success(res) {
+ res = res.data
+ if (res.code == 200) {
+ _this.orderNoList = res.data
+ } else if (res.code == 403) {
+ uni.showToast({
+ title: res.msg,
+ icon: "error",
+ position: 'center'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: "error",
+ position: 'center'
+ })
+ }
+ }
+ })
+ },
+ //鑾峰彇浠撳簱
+ getSite() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/mobile/ck',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ method: 'POST',
+ success(res) {
+ res = res.data
+ console.log(res)
+ if (res.code === 200) {
+ that.floorList = res.data
+ } 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')
+ }
+ }
+ })
+ },
findOrder() {
let _this = this
uni.request({
url: _this.baseUrl + '/mobile/order/search/orderNo/auth',
- data: {orderNo: _this.orderNo},
- header: { 'token':uni.getStorageSync('token') },
+ data: {
+ orderNo: _this.orderNo
+ },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
success(res) {
- res = res.data
+ res = res.data
console.log(res);
- if (res.code === 200 ) {
- for(let k in res.data) {
+ if (res.code === 200) {
+ for (let k in res.data) {
res.data[k]['total'] = res.data[k].anfme
res.data[k]['enterCount'] = res.data[k].anfme - res.data[k].qty
}
@@ -333,7 +431,8 @@
},
checkMat(mat) {
var len = this.dataList.length
- var add = true ,sameItem = false
+ 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++) {
@@ -349,7 +448,7 @@
} else {
add = true
}
-
+
} else {
// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
this.dataList[i].anfme += mat.anfme
@@ -361,6 +460,70 @@
if (add) {
this.dataList.unshift(mat)
}
+ },
+
+ //缁勬墭骞惰ˉ绌烘墭鐩�
+ combAndFillEmptyPallets() {
+ 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;
+ }
+ if (that.floor === '') {
+ 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/comb/auth',
+ data: JSON.stringify({
+ beBatch : 1,
+ barcodeSize : this.fullPlt,
+ rsta: that.rsta,
+ 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')
+ }
+ }
+ });
},
// 淇敼鎵瑰彿
revise(item, i) {
@@ -377,7 +540,7 @@
},
// 鍒楄〃绉婚櫎鎸夐挳
remove(item, i, type) {
- this.removeNum = i
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
@@ -417,6 +580,12 @@
combClose() {
this.$refs.combConfirm.close()
},
+ combConfirmAndFillEmptyPallets(type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁鐜板湪缁勬墭骞惰ˉ绌烘澘!'
+ this.$refs.combConfirmAndFillEmptyPallets.open()
+ },
comb() {
uni.vibrateShort();
let that = this;
@@ -427,6 +596,11 @@
}
if (that.barcode === '') {
this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.floor === '') {
+ this.messageText = "璇烽�夋嫨浠撳簱"
this.messageToggle('error')
return;
}
@@ -450,7 +624,8 @@
data: JSON.stringify({
orderNo: that.orderNo,
barcode: that.barcode,
- combMats: that.dataList
+ combMats: that.dataList,
+ ck: that.floor,
}),
method: 'POST',
header: {
@@ -491,6 +666,9 @@
this.dataList = []
this.messageText = "閲嶇疆瀹屾垚"
this.messageToggle('success')
+ this.orderNo = ''
+ this.barcode = ''
+ this.floor = ''
},
// 鍙栨秷閲嶇疆
resetClose() {
@@ -503,10 +681,7 @@
this.barcode = ''
let that = this;
that.orderNoFocus = false;
- setTimeout(() => {
- that.orderNo = '';
- that.orderNoFocus = true;
- }, 100);
+
},
}
}
@@ -515,18 +690,26 @@
<style>
@import url('../../static/css/wms.css/wms.css');
+
.code {
width: 100%;
position: fixed;
- min-height: 210rpx;
+ min-height: 300rpx;
background-color: #FFF;
z-index: 10;
+ }
+
+
+ .combox {
+ background-color: white;
+ padding: 8px;
+ display: flex;
}
.item {
display: flex;
align-items: center;
- height: 70rpx;
+ height: 75rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -558,10 +741,10 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 250rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1