From 166b9c6d7517fbff3a400e07d47d1f33c8634c69 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期六, 05 七月 2025 15:08:47 +0800 Subject: [PATCH] # --- pages/basics/pakin.vue | 56 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 22 deletions(-) diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue index 9dd2588..da06367 100644 --- a/pages/basics/pakin.vue +++ b/pages/basics/pakin.vue @@ -9,7 +9,7 @@ <view class="square-content"> <view class="content-input"> <input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" - :focus="barcodeFocus" @input="barcodeInput()" placeholder-style="line-height: 85rpx;"> + :focus="barcodeFocus" @confirm="barcodeInput()" placeholder-style="line-height: 85rpx;"> <uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons> </view> </view> @@ -22,14 +22,14 @@ <view class="title-text"><text>妫�绱㈠晢鍝�</text></view> </view> <view class="square-content"> - <view class="content-input-btn"> + <view class="content-input"> <input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()" :focus="focus" placeholder-style="line-height: 85rpx;"> <uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons> </view> - <view class="content-btn"> + <!-- <view class="content-btn"> <button class="cu-btn bg-blue pda-btn" @click="selectMat()">+鎻愬彇</button> - </view> + </view> --> </view> </view> @@ -52,11 +52,18 @@ <!-- <view> <checkbox :value="item.id+''" :checked="item.checked" style="display: block;" /> </view> --> + <view ><text style="width: 400rpx;">鍗曟嵁锛歿{item.orderNo}}</text></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.specs}}</text></view> + <!-- <view><text style="width: 400rpx;">鍨嬪彿锛歿{item.model}}</text></view> --> + <view><text style="width: 400rpx;">鎵规锛歿{item.batch}}</text></view> + <!-- <view><text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text></view> --> <view> - <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text> + <text style="width: 400rpx;">涓绘暟閲忥細{{item.anfme}}</text> + </view> + <view> + <text style="width: 400rpx;">杈呮暟閲忥細{{item.weight}}</text> </view> </view> <view class="data-list-right"> @@ -87,15 +94,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> </view> + <!-- <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 :value="count" :max="9999" 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"> @@ -131,6 +143,7 @@ check:false, checkText:'鍏ㄩ��', checkedData:[], + batch:'' } }, onShow() { @@ -163,10 +176,8 @@ this.barcodeFocuss() return; } - if (len == 8) { - this.focuss() - } - },100) + this.focuss() + },200) }, // 鎵樼洏鐮佹湁璇噸缃� barcodeFocuss() { @@ -234,7 +245,7 @@ } uni.showLoading(); uni.request({ - url: that.commonUrl + '/mobile/comb/auth', + url: that.commonUrl + '/mobile/comb2/auth', data: JSON.stringify({ barcode: that.barcode, combMats: that.matList @@ -280,7 +291,7 @@ }, success: function(res) { // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑 - res.eventChannel.emit('acceptDataFromOpenerPage', {commonUrl:that.commonUrl }) + res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl }) }, }); @@ -289,7 +300,7 @@ findMat() { let that = this uni.request({ - url: that.commonUrl + '/mat/auth', + url: that.commonUrl + '/mobile/mat/auth', data: { matnr:that.matnr }, @@ -340,7 +351,7 @@ var len = this.matList.length var add = true for (var i = 0; i < len; i++) { - if (mat.matnr == this.matList[i].matnr) { + if (mat.matnr == this.matList[i].matnr && mat.batch == this.matList[i].batch) { this.matList[i].anfme += mat.anfme this.$forceUpdate() // 寮哄埗鍒锋柊 add = false @@ -400,8 +411,8 @@ this.count = value }, confirm() { - console.log(this.count) this.matList[this.rowNum].anfme = this.count + this.matList[this.rowNum].batch = this.batch this.$refs.revise.close() this.$forceUpdate() // 寮哄埗鍒锋柊 }, @@ -456,8 +467,9 @@ /* @import "../../colorui/main.css"; @import "../../colorui/icon.css"; */ .revise-box { - width: 400rpx; - height: 300rpx; + position: relative; + width: 500rpx; + height: 400rpx; border-radius: 25px; } .revise-box-top { @@ -473,7 +485,7 @@ margin-left: 100rpx; } .revise-box-buttom{ - margin-left: 130rpx; + margin-left: 190rpx; } .pak-seach-box { background-color: #FFFFFF; @@ -571,7 +583,7 @@ } .data-list { border-bottom: 1px solid #d8d8d8; - height: 180rpx; + height: 280rpx; margin: 15rpx; border-radius: 20rpx; } -- Gitblit v1.9.1