From 3e6bdea98a22477d305e63cc286be5b37fc07668 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 17:02:01 +0800
Subject: [PATCH] 1
---
pages/pakin/review.vue | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/pages/pakin/review.vue b/pages/pakin/review.vue
index f1e431d..24e829f 100644
--- a/pages/pakin/review.vue
+++ b/pages/pakin/review.vue
@@ -262,10 +262,10 @@
model: /鍗峰彿[锛�:]\s*([^\s<]+)/,
batch: /绠卞彿[锛�:]\s*([^\s<]+)/,
specs: /瑙勬牸[锛�:]\s*([^\s<]+)/,
- length: /闀垮害[锛�:]\s*([\d.]+)\s* ?m/,
- anfme: /鍑�閲峓锛�:]\s*([\d.]+)\s* ?kg/,
- qty: /姣涢噸[锛�:]\s*([\d.]+)\s* ?kg/,
- volume: /鎺ュご[锛�:]\s*([\d.]+)\s* ?涓�/
+ length: /闀垮害[锛�:]\s*([\d.]+)\s*m/,
+ anfme: /鍑�閲峓锛�:]\s*([\d.]+)\s*kg/,
+ qty: /姣涢噸[锛�:]\s*([\d.]+)\s*kg/,
+ volume: /鎺ュご[锛�:]\s*([\d.]+)\s*涓�/
};
// 鎻愬彇鍚勫瓧娈典俊鎭�
@@ -273,7 +273,7 @@
const match = this.matnr.match(patterns[key]);
if (match && match[1]) {
if (['length', 'anfme', 'qty', 'volume'].includes(key)) {
- productInfo[key] = parseFloat(match[1]);
+ productInfo[key] = parseFloat(match[1].trim());
} else {
productInfo[key] = match[1].trim();
}
@@ -320,7 +320,10 @@
if (!flag) {
this.msgType = 'warn'
this.title = '璀﹀憡'
- this.content = '绠卞彿锛�' + data.batch + '瑙勬牸锛�' + data.specs + '鍑�閲嶏細' + data.anfme + ' 涓嶅瓨鍦紝璇锋鏌�!'
+ this.content = "绠卞彿锛�" + data.batch + "\n"
+ + "瑙勬牸锛�"+ data.specs + "\n"
+ + "鍑�閲嶏細"+ data.anfme + "\n"
+ + '涓嶅瓨鍦紝璇锋鏌�!'
this.$refs.combConfirm2.open()
}
this.focuss()
@@ -350,11 +353,11 @@
comb() {
let _this = this
- if (!_this.memo) {
- this.messageText = "璇烽�夋嫨澶嶆牳澶囨敞"
- this.messageToggle('error')
- return;
- }
+ // if (!_this.memo) {
+ // this.messageText = "璇烽�夋嫨澶嶆牳澶囨敞"
+ // this.messageToggle('error')
+ // return;
+ // }
if (!_this.threeCode) {
this.messageText = "璇烽�夋嫨澶嶆牳浜�"
this.messageToggle('error')
--
Gitblit v1.9.1