From 4fe03b6ba321418a0356e37de44417be03cda5af Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 12 四月 2024 10:24:10 +0800
Subject: [PATCH] #
---
pages/pakin/pakin.vue | 75 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 20 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index cd83df3..45561a7 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -4,7 +4,7 @@
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
- @confirm="barcodeInput()">
+ @input="barcodeInput()">
</view>
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
@@ -41,11 +41,25 @@
<view class="left-item">{{item.specs}}</view>
</view>
<view class="list-left-item">
+ <view class="desc">澶囨敞锛�</view>
+ <view class="left-item">{{item.memo}}</view>
+ </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>
+ <view class="list-left-item">
+ <view class="desc">绫虫暟锛�</view>
+ <view class="left-item">{{item.meter ? item.meter : '--'}}</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>
@@ -77,13 +91,17 @@
</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="meter"></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">
@@ -98,7 +116,7 @@
<!-- 鎻愮ず绐楃ず渚� -->
<uni-popup ref="alertDialog" type="dialog">
<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
- @confirm="removeConfirm" @close="removeClose"></uni-popup-dialog>
+ @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
</uni-popup>
</view>
<view>
@@ -136,6 +154,7 @@
rowNum: '',
matnr: '',
batch: '',
+ weight: '',
msgType1: 'success',
msgType: 'success',
messageText: '',
@@ -143,8 +162,9 @@
content: '',
barcodeFocus: true,
matFocus: false,
- matData: ''
-
+ matData: '',
+ removeNum: 0,
+ meter: ''
}
},
onLoad() {
@@ -187,14 +207,11 @@
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- // #ifdef APP
- let that = this;
- that.focus = false;
+ this.focus = false;
setTimeout(() => {
- that.matnr = '';
- that.focus = true;
+ this.matnr = '';
+ this.matFocus = true;
}, 100);
- // #endif
},
// 鎼滅储鐗╂枡
findMat() {
@@ -213,6 +230,7 @@
that.matData = result.data
that.matnr = ''
that.matData['batch'] = ''
+ that.matData['meter'] = ''
uni.navigateTo({
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -225,12 +243,13 @@
events: {
matList: function(data) {
that.checkMat(data.data)
+ that.focuss()
},
},
});
- } else if (res.code == 403) {
+ } else if (result.code == 403) {
uni.showToast({
- title: res.msg,
+ title: result.msg,
icon: "none",
position: 'top'
})
@@ -241,7 +260,7 @@
}, 1000);
} else {
uni.showToast({
- title: res.msg,
+ title: result.msg,
icon: "none",
position: 'top'
})
@@ -303,13 +322,14 @@
if (add) {
this.dataList.unshift(mat)
}
- console.log(len);
},
// 淇敼鎵瑰彿
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.meter = this.dataList[i].meter
this.rowNum = i
this.eject()
},
@@ -319,16 +339,17 @@
},
// 鍒楄〃绉婚櫎鎸夐挳
remove(item, i, type) {
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
this.$refs.alertDialog.open(i)
},
// 纭绉婚櫎
- removeConfirm(i) {
+ removeConfirm() {
this.messageText = "绉婚櫎鎴愬姛"
this.messageToggle('success')
- this.dataList.splice(i, 1)
+ this.dataList.splice(this.removeNum, 1)
},
// 鍙栨秷绉婚櫎
removeClose() {
@@ -337,6 +358,9 @@
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].weight = this.weight
+ this.dataList[this.rowNum].meter = this.meter
+ this.matnr = ''
this.messageText = "淇敼鎴愬姛"
this.messageToggle('success')
this.$refs.revise.close()
@@ -376,11 +400,19 @@
return;
}
}
+ let tmpData = JSON.parse(JSON.stringify(that.dataList))
+ for (let k of tmpData) {
+ if(k.batch == '' || k.batch == null) {
+ k.batch = ""
+ }else {
+ k.batch = k.batch + '_' + k.meter
+ }
+ }
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
- combMats: that.dataList
+ combMats: tmpData
}),
method: 'POST',
header: {
@@ -392,6 +424,9 @@
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')
@@ -483,6 +518,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>
--
Gitblit v1.9.1