diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 709eab3..38a38d5 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -124,7 +124,7 @@ aside { //main-container全局样式 .app-container { padding: 10px 10px 0 10px; - min-height: calc(100vh - 84px); + min-height: calc(100vh - 5.25rem); } .components-container { @@ -308,4 +308,29 @@ aside { .next_btn { margin-right: 0.2rem; } +} + + +.search-form { + :deep(.el-form-item__label) { + padding: 0 !important; + } + + :deep(.el-form-item) { + margin-right: 0; + } + + .el-form-item--default { + margin-bottom: .3125rem !important; + } + + .el-form-item--small { + margin-bottom: .3125rem !important; + } +} + + +.page-box { + margin-top: 10px; + float: right; } \ No newline at end of file diff --git a/src/components/SelectTable/YQSelectTable/index.vue b/src/components/SelectTable/YQSelectTable/index.vue index c1489ab..2de5c10 100644 --- a/src/components/SelectTable/YQSelectTable/index.vue +++ b/src/components/SelectTable/YQSelectTable/index.vue @@ -19,11 +19,12 @@ const props = withDefaults(defineProps<{ size?: string, clearable?: boolean, instrGroup?: string | number, //部门组代号 - data: string + data: string | undefined }>(), { width: '100%', size: 'default', - clearable: false + clearable: false, + data: '' }) const instrOptions = ref>([]); diff --git a/src/components/SelectTable/index.vue b/src/components/SelectTable/index.vue index e03c36e..f72ac82 100644 --- a/src/components/SelectTable/index.vue +++ b/src/components/SelectTable/index.vue @@ -55,12 +55,13 @@ const props = withDefaults(defineProps(), { placeholder: "请选择", size: "default", isHighlight: true, - value: undefined, - label: undefined, - border: false, + value: 'value', + label: 'label', + border: true, width: "100%", dictType: '', - clearable: true + clearable: true, + objKey: '' }); diff --git a/src/views/liswork/labItem/index.vue b/src/views/liswork/labItem/index.vue index 39a797b..73c6a5a 100644 --- a/src/views/liswork/labItem/index.vue +++ b/src/views/liswork/labItem/index.vue @@ -1,55 +1,52 @@ + +
+ +
- + - + @@ -88,15 +91,15 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/liswork/labItem/tab/CommonlyValues.vue b/src/views/liswork/labItem/tab/CommonlyValues.vue index 5f69e9a..64f6107 100644 --- a/src/views/liswork/labItem/tab/CommonlyValues.vue +++ b/src/views/liswork/labItem/tab/CommonlyValues.vue @@ -8,12 +8,12 @@ @@ -27,7 +27,7 @@ \ No newline at end of file diff --git a/src/views/liswork/labItem/tab/base/child/MultiRef.vue b/src/views/liswork/labItem/tab/base/child/MultiRef.vue index 9e46407..38197db 100644 --- a/src/views/liswork/labItem/tab/base/child/MultiRef.vue +++ b/src/views/liswork/labItem/tab/base/child/MultiRef.vue @@ -2,18 +2,26 @@ - - - - -

多行参考值,每行作为一段:

-

如果系统使用标准性激素报告单,

-

则第一行表示:男性

-

第二行表示:女卵泡期

-

第三行表示:排卵期

-

第四行表示:黄体期

-

第五行表示:绝经期

-
+ + + + + + + + +
多行参考值,每行作为一段: + 如果系统使用标准性激素报告单,
+ 则第一行表示:男性
+ 第二行表示:女卵泡期
+ 第三行表示:排卵期
+ 第四行表示:黄体期
+ 第五行表示:绝经期
+
+
+
+ +
- + diff --git a/src/views/liswork/labItem/tab/commonDescriptions.vue b/src/views/liswork/labItem/tab/commonDescriptions.vue index 7ed82a4..832284d 100644 --- a/src/views/liswork/labItem/tab/commonDescriptions.vue +++ b/src/views/liswork/labItem/tab/commonDescriptions.vue @@ -30,8 +30,8 @@ const columns = ref([ ]); const tableConfig = ref({ border: true, // 边框 - height: '80vh', // 高度 - highlightCurrentRow: true, // 高亮当前行 + height: '78vh', // 高度 + // highlightCurrentRow: true, // 高亮当前行 // cellStyle: cellStyleHd }) @@ -47,7 +47,7 @@ const emit = defineEmits(['refreshTabData']) //序号最大值 const maxXh = computed(() => { - return modelParam.value.commonDescriptionsData.length > 0 ? Math.max(...modelParam.value.commonDescriptionsData.map((item: any) => item.xh || 0)) : 0; + return modelParam.value.commonDescriptionsData.length > 0 ? modelParam.value.commonDescriptionsData.length + 1 : 0; }); const rowClick = (row: any) => { @@ -59,7 +59,7 @@ const onAddClick = () => { const newData: XmTextresultNew = { xmid: modelParam.value.basicData.xmid, xmdh: modelParam.value.basicData.xmdh, - xh: maxXh.value + 1 + xh: maxXh.value } modelParam.value.commonDescriptionsData.push(newData) } diff --git a/src/views/liswork/labItem/tab/knowledge.vue b/src/views/liswork/labItem/tab/knowledge.vue index 160df33..68edfa0 100644 --- a/src/views/liswork/labItem/tab/knowledge.vue +++ b/src/views/liswork/labItem/tab/knowledge.vue @@ -1,9 +1,9 @@ @@ -32,7 +32,7 @@ const columns = ref([ ]); const tableConfig = ref({ border: true, // 边框 - height: '87vh', // 高度 + height: '81.5vh', // 高度 highlightCurrentRow: true, // 高亮当前行 // cellStyle: cellStyleHd }) diff --git a/src/views/liswork/labItem/tab/useInstr.vue b/src/views/liswork/labItem/tab/useInstr.vue index a5920e5..cfe4886 100644 --- a/src/views/liswork/labItem/tab/useInstr.vue +++ b/src/views/liswork/labItem/tab/useInstr.vue @@ -8,7 +8,7 @@