From 9a8ac95db523ce82f643fd5d795c0e2550618226 Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Fri, 1 Nov 2024 15:48:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A2=9E=E5=8A=A0=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RepTemplate/RepTemplate/index.ts | 4 +-- .../RepTemplate/RepTemplate/types.ts | 2 +- .../dataset/IndexMannageMs/IndexMannageMs.vue | 6 ++-- src/views/dataset/IndexMannageMs/constants.ts | 11 +++++++ .../RepDataProblem/RepDataProblem.vue | 11 +++++-- .../reporting/RepTemplate/RepTemplate.vue | 32 +++++++++++++------ .../RepTemplate/components/Write.vue | 14 +++++--- src/views/reporting/RepTemplate/constants.ts | 11 +++++++ 8 files changed, 70 insertions(+), 21 deletions(-) diff --git a/src/api/reporting/RepTemplate/RepTemplate/index.ts b/src/api/reporting/RepTemplate/RepTemplate/index.ts index 474fdee..a9403b0 100644 --- a/src/api/reporting/RepTemplate/RepTemplate/index.ts +++ b/src/api/reporting/RepTemplate/RepTemplate/index.ts @@ -47,8 +47,8 @@ export const exportExcelApi = (params: any) => { return request.doExport({ url: '/RepTemplate/sdi/reporting/RepTemplate/RepTemplateExportXls', params }); }; -/** 获取某个字典 */ -export const getCsckCheckType = ({ paramName, systemCode }): Promise => { +/** 获取报告分类 */ +export const getCategory = ({ paramName, systemCode }): Promise => { return request.postJson({ url: '/param/spi/param/systemparam', data: { diff --git a/src/api/reporting/RepTemplate/RepTemplate/types.ts b/src/api/reporting/RepTemplate/RepTemplate/types.ts index af61baa..335ce97 100644 --- a/src/api/reporting/RepTemplate/RepTemplate/types.ts +++ b/src/api/reporting/RepTemplate/RepTemplate/types.ts @@ -53,4 +53,4 @@ export type FormModel = { tDescription?: string /** 所属机构 */ organCode?: string -} +} \ No newline at end of file diff --git a/src/views/dataset/IndexMannageMs/IndexMannageMs.vue b/src/views/dataset/IndexMannageMs/IndexMannageMs.vue index d6e0156..f1fd430 100644 --- a/src/views/dataset/IndexMannageMs/IndexMannageMs.vue +++ b/src/views/dataset/IndexMannageMs/IndexMannageMs.vue @@ -19,7 +19,7 @@ import RuleConfig from './components/Ruleconfig.vue' import Write from './components/Write.vue' import { Dialog } from '@/components/Dialog' import { getWidth } from '@/utils'; -import { method } from 'lodash-es' +import { INDEX_CATAGOTY_LIST } from './constants' const { t } = useI18n() /** @@ -197,7 +197,9 @@ const indexDefineSearchSchema = reactive([ { field: 'tCategory', label: '指标计算类型', - componentProps: {}, + componentProps: { + options:INDEX_CATAGOTY_LIST + }, component: 'Select' }, { diff --git a/src/views/dataset/IndexMannageMs/constants.ts b/src/views/dataset/IndexMannageMs/constants.ts index e69de29..b483b84 100644 --- a/src/views/dataset/IndexMannageMs/constants.ts +++ b/src/views/dataset/IndexMannageMs/constants.ts @@ -0,0 +1,11 @@ +//指标计算类型 +export const INDEX_CATAGOTY_LIST = [ + { + value:"1", + label:"自动" + }, + { + value:"0", + label:"手动" + }, +] \ No newline at end of file diff --git a/src/views/reporting/RepDataProblem/RepDataProblem.vue b/src/views/reporting/RepDataProblem/RepDataProblem.vue index e6802ec..c283f52 100644 --- a/src/views/reporting/RepDataProblem/RepDataProblem.vue +++ b/src/views/reporting/RepDataProblem/RepDataProblem.vue @@ -17,11 +17,12 @@ 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 { getWidth, transfDictList } from '@/utils'; import Detail from './components/Detail.vue' import { useValidator } from '@/hooks/web/useValidator' import { getOrganTree } from '@/api/common' import { getLoginOrganCodeByUserInfo } from '@/utils/auth' +import { getCategory } from '@/api/reporting/RepTemplate/RepTemplate' const { t } = useI18n(); const { required } = useValidator(); @@ -142,8 +143,12 @@ const searchSchema = reactive([ { field: 'tCategory', label: '报告分类', - componentProps: {}, - component: 'Select' + optionApi: async () => { + const res = await getCategory({ paramName: 'reportingType_param', systemCode: 'ordb' }); + return transfDictList(res.body.result); + }, + value: '1', + component: 'Select' }, { field: 'tName', diff --git a/src/views/reporting/RepTemplate/RepTemplate.vue b/src/views/reporting/RepTemplate/RepTemplate.vue index 90c34e8..d63c90e 100644 --- a/src/views/reporting/RepTemplate/RepTemplate.vue +++ b/src/views/reporting/RepTemplate/RepTemplate.vue @@ -6,19 +6,21 @@ import { delRepTemplateListApi, delRepTemplateApi, queryRepTemplateApi, + getCategory, } from '@/api/reporting/RepTemplate/RepTemplate' import { TableData } from '@/api/reporting/RepTemplate/RepTemplate/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 { ElButton, ElLink, ElLoading, ElPopconfirm, ElMessage, ElTag } 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 { getWidth, transfDictList } from '@/utils'; import Detail from './components/Detail.vue' +import { REPORTING_TATUS_LIST } from './constants' const { t } = useI18n() @@ -68,10 +70,6 @@ const tableColumns = reactive([ field: 'uploadUser', label: '上传人' }, - { - field: 'tStatus', - label: '状态' - }, { field: 'tVersion', label: '版本' @@ -88,6 +86,19 @@ const tableColumns = reactive([ field: 'tDescription', label: '描述' }, + { + field: 'tStatus', + label: '状态', + formatter:(row:Recordable,_:TableColumn) =>{ + const state=REPORTING_TATUS_LIST.find((item)=>item.value===row.tStatus) + if(state&&state.value =='1'){ + return {state.label} + } + else{ + return 停用 + } + } + }, { field: 'action', label: t('tableDemo.action'), @@ -127,8 +138,12 @@ const searchSchema = reactive([ { field: 'tCategory', label: '报告分类', - componentProps: {}, - component: 'Select' + component: 'Select', + optionApi: async () => { + const res = await getCategory({ paramName: 'reportingType_param', systemCode: 'ordb' }); + return transfDictList(res.body.result); + }, + value: '1' }, { field: 'createUser', @@ -242,7 +257,6 @@ const disabled = ref(true) const onSelectionChange = (selection: TableData[]) => { disabled.value = selection.length === 0 } -