解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue
@@ -300,16 +300,16 @@ function handleCardClick(item, index) {
    }
  }
 }
-::v-deep .el-tabs__header {
+:deep(.el-tabs__header) {
  padding: 0;
  position: relative;
  margin: 0 0 5px !important;
 }

-::v-deep .el-drawer__header {
+:deep(.el-drawer__header) {
  margin-bottom: 15px !important;
 }
-::v-deep .el-drawer__body {
+:deep(.el-drawer__body) {
  padding: 10px !important;
 }
 .el-badge {