Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
2026-06-03 13:39:27 +08:00
9 changed files with 13 additions and 13 deletions

View File

@@ -34,7 +34,7 @@
width="1" width="1"
style="width: 0" style="width: 0"
> >
<template #default="scope"> <template #content="scope">
<el-form <el-form
:ref="'formRef' + scope.rowIndex" :ref="'formRef' + scope.rowIndex"
:model="scope.row" :model="scope.row"
@@ -1361,7 +1361,7 @@ defineExpose({ getListInfo });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.vxe-table--expand-icon) { :deep(.vxe-table--expand-btn) {
display: none !important; display: none !important;
} }
.medicine-title { .medicine-title {

View File

@@ -1388,7 +1388,7 @@ defineExpose({ getListInfo, closeAllPopovers });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.vxe-table--expand-icon) { :deep(.vxe-table--expand-btn) {
display: none !important; display: none !important;
} }
.medicine-title { .medicine-title {

View File

@@ -500,7 +500,7 @@ function cancel() {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.vxe-table--expand-icon) { :deep(.vxe-table--expand-btn) {
display: none !important; display: none !important;
} }
.medicine-title { .medicine-title {

View File

@@ -602,7 +602,7 @@ defineExpose({ getList });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.vxe-table--expand-icon) { :deep(.vxe-table--expand-btn) {
display: none !important; display: none !important;
} }

View File

@@ -321,7 +321,7 @@
width="1" width="1"
style="width: 0" style="width: 0"
> >
<template #default="scope"> <template #content="scope">
<el-form <el-form
:ref="'formRef' + scope.rowIndex" :ref="'formRef' + scope.rowIndex"
v-arrow-navigate v-arrow-navigate
@@ -5406,7 +5406,7 @@ defineExpose({ getListInfo, getDiagnosisInfo });
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.vxe-table--expand-icon) { :deep(.vxe-table--expand-btn) {
display: none !important; display: none !important;
} }

View File

@@ -206,7 +206,7 @@
width="1" width="1"
style="width: 0" style="width: 0"
> >
<template #default="scope"> <template #content="scope">
<el-form <el-form
:ref="'formRef' + pIndex + '-' + scope.rowIndex" :ref="'formRef' + pIndex + '-' + scope.rowIndex"
:model="scope.row" :model="scope.row"
@@ -1506,7 +1506,7 @@ defineExpose({ getListInfo, getDiagnosisInfo });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.vxe-table--expand-icon) { :deep(.vxe-table--expand-btn) {
display: none !important; display: none !important;
} }

View File

@@ -620,7 +620,7 @@ const msgSuccess = (msg) => {
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.vxe-table--expand-icon) { :deep(.vxe-table--expand-btn) {
display: none !important; display: none !important;
} }
.tableItemCheck { .tableItemCheck {

View File

@@ -1813,7 +1813,7 @@ const logHtml = () => {
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.vxe-table--expand-icon) { :deep(.vxe-table--expand-btn) {
display: none !important; display: none !important;
} }
.borderBottom { .borderBottom {

View File

@@ -107,7 +107,7 @@
@checkbox-change="handleSelectionChange" @checkbox-change="handleSelectionChange"
> >
<vxe-column type="expand" width="1" style="width: 0"> <vxe-column type="expand" width="1" style="width: 0">
<template #default="scope"> <template #content="scope">
<OrderForm <OrderForm
:row="scope.row" :row="scope.row"
:index="scope.rowIndex" :index="scope.rowIndex"
@@ -2707,7 +2707,7 @@ defineExpose({ getListInfo, getDiagnosisInfo });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.vxe-table--expand-icon) { :deep(.vxe-table--expand-btn) {
display: none !important; display: none !important;
} }