public/FastapiAdmin
1
0
Fork 0
mirror of https://github.com/fastapiadmin/FastapiAdmin.git synced 2026-09-26 06:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 统一状态字段为字符串类型并标准化状态显示

Browse Source 
refactor: 将状态字段从布尔值改为字符串类型'0'和'1'
fix: 修复前端组件中状态显示和判断逻辑
docs: 更新相关字段描述为'0:启用 1:禁用'
style: 统一时间查询字段为created_time和created_id
This commit is contained in:
zhangtao
2025-11-30 09:12:13 +08:00
parent 959eb6f19c
commit 463e2fca23
36 changed files with 215 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/dashboard/workplace.vue
+1 -1
View File
@@ -312,7 +312,7 @@ const listNotice = async () => {
const response = await NoticeAPI.listNotice({
page_no: 1,
page_size: 10,
status: true, // 只获取启用的公告
status: '0', // 只获取启用的公告
});
if (response.data.code === 0) {
noticeList.value = response.data.data.items;
frontend/src/views/module_application/job/components/JobLogDrawer.vue
+5 -9
View File
@@ -140,7 +140,7 @@
<el-table-column label="任务组名" prop="job_group" min-width="120" show-overflow-tooltip />
<el-table-column label="执行状态" prop="status" min-width="100" show-overflow-tooltip>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status ? "成功" : "失败" }}
</el-tag>
</template>
@@ -320,8 +320,7 @@ const queryFormData = reactive<JobLogPageQuery>({
page_no: 1,
page_size: 10,
status: undefined,
start_time: undefined,
end_time: undefined,
created_time: undefined,
job_id: props.jobId,
});
@@ -339,11 +338,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -378,8 +375,7 @@ async function handleResetQuery() {
queryFormRef.value.resetFields();
queryFormData.page_no = 1;
queryFormData.status = undefined;
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
dateRange.value = [];
loadingData();
}
frontend/src/views/module_application/job/index.vue
+7 -12
View File
@@ -30,7 +30,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -199,7 +199,7 @@
</el-table-column>
<el-table-column label="状态" prop="status" min-width="100">
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status === true ? "运行中" : "暂停" }}
</el-tag>
</template>
@@ -657,10 +657,8 @@ const queryFormData = reactive<JobPageQuery>({
page_size: 10,
name: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 编辑表单
@@ -709,11 +707,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -753,8 +749,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
frontend/src/views/module_application/myapp/index.vue
+6 -7
View File
@@ -26,7 +26,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -209,8 +209,8 @@
<el-form-item label="应用状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
@@ -275,8 +275,7 @@ const queryFormData = reactive<ApplicationPageQuery>({
page_no: 1,
page_size: 12,
name: undefined,
status: undefined,
creator: undefined,
status: undefined, created_id: undefined,
});
// 应用列表数据
@@ -287,7 +286,7 @@ const formData = reactive<ApplicationForm>({
name: "",
access_url: "",
icon_url: "",
status: true,
status: '0',
description: "",
});
@@ -460,7 +459,7 @@ function resetForm() {
name: "",
access_url: "",
icon_url: "",
status: true,
status: '0',
description: "",
});
formRef.value?.resetFields();
frontend/src/views/module_application/workflow/index.vue
+14 -18
View File
@@ -89,10 +89,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -166,8 +166,8 @@
min-width="80"
>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
{{ scope.row.status === true ? "启用" : "停用" }}
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status === '0' ? "启用" : "停用" }}
</el-tag>
</template>
</el-table-column>
@@ -301,8 +301,8 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="描述" prop="description">
@@ -377,11 +377,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -391,15 +389,14 @@ const queryFormData = reactive<DemoPageQuery>({
page_size: 10,
name: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
created_time: undefined,
});
// 编辑表单
const formData = reactive<DemoForm>({
id: undefined,
name: "",
status: true,
status: '0',
description: undefined,
});
@@ -447,8 +444,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 重置日期范围选择器
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -456,7 +452,7 @@ async function handleResetQuery() {
const initialFormData: DemoForm = {
id: undefined,
name: "",
status: true,
status: '0',
description: "",
};
@@ -561,9 +557,9 @@ async function handleDelete(ids: number[]) {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_example/demo/index.vue
+13 -18
View File
@@ -26,7 +26,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -115,10 +115,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -365,8 +365,8 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="描述" prop="description">
@@ -497,11 +497,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -511,16 +509,14 @@ const queryFormData = reactive<DemoPageQuery>({
page_size: 10,
name: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
creator: undefined,
created_time: undefined, created_id: undefined,
});
// 编辑表单
const formData = reactive<DemoForm>({
id: undefined,
name: "",
status: true,
status: '0',
description: undefined,
});
@@ -589,8 +585,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 重置日期范围选择器
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -598,7 +593,7 @@ async function handleResetQuery() {
const initialFormData: DemoForm = {
id: undefined,
name: "",
status: true,
status: '0',
description: "",
};
@@ -704,9 +699,9 @@ async function handleDelete(ids: number[]) {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/customer/index.vue
+6 -6
View File
@@ -108,10 +108,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -365,8 +365,8 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="描述" prop="description">
@@ -699,9 +699,9 @@ async function handleDelete(ids: number[]) {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/dept/index.vue
+13 -17
View File
@@ -108,10 +108,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -196,7 +196,7 @@
min-width="60"
>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status ? "启用" : "停用" }}
</el-tag>
</template>
@@ -359,8 +359,8 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="描述" prop="description">
@@ -436,8 +436,7 @@ const detailFormData = ref<DeptTable>({});
const queryFormData = reactive<DeptPageQuery>({
name: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
created_time: undefined,
});
// 编辑表单
@@ -447,7 +446,7 @@ const formData = reactive<DeptForm>({
code: undefined,
order: 1,
parent_id: undefined,
status: true,
status: '0',
description: undefined,
});
@@ -503,8 +502,7 @@ async function handleResetQuery() {
queryFormRef.value.resetFields();
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -514,7 +512,7 @@ const initialFormData: DeptForm = {
name: undefined,
order: 1,
parent_id: undefined,
status: true,
status: '0',
description: undefined,
};
@@ -525,11 +523,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -642,9 +638,9 @@ async function handleDelete(ids: number[]) {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/dict/components/DataDrawer.vue
+13 -18
View File
@@ -34,7 +34,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -106,10 +106,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -164,7 +164,7 @@
<el-table-column label="标签" prop="dict_label" min-width="150" show-overflow-tooltip />
<el-table-column label="状态" prop="status" min-width="100" show-overflow-tooltip>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status ? "启用" : "停用" }}
</el-tag>
</template>
@@ -454,10 +454,8 @@ const queryFormData = reactive<DictDataPageQuery>({
dict_label: undefined,
dict_type: props.dictType,
status: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 编辑表单
@@ -470,7 +468,7 @@ const formData = reactive<DictDataForm>({
css_class: "",
list_class: undefined,
is_default: false,
status: true,
status: '0',
description: "",
});
@@ -500,11 +498,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -545,8 +541,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -560,7 +555,7 @@ const initialFormData: DictDataForm = {
css_class: "",
list_class: undefined,
is_default: false,
status: true,
status: '0',
description: "",
};
@@ -673,9 +668,9 @@ function handleOpenExportsModal() {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/dict/index.vue
+15 -20
View File
@@ -33,7 +33,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -118,10 +118,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -229,7 +229,7 @@
min-width="80"
>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status ? "启用" : "停用" }}
</el-tag>
</template>
@@ -382,8 +382,8 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="描述" prop="description">
@@ -480,10 +480,8 @@ const queryFormData = reactive<DictPageQuery>({
dict_name: undefined,
dict_type: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 编辑表单
@@ -491,7 +489,7 @@ const formData = reactive<DictForm>({
id: undefined,
dict_name: "",
dict_type: "",
status: true,
status: '0',
description: undefined,
});
@@ -516,11 +514,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -569,8 +565,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -579,7 +574,7 @@ const initialFormData: DictForm = {
id: undefined,
dict_name: "",
dict_type: "",
status: true,
status: '0',
description: undefined,
};
@@ -688,9 +683,9 @@ function handleOpenExportsModal() {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/log/index.vue
+6 -11
View File
@@ -26,7 +26,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -365,10 +365,8 @@ const queryFormData = reactive<LogPageQuery>({
type: undefined,
request_path: undefined,
creator_name: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 弹窗状态
@@ -385,11 +383,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -461,8 +457,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
frontend/src/views/module_system/menu/index.vue
+12 -16
View File
@@ -108,10 +108,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -171,7 +171,7 @@
</el-table-column>
<el-table-column label="状态" prop="status" min-width="80" align="center">
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status ? "启用" : "停用" }}
</el-tag>
</template>
@@ -631,7 +631,7 @@
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="false">禁用</el-radio>
</el-radio-group>
</el-form-item>
@@ -699,8 +699,7 @@ const detailFormData = ref<MenuTable>({});
const queryFormData = reactive<MenuPageQuery>({
name: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
created_time: undefined,
});
// 编辑表单
@@ -722,7 +721,7 @@ const formData = reactive<MenuForm>({
title: "",
params: undefined,
affix: false,
status: true,
status: '0',
description: undefined,
});
@@ -783,11 +782,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -839,8 +836,7 @@ async function handleResetQuery() {
queryFormRef.value.resetFields();
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
handleQuery();
}
@@ -863,7 +859,7 @@ const initialFormData: MenuForm = {
title: "",
params: [] as { key: string; value: string }[],
affix: false,
status: true,
status: '0',
description: undefined,
};
@@ -983,8 +979,8 @@ async function handleDelete(ids: number[]) {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
async function handleMoreClick(status: string) {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/notice/index.vue
+16 -21
View File
@@ -45,7 +45,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -130,10 +130,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -227,8 +227,8 @@
min-width="80"
>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
{{ scope.row.status === true ? "启用" : "停用" }}
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status === '0' ? "启用" : "停用" }}
</el-tag>
</template>
</el-table-column>
@@ -421,8 +421,8 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="内容" prop="notice_content">
@@ -506,10 +506,8 @@ const queryFormData = reactive<NoticePageQuery>({
notice_title: undefined,
notice_type: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 编辑表单
@@ -518,7 +516,7 @@ const formData = reactive<NoticeForm>({
notice_title: "",
notice_type: "",
notice_content: "",
status: true,
status: '0',
description: undefined,
});
@@ -544,11 +542,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -588,8 +584,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -599,7 +594,7 @@ const initialFormData: NoticeForm = {
notice_title: "",
notice_type: "",
notice_content: "",
status: true,
status: '0',
description: undefined,
};
@@ -710,9 +705,9 @@ async function handleOpenExportsModal() {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/param/index.vue
+6 -11
View File
@@ -33,7 +33,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -467,10 +467,8 @@ const queryFormData = reactive<ConfigPageQuery>({
config_name: undefined,
config_key: undefined,
config_type: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 编辑表单
@@ -505,11 +503,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -549,8 +545,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
frontend/src/views/module_system/position/index.vue
+16 -21
View File
@@ -30,7 +30,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -115,10 +115,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu v-hasPerm="['module_system:position:filter']">
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -214,8 +214,8 @@
min-width="80"
>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
{{ scope.row.status === true ? "启用" : "停用" }}
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status === '0' ? "启用" : "停用" }}
</el-tag>
</template>
</el-table-column>
@@ -365,8 +365,8 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="描述" prop="description">
@@ -458,10 +458,8 @@ const queryFormData = reactive<PositionPageQuery>({
page_size: 10,
name: "",
status: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 编辑表单
@@ -469,7 +467,7 @@ const formData = reactive<PositionForm>({
id: undefined,
name: undefined,
order: 1,
status: true,
status: '0',
description: undefined,
});
@@ -494,11 +492,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -538,8 +534,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -548,7 +543,7 @@ const initialFormData: PositionForm = {
id: undefined,
name: undefined,
order: 1,
status: true,
status: '0',
description: undefined,
};
@@ -650,9 +645,9 @@ async function handleOpenExportsModal() {
exportsDialogVisible.value = true;
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/role/index.vue
+16 -21
View File
@@ -30,7 +30,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -115,10 +115,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -245,8 +245,8 @@
min-width="80"
>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
{{ scope.row.status === true ? "启用" : "停用" }}
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status === '0' ? "启用" : "停用" }}
</el-tag>
</template>
</el-table-column>
@@ -437,8 +437,8 @@
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
@@ -538,10 +538,8 @@ const queryFormData = reactive<TablePageQuery>({
page_size: 10,
name: "",
status: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 新增、编辑表单
@@ -550,7 +548,7 @@ const formData = reactive<RoleForm>({
name: undefined,
order: 1,
code: undefined,
status: true,
status: '0',
description: undefined,
});
@@ -610,8 +608,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 额外清空日期范围与时间查询参数
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -621,7 +618,7 @@ const initialFormData: RoleForm = {
name: undefined,
order: 1,
code: undefined,
status: true,
status: '0',
description: undefined,
};
@@ -632,11 +629,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -733,9 +728,9 @@ function handleOpenExportsModal() {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/tenant/index.vue
+13 -18
View File
@@ -26,7 +26,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -115,10 +115,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -372,8 +372,8 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="描述" prop="description">
@@ -506,11 +506,9 @@ const dateRange = ref<[Date, Date] | []>([]);
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -520,9 +518,7 @@ const queryFormData = reactive<TenantPageQuery>({
page_size: 10,
name: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
creator: undefined,
created_time: undefined, created_id: undefined,
});
// 编辑表单
@@ -530,7 +526,7 @@ const formData = reactive<TenantForm>({
id: undefined,
name: "",
code: "",
status: true,
status: '0',
description: undefined,
});
@@ -600,8 +596,7 @@ async function handleResetQuery() {
queryFormData.page_no = 1;
// 重置日期范围选择器
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
loadingData();
}
@@ -610,7 +605,7 @@ const initialFormData: TenantForm = {
id: undefined,
name: "",
code: "",
status: true,
status: '0',
description: "",
};
@@ -716,9 +711,9 @@ async function handleDelete(ids: number[]) {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm(`确认${status ? "启用" : "停用"}该项数据?`, "警告", {
ElMessageBox.confirm(`确认${status === "0" ? "启用" : "停用"}该项数据?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
frontend/src/views/module_system/user/components/DeptTree.vue
+1 -2
View File
@@ -71,8 +71,7 @@ function handleNodeClick(data: { [key: string]: any }) {
const queryFormData = reactive<DeptPageQuery>({
name: undefined,
status: undefined,
start_time: undefined,
end_time: undefined,
created_time: undefined,
});
const loading = ref(true);
frontend/src/views/module_system/user/index.vue
+16 -21
View File
@@ -41,7 +41,7 @@
</el-form-item>
<el-form-item v-if="isExpand" prop="creator" label="创建人">
<UserTableSelect
v-model="queryFormData.creator"
v-model="queryFormData.created_id"
@confirm-click="handleConfirm"
@clear-click="handleQuery"
/>
@@ -130,10 +130,10 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Check" @click="handleMoreClick(true)">
<el-dropdown-item icon="Check" @click="handleMoreClick('0')">
批量启用
</el-dropdown-item>
<el-dropdown-item icon="CircleClose" @click="handleMoreClick(false)">
<el-dropdown-item icon="CircleClose" @click="handleMoreClick('1')">
批量停用
</el-dropdown-item>
</el-dropdown-menu>
@@ -217,8 +217,8 @@
<el-table-column label="用户名" prop="name" min-width="100" />
<el-table-column label="状态" prop="status" min-width="100">
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
{{ scope.row.status === true ? "启用" : "停用" }}
<el-tag :type="scope.row.status === '0' ? 'success' : 'danger'">
{{ scope.row.status === '0' ? "启用" : "停用" }}
</el-tag>
</template>
</el-table-column>
@@ -497,8 +497,8 @@
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :value="true">启用</el-radio>
<el-radio :value="false">停用</el-radio>
<el-radio :value="0">启用</el-radio>
<el-radio :value="1">停用</el-radio>
</el-radio-group>
</el-form-item>
@@ -612,10 +612,8 @@ const queryFormData = reactive<UserPageQuery>({
name: undefined,
status: undefined,
dept_id: undefined,
start_time: undefined,
end_time: undefined,
// 创建人
creator: undefined,
created_time: undefined,
created_id: undefined,
});
// 表单
@@ -634,7 +632,7 @@ const formData = reactive<UserForm>({
email: undefined,
mobile: undefined,
is_superuser: false, //默认不是超管
status: true,
status: '0',
description: undefined,
});
@@ -720,11 +718,9 @@ function handleConfirm() {
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = formatToDateTime(range[0]);
queryFormData.end_time = formatToDateTime(range[1]);
queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
}
}
@@ -759,12 +755,11 @@ async function handleResetQuery() {
queryFormRef.value.resetFields();
// 额外清空不在 model 内的扩展查询项（如日期范围）
dateRange.value = [];
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
queryFormData.created_time = undefined;
// 清空部门并重置页码
queryFormData.dept_id = undefined;
// 清空创建人
queryFormData.creator = undefined;
queryFormData.created_id = undefined;
queryFormData.page_no = 1;
// 重新加载数据
loadingData();
@@ -786,7 +781,7 @@ const initialFormData: UserForm = {
email: undefined,
mobile: undefined,
is_superuser: false, //默认不是超管
status: true,
status: '0',
description: undefined,
};
@@ -941,7 +936,7 @@ async function handleDelete(ids: number[]) {
}
// 批量启用/停用
async function handleMoreClick(status: boolean) {
async function handleMoreClick(status: string) {
if (selectIds.value.length) {
ElMessageBox.confirm("确认启用或停用该项数据?", "警告", {
confirmButtonText: "确定",