diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index c8a4094..19a70cf 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -395,6 +395,9 @@ cursor: pointer; } + .el-table--default .cell { + padding: 0 0 0 .3125rem !important; + } // 表格input宽度,表格select宽度 .full-width-input .el-input__inner .el-select__inner { @@ -411,6 +414,7 @@ box-shadow: none; background: transparent !important; padding: 0 !important; + padding-left: .3125rem !important; outline: none; &:hover { diff --git a/src/components/elTable/index.vue b/src/components/elTable/index.vue index bfe57ab..ee6aef4 100644 --- a/src/components/elTable/index.vue +++ b/src/components/elTable/index.vue @@ -26,7 +26,10 @@ - + + + + diff --git a/src/views/liswork/components/charge/index.vue b/src/views/liswork/components/charge/index.vue index 7dacf12..cc5843c 100644 --- a/src/views/liswork/components/charge/index.vue +++ b/src/views/liswork/components/charge/index.vue @@ -100,9 +100,12 @@ const getInfoList = () => { }) } -watch(() => props.queryParams, (newValue) => { +watch(() => queryParams, (newValue) => { getInfoList() -}, { immediate: true }) +}, { + immediate: true, + deep: true +}) const getMxInfo = (row: any) => { const data = { diff --git a/src/views/liswork/components/clinical/index.vue b/src/views/liswork/components/clinical/index.vue index 06ea074..30b32e7 100644 --- a/src/views/liswork/components/clinical/index.vue +++ b/src/views/liswork/components/clinical/index.vue @@ -13,7 +13,6 @@ const info = ref('') const getClinicalInfo = (data: any) => { clinicInfo(data).then((res: any) => { if (res.code == 0) { - console.log('临床意义==>', res.data); info.value = res.data } }) @@ -26,7 +25,6 @@ onMounted(() => { } emitter.on('refreshClinical', (data) => { - console.log('data==>', data); getClinicalInfo(data) }) }) diff --git a/src/views/liswork/components/combination/index.vue b/src/views/liswork/components/combination/index.vue index 6b9e078..24beebe 100644 --- a/src/views/liswork/components/combination/index.vue +++ b/src/views/liswork/components/combination/index.vue @@ -58,7 +58,10 @@ const getCombination = () => { }; watch(() => props.queryParams.yq, (newValue) => { getCombination() -}, { immediate: true }) +}, { + immediate: true, + deep: true +}) const changeLxsr = (row: any) => { const lxsrs = tableData.value.filter((item: any) => item.lxsr).map((item: any) => item.mbmc); diff --git a/src/views/liswork/components/history/index.vue b/src/views/liswork/components/history/index.vue index 92e61f7..b802622 100644 --- a/src/views/liswork/components/history/index.vue +++ b/src/views/liswork/components/history/index.vue @@ -203,7 +203,10 @@ const getList = () => { watch(() => props.queryParams, (newValue) => { getList() -}, { immediate: true }) +}, { + immediate: true, + deep: true +}) const handleRowClick = (row: any) => { nextTick(() => { diff --git a/src/views/liswork/components/others/index.vue b/src/views/liswork/components/others/index.vue index 00aa891..6a002f9 100644 --- a/src/views/liswork/components/others/index.vue +++ b/src/views/liswork/components/others/index.vue @@ -171,7 +171,10 @@ const getOthersInfo = () => { watch(() => props.queryParams, (newValue) => { getOthersInfo() -}, { immediate: true }) +}, { + immediate: true, + deep: true +}) // 获取明细 const handleRowClick = (row: any) => { diff --git a/src/views/liswork/components/reexamination/index.vue b/src/views/liswork/components/reexamination/index.vue index 5e9c0ea..c2e7e64 100644 --- a/src/views/liswork/components/reexamination/index.vue +++ b/src/views/liswork/components/reexamination/index.vue @@ -56,7 +56,10 @@ const getReexamination = () => { watch(() => queryParams.value, () => { getReexamination(); -}, { immediate: true }) +}, { + immediate: true, + deep: true +}) const tableRef = ref(); const itemDictRef = ref(); // DictInput组件引用 @@ -111,7 +114,6 @@ const addRowFromDict = async (rowData: any) => { }; const handleCsjgEnter = (row: any) => { - console.log('复查结果修改', row); saveRedo(row) } diff --git a/src/views/liswork/components/resultGraph/index.vue b/src/views/liswork/components/resultGraph/index.vue index ef4ace5..a120b5f 100644 --- a/src/views/liswork/components/resultGraph/index.vue +++ b/src/views/liswork/components/resultGraph/index.vue @@ -43,7 +43,10 @@ const getResultGraph = () => { watch(() => props.queryParams, (newValue) => { getResultGraph() -}, { immediate: true }) +}, { + immediate: true, + deep: true +}) \ No newline at end of file diff --git a/src/views/liswork/micro/labresult/byj.vue b/src/views/liswork/micro/labresult/pyj.vue similarity index 56% rename from src/views/liswork/micro/labresult/byj.vue rename to src/views/liswork/micro/labresult/pyj.vue index 56f939b..64e020b 100644 --- a/src/views/liswork/micro/labresult/byj.vue +++ b/src/views/liswork/micro/labresult/pyj.vue @@ -1,22 +1,31 @@ - 打印培养基条码 - 自动打印培养基条码 + 新增 + 删除 + 打印培养基条码 + 自动打印培养基条码 - - 培养基 {{ tableData.length }}个 + + 培养基 {{ tableData?.length }}个 + + + +