From a2a1efc92521f7a821dc437ff919a39aa292ad06 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 09 一月 2025 19:51:25 +0800
Subject: [PATCH] # 1. 波次预览重复问题 2. PDA组拖超过3个物料后，组拖按钮被遮挡 3. 平库入库物料ID为空 4. PDA出库成功后，界面数据重置，避免重复操作 5. 入库单历史档，按时间倒序排列
---
uni_modules/uni-scss/styles/tools/functions.scss | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
index ac6f63e..a71beeb 100644
--- a/uni_modules/uni-scss/styles/tools/functions.scss
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -1,19 +1,19 @@
-// 鍚堝苟 map
-@function map-deep-merge($parent-map, $child-map){
- $result: $parent-map;
- @each $key, $child in $child-map {
- $parent-has-key: map-has-key($result, $key);
- $parent-value: map-get($result, $key);
- $parent-type: type-of($parent-value);
- $child-type: type-of($child);
- $parent-is-map: $parent-type == map;
- $child-is-map: $child-type == map;
-
- @if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
- $result: map-merge($result, ( $key: $child ));
- }@else {
- $result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
- }
- }
- @return $result;
-};
+// 鍚堝苟 map
+@function map-deep-merge($parent-map, $child-map){
+ $result: $parent-map;
+ @each $key, $child in $child-map {
+ $parent-has-key: map-has-key($result, $key);
+ $parent-value: map-get($result, $key);
+ $parent-type: type-of($parent-value);
+ $child-type: type-of($child);
+ $parent-is-map: $parent-type == map;
+ $child-is-map: $child-type == map;
+
+ @if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+ $result: map-merge($result, ( $key: $child ));
+ }@else {
+ $result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+ }
+ }
+ @return $result;
+};
--
Gitblit v1.9.1