From 1689eae8aa7f412125a6727592a88345b090ccdc Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 27 Feb 2025 03:38:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supermarketerp/smErpCgBack/index.vue | 6 +-
.../supermarketerp/smErpRetailBack/index.vue | 22 ++---
.../smErpRetailDelivery/index.vue | 22 ++---
.../supermarketerp/supermarketSpu/form.vue | 94 +++++++++----------
.../supermarketerp/supermarketSpu/index.vue | 2 +-
5 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/src/views/supermarketerp/smErpCgBack/index.vue b/src/views/supermarketerp/smErpCgBack/index.vue
index cc24a7f..da7e4f2 100644
--- a/src/views/supermarketerp/smErpCgBack/index.vue
+++ b/src/views/supermarketerp/smErpCgBack/index.vue
@@ -18,11 +18,11 @@
-
+
查询
重置
@@ -75,7 +75,7 @@
-
+
diff --git a/src/views/supermarketerp/smErpRetailBack/index.vue b/src/views/supermarketerp/smErpRetailBack/index.vue
index b7fc6b2..84ac8df 100644
--- a/src/views/supermarketerp/smErpRetailBack/index.vue
+++ b/src/views/supermarketerp/smErpRetailBack/index.vue
@@ -18,11 +18,11 @@
-
-
-
-
-
+
+
+
+
+
查询
重置
@@ -75,12 +75,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/views/supermarketerp/smErpRetailDelivery/index.vue b/src/views/supermarketerp/smErpRetailDelivery/index.vue
index 238d269..ea9cfb2 100644
--- a/src/views/supermarketerp/smErpRetailDelivery/index.vue
+++ b/src/views/supermarketerp/smErpRetailDelivery/index.vue
@@ -18,11 +18,11 @@
-
-
-
-
-
+
+
+
+
+
查询
重置
@@ -75,12 +75,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index d4a0756..eee5b10 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -14,11 +14,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -58,43 +58,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -102,11 +102,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/views/supermarketerp/supermarketSpu/index.vue b/src/views/supermarketerp/supermarketSpu/index.vue
index be23bad..53d062b 100644
--- a/src/views/supermarketerp/supermarketSpu/index.vue
+++ b/src/views/supermarketerp/supermarketSpu/index.vue
@@ -61,7 +61,7 @@
-
+
From 5f7e424ce3322044ad37d77ade04df264390af0f Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 28 Feb 2025 22:07:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/biz/app/appuser/i18n/zh-cn.ts | 5 +++++
src/views/supermarketerp/smErpSupplier/index.vue | 12 +++++++++++-
src/views/supermarketerp/supermarketSpu/index.vue | 12 +++++++++++-
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/views/biz/app/appuser/i18n/zh-cn.ts b/src/views/biz/app/appuser/i18n/zh-cn.ts
index 78769eb..e9e2dbe 100644
--- a/src/views/biz/app/appuser/i18n/zh-cn.ts
+++ b/src/views/biz/app/appuser/i18n/zh-cn.ts
@@ -22,4 +22,9 @@ export default {
inputNickNameTip: '请输入昵称',
importUserTip: '导入用户',
},
+ supermarket: {
+ index: '#',
+ importSupplierTip: '导入货商',
+ importErpSpuTip: '导入库存商品',
+ }
};
diff --git a/src/views/supermarketerp/smErpSupplier/index.vue b/src/views/supermarketerp/smErpSupplier/index.vue
index eedfced..84c49e1 100644
--- a/src/views/supermarketerp/smErpSupplier/index.vue
+++ b/src/views/supermarketerp/smErpSupplier/index.vue
@@ -41,6 +41,9 @@
style="float: right"
@queryTable="getDataList"
>
+
+ {{ $t("common.importBtn") }}
+
+
+
@@ -118,7 +128,7 @@ const showSearch = ref(true);
const selectObjs = ref([]) as any;
const multiple = ref(true);
const supplierType = ref([]); // 货商类别
-
+const excelUploadRef = ref()
const state: BasicTableProps = reactive({
queryForm: {},
pageList: fetchList,
diff --git a/src/views/supermarketerp/supermarketSpu/index.vue b/src/views/supermarketerp/supermarketSpu/index.vue
index f5f1a3f..e1515e1 100644
--- a/src/views/supermarketerp/supermarketSpu/index.vue
+++ b/src/views/supermarketerp/supermarketSpu/index.vue
@@ -39,6 +39,7 @@
>
删 除
+
+
+ {{ $t("common.importBtn") }}
+
+
@@ -135,7 +145,7 @@ import { useDict } from "/@/hooks/dict"
// 引入组件
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
-
+const excelUploadRef = ref()
const { supermarket_nature, status } = useDict("supermarket_nature", "status")
const formDialogRef = ref() // 对话框ref引用
const queryRef = ref() // 搜索表单ref引用