新增数据模型模块代码

修改指标定义模块字段名称和数量
main
zhangxiaodi1 9 months ago
parent 92914c5731
commit 2fc58e0ac8

@ -21,18 +21,28 @@ export type TableData = {
status?: string
/** 对照指标编码 */
conCode?: string
/** */
/** 业务类型1 */
itemType1?: string
/** */
/** 业务类型2 */
itemType2?: string
/** */
/** 业务类型3 */
itemType3?: string
/** */
/** 业务类型4 */
itemType4?: string
/** */
/** 业务类型5 */
itemType5?: string
/** 主键 */
criid?: string
/** 指标类型 */
indexType?: string
/** 指标计算类型 */
indexcalType?: string
/** 指标数据类型 */
indexdataType?: string
/** 指标数据精度 */
indexdataPrecision?: string
/** 指标数据项单位 */
indexdataUnit?: string
}
export interface DictItem {
@ -61,16 +71,26 @@ export type FormModel = {
status?: string
/** 对照指标编码 */
conCode?: string
/** */
/** 业务类型1 */
itemType1?: string
/** */
/** 业务类型2 */
itemType2?: string
/** */
/** 业务类型3 */
itemType3?: string
/** */
/** 业务类型4 */
itemType4?: string
/** */
/** 业务类型5 */
itemType5?: string
/** 主键 */
criid?: string
/** 指标类型 */
indexType?: string
/** 指标计算类型 */
indexcalType?: string
/** 指标数据类型 */
indexdataType?: string
/** 指标数据精度 */
indexdataPrecision?: string
/** 指标数据项单位 */
indexdataUnit?: string
}

@ -0,0 +1,60 @@
import request from '@/config/axios';
import type { TableData } from './types';
/** 获取表格数据 */
export const getRepDataModelListApi = (data: any) => {
return request.postJson({ url: '/RepDataModel/spi/dataset/RepDataModel/RepDataModelQueryPage', data });
};
/** 批量删除 */
export const delRepDataModelListApi = (list: string[] | number[]): Promise<IResponse> => {
const _list = list.map(v => {
return {
modelCode: v.modelCode,
};
});
return request.postJson({
url: '/RepDataModel/spi/dataset/RepDataModel/RepDataModelBatchDelete',
data: {
list: _list,
},
});
};
/** 删除 */
export const delRepDataModelApi = (modelCode?: string): Promise<IResponse> => {
return request.postJson({ url: '/RepDataModel/spi/dataset/RepDataModel/RepDataModelDelete', data: { modelCode } });
};
/** 保存 */
export const saveRepDataModelApi = (data: Partial<TableData>): Promise<IResponse> => {
return request.postJson({ url: '/RepDataModel/spi/dataset/RepDataModel/RepDataModelSave', data });
};
/** 查询单条数据 */
export const queryRepDataModelApi = (modelCode?: string): Promise<IResponse> => {
return request.postJson({ url: '/RepDataModel/spi/dataset/RepDataModel/RepDataModelQueryOne', data: { modelCode } });
};
/** 同步导入 */
export const importExcelApiUrl = '/RepDataModel/sui/dataset/RepDataModel/RepDataModelImportExcel';
/** 异步导入 */
export const importExcelAsyncApiUrl = '/RepDataModel/sui/dataset/RepDataModel/RepDataModelImportAsyncExcel';
/** 导出 */
export const exportExcelApi = (params: any) => {
return request.doExport({ url: '/RepDataModel/sdi/RepDataModel/RepDataModel/RepDataModelExportXls', params });
};
/** 获取某个字典 */
export const getCsckCheckType = ({ paramName, systemCode }): Promise<IResponse> => {
return request.postJson({
url: '/param/spi/param/systemparam',
data: {
paramName: paramName,
systemCode: systemCode,
},
});
};

@ -0,0 +1,36 @@
/* eslint-disable lines-around-comment */
export type TableData = {
/** 模型编码 */
modelCode?: string
/** 模型名称 */
modelName?: string
/** 描述 */
description?: string
/** 用户所属机构 */
organCode?: string
/** 登录用户 */
createUser?: string
/** 创建日期 */
createDate?: string
}
export interface DictItem {
dictId: string;
dictName: string;
}
export type FormModel = {
/** 模型编码 */
modelCode?: string
/** 模型名称 */
modelName?: string
/** 描述 */
description?: string
/** 用户所属机构 */
organCode?: string
/** 登录用户 */
createUser?: string
/** 创建日期 */
createDate?: string
}

@ -1891,6 +1891,18 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [
type:"ybt",
sort:8,
}
},
{
path: 'repDataModel',
component: () => import('@/views/dataset/RepDataModel/RepDataModel.vue'),
name: 'repDataModel',
menuId: 'repDataModel',
meta: {
title: '数据模型',
alwaysShow: true,
type:"ybt",
sort:9,
}
}
]
},

@ -95,6 +95,26 @@ const tableColumns = reactive<TableColumn[]>([
field: 'conCode',
label: '对照指标编码'
},
{
field: 'indexType',
label: '指标类型'
},
{
field: 'indexcalType',
label: '指标计算类型'
},
{
field: 'indexdataType',
label: '指标数据类型'
},
{
field: 'indexdataPrecision',
label: '指标数据精度'
},
{
field: 'indexdataUnit',
label: '指标数据项单位'
},
{
field: 'action',
label: t('tableDemo.action'),
@ -134,6 +154,18 @@ const tableColumns = reactive<TableColumn[]>([
].map(item => ({ minWidth: item.label ? getWidth(item.label) : 120, ...item }) as TableColumn))
const searchSchema = reactive<FormSchema[]>([
{
field: 'indexsetCode',
label: '指标集编码',
componentProps: {},
component: 'Input'
},
{
field: 'code',
label: '科目编码',
componentProps: {},
component: 'Input'
},
{
field: 'itemName',
label: '科目名称',
@ -147,14 +179,14 @@ const searchSchema = reactive<FormSchema[]>([
component: 'Select'
},
{
field: 'isOrgCollect',
label: '是否机构汇总',
field: 'status',
label: '状态',
componentProps: {},
component: 'Select'
},
{
field: 'status',
label: '状态',
field: 'indexType',
label: '指标类型',
componentProps: {},
component: 'Select'
}

@ -1,6 +1,6 @@
<script setup lang="tsx">
import { PropType, ref } from 'vue'
import { TableData } from '@/api/dataset/CodeRepItem'
import { TableData } from '@/api/dataset/CodeRepItem/types'
import { Descriptions, DescriptionsSchema } from '@/components/Descriptions'
const detailSchema = ref<DescriptionsSchema[]>([
@ -46,23 +46,43 @@ const detailSchema = ref<DescriptionsSchema[]>([
},
{
field: 'itemType1',
label: ''
label: '业务类型1'
},
{
field: 'itemType2',
label: ''
label: '业务类型2'
},
{
field: 'itemType3',
label: ''
label: '业务类型3'
},
{
field: 'itemType4',
label: ''
label: '业务类型4'
},
{
field: 'itemType5',
label: ''
label: '业务类型5'
},
{
field: 'indexType',
label: '指标类型'
},
{
field: 'indexcalType',
label: '指标计算类型'
},
{
field: 'indexdataType',
label: '指标数据类型'
},
{
field: 'indexdataPrecision',
label: '指标数据精度'
},
{
field: 'indexdataUnit',
label: '指标数据项单位'
}
])

@ -85,7 +85,7 @@ const formSchema = reactive<FormSchema[]>([
{
field: 'isOrgCollect',
label: '是否机构汇总',
component: 'Select',
component: 'Input',
componentProps: {
},
@ -108,7 +108,7 @@ const formSchema = reactive<FormSchema[]>([
},
{
field: 'itemType1',
label: '',
label: '业务类型1',
component: 'Input',
componentProps: {
@ -116,7 +116,7 @@ const formSchema = reactive<FormSchema[]>([
},
{
field: 'itemType2',
label: '',
label: '业务类型2',
component: 'Input',
componentProps: {
@ -124,7 +124,7 @@ const formSchema = reactive<FormSchema[]>([
},
{
field: 'itemType3',
label: '',
label: '业务类型3',
component: 'Input',
componentProps: {
@ -132,7 +132,7 @@ const formSchema = reactive<FormSchema[]>([
},
{
field: 'itemType4',
label: '',
label: '业务类型4',
component: 'Input',
componentProps: {
@ -140,7 +140,47 @@ const formSchema = reactive<FormSchema[]>([
},
{
field: 'itemType5',
label: '',
label: '业务类型5',
component: 'Input',
componentProps: {
},
},
{
field: 'indexType',
label: '指标类型',
component: 'Select',
componentProps: {
},
},
{
field: 'indexcalType',
label: '指标计算类型',
component: 'Input',
componentProps: {
},
},
{
field: 'indexdataType',
label: '指标数据类型',
component: 'Input',
componentProps: {
},
},
{
field: 'indexdataPrecision',
label: '指标数据精度',
component: 'Input',
componentProps: {
},
},
{
field: 'indexdataUnit',
label: '指标数据项单位',
component: 'Input',
componentProps: {
@ -149,7 +189,10 @@ const formSchema = reactive<FormSchema[]>([
])
const rules = reactive({
indexsetCode: [required()],
code: [required()],
beginDate: [required()],
endDate: [required()],
})
const submit = async () => {

@ -0,0 +1,292 @@
<script setup lang="tsx">
import { reactive, ref, unref } from 'vue'
import {
getRepDataModelListApi,
saveRepDataModelApi,
delRepDataModelListApi,
delRepDataModelApi,
queryRepDataModelApi,
importExcelApiUrl,
exportExcelApi
} from '@/api/dataset/RepDataModel'
import { TableData } from '@/api/dataset/RepDataModel/types'
import { useTable } from '@/hooks/web/useTable'
import { useI18n } from '@/hooks/web/useI18n'
import { Table, TableColumn } from '@/components/Table'
import { ElButton, ElLink, ElLoading, ElPopconfirm, ElMessage } from 'element-plus'
import { Search } from '@/components/Search'
import { FormSchema } from '@/components/Form'
import { ContentWrap } from '@/components/ContentWrap'
import Write from './components/Write.vue'
import { Dialog } from '@/components/Dialog'
import { getWidth } from '@/utils';
import Detail from './components/Detail.vue'
import { Upload } from '@/components/Upload'
const { t } = useI18n()
const ids = ref<string[]>([])
const { tableRegister, tableState, tableMethods } = useTable({
fetchDataApi: async () => {
const { currentPage, pageSize } = tableState
const res = await getRepDataModelListApi({
pageIndex: unref(currentPage),
pageSize: unref(pageSize),
...unref(searchParams)
})
return {
list: res.body.list,
total: res.body.total
}
},
fetchDelApi: async () => {
const res = await delRepDataModelListApi(unref(ids));
return !!res;
},
})
const { loading, dataList, total, currentPage, pageSize } = tableState
const { getList, getElTableExpose, delList, refresh } = tableMethods
const tableColumns = reactive<TableColumn[]>([
{
field: 'selection',
type: 'selection',
fixed: true
},
{
field: 'modelCode',
label: '模型编码'
},
{
field: 'modelName',
label: '模型名称'
},
{
field: 'description',
label: '描述'
},
{
field: 'organCode',
label: '用户所属机构'
},
{
field: 'createUser',
label: '登录用户'
},
{
field: 'createDate',
label: '创建日期'
},
{
field: 'action',
label: t('tableDemo.action'),
width: 160,
fixed: 'right',
slots: {
default: (data: any) => {
return (
<>
<ElLink type="primary" underline={false} onClick={() => action(data.row, 'edit')}>
{t('tableDemo.edit')}
</ElLink>
<ElPopconfirm
title={t('common.delTableMsg')}
width={200}
v-slots={{
reference: () => {
return (
<>
<ElLink type="primary" underline={false}>
{t('tableDemo.del')}
</ElLink>
</>
)
}
}}
onConfirm={() => delData(data.row)}
></ElPopconfirm>
<ElLink type="primary" underline={false} onClick={() => action(data.row, 'detail')}>
{t('tableDemo.detail')}
</ElLink>
</>
)
}
}
}
].map(item => ({ minWidth: item.label ? getWidth(item.label) : 120, ...item }) as TableColumn))
const searchSchema = reactive<FormSchema[]>([
{
field: 'modelCode',
label: '模型编码',
componentProps: {},
component: 'Input'
},
{
field: 'modelName',
label: '模型名称',
componentProps: {},
component: 'Input'
},
{
field: 'organCode',
label: '用户所属机构',
componentProps: {},
component: 'Select'
},
{
field: 'createDate',
label: '创建日期',
componentProps: {},
component: 'DatePicker'
}
])
const searchParams = ref({})
const setSearchParams = (data: any) => {
searchParams.value = data
getList()
}
const dialogVisible = ref(false)
const dialogTitle = ref('')
const currentRow = ref()
const actionType = ref('')
const writeRef = ref<ComponentRef<typeof Write>>()
/**单行查询**/
const action = async (row: TableData, type: string) => {
let detailLoading = ElLoading.service({
background: 'rgba(0, 0, 0, 0.7)'
})
const res = await queryRepDataModelApi(row.modelCode)
.catch(() => {})
.finally(() => {
detailLoading.close()
})
detailLoading.close()
if (res) {
const data = res.body.result
dialogTitle.value = t(type === 'edit' ? 'tableDemo.edit' : 'tableDemo.detail')
actionType.value = type
currentRow.value = data
dialogVisible.value = true
}
}
const AddAction = () => {
dialogTitle.value = t('tableDemo.add')
currentRow.value = undefined
dialogVisible.value = true
actionType.value = 'add'
}
const saveLoading = ref(false)
/** 保存 **/
const save = async () => {
const write = unref(writeRef)
const formData = await write?.submit()
if (formData) {
saveLoading.value = true
const res = await saveRepDataModelApi(formData)
.catch(() => {})
.finally(() => {
saveLoading.value = false
})
if (res) {
dialogVisible.value = false
currentPage.value = 1
getList()
}
}
}
const delLoading = ref(false)
/** 批量删除 **/
const delDataBatch = async () => {
const elTableExpose = await getElTableExpose()
ids.value = elTableExpose?.getSelectionRows().map((v: TableData) => { v.modelCode }) || []
delLoading.value = true
await delList(unref(ids).length).finally(() => {
delLoading.value = false
})
}
/** 单行删除 */
const delData = async (row: TableData) => {
const res = await delRepDataModelApi(row.modelCode)
if (res) {
const { code, errMsg } = res.head
if (code === '0') {
ElMessage.success('删除成功!')
getList()
} else {
ElMessage.error(errMsg || '删除失败!')
}
}
}
const disabled = ref(true)
const onSelectionChange = (selection: TableData[]) => {
disabled.value = selection.length === 0
}
/** 导出Excel */
const exportExcel = async () => {
const data = { ...unref(searchParams) }
await exportExcelApi(data)
}
</script>
<template>
<ContentWrap>
<Search :schema="searchSchema" @reset="setSearchParams" @search="setSearchParams" />
<Table
:columns="tableColumns"
v-model:pageSize="pageSize"
v-model:currentPage="currentPage"
default-expand-all
node-key="modelCode"
:data="dataList"
:loading="loading"
:pagination="{
total
}"
@selection-change="onSelectionChange"
@register="tableRegister"
@refresh="refresh"
>
<template #buttons>
<ElButton type="primary" @click="AddAction">{{ t('tableDemo.add') }}</ElButton>
<Upload :url="importExcelApiUrl" :callback="getList"> <ElButton type="primary">导入</ElButton> </Upload>
<ElButton type="primary" @click="exportExcel()"></ElButton>
<ElButton :loading="delLoading" type="primary" :disabled="disabled" @click="delDataBatch()">
{{ t('tableDemo.del') }}
</ElButton>
</template>
</Table>
</ContentWrap>
<Dialog v-model="dialogVisible" :title="dialogTitle">
<Write
v-if="actionType !== 'detail'"
ref="writeRef"
:current-row="currentRow"
:action-type="actionType"
/>
<Detail v-if="actionType === 'detail'" :current-row="currentRow" />
<template #footer>
<ElButton v-if="actionType !== 'detail'" type="primary" :loading="saveLoading" @click="save">
{{ t('dialogDemo.save') }}
</ElButton>
<ElButton @click="dialogVisible = false">{{ t('dialogDemo.close') }}</ElButton>
</template>
</Dialog>
</template>

@ -0,0 +1,43 @@
<script setup lang="tsx">
import { PropType, ref } from 'vue'
import { TableData } from '@/api/dataset/RepDataModel/types'
import { Descriptions, DescriptionsSchema } from '@/components/Descriptions'
const detailSchema = ref<DescriptionsSchema[]>([
{
field: 'modelCode',
label: '模型编码'
},
{
field: 'modelName',
label: '模型名称'
},
{
field: 'description',
label: '描述'
},
{
field: 'organCode',
label: '用户所属机构'
},
{
field: 'createUser',
label: '登录用户'
},
{
field: 'createDate',
label: '创建日期'
}
])
defineProps({
currentRow: {
type: Object as PropType<TableData>,
default: () => {}
}
})
</script>
<template>
<Descriptions :schema="detailSchema" :data="currentRow || {}" />
</template>

@ -0,0 +1,112 @@
<script setup lang="tsx">
import { Form, FormSchema } from '@/components/Form'
import { useForm } from '@/hooks/web/useForm'
import { PropType, reactive, watch } from 'vue'
import { useValidator } from '@/hooks/web/useValidator'
import dayjs from 'dayjs'
const { required } = useValidator()
const props = defineProps({
currentRow: {
type: Object as PropType<any>,
default: () => null
},
actionType: {
type: String,
default: 'add'
}
})
const { formRegister, formMethods } = useForm()
const { setValues, getFormData, getElFormExpose } = formMethods
const formSchema = reactive<FormSchema[]>([
{
field: 'modelCode',
label: '模型编码',
component: 'Input',
componentProps: {
},
},
{
field: 'modelName',
label: '模型名称',
component: 'Input',
componentProps: {
},
},
{
field: 'description',
label: '描述',
component: 'Input',
componentProps: {
},
},
{
field: 'organCode',
label: '用户所属机构',
component: 'Select',
componentProps: {
},
},
{
field: 'createUser',
label: '登录用户',
component: 'Input',
componentProps: {
},
},
{
field: 'createDate',
label: '创建日期',
component: 'DatePicker',
componentProps: {
},
}
])
const rules = reactive({
modelCode: [required()],
})
const submit = async () => {
const elForm = await getElFormExpose()
const valid = await elForm?.validate().catch((err) => {
console.log(err)
})
if (valid) {
const formData = await getFormData()
const { createDate } = formData;
Object.assign(formData, { createDate: dayjs(createDate).format('YYYY-MM-DD') })
return formData
}
}
watch(
() => props.currentRow,
(currentRow) => {
if (!currentRow) return
setValues(currentRow)
},
{
deep: true,
immediate: true
}
)
defineExpose({
submit
})
</script>
<template>
<Form :rules="rules" @register="formRegister" :schema="formSchema" />
</template>
Loading…
Cancel
Save