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 | 274 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 192 insertions(+), 82 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index b1d1a83..89bde36 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -1,20 +1,52 @@
<template>
<view>
+ <!-- ----------------------------------------------绋嬪簭鏍囬鏍�----------------------------------------------------------- -->
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar left-icon="left" background-color="#f8f8f8" title="缁勬墭鍏ュ簱" @clickLeft="back" :fixed="true"
+ :border="false" rightWidth="160rpx" leftWidth="160rpx"
+ >
+ <block slot="right">
+ <view class="city">
+ <view>
+ <text class="uni-nav-bar-text">{{store}}</text>
+ </view>
+ </view>
+ </block>
+ </uni-nav-bar>
+ <!-- ----------------------------------------------绋嬪簭鏍囬鏍�----------------------------------------------------------- -->
+
+ <!-- ---------------------------------------------- 杈撳叆妗� ----------------------------------------------------------- -->
<view class="code">
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus" @confirm="barcodeInput()">
+ <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()">
+ <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>
@@ -27,7 +59,9 @@
</view>
<view class="list-left-item">
<view class="desc">缂栫爜锛�</view>
- <view class="left-item"><uni-tag :text="item.matnr" type="primary"></uni-tag></view>
+ <view class="left-item">
+ <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ </view>
</view>
<view class="list-left-item">
<view class="desc">鍝佸悕锛�</view>
@@ -39,8 +73,16 @@
</view>
<view class="list-left-item">
<view class="desc">鎵瑰彿锛�</view>
- <view class="left-item"><uni-tag :text="item.batch" type="warning"></uni-tag></view>
+ <view class="left-item">
+ <uni-tag :text="item.batch" type="warning"></uni-tag>
+ </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>
@@ -67,17 +109,22 @@
<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;">
+ <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-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">
@@ -91,8 +138,8 @@
<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-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+ @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
</uni-popup>
</view>
<view>
@@ -124,12 +171,15 @@
return {
baseUrl: '',
token: '',
+ storeId: 0,
+ store: '',
barcode: '',
dataList: [],
count: 0,
rowNum: '',
matnr: '',
batch: '',
+ weight: '',
msgType1: 'success',
msgType: 'success',
messageText: '',
@@ -137,18 +187,47 @@
content: '',
barcodeFocus: true,
matFocus: false,
- matData: ''
-
+ 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');
this.token = uni.getStorageSync('token');
+ this.storeId = uni.getStorageSync('store')
+ if (this.storeId == 1) {
+ this.store = '瀹佹尝浠�'
+ }
+ if (this.storeId == 2) {
+ this.store = '鏂版槍浠�'
+ }
},
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()
@@ -156,47 +235,44 @@
// barcode input 浜嬩欢
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(()=>{
+ 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;
}
this.focuss()
- },200)
+ }, 200)
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
let that = this;
that.barcodeFocus = false;
- setTimeout(()=>{
+ setTimeout(() => {
that.barcode = '';
that.barcodeFocus = true;
}, 100);
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- // #ifdef APP
- let that = this;
- that.focus = false;
- setTimeout(()=>{
- that.matnr = '';
- that.focus = true;
+ this.matFocus = false;
+ setTimeout(() => {
+ this.matnr = '';
+ this.matFocus = true;
}, 100);
- // #endif
},
// 鎼滅储鐗╂枡
findMat() {
let that = this
uni.request({
- url: that.baseUrl + '/mat/auth',
- data: {
- matnr:that.matnr
- },
- header: {
- 'token':uni.getStorageSync('token')
- },
+ 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) {
@@ -207,69 +283,93 @@
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
success: function(res) {
- res.eventChannel.emit('mat', { data: result.data })
+ res.eventChannel.emit('mat', {
+ data: result.data
+ })
},
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
- matList: function(data) {
+ matList: function(data) {
that.checkMat(data.data)
+ that.focuss()
},
},
});
- } else if (res.code == 403) {
- uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ } 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: res.msg, icon: "none",position: 'top'})
+ 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: '' })
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {
+ commonUrl: ''
+ })
},
events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
that.matnr = data.data
that.findMat(that.matnr)
- },
+ },
},
-
-
+
+
});
that.matnr = ''
},
checkMat(mat) {
var len = this.dataList.length
- var add = true
+ var add = true ,sameItem = false
for (var i = 0; i < len; i++) {
if (mat.matnr == this.dataList[i].matnr) {
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
+ 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)
}
+ uni.setStorageSync('pakinDataList', this.dataList);
},
// 淇敼鎵瑰彿
- revise(item,i) {
+ revise(item, i) {
this.matnr = 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()
},
@@ -278,17 +378,17 @@
this.$refs.revise.open(type)
},
// 鍒楄〃绉婚櫎鎸夐挳
- remove(item,i,type) {
+ remove(item, i, type) {
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
this.$refs.alertDialog.open(i)
},
// 纭绉婚櫎
- removeConfirm(i) {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
- this.dataList.splice(i,1)
+ removeConfirm() {
+ this.dataList.splice(this.removeNum, 1)
+ uni.showToast({ title: '绉婚櫎鎴愬姛', icon: "error", position: 'top' });
},
// 鍙栨秷绉婚櫎
removeClose() {
@@ -297,8 +397,9 @@
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
+ this.dataList[this.rowNum].weight = this.weight
+ this.matnr = ''
+ uni.showToast({ title: '绉婚櫎鎴愬姛', icon: "success", position: 'top' });
this.$refs.revise.close()
},
reviseClose() {
@@ -312,7 +413,7 @@
this.title = '璀﹀憡'
this.content = '鏄惁鐜板湪缁勬墭!'
this.$refs.combConfirm.open()
- },
+ },
combClose() {
this.$refs.combConfirm.close()
},
@@ -320,49 +421,49 @@
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({
+ url: that.baseUrl + '/mobile/comb/auth',
+ data: JSON.stringify({
+ owner: that.store,
+ fullPlt: that.fullPlt,
barcode: that.barcode,
combMats: that.dataList
}),
method: 'POST',
- header: {
- 'token':uni.getStorageSync('token')
- },
+ 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()
+ 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' });
}
}
});
@@ -375,13 +476,13 @@
},
// 纭閲嶇疆
resetConfirm() {
- this.dataList = ''
+ this.dataList = []
this.messageText = "閲嶇疆瀹屾垚"
this.messageToggle('success')
},
// 鍙栨秷閲嶇疆
resetClose() {
-
+
},
// 娓呯┖
resst() {
@@ -395,20 +496,26 @@
<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;
}
+
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
+
.item input {
height: 50rpx;
line-height: 50rpx;
@@ -416,17 +523,20 @@
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;
@@ -437,6 +547,6 @@
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
- box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.5);
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1