diff --git a/src/views/main/BookingLedger/detail/components/ediMore.vue b/src/views/main/BookingLedger/detail/components/ediMore.vue index ed8d814..271f79c 100644 --- a/src/views/main/BookingLedger/detail/components/ediMore.vue +++ b/src/views/main/BookingLedger/detail/components/ediMore.vue @@ -1,5 +1,5 @@ @@ -307,7 +313,7 @@ has-feedback prop="dclass" > - + @@ -319,7 +325,7 @@ has-feedback prop="dunno" > - + @@ -331,7 +337,7 @@ has-feedback prop="dpage" > - + @@ -343,7 +349,7 @@ has-feedback prop="dlabel" > - + @@ -355,7 +361,7 @@ has-feedback prop="linkman" > - + @@ -821,12 +827,18 @@ export default { right: 10px !important; } +.bill-info{ + padding-bottom: 10px; +} .bill-info-box{ /deep/ .ant-row{ - margin-bottom: 5px !important; + margin-bottom: 0 !important; } } +/deep/ .ant-collapse-content-box{ + padding: 0 !important; +} /deep/ .ant-calendar-picker-clear{ color: rgba(0, 0, 0, 0.25) !important; } @@ -838,4 +850,14 @@ export default { /deep/ .collapse-box{ margin-bottom: 2px !important; } + +/deep/ .ant-form-item-label { + height:36px !important; + line-height: 36px !important; + // border: 1px solid #f00; +} +/deep/ .ant-form-item-control{ + height:36px !important; + line-height: 36px !important; +} diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue index a45fda6..3dba7f4 100644 --- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue @@ -9,7 +9,7 @@ -
+
Seal No.(封志号)
Marks & Nos.(标记与号码)
@@ -38,6 +38,7 @@
-
-
货物标志
- - +
+
货物标志
+ + S 普通货 R 冻柜 D 危险品 @@ -61,10 +62,10 @@
-
-
HS编码
- - +
+
HS编码
+ +
@@ -295,28 +296,32 @@ export default { .tit { text-align: left; width: 100%; - margin-bottom: 10px; - height: 54px; - padding-top: 4px; + -webkit-box-sizing: border-box; box-sizing: border-box; + line-height: 18px; } - .line { text-align: left; width: 100%; display: flex; - margin-bottom: 10px; - height: 54px; + // margin-bottom: 10px; + // height: 54px; } .left { + // text-align: left; + // display: inline-block; + // padding-top: 4px; + // flex: 1; + text-align: left; display: inline-block; - padding-top: 4px; + /* padding-top: 4px; */ flex: 1; + line-height: 18px; .title{ - padding-bottom:4px; + // padding-bottom:4px; width: 90%; overflow: hidden; text-overflow: ellipsis; @@ -345,9 +350,34 @@ export default { display: inline-block; width: 120px; margin-right: 10px; + .ant-form-item{ + margin-bottom: 0; + } + } + .cargo-info-tit{ + font-size: 14px; + line-height: 18px; + height: 45px; + } + + /deep/ .ant-form-item-label { + height:36px !important; + line-height: 36px !important; + } + /deep/ .ant-form-item-control{ + height:36px !important; + line-height: 36px !important; + } + .line{ + height: 45px; + } + .cargo-mark{ + padding: 0; + height: 56px; } .input-box { - height: 200px; + // height: 200px; + height: 100px; font-size: 14px; } .num-box { @@ -401,7 +431,8 @@ export default { margin-top: -6px; } .textarea-label{ - // margin-top: 18px; + margin-bottom: 0; + min-height: 104px; } .required{ padding-left: 10px; diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index bf5fa93..5fb5e59 100644 --- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue +++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue @@ -1,13 +1,13 @@