From d47f466dfcf0fad3f4d51298c6ab84b33f83274d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 22 三月 2024 13:30:46 +0800
Subject: [PATCH] #
---
pages/phyz/AGV/AGVPakin2.vue | 4 --
pages/phyz/order/orderList.vue | 36 ++++++++++++++----
pages/phyz/order/purchaseOrder.vue | 21 ++++++++--
static/css/common/order.css | 2
4 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/pages/phyz/AGV/AGVPakin2.vue b/pages/phyz/AGV/AGVPakin2.vue
index c368d4f..fe3e4f5 100644
--- a/pages/phyz/AGV/AGVPakin2.vue
+++ b/pages/phyz/AGV/AGVPakin2.vue
@@ -523,10 +523,6 @@
return;
}
}
- console.log(that.dataList);
- console.log(that.barcode);
- console.log(that.orderNo);
- // return
uni.request({
url: that.baseUrl + '/agvMobile/comb/auth',
data: JSON.stringify({
diff --git a/pages/phyz/order/orderList.vue b/pages/phyz/order/orderList.vue
index 3c3ce58..6e31484 100644
--- a/pages/phyz/order/orderList.vue
+++ b/pages/phyz/order/orderList.vue
@@ -16,13 +16,14 @@
<view>鍚嶇О锛歿{item.maktx}}</view>
<view>瑙勬牸锛歿{item.specs}}</view>
<view>鎵瑰彿锛歿{item.batch}}</view>
- <view>鏁伴噺锛歿{item.anfme}}</view>
- <view>浣滀笟鏁伴噺锛歿{item.qty}}</view>
+ <view class="list-anfme">鏁伴噺锛歿{item.anfme}}</view>
+ <view class="list-qty-1" v-if="item.anfme > item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
+ <view class="list-qty-2" v-if="item.anfme <= item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
<view class="card-id">{{i + 1}}</view>
</view>
<view class="list-right" @click="checkboxChange(item)">
<label >
- <checkbox :value="item.orderNo" :checked="item.checked" color="" style="transform:scale(0.7)" /><text></text>
+ <checkbox :value="item.orderNo" :checked="item.checked" color="" :disabled="item.anfme <= item.qty" style="transform:scale(0.7)" /><text></text>
</label>
</view>
</view>
@@ -141,7 +142,12 @@
if (e.checked) {
this.$set(e,'checked',false)
} else {
- this.$set(e,'checked',true)
+ if (e.anfme == e.qty) {
+ this.$set(e,'checked',false)
+ } else {
+ this.$set(e,'checked',true)
+ }
+
}
},
allChecked() {
@@ -154,7 +160,11 @@
}
for (let item of this.dataList) {
if (this.allCheck) {
- this.$set(item,'checked',true)
+ if (item.anfme == item.qty) {
+ this.$set(item,'checked',false)
+ } else {
+ this.$set(item,'checked',true)
+ }
} else {
this.$set(item,'checked',false)
}
@@ -173,8 +183,7 @@
}
}
if (combList.length == 0) {
- uni.showToast({ title: '璇烽�夋嫨缁勬墭鍟嗗搧', icon: "error", position: 'top'
- })
+ uni.showToast({ title: '璇烽�夋嫨缁勬墭鍟嗗搧', icon: "error", position: 'top'})
return
}
uni.navigateTo({
@@ -193,5 +202,16 @@
<style>
@import url('../../../static/css/common/order.css');
-
+ .list-anfme {
+ color: #0082ff;
+ font-weight: bold;
+ }
+ .list-qty-1 {
+ color: #33ba43;
+ font-weight: bold;
+ }
+ .list-qty-2 {
+ color: #e2231a;
+ font-weight: bold;
+ }
</style>
\ No newline at end of file
diff --git a/pages/phyz/order/purchaseOrder.vue b/pages/phyz/order/purchaseOrder.vue
index f5ecffd..f31898f 100644
--- a/pages/phyz/order/purchaseOrder.vue
+++ b/pages/phyz/order/purchaseOrder.vue
@@ -17,7 +17,8 @@
<view>鍗曟嵁绫诲瀷锛歿{item.docType$}}</view>
<view>鍒涘缓鏃堕棿锛歿{item.createTime$}}</view>
<!-- <view class="card-id">{{i + 1}}</view> -->
- <view class="card-status">{{item.settle$}}</view>
+ <view class="card-status-1" v-if="item.settle == 1">{{item.settle$}}</view>
+ <view class="card-status-2" v-if="item.settle == 2">{{item.settle$}}</view>
</view>
<!-- <view class="list-right" @click="checkboxChange(item)">
<label >
@@ -162,16 +163,28 @@
<style>
@import url('../../../static/css/common/order.css');
- .card-status {
+ .card-status-1 {
position: absolute;
right: 20rpx;
top: 30rpx;
- padding: 10rpx 20rpx;
+ padding: 4rpx 20rpx;
text-align: center;
font-size: 10px;
- color: #ffa39e;
+ color: #f5222d;
background-color: #fff1f0;
border: 1px solid #ffa39e;
border-radius: 6rpx;
}
+ .card-status-2 {
+ position: absolute;
+ right: 20rpx;
+ top: 30rpx;
+ padding: 4rpx 20rpx;
+ text-align: center;
+ font-size: 10px;
+ color: #52c41a;
+ background-color: #f6ffed;
+ border: 1px solid #b7eb8f;
+ border-radius: 6rpx;
+ }
</style>
\ No newline at end of file
diff --git a/static/css/common/order.css b/static/css/common/order.css
index 4750a08..a64e023 100644
--- a/static/css/common/order.css
+++ b/static/css/common/order.css
@@ -27,7 +27,7 @@
line-height: 1.2;
text-align: center;
color: #eeeeee;
- background-color: #ddd844;
+ background-color: #30ddb2;
border-radius: 50%;
font-size: 10px;
}
--
Gitblit v1.9.1