diff --git a/src/api/liswork/xtwh/ComOpt.ts b/src/api/liswork/xtwh/ComOpt.ts index 5503157..08b53b4 100644 --- a/src/api/liswork/xtwh/ComOpt.ts +++ b/src/api/liswork/xtwh/ComOpt.ts @@ -74,4 +74,28 @@ export function delXmFilter(data?: Object) { method: 'get', params: data }); +} +// 获取试剂维护数据 +export function queryXmLot(data?: Object) { + return request({ + url: '/xminfo/queryXmLot', + method: 'get', + params: data + }); +} +// 新增试剂维护数据 +export function addXmLot(data?: Object) { + return request({ + url: '/xminfo/addXmLot', + method: 'post', + data + }); +} +// 删除试剂维护数据 +export function delXmLot(data?: Object) { + return request({ + url: '/xminfo/delXmLot', + method: 'get', + params: data + }); } \ No newline at end of file diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index c69d1db..c9cf9ce 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -258,6 +258,10 @@ // .el-table__body tr.hover-row>td { // background-color: #a4beef !important; // } + + .el-table__empty-block { + width: 100% !important; + } } .el-table--border { diff --git a/src/components/SelectTable/index.vue b/src/components/SelectTable/index.vue index a182fb1..5d036bc 100644 --- a/src/components/SelectTable/index.vue +++ b/src/components/SelectTable/index.vue @@ -44,8 +44,7 @@ \ No newline at end of file diff --git a/src/views/liswork/labItem/tab/sort.vue b/src/views/liswork/labItem/tab/sort.vue deleted file mode 100644 index 7d55d1d..0000000 --- a/src/views/liswork/labItem/tab/sort.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/liswork/micro/labresult/components/kssMb.vue b/src/views/liswork/micro/labresult/components/kssMb.vue index 97d90f9..336cad8 100644 --- a/src/views/liswork/micro/labresult/components/kssMb.vue +++ b/src/views/liswork/micro/labresult/components/kssMb.vue @@ -18,7 +18,7 @@ + + \ No newline at end of file diff --git a/src/views/liswork/xtwh/comopt/components/sysGlobal.vue b/src/views/liswork/xtwh/comopt/components/sysGlobal/index.vue similarity index 97% rename from src/views/liswork/xtwh/comopt/components/sysGlobal.vue rename to src/views/liswork/xtwh/comopt/components/sysGlobal/index.vue index 940ecbc..e234dcc 100644 --- a/src/views/liswork/xtwh/comopt/components/sysGlobal.vue +++ b/src/views/liswork/xtwh/comopt/components/sysGlobal/index.vue @@ -75,8 +75,7 @@ + + \ No newline at end of file diff --git a/src/views/liswork/xtwh/comopt/index.vue b/src/views/liswork/xtwh/comopt/index.vue index 06dca17..3e7ad85 100644 --- a/src/views/liswork/xtwh/comopt/index.vue +++ b/src/views/liswork/xtwh/comopt/index.vue @@ -43,13 +43,14 @@ import { ref, watch, nextTick, computed } from 'vue' import { ElMessage, ElTree, TreeNode, ElMessageBox, ElBadge } from 'element-plus' import { paramList, paramTree, getdef, updateParam } from '@/api/liswork/xtwh/ComOpt' -// @ts-ignore -import { getFirstLetter } from '@/utils/pinyin.js' +import { getFirstLetter } from '@/utils/pinyin' -import SysGlobal from './components/sysGlobal.vue' -import SysInput from './components/sysInput.vue' -import SysReport from './components/sysReport.vue' -import SysParameter from './components/sysParameter.vue' +import SysGlobal from './components/sysGlobal/index.vue' +import SysInput from './components/sysInput/index.vue' +import SysReport from './components/sysReport/index.vue' +import SysParameter from './components/sysParameter/index.vue' +import SysChannel from './components/sysChannel/index.vue' +import SysSort from './components/sysSort/index.vue' // ========== TypeScript 类型定义 ========== interface InstrTreeNode { @@ -107,6 +108,8 @@ const tabList = [ { key: 'SysGlobal', label: '全局设定', component: SysGlobal }, { key: 'SysInput', label: '界面设定', component: SysInput }, { key: 'SysParameter', label: '参数', component: SysParameter }, + { key: 'SysChannel', label: '通道号', component: SysChannel }, + { key: 'SysSort', label: '整体排序', component: SysSort }, { key: 'SysReport', label: '报告单设置', component: SysReport }, ] const activeName = ref('SysParameter') diff --git a/src/views/mzcx/cydj/components/OutPatList.vue b/src/views/mzcx/cydj/components/OutPatList.vue index 41f18f8..7d2a061 100644 --- a/src/views/mzcx/cydj/components/OutPatList.vue +++ b/src/views/mzcx/cydj/components/OutPatList.vue @@ -30,7 +30,7 @@