From c5df53716b70b190e22e4016d952f1aec25c9049 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 06 五月 2025 13:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
pages/listing/disc.vue | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/pages/listing/disc.vue b/pages/listing/disc.vue
index 929e8ef..114dd16 100644
--- a/pages/listing/disc.vue
+++ b/pages/listing/disc.vue
@@ -6,12 +6,11 @@
<input placeholder="璇锋壂鎻忓鍣ㄥ彿" v-model="container" focus></input>
<text class='cuIcon-search text-blue' @click="getList"></text>
</view>
- <view class="cu-form-group ">
+ <view class="cu-form-group">
<view class="title">鎵规鍙�</view>
<input placeholder="璇疯緭鍏ョ墿鏂欐壒娆�" v-model="batch"></input>
- <text class='text-blue'></text>
</view>
- <view class="cu-form-group ">
+ <view class="cu-form-group">
<view class="title">鐗╂枡鏍囩</view>
<input placeholder="璇锋壂鎻忕墿鏂欐爣绛�" v-model="barcode"></input>
<text class='cuIcon-search text-blue' @click="search"></text>
@@ -114,7 +113,6 @@
<button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
<button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="confirm">缁勭洏</button>
</view>
-
</view>
</template>
@@ -136,8 +134,10 @@
megreQty: '',
list: [],
range: [],
+ batch: '',
repeatClick: false,
- isconfirm: false
+ isconfirm: false,
+ batch:''
}
},
computed: {
@@ -149,16 +149,25 @@
mounted() {},
methods: {
async search() {
- const find = this.list.find(el => el.trackCode === this.barcode);
+ if (this.barcode == undefined || this.barcode == '') {
+ uni.showToast({
+ icon: "none",
+ title: '鐗╂枡鏍囩涓嶈兘涓虹┖锛侊紒'
+ })
+ return
+ }
+ const find = this.list.find(el => el.trackCode === this.barcode);
find ? this.scrollTo() : this.getDet();
-
},
async getDet() {
const {
code,
data,
msg
- } = await request('/asnOrderItem/trackCode/' + this.barcode, {}, "get")
+ } = await request('/asnOrderItem/trackCode', {
+ code: this.barcode,
+ batch: this.batch
+ }, "post")
if (code === 200) {
data && this.list.push(data);
} else {
@@ -169,7 +178,14 @@
})
}
},
- async getList() {
+ async getList() {
+ if (this.container == undefined || this.container == '') {
+ uni.showToast({
+ icon: "none",
+ title: '瀹瑰櫒鍙蜂笉鑳戒负绌猴紒锛�'
+ })
+ return
+ }
const {
code,
data,
@@ -230,7 +246,8 @@
msg
} = await request('/waitPakin/merge', {
items: newArr,
- barcode: this.container
+ barcode: this.container,
+ batch: this.batch,
})
if (code === 200) {
uni.showToast({
--
Gitblit v1.9.1