From d716fe237eadc6aa5a567a36dd9cbe958fee7dc0 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 10 Sep 2024 10:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=88=E8=BF=9B=E5=85=88?=
=?UTF-8?q?=E5=87=BA=E7=9B=B4=E6=8E=A5=E8=A1=A5=E6=96=992024/7/29=2011:41:?=
=?UTF-8?q?24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/style/new_style.css | 11 +-
src/mycomponents/balance/balance.vue | 4 +-
src/mycomponents/balance/balanceSelect.vue | 11 +
.../record/recordComDetailCard.vue | 2 +-
src/mycomponents/scan/winComScanBalance.vue | 4 +
.../repleinsh/record/repleinshRecord.vue | 858 ++++++++++--------
6 files changed, 482 insertions(+), 408 deletions(-)
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index c184661d..0067c4da 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2088,7 +2088,12 @@ button::after {
vertical-align: middle;
margin-right:12rpx
}
-
+
+.card_item_code {
+ color: #329362;
+ padding: 5px;
+ font-size: 30rpx;
+}
.card_packing_code {
color: #3315EB;
padding: 5px;
@@ -2152,10 +2157,10 @@ button::after {
font-size: 32rpx;
}
-.card_item_code {
+/* .card_item_code {
color: #F1A532;
padding: 5px;
-}
+} */
.card_product_date {
color: #329362;
diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index e3449f02..a0084956 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -19,9 +19,9 @@
-
+
diff --git a/src/mycomponents/balance/balanceSelect.vue b/src/mycomponents/balance/balanceSelect.vue
index 5bc6c0b2..4d631b7b 100644
--- a/src/mycomponents/balance/balanceSelect.vue
+++ b/src/mycomponents/balance/balanceSelect.vue
@@ -7,6 +7,13 @@
+
@@ -30,6 +37,10 @@ const callback = (item) => {
emit('onSelectItem', item)
show.value = false
}
+
+const close = () => {
+ show.value = false
+}
const emit = defineEmits(['onSelectItem'])
defineExpose({ openPopup })
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index 35eb06fa..68cd477c 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -40,7 +40,7 @@ const props = defineProps({
isShowStatus: {
type: Boolean,
- default: false
+ default: true
},
isShowFromLocation: {
diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index efc26619..6902f3f8 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -114,6 +114,10 @@ export default {
areaType: this.fromLocationAreaTypeList,
bussinessCode: this.bussinessCode
}
+ uni.showLoading({
+ title: '查询中',
+ mask: true
+ })
getBalanceByParams(params)
.then((res) => {
uni.hideLoading()
diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue
index 8cae0661..83d78c44 100644
--- a/src/pages/repleinsh/record/repleinshRecord.vue
+++ b/src/pages/repleinsh/record/repleinshRecord.vue
@@ -1,465 +1,519 @@
-
+
-
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
-
-
+