manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增预警页面

Browse Source
This commit is contained in:
gaoxq
2025-12-11 21:47:01 +08:00
parent d3a19803e9
commit 0ce726551c
63 changed files with 437 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
web-vue/packages/biz/views/biz/calendarSchedule/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:calendarSchedule:edit'" :okAuth="'biz:calendarSchedule:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizCalendarScheduleForm"> <script lang="ts" setup name="ViewsBizCalendarScheduleForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizCalendarSchedule, bizCalendarScheduleSave, bizCalendarScheduleForm } from '@jeesite/biz/api/biz/calendarSchedule'; import { BizCalendarSchedule, bizCalendarScheduleSave, bizCalendarScheduleForm } from '@jeesite/biz/api/biz/calendarSchedule';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -159,8 +159,8 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizCalendarScheduleForm(data); const res = await bizCalendarScheduleForm(data);
record.value = (res.bizCalendarSchedule || {}) as BizCalendarSchedule; record.value = (res.bizCalendarSchedule || {}) as BizCalendarSchedule;
@@ -169,13 +169,13 @@
record.value.scheduleNo = RcTimestamp(); record.value.scheduleNo = RcTimestamp();
} }
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
scheduleId: record.value.scheduleId || data.scheduleId, scheduleId: record.value.scheduleId || data.scheduleId,
@@ -183,7 +183,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizCalendarScheduleSave(params, data); const res = await bizCalendarScheduleSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -191,7 +191,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/calendarSchedule/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizCalendarSchedule, bizCalendarScheduleList } from '@jeesite/biz/api/biz/calendarSchedule'; import { BizCalendarSchedule, bizCalendarScheduleList } from '@jeesite/biz/api/biz/calendarSchedule';
import { bizCalendarScheduleDelete, bizCalendarScheduleListData } from '@jeesite/biz/api/biz/calendarSchedule'; import { bizCalendarScheduleDelete, bizCalendarScheduleListData } from '@jeesite/biz/api/biz/calendarSchedule';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -273,10 +272,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/cities/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:cities:edit'" :okAuth="'biz:cities:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="40%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizCitiesForm"> <script lang="ts" setup name="ViewsBizCitiesForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizCities, bizCitiesSave, bizCitiesForm } from '@jeesite/biz/api/biz/cities'; import { BizCities, bizCitiesSave, bizCitiesForm } from '@jeesite/biz/api/biz/cities';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -113,20 +113,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizCitiesForm(data); const res = await bizCitiesForm(data);
record.value = (res.bizCities || {}) as BizCities; record.value = (res.bizCities || {}) as BizCities;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
id: record.value.id || data.id, id: record.value.id || data.id,
@@ -134,7 +134,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizCitiesSave(params, data); const res = await bizCitiesSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -142,7 +142,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/cities/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizCities, bizCitiesList } from '@jeesite/biz/api/biz/cities'; import { BizCities, bizCitiesList } from '@jeesite/biz/api/biz/cities';
import { bizCitiesDelete, bizCitiesListData } from '@jeesite/biz/api/biz/cities'; import { bizCitiesDelete, bizCitiesListData } from '@jeesite/biz/api/biz/cities';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -240,10 +239,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

156
web-vue/packages/biz/views/biz/cities/select.ts
View File

@@ -1,156 +0,0 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { BizCities, bizCitiesListData } from '@jeesite/biz/api/biz/cities';
const { t } = useI18n('biz.cities');
const modalProps = {
title: t('市区信息选择'),
};
const searchForm: FormProps<BizCities> = {
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('省份编码'),
field: 'provinceCode',
component: 'Input',
},
{
label: t('市区编码'),
field: 'cityCode',
component: 'Input',
},
{
label: t('市区名称'),
field: 'cityName',
component: 'Input',
},
{
label: t('市区级别'),
field: 'areaType',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('数据状态'),
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
],
};
const tableColumns: BasicColumn<BizCities>[] = [
{
title: t('记录时间'),
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
},
{
title: t('省份编码'),
dataIndex: 'provinceCode',
key: 'a.province_code',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('市区编码'),
dataIndex: 'cityCode',
key: 'a.city_code',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('市区名称'),
dataIndex: 'cityName',
key: 'a.city_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('市区区号'),
dataIndex: 'areaCode',
key: 'a.area_code',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('市区级别'),
dataIndex: 'areaType',
key: 'a.area_type',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
align: 'center',
},
{
title: t('数据状态'),
dataIndex: 'dataStatus',
key: 'a.data_status',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
];
const tableProps: BasicTableProps = {
api: bizCitiesListData,
beforeFetch: (params) => {
params['isAll'] = true;
return params;
},
columns: tableColumns,
formConfig: searchForm,
rowKey: 'id',
};
export default {
modalProps,
tableProps,
itemCode: 'id',
itemName: 'id',
isShowCode: false,
};

22
web-vue/packages/biz/views/biz/company/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:company:edit'" :okAuth="'biz:company:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizCompanyForm"> <script lang="ts" setup name="ViewsBizCompanyForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizCompany, bizCompanySave, bizCompanyForm } from '@jeesite/biz/api/biz/company'; import { BizCompany, bizCompanySave, bizCompanyForm } from '@jeesite/biz/api/biz/company';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -118,20 +118,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizCompanyForm(data); const res = await bizCompanyForm(data);
record.value = (res.bizCompany || {}) as BizCompany; record.value = (res.bizCompany || {}) as BizCompany;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
companyId: record.value.companyId || data.companyId, companyId: record.value.companyId || data.companyId,
@@ -139,7 +139,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizCompanySave(params, data); const res = await bizCompanySave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -147,7 +147,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/company/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizCompany, bizCompanyList } from '@jeesite/biz/api/biz/company'; import { BizCompany, bizCompanyList } from '@jeesite/biz/api/biz/company';
import { bizCompanyDelete, bizCompanyListData } from '@jeesite/biz/api/biz/company'; import { bizCompanyDelete, bizCompanyListData } from '@jeesite/biz/api/biz/company';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -231,10 +230,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

30
web-vue/packages/biz/views/biz/dataInfo/index.vue Normal file
View File

@@ -0,0 +1,30 @@
<template>
<div class="web-page-container">
<Tabs v-model:activeKey="activeKey">
<TabPane key="1" tab="数据信息">
<TableInfo />
</TabPane>
<TabPane key="2" tab="字段信息">
<TableField />
</TabPane>
</Tabs>
</div>
</template>
<script lang="ts" setup name="AboutPage">
import { h, ref } from 'vue';
import { Tag, Tabs ,TabPane } from 'ant-design-vue';
import TableInfo from './tableInfo/list.vue';
import TableField from './tableField/list.vue';
const activeKey = ref('1');
</script>
<style scoped lang="less">
// 整体容器样式
.web-page-container {
width: 100%;
background-color: #e8f4f8;
display: flex;
flex-direction: column; // 垂直布局
overflow: hidden; // 防止内容溢出
}
</style>

0
web-vue/packages/biz/views/biz/tableField/formImport.vue → web-vue/packages/biz/views/biz/dataInfo/tableField/formImport.vue
View File

2
web-vue/packages/biz/views/biz/tableField/list.vue → web-vue/packages/biz/views/biz/dataInfo/tableField/list.vue
View File

@@ -42,7 +42,7 @@
const getTitle = { const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined', icon: meta.icon || 'i-ant-design:book-outlined',
value: meta.title || t('字段信息管理'), value: '字段信息管理',
}; };
const loading = ref(false); const loading = ref(false);

0
web-vue/packages/biz/views/biz/tableInfo/formImport.vue → web-vue/packages/biz/views/biz/dataInfo/tableInfo/formImport.vue
View File

2
web-vue/packages/biz/views/biz/tableInfo/list.vue → web-vue/packages/biz/views/biz/dataInfo/tableInfo/list.vue
View File

@@ -42,7 +42,7 @@
const getTitle = { const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined', icon: meta.icon || 'i-ant-design:book-outlined',
value: meta.title || t('数据信息管理'), value: '数据信息管理',
}; };
const loading = ref(false); const loading = ref(false);

22
web-vue/packages/biz/views/biz/dataReport/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:dataReport:edit'" :okAuth="'biz:dataReport:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizDataReportForm"> <script lang="ts" setup name="ViewsBizDataReportForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizDataReport, bizDataReportSave, bizDataReportForm } from '@jeesite/biz/api/biz/dataReport'; import { BizDataReport, bizDataReportSave, bizDataReportForm } from '@jeesite/biz/api/biz/dataReport';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -95,20 +95,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizDataReportForm(data); const res = await bizDataReportForm(data);
record.value = (res.bizDataReport || {}) as BizDataReport; record.value = (res.bizDataReport || {}) as BizDataReport;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
id: record.value.id || data.id, id: record.value.id || data.id,
@@ -116,7 +116,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizDataReportSave(params, data); const res = await bizDataReportSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -124,7 +124,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

30
web-vue/packages/biz/views/biz/dataReport/index.vue Normal file
View File

@@ -0,0 +1,30 @@
<template>
<div class="web-page-container">
<Tabs v-model:activeKey="activeKey">
<TabPane key="1" tab="指标信息">
<DataReport />
</TabPane>
<TabPane key="2" tab="财务管控">
<ErpReport />
</TabPane>
</Tabs>
</div>
</template>
<script lang="ts" setup name="AboutPage">
import { h, ref } from 'vue';
import { Tag, Tabs ,TabPane } from 'ant-design-vue';
import DataReport from './list.vue';
import ErpReport from './erp/index.vue';
const activeKey = ref('1');
</script>
<style scoped lang="less">
// 整体容器样式
.web-page-container {
width: 100%;
background-color: #e8f4f8;
display: flex;
flex-direction: column; // 垂直布局
overflow: hidden; // 防止内容溢出
}
</style>

7
web-vue/packages/biz/views/biz/dataReport/list.vue
View File

@@ -27,7 +27,7 @@
<img :src="record.image" style="width: 30px; height: 24px; object-fit: contain;" /> <img :src="record.image" style="width: 30px; height: 24px; object-fit: contain;" />
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -42,7 +42,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizDataReport, bizDataReportList } from '@jeesite/biz/api/biz/dataReport'; import { BizDataReport, bizDataReportList } from '@jeesite/biz/api/biz/dataReport';
import { bizDataReportDelete, bizDataReportListData } from '@jeesite/biz/api/biz/dataReport'; import { bizDataReportDelete, bizDataReportListData } from '@jeesite/biz/api/biz/dataReport';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -185,10 +184,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/dbConfig/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:dbConfig:edit'" :okAuth="'biz:dbConfig:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizDbConfigForm"> <script lang="ts" setup name="ViewsBizDbConfigForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizDbConfig, bizDbConfigSave, bizDbConfigForm } from '@jeesite/biz/api/biz/dbConfig'; import { BizDbConfig, bizDbConfigSave, bizDbConfigForm } from '@jeesite/biz/api/biz/dbConfig';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -129,20 +129,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizDbConfigForm(data); const res = await bizDbConfigForm(data);
record.value = (res.bizDbConfig || {}) as BizDbConfig; record.value = (res.bizDbConfig || {}) as BizDbConfig;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
id: record.value.id || data.id, id: record.value.id || data.id,
@@ -150,7 +150,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizDbConfigSave(params, data); const res = await bizDbConfigSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -158,7 +158,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/dbConfig/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizDbConfig, bizDbConfigList } from '@jeesite/biz/api/biz/dbConfig'; import { BizDbConfig, bizDbConfigList } from '@jeesite/biz/api/biz/dbConfig';
import { bizDbConfigDelete, bizDbConfigListData } from '@jeesite/biz/api/biz/dbConfig'; import { bizDbConfigDelete, bizDbConfigListData } from '@jeesite/biz/api/biz/dbConfig';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -251,10 +250,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

172
web-vue/packages/biz/views/biz/dbConfig/select.ts
View File

@@ -1,172 +0,0 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { BizDbConfig, bizDbConfigListData } from '@jeesite/biz/api/biz/dbConfig';
const { t } = useI18n('biz.dbConfig');
const modalProps = {
title: t('连接信息选择'),
};
const searchForm: FormProps<BizDbConfig> = {
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('数据库类型'),
field: 'dbType',
component: 'Select',
componentProps: {
dictType: 'db_type',
allowClear: true,
},
},
{
label: t('数据库名称'),
field: 'dbName',
component: 'Input',
},
{
label: t('数据库IP'),
field: 'dbIp',
component: 'Input',
},
{
label: t('数据库描述'),
field: 'description',
component: 'Input',
},
{
label: t('是否启用'),
field: 'isEnabled',
component: 'Select',
componentProps: {
dictType: 'is_active',
allowClear: true,
},
},
],
};
const tableColumns: BasicColumn<BizDbConfig>[] = [
{
title: t('创建时间'),
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 180,
align: 'left',
fixed: 'left'
},
{
title: t('数据库类型'),
dataIndex: 'dbType',
key: 'a.db_type',
sorter: true,
width: 130,
align: 'left',
dictType: 'db_type',
},
{
title: t('数据库名称'),
dataIndex: 'dbName',
key: 'a.db_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('数据库IP'),
dataIndex: 'dbIp',
key: 'a.db_ip',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('数据库端口'),
dataIndex: 'dbPort',
key: 'a.db_port',
sorter: true,
width: 130,
align: 'center',
},
{
title: t('数据库账号'),
dataIndex: 'dbUsername',
key: 'a.db_username',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('数据库描述'),
dataIndex: 'description',
key: 'a.description',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('是否启用'),
dataIndex: 'isEnabled',
key: 'a.is_enabled',
sorter: true,
width: 130,
align: 'center',
dictType: 'is_active',
},
{
title: t('schema名称'),
dataIndex: 'dbSchemaName',
key: 'a.db_schema_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 180,
align: 'center',
},
];
const tableProps: BasicTableProps = {
api: bizDbConfigListData,
beforeFetch: (params) => {
params['isAll'] = true;
return params;
},
columns: tableColumns,
formConfig: searchForm,
rowKey: 'id',
};
export default {
modalProps,
tableProps,
itemCode: 'id',
itemName: 'dbName',
isShowCode: true,
};

30
web-vue/packages/biz/views/biz/hostInfo/index.vue Normal file
View File

@@ -0,0 +1,30 @@
<template>
<div class="web-page-container">
<Tabs v-model:activeKey="activeKey">
<TabPane key="1" tab="主机信息">
<MonitorHost />
</TabPane>
<TabPane key="2" tab="账号信息">
<MonitorAccount />
</TabPane>
</Tabs>
</div>
</template>
<script lang="ts" setup name="AboutPage">
import { h, ref } from 'vue';
import { Tag, Tabs ,TabPane } from 'ant-design-vue';
import MonitorHost from './monitorHost/list.vue';
import MonitorAccount from './monitorAccount/list.vue';
const activeKey = ref('1');
</script>
<style scoped lang="less">
// 整体容器样式
.web-page-container {
width: 100%;
background-color: #e8f4f8;
display: flex;
flex-direction: column; // 垂直布局
overflow: hidden; // 防止内容溢出
}
</style>

22
web-vue/packages/biz/views/biz/monitorAccount/form.vue → web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:monitorAccount:edit'" :okAuth="'biz:monitorAccount:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizMonitorAccountForm"> <script lang="ts" setup name="ViewsBizMonitorAccountForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizMonitorAccount, bizMonitorAccountSave, bizMonitorAccountForm } from '@jeesite/biz/api/biz/monitorAccount'; import { BizMonitorAccount, bizMonitorAccountSave, bizMonitorAccountForm } from '@jeesite/biz/api/biz/monitorAccount';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -122,20 +122,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizMonitorAccountForm(data); const res = await bizMonitorAccountForm(data);
record.value = (res.bizMonitorAccount || {}) as BizMonitorAccount; record.value = (res.bizMonitorAccount || {}) as BizMonitorAccount;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
accountId: record.value.accountId || data.accountId, accountId: record.value.accountId || data.accountId,
@@ -143,7 +143,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizMonitorAccountSave(params, data); const res = await bizMonitorAccountSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -151,7 +151,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

0
web-vue/packages/biz/views/biz/monitorAccount/formImport.vue → web-vue/packages/biz/views/biz/hostInfo/monitorAccount/formImport.vue
View File

9
web-vue/packages/biz/views/biz/monitorAccount/list.vue → web-vue/packages/biz/views/biz/hostInfo/monitorAccount/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizMonitorAccount, bizMonitorAccountList } from '@jeesite/biz/api/biz/monitorAccount'; import { BizMonitorAccount, bizMonitorAccountList } from '@jeesite/biz/api/biz/monitorAccount';
import { bizMonitorAccountDelete, bizMonitorAccountListData } from '@jeesite/biz/api/biz/monitorAccount'; import { bizMonitorAccountDelete, bizMonitorAccountListData } from '@jeesite/biz/api/biz/monitorAccount';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -52,7 +51,7 @@
const getTitle = { const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined', icon: meta.icon || 'i-ant-design:book-outlined',
value: meta.title || t('账号信息管理'), value: '账号信息管理',
}; };
const loading = ref(false); const loading = ref(false);
@@ -243,10 +242,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/monitorHost/form.vue → web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:monitorHost:edit'" :okAuth="'biz:monitorHost:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizMonitorHostForm"> <script lang="ts" setup name="ViewsBizMonitorHostForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizMonitorHost, bizMonitorHostSave, bizMonitorHostForm } from '@jeesite/biz/api/biz/monitorHost'; import { BizMonitorHost, bizMonitorHostSave, bizMonitorHostForm } from '@jeesite/biz/api/biz/monitorHost';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -152,20 +152,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizMonitorHostForm(data); const res = await bizMonitorHostForm(data);
record.value = (res.bizMonitorHost || {}) as BizMonitorHost; record.value = (res.bizMonitorHost || {}) as BizMonitorHost;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
hostId: record.value.hostId || data.hostId, hostId: record.value.hostId || data.hostId,
@@ -173,7 +173,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizMonitorHostSave(params, data); const res = await bizMonitorHostSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -181,7 +181,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

0
web-vue/packages/biz/views/biz/monitorHost/formImport.vue → web-vue/packages/biz/views/biz/hostInfo/monitorHost/formImport.vue
View File

9
web-vue/packages/biz/views/biz/monitorHost/list.vue → web-vue/packages/biz/views/biz/hostInfo/monitorHost/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizMonitorHost, bizMonitorHostList } from '@jeesite/biz/api/biz/monitorHost'; import { BizMonitorHost, bizMonitorHostList } from '@jeesite/biz/api/biz/monitorHost';
import { bizMonitorHostDelete, bizMonitorHostListData } from '@jeesite/biz/api/biz/monitorHost'; import { bizMonitorHostDelete, bizMonitorHostListData } from '@jeesite/biz/api/biz/monitorHost';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -52,7 +51,7 @@
const getTitle = { const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined', icon: meta.icon || 'i-ant-design:book-outlined',
value: meta.title || t('主机信息管理'), value: '主机信息管理',
}; };
const loading = ref(false); const loading = ref(false);
@@ -310,10 +309,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/listItem/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:listItem:edit'" :okAuth="'biz:listItem:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizListItemForm"> <script lang="ts" setup name="ViewsBizListItemForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizListItem, bizListItemSave, bizListItemForm } from '@jeesite/biz/api/biz/listItem'; import { BizListItem, bizListItemSave, bizListItemForm } from '@jeesite/biz/api/biz/listItem';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -95,20 +95,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizListItemForm(data); const res = await bizListItemForm(data);
record.value = (res.bizListItem || {}) as BizListItem; record.value = (res.bizListItem || {}) as BizListItem;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
id: record.value.id || data.id, id: record.value.id || data.id,
@@ -116,7 +116,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizListItemSave(params, data); const res = await bizListItemSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -124,7 +124,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/listItem/list.vue
View File

@@ -27,7 +27,7 @@
<img :src="record.avatar" style="width: 20px; height: 20px; object-fit: cover; border-radius: 50%; display: inline-block; vertical-align: middle;" /> <img :src="record.avatar" style="width: 20px; height: 20px; object-fit: cover; border-radius: 50%; display: inline-block; vertical-align: middle;" />
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -42,7 +42,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizListItem, bizListItemList } from '@jeesite/biz/api/biz/listItem'; import { BizListItem, bizListItemList } from '@jeesite/biz/api/biz/listItem';
import { bizListItemDelete, bizListItemListData } from '@jeesite/biz/api/biz/listItem'; import { bizListItemDelete, bizListItemListData } from '@jeesite/biz/api/biz/listItem';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -278,10 +277,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

162
web-vue/packages/biz/views/biz/monitorAccount/select.ts
View File

@@ -1,162 +0,0 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { bizMonitorAccountListData } from '@jeesite/biz/api/biz/monitorAccount';
const { t } = useI18n('biz.monitorAccount');
const modalProps = {
title: t('账号信息选择'),
};
const searchForm: FormProps<BizMonitorAccount> = {
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('主机标识'),
field: 'hostId',
component: 'Input',
},
{
label: t('登录账号'),
field: 'sshUsername',
component: 'Input',
},
{
label: t('初始目录'),
field: 'initialPath',
component: 'Input',
},
{
label: t('账号状态'),
field: 'ustatus',
component: 'Input',
},
{
label: t('备注信息'),
field: 'remark',
component: 'Input',
},
],
};
const tableColumns: BasicColumn<BizMonitorAccount>[] = [
{
title: t('记录时间'),
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
},
{
title: t('主机标识'),
dataIndex: 'hostId',
key: 'a.host_id',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('登录账号'),
dataIndex: 'sshUsername',
key: 'a.ssh_username',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('登录密码'),
dataIndex: 'sshPassword',
key: 'a.ssh_password',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('登录端口'),
dataIndex: 'sshPort',
key: 'a.ssh_port',
sorter: true,
width: 130,
align: 'center',
},
{
title: t('初始目录'),
dataIndex: 'initialPath',
key: 'a.initial_path',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('超时时间'),
dataIndex: 'timeoutSeconds',
key: 'a.timeout_seconds',
sorter: true,
width: 130,
align: 'center',
},
{
title: t('账号状态'),
dataIndex: 'ustatus',
key: 'a.ustatus',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('备注信息'),
dataIndex: 'remark',
key: 'a.remark',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
align: 'center',
},
];
const tableProps: BasicTableProps = {
api: bizMonitorAccountListData,
beforeFetch: (params) => {
params['isAll'] = true;
return params;
},
columns: tableColumns,
formConfig: searchForm,
rowKey: 'accountId',
};
export default {
modalProps,
tableProps,
itemCode: 'accountId',
itemName: 'accountId',
isShowCode: false,
};

197
web-vue/packages/biz/views/biz/monitorHost/select.ts
View File

@@ -1,197 +0,0 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { BizMonitorHost, bizMonitorHostListData } from '@jeesite/biz/api/biz/monitorHost';
const { t } = useI18n('biz.monitorHost');
const modalProps = {
title: t('主机信息选择'),
};
const searchForm: FormProps<BizMonitorHost> = {
baseColProps: { md: 8, lg: 6 },
labelWidth: 90,
schemas: [
{
label: t('主机名称'),
field: 'hostname',
component: 'Input',
},
{
label: t('IP地址'),
field: 'ipAddress',
component: 'Input',
},
{
label: t('主机类型'),
field: 'hostType',
component: 'Select',
componentProps: {
dictType: 'host_type',
allowClear: true,
},
},
{
label: t('操作系统'),
field: 'hostOs',
component: 'Select',
componentProps: {
dictType: 'host_os',
allowClear: true,
},
},
{
label: t('主机状态'),
field: 'ustatus',
component: 'Select',
componentProps: {
dictType: 'host_status',
allowClear: true,
},
},
{
label: t('物理位置'),
field: 'locationName',
component: 'Input',
},
{
label: t('地址类型'),
field: 'locationType',
component: 'Select',
componentProps: {
dictType: 'location_type',
allowClear: true,
},
},
],
};
const tableColumns: BasicColumn<BizMonitorHost>[] = [
{
title: t('记录时间'),
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 180,
align: 'left',
},
{
title: t('主机名称'),
dataIndex: 'hostname',
key: 'a.hostname',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('IP地址'),
dataIndex: 'ipAddress',
key: 'a.ip_address',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('主机类型'),
dataIndex: 'hostType',
key: 'a.host_type',
sorter: true,
width: 130,
align: 'left',
dictType: 'host_type',
},
{
title: t('操作系统'),
dataIndex: 'hostOs',
key: 'a.host_os',
sorter: true,
width: 130,
align: 'left',
dictType: 'host_os',
},
{
title: t('主机状态'),
dataIndex: 'ustatus',
key: 'a.ustatus',
sorter: true,
width: 130,
align: 'left',
dictType: 'host_status',
},
{
title: t('监测运行时间'),
dataIndex: 'lastOnlineTime',
key: 'a.last_online_time',
sorter: true,
width: 180,
align: 'center',
},
{
title: t('物理位置'),
dataIndex: 'locationName',
key: 'a.location_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('地址类型'),
dataIndex: 'locationType',
key: 'a.location_type',
sorter: true,
width: 130,
align: 'left',
dictType: 'location_type',
},
{
title: t('联系方式'),
dataIndex: 'otherContact',
key: 'a.other_contact',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('备注信息'),
dataIndex: 'remark',
key: 'a.remark',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 180,
align: 'center',
},
{
title: t('失效日期'),
dataIndex: 'expiryDate',
key: 'a.expiry_date',
sorter: true,
width: 180,
align: 'center',
},
];
const tableProps: BasicTableProps = {
api: bizMonitorHostListData,
beforeFetch: (params) => {
params['isAll'] = true;
return params;
},
columns: tableColumns,
formConfig: searchForm,
rowKey: 'hostId',
};
export default {
modalProps,
tableProps,
itemCode: 'hostId',
itemName: 'hostId',
isShowCode: false,
};

0
web-vue/packages/biz/views/biz/deviceInfo/formImport.vue → web-vue/packages/biz/views/biz/monitorInfo/deviceInfo/formImport.vue
View File

2
web-vue/packages/biz/views/biz/deviceInfo/list.vue → web-vue/packages/biz/views/biz/monitorInfo/deviceInfo/list.vue
View File

@@ -42,7 +42,7 @@
const getTitle = { const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined', icon: meta.icon || 'i-ant-design:book-outlined',
value: meta.title || t('磁盘信息管理'), value: '磁盘信息管理',
}; };
const loading = ref(false); const loading = ref(false);

30
web-vue/packages/biz/views/biz/monitorInfo/index.vue Normal file
View File

@@ -0,0 +1,30 @@
<template>
<div class="web-page-container">
<Tabs v-model:activeKey="activeKey">
<TabPane key="1" tab="运行信息">
<ServerInfo />
</TabPane>
<TabPane key="2" tab="磁盘信息">
<DeviceInfo />
</TabPane>
</Tabs>
</div>
</template>
<script lang="ts" setup name="AboutPage">
import { h, ref } from 'vue';
import { Tag, Tabs ,TabPane } from 'ant-design-vue';
import ServerInfo from './serverInfo/list.vue';
import DeviceInfo from './deviceInfo/list.vue';
const activeKey = ref('1');
</script>
<style scoped lang="less">
// 整体容器样式
.web-page-container {
width: 100%;
background-color: #e8f4f8;
display: flex;
flex-direction: column; // 垂直布局
overflow: hidden; // 防止内容溢出
}
</style>

0
web-vue/packages/biz/views/biz/serverInfo/formImport.vue → web-vue/packages/biz/views/biz/monitorInfo/serverInfo/formImport.vue
View File

2
web-vue/packages/biz/views/biz/serverInfo/list.vue → web-vue/packages/biz/views/biz/monitorInfo/serverInfo/list.vue
View File

@@ -42,7 +42,7 @@
const getTitle = { const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined', icon: meta.icon || 'i-ant-design:book-outlined',
value: meta.title || t('运行信息管理'), value: '运行信息管理',
}; };
const loading = ref(false); const loading = ref(false);

22
web-vue/packages/biz/views/biz/municipalities/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:municipalities:edit'" :okAuth="'biz:municipalities:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizMunicipalitiesForm"> <script lang="ts" setup name="ViewsBizMunicipalitiesForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { bizCitiesListAll } from '@jeesite/biz/api/biz/cities'; import { bizCitiesListAll } from '@jeesite/biz/api/biz/cities';
import { bizProvinceListAll } from '@jeesite/biz/api/biz/province'; import { bizProvinceListAll } from '@jeesite/biz/api/biz/province';
import { BizMunicipalities, bizMunicipalitiesSave, bizMunicipalitiesForm } from '@jeesite/biz/api/biz/municipalities'; import { BizMunicipalities, bizMunicipalitiesSave, bizMunicipalitiesForm } from '@jeesite/biz/api/biz/municipalities';
@@ -147,20 +147,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizMunicipalitiesForm(data); const res = await bizMunicipalitiesForm(data);
record.value = (res.bizMunicipalities || {}) as BizMunicipalities; record.value = (res.bizMunicipalities || {}) as BizMunicipalities;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
id: record.value.id || data.id, id: record.value.id || data.id,
@@ -168,7 +168,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizMunicipalitiesSave(params, data); const res = await bizMunicipalitiesSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -176,7 +176,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/municipalities/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -41,7 +41,6 @@
import { bizMunicipalitiesDelete, bizMunicipalitiesListData } from '@jeesite/biz/api/biz/municipalities'; import { bizMunicipalitiesDelete, bizMunicipalitiesListData } from '@jeesite/biz/api/biz/municipalities';
import { bizCitiesListAll } from '@jeesite/biz/api/biz/cities'; import { bizCitiesListAll } from '@jeesite/biz/api/biz/cities';
import { bizProvinceListAll } from '@jeesite/biz/api/biz/province'; import { bizProvinceListAll } from '@jeesite/biz/api/biz/province';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -303,10 +302,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/projectInfo/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:projectInfo:edit'" :okAuth="'biz:projectInfo:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizProjectInfoForm"> <script lang="ts" setup name="ViewsBizProjectInfoForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizProjectInfo, bizProjectInfoSave, bizProjectInfoForm } from '@jeesite/biz/api/biz/projectInfo'; import { BizProjectInfo, bizProjectInfoSave, bizProjectInfoForm } from '@jeesite/biz/api/biz/projectInfo';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -133,20 +133,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizProjectInfoForm(data); const res = await bizProjectInfoForm(data);
record.value = (res.bizProjectInfo || {}) as BizProjectInfo; record.value = (res.bizProjectInfo || {}) as BizProjectInfo;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
projectId: record.value.projectId || data.projectId, projectId: record.value.projectId || data.projectId,
@@ -154,7 +154,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizProjectInfoSave(params, data); const res = await bizProjectInfoSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -162,7 +162,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/projectInfo/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizProjectInfo, bizProjectInfoList } from '@jeesite/biz/api/biz/projectInfo'; import { BizProjectInfo, bizProjectInfoList } from '@jeesite/biz/api/biz/projectInfo';
import { bizProjectInfoDelete, bizProjectInfoListData } from '@jeesite/biz/api/biz/projectInfo'; import { bizProjectInfoDelete, bizProjectInfoListData } from '@jeesite/biz/api/biz/projectInfo';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -240,10 +239,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/projectReport/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:projectReport:edit'" :okAuth="'biz:projectReport:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizProjectReportForm"> <script lang="ts" setup name="ViewsBizProjectReportForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizProjectReport, bizProjectReportSave, bizProjectReportForm } from '@jeesite/biz/api/biz/projectReport'; import { BizProjectReport, bizProjectReportSave, bizProjectReportForm } from '@jeesite/biz/api/biz/projectReport';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -155,20 +155,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizProjectReportForm(data); const res = await bizProjectReportForm(data);
record.value = (res.bizProjectReport || {}) as BizProjectReport; record.value = (res.bizProjectReport || {}) as BizProjectReport;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
reportId: record.value.reportId || data.reportId, reportId: record.value.reportId || data.reportId,
@@ -176,7 +176,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizProjectReportSave(params, data); const res = await bizProjectReportSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -184,7 +184,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/projectReport/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizProjectReport, bizProjectReportList } from '@jeesite/biz/api/biz/projectReport'; import { BizProjectReport, bizProjectReportList } from '@jeesite/biz/api/biz/projectReport';
import { bizProjectReportDelete, bizProjectReportListData } from '@jeesite/biz/api/biz/projectReport'; import { bizProjectReportDelete, bizProjectReportListData } from '@jeesite/biz/api/biz/projectReport';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -252,10 +251,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/projectRequirements/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:projectRequirements:edit'" :okAuth="'biz:projectRequirements:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizProjectRequirementsForm"> <script lang="ts" setup name="ViewsBizProjectRequirementsForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizProjectRequirements, bizProjectRequirementsSave, bizProjectRequirementsForm } from '@jeesite/biz/api/biz/projectRequirements'; import { BizProjectRequirements, bizProjectRequirementsSave, bizProjectRequirementsForm } from '@jeesite/biz/api/biz/projectRequirements';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -151,20 +151,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizProjectRequirementsForm(data); const res = await bizProjectRequirementsForm(data);
record.value = (res.bizProjectRequirements || {}) as BizProjectRequirements; record.value = (res.bizProjectRequirements || {}) as BizProjectRequirements;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
requirementId: record.value.requirementId || data.requirementId, requirementId: record.value.requirementId || data.requirementId,
@@ -172,7 +172,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizProjectRequirementsSave(params, data); const res = await bizProjectRequirementsSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -180,7 +180,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/projectRequirements/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizProjectRequirements, bizProjectRequirementsList } from '@jeesite/biz/api/biz/projectRequirements'; import { BizProjectRequirements, bizProjectRequirementsList } from '@jeesite/biz/api/biz/projectRequirements';
import { bizProjectRequirementsDelete, bizProjectRequirementsListData } from '@jeesite/biz/api/biz/projectRequirements'; import { bizProjectRequirementsDelete, bizProjectRequirementsListData } from '@jeesite/biz/api/biz/projectRequirements';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -316,10 +315,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/province/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:province:edit'" :okAuth="'biz:province:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="40%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizProvinceForm"> <script lang="ts" setup name="ViewsBizProvinceForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizProvince, bizProvinceSave, bizProvinceForm } from '@jeesite/biz/api/biz/province'; import { BizProvince, bizProvinceSave, bizProvinceForm } from '@jeesite/biz/api/biz/province';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -110,20 +110,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizProvinceForm(data); const res = await bizProvinceForm(data);
record.value = (res.bizProvince || {}) as BizProvince; record.value = (res.bizProvince || {}) as BizProvince;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
id: record.value.id || data.id, id: record.value.id || data.id,
@@ -131,7 +131,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizProvinceSave(params, data); const res = await bizProvinceSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -139,7 +139,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/province/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizProvince, bizProvinceList } from '@jeesite/biz/api/biz/province'; import { BizProvince, bizProvinceList } from '@jeesite/biz/api/biz/province';
import { bizProvinceDelete, bizProvinceListData } from '@jeesite/biz/api/biz/province'; import { bizProvinceDelete, bizProvinceListData } from '@jeesite/biz/api/biz/province';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -220,10 +219,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/quickLogin/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:quickLogin:edit'" :okAuth="'biz:quickLogin:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizQuickLoginForm"> <script lang="ts" setup name="ViewsBizQuickLoginForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizQuickLogin, bizQuickLoginSave, bizQuickLoginForm } from '@jeesite/biz/api/biz/quickLogin'; import { BizQuickLogin, bizQuickLoginSave, bizQuickLoginForm } from '@jeesite/biz/api/biz/quickLogin';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -125,20 +125,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizQuickLoginForm(data); const res = await bizQuickLoginForm(data);
record.value = (res.bizQuickLogin || {}) as BizQuickLogin; record.value = (res.bizQuickLogin || {}) as BizQuickLogin;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
id: record.value.id || data.id, id: record.value.id || data.id,
@@ -146,7 +146,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizQuickLoginSave(params, data); const res = await bizQuickLoginSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -154,7 +154,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

8
web-vue/packages/biz/views/biz/quickLogin/list.vue
View File

@@ -24,7 +24,7 @@
<img :src="record.iconClass" style="width: 30px; height: 24px; object-fit: contain;" /> <img :src="record.iconClass" style="width: 30px; height: 24px; object-fit: contain;" />
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
</div> </div>
</template> </template>
<script lang="ts" setup name="ViewsBizQuickLoginList"> <script lang="ts" setup name="ViewsBizQuickLoginList">
@@ -36,7 +36,7 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizQuickLogin, bizQuickLoginList } from '@jeesite/biz/api/biz/quickLogin'; import { BizQuickLogin, bizQuickLoginList } from '@jeesite/biz/api/biz/quickLogin';
import { bizQuickLoginDelete, bizQuickLoginListData } from '@jeesite/biz/api/biz/quickLogin'; import { bizQuickLoginDelete, bizQuickLoginListData } from '@jeesite/biz/api/biz/quickLogin';
import { useDrawer } from '@jeesite/core/components/Drawer'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -209,10 +209,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleDelete(record: Recordable) { async function handleDelete(record: Recordable) {

22
web-vue/packages/biz/views/biz/resumeEmployee/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:resumeEmployee:edit'" :okAuth="'biz:resumeEmployee:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizResumeEmployeeForm"> <script lang="ts" setup name="ViewsBizResumeEmployeeForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizResumeEmployee, bizResumeEmployeeSave, bizResumeEmployeeForm } from '@jeesite/biz/api/biz/resumeEmployee'; import { BizResumeEmployee, bizResumeEmployeeSave, bizResumeEmployeeForm } from '@jeesite/biz/api/biz/resumeEmployee';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -116,20 +116,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizResumeEmployeeForm(data); const res = await bizResumeEmployeeForm(data);
record.value = (res.bizResumeEmployee || {}) as BizResumeEmployee; record.value = (res.bizResumeEmployee || {}) as BizResumeEmployee;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
employeeId: record.value.employeeId || data.employeeId, employeeId: record.value.employeeId || data.employeeId,
@@ -137,7 +137,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizResumeEmployeeSave(params, data); const res = await bizResumeEmployeeSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -145,7 +145,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/resumeEmployee/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizResumeEmployee, bizResumeEmployeeList } from '@jeesite/biz/api/biz/resumeEmployee'; import { BizResumeEmployee, bizResumeEmployeeList } from '@jeesite/biz/api/biz/resumeEmployee';
import { bizResumeEmployeeDelete, bizResumeEmployeeListData } from '@jeesite/biz/api/biz/resumeEmployee'; import { bizResumeEmployeeDelete, bizResumeEmployeeListData } from '@jeesite/biz/api/biz/resumeEmployee';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -236,10 +235,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/biz/views/biz/websiteStorage/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'biz:websiteStorage:edit'" :okAuth="'biz:websiteStorage:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsBizWebsiteStorageForm"> <script lang="ts" setup name="ViewsBizWebsiteStorageForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { BizWebsiteStorage, bizWebsiteStorageSave, bizWebsiteStorageForm } from '@jeesite/biz/api/biz/websiteStorage'; import { BizWebsiteStorage, bizWebsiteStorageSave, bizWebsiteStorageForm } from '@jeesite/biz/api/biz/websiteStorage';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -121,20 +121,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await bizWebsiteStorageForm(data); const res = await bizWebsiteStorageForm(data);
record.value = (res.bizWebsiteStorage || {}) as BizWebsiteStorage; record.value = (res.bizWebsiteStorage || {}) as BizWebsiteStorage;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
websiteId: record.value.websiteId || data.websiteId, websiteId: record.value.websiteId || data.websiteId,
@@ -142,7 +142,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await bizWebsiteStorageSave(params, data); const res = await bizWebsiteStorageSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -150,7 +150,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/biz/views/biz/websiteStorage/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizWebsiteStorage, bizWebsiteStorageList } from '@jeesite/biz/api/biz/websiteStorage'; import { BizWebsiteStorage, bizWebsiteStorageList } from '@jeesite/biz/api/biz/websiteStorage';
import { bizWebsiteStorageDelete, bizWebsiteStorageListData } from '@jeesite/biz/api/biz/websiteStorage'; import { bizWebsiteStorageDelete, bizWebsiteStorageListData } from '@jeesite/biz/api/biz/websiteStorage';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -249,10 +248,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

38
web-vue/packages/core/components/Modal/src/BasicModal.vue
View File

@@ -245,6 +245,9 @@
<style lang="less"> <style lang="less">
@prefix-cls: ~'jeesite-basic-modal'; @prefix-cls: ~'jeesite-basic-modal';
@modal-footer-bg: #f0f7ff;
@modal-footer-border: #d6e8ff;
.ant-modal.@{prefix-cls} { .ant-modal.@{prefix-cls} {
.ant-modal { .ant-modal {
@@ -310,8 +313,11 @@
&-footer { &-footer {
padding: 14px; padding: 14px;
margin-top: 0; margin-top: 0;
// border-top: 1px solid fade(@border-color-base, 50%); background-color: @modal-footer-bg;
border-top: 1px solid @modal-footer-border;
padding: 12px 16px;
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
button + button { button + button {
margin-left: 10px; margin-left: 10px;
} }
@@ -331,14 +337,6 @@
} }
} }
// 注释掉，防止点击全屏误触关闭
//&-close-x {
// display: inline-block;
// width: 96px;
// height: 55px;
// line-height: 55px;
//}
&-confirm-body { &-confirm-body {
.ant-modal-confirm-content { .ant-modal-confirm-content {
// color: #fff; // color: #fff;
@@ -377,26 +375,6 @@
} }
} }
// .ant-modal.@{prefix-cls} {
// top: 150px !important;
// vertical-align: top !important;
// }
// @media screen and (max-height: 600px) {
// .ant-modal.@{prefix-cls} {
// top: 60px !important;
// }
// }
// @media screen and (max-height: 540px) {
// .ant-modal.@{prefix-cls} {
// top: 30px !important;
// }
// }
// @media screen and (max-height: 480px) {
// .ant-modal.@{prefix-cls} {
// top: 10px !important;
// }
// }
.fullscreen-modal { .fullscreen-modal {
overflow: hidden; overflow: hidden;

2
web-vue/packages/core/layouts/views/desktop/analysis/components/DynamicInfo.vue
View File

@@ -105,7 +105,7 @@ export default defineComponent({
// 跳转到更多页面 // 跳转到更多页面
const goToMorePage = () => { const goToMorePage = () => {
router.push('/biz/serverInfo/list'); router.push('/biz/hostInfo/index');
}; };
// 根据使用率获取样式类 // 根据使用率获取样式类

22
web-vue/packages/erp/views/erp/account/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'erp:account:edit'" :okAuth="'erp:account:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="40%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsErpAccountForm"> <script lang="ts" setup name="ViewsErpAccountForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { ErpAccount, erpAccountSave, erpAccountForm } from '@jeesite/erp/api/erp/account'; import { ErpAccount, erpAccountSave, erpAccountForm } from '@jeesite/erp/api/erp/account';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -108,20 +108,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await erpAccountForm(data); const res = await erpAccountForm(data);
record.value = (res.erpAccount || {}) as ErpAccount; record.value = (res.erpAccount || {}) as ErpAccount;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
accountId: record.value.accountId || data.accountId, accountId: record.value.accountId || data.accountId,
@@ -129,7 +129,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await erpAccountSave(params, data); const res = await erpAccountSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -137,7 +137,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/erp/views/erp/account/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { ErpAccount, erpAccountList } from '@jeesite/erp/api/erp/account'; import { ErpAccount, erpAccountList } from '@jeesite/erp/api/erp/account';
import { erpAccountDelete, erpAccountListData } from '@jeesite/erp/api/erp/account'; import { erpAccountDelete, erpAccountListData } from '@jeesite/erp/api/erp/account';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -200,10 +199,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

22
web-vue/packages/erp/views/erp/category/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'erp:category:edit'" :okAuth="'erp:category:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="40%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsErpCategoryForm"> <script lang="ts" setup name="ViewsErpCategoryForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { ErpCategory, erpCategorySave, erpCategoryForm } from '@jeesite/erp/api/erp/category'; import { ErpCategory, erpCategorySave, erpCategoryForm } from '@jeesite/erp/api/erp/category';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
@@ -107,20 +107,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await erpCategoryForm(data); const res = await erpCategoryForm(data);
record.value = (res.erpCategory || {}) as ErpCategory; record.value = (res.erpCategory || {}) as ErpCategory;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
categoryId: record.value.categoryId || data.categoryId, categoryId: record.value.categoryId || data.categoryId,
@@ -128,7 +128,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await erpCategorySave(params, data); const res = await erpCategorySave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -136,7 +136,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

7
web-vue/packages/erp/views/erp/category/list.vue
View File

@@ -24,7 +24,7 @@
</a> </a>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -39,7 +39,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { ErpCategory, erpCategoryList } from '@jeesite/erp/api/erp/category'; import { ErpCategory, erpCategoryList } from '@jeesite/erp/api/erp/category';
import { erpCategoryDelete, erpCategoryListData } from '@jeesite/erp/api/erp/category'; import { erpCategoryDelete, erpCategoryListData } from '@jeesite/erp/api/erp/category';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -193,10 +192,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {

0
web-vue/packages/erp/views/erp/expense/formImport.vue → web-vue/packages/erp/views/erp/erpInc/expense/formImport.vue
View File

2
web-vue/packages/erp/views/erp/expense/list.vue → web-vue/packages/erp/views/erp/erpInc/expense/list.vue
View File

@@ -43,7 +43,7 @@
const getTitle = { const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined', icon: meta.icon || 'i-ant-design:book-outlined',
value: meta.title || t('支出信息管理'), value: '支出信息管理',
}; };
const loading = ref(false); const loading = ref(false);

0
web-vue/packages/erp/views/erp/income/formImport.vue → web-vue/packages/erp/views/erp/erpInc/income/formImport.vue
View File

2
web-vue/packages/erp/views/erp/income/list.vue → web-vue/packages/erp/views/erp/erpInc/income/list.vue
View File

@@ -43,7 +43,7 @@
const getTitle = { const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined', icon: meta.icon || 'i-ant-design:book-outlined',
value: meta.title || t('收入信息管理'), value: '收入信息管理',
}; };
const loading = ref(false); const loading = ref(false);

33
web-vue/packages/erp/views/erp/erpInc/index.vue Normal file
View File

@@ -0,0 +1,33 @@
<template>
<div class="web-page-container">
<Tabs v-model:activeKey="activeKey">
<TabPane key="1" tab="支出信息">
<Expense />
</TabPane>
<TabPane key="2" tab="收入信息">
<Income />
</TabPane>
</Tabs>
</div>
</template>
<script lang="ts" setup name="AboutPage">
import { h, ref } from 'vue';
import { Tag, Tabs ,TabPane } from 'ant-design-vue';
import { PageWrapper } from '@jeesite/core/components/Page';
import Expense from './expense/list.vue';
import Income from './income/list.vue';
const activeKey = ref('1');
</script>
<style scoped lang="less">
// 整体容器样式
.web-page-container {
width: 100%;
background-color: #e8f4f8;
display: flex;
flex-direction: column; // 垂直布局
overflow: hidden; // 防止内容溢出
}
</style>

22
web-vue/packages/erp/views/erp/transactionFlow/form.vue
View File

@@ -4,20 +4,20 @@
* @author gaoxq * @author gaoxq
--> -->
<template> <template>
<BasicDrawer <BasicModal
v-bind="$attrs" v-bind="$attrs"
:showFooter="true" :showFooter="true"
:okAuth="'erp:transactionFlow:edit'" :okAuth="'erp:transactionFlow:edit'"
@register="registerDrawer" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
width="70%" width="60%"
> >
<template #title> <template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" /> <Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span> <span> {{ getTitle.value }} </span>
</template> </template>
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm" />
</BasicDrawer> </BasicModal>
</template> </template>
<script lang="ts" setup name="ViewsErpTransactionFlowForm"> <script lang="ts" setup name="ViewsErpTransactionFlowForm">
import { ref, unref, computed } from 'vue'; import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
import { router } from '@jeesite/core/router'; import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon'; import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category'; import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
import { ErpTransactionFlow, erpTransactionFlowSave, erpTransactionFlowForm } from '@jeesite/erp/api/erp/transactionFlow'; import { ErpTransactionFlow, erpTransactionFlowSave, erpTransactionFlowForm } from '@jeesite/erp/api/erp/transactionFlow';
@@ -118,20 +118,20 @@
baseColProps: { md: 24, lg: 12 }, baseColProps: { md: 24, lg: 12 },
}); });
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
setDrawerProps({ loading: true }); setModalProps({ loading: true });
await resetFields(); await resetFields();
const res = await erpTransactionFlowForm(data); const res = await erpTransactionFlowForm(data);
record.value = (res.erpTransactionFlow || {}) as ErpTransactionFlow; record.value = (res.erpTransactionFlow || {}) as ErpTransactionFlow;
record.value.__t = new Date().getTime(); record.value.__t = new Date().getTime();
await setFieldsValue(record.value); await setFieldsValue(record.value);
setDrawerProps({ loading: false }); setModalProps({ loading: false });
}); });
async function handleSubmit() { async function handleSubmit() {
try { try {
const data = await validate(); const data = await validate();
setDrawerProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
const params: any = { const params: any = {
isNewRecord: record.value.isNewRecord, isNewRecord: record.value.isNewRecord,
flowId: record.value.flowId || data.flowId, flowId: record.value.flowId || data.flowId,
@@ -139,7 +139,7 @@
// console.log('submit', params, data, record); // console.log('submit', params, data, record);
const res = await erpTransactionFlowSave(params, data); const res = await erpTransactionFlowSave(params, data);
showMessage(res.message); showMessage(res.message);
setTimeout(closeDrawer); setTimeout(closeModal);
emit('success', data); emit('success', data);
} catch (error: any) { } catch (error: any) {
if (error && error.errorFields) { if (error && error.errorFields) {
@@ -147,7 +147,7 @@
} }
console.log('error', error); console.log('error', error);
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

9
web-vue/packages/erp/views/erp/transactionFlow/list.vue
View File

@@ -19,7 +19,7 @@
</a-button> </a-button>
</template> </template>
</BasicTable> </BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" /> <InputForm @register="registerModal" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" /> <FormImport @register="registerImportModal" @success="handleSuccess" />
</div> </div>
</template> </template>
@@ -34,7 +34,6 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table'; import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { ErpTransactionFlow, erpTransactionFlowList } from '@jeesite/erp/api/erp/transactionFlow'; import { ErpTransactionFlow, erpTransactionFlowList } from '@jeesite/erp/api/erp/transactionFlow';
import { erpTransactionFlowDelete, erpTransactionFlowFinish, erpTransactionFlowListData } from '@jeesite/erp/api/erp/transactionFlow'; import { erpTransactionFlowDelete, erpTransactionFlowFinish, erpTransactionFlowListData } from '@jeesite/erp/api/erp/transactionFlow';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal'; import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form'; import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue'; import InputForm from './form.vue';
@@ -267,10 +266,10 @@
await getForm().setFieldsValue(record.value); await getForm().setFieldsValue(record.value);
}); });
const [registerDrawer, { openDrawer }] = useDrawer(); const [registerModal, { openModal }] = useModal();
function handleForm(record: Recordable) { function handleForm(record: Recordable) {
openDrawer(true, record); openModal(true, record);
} }
async function handleExport() { async function handleExport() {
@@ -302,8 +301,6 @@
showMessage(res.message); showMessage(res.message);
await handleSuccess(record); await handleSuccess(record);
} }
async function handleSuccess(record: Recordable) { async function handleSuccess(record: Recordable) {
await reload({ record }); await reload({ record });