From 745815f637e5385b2cbc23a6ae02401bb8b6c675 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 08 三月 2025 14:22:36 +0800
Subject: [PATCH] 详情页面优化
---
src/views/components/ImportExcelModal.vue | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/views/components/ImportExcelModal.vue b/src/views/components/ImportExcelModal.vue
index 9dbcb5f..2a938da 100644
--- a/src/views/components/ImportExcelModal.vue
+++ b/src/views/components/ImportExcelModal.vue
@@ -40,6 +40,7 @@
// import { useLocale } from '/@/locales/useLocale';
import { BasicTable } from '/@/components/Table';
import { ImportExcel, ValidateTableImport } from '/@/api/tigerapi/system';
+ import { useUserStore } from '/@/store/modules/user';
const emit = defineEmits(['success', 'register', 'toExcel']);
const props = defineProps({
@@ -58,7 +59,7 @@
});
// const { getLocale } = useLocale();
const { t } = useI18n('');
- const { createMessage, createConfirm } = useMessage();
+ const { createMessage, createConfirm, createErrorModal } = useMessage();
const tmpHeader = ref([]);
const filename = ref('');
const entityName = ref('');
@@ -118,7 +119,7 @@
let dataSource = [] as any[];
results.map((item) => {
- let entity = {} as any;
+ let entity = { AUTH_ORG: useUserStore().userInfo?.orgCode.toString() } as any;
baseColumns.value.map((c) => {
entity[c['dataIndex']] = item[c['title']]; //c['dataIndex']=='BATCH_NO'?`${item[c['ORDER_NO']]}-01`: item[c['title']];
});
@@ -136,13 +137,34 @@
EntityJson: JSON.stringify(tableListRef.value[0].dataSource),
CheckJson: checkJson.value,
where: where.value,
- typeFullName: typeFullName.value
+ typeFullName: typeFullName.value,
});
if (res.IsSuccessed) {
tableListRef.value[0].dataSource = res.Data;
err.value = '';
} else {
- tableListRef.value = [];
+ tableListRef.value = [
+ {
+ title: '鍒楄〃淇℃伅',
+ columns: [
+ {
+ title: '瀛楁1',
+ dataIndex: 'field1',
+ width: 200,
+ sorter: true,
+ resizable: true,
+ },
+ {
+ title: '瀛楁2',
+ dataIndex: 'field2',
+ width: 200,
+ sorter: true,
+ resizable: true,
+ },
+ ],
+ dataSource: [],
+ },
+ ];
createMessage.error('瀵煎叆澶辫触' + res.Message);
err.value = res.Message;
}
@@ -171,7 +193,10 @@
title: () => h('span', t('瀵煎叆淇℃伅')),
content: () => h('span', t('纭鏈変慨鏀圭殑鏁版嵁鏄惁姝ｇ‘锛屾湁寮傚父鐨勬暟鎹棤娉曞鍏�')),
onOk: async () => {
- const apiAction = await ImportExcel(entityName.value, tableListRef.value[0]['dataSource'] as any[]);
+ const apiAction = await ImportExcel(entityName.value, {
+ EntityJson: JSON.stringify(tableListRef.value[0].dataSource),
+ typeFullName: typeFullName.value,
+ });
if (apiAction.IsSuccessed) {
closeModal();
createMessage.success(t('瀵煎叆鎴愬姛'));
@@ -179,6 +204,11 @@
isUpdate: unref(false),
values: { ...values, id: 0 },
});
+ } else {
+ createErrorModal({
+ title: t('sys.api.errorTip'),
+ content: apiAction.Message,
+ });
}
},
});
--
Gitblit v1.9.3