From 4a01b5f1b111885aa0cadf3d5f96fee78413be16 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 15:09:29 +0800
Subject: [PATCH] 1
---
pages/pakin/mergeStore.vue | 186 +++++++++++-----------------------------------
1 files changed, 46 insertions(+), 140 deletions(-)
diff --git a/pages/pakin/mergeStore.vue b/pages/pakin/mergeStore.vue
index edb9e4c..cd724b8 100644
--- a/pages/pakin/mergeStore.vue
+++ b/pages/pakin/mergeStore.vue
@@ -2,22 +2,13 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">Bom鍙�:</view>
- <view style="flex: 1;">
- <input type="text" placeholder=" --" disabled="true" v-model="orderNo" :focus="orderNoFocus">
- </view>
- <view style="height:100%;line-height:2;width:40rpx;margin-right: 20rpx;">
- <!-- <uni-icons type="clear" color="#c1c1c1" @click="clearOrderNo()"></uni-icons> -->
- </view>
- </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="checkBom()">
+ <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>
@@ -50,7 +41,7 @@
<view class="left-item">{{item.specs}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
+ <view class="desc" style="width: 38%;">鎵瑰彿锛�</view>
<view class="left-item">
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
@@ -62,9 +53,8 @@
</view>
</view> -->
<view class="list-left-item">
- <view class="left-item">鏁伴噺锛歿{item.anfme}}</view>
- </view>
- <view class="list-left-item">
+ <view class="desc">鏁伴噺锛�</view>
+ <view class="left-item">{{item.anfme}}</view>
</view>
</view>
<view class="list-right">
@@ -76,7 +66,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>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -93,8 +83,8 @@
</view>
</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-left" style="width: 20vw;">澶囨敞:</view>
+ <view class="popup-item-right" style="width: 46vw;"><input type="text" v-model="memo"></view>
</view>
<!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
@@ -103,7 +93,7 @@
<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='1' :max="maxAn" color="#747474" @change="changeValue" />
+ <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -127,7 +117,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"
@@ -151,7 +141,7 @@
baseUrl: '',
token: '',
barcode: '',
- orderNo: '',
+ memo: '',
dataList: [],
count: 0,
rowNum: '',
@@ -163,14 +153,10 @@
messageText: '',
title: '',
content: '',
- orderNoFocus: false,
barcodeFocus: true,
matFocus: false,
matData: '',
removeNum: 0,
- enterCount: 0,
- maxAnfme: 0,
- maxAn: 0
}
},
onLoad() {
@@ -185,46 +171,23 @@
this.msgType1 = type
this.$refs.message.open()
},
- clearOrderNo() {
- this.orderNo = ''
- let that = this;
- that.orderNoFocus = false;
- setTimeout(() => {
- that.orderNo = '';
- that.orderNoFocus = true;
- }, 100);
- },
- orderNoInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.orderNo.length
- this.barcodeFocuss()
- }, 200)
- },
// barcode input 浜嬩欢
barcodeInput() {
- let _this = this
- uni.request({
- url: _this.baseUrl + '/mobile/check/mergeStore/barcode',
- data: {barcode: _this.barcode},
- header: { 'token':uni.getStorageSync('token') },
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.focuss()
- _this.orderNo = res.data
- uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: "none", position: 'top' })
- } else if (res.code === 403) {
- uni.showToast({ title: res.msg, icon: "none", position: 'top' })
- setTimeout(() => {
- uni.reLaunch({ url: '../login/login' });
- }, 1000);
- } else {
- _this.barcodeFocuss()
- uni.showToast({ title: res.msg, icon: "none", position: 'top' })
- }
+ this.barcode = this.barcode.replace(/^\{|\}$/g, '')
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ if (len != 8) {
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ this.barcodeFocuss()
+ return;
}
- })
+ this.focuss()
+ }, 200)
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
@@ -237,63 +200,29 @@
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- this.focus = false;
+ this.barcodeFocus = false;
+ this.matFocus = false;
setTimeout(() => {
this.matnr = '';
this.matFocus = true;
}, 100);
},
- // 妫�楠屽綋鍓嶇墿鏂欐槸鍚︽槸鍦ㄥ綋鍓岯om琛ㄤ腑
- checkBom() {
- let _this = this
- uni.request({
- url: _this.baseUrl + '/mobile/comb/checkBom',
- data: JSON.stringify({
- bomCode: _this.orderNo,
- matnr: _this.matnr
- }),
- method: 'POST',
- header: { 'token': uni.getStorageSync('token') },
- success(res) {
- // console.log(res);
- res = res.data
- if (res.code === 200) {
- if (res.data) {
- _this.maxAnfme = res.data.zpalletAnfme
- _this.findMat()
- } else {
- _this.findMat()
- }
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- _this.matnr = ''
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
-
- }
- })
- },
// 鎼滅储鐗╂枡
findMat() {
let that = this
+ var mat = that.matnr
+ let submitMat
+ let newMatnr
+ if (mat.includes(';')) {
+ newMatnr = mat.split(';')
+ submitMat = newMatnr[1]
+ } else {
+ submitMat = mat
+ }
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
- matnr: that.matnr
+ matnr: submitMat
},
header: {
'token': uni.getStorageSync('token')
@@ -304,11 +233,6 @@
that.matData = result.data
that.matnr = ''
that.matData['batch'] = ''
- if (that.maxAnfme > 0) {
- that.matData['maxNum'] = that.maxAnfme
- } else if (that.maxAnfme == 0){
- that.matData['maxNum'] = 0
- }
uni.navigateTo({
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -320,7 +244,6 @@
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
matList: function(data) {
- console.log(data);
that.checkMat(data.data)
that.focuss()
},
@@ -399,22 +322,17 @@
}
}
if (add) {
- // if (this.maxAnfme) {
- // mat['maxAnfme'] = this.maxAnfme
- // mat.anfme = this.maxAnfme
-
- // }
this.dataList.unshift(mat)
}
- this.maxAnfme = ''
+ this.$forceUpdate() // 寮哄埗鍒锋柊
},
// 淇敼鎵瑰彿
revise(item, i) {
this.matnr = this.dataList[i].matnr
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
+ this.memo = this.dataList[i].memo
this.weight = this.dataList[i].weight
- this.maxAn = this.dataList[i].maxNum
this.rowNum = i
this.eject()
},
@@ -458,7 +376,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪骞舵墭!'
this.$refs.combConfirm.open()
},
combClose() {
@@ -467,11 +385,6 @@
comb() {
uni.vibrateShort();
let that = this;
- if (that.orderNo === '') {
- this.messageText = "璇疯緭鍏ヨ鍗曟潯鐮�"
- this.messageToggle('error')
- return;
- }
if (that.barcode === '') {
this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
this.messageToggle('error')
@@ -484,15 +397,14 @@
}
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/merge/comb/auth',
+ url: that.baseUrl + '/mobile/combMeger/auth',
data: JSON.stringify({
- bomCode: that.orderNo,
barcode: that.barcode,
combMats: that.dataList
}),
@@ -504,7 +416,7 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "骞舵墭鎴愬姛"
that.messageToggle('success')
const innerAudioContext = uni.createInnerAudioContext();
innerAudioContext.src = '/static/music/pakinOk.mp3';
@@ -542,15 +454,9 @@
},
// 娓呯┖
resst() {
- this.orderNo = ''
this.dataList = []
this.barcode = ''
- let that = this;
- that.orderNoFocus = false;
- setTimeout(() => {
- that.orderNo = '';
- that.orderNoFocus = true;
- }, 100);
+ this.barcodeFocuss()
},
}
}
@@ -562,7 +468,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 140rpx;
+ min-height: 200rpx;
background-color: #FFF;
z-index: 10;
}
@@ -570,7 +476,7 @@
.item {
display: flex;
align-items: center;
- height: 70rpx;
+ height: 100rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -602,7 +508,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 210rpx;
+ margin-top: 200rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
--
Gitblit v1.9.1