From fe0fbbc0bc3f05515f99c1df671dd03323e355b7 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 23 Jan 2025 16:29:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/supermarketUnit/form.vue       |  2 +-
 .../components/supermarketUnit/index.vue      |  2 +-
 .../supermarketerp/supermarketSpu/form.vue    | 40 +++++++++++--------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/form.vue
index 5718064..a2d0e54 100644
--- a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/form.vue
@@ -101,7 +101,7 @@ const dataRules = ref({
 	spec: [{ required: true, message: "规格不能为空", trigger: "blur" }],
 	unit: [{ required: true, message: "单位不能为空", trigger: "blur" }],
 	status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
-	packageNum: [{ required: true, message: "内装数量不能为空", trigger: "blur" }],
+	packageNum: [{ required: true, message: "内装数不能为空", trigger: "blur" }],
 	// purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }],
 	retailPrice: [{ required: true, message: "零售价不能为空", trigger: "blur" }],
 	// promotionPrice: [{ required: true, message: '促销价不能为空', trigger: 'blur' }],
diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/index.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/index.vue
index 341346b..c5eb06e 100644
--- a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/index.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/index.vue
@@ -76,7 +76,7 @@
 						<el-tag v-if="scope.row.status == 1" type="danger">停销</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip />
+				<el-table-column prop="packageNum" label="内装数" show-overflow-tooltip />
 				<el-table-column prop="purchasePrice" label="进价(元)" show-overflow-tooltip />
 				<el-table-column prop="retailPrice" label="零售价(元)" show-overflow-tooltip />
 				<!-- <el-table-column prop="spuId" label="spuId" show-overflow-tooltip /> -->
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 467c2f6..1b4de2a 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -68,21 +68,32 @@
 							</el-form-item>
 						</el-col>
 
+<!--            <el-col :span="12" class="mb20">-->
+<!--              <el-form-item label="单位" prop="unit">-->
+<!--&lt;!&ndash;                <el-alert type="warning" show-icon>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <p>最小售卖的基本单位</p>&ndash;&gt;-->
+<!--&lt;!&ndash;                </el-alert>&ndash;&gt;-->
+<!--                <el-input placeholder="请输入单位" v-model.trim="form.unit" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="14" class="mb20">-->
+<!--              <el-form-item label="内装数" prop="packageNum">-->
+<!--&lt;!&ndash;                <el-alert type="warning" show-icon >&ndash;&gt;-->
+<!--&lt;!&ndash;                  <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。&ndash;&gt;-->
+<!--&lt;!&ndash;                    例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>&ndash;&gt;-->
+<!--&lt;!&ndash;                </el-alert>&ndash;&gt;-->
+<!--                <el-input-number v-model="form.packageNum" :min="0" :precision="0" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="14" class="mb20">
-              <el-form-item label="内装数" prop="packageNum">
-                <el-alert type="warning" show-icon :closable="false">
-                  <p>注：内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换，影响erp库存自动扣减操作。
-                    例如：一箱矿泉水内装填'24',是按整箱售卖，如果想拆开零售，再继续添加包装单位为瓶，内装为1</p>
+              <el-form-item label="总库存" prop="stock">
+                <el-alert type="warning" show-icon >
+                  <p>注：最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品，都会进行总库存-内装数，实现多种包装形式售卖</p>
                 </el-alert>
-                <el-input-number v-model="form.packageNum" :min="0" :precision="0" />
+                <el-input-number v-model="form.stock" :min="0" :precision="0" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="mb20">
-              <el-form-item label="单位" prop="unit">
-                <el-input placeholder="请输入单位" v-model.trim="form.unit" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" class="mb20">
+<!--            <el-col :span="12" class="mb20">
               <el-form-item label="零售价" prop="retailPrice">
                 <el-input-number v-model="form.retailPrice" :min="0" :precision="2" />
               </el-form-item>
@@ -103,12 +114,7 @@
               <el-form-item label="成本价" prop="costPrice">
                 <el-input-number v-model="form.costPrice" :min="0" :precision="2" />
               </el-form-item>
-            </el-col>
-            <el-col :span="12" class="mb20">
-              <el-form-item label="总库存" prop="stock">
-                <el-input-number v-model="form.stock" :min="0" :precision="0" />
-              </el-form-item>
-            </el-col>
+            </el-col>-->
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品状态" prop="status">
 								<el-radio-group v-model="form.status">