From e9b09087f519df8bfa286a0780c2795003515484 Mon Sep 17 00:00:00 2001
From: liuxiaoxue <1126966868@qq.com>
Date: Thu, 1 Dec 2022 17:43:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E8=88=B1=E8=AF=A6=E6=83=85=E5=A4=9A?=
 =?UTF-8?q?=E5=93=81=E5=90=8D=E5=A4=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |  2 +-
 .../BookingLedger/detail/modules/billInfo.vue |  2 +-
 .../detail/modules/goodsTable.vue             | 41 +++++++++++++++----
 src/views/main/BookingLedger/list/index.vue   | 11 ++++-
 .../BookingLedger/list/modules/initData.js    |  4 +-
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/public/index.html b/public/index.html
index 1126b16..063449a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -95,7 +95,7 @@
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
     <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
     <% } %>
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_sqw8em8u0p.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_5nvf0rgprqc.css" />
     <!-- 1.8K仔百度收录 -->
     <meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
   </head>
diff --git a/src/views/main/BookingLedger/detail/modules/billInfo.vue b/src/views/main/BookingLedger/detail/modules/billInfo.vue
index 1b8a085..3cb9fdd 100644
--- a/src/views/main/BookingLedger/detail/modules/billInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue
@@ -628,7 +628,7 @@ export default {
 .base-tit {
   font-size: 14px;
   font-weight: 600;
-  color: #666;
+  color: #333;
   position: relative;
   height: 40px;
   line-height: 40px;
diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
index c36a274..56cee91 100644
--- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue
+++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
@@ -3,11 +3,11 @@
     <a-card :bordered="false">
       <div class="from-line">
         <div class="left">
-          <a-button class="btn" type="primary" @click="addboxLine">添加</a-button>
-          <a-button class="btn" @click="removeLine">删除</a-button>
-          <a-button class="btn" type="primary" @click="openDialog" :disabled="tableData.length === 0">多品名</a-button>
-          <a-button class="btn" type="primary" @click="importYarn" :loading="YarnLoading">引入场站数据</a-button>
-          <a-button class="btn" type="primary" @click="importWeight" :loading="WeightLoading">引入箱皮重</a-button>
+          <a-button class="btn btn-add" type="primary" @click="addboxLine">添加</a-button>
+          <a-button class="btn btn-delete" @click="removeLine" :style="{marginRight:'50px'}">删除</a-button>
+          <a-button class="btn btn-more-name" type="primary" @click="openDialog" :disabled="tableData.length === 0"><a-icon type="appstore" />多品名</a-button>
+          <a-button class="btn btn-import-station" type="primary" @click="importYarn" :loading="YarnLoading"><a-icon type="import" />引入场站数据</a-button>
+          <a-button class="btn btn-weight" type="primary" @click="importWeight" :loading="WeightLoading"><a-icon type="import" />引入箱皮重</a-button>
         </div>
         <div class="table-right">
           <!-- <span>合计: {{ totalCtnall }}</span> -->
@@ -49,7 +49,7 @@
         />
         <div class="model-botton-box">
           <a-button class="btn" type="primary" @click="addChildData">新增</a-button>
-          <a-button class="btn" @click="removeChildData">删除</a-button>
+          <a-button class="btn btn-delete" @click="removeChildData">删除</a-button>
           <a-button class="btn" type="primary" @click="saveChildData">保存</a-button>
         </div>
         <div class="model-child-table">
@@ -1028,6 +1028,22 @@ export default {
     .btn {
       margin-right: 10px;
     }
+    .btn-delete{
+      border: 1px solid #ff6646;
+      background: #fdf2f0;
+      color: #ff6646;
+      &:hover{
+        border: 1px solid #ff6646 !important;
+        background: #fdf2f0 !important;
+        color: #ff6646 !important;
+        opacity:.7;
+      }
+    }
+    .btn-more-name,.btn-import-station,.btn-weight{
+      border: 1px solid @primary-color;
+      color: @primary-color;
+      background-color: #f5f9fe;
+    }
   }
   .table-right {
     line-height: 28px;
@@ -1042,10 +1058,21 @@ export default {
 
 .model-content {
   .model-botton-box {
-    margin: 40px 0;
+    margin: 40px 0 20px;
     .btn {
       margin-right: 10px;
     }
+    .btn-delete{
+      border: 1px solid #ff6646;
+      background: #fdf2f0;
+      color: #ff6646;
+      &:hover{
+        border: 1px solid #ff6646 !important;
+        background: #fdf2f0 !important;
+        color: #ff6646 !important;
+        opacity:.7;
+      }
+    }
   }
 }
 .table-no-data {
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 3649436..340f675 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -72,6 +72,9 @@
               @cell-dblclick="handledbclick"
               style="margin-top:15px;"
             >
+              <template #mblno="{ row }">
+                <div class="mblno">{{ row.mblno }}</div>
+              </template>
               <template #vessel="{ row }">
                 <div class="vessel">{{ row.vessel }}</div>
               </template>
@@ -554,9 +557,13 @@ export default {
 }
 </style>
 <style lang="less" scoped>
-.vessel {
-  color: #ffa93e;
+/*订舱表格内字体颜色 */
+.mblno{
+  color: #3277ff;
 }
+/*.vessel {
+  color: #77c950;
+}*/
 .nav-box {
   margin-bottom: 10px;
   padding: 0 10px;
diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js
index df483b8..025cb5d 100644
--- a/src/views/main/BookingLedger/list/modules/initData.js
+++ b/src/views/main/BookingLedger/list/modules/initData.js
@@ -3,8 +3,8 @@ export default {
     { type: 'checkbox', width: 60, noDraggable: true },
     { field: 'carrier', title: '船公司', showHeaderOverflow: true, sortable: true },
     { field: 'yard', title: '场站', showHeaderOverflow: true, sortable: true },
-    { field: 'mblno', title: '提单号', showHeaderOverflow: true, sortable: true },
-    { title: '船名航次', showHeaderOverflow: true, sortable: true,slots: { default: 'vessel' } },
+    { title: '提单号', showHeaderOverflow: true, sortable: true, slots: { default: 'mblno' } },
+    { title: '船名航次', showHeaderOverflow: true, sortable: true, slots: { default: 'vessel' } },
     { field: 'etd', title: '开船日期', showHeaderOverflow: true, sortable: true },
     { field: 'voyno', title: '海关航次', showHeaderOverflow: true },
     { field: 'bookingStatus', title: '定舱状态', showHeaderOverflow: true },