From fe8fb74ce94e7bee23ed47b7175236248ac93b98 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 19 十一月 2024 16:24:04 +0800
Subject: [PATCH] Merge branch 'nbncPda' of http://47.97.1.152:5880/r/wms_app into nbncPda
---
pages/order/orderComb.vue | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index 682f1ac..62f2959 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -33,7 +33,7 @@
<scroll-view>
<checkbox-group class="list" v-for="(item,i) in dataList" :key="i" @change="checkboxChange">
<view class="aside">
- <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
+ <!-- <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/> -->
</view>
<view class="list-left" style="margin: 0;">
<view class="list-left-item">
@@ -243,7 +243,7 @@
getOrderNoList() {
let that = this
uni.request({
- url: this.baseUrl + '/order/list/all',
+ url: this.baseUrl + '/order/comb/list/all',
header: {
'token': uni.getStorageSync('token')
},
@@ -394,19 +394,16 @@
uni.vibrateShort();
let that = this;
if (that.barcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
- this.messageToggle('error')
+ uni.showToast({ title: "璇锋壂鎻忔墭鐩樻潯鐮�", icon: "error", position: 'center' })
return;
}
if (that.dataList.length === 0) {
- this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
- this.messageToggle('error')
+ uni.showToast({ title: "璇锋坊鍔犲晢鍝佸垪琛�", icon: "error", position: 'center' })
return;
}
for (var i = 0; i < that.dataList.length; i++) {
if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
- this.messageToggle('error')
+ uni.showToast({ title: that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0', icon: "error", position: 'center' })
return;
}
}
@@ -425,19 +422,16 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
- that.messageToggle('success')
+ uni.showToast({ title: "缁勬墭鎴愬姛", icon: "success", position: 'center' })
} else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
+ uni.showToast({ title: res.msg, icon: "error", position: 'center' })
setTimeout(() => {
uni.reLaunch({
url: '../login/login'
});
}, 1000);
} else {
- that.messageText = res.msg
- that.messageToggle('error')
+ uni.showToast({ title: res.msg, icon: "error", position: 'center' })
}
}
});
@@ -453,8 +447,7 @@
this.dataList = []
this.orderNo = ''
this.barcode = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
+ uni.showToast({ title:"閲嶇疆瀹屾垚", icon: "success", position: 'center' })
},
// 鍙栨秷閲嶇疆
resetClose() {
@@ -483,16 +476,14 @@
},
// 纭绉婚櫎
removeConfirm(i) {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
+ uni.showToast({ title:"绉婚櫎鎴愬姛", icon: "success", position: 'center' })
this.dataList.splice(this.removeNum, 1)
},
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
this.dataList[this.rowNum].weight = this.weight
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
+ uni.showToast({ title:"淇敼鎴愬姛", icon: "success", position: 'center' })
this.$refs.revise.close()
this.$forceUpdate() // 寮哄埗鍒锋柊
},
--
Gitblit v1.9.1