From 597fc3077ad5acdde2e8dd5ef41f502ce7558445 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 19:12:16 +0800
Subject: [PATCH] #
---
pages/order/orderComb.vue | 27 +++------
pages/pakin/WarehouseIn.vue | 47 ++++-----------
pages/order/orderDetlList.vue | 8 --
pages/order/orderPutOn.vue | 52 ++++------------
4 files changed, 39 insertions(+), 95 deletions(-)
diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index 682f1ac..604351b 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -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() // 寮哄埗鍒锋柊
},
diff --git a/pages/order/orderDetlList.vue b/pages/order/orderDetlList.vue
index 8b4a743..bc17371 100644
--- a/pages/order/orderDetlList.vue
+++ b/pages/order/orderDetlList.vue
@@ -40,12 +40,8 @@
let that = this
uni.request({
url: this.baseUrl + '/orderDetl/forOrderNo/auth',
- data: {
- orderNo: that.orderNo
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
+ data: { orderNo: that.orderNo },
+ header: { 'token': uni.getStorageSync('token') },
success(res) {
res = res.data
that.menuList = res.data
diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index 0f36504..5d537d6 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -222,12 +222,8 @@
that.matnr = matnr[1]
uni.request({
url: that.baseUrl + '/mat/auth',
- data: {
- matnr: that.matnr
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
+ data: { matnr: that.matnr },
+ header: { 'token': uni.getStorageSync('token') },
success(result) {
result = result.data
if (result.code === 200 && result.data) {
@@ -253,22 +249,12 @@
},
});
} else if (result.code == 403) {
- uni.showToast({
- title: result.msg,
- icon: "none",
- position: 'top'
- })
+ uni.showToast({ title: result.msg, icon: "none", position: 'top' })
setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
+ uni.reLaunch({ url: '../login/login' });
}, 1000);
} else {
- uni.showToast({
- title: result.msg,
- icon: "none",
- position: 'top'
- })
+ uni.showToast({ title: result.msg, icon: "none", position: 'top' })
}
}
@@ -340,19 +326,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;
}
}
@@ -363,26 +346,21 @@
combMats: that.dataList
}),
method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
+ header: { 'token': uni.getStorageSync('token') },
success(result) {
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: "none", position: 'top' })
setTimeout(() => {
uni.reLaunch({
url: '../login/login'
});
}, 1000);
} else {
- that.messageText = res.msg
- that.messageToggle('error')
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
}
}
});
@@ -428,16 +406,14 @@
},
// 纭绉婚櫎
removeConfirm(i) {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
+ uni.showToast({ title: "绉婚櫎鎴愬姛", icon: "success", position: 'top' })
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: 'top' })
this.$refs.revise.close()
this.$forceUpdate() // 寮哄埗鍒锋柊
},
diff --git a/pages/pakin/WarehouseIn.vue b/pages/pakin/WarehouseIn.vue
index fba7b8c..3ac0933 100644
--- a/pages/pakin/WarehouseIn.vue
+++ b/pages/pakin/WarehouseIn.vue
@@ -206,27 +206,19 @@
}
uni.request({
url: that.baseUrl + '/waitPakin/forBarcode/auth',
- data: {
- barcode: that.barcode
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
+ data: { barcode: that.barcode },
+ header: { 'token': uni.getStorageSync('token') },
success(result) {
var res = result.data
if (res.code === 200) {
that.dataList = res.data;
} 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'
- });
+ uni.reLaunch({ url: '../login/login' });
}, 1000);
} else {
- that.messageText = res.msg
- that.messageToggle('error')
+ uni.showToast({ title: res.msg, icon: "error", position: 'center' })
}
}
});
@@ -382,8 +374,7 @@
},
// 纭绉婚櫎
removeConfirm() {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
+ uni.showToast({ title: "绉婚櫎鎴愬姛", icon: "success", position: 'center' })
this.dataList.splice(this.removeNum, 1)
},
// 鍙栨秷绉婚櫎
@@ -395,8 +386,7 @@
this.dataList[this.rowNum].batch = this.batch
this.dataList[this.rowNum].weight = this.weight
this.matnr = ''
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
+ uni.showToast({ title: "淇敼鎴愬姛", icon: "success", position: 'center' })
this.$refs.revise.close()
},
reviseClose() {
@@ -419,8 +409,7 @@
let that = this;
if (that.dataList.length === 0) {
- this.messageText = "鎵樼洏鐮佺粍鎵樻暟鎹湁璇�"
- this.messageToggle('error')
+ uni.showToast({ title: "鎵樼洏鐮佺粍鎵樻暟鎹湁璇�", icon: "error", position: 'center' })
return;
}
uni.request({
@@ -429,26 +418,19 @@
barcode: that.barcode,
locNo: that.locNo
},
- header: {
- 'token': uni.getStorageSync('token')
- },
+ header: { 'token': uni.getStorageSync('token') },
success(result) {
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'
- });
+ uni.reLaunch({ url: '../login/login' });
}, 1000);
} else {
- that.messageText = res.msg
- that.messageToggle('error')
+ uni.showToast({ title: res.msg, icon: "error", position: 'center' })
}
}
});
@@ -462,8 +444,7 @@
// 纭閲嶇疆
resetConfirm() {
this.dataList = []
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
+ uni.showToast({ title: "閲嶇疆瀹屾垚", icon: "success", position: 'center' })
},
// 鍙栨秷閲嶇疆
resetClose() {
--
Gitblit v1.9.1