From c69b2a0ccd8ed4fe8f11b7bad34bc00b0aa2aaf7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 08 七月 2024 15:39:38 +0800
Subject: [PATCH] #
---
pages/order/orderComb.vue | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index 5e31319..682f1ac 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>
@@ -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
@@ -220,6 +244,9 @@
let that = this
uni.request({
url: this.baseUrl + '/order/list/all',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
method: 'POST',
success(res) {
res = res.data
@@ -386,6 +413,7 @@
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
+ orderNo: that.orderNo,
barcode: that.barcode,
combMats: that.dataList
}),
@@ -478,6 +506,7 @@
resst() {
this.dataList = []
this.barcode = ''
+ this.orderNo = ''
this.barcodeFocuss()
},
combClose() {
--
Gitblit v1.9.1