From fe8fb74ce94e7bee23ed47b7175236248ac93b98 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 19 十一月 2024 16:24:04 +0800
Subject: [PATCH] Merge branch 'nbncPda' of http://47.97.1.152:5880/r/wms_app into nbncPda
---
pages/pakin/pakin.vue | 99 +++++++++++++++++++++++++++++++------------------
1 files changed, 62 insertions(+), 37 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 220ce7a..89bde36 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -1,5 +1,6 @@
<template>
<view>
+ <!-- ----------------------------------------------绋嬪簭鏍囬鏍�----------------------------------------------------------- -->
<view class="status_bar">
<!-- 杩欓噷鏄姸鎬佹爮 -->
</view>
@@ -14,6 +15,9 @@
</view>
</block>
</uni-nav-bar>
+ <!-- ----------------------------------------------绋嬪簭鏍囬鏍�----------------------------------------------------------- -->
+
+ <!-- ---------------------------------------------- 杈撳叆妗� ----------------------------------------------------------- -->
<view class="code">
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
@@ -22,14 +26,27 @@
</view>
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+ <input type="text" style="width: 350rpx;" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+ <uni-icons type="close" color="#c1c1c1" @click="clearMatnr"></uni-icons>
<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 class="item">
+ <view class="code-decs" style="width: 25vw;">鏄惁婊℃澘:</view>
+ <radio-group @change="isFullPlt">
+ <label>
+ <radio :checked="ck1" /><text>鏄�</text>
+ </label>
+ <label>
+ <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+ </label>
+ </radio-group>
+ </view>
</view>
+ <!-- ---------------------------------------------- 杈撳叆妗� ----------------------------------------------------------- -->
<view class="mat-list-title">
鍟嗗搧鍒楄〃
</view>
@@ -172,10 +189,16 @@
matFocus: false,
matData: '',
removeNum: 0,
+ ck1: false,
+ ck2: true,
+ fullPlt: 'N',
}
},
onLoad() {
-
+ this.dataList = uni.getStorageSync('pakinDataList')
+ if (this.dataList === '') {
+ this.dataList = []
+ }
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
@@ -190,6 +213,21 @@
},
methods: {
back() { uni.navigateBack({}) },
+ // 鏄惁婊℃澘
+ isFullPlt() {
+ var temp = this.ck1
+ this.ck1 = this.ck2
+ this.ck2 = temp
+ if (this.ck1) {
+ this.fullPlt = 'Y'
+ } else {
+ this.fullPlt = 'N'
+ }
+ },
+ clearMatnr() {
+ // this.matnr = ''
+ this.focuss()
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -200,11 +238,7 @@
setTimeout(() => {
var len = this.barcode.length
if (len != 8) {
- uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
+ uni.showToast({ title: '鎵樼洏鐮佹湁璇閲嶈瘯', icon: "none", position: 'top' });
this.barcodeFocuss()
return;
}
@@ -222,7 +256,7 @@
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- this.focus = false;
+ this.matFocus = false;
setTimeout(() => {
this.matnr = '';
this.matFocus = true;
@@ -262,22 +296,14 @@
},
});
} else if (result.code == 403) {
- uni.showToast({
- title: result.msg,
- icon: "none",
- position: 'top'
- })
+ 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'
- })
+ uni.showToast({ title: result.msg, icon: "none", position: 'top' })
}
}
@@ -336,6 +362,7 @@
if (add) {
this.dataList.unshift(mat)
}
+ uni.setStorageSync('pakinDataList', this.dataList);
},
// 淇敼鎵瑰彿
revise(item, i) {
@@ -360,9 +387,8 @@
},
// 纭绉婚櫎
removeConfirm() {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
this.dataList.splice(this.removeNum, 1)
+ uni.showToast({ title: '绉婚櫎鎴愬姛', icon: "error", position: 'top' });
},
// 鍙栨秷绉婚櫎
removeClose() {
@@ -373,8 +399,7 @@
this.dataList[this.rowNum].batch = this.batch
this.dataList[this.rowNum].weight = this.weight
this.matnr = ''
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
+ uni.showToast({ title: '绉婚櫎鎴愬姛', icon: "success", position: 'top' });
this.$refs.revise.close()
},
reviseClose() {
@@ -396,25 +421,24 @@
uni.vibrateShort();
let that = this;
if (that.barcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
- this.messageToggle('error')
+ uni.showToast({ title: '璇锋壂鎻忔墭鐩樻潯鐮�', icon: "error", position: 'top' });
return;
}
if (that.dataList.length === 0) {
- this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
- this.messageToggle('error')
+ uni.showToast({ title: '璇锋坊鍔犲晢鍝佸垪琛�', icon: "error", position: 'top' });
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')
+ uni.showToast({ title: that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0', icon: "error", position: 'top' });
return;
}
}
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
+ owner: that.store,
+ fullPlt: that.fullPlt,
barcode: that.barcode,
combMats: that.dataList
}),
@@ -431,17 +455,15 @@
const innerAudioContext = uni.createInnerAudioContext();
innerAudioContext.src = '/static/music/pakinOk.mp3';
innerAudioContext.play()
+ that.dataList = []
+ uni.setStorageSync('pakinDataList', that.dataList);
} else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' });
setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
+ uni.reLaunch({ url: '../login/login' });
}, 1000);
} else {
- that.messageText = res.msg
- that.messageToggle('error')
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' });
}
}
});
@@ -475,10 +497,13 @@
<style>
@import url('../../static/css/wms.css/wms.css');
+ .list:first-child {
+ margin-top: 320rpx;
+ }
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 210rpx;
background-color: #FFF;
z-index: 10;
}
@@ -486,7 +511,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
--
Gitblit v1.9.1