From 3af3fe4338e97d52e7811bad2689c71c7a4acdc4 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期五, 04 三月 2022 09:46:15 +0800
Subject: [PATCH] #
---
pages/basics/combPro.vue | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 40 deletions(-)
diff --git a/pages/basics/combPro.vue b/pages/basics/combPro.vue
index d0de175..717343e 100644
--- a/pages/basics/combPro.vue
+++ b/pages/basics/combPro.vue
@@ -157,7 +157,7 @@
let size = this.size;
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/bill/query/auth",
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/bill/query1/auth",
header: {
'content-type':'application/x-www-form-urlencoded',
'token':uni.getStorageSync('token')},
@@ -171,36 +171,23 @@
if(res.data.data != null){
that.addTableData(res.data.data)
}else if(res.data.code === 403){
-
+ uni.navigateBack({
+ delta: 1
+ })
}else {
-
+ that.messageToggle('error')
+ that.messageText = res.data.msg
}
}
}
})
- // var str = ''
- // var tempData = []
- // str = val.detail.value;
- // tempData = this.tableData
- // for (var i = 0; i < tempData.length; i++) {
- // var size = tempData[i].size
- // if (str != '') {
- // if (str === size) {
- // tempData =[]
- // tempData.push(this.matData[i])
- // break
- // }
- // }
- // }
- // this.tableData = tempData
- // this.matData = tempData
- }, //SA290475 SH3102081
+
+ },
// 閲嶇疆
reset:function() {
this.billNo = '';
this.code = '';
this.matData = [];
-
this.size = '';
this.toggleSelection()
},
@@ -209,7 +196,6 @@
this.messageText = '鎻愬彇澶辫触'
this.$refs.message.open()
},
-
// 鏍规嵁閫氱煡鍗曞彿鏌ヨ鐗╂枡璇︽儏
find(){
let billNo = this.billNo
@@ -226,7 +212,7 @@
}
this.matData = []
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/bill/query/auth",
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/bill/query1/auth",
header: {
'content-type':'application/x-www-form-urlencoded',
'token':uni.getStorageSync('token')},
@@ -236,14 +222,16 @@
},
method: 'POST',
success(res){
- console.log(res)
if(res.data.code === 200){
if(res.data.data != null){
that.addTableData(res.data.data)
}else if(res.data.code === 403){
-
+ uni.navigateBack({
+ delta: 1
+ })
}else {
-
+ that.messageToggle('error')
+ that.messageText = res.data.msg
}
}
}
@@ -252,18 +240,16 @@
},
addTableData(data){
this.matData=[];
-
for(var i=0;i<data.length;i++){
var toPush = true;
for(var j=0;j<this.matData.length;j++){
- if(data[i].matNo ===this.matData[j].matNo ){
+ if(data[i].matNo ===this.matData[j].matNo && data[i].itemBatch === this.matData[j].itemBatch && data[i].specs === this.matData[j].specs){
this.matData[j].count = Number(this.matData[j].count) + Number(data[i].count);
toPush = false;
}
}
if(toPush) {
- this.matData.push(data[i]);
-
+ this.matData.push(data[i]);
}
}
},
@@ -313,12 +299,8 @@
that.messageText = '璇峰厛纭鍏ュ簱鏁伴噺'
return;
}
-
for (var i = 0; i < that.matData.length; i++) {
- console.log(that.value)
- console.log(that.matData[i].qty)
var sad = that.matData[i].qty - that.value
- console.log(sad)
if (sad <= 5 && sad > 0) {
this.$refs.alertDialog.open()
that.message = '浜у搧浠ｅ彿' + that.matData[i].size + '鍓╀綑寰呯粍鎵樻暟閲忓皯浜�5锛屾槸鍚︾户缁粍鎵�'
@@ -334,12 +316,18 @@
},
method:'POST',
success(res) {
-
if(res.data.code === 200){
that.reset()
that.matData = []
that.messageToggle('success')
that.messageText = '缁勬墭鎴愬姛'
+ } else if(res.data.code === 403){
+ uni.navigateBack({
+ delta: 1
+ })
+ } else {
+ that.messageToggle('error')
+ that.messageText = res.data.msg
}
}
})
@@ -349,15 +337,12 @@
},
// 纭畾缁勬墭
dialogConfirm() {
- console.log(1)
let that = this
let barcode = that.code
let billNo = this.billNo
- console.log(that.matData)
for (var i = 0; i < that.matData.length; i++) {
that.matData[i].oveFlag = 1
}
- console.log(that.matData)
uni.request({
url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/comb/auth",
header: {'token':uni.getStorageSync('token')},
@@ -368,19 +353,55 @@
},
method:'POST',
success(res) {
-
if(res.data.code === 200){
that.reset()
that.matData = []
that.messageToggle('success')
that.messageText = '缁勬墭鎴愬姛'
+ } else if(res.data.code === 403){
+ uni.navigateBack({
+ delta: 1
+ })
+ } else {
+ that.messageToggle('error')
+ that.messageText = res.data.msg
}
}
})
},
// 鍙栨秷缁勬墭
dialogClose() {
- console.log('鍙栨秷缁勬墭浜�')
+ let that = this
+ let barcode = that.code
+ let billNo = this.billNo
+ for (var i = 0; i < that.matData.length; i++) {
+ that.matData[i].oveFlag = 0
+ }
+ uni.request({
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/comb/auth",
+ header: {'token':uni.getStorageSync('token')},
+ data:{
+ barcode:barcode,
+ combMats:that.matData,
+ billNo: billNo,
+ },
+ method:'POST',
+ success(res) {
+ if(res.data.code === 200){
+ that.reset()
+ that.matData = []
+ that.messageToggle('success')
+ that.messageText = '缁勬墭鎴愬姛'
+ } else if(res.data.code === 403){
+ uni.navigateBack({
+ delta: 1
+ })
+ } else {
+ that.messageToggle('error')
+ that.messageText = res.data.msg
+ }
+ }
+ })
}
},
onShow() {
--
Gitblit v1.9.1