From 3a26de1e638383b62b32491c1e779a288f145a61 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 11 Aug 2025 18:02:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BA=93=E5=AD=98=E4=B8=8A=E9=99=90?=
 =?UTF-8?q?=E5=92=8C=E4=B8=8B=E9=99=90=E9=83=BD=E6=98=BE=E7=A4=BA=E7=B2=BE?=
 =?UTF-8?q?=E7=A1=AE=E5=88=B0=E5=B0=8F=E6=95=B0=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseManagement/smErpCgBack/form.vue           |  2 +-
 .../purchaseManagement/smErpCgInventory/form.vue      |  2 +-
 .../supermarketSpu/components/product-inventory.vue   | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
index fdc99ed..8a2c642 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
@@ -70,7 +70,7 @@
 				:edit-rules="validRules"
 				show-footer
 				:footer-data="[{ seq: '合计', totalAmount }]"
-				:merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 5 }]"
+				:merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 7 }]"
 				@checkbox-all=""
 				@checkbox-change=""
 				size="mini"
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index 586ab19..81b53dd 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -98,7 +98,7 @@
 				:edit-rules="validRules"
 				show-footer
 				:footer-data="[{ seq: '合计', totalAmount }]"
-				:merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 6 }]"
+				:merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 7 }]"
 				@checkbox-all=""
 				@checkbox-change=""
 				size="mini"
diff --git a/src/views/supermarketerp/supermarketSpu/components/product-inventory.vue b/src/views/supermarketerp/supermarketSpu/components/product-inventory.vue
index 9299bb8..c8b6133 100644
--- a/src/views/supermarketerp/supermarketSpu/components/product-inventory.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/product-inventory.vue
@@ -2,24 +2,27 @@
 	<el-row>
 		<el-col :span="8" class="mb20">
 			<el-form-item label="期初库存" prop="stock" class="flex w-full h-full">
-				<el-input-number v-model="stock" :min="0" :precision="0" />
+				<el-input-number v-model="stock" :min="0" :precision="2" />
 			</el-form-item>
 		</el-col>
 
 		<el-col :span="8" class="mb20">
 			<el-form-item label="库存上限" prop="inventoryUpperLimit">
-				<el-input-number v-model="inventoryUpperLimit" :min="0" :precision="0" />
+				<el-input-number v-model="inventoryUpperLimit" :min="0" :precision="2" />
 			</el-form-item>
 		</el-col>
 
 		<el-col :span="8" class="mb20">
 			<el-form-item label="库存下限" prop="inventoryLowerLimit">
-				<el-input-number v-model="inventoryLowerLimit" :min="0" :precision="0" />
+				<el-input-number v-model="inventoryLowerLimit" :min="0" :precision="2" />
 			</el-form-item>
 		</el-col>
 
 		<el-alert type="warning" show-icon :closable="false">
-			注：最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品，都会进行总库存-内装数，实现多种包装形式售卖
+			<span class="text-lg">
+				注：此处库存数应该填写最小售卖单位的总库存，否则无法换算成完整的库存扣减。每卖出一个包装形式的商品，都会进行总库存数 -
+				内装数，从而进行多种包装形式的售卖。
+			</span>
 		</el-alert>
 	</el-row>
 </template>