From a2ef1f4528324d72eeb162dca7dba29e8da1b934 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 16 May 2024 11:23:04 +0800
Subject: [PATCH] 11

---
 pages/inventory/AIInventory.vue | 5 ++---
 pages/inventory/goodsList1.vue  | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/inventory/AIInventory.vue b/pages/inventory/AIInventory.vue
index 0191146..a8cc9ca 100644
--- a/pages/inventory/AIInventory.vue
+++ b/pages/inventory/AIInventory.vue
@@ -1648,9 +1648,6 @@
 				let purchaseDetails = [];
 				let jishuqi = 0
 				this.carList.forEach(function(value, key) {
-					if(value.price == null){
-						value.price = 0
-					}
 					if(value.productName == ''){
 						uni.showToast({
 							title:  "品名必须维护~",
@@ -1678,6 +1675,8 @@
 							icon: 'none'
 						})
 						return
+					}else{
+						value.price = value.lsprice
 					}
 					value.stockLogList1 = []
 					if (value.purchasePrice == '' || value.purchasePrice == 0) {
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index d2304c0..d82405c 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -1437,9 +1437,11 @@
 			    const chineseNumToArabic = {
 			        '零': 0, '一': 1, '二': 2, '两': 2, '三': 3,
 			        '四': 4, '五': 5, '六': 6, '七': 7, '八': 8, 
-					'九': 9,'杠':'-','刚':'-','军色':'均色','叉':'X','金色':'均色','井':'#'
+					'九': 9,'杠':'-','刚':'-','军色':'均色','叉':'X','金色':'均色','井':'#',
+					'时间':'10件','事件':'10件','世间':'10件','实践':'10件','实件':'10件',
+					'景':'#','警':'#','颈':'#',
 			    };
-			    const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井)/g;
+			    const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井|时间|事件|世间|实践|实件|景|警|颈)/g;
 			    return str.replace(regex, match => chineseNumToArabic[match]);
 			},
 			//编辑挂单信息