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 | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/pages/listing/disc.vue b/pages/listing/disc.vue
index 07f23f6..114dd16 100644
--- a/pages/listing/disc.vue
+++ b/pages/listing/disc.vue
@@ -6,8 +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>
+ </view>
+ <view class="cu-form-group">
<view class="title">鐗╂枡鏍囩</view>
<input placeholder="璇锋壂鎻忕墿鏂欐爣绛�" v-model="barcode"></input>
<text class='cuIcon-search text-blue' @click="search"></text>
@@ -36,7 +39,6 @@
<text @click="remove(index)" class="cuIcon-close text-red" style="font-size: 24px;"></text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-black">ASN:</text>
@@ -45,7 +47,6 @@
<text class="text-grey ">{{item.asnCode}}</text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-black">鐗╂枡鏉＄爜:</text>
@@ -54,7 +55,6 @@
<text class="text-grey ">{{item.trackCode}}</text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-black">渚涘簲鍟嗘壒娆�:</text>
@@ -63,7 +63,6 @@
<text class="text-grey ">{{item.splrBatch}}</text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-black">搴撳瓨鎵规:</text>
@@ -72,9 +71,6 @@
<text class="text-grey ">{{item.batch}}</text>
</view>
</view>
-
-
-
<view class="cu-item">
<view class="content">
<text class="text-black">骞冲彴琛屽彿: <text class="text-grey ">{{item.platformId}}</text></text>
@@ -90,14 +86,16 @@
</view>
<view class="content">
<text class="text-black">鏀惰揣鏁伴噺: <text class="text-grey ">{{item.anfme}}</text></text>
- </view>
- <view class="content">
- <text class="text-black">宸蹭笂鏋舵暟閲�: <text class="text-grey ">{{item.workQty + item.qty}}</text></text>
+ </view>
+ <view class="content">
+ <text class="text-black">宸蹭笂鏋舵暟閲�: <text
+ class="text-grey ">{{item.workQty + item.qty}}</text></text>
</view>
</view>
- <view class="cu-item">
- <view class="content">
- <text class="text-black">鍙粍鐩樻暟閲�: <text class="text-grey ">{{item.anfme - item.workQty}}</text></text>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">鍙粍鐩樻暟閲�: <text
+ class="text-grey ">{{item.anfme - item.workQty}}</text></text>
</view>
<view class="content">
<view class="cu-form-group padding-lr-0">
@@ -113,9 +111,8 @@
</view>
<view class="cu-bar btn-group foot">
<button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
- <button class="cu-btn bg-blue shadow-blur" @click="confirm">缁勭洏</button>
+ <button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="confirm">缁勭洏</button>
</view>
-
</view>
</template>
@@ -133,11 +130,14 @@
data() {
return {
barcode: '',
- container: '',
+ container: '',
megreQty: '',
list: [],
range: [],
- isconfirm: false
+ batch: '',
+ repeatClick: 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,
@@ -215,6 +231,7 @@
this.isconfirm = false
},
async confirm() {
+ this.repeatClick = true
const newArr = this.list.map(item => {
return {
...item,
@@ -229,7 +246,8 @@
msg
} = await request('/waitPakin/merge', {
items: newArr,
- barcode: this.container
+ barcode: this.container,
+ batch: this.batch,
})
if (code === 200) {
uni.showToast({
@@ -246,6 +264,7 @@
position: 'top'
})
}
+ this.repeatClick = false
},
}
}
--
Gitblit v1.9.1