From 228dd136d88ee8cd067d6317d51b9fa019683567 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Sat, 13 Dec 2025 22:34:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E8=AD=A6=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/biz/entity/BizDataReportUser.java | 4 +- .../packages/biz/api/biz/dataReportUser.ts | 2 +- .../biz/views/biz/dataReport/index.vue | 4 - .../biz/views/biz/dataReport/user/form.vue | 2 +- .../biz/views/biz/dataReport/user/list.vue | 4 +- .../biz/views/biz/dataReportUser/form.vue | 113 --------- .../views/biz/dataReportUser/formImport.vue | 103 --------- .../biz/views/biz/dataReportUser/list.vue | 214 ------------------ .../biz/views/biz/dataReportUser/select.ts | 107 --------- .../workbench/components/MySchedule.vue | 2 +- 10 files changed, 7 insertions(+), 548 deletions(-) delete mode 100644 web-vue/packages/biz/views/biz/dataReportUser/form.vue delete mode 100644 web-vue/packages/biz/views/biz/dataReportUser/formImport.vue delete mode 100644 web-vue/packages/biz/views/biz/dataReportUser/list.vue delete mode 100644 web-vue/packages/biz/views/biz/dataReportUser/select.ts diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizDataReportUser.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizDataReportUser.java index e1a094da..39831c64 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizDataReportUser.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizDataReportUser.java @@ -30,7 +30,7 @@ import java.io.Serial; @Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdate = false, isUpdateForce = true), @Column(name = "id", attrName = "id", label = "主键ID", isPK = true), @Column(name = "data_report_id", attrName = "dataReportId", label = "data_report_id"), - @Column(name = "user_code", attrName = "userCode", label = "user_code"), + @Column(name = "login_code", attrName = "loginCode", label = "user_code"), @Column(name = "user_name", attrName = "userName", label = "user_name", isQuery = false), @Column(name = "ustatus", attrName = "ustatus", label = "ustatus"), }, joinTable = { @@ -51,7 +51,7 @@ public class BizDataReportUser extends DataEntity implements private static final long serialVersionUID = 1L; private Date createTime; // 记录时间 private String dataReportId; // data_report_id - private String userCode; // user_code + private String loginCode; // user_code private String userName; // user_name private String ustatus; // ustatus diff --git a/web-vue/packages/biz/api/biz/dataReportUser.ts b/web-vue/packages/biz/api/biz/dataReportUser.ts index ad8571d6..036c00c0 100644 --- a/web-vue/packages/biz/api/biz/dataReportUser.ts +++ b/web-vue/packages/biz/api/biz/dataReportUser.ts @@ -15,7 +15,7 @@ const { ctxPath, adminPath } = useGlobSetting(); export interface BizDataReportUser extends BasicModel { createTime?: string; // 记录时间 dataReportId: string; // data_report_id - userCode: string; // user_code + loginCode: string; // user_code userName?: string; // user_name ustatus: string; // ustatus routePath: string; diff --git a/web-vue/packages/biz/views/biz/dataReport/index.vue b/web-vue/packages/biz/views/biz/dataReport/index.vue index 72fc2106..86529b9e 100644 --- a/web-vue/packages/biz/views/biz/dataReport/index.vue +++ b/web-vue/packages/biz/views/biz/dataReport/index.vue @@ -7,9 +7,6 @@ - - - @@ -17,7 +14,6 @@ import { h, ref } from 'vue'; import { Tag, Tabs ,TabPane } from 'ant-design-vue'; import DataReport from './list.vue'; - import ErpReport from './erp/index.vue'; import UserReport from './user/list.vue' const activeKey = ref('1'); diff --git a/web-vue/packages/biz/views/biz/dataReport/user/form.vue b/web-vue/packages/biz/views/biz/dataReport/user/form.vue index 149191d8..8d20910c 100644 --- a/web-vue/packages/biz/views/biz/dataReport/user/form.vue +++ b/web-vue/packages/biz/views/biz/dataReport/user/form.vue @@ -59,7 +59,7 @@ }, { label: t('用户名称'), - field: 'userCode', + field: 'loginCode', fieldLabel: 'userName', component: 'ListSelect', componentProps: { diff --git a/web-vue/packages/biz/views/biz/dataReport/user/list.vue b/web-vue/packages/biz/views/biz/dataReport/user/list.vue index 5807be01..1dadbed8 100644 --- a/web-vue/packages/biz/views/biz/dataReport/user/list.vue +++ b/web-vue/packages/biz/views/biz/dataReport/user/list.vue @@ -104,8 +104,8 @@ }, { title: t('用户账号'), - dataIndex: 'userCode', - key: 'a.user_code', + dataIndex: 'loginCode', + key: 'a.login_code', sorter: true, width: 130, align: 'left', diff --git a/web-vue/packages/biz/views/biz/dataReportUser/form.vue b/web-vue/packages/biz/views/biz/dataReportUser/form.vue deleted file mode 100644 index a9e731e2..00000000 --- a/web-vue/packages/biz/views/biz/dataReportUser/form.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - diff --git a/web-vue/packages/biz/views/biz/dataReportUser/formImport.vue b/web-vue/packages/biz/views/biz/dataReportUser/formImport.vue deleted file mode 100644 index 1cc043ab..00000000 --- a/web-vue/packages/biz/views/biz/dataReportUser/formImport.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - diff --git a/web-vue/packages/biz/views/biz/dataReportUser/list.vue b/web-vue/packages/biz/views/biz/dataReportUser/list.vue deleted file mode 100644 index fbb7bd78..00000000 --- a/web-vue/packages/biz/views/biz/dataReportUser/list.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - diff --git a/web-vue/packages/biz/views/biz/dataReportUser/select.ts b/web-vue/packages/biz/views/biz/dataReportUser/select.ts deleted file mode 100644 index 420d8d81..00000000 --- a/web-vue/packages/biz/views/biz/dataReportUser/select.ts +++ /dev/null @@ -1,107 +0,0 @@ -import { useI18n } from '@jeesite/core/hooks/web/useI18n'; -import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table'; -import { bizDataReportUserListData } from '@jeesite/biz/api/biz/dataReportUser'; - -const { t } = useI18n('biz.dataReportUser'); - -const modalProps = { - title: t('指标用户选择'), -}; - -const searchForm: FormProps = { - baseColProps: { md: 8, lg: 6 }, - labelWidth: 90, - schemas: [ - { - label: t('记录时间起'), - field: 'createTime_gte', - component: 'DatePicker', - componentProps: { - format: 'YYYY-MM-DD HH:mm', - showTime: { format: 'HH:mm' }, - }, - }, - { - label: t('记录时间止'), - field: 'createTime_lte', - component: 'DatePicker', - componentProps: { - format: 'YYYY-MM-DD HH:mm', - showTime: { format: 'HH:mm' }, - }, - }, - { - label: t('ustatus'), - field: 'ustatus', - component: 'Select', - componentProps: { - dictType: 'ustatus', - allowClear: true, - }, - }, - ], -}; - -const tableColumns: BasicColumn[] = [ - { - title: t('记录时间'), - dataIndex: 'createTime', - key: 'a.create_time', - sorter: true, - width: 230, - align: 'left', - slot: 'firstColumn', - }, - { - title: t('data_report_id'), - dataIndex: 'dataReportId', - key: 'a.data_report_id', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('user_code'), - dataIndex: 'userCode', - key: 'a.user_code', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('user_name'), - dataIndex: 'userName', - key: 'a.user_name', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('ustatus'), - dataIndex: 'ustatus', - key: 'a.ustatus', - sorter: true, - width: 130, - align: 'center', - dictType: 'ustatus', - }, -]; - -const tableProps: BasicTableProps = { - api: bizDataReportUserListData, - beforeFetch: (params) => { - params['isAll'] = true; - return params; - }, - columns: tableColumns, - formConfig: searchForm, - rowKey: 'id', -}; - -export default { - modalProps, - tableProps, - itemCode: 'id', - itemName: 'id', - isShowCode: false, -}; diff --git a/web-vue/packages/core/layouts/views/desktop/workbench/components/MySchedule.vue b/web-vue/packages/core/layouts/views/desktop/workbench/components/MySchedule.vue index 8138d194..77c48343 100644 --- a/web-vue/packages/core/layouts/views/desktop/workbench/components/MySchedule.vue +++ b/web-vue/packages/core/layouts/views/desktop/workbench/components/MySchedule.vue @@ -68,7 +68,7 @@ const fetchCardList = async () => { try { const params = { - userCode: userinfo.value.loginCode, + loginCode: userinfo.value.loginCode, } const result = await bizDataReportUserListAll(params); cardListData.value = result || []; // 防止返回 null 导致渲染异常