From 6c9cbdf482ce1330704dc635c510ec51a1115a9f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 16:52:29 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 155 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 104 insertions(+), 51 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 06f3bb5..4ebbb57 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -8,8 +8,8 @@
</view>
<view class="square-content">
<view class="content-input">
- <input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="10"
- :focus="barcodeFocus" @input="barcodeInput">
+ <input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆"
+ :focus="barcodeFocus" @confirm="barcodeInput()" placeholder-style="line-height: 85rpx;">
<uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
</view>
</view>
@@ -24,7 +24,7 @@
<view class="square-content">
<view class="content-input-btn">
<input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()"
- :focus="focus">
+ :focus="focus" placeholder-style="line-height: 85rpx;">
<uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
</view>
<view class="content-btn">
@@ -54,7 +54,7 @@
</view> -->
<view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
- <view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+ <view><text style="width: 400rpx;">鍚堝悓鍙凤細{{item.batch}}</text></view>
<view>
<text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
</view>
@@ -87,18 +87,20 @@
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
- <uni-popup ref="revise" background-color="#fff" @change="change">
- <view class="revise-box">
+ <uni-popup ref="revise" background-color="#fff">
+ <view class="revise-box ">
<view class="revise-box-top">
<view class="color-block-blue"></view>
- <text class="title">缁勬墭鏁伴噺</text>
+ <text class="title">淇敼鎵瑰彿/鏁伴噺</text>
</view>
- <view class="text-box">
- <text>鍙粍鏁伴噺锛歿{enableQty}}</text>
+ <view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
+ <text style="display: inline-block;float: left;width: 60px;">鍚堝悓鍙凤細</text>
+ <input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="batch">
</view>
<view class="changeBox">
<view class="num-box">
- <uni-number-box v-model="count" :min="minCount" :max="maxCount" color="#747474" @change="changeValue"/>
+ <text style="display: inline-block;float: left;width: 60px;">鏁伴噺锛�</text>
+ <uni-number-box :value="count" :max="99999999" color="#747474" @change="changeValue"/>
</view>
</view>
<view class="revise-box-buttom">
@@ -116,6 +118,7 @@
export default {
data() {
return {
+ commonUrl:null,
barcode: '',
barcodeFocus:true,
focus:false,
@@ -133,6 +136,7 @@
check:false,
checkText:'鍏ㄩ��',
checkedData:[],
+ batch:''
}
},
onShow() {
@@ -146,30 +150,36 @@
this.baseIP = UIP;
const UPORT = uni.getStorageSync('UPORT');
this.basePORT = UPORT
+ const PROJ = uni.getStorageSync('UPROJ');
+ this.baseUrl = PROJ
+ this.getUrl()
},
methods: {
+ // 鑾峰彇url
+ getUrl() {
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
+ },
// barcode input 浜嬩欢
barcodeInput() {
- var len = this.barcode.length
- if (len != 8) {
- uni.showToast({title: '鎵樼洏鐮佹湁璇閲嶈瘯', icon: "none", position: 'top'});
- this.barcodeFocuss()
- return;
- }
- if (len == 8) {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(()=>{
+ var len = this.barcode.length
+ if (len != 8) {
+ uni.showToast({title: '鎵樼洏鐮佹湁璇閲嶈瘯', icon: "none", position: 'top'});
+ this.barcodeFocuss()
+ return;
+ }
this.focuss()
- }
+ },200)
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
- // #ifdef APP
let that = this;
that.barcodeFocus = false;
setTimeout(()=>{
that.barcode = '';
that.barcodeFocus = true;
}, 100);
- // #endif
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
@@ -204,14 +214,9 @@
this.focus = true;
});
},
- remove() {
- // this.matList.splice(index,1)
- for (var i = 0; i < this.matList.length; i++) {
- if (this.matList[i].checked == true) {
- this.matList.splice(i,1)
- }
- }
- this.checkList();
+ // 鍒楄〃鍒犻櫎鎸夐挳
+ remove(item,index) {
+ this.matList.splice(index,1)
uni.vibrateShort();
},
comb() {
@@ -225,9 +230,15 @@
uni.showToast({title: '璇锋坊鍔犲晢鍝佸垪琛�', icon: "none", position: 'top'});
return;
}
+ for (var i = 0; i < that.matList.length; i++) {
+ if (that.matList[i].anfme == 0 || that.matList[i].anfme == '') {
+ uni.showToast({title: that.matList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0', icon: "none", position: 'top'});
+ return;
+ }
+ }
uni.showLoading();
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/comb/auth',
+ url: that.commonUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
combMats: that.matList
@@ -273,7 +284,7 @@
},
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('acceptDataFromOpenerPage', {baseIP:that.baseIP, basePORT:that.basePORT })
+ res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl })
},
});
@@ -282,7 +293,7 @@
findMat() {
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/auth',
+ url: that.commonUrl + '/mat/auth',
data: {
matnr:that.matnr
},
@@ -300,8 +311,8 @@
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
matList: function(data) {
- that.matList.push(data.data)
- console.log(that.matList)
+ that.checkMat(data.data)
+ // that.matList.push(data.data)
},
},
success: function(res) {
@@ -309,6 +320,15 @@
res.eventChannel.emit('matData', { data: that.matData })
},
});
+ } else if (res.code == 403) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({title: res.msg, icon: "none",position: 'top'})
}
}
@@ -316,6 +336,24 @@
},
+ // 娣诲姞鍟嗗搧
+ addMat(mat) {
+ this.matList.unshift(mat)
+ },
+ checkMat(mat) {
+ var len = this.matList.length
+ var add = true
+ for (var i = 0; i < len; i++) {
+ if (mat.matnr == this.matList[i].matnr) {
+ this.matList[i].anfme += mat.anfme
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ add = false
+ }
+ }
+ if (add) {
+ this.matList.unshift(mat)
+ }
+ },
change(e) {
console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
},
@@ -346,13 +384,14 @@
uni.vibrateShort();
},
revise(item,index) {
- var maxCount = this.matList[index].maxCount
- if (maxCount == undefined ) {
- this.matList[index]["maxCount"] = item.enableQty
- }
- this.enableQty = item.enableQty
- this.count = this.minCount
- this.maxCount = item.maxCount
+ this.count = this.matList[index].anfme
+ // var maxCount = this.matList[index].maxCount
+ // if (maxCount == undefined ) {
+ // this.matList[index]["maxCount"] = item.enableQty
+ // }
+ // this.enableQty = item.enableQty
+ // this.count = this.minCount
+ // this.maxCount = item.maxCount
this.rowNum = index
this.eject()
},
@@ -361,12 +400,14 @@
// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
this.$refs.revise.open(type)
},
- changeValue() {
-
+ changeValue(value) {
+ this.count = value
},
confirm() {
this.matList[this.rowNum].anfme = this.count
+ this.matList[this.rowNum].batch = this.batch
this.$refs.revise.close()
+ this.$forceUpdate() // 寮哄埗鍒锋柊
},
// 鍒楄〃鍙嶉��
reChecked() {
@@ -411,14 +452,6 @@
}
uni.vibrateShort();
},
- // 妫�楠屽垪琛ㄩ暱搴� 绛変簬0 鏄剧ず鍏ㄩ��
- checkList() {
- if (this.matList.length == 0) {
- this.check = false
- this.checkText = "鍏ㄩ��"
- return;
- }
- }
}
}
</script>
@@ -426,7 +459,27 @@
<style>
/* @import "../../colorui/main.css";
@import "../../colorui/icon.css"; */
-
+ .revise-box {
+ position: relative;
+ width: 500rpx;
+ height: 400rpx;
+ border-radius: 25px;
+ }
+ .revise-box-top {
+ width: 400rpx;
+ height: 120rpx;
+ border-radius: 25px;
+ }
+ .changeBox {
+ width: 400rpx;
+ height: 100rpx;
+ }
+ .num-box {
+ margin-left: 100rpx;
+ }
+ .revise-box-buttom{
+ margin-left: 190rpx;
+ }
.pak-seach-box {
background-color: #FFFFFF;
margin: 15rpx 15rpx 0rpx 15rpx;
--
Gitblit v1.9.1