From e7eb50df3d18be440507d68230a55f4a71d2a156 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 3 Mar 2025 17:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=BB=84=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/Excel.vue               | 216 +++++++++---------
 src/hooks/table.ts                            |   1 +
 .../supermarketerp/supermarketSpu/form.vue    |   3 +-
 3 files changed, 115 insertions(+), 105 deletions(-)

diff --git a/src/components/Upload/Excel.vue b/src/components/Upload/Excel.vue
index ffc20da..eb7cb1e 100644
--- a/src/components/Upload/Excel.vue
+++ b/src/components/Upload/Excel.vue
@@ -1,155 +1,165 @@
 <!-- excel 导入组件 -->
 <template>
-  <el-dialog :title="prop.title" v-model="state.upload.open" :close-on-click-modal="false" draggable>
-    <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="headers"
-      :action="baseURL + other.adaptationUrl(url)" :disabled="state.upload.isUploading"
-      :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :on-error="handleFileError"
-      :auto-upload="false" drag>
-      <i class="el-icon-upload"></i>
-      <div class="el-upload__text">
-        {{ $t('excel.operationNotice') }}
-        <em>{{ $t('excel.clickUpload') }}</em>
-      </div>
-      <template #tip>
-        <div class="el-upload__tip text-center">
-          <span>{{ $t('excel.fileFormat') }}</span>
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-            @click="downExcelTemp" v-if="tempUrl">{{ $t('excel.downloadTemplate') }}
-          </el-link>
-        </div>
-      </template>
-    </el-upload>
-    <template #footer>
-      <el-button type="primary" @click="submitFileForm">{{ $t('common.confirmButtonText') }}</el-button>
-      <el-button @click="state.upload.open = false">{{ $t('common.cancelButtonText') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :title="prop.title" v-model="state.upload.open" :close-on-click-modal="false" draggable>
+		<el-upload
+			v-loading="state.upload.isUploading"
+			ref="uploadRef"
+			:limit="1"
+			accept=".xlsx, .xls"
+			:headers="headers"
+			:action="baseURL + other.adaptationUrl(url)"
+			:disabled="state.upload.isUploading"
+			:on-progress="handleFileUploadProgress"
+			:on-success="handleFileSuccess"
+			:on-error="handleFileError"
+			:auto-upload="false"
+			drag
+		>
+			<i class="el-icon-upload"></i>
+			<div class="el-upload__text">
+				{{ $t("excel.operationNotice") }}
+				<em>{{ $t("excel.clickUpload") }}</em>
+			</div>
+			<template #tip>
+				<div class="el-upload__tip text-center">
+					<span>{{ $t("excel.fileFormat") }}</span>
+					<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="downExcelTemp" v-if="tempUrl"
+						>{{ $t("excel.downloadTemplate") }}
+					</el-link>
+				</div>
+			</template>
+		</el-upload>
+		<template #footer>
+			<el-button type="primary" @click="submitFileForm" :disabled="state.upload.isUploading">
+				{{ $t("common.confirmButtonText") }}
+			</el-button>
+			<el-button @click="state.upload.open = false">{{ $t("common.cancelButtonText") }}</el-button>
+		</template>
+	</el-dialog>
 
-  <!--校验失败错误数据-->
-  <el-dialog :title="$t('excel.validationFailureData')" v-model="state.errorVisible">
-    <el-table :data="state.errorData">
-      <el-table-column property="lineNum" align="center" :label="$t('excel.lineNumbers')" width="100"></el-table-column>
-      <el-table-column property="errors" align="center" :label="$t('excel.misDescription')" show-overflow-tooltip>
-        <template v-slot="scope">
-          <el-tag type="danger" v-for="error in scope.row.errors" :key="error">{{ error }}</el-tag>
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-dialog>
+	<!--校验失败错误数据-->
+	<el-dialog :title="$t('excel.validationFailureData')" v-model="state.errorVisible" :close-on-click-modal="false" draggable>
+		<el-table :data="state.errorData">
+			<el-table-column property="row" align="center" :label="$t('excel.lineNumbers')" width="100" />
+			<el-table-column property="reasons" align="center" :label="$t('excel.misDescription')" show-overflow-tooltip>
+				<template v-slot="scope">
+					<el-tag type="danger" v-for="error in scope.row.reasons" :key="error">{{ error }}</el-tag>
+				</template>
+			</el-table-column>
+		</el-table>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="upload-excel">
-import { useMessage } from '/@/hooks/message';
-import other from '/@/utils/other';
-import { Session } from '/@/utils/storage';
+import { useMessage } from "/@/hooks/message"
+import other from "/@/utils/other"
+import { Session } from "/@/utils/storage"
 
-const emit = defineEmits(['sizeChange', 'refreshDataList']);
+const emit = defineEmits(["sizeChange", "refreshDataList"])
 const prop = defineProps({
-  url: {
-    type: String,
-  },
-  title: {
-    type: String,
-  },
-  tempUrl: {
-    type: String,
-  },
-});
+	url: {
+		type: String,
+	},
+	title: {
+		type: String,
+	},
+	tempUrl: {
+		type: String,
+	},
+})
 
-const uploadRef = ref();
+const uploadRef = ref()
 
 const state = reactive({
-  errorVisible: false,
-  errorData: [],
-  dialog: {
-    title: '',
-    isShowDialog: false,
-  },
-  upload: {
-    open: false,
-    isUploading: false,
-  },
-});
+	errorVisible: false,
+	errorData: [],
+	dialog: {
+		title: "",
+		isShowDialog: false,
+	},
+	upload: {
+		open: false,
+		isUploading: false,
+	},
+})
 
 /**
  * 下载模板文件
  */
 const downExcelTemp = async () => {
-  try {
-    await other.downBlobFile(other.adaptationUrl(prop.tempUrl), {}, 'temp.xlsx');
-  } catch (error) {
-    useMessage().error('模板下载失败，请先维护模板文件');
-  }
-};
+	try {
+		await other.downBlobFile(other.adaptationUrl(prop.tempUrl), {}, "temp.xlsx")
+	} catch (error) {
+		useMessage().error("模板下载失败，请先维护模板文件")
+	}
+}
 
 /**
  * 上传进度条变化事件
  */
 const handleFileUploadProgress = () => {
-  state.upload.isUploading = true;
-};
+	state.upload.isUploading = true
+}
 
 /**
  * 上传失败事件处理
  */
 const handleFileError = () => {
-  useMessage().error('上传失败,数据格式不合法!');
-  state.upload.open = false;
-};
+	useMessage().error("上传失败,数据格式不合法!")
+	state.upload.open = false
+}
 
 /**
  * 上传成功事件处理
  * @param {any} response - 上传成功的响应结果
  */
 const handleFileSuccess = (response: any) => {
-  state.upload.isUploading = false;
-  state.upload.open = false;
-  uploadRef.value.clearFiles();
+	state.upload.isUploading = false
+	state.upload.open = false
+	uploadRef.value.clearFiles()
 
-  // 校验失败
-  if (response.code === 1) {
-    useMessage().error('导入失败，以下数据不合法');
-    state.errorVisible = true;
-    state.errorData = response.data;
-    uploadRef.value.clearFiles();
-    // 刷新表格
-    emit?.('refreshDataList');
-  } else {
-    useMessage().success(response.msg ? response.msg : '导入成功');
-    // 刷新表格
-    emit?.('refreshDataList');
-  }
-};
+	// 校验失败
+	if (response.code === 1) {
+		useMessage().error(response.msg ? response.msg : "导入失败，以下数据不合法")
+		state.errorVisible = true
+		state.errorData = response.data?.errors
+		uploadRef.value.clearFiles()
+		// 刷新表格
+		emit?.("refreshDataList")
+	} else {
+		useMessage().success(response.msg ? response.msg : "导入成功")
+		// 刷新表格
+		emit?.("refreshDataList")
+	}
+}
 
 /**
  * 提交表单，触发上传
  */
 const submitFileForm = () => {
-  uploadRef.value.submit();
-};
+	uploadRef.value.submit()
+}
 
 /**
  * 显示上传文件对话框，并清除上传信息
  */
 const show = () => {
-  state.upload.isUploading = false;
-  state.upload.open = true;
-};
+	state.upload.isUploading = false
+	state.upload.open = true
+}
 
 /**
  * 计算请求头部信息
  */
 const headers = computed(() => {
-  return {
-    Authorization: 'Bearer ' + Session.getToken(),
-    'TENANT-ID': Session.getTenant(),
-  };
-});
+	return {
+		Authorization: "Bearer " + Session.getToken(),
+		"TENANT-ID": Session.getTenant(),
+	}
+})
 
 // 暴露变量
 defineExpose({
-  show,
-});
+	show,
+})
 </script>
-
-<style scoped></style>
diff --git a/src/hooks/table.ts b/src/hooks/table.ts
index cfc9f69..48d9f7c 100644
--- a/src/hooks/table.ts
+++ b/src/hooks/table.ts
@@ -219,6 +219,7 @@ export function useTable(options?: BasicTableProps) {
 	 * @returns 返回一个Promise对象，用于异步处理结果
 	 */
 	const downBlobFile = (url: string, query: any, fileName: string) => {
+		ElMessage.info("下载中，请稍后")
 		return other.downBlobFile(url, query, fileName)
 	}
 
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 98bb244..65ad2eb 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -145,7 +145,7 @@
 
 		<template #footer>
 			<el-button @click="visible = false">取消</el-button>
-			<el-button v-if="currentTabPaneIndex != 0" type="primary" @click="currentTabPaneIndex--">上一步</el-button>
+			<el-button v-if="currentTabPaneIndex != 0" type="primary" @click="currentTabPaneIndex--" :disabled="loading">上一步</el-button>
 			<el-button v-if="currentTabPaneIndex != 3" type="primary" @click="currentTabPaneIndex++">下一步</el-button>
 			<el-button v-if="currentTabPaneIndex == 3" type="primary" @click="onSubmit" :disabled="loading">确 认</el-button>
 		</template>
@@ -156,7 +156,6 @@
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
 import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
-import { getSupplierTypeSimpleAll } from "/@/api/supermarketerp/smErpSupplierType"
 import { rule } from "/@/utils/validate"
 import SupermarketUnit from "./components/supermarketUnit.vue"
 import supermarketInventory from "./components/supermarketInventory.vue"