From 776deb68198d3415dafa3e9e7f75f59b231a1609 Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Wed, 23 Jul 2025 14:34:48 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sc/purchase/order/add.vue                 | 2 ++
 src/views/sc/purchase/order/modify.vue              | 2 ++
 src/views/sc/purchase/receive/add-require.vue       | 2 +-
 src/views/sc/purchase/receive/add-un-require.vue    | 2 ++
 src/views/sc/purchase/receive/modify-require.vue    | 2 +-
 src/views/sc/purchase/receive/modify-un-require.vue | 2 ++
 src/views/sc/purchase/return/add-require.vue        | 2 +-
 src/views/sc/purchase/return/add-un-require.vue     | 2 ++
 src/views/sc/purchase/return/modify-require.vue     | 2 +-
 src/views/sc/purchase/return/modify-un-require.vue  | 2 ++
 src/views/sc/retail/out/add.vue                     | 2 ++
 src/views/sc/retail/out/modify.vue                  | 2 ++
 src/views/sc/retail/return/add-require.vue          | 2 +-
 src/views/sc/retail/return/add-un-require.vue       | 2 ++
 src/views/sc/retail/return/modify-require.vue       | 2 +-
 src/views/sc/retail/return/modify-un-require.vue    | 2 ++
 src/views/sc/sale/order/add.vue                     | 2 ++
 src/views/sc/sale/order/modify.vue                  | 2 ++
 src/views/sc/sale/out/add-require.vue               | 2 +-
 src/views/sc/sale/out/add-un-require.vue            | 2 ++
 src/views/sc/sale/out/modify-require.vue            | 2 +-
 src/views/sc/sale/out/modify-un-require.vue         | 2 ++
 src/views/sc/sale/return/add-require.vue            | 2 +-
 src/views/sc/sale/return/add-un-require.vue         | 2 ++
 src/views/sc/sale/return/modify-require.vue         | 2 +-
 src/views/sc/sale/return/modify-un-require.vue      | 2 ++
 src/views/sc/stock/adjust/stock/add.vue             | 2 +-
 src/views/sc/stock/adjust/stock/modify.vue          | 2 +-
 src/views/sc/stock/take/pre/add.vue                 | 2 +-
 src/views/sc/stock/take/pre/modify.vue              | 2 +-
 src/views/sc/stock/take/sheet/add.vue               | 2 +-
 src/views/sc/stock/take/sheet/modify.vue            | 2 +-
 src/views/sc/stock/transfer/add.vue                 | 2 +-
 src/views/sc/stock/transfer/modify.vue              | 2 +-
 34 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/views/sc/purchase/order/add.vue b/src/views/sc/purchase/order/add.vue
index 2a68ea7..3fa3142 100644
--- a/src/views/sc/purchase/order/add.vue
+++ b/src/views/sc/purchase/order/add.vue
@@ -57,6 +57,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -65,6 +66,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 采购价 列自定义内容 -->
diff --git a/src/views/sc/purchase/order/modify.vue b/src/views/sc/purchase/order/modify.vue
index 3f5bc1a..9820b00 100644
--- a/src/views/sc/purchase/order/modify.vue
+++ b/src/views/sc/purchase/order/modify.vue
@@ -102,6 +102,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -110,6 +111,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{row.productName}}</span>
         </template>
 
         <!-- 采购价 列自定义内容 -->
diff --git a/src/views/sc/purchase/receive/add-require.vue b/src/views/sc/purchase/receive/add-require.vue
index 428544f..a2eec1b 100644
--- a/src/views/sc/purchase/receive/add-require.vue
+++ b/src/views/sc/purchase/receive/add-require.vue
@@ -81,7 +81,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/purchase/receive/add-un-require.vue b/src/views/sc/purchase/receive/add-un-require.vue
index 1b97c0c..30916ee 100644
--- a/src/views/sc/purchase/receive/add-un-require.vue
+++ b/src/views/sc/purchase/receive/add-un-require.vue
@@ -74,6 +74,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -82,6 +83,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 采购价 列自定义内容 -->
diff --git a/src/views/sc/purchase/receive/modify-require.vue b/src/views/sc/purchase/receive/modify-require.vue
index c0ec32e..89542c8 100644
--- a/src/views/sc/purchase/receive/modify-require.vue
+++ b/src/views/sc/purchase/receive/modify-require.vue
@@ -128,7 +128,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/purchase/receive/modify-un-require.vue b/src/views/sc/purchase/receive/modify-un-require.vue
index a724cb6..ff357e1 100644
--- a/src/views/sc/purchase/receive/modify-un-require.vue
+++ b/src/views/sc/purchase/receive/modify-un-require.vue
@@ -116,6 +116,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -124,6 +125,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 采购价 列自定义内容 -->
diff --git a/src/views/sc/purchase/return/add-require.vue b/src/views/sc/purchase/return/add-require.vue
index a3ad143..024b4aa 100644
--- a/src/views/sc/purchase/return/add-require.vue
+++ b/src/views/sc/purchase/return/add-require.vue
@@ -67,7 +67,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/purchase/return/add-un-require.vue b/src/views/sc/purchase/return/add-un-require.vue
index e73a83d..ab2d8b9 100644
--- a/src/views/sc/purchase/return/add-un-require.vue
+++ b/src/views/sc/purchase/return/add-un-require.vue
@@ -65,6 +65,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -73,6 +74,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 退货价 列自定义内容 -->
diff --git a/src/views/sc/purchase/return/modify-require.vue b/src/views/sc/purchase/return/modify-require.vue
index 3bef741..1b82847 100644
--- a/src/views/sc/purchase/return/modify-require.vue
+++ b/src/views/sc/purchase/return/modify-require.vue
@@ -106,7 +106,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/purchase/return/modify-un-require.vue b/src/views/sc/purchase/return/modify-un-require.vue
index f10cf9a..a48ddd6 100644
--- a/src/views/sc/purchase/return/modify-un-require.vue
+++ b/src/views/sc/purchase/return/modify-un-require.vue
@@ -107,6 +107,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -115,6 +116,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 退货价 列自定义内容 -->
diff --git a/src/views/sc/retail/out/add.vue b/src/views/sc/retail/out/add.vue
index 04b2903..f8c69f9 100644
--- a/src/views/sc/retail/out/add.vue
+++ b/src/views/sc/retail/out/add.vue
@@ -57,6 +57,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -65,6 +66,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/retail/out/modify.vue b/src/views/sc/retail/out/modify.vue
index 3620e78..89eabce 100644
--- a/src/views/sc/retail/out/modify.vue
+++ b/src/views/sc/retail/out/modify.vue
@@ -105,6 +105,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -113,6 +114,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/retail/return/add-require.vue b/src/views/sc/retail/return/add-require.vue
index 2ac276c..cc6655d 100644
--- a/src/views/sc/retail/return/add-require.vue
+++ b/src/views/sc/retail/return/add-require.vue
@@ -65,7 +65,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/retail/return/add-un-require.vue b/src/views/sc/retail/return/add-un-require.vue
index 24ccd55..1f10a53 100644
--- a/src/views/sc/retail/return/add-un-require.vue
+++ b/src/views/sc/retail/return/add-un-require.vue
@@ -63,6 +63,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -71,6 +72,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/retail/return/modify-require.vue b/src/views/sc/retail/return/modify-require.vue
index 8484125..f7a110a 100644
--- a/src/views/sc/retail/return/modify-require.vue
+++ b/src/views/sc/retail/return/modify-require.vue
@@ -106,7 +106,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/retail/return/modify-un-require.vue b/src/views/sc/retail/return/modify-un-require.vue
index 727d994..c0aa04f 100644
--- a/src/views/sc/retail/return/modify-un-require.vue
+++ b/src/views/sc/retail/return/modify-un-require.vue
@@ -105,6 +105,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -113,6 +114,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/sale/order/add.vue b/src/views/sc/sale/order/add.vue
index 67ec124..9ece604 100644
--- a/src/views/sc/sale/order/add.vue
+++ b/src/views/sc/sale/order/add.vue
@@ -44,6 +44,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -52,6 +53,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/sale/order/modify.vue b/src/views/sc/sale/order/modify.vue
index 81cc5f7..04e2fe0 100644
--- a/src/views/sc/sale/order/modify.vue
+++ b/src/views/sc/sale/order/modify.vue
@@ -91,6 +91,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -99,6 +100,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/sale/out/add-require.vue b/src/views/sc/sale/out/add-require.vue
index 6c6cdeb..8f22157 100644
--- a/src/views/sc/sale/out/add-require.vue
+++ b/src/views/sc/sale/out/add-require.vue
@@ -67,7 +67,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/sale/out/add-un-require.vue b/src/views/sc/sale/out/add-un-require.vue
index 61a19c4..2514949 100644
--- a/src/views/sc/sale/out/add-un-require.vue
+++ b/src/views/sc/sale/out/add-un-require.vue
@@ -63,6 +63,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -71,6 +72,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/sale/out/modify-require.vue b/src/views/sc/sale/out/modify-require.vue
index 562e895..a9a979e 100644
--- a/src/views/sc/sale/out/modify-require.vue
+++ b/src/views/sc/sale/out/modify-require.vue
@@ -109,7 +109,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/sale/out/modify-un-require.vue b/src/views/sc/sale/out/modify-un-require.vue
index b69cf65..9e57848 100644
--- a/src/views/sc/sale/out/modify-un-require.vue
+++ b/src/views/sc/sale/out/modify-un-require.vue
@@ -105,6 +105,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -113,6 +114,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/sale/return/add-require.vue b/src/views/sc/sale/return/add-require.vue
index a4a86bd..8b309e5 100644
--- a/src/views/sc/sale/return/add-require.vue
+++ b/src/views/sc/sale/return/add-require.vue
@@ -64,7 +64,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/sale/return/add-un-require.vue b/src/views/sc/sale/return/add-un-require.vue
index ce93275..646d98a 100644
--- a/src/views/sc/sale/return/add-un-require.vue
+++ b/src/views/sc/sale/return/add-un-require.vue
@@ -63,6 +63,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -71,6 +72,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/sale/return/modify-require.vue b/src/views/sc/sale/return/modify-require.vue
index 196fb06..3eabc42 100644
--- a/src/views/sc/sale/return/modify-require.vue
+++ b/src/views/sc/sale/return/modify-require.vue
@@ -106,7 +106,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/sale/return/modify-un-require.vue b/src/views/sc/sale/return/modify-un-require.vue
index ef0960f..35eef6e 100644
--- a/src/views/sc/sale/return/modify-un-require.vue
+++ b/src/views/sc/sale/return/modify-un-require.vue
@@ -105,6 +105,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
+            v-if="$utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
@@ -113,6 +114,7 @@
             @search="(e) => queryProduct(e, row)"
             @select="(e) => handleSelectProduct(rowIndex, e, row)"
           />
+          <span v-else>{{ row.productName }}</span>
         </template>
 
         <!-- 折扣 列自定义内容 -->
diff --git a/src/views/sc/stock/adjust/stock/add.vue b/src/views/sc/stock/adjust/stock/add.vue
index 67428a0..f07c727 100644
--- a/src/views/sc/stock/adjust/stock/add.vue
+++ b/src/views/sc/stock/adjust/stock/add.vue
@@ -65,7 +65,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/stock/adjust/stock/modify.vue b/src/views/sc/stock/adjust/stock/modify.vue
index 98b8cff..35a3bf4 100644
--- a/src/views/sc/stock/adjust/stock/modify.vue
+++ b/src/views/sc/stock/adjust/stock/modify.vue
@@ -114,7 +114,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/stock/take/pre/add.vue b/src/views/sc/stock/take/pre/add.vue
index 2a7bdb0..d42ae05 100644
--- a/src/views/sc/stock/take/pre/add.vue
+++ b/src/views/sc/stock/take/pre/add.vue
@@ -64,7 +64,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/stock/take/pre/modify.vue b/src/views/sc/stock/take/pre/modify.vue
index acf5cd6..574fd7e 100644
--- a/src/views/sc/stock/take/pre/modify.vue
+++ b/src/views/sc/stock/take/pre/modify.vue
@@ -60,7 +60,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/stock/take/sheet/add.vue b/src/views/sc/stock/take/sheet/add.vue
index dacc8b9..d4c90cd 100644
--- a/src/views/sc/stock/take/sheet/add.vue
+++ b/src/views/sc/stock/take/sheet/add.vue
@@ -68,7 +68,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/stock/take/sheet/modify.vue b/src/views/sc/stock/take/sheet/modify.vue
index 50feb66..af4e3d8 100644
--- a/src/views/sc/stock/take/sheet/modify.vue
+++ b/src/views/sc/stock/take/sheet/modify.vue
@@ -115,7 +115,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/stock/transfer/add.vue b/src/views/sc/stock/transfer/add.vue
index 6e58338..3c7bb99 100644
--- a/src/views/sc/stock/transfer/add.vue
+++ b/src/views/sc/stock/transfer/add.vue
@@ -46,7 +46,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
diff --git a/src/views/sc/stock/transfer/modify.vue b/src/views/sc/stock/transfer/modify.vue
index 5721283..fc8973e 100644
--- a/src/views/sc/stock/transfer/modify.vue
+++ b/src/views/sc/stock/transfer/modify.vue
@@ -94,7 +94,7 @@
         <!-- 商品名称 列自定义内容 -->
         <template #productName_default="{ row, rowIndex }">
           <a-auto-complete
-            v-if="!row.isFixed"
+            v-if="!row.isFixed && $utils.isEmpty(row.productId)"
             v-model:value="row.productName"
             style="width: 100%"
             placeholder=""
-- 
Gitee


From 97df600e5925152410591bac0f4e7c4a73775868 Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Wed, 23 Jul 2025 14:41:11 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix=20=E6=94=B6=E8=B4=A7=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88=E4=B8=8B=E8=BD=BD=E7=9A=84?=
 =?UTF-8?q?api=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Importor/src/ReceiveSheetImporter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Importor/src/ReceiveSheetImporter.vue b/src/components/Importor/src/ReceiveSheetImporter.vue
index 22703c0..ecb89d9 100644
--- a/src/components/Importor/src/ReceiveSheetImporter.vue
+++ b/src/components/Importor/src/ReceiveSheetImporter.vue
@@ -27,7 +27,7 @@
         this.$refs.importer.openDialog();
       },
       downloadTemplate() {
-        return api.downloadImportPayTypeTemplate();
+        return api.downloadImportTemplate();
       },
       upload(params) {
         return api.importExcel(params);
-- 
Gitee


From 784c48c24c57dbda4cbe942f4b0c1a6af9c66700 Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Sun, 27 Jul 2025 19:11:14 +0800
Subject: [PATCH 03/10] =?UTF-8?q?fix=20=E6=8F=90=E7=A4=BA=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sc/retail/return/index.vue        |  4 ++--
 src/views/sc/sale/order/add.vue             |  2 +-
 src/views/sc/sale/order/index.vue           | 16 ++++++++--------
 src/views/sc/sale/order/modify.vue          |  2 +-
 src/views/sc/sale/out/index.vue             |  2 +-
 src/views/sc/sale/out/modify-un-require.vue |  1 -
 src/views/sc/sale/return/index.vue          |  4 ++--
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/views/sc/retail/return/index.vue b/src/views/sc/retail/return/index.vue
index ce3b067..0db7b1d 100644
--- a/src/views/sc/retail/return/index.vue
+++ b/src/views/sc/retail/return/index.vue
@@ -174,7 +174,7 @@
 
       <approve-refuse ref="approveRefuseDialog" @confirm="doApproveRefuse" />
 
-      <!-- 采购收货查看窗口 -->
+      <!-- 零售出库单查看窗口 -->
       <out-sheet-detail :id="outSheetId" ref="viewOutSheetDetailDialog" />
 
       <!-- 批量操作 -->
@@ -448,7 +448,7 @@
 
         for (let i = 0; i < records.length; i++) {
           if (this.$enums.RETAIL_RETURN_STATUS.APPROVE_PASS.equalsCode(records[i].status)) {
-            this.$msg.createError('第' + (i + 1) + '个采购单已审核通过，不允许继续执行审核！');
+            this.$msg.createError('第' + (i + 1) + '个零售退货单已审核通过，不允许继续执行审核！');
             return;
           }
         }
diff --git a/src/views/sc/sale/order/add.vue b/src/views/sc/sale/order/add.vue
index 9ece604..6aa140d 100644
--- a/src/views/sc/sale/order/add.vue
+++ b/src/views/sc/sale/order/add.vue
@@ -467,7 +467,7 @@
 
         for (let i = 0; i < records.length; i++) {
           if (records[i].isGift) {
-            this.$msg.createError('第' + (i + 1) + '行商品为赠品，不允许录入采购价！');
+            this.$msg.createError('第' + (i + 1) + '行商品为赠品，不允许录入销售价！');
             return;
           }
         }
diff --git a/src/views/sc/sale/order/index.vue b/src/views/sc/sale/order/index.vue
index 9338de9..bdd8e56 100644
--- a/src/views/sc/sale/order/index.vue
+++ b/src/views/sc/sale/order/index.vue
@@ -319,7 +319,7 @@
       },
       // 删除订单
       deleteOrder(row) {
-        this.$msg.createConfirm('对选中的采购单据执行删除操作？').then(() => {
+        this.$msg.createConfirm('对选中的销售单据执行删除操作？').then(() => {
           this.loading = true;
           api
             .deleteById(row.id)
@@ -339,13 +339,13 @@
       batchDelete() {
         const records = this.$refs.grid.getCheckboxRecords();
         if (this.$utils.isEmpty(records)) {
-          this.$msg.createError('请选择要执行操作的采购单据！');
+          this.$msg.createError('请选择要执行操作的销售单据！');
           return;
         }
 
         for (let i = 0; i < records.length; i++) {
           if (this.$enums.SALE_ORDER_STATUS.APPROVE_PASS.equalsCode(records[i].status)) {
-            this.$msg.createError('第' + (i + 1) + '个采购单据已审核通过，不允许执行删除操作！');
+            this.$msg.createError('第' + (i + 1) + '个销售单据已审核通过，不允许执行删除操作！');
             return;
           }
         }
@@ -363,13 +363,13 @@
       batchApprovePass() {
         const records = this.$refs.grid.getCheckboxRecords();
         if (this.$utils.isEmpty(records)) {
-          this.$msg.createError('请选择要执行操作的采购单据！');
+          this.$msg.createError('请选择要执行操作的销售单据！');
           return;
         }
 
         for (let i = 0; i < records.length; i++) {
           if (this.$enums.SALE_ORDER_STATUS.APPROVE_PASS.equalsCode(records[i].status)) {
-            this.$msg.createError('第' + (i + 1) + '个采购单已审核通过，不允许继续执行审核！');
+            this.$msg.createError('第' + (i + 1) + '个销售单已审核通过，不允许继续执行审核！');
             return;
           }
         }
@@ -382,18 +382,18 @@
       batchApproveRefuse() {
         const records = this.$refs.grid.getCheckboxRecords();
         if (this.$utils.isEmpty(records)) {
-          this.$msg.createError('请选择要执行操作的采购单据！');
+          this.$msg.createError('请选择要执行操作的销售单据！');
           return;
         }
 
         for (let i = 0; i < records.length; i++) {
           if (this.$enums.SALE_ORDER_STATUS.APPROVE_PASS.equalsCode(records[i].status)) {
-            this.$msg.createError('第' + (i + 1) + '个采购单据已审核通过，不允许继续执行审核！');
+            this.$msg.createError('第' + (i + 1) + '个销售单据已审核通过，不允许继续执行审核！');
             return;
           }
 
           if (this.$enums.SALE_ORDER_STATUS.APPROVE_REFUSE.equalsCode(records[i].status)) {
-            this.$msg.createError('第' + (i + 1) + '个采购单据已审核拒绝，不允许继续执行审核！');
+            this.$msg.createError('第' + (i + 1) + '个销售单据已审核拒绝，不允许继续执行审核！');
             return;
           }
         }
diff --git a/src/views/sc/sale/order/modify.vue b/src/views/sc/sale/order/modify.vue
index 04e2fe0..a6a06f1 100644
--- a/src/views/sc/sale/order/modify.vue
+++ b/src/views/sc/sale/order/modify.vue
@@ -550,7 +550,7 @@
 
         for (let i = 0; i < records.length; i++) {
           if (records[i].isGift) {
-            this.$msg.createError('第' + (i + 1) + '行商品为赠品，不允许录入采购价！');
+            this.$msg.createError('第' + (i + 1) + '行商品为赠品，不允许录入销售价！');
             return;
           }
         }
diff --git a/src/views/sc/sale/out/index.vue b/src/views/sc/sale/out/index.vue
index 66af5f2..59881e8 100644
--- a/src/views/sc/sale/out/index.vue
+++ b/src/views/sc/sale/out/index.vue
@@ -450,7 +450,7 @@
 
         for (let i = 0; i < records.length; i++) {
           if (this.$enums.SALE_OUT_SHEET_STATUS.APPROVE_PASS.equalsCode(records[i].status)) {
-            this.$msg.createError('第' + (i + 1) + '个采购单已审核通过，不允许继续执行审核！');
+            this.$msg.createError('第' + (i + 1) + '个销售出库单已审核通过，不允许继续执行审核！');
             return;
           }
         }
diff --git a/src/views/sc/sale/out/modify-un-require.vue b/src/views/sc/sale/out/modify-un-require.vue
index 9e57848..efd2f3c 100644
--- a/src/views/sc/sale/out/modify-un-require.vue
+++ b/src/views/sc/sale/out/modify-un-require.vue
@@ -565,7 +565,6 @@
             });
           });
       },
-      // 批量录入采购价
       batchInputTaxPrice() {
         const records = this.$refs.grid.getCheckboxRecords();
         if (this.$utils.isEmpty(records)) {
diff --git a/src/views/sc/sale/return/index.vue b/src/views/sc/sale/return/index.vue
index 1d16f9f..5e4128b 100644
--- a/src/views/sc/sale/return/index.vue
+++ b/src/views/sc/sale/return/index.vue
@@ -174,7 +174,7 @@
 
       <approve-refuse ref="approveRefuseDialog" @confirm="doApproveRefuse" />
 
-      <!-- 采购收货查看窗口 -->
+      <!-- 销售出库单查看窗口 -->
       <out-sheet-detail :id="outSheetId" ref="viewOutSheetDetailDialog" />
 
       <!-- 批量操作 -->
@@ -448,7 +448,7 @@
 
         for (let i = 0; i < records.length; i++) {
           if (this.$enums.SALE_RETURN_STATUS.APPROVE_PASS.equalsCode(records[i].status)) {
-            this.$msg.createError('第' + (i + 1) + '个采购单已审核通过，不允许继续执行审核！');
+            this.$msg.createError('第' + (i + 1) + '个销售退货单已审核通过，不允许继续执行审核！');
             return;
           }
         }
-- 
Gitee


From a01e1a47adeb1d64289330eed220ea100e90ecba Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Sun, 10 Aug 2025 13:42:31 +0800
Subject: [PATCH 04/10] =?UTF-8?q?fix=20=E5=9B=BE=E7=89=87=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=A0=B7=E5=BC=8F=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/design/ant/index.less | 84 ++++++++++++++++++---------------------
 src/design/index.less     |  1 +
 2 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/src/design/ant/index.less b/src/design/ant/index.less
index d508217..c6c1c7f 100644
--- a/src/design/ant/index.less
+++ b/src/design/ant/index.less
@@ -1,63 +1,55 @@
-@import './pagination.less';
-@import './input.less';
-@import './btn.less';
 
-.ant-image-preview-root {
-  img {
-    display: unset;
-  }
-}
-
-.ant-back-top {
-  right: 20px;
-  bottom: 20px;
-}
-
-.collapse-container__body {
-  > .ant-descriptions {
-    margin-left: 6px;
-  }
+.ant-image-preview-operations-wrapper {
+  position: fixed;
+  inset-block-start: 0;
+  inset-inline-end: 0;
+  z-index: 1081;
+  width: 100%;
 }
 
 .ant-image-preview-operations {
-  background-color: rgb(0 0 0 / 30%);
-}
-
-.ant-popover {
-  &-content {
-    box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-  }
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  color: rgb(255, 255, 255);
+  font-size: 12px;
+  line-height: 1.6666666666666667;
+  list-style: none;
+  font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,'Noto Sans',sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol','Noto Color Emoji';
+  display: flex !important;
+  flex-direction: row-reverse;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.1);
+  pointer-events: auto;
 }
 
-// =================================
-// ==============modal message======
-// =================================
-.modal-icon-warning {
-  color: @warning-color !important;
+.ant-image-preview-operations-operation {
+  margin-inline-start: 8px;
+  padding: 8px;
+  cursor: pointer;
+  transition: all 0.3s;
+  user-select: none;
 }
 
-.modal-icon-success {
-  color: @success-color !important;
+.ant-image-preview-operations-operation:hover {
+  background: rgba(0, 0, 0, 0.2);
 }
 
-.modal-icon-error {
-  color: @error-color !important;
+.ant-image-preview-operations-operation-disabled {
+  color: rgba(255, 255, 255, 0.25);
+  pointer-events: none;
 }
 
-.modal-icon-info {
-  color: @primary-color !important;
+.ant-image-preview-operations-operation:last-of-type {
+  margin-inline-start: 0;
 }
 
-.ant-checkbox-checked .ant-checkbox-inner::after,
-.ant-tree-checkbox-checked .ant-tree-checkbox-inner::after {
-  border-top: 0 !important;
-  border-left: 0 !important;
+.ant-image-preview-operations-progress {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
 }
 
-.ant-form-item-control-input-content {
-  > div {
-    > div {
-      max-width: 100%;
-    }
-  }
+.ant-image-preview-operations-icon {
+  font-size: 15px;
 }
diff --git a/src/design/index.less b/src/design/index.less
index 5302825..ca4d225 100644
--- a/src/design/index.less
+++ b/src/design/index.less
@@ -1,6 +1,7 @@
 @import 'transition/index.less';
 @import 'var/index.less';
 @import 'public.less';
+@import 'ant/index.less';
 @import './theme.less';
 @import './entry.css';
 @import './dark.less';
-- 
Gitee


From b52dcdea3fcae2be9da9daa3d3b68b984bed4b71 Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Sun, 10 Aug 2025 13:47:51 +0800
Subject: [PATCH 05/10] =?UTF-8?q?fix=20=E5=9B=BE=E7=89=87=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=A0=B7=E5=BC=8F=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/design/ant/index.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/design/ant/index.less b/src/design/ant/index.less
index c6c1c7f..8fbec82 100644
--- a/src/design/ant/index.less
+++ b/src/design/ant/index.less
@@ -16,7 +16,7 @@
   line-height: 1.6666666666666667;
   list-style: none;
   font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,'Noto Sans',sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol','Noto Color Emoji';
-  display: flex !important;
+  display: flex;
   flex-direction: row-reverse;
   align-items: center;
   background: rgba(0, 0, 0, 0.1);
-- 
Gitee


From 498a9419f3a85cb1c556fda3af1e14ec3a6e6077 Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Sun, 10 Aug 2025 23:01:22 +0800
Subject: [PATCH 06/10] =?UTF-8?q?fix=20=E6=B2=A1=E6=9C=89=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BB=BB=E5=8A=A1=E6=97=B6=E4=BC=9A=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/header/components/export-center/index.vue    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/layouts/default/header/components/export-center/index.vue b/src/layouts/default/header/components/export-center/index.vue
index 8121269..ce8849c 100644
--- a/src/layouts/default/header/components/export-center/index.vue
+++ b/src/layouts/default/header/components/export-center/index.vue
@@ -88,7 +88,7 @@
   import { useDesign } from '@/hooks/web/useDesign';
   import eventBus from '@/events/eventBus';
   import * as api from '@/api/export-task';
-  import { uuid } from '@/utils/utils';
+  import { uuid, isEmpty } from '@/utils/utils';
   import { ExportingExportTaskBo } from '@/api/export-task/model/exportingExportTaskBo';
   import projectSetting from '@/settings/projectSetting';
   import SuccessList from './SuccessList.vue';
@@ -137,6 +137,13 @@
       eventBusOff.value.push(eventBus.$on(eventBus.$pullEvent.EXPORT_TASK, onExportTaskSummary));
 
       function onExportTaskSummary(e) {
+        if (isEmpty(e)) {
+          e = {
+            unFinishedCount: 0,
+            successCount: 0,
+            failCount: 0,
+          };
+        }
         const { unFinishedCount, successCount, failCount } = e;
         unFinishedSummary.value = unFinishedCount;
         successSummary.value = successCount;
-- 
Gitee


From 4d6a76ffe26ea711968fee69bc4f03a549836cbe Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Wed, 13 Aug 2025 20:40:34 +0800
Subject: [PATCH 07/10] =?UTF-8?q?fix=20=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=84=E4=BB=B6=E5=9B=BE=E6=A0=87=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JImgUpload/src/JImgUpload.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/JImgUpload/src/JImgUpload.vue b/src/components/JImgUpload/src/JImgUpload.vue
index fe547b9..ac099f5 100644
--- a/src/components/JImgUpload/src/JImgUpload.vue
+++ b/src/components/JImgUpload/src/JImgUpload.vue
@@ -13,7 +13,8 @@
       @change="handleChange"
     >
       <div v-if="fileList.length < 1">
-        <a-icon style="font-size: 30px; color: #999" :type="loading ? 'loading' : 'picture'" />
+        <LoadingOutlined :style="{ fontSize: '30px' }" v-if="loading" />
+        <PictureOutlined :style="{ fontSize: '30px' }" v-else />
         <div style="margin-top: 8px; color: #666"> 上传图片 </div>
       </div>
     </a-upload>
@@ -27,12 +28,15 @@
   import { defHttp } from '@/utils/http/axios';
   import * as api from '@/api/components';
   import { ContentTypeEnum } from '@/enums/httpEnum';
+  import { LoadingOutlined, PictureOutlined } from '@ant-design/icons-vue';
 
   export default defineComponent({
     name: 'JImgUpload',
-
     componentName: 'JImgUpload',
-
+    components: {
+      LoadingOutlined,
+      PictureOutlined,
+    },
     props: {
       value: {
         type: String,
-- 
Gitee


From acb6d3bd78ad829a017b6941121c763a76c03547 Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Wed, 20 Aug 2025 14:27:44 +0800
Subject: [PATCH 08/10] =?UTF-8?q?fix=20=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base-data/product/info/add.vue    | 2 +-
 src/views/base-data/product/info/modify.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/base-data/product/info/add.vue b/src/views/base-data/product/info/add.vue
index ddbf2e3..6b5e1b2 100644
--- a/src/views/base-data/product/info/add.vue
+++ b/src/views/base-data/product/info/add.vue
@@ -624,7 +624,7 @@
             .filter((item) => item.isRequired)
             .every((item) => {
               if (that.$utils.isEmpty(item.text)) {
-                that.$msg.error(item.name + '不能为空！');
+                that.$msg.createError(item.name + '不能为空！');
                 valid = false;
                 return false;
               }
diff --git a/src/views/base-data/product/info/modify.vue b/src/views/base-data/product/info/modify.vue
index cd90ddd..ef13b09 100644
--- a/src/views/base-data/product/info/modify.vue
+++ b/src/views/base-data/product/info/modify.vue
@@ -606,7 +606,7 @@
             .filter((item) => item.isRequired)
             .every((item) => {
               if (that.$utils.isEmpty(item.text)) {
-                that.$msg.error(item.name + '不能为空！');
+                that.$msg.createError(item.name + '不能为空！');
                 valid = false;
                 return false;
               }
-- 
Gitee


From 95c4c943688776444e7790cbb81da24d794bd835 Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Wed, 27 Aug 2025 21:21:43 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix=20form=E5=A2=9E=E5=8A=A0colon?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JForm/src/JForm.vue         | 4 ++++
 src/components/JFormItem/src/JFormItem.vue | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/JForm/src/JForm.vue b/src/components/JForm/src/JForm.vue
index f1264fc..6a98934 100644
--- a/src/components/JForm/src/JForm.vue
+++ b/src/components/JForm/src/JForm.vue
@@ -59,6 +59,10 @@
         type: Boolean,
         default: true,
       },
+      colon: {
+        type: Boolean,
+        default: true,
+      },
     },
     setup() {
       const collapseStatus = ref(false);
diff --git a/src/components/JFormItem/src/JFormItem.vue b/src/components/JFormItem/src/JFormItem.vue
index f9aeeef..a07db99 100644
--- a/src/components/JFormItem/src/JFormItem.vue
+++ b/src/components/JFormItem/src/JFormItem.vue
@@ -11,7 +11,7 @@
           <span v-if="_required" class="j-form-item-required"></span>
           <slot name="label"></slot>
           <span v-if="!$slots.label">{{ label }}</span>
-          <span>{{ '：' }}</span>
+          <span v-if="_colon">{{ '：' }}</span>
         </div>
       </div>
       <div class="j-form-item-content" :class="_bordered ? 'j-form-item-content-border' : ''">
@@ -153,6 +153,9 @@
       _contentNest() {
         return this.contentNest && (this.form?.contentNest ?? this.contentNest);
       },
+      _colon() {
+        return this.colon && (this.form?.colon ?? this.colon);
+      },
     },
   });
 </script>
-- 
Gitee


From 7072bce69561e84b1dc8b74ca93d035399b85ab1 Mon Sep 17 00:00:00 2001
From: lframework <lframework@163.com>
Date: Sat, 30 Aug 2025 00:11:33 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E5=92=8C=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sc/stock/warning/index.ts             | 44 ++++++++++++--
 .../Importor/src/StockWarningImporter.vue     | 39 +++++++++++++
 src/views/sc/stock/warning/index.vue          | 57 ++++++++++++++++++-
 3 files changed, 134 insertions(+), 6 deletions(-)
 create mode 100644 src/components/Importor/src/StockWarningImporter.vue

diff --git a/src/api/sc/stock/warning/index.ts b/src/api/sc/stock/warning/index.ts
index 498af04..b512911 100644
--- a/src/api/sc/stock/warning/index.ts
+++ b/src/api/sc/stock/warning/index.ts
@@ -1,5 +1,5 @@
 import { defHttp } from '/@/utils/http/axios';
-import { ContentTypeEnum } from '@/enums/httpEnum';
+import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum';
 import { PageResult } from '@/api/model/pageResult';
 import { QueryProductStockWarningBo } from '@/api/sc/stock/warning/model/queryProductStockWarningBo';
 import { QueryProductStockWarningVo } from '@/api/sc/stock/warning/model/queryProductStockWarningVo';
@@ -98,15 +98,18 @@ export function deleteById(id: string): Promise<void> {
 /**
  * 批量删除
  */
-export function deleteByIds(ids: string[]): Promise<void> {
+export function batchDelete(id: string): Promise<void> {
   return defHttp.delete<void>(
     {
-      url: baseUrl + '/batch',
-      data: ids,
+      url: baseUrl,
+      data: {
+        id,
+      },
     },
     {
+      errorMessageMode: 'none',
       region,
-      contentType: ContentTypeEnum.JSON,
+      contentType: ContentTypeEnum.FORM_URLENCODED,
     },
   );
 }
@@ -162,3 +165,34 @@ export function deleteSetting(id: string): Promise<void> {
     },
   );
 }
+
+/**
+ * 下载导入模板
+ */
+export function downloadImportTemplate(): Promise<void> {
+  return defHttp.get<void>(
+    {
+      url: baseUrl + '/import/template',
+    },
+    {
+      responseType: ResponseEnum.BLOB,
+      region,
+    },
+  );
+}
+
+/**
+ * 导入
+ */
+export function importExcel(data: { id: string; file: Blob }): Promise<void> {
+  return defHttp.post<void>(
+    {
+      url: baseUrl + '/import',
+      data,
+    },
+    {
+      contentType: ContentTypeEnum.BLOB,
+      region,
+    },
+  );
+}
diff --git a/src/components/Importor/src/StockWarningImporter.vue b/src/components/Importor/src/StockWarningImporter.vue
new file mode 100644
index 0000000..de43f66
--- /dev/null
+++ b/src/components/Importor/src/StockWarningImporter.vue
@@ -0,0 +1,39 @@
+<template>
+  <div>
+    <excel-importer
+      ref="importer"
+      :tip-msg="'导入支持新增、修改库存预警信息。'"
+      :download-template-url="downloadTemplate"
+      :upload-url="upload"
+      @confirm="(e) => $emit('confirm', e)"
+    />
+  </div>
+</template>
+
+<script>
+  import { defineComponent } from 'vue';
+  import ExcelImporter from '@/components/ExcelImporter';
+  import * as api from '@/api/sc/stock/warning';
+
+  export default defineComponent({
+    name: 'StockWarningImporter',
+    components: { ExcelImporter },
+    data() {
+      return {};
+    },
+    computed: {},
+    methods: {
+      openDialog() {
+        this.$refs.importer.openDialog();
+      },
+      downloadTemplate() {
+        return api.downloadImportTemplate();
+      },
+      upload(params) {
+        return api.importExcel(params);
+      },
+    },
+  });
+</script>
+
+<style lang="less"></style>
diff --git a/src/views/sc/stock/warning/index.vue b/src/views/sc/stock/warning/index.vue
index ee121d0..12a0bc5 100644
--- a/src/views/sc/stock/warning/index.vue
+++ b/src/views/sc/stock/warning/index.vue
@@ -73,6 +73,19 @@
                 v-permission="['stock:warning:notify']"
                 >设置消息通知组</a-button
               >
+              <a-button
+                v-permission="['stock:warning:import']"
+                :icon="h(CloudUploadOutlined)"
+                @click="$refs.importer.openDialog()"
+                >导入Excel</a-button
+              >
+              <a-button
+                v-permission="['stock:warning:delete']"
+                danger
+                :icon="h(DeleteOutlined)"
+                @click="batchDelete"
+                >批量删除</a-button
+              >
             </a-space>
           </template>
 
@@ -95,6 +108,24 @@
     <modify :id="id" ref="updateDialog" @confirm="search" />
 
     <notify ref="notifyDialog" />
+
+    <stock-warning-importer ref="importer" @confirm="search" />
+
+    <batch-handler
+      ref="batchDeleteHandlerDialog"
+      :table-column="[
+        { field: 'scCode', title: '仓库编号', width: 100, sortable: true },
+        { field: 'scName', title: '仓库名称', width: 140 },
+        { field: 'productCode', title: '商品编号', width: 100, sortable: true },
+        { field: 'productName', title: '商品名称', width: 140 },
+        { field: 'maxLimit', title: '预警上限', width: 100, sortable: true, align: 'right' },
+        { field: 'minLimit', title: '预警下限', width: 100, sortable: true, align: 'right' },
+      ]"
+      title="批量删除"
+      :tableData="batchHandleDatas"
+      :handle-fn="doBatchDelete"
+      @confirm="search"
+    />
   </div>
 </template>
 
@@ -104,7 +135,13 @@
   import Modify from './modify.vue';
   import Notify from './notify.vue';
   import * as api from '@/api/sc/stock/warning';
-  import { SearchOutlined, PlusOutlined, SettingOutlined } from '@ant-design/icons-vue';
+  import {
+    SearchOutlined,
+    PlusOutlined,
+    SettingOutlined,
+    CloudUploadOutlined,
+    DeleteOutlined,
+  } from '@ant-design/icons-vue';
   import StoreCenterSelector from '@/components/Selector/src/StoreCenterSelector.vue';
 
   export default defineComponent({
@@ -121,6 +158,8 @@
         SearchOutlined,
         PlusOutlined,
         SettingOutlined,
+        CloudUploadOutlined,
+        DeleteOutlined,
       };
     },
     data() {
@@ -172,6 +211,7 @@
             },
           },
         },
+        batchHandleDatas: [],
       };
     },
     created() {},
@@ -227,6 +267,21 @@
           },
         ];
       },
+      // 批量删除
+      batchDelete() {
+        const records = this.$refs.grid.getCheckboxRecords();
+        if (this.$utils.isEmpty(records)) {
+          this.$msg.createError('请选择要删除的库存预警信息！');
+          return;
+        }
+
+        this.batchHandleDatas = records;
+
+        this.$refs.batchDeleteHandlerDialog.openDialog();
+      },
+      doBatchDelete(row) {
+        return api.batchDelete(row.id);
+      },
     },
   });
 </script>
-- 
Gitee