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 | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index 5e31319..62f2959 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -1,5 +1,19 @@
<template>
<view>
+ <view class="status_bar">
+ <!-- 杩欓噷鏄姸鎬佹爮 -->
+ </view>
+ <uni-nav-bar left-icon="left" background-color="#f8f8f8" title="璁㈠崟缁勬墭" @clickLeft="back" :fixed="true"
+ :border="false" rightWidth="160rpx" leftWidth="160rpx"
+ >
+ <block slot="right">
+ <view class="city">
+ <view>
+ <text class="uni-nav-bar-text">{{store}}</text>
+ </view>
+ </view>
+ </block>
+ </uni-nav-bar>
<view class="code">
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
@@ -19,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">
@@ -52,14 +66,14 @@
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
</view>
- <view class="list-left-item">
+ <!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
<uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
- </view>
+ </view> -->
<view class="list-left-item">
- <view class="desc">鏁伴噺锛�</view>
+ <view class="desc">鍓╀綑鏁伴噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
</view>
</view>
@@ -72,7 +86,7 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">涓婃灦</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -153,6 +167,8 @@
return {
baseUrl: '',
token: '',
+ storeId: 0,
+ store: '',
order: '',
barcode: '',
barcodeFocus: '',
@@ -178,11 +194,19 @@
}
},
onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.getOrderNoList()
- },
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.getOrderNoList()
+ this.storeId = uni.getStorageSync('store')
+ if (this.storeId == 1) {
+ this.store = '瀹佹尝浠�'
+ }
+ if (this.storeId == 2) {
+ this.store = '鏂版槍浠�'
+ }
+ },
methods: {
+ back() { uni.navigateBack({}) },
set(e) {
var ck = this.dataList[e].checked
this.dataList[e].checked = ck ? false:true
@@ -219,7 +243,10 @@
getOrderNoList() {
let that = this
uni.request({
- url: this.baseUrl + '/order/list/all',
+ url: this.baseUrl + '/order/comb/list/all',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
method: 'POST',
success(res) {
res = res.data
@@ -367,25 +394,23 @@
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;
}
}
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
+ orderNo: that.orderNo,
barcode: that.barcode,
combMats: that.dataList
}),
@@ -397,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' })
}
}
});
@@ -425,8 +447,7 @@
this.dataList = []
this.orderNo = ''
this.barcode = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
+ uni.showToast({ title:"閲嶇疆瀹屾垚", icon: "success", position: 'center' })
},
// 鍙栨秷閲嶇疆
resetClose() {
@@ -455,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() // 寮哄埗鍒锋柊
},
@@ -478,6 +497,7 @@
resst() {
this.dataList = []
this.barcode = ''
+ this.orderNo = ''
this.barcodeFocuss()
},
combClose() {
--
Gitblit v1.9.1