diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index f12c92e..dd9b46c 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -109,9 +109,30 @@ body { margin: 0; } .el-popper.is-light.type-popper, .el-popper.is-light>.el-popper__arrow:before{ - background:#F5FAFF !important; - padding: 0 !important; - //border: 1px solid #4D6DE4 !important; + background:#F5FAFF; +} +.el-popper.is-light.type-popper{ + background:#F5FAFF; + padding: 0; +} +.el-popper.is-light.id-code-popper{ + width: 218px; + border-radius: 8px; + padding:0; + border: 1px solid #EAEAEC; +} +.el-popper.is-light.traceability{ + padding:0; + border: 1px solid #EAEAEC; +} +.el-popper.is-light.id-code-popper .el-popover__title{ + height: 35px; + line-height: 35px; + margin-bottom: 0; + font-size: 14px; + padding-left:24px; + background:#F5FAFF; + border-radius: 8px 8px 0 0; } $btn-color: #4D6DE4; $lighter-color: #7c91e3; diff --git a/src/components/charge/AssociationIdCode.vue b/src/components/charge/AssociationIdCode.vue index 9433f3e..6acb32f 100644 --- a/src/components/charge/AssociationIdCode.vue +++ b/src/components/charge/AssociationIdCode.vue @@ -1,9 +1,8 @@ \ No newline at end of file diff --git a/src/components/charge/CheckoutDetail.vue b/src/components/charge/CheckoutDetail.vue index 22f7894..1890c23 100644 --- a/src/components/charge/CheckoutDetail.vue +++ b/src/components/charge/CheckoutDetail.vue @@ -16,7 +16,7 @@
- +
@@ -26,7 +26,7 @@ - +
发药项目追溯码
{{ item.name }} @@ -210,12 +210,36 @@ const addTraceAbilityCodeHandler = (item: any, code: any) => { width: 100%; height: 52px; font-weight: 500; - font-size: 14px; + font-size: 16px; color: #333333; + line-height: 22px; + text-align: left; font-style: normal; + padding: 0 25px; th { text-align: left; + + &:first-child { + padding-left: 25px; + width: 240px; + } + + &:nth-child(2) { + width: 146px; + } + + &:nth-child(3) { + width: 124px; + } + + &:nth-child(4) { + width: 132px; + } + + &:last-child { + padding-right: 25px; + } } } @@ -225,16 +249,25 @@ const addTraceAbilityCodeHandler = (item: any, code: any) => { font-size: 14px; color: #666666; font-style: normal; + padding: 0 25px; + tr { + height: 52px; + font-size: 14px; + color: #333333; - &:last-child { - border-radius: 0 0 8px 8px; + td { + &:first-child { + width: 132px; + padding-left: 25px; + } + + &:last-child { + padding-right: 25px; + } + } } - &:hover { - background-color: #4D6DE4; - color: #fff; - } } } } @@ -247,4 +280,10 @@ const addTraceAbilityCodeHandler = (item: any, code: any) => { align-items: center; padding: 24px; } +table, tbody, td { + border-bottom: 1px solid #EAEAEC; /* 明确设置边框 */ +} +table{ + border: none; +} \ No newline at end of file diff --git a/src/components/charge/IdCodeListShow.vue b/src/components/charge/IdCodeListShow.vue index 051d33a..40f592a 100644 --- a/src/components/charge/IdCodeListShow.vue +++ b/src/components/charge/IdCodeListShow.vue @@ -12,7 +12,9 @@ const props = defineProps({ title="已关联的追溯码产品标识码:" placement="bottom-start" trigger="hover" - width="250px" + width="218px" + popper-class="id-code-popper" + style="max-height: 221px" > @@ -40,8 +40,18 @@ const props = defineProps({ display: flex; .number{ margin-left: 10px; - color: green; + color: #4D6DE4; + } +} +.id-code-detail{ + .item{ + height: 35px; + line-height: 35px; + border-bottom: 1px solid #DCDFE6; + padding-left: 24px; + &:last-child{ + border-bottom: none; + } } - } \ No newline at end of file diff --git a/src/components/charge/TraceabilityCodeAdd.vue b/src/components/charge/TraceabilityCodeAdd.vue index 178edc6..1a4d097 100644 --- a/src/components/charge/TraceabilityCodeAdd.vue +++ b/src/components/charge/TraceabilityCodeAdd.vue @@ -1,45 +1,59 @@ \ No newline at end of file diff --git a/src/components/retail/IdCodeListShow.vue b/src/components/retail/IdCodeListShow.vue index 051d33a..95610e1 100644 --- a/src/components/retail/IdCodeListShow.vue +++ b/src/components/retail/IdCodeListShow.vue @@ -13,6 +13,7 @@ const props = defineProps({ placement="bottom-start" trigger="hover" width="250px" + popper-class="id-code-popper" > @@ -40,8 +39,19 @@ const props = defineProps({ display: flex; .number{ margin-left: 10px; - color: green; + color: #4D6DE4; } } +.id-code-detail{ + .item{ + height: 35px; + line-height: 35px; + border-bottom: 1px solid #DCDFE6; + padding-left: 24px; + &:last-child{ + border-bottom: none; + } + } +} \ No newline at end of file