From fbe705e4a28d2ad6a1f6e08a27379146bd7e1eed Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Thu, 31 Oct 2024 15:21:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 11 ++++++- .../dataset/IndexClassMs/IndexClassMs.vue | 11 +++++-- .../IndexSearchServiceMs.vue | 33 +++++++++---------- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index ab60199..17ab214 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1818,7 +1818,16 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ name: 'indexClassManage', menuId: 'indexClassManage', meta: { - title: '指标分类管理', + title: '指标分类管理' + } + }, + { + path: 'indexSearchServiceMs', + component: () => import('@/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue'), + name: 'IndexSearchServiceMs', + menuId: 'indexSearchServiceMs', + meta: { + title: '指标查询', alwaysShow: true, type:"ybt", sort:4, diff --git a/src/views/dataset/IndexClassMs/IndexClassMs.vue b/src/views/dataset/IndexClassMs/IndexClassMs.vue index 4eee44d..21a57d7 100644 --- a/src/views/dataset/IndexClassMs/IndexClassMs.vue +++ b/src/views/dataset/IndexClassMs/IndexClassMs.vue @@ -27,8 +27,11 @@ import { ContentWrap } from '@/components/ContentWrap' import Write from './components/Write.vue' import Detail from './components/Detail.vue' import { Dialog } from '@/components/Dialog' +import router from '@/router' - +defineOptions({ + name: 'IndexSearchServiceMs', +}); const { t } = useI18n() const ids = ref([]) @@ -55,6 +58,10 @@ const { tableRegister, tableState, tableMethods } = useTable({ const { loading, dataList, total, currentPage, pageSize } = tableState const { getList, refresh } = tableMethods +const lookRule = async (row: any) => { + router.push(`/dataset/indexSearchServiceMs`) +}; + const tableColumns = reactive([ { field: 'selection', @@ -108,7 +115,7 @@ const tableColumns = reactive([ }} onConfirm={() => delData(data.row)} > - action(data.row, 'detail')}> + lookRule(data.row)}> {'查询'} diff --git a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue index 395f3e3..507273f 100644 --- a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue +++ b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue @@ -64,11 +64,11 @@ const tableColumns = reactive([ }, { field: 'createTime', - label: '机构' + label: '机构名称' }, { field: 'tName', - label: '日期' + label: '数据日期' }, { field: 'tCategory', @@ -84,16 +84,17 @@ const searchSchema = reactive([ { field: 'orgCode', label: '机构', + colProps: { span: 100 }, componentProps: { checkStrictly: true, - nodeKey: 'id', - props: { children: 'childs', label: 'nodeName' }, + nodeKey: 'key', + props: { children: 'childrens', label: 'value' }, filterable: true, multiple: true, collapseTags: true, showCheckbox: true, - // style: { minWidth: '300px' }, - style: 'width: 100%', + style: { minWidth: '200px' }, + //style: 'width: 100%', checkOnClickNode: true, }, component: 'TreeSelect', @@ -111,10 +112,13 @@ const searchSchema = reactive([ }, }, { - field: 'tName', + field: 'Datadate', label: '日期', - componentProps: {}, - component: 'Input', + componentProps: { + type: 'date', + valueFormat: 'YYYYMMDD', + }, + component: 'DatePicker', formItemProps: { rules: [required()], }, @@ -223,7 +227,7 @@ const onSelectionChange = (selection: TableData[]) => { disabled.value = selection.length === 0 } const onContextMenu = (row: any, column: any, cell: HTMLTableCellElement, event: Event) => { - console.log(row,column,cell,event); + } @@ -248,14 +252,7 @@ const onContextMenu = (row: any, column: any, cell: HTMLTableCellElement, event: @register="tableRegister" @refresh="refresh" @cell-contextmenu="onContextMenu" - > - - + /> From 15995c4352cd3175b4a872fe38be4629c9ea530f Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Thu, 31 Oct 2024 16:14:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RepDataProblem/RepDataProblem.vue | 61 +++++++++++++++---- .../reporting/RepTemplate/RepTemplate.vue | 12 ++-- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/src/views/reporting/RepDataProblem/RepDataProblem.vue b/src/views/reporting/RepDataProblem/RepDataProblem.vue index 7779aa5..e6802ec 100644 --- a/src/views/reporting/RepDataProblem/RepDataProblem.vue +++ b/src/views/reporting/RepDataProblem/RepDataProblem.vue @@ -19,8 +19,14 @@ import Write from './components/Write.vue' import { Dialog } from '@/components/Dialog' import { getWidth } from '@/utils'; import Detail from './components/Detail.vue' +import { useValidator } from '@/hooks/web/useValidator' +import { getOrganTree } from '@/api/common' +import { getLoginOrganCodeByUserInfo } from '@/utils/auth' -const { t } = useI18n() +const { t } = useI18n(); +const { required } = useValidator(); +// 获取当前用户机构号 +const loginOrganCode = getLoginOrganCodeByUserInfo(); const ids = ref([]) @@ -92,16 +98,46 @@ const tableColumns = reactive([ const searchSchema = reactive([ { - field: 'createTime', - label: '生成时间', - componentProps: {type: 'daterange'}, - component: 'DatePicker' + field: 'organCode', + label: '机构', + colProps: { span: 100 }, + componentProps: { + checkStrictly: true, + nodeKey: 'key', + props: { children: 'childrens', label: 'value' }, + filterable: true, + multiple: true, + collapseTags: true, + showCheckbox: true, + style: { minWidth: '200px' }, + //style: 'width: 100%', + checkOnClickNode: true, + }, + component: 'TreeSelect', + optionApi: async () => { + const res = await getOrganTree({ + treeid: '1', + systemCode: 'portal', + loginOrganCode, + }); + return res.body.result; + }, + value: loginOrganCode, + formItemProps: { + rules: [required()], + }, }, { - field: 'tName', - label: '报告名称', - componentProps: {}, - component: 'Input' + field: 'dataDate', + label: '日期', + componentProps: { + type: 'date', + valueFormat: 'YYYYMMDD', + }, + component: 'DatePicker', + formItemProps: { + rules: [required()], + }, }, { field: 'tCategory', @@ -110,11 +146,12 @@ const searchSchema = reactive([ component: 'Select' }, { - field: 'organCode', - label: '所属机构', + field: 'tName', + label: '报告名称', componentProps: {}, - component: 'Select' + component: 'Input' } + ]) const searchParams = ref({}) diff --git a/src/views/reporting/RepTemplate/RepTemplate.vue b/src/views/reporting/RepTemplate/RepTemplate.vue index d847068..90c34e8 100644 --- a/src/views/reporting/RepTemplate/RepTemplate.vue +++ b/src/views/reporting/RepTemplate/RepTemplate.vue @@ -124,12 +124,6 @@ const tableColumns = reactive([ ].map(item => ({ minWidth: item.label ? getWidth(item.label) : 120, ...item }) as TableColumn)) const searchSchema = reactive([ - { - field: 'tName', - label: '名称', - componentProps: {}, - component: 'Input' - }, { field: 'tCategory', label: '报告分类', @@ -142,6 +136,12 @@ const searchSchema = reactive([ componentProps: {}, component: 'Input' }, + { + field: 'tName', + label: '名称', + componentProps: {}, + component: 'Input' + }, { field: 'createTime', label: '上传时间', From 062a9283db7b7e80971c2e099947a90a0484cfdd Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Thu, 31 Oct 2024 18:45:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/IndexClassMs/IndexClassMs.vue | 3 +++ .../dataset/IndexClassMs/components/Write.vue | 18 ++++++++++++------ .../IndexSearchServiceMs.vue | 3 +++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/views/dataset/IndexClassMs/IndexClassMs.vue b/src/views/dataset/IndexClassMs/IndexClassMs.vue index 21a57d7..e2d0862 100644 --- a/src/views/dataset/IndexClassMs/IndexClassMs.vue +++ b/src/views/dataset/IndexClassMs/IndexClassMs.vue @@ -99,6 +99,9 @@ const tableColumns = reactive([ default: (data: any) => { return ( <> + action(data.row, 'edit')}> + {t('tableDemo.edit')} + ([ { field: 'dicid', - label: '分类编号' + label: '分类编号', + component: 'Input', }, { field: 'dicname', - label: '分类名称' + label: '分类名称', + component: 'Input', }, { field: 'dicvalue', - label: '分类值' + label: '分类值', + component: 'Input', }, { field: 'parentname', - label: '上级分类' + label: '上级分类', + component: 'Input', }, { field: 'description', - label: '分类描述' + label: '分类描述', + component: 'Input', }, { field: 'status', - label: '分类状态' + label: '分类状态', + component: 'Input', } ]) diff --git a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue index 507273f..fb2c005 100644 --- a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue +++ b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue @@ -23,6 +23,9 @@ import { useValidator } from '@/hooks/web/useValidator' import { getLoginOrganCodeByUserInfo } from '@/utils/auth' import { getOrganTree } from '@/api/common' +defineOptions({ + name: 'IndexSearchServiceMs', +}); const { t } = useI18n() const { required } = useValidator(); From 9a8ac95db523ce82f643fd5d795c0e2550618226 Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Fri, 1 Nov 2024 15:48:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8B=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 } -