marymelisa 4 anni fa
parent
commit
7dceb1e041

+ 18 - 0
src/assets/styles/mixin.less

@@ -488,6 +488,24 @@
         }
     }
 }
+.dialogTable2 {
+    .ant-table {
+        .ant-table-thead {
+            tr {
+                th {
+                    background: @m-black13;
+                }
+            }
+        }
+        .ant-table-tbody {
+            tr {
+                td {
+                     background: @m-black13;
+                }
+            }
+        }
+    }
+}
 .ant-empty-normal {
     color: @m-grey17;
 }

+ 7 - 58
src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/components/bargain_detail/index.vue

@@ -12,7 +12,7 @@
                 <div class="formBar">
                     <a-table
                         :columns="columns"
-                        class="dialogTable"
+                        class="dialogTable dialogTable2"
                         :pagination="false"
                         :expandIcon="expandIcon"
                         :loading="loading"
@@ -130,6 +130,12 @@ export default defineComponent({
     .flex;
     flex-direction: column;
     overflow: hidden;
+    .ant-form {
+        height: 100%;
+        .formBar {
+            height: calc(100% - 70px);
+        }
+    }
     .condition {
         width: 100%;
         height: 48px;
@@ -157,61 +163,4 @@ export default defineComponent({
         }
     }
 }
-
-::v-deep.formProgress {
-    width: 140px;
-    // height: 3px;
-    // .rounded-corners(2px);
-    margin-left: 70px;
-    .ant-progress-outer {
-        margin-right: 0;
-        padding-right: 0;
-        .ant-progress-inner {
-            background: @m-grey14;
-            .rounded-corners(2px);
-            .ant-progress-bg {
-                height: 3px !important;
-                border-radius: 2px !important;
-                background-color: @m-blue0;
-            }
-        }
-    }
-    .ant-progress-text {
-        display: none;
-    }
-}
-.unit {
-    margin-left: 80px;
-    .flex;
-    justify-content: space-between;
-    font-size: 14px;
-    color: @m-grey41;
-    height: 14px;
-    line-height: 14px;
-}
-.listedBtn {
-    width: 120px;
-    height: 30px;
-    line-height: 30px;
-    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
-    border-radius: 3px;
-    color: @m-white0;
-    font-size: 14px;
-    text-align: center;
-    border: 0;
-    &:hover {
-        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
-        color: @m-white0-hover;
-    }
-}
-.cancelBtn:extend(.listedBtn) {
-    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
-    &:hover {
-        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%);
-        color: @m-white0-hover;
-    }
-}
-.ml10 {
-    margin-left: 10px;
-}
 </style>;

+ 7 - 58
src/views/order/spot_warran/components/spot_warrant_bargain/components/bargain_detail/index.vue

@@ -12,7 +12,7 @@
                 <div class="formBar">
                     <a-table
                         :columns="columns"
-                        class="dialogTable"
+                        class="dialogTable dialogTable2"
                         :pagination="false"
                         :expandIcon="expandIcon"
                         :loading="loading"
@@ -130,6 +130,12 @@ export default defineComponent({
     .flex;
     flex-direction: column;
     overflow: hidden;
+    .ant-form {
+        height: 100%;
+        .formBar {
+            height: calc(100% - 70px);
+        }
+    }
     .condition {
         width: 100%;
         height: 48px;
@@ -157,61 +163,4 @@ export default defineComponent({
         }
     }
 }
-
-::v-deep.formProgress {
-    width: 140px;
-    // height: 3px;
-    // .rounded-corners(2px);
-    margin-left: 70px;
-    .ant-progress-outer {
-        margin-right: 0;
-        padding-right: 0;
-        .ant-progress-inner {
-            background: @m-grey14;
-            .rounded-corners(2px);
-            .ant-progress-bg {
-                height: 3px !important;
-                border-radius: 2px !important;
-                background-color: @m-blue0;
-            }
-        }
-    }
-    .ant-progress-text {
-        display: none;
-    }
-}
-.unit {
-    margin-left: 80px;
-    .flex;
-    justify-content: space-between;
-    font-size: 14px;
-    color: @m-grey41;
-    height: 14px;
-    line-height: 14px;
-}
-.listedBtn {
-    width: 120px;
-    height: 30px;
-    line-height: 30px;
-    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
-    border-radius: 3px;
-    color: @m-white0;
-    font-size: 14px;
-    text-align: center;
-    border: 0;
-    &:hover {
-        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
-        color: @m-white0-hover;
-    }
-}
-.cancelBtn:extend(.listedBtn) {
-    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
-    &:hover {
-        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%);
-        color: @m-white0-hover;
-    }
-}
-.ml10 {
-    margin-left: 10px;
-}
 </style>;