From 457e9f2d27f0cee2fcbca6d331cea1cf64e4feb3 Mon Sep 17 00:00:00 2001
From: jiangkuan <jiangkuan@myshipping.net>
Date: Tue, 25 Apr 2023 13:39:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=AB=99=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=92=8C=E5=AD=97=E4=BD=93=E6=98=BE=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |    2 +-
 src/components/GlobalHeader/GlobalHeader.vue  |    4 +-
 src/components/global.less                    |    3 +
 .../BookingLedger/detail/style/basicInfo.less |    4 +-
 .../BookingLedger/detail/style/billInfo.less  |    3 +
 .../detail/style/mailingInfo.less             |    5 +-
 .../detail/style/operationArea.less           |    1 +
 .../main/ViewDeletedList/ViewDeletedList.vue  | 1966 ++++++++---------
 8 files changed, 991 insertions(+), 997 deletions(-)

diff --git a/public/index.html b/public/index.html
index 99f168a..773812c 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_h38tucwhmn.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_qbc103sjo2g.css" />
     <!-- 1.8K仔百度收录 -->
     <meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
   </head>
diff --git a/src/components/GlobalHeader/GlobalHeader.vue b/src/components/GlobalHeader/GlobalHeader.vue
index 5aa349a..2fdd267 100644
--- a/src/components/GlobalHeader/GlobalHeader.vue
+++ b/src/components/GlobalHeader/GlobalHeader.vue
@@ -147,7 +147,9 @@ export default {
 
 <style lang="less">
 @import '../index.less';
-
+.header ul{
+  color: black;
+}
 .header-animat{
   position: relative;
   z-index: @ant-global-header-zindex;
diff --git a/src/components/global.less b/src/components/global.less
index 40e3d22..134edb4 100644
--- a/src/components/global.less
+++ b/src/components/global.less
@@ -382,6 +382,9 @@ body {
 }
 
 // 菜单样式
+.ant-layout-sider-children ul li span {
+  color: black;
+}
 .sider {
   box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
   position: relative;
diff --git a/src/views/main/BookingLedger/detail/style/basicInfo.less b/src/views/main/BookingLedger/detail/style/basicInfo.less
index 6b89830..0ddee20 100644
--- a/src/views/main/BookingLedger/detail/style/basicInfo.less
+++ b/src/views/main/BookingLedger/detail/style/basicInfo.less
@@ -2,7 +2,9 @@
     margin-bottom: 0;
     overflow: hidden;
   }
-  
+  /deep/ .from-label label{
+    color: black;
+  }
   .from-box {
     border-bottom: 1px dashed #ccc;
     margin-bottom: 2px;
diff --git a/src/views/main/BookingLedger/detail/style/billInfo.less b/src/views/main/BookingLedger/detail/style/billInfo.less
index 63d2dca..aef83ce 100644
--- a/src/views/main/BookingLedger/detail/style/billInfo.less
+++ b/src/views/main/BookingLedger/detail/style/billInfo.less
@@ -88,6 +88,9 @@
   .bill-info{
     padding-bottom: 10px;
   }
+  .bill-info /deep/ label{
+    color: black;
+  }
   .bill-info-box{
     /deep/ .ant-row{
       margin-bottom: 0 !important;
diff --git a/src/views/main/BookingLedger/detail/style/mailingInfo.less b/src/views/main/BookingLedger/detail/style/mailingInfo.less
index 843f054..e8cdd39 100644
--- a/src/views/main/BookingLedger/detail/style/mailingInfo.less
+++ b/src/views/main/BookingLedger/detail/style/mailingInfo.less
@@ -2,6 +2,7 @@
     margin-bottom: 2px;
     background: #fff;
   }
+
   .base-tit {
     font-size: 14px;
     font-weight: 600;
@@ -312,7 +313,9 @@
   /deep/ .right-content .ant-form-explain {
     display: none !important;
   }
-  
+  /deep/ .right-content label{
+    color: black;
+  }
   @media (max-width: 1800px) {
     // .feeself {
     //   right: -75px !important;
diff --git a/src/views/main/BookingLedger/detail/style/operationArea.less b/src/views/main/BookingLedger/detail/style/operationArea.less
index 0e7278f..96fa0ad 100644
--- a/src/views/main/BookingLedger/detail/style/operationArea.less
+++ b/src/views/main/BookingLedger/detail/style/operationArea.less
@@ -65,6 +65,7 @@
         font-size: 14px;
         color: #666;
         cursor: pointer;
+        color: black;
         background: #fff;
         .iconfont {
           font-size: 16px;
diff --git a/src/views/main/ViewDeletedList/ViewDeletedList.vue b/src/views/main/ViewDeletedList/ViewDeletedList.vue
index 4c32ade..29c5615 100644
--- a/src/views/main/ViewDeletedList/ViewDeletedList.vue
+++ b/src/views/main/ViewDeletedList/ViewDeletedList.vue
@@ -1,205 +1,187 @@
 <template>
-    <div>
-        <vxe-toolbar>
-                <template #buttons>
-                  <div class="nav-box">
-                    <a-popconfirm
-                      title="确定恢复当前选中订舱？"
-                      ok-text="是"
-                      cancel-text="否"
-                      @confirm="removeMoreFun"
-                      @cancel="cancelRemove"
-                    >
-                      <div class="nav"><i class="iconfont icon-zhuanhuan"></i>批量恢复</div>
-                    </a-popconfirm>
-                  </div>
-                </template>
-               
-              </vxe-toolbar>
-        <vxe-grid
-                ref="xGrid"
-                v-bind="gridOptions"
-                row-class-name="line-box"
-                :height="tableHeight"
-                :checkbox_config="{ checkField: 'checked' }"
-                :scroll-x="{ gt: 10, oSize: 10, enabled: false }"
-                :scroll-y="{ gt: 20, oSize: 20, enabled: true }"
-                @page-change="handlePageChange"
-                @resizable-change="resizableChange"
-                @sort-change="tableSortChange"
-                @scroll="pageClick"
-                @checkbox-change="checkboxChangeEvent"
-              >
-                <template #mblno="{ row }">
-                  <div class="mblno">
-                    <span>{{ row.mblno }}</span>
-                    <a-icon class="CSMblnoCopy" type="copy" @click="FnCopy(row.mblno)" />
-                  </div>
-                </template>
-                <template #pono="{ row }">
-                  <div class="pono">
-                    {{ row.pono }}
-                  </div>
-                </template>
-                <template #vessel="{ row }">
-                  <div class="vessel">{{ row.vessel }}</div>
-                </template>
-                <template #remarks="{ row }">
-                  <a-popover title="备注消息">
-                    <template slot="content">
-                      <p>订舱备注： {{ row.soremark }}</p>
-                      <p>截单备注： {{ row.siremark }}</p>
-                    </template>
-                    <div class="remarks">{{ row.soremark }} / {{ row.siremark }}</div>
-                  </a-popover>
-                </template>
-                <template #etd="{ row }">
-                  <div class="etd" v-if="row.etd">{{ row.etd.substring(0, 10) }}</div>
-                </template>
-                <template #atd="{ row }">
-                  <div class="atd" v-if="row.atd">{{ row.atd.substring(0, 10) }}</div>
-                </template>
-                <template #issuedate="{ row }">
-                  <div class="atd" v-if="row.issuedate">{{ row.issuedate.substring(0, 10) }}</div>
-                </template>
-                <template #closingdate="{ row }">
-                  <div class="closingdate" v-if="row.closingdate">{{ row.closingdate.substring(0, 13) }}</div>
-                </template>
-                <template #operate="{ row }">
-                  <!-- <vxe-button
+  <div>
+    <vxe-toolbar>
+      <template #buttons>
+        <div class="nav-box">
+          <a-popconfirm
+            title="确定恢复当前选中订舱？"
+            ok-text="是"
+            cancel-text="否"
+            @confirm="removeMoreFun"
+            @cancel="cancelRemove"
+          >
+            <div class="nav"><i class="iconfont icon-fanhui"></i>批量恢复</div>
+          </a-popconfirm>
+        </div>
+      </template>
+    </vxe-toolbar>
+    <vxe-grid
+      ref="xGrid"
+      v-bind="gridOptions"
+      row-class-name="line-box"
+      :height="tableHeight"
+      :checkbox_config="{ checkField: 'checked' }"
+      :scroll-x="{ gt: 10, oSize: 10, enabled: false }"
+      :scroll-y="{ gt: 20, oSize: 20, enabled: true }"
+      @page-change="handlePageChange"
+      @resizable-change="resizableChange"
+      @sort-change="tableSortChange"
+      @scroll="pageClick"
+      @checkbox-change="checkboxChangeEvent"
+    >
+      <template #mblno="{ row }">
+        <div class="mblno">
+          <span>{{ row.mblno }}</span>
+          <a-icon class="CSMblnoCopy" type="copy" @click="FnCopy(row.mblno)" />
+        </div>
+      </template>
+      <template #pono="{ row }">
+        <div class="pono">
+          {{ row.pono }}
+        </div>
+      </template>
+      <template #vessel="{ row }">
+        <div class="vessel">{{ row.vessel }}</div>
+      </template>
+      <template #remarks="{ row }">
+        <a-popover title="备注消息">
+          <template slot="content">
+            <p>订舱备注： {{ row.soremark }}</p>
+            <p>截单备注： {{ row.siremark }}</p>
+          </template>
+          <div class="remarks">{{ row.soremark }} / {{ row.siremark }}</div>
+        </a-popover>
+      </template>
+      <template #etd="{ row }">
+        <div class="etd" v-if="row.etd">{{ row.etd.substring(0, 10) }}</div>
+      </template>
+      <template #atd="{ row }">
+        <div class="atd" v-if="row.atd">{{ row.atd.substring(0, 10) }}</div>
+      </template>
+      <template #issuedate="{ row }">
+        <div class="atd" v-if="row.issuedate">{{ row.issuedate.substring(0, 10) }}</div>
+      </template>
+      <template #closingdate="{ row }">
+        <div class="closingdate" v-if="row.closingdate">{{ row.closingdate.substring(0, 13) }}</div>
+      </template>
+      <template #operate="{ row }">
+        <!-- <vxe-button
                     class="operate-btn"
                     type="text"
                     icon="vxe-icon-edit"
                     @click="editColumns(row)"
                   ></vxe-button> -->
-                  <a-popconfirm
-                    title="确定恢复当前订舱？"
-                    ok-text="是"
-                    cancel-text="否"
-                    @confirm="removeFun(row)"
-                    @cancel="cancelRemove"
-                  >
-                    <vxe-button class="operate-btn" type="text" icon="vxe-icon-arrow-left"></vxe-button>
-                  </a-popconfirm>
-                </template>
-                <!-- <template #bookstatus="{ row }">
+        <a-popconfirm
+          title="确定恢复当前订舱？"
+          ok-text="是"
+          cancel-text="否"
+          @confirm="removeFun(row)"
+          @cancel="cancelRemove"
+        >
+          <vxe-button class="operate-btn" type="text" icon="iconfont icon-return"></vxe-button>
+        </a-popconfirm>
+      </template>
+      <!-- <template #bookstatus="{ row }">
                 <span class="book-btn" v-for="(btn,bindex) in row.bookstatus" :class="btn.staCode" :key="bindex"> {{ enmuBookingBtn(btn.staCode) }}<i>/</i></span>
               </template> -->
-                <template #bookstatus="{ row, column }">
-                  <div class="billtrace-box" :class="column.resizeWidth > 240 ? 'normal-box' : 'flex-box'">
-                    <div
-                      class="billtrace-btn"
-                      v-for="(btn, bindex) in row.bookstatus"
-                      :class="btn.staCode"
-                      :key="bindex"
-                    >
-                      <a-popover placement="topLeft" v-if="btn.staTime">
-                        <div slot="content">{{ btn.staTime }}</div>
-                        <span :class="{ active: btn.isChecked }">{{ enmuBookingBtn(btn.staCode) }}</span>
-                      </a-popover>
-                      <span :class="{ active: btn.isChecked }" v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
-                      <i
-                        class="iconfont icon-xiaoyoujiantou"
-                        :class="{ hide: bindex === row.bookstatus.length - 1 }"
-                      ></i>
-                    </div>
-                  </div>
-                </template>
-                <template #bookremark="{ row }">
-                  <!-- @mouseover="remarkhover($event, row)" -->
-                  <div class="bookremark" @mouseover="remarkhover($event, row)" @mouseleave="remarkLeave($event, row)">
-                    <span class="reamrk-label">
-                      <template v-for="remark in row.bookremark">
-                        {{ remark.remark }}
-                      </template>
-                    </span>
-                  </div>
-                </template>
-                <template #lstShipOrderCompareRlt="{ row }">
-                  <div class="goods-status">
-                    <a-popover>
-                      <template slot="content">
-                        <p>
-                          比对方式:
-                          <span>{{
-                            row.lstShipOrderCompareMode
-                              ? row.lstShipOrderCompareMode == 'MANUAL'
-                                ? '手动'
-                                : '自动'
-                              : ''
-                          }}</span>
-                        </p>
-                        <p>
-                          比对时间: <span>{{ row.lstShipOrderCompareDate }}</span>
-                        </p>
-                      </template>
-                      <div v-if="row.lstShipOrderCompareRlt">
-                        <div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
-                          <a-icon type="close-circle" :style="{ color: 'red' }" />
-                        </div>
-                        <div v-else-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">
-                          <a-icon type="check-circle" :style="{ color: '#54bc25' }" />
-                        </div>
-                        <!-- <div v-else>
+      <template #bookstatus="{ row, column }">
+        <div class="billtrace-box" :class="column.resizeWidth > 240 ? 'normal-box' : 'flex-box'">
+          <div class="billtrace-btn" v-for="(btn, bindex) in row.bookstatus" :class="btn.staCode" :key="bindex">
+            <a-popover placement="topLeft" v-if="btn.staTime">
+              <div slot="content">{{ btn.staTime }}</div>
+              <span :class="{ active: btn.isChecked }">{{ enmuBookingBtn(btn.staCode) }}</span>
+            </a-popover>
+            <span :class="{ active: btn.isChecked }" v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
+            <i class="iconfont icon-xiaoyoujiantou" :class="{ hide: bindex === row.bookstatus.length - 1 }"></i>
+          </div>
+        </div>
+      </template>
+      <template #bookremark="{ row }">
+        <!-- @mouseover="remarkhover($event, row)" -->
+        <div class="bookremark" @mouseover="remarkhover($event, row)" @mouseleave="remarkLeave($event, row)">
+          <span class="reamrk-label">
+            <template v-for="remark in row.bookremark">
+              {{ remark.remark }}
+            </template>
+          </span>
+        </div>
+      </template>
+      <template #lstShipOrderCompareRlt="{ row }">
+        <div class="goods-status">
+          <a-popover>
+            <template slot="content">
+              <p>
+                比对方式:
+                <span>{{
+                  row.lstShipOrderCompareMode ? (row.lstShipOrderCompareMode == 'MANUAL' ? '手动' : '自动') : ''
+                }}</span>
+              </p>
+              <p>
+                比对时间: <span>{{ row.lstShipOrderCompareDate }}</span>
+              </p>
+            </template>
+            <div v-if="row.lstShipOrderCompareRlt">
+              <div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
+                <a-icon type="close-circle" :style="{ color: 'red' }" />
+              </div>
+              <div v-else-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">
+                <a-icon type="check-circle" :style="{ color: '#54bc25' }" />
+              </div>
+              <!-- <div v-else>
                         {{ row.lstShipOrderCompareRltName }}
                       </div> -->
-                      </div>
-                    </a-popover>
-
-                    <a-icon
-                      class="TablelstShipOrderCompareRltRedo"
-                      @click="excuteShippingOrderCompareBatch(row)"
-                      type="redo"
-                    />
-                  </div>
-                </template>
-                <template #goodsStatusList="{ row }">
-                  <div class="goods-status">
-                    <div class="goods-status-left">
-                      <template v-for="(status, sindex) in row.goodsStatusList">
-                        <a-popover placement="top" :key="sindex" v-show="status.finishTime || status.remark">
-                          <div slot="content">
-                            <div v-if="status.finishTime">时间：{{ status.finishTime }}</div>
-                            <div v-if="status.remark">备注：{{ status.remark }}</div>
-                            <div v-if="status.extData">显示天数：{{ status.extData }}</div>
-                          </div>
-                          <span class="goods-tip">{{ status.statusName }}</span>
-                        </a-popover>
-                      </template>
-                    </div>
-                    <!-- @mouseover="goodStatusHover($event, row)" @mouseleave="goodStatusLeave($event, row)" -->
-                    <div class="goods-status-right" @click.stop="goodStatusclick($event, row)" v-if="row.hasGoods > 0">
-                      <i class="iconfont icon-zhankai2"></i>
-                    </div>
-                  </div>
-                </template>
-
-                <template #dzRemark="{ row }">
-                  <div v-if="row.dzRemark">
-                    <a-popover placement="topLeft" :content="row.dzRemark">
-                      <span class="dzRemark">{{ row.dzRemark }}</span>
-                    </a-popover>
-                  </div>
-                </template>
-
-                <template #czRemark="{ row }">
-                  <div v-if="row.czRemark">
-                    <a-popover placement="topLeft" :content="row.czRemark">
-                      <span class="czRemark">{{ row.czRemark }}</span>
-                    </a-popover>
-                  </div>
-                </template>
-
-                <template #empty>
-                  <span class="no-data">
-                    <i class="iconfont icon-queshengye_zanwushuju"></i>
-                    <p>没有更多数据了！</p>
-                  </span>
-                </template>
-              </vxe-grid>
-              
-    </div>
-  </template>
+            </div>
+          </a-popover>
+
+          <a-icon class="TablelstShipOrderCompareRltRedo" @click="excuteShippingOrderCompareBatch(row)" type="redo" />
+        </div>
+      </template>
+      <template #goodsStatusList="{ row }">
+        <div class="goods-status">
+          <div class="goods-status-left">
+            <template v-for="(status, sindex) in row.goodsStatusList">
+              <a-popover placement="top" :key="sindex" v-show="status.finishTime || status.remark">
+                <div slot="content">
+                  <div v-if="status.finishTime">时间：{{ status.finishTime }}</div>
+                  <div v-if="status.remark">备注：{{ status.remark }}</div>
+                  <div v-if="status.extData">显示天数：{{ status.extData }}</div>
+                </div>
+                <span class="goods-tip">{{ status.statusName }}</span>
+              </a-popover>
+            </template>
+          </div>
+          <!-- @mouseover="goodStatusHover($event, row)" @mouseleave="goodStatusLeave($event, row)" -->
+          <div class="goods-status-right" @click.stop="goodStatusclick($event, row)" v-if="row.hasGoods > 0">
+            <i class="iconfont icon-zhankai2"></i>
+          </div>
+        </div>
+      </template>
+
+      <template #dzRemark="{ row }">
+        <div v-if="row.dzRemark">
+          <a-popover placement="topLeft" :content="row.dzRemark">
+            <span class="dzRemark">{{ row.dzRemark }}</span>
+          </a-popover>
+        </div>
+      </template>
+
+      <template #czRemark="{ row }">
+        <div v-if="row.czRemark">
+          <a-popover placement="topLeft" :content="row.czRemark">
+            <span class="czRemark">{{ row.czRemark }}</span>
+          </a-popover>
+        </div>
+      </template>
+
+      <template #empty>
+        <span class="no-data">
+          <i class="iconfont icon-queshengye_zanwushuju"></i>
+          <p>没有更多数据了！</p>
+        </span>
+      </template>
+    </vxe-grid>
+  </div>
+</template>
 <script>
 import { XCard, setFormModel } from '@/components'
 import columnSetting from '@/components/tableColumnSetting'
@@ -226,7 +208,7 @@ import {
   DeleteBookingOrder,
   RecoverDeleteOrder,
   ExcuteShippingOrderCompareBatch,
-  GetTenantLineList
+  GetTenantLineList,
 } from '@/api/modular/main/BookingLedger'
 
 import initData from './modules/initData'
@@ -238,7 +220,7 @@ const formInitData = [
   { title: '订舱编号', align: 'center', width: '90', label: 'CUSTNO', type: 'input' },
   { title: '开船日期', align: 'center', width: 160, label: 'ETD', type: 'dateRange', resLabel: ['BETD', 'EETD'] },
   { title: '实际开船日期', align: 'center', width: 160, label: 'ATD', type: 'dateRange', resLabel: ['BATD', 'EATD'] },
-  { title: '船名', align: 'center', width: '90', label: 'VESSEL', type: 'input' }
+  { title: '船名', align: 'center', width: '90', label: 'VESSEL', type: 'input' },
 ]
 export default {
   name: 'BookingLedger',
@@ -247,14 +229,14 @@ export default {
     XCard,
     columnSetting,
     setFormModel,
-    formLabel
+    formLabel,
   },
   data() {
     return {
       spinning: false,
       TaskShippingOrderCompareVisible: false,
       TaskShippingOrderCompareData: {
-        showDetailList: ''
+        showDetailList: '',
       },
       ResetType: true,
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
@@ -285,10 +267,10 @@ export default {
           total: 0,
           currentPage: 1,
           pageSize: 20,
-          pageSizes: [10, 20, 50, 100, 200, 500]
+          pageSizes: [10, 20, 50, 100, 200, 500],
         },
         columns: JSON.parse(JSON.stringify(initData.columns)),
-        data: []
+        data: [],
         // treeConfig: {
         //   transform: true,
         //   rowField: 'index',
@@ -303,7 +285,7 @@ export default {
       radioStyle: {
         display: 'block',
         height: '50px',
-        lineHeight: '50px'
+        lineHeight: '50px',
       },
       moreNumVisible: false,
       moreNumVal: '',
@@ -318,7 +300,7 @@ export default {
       editingModalVisible: false,
       traceOptions: [
         { label: '起运港', value: '1' },
-        { label: '目的港', value: '2' }
+        { label: '目的港', value: '2' },
       ],
       traceValue: [],
       addNum: 0,
@@ -334,11 +316,11 @@ export default {
       portDischargeData: [],
       destinationData: [],
       RcarrierData: [],
-      RecentlyCarrierData: []
+      RecentlyCarrierData: [],
     }
   },
   computed: {
-    ...mapGetters(['bookingList', 'bookingGridOptions'])
+    ...mapGetters(['bookingList', 'bookingGridOptions']),
   },
   beforeRouteLeave(to, from, next) {
     // const copyArr = JSON.parse(JSON.stringify(this.gridOptions.data))
@@ -368,7 +350,7 @@ export default {
     next()
   },
   beforeRouteEnter(to, from, next) {
-    next(vm => {
+    next((vm) => {
       vm.upDate()
     })
   },
@@ -438,16 +420,16 @@ export default {
     // 批量编辑
     editingHandleOk() {
       const {
-        editingForm: { validateFields }
+        editingForm: { validateFields },
       } = this
       validateFields((errors, values) => {
         if (!errors) {
           values.id = []
           const select = this.$refs.xGrid.getCheckboxRecords()
-          select.forEach(item => {
+          select.forEach((item) => {
             values.id.push(item.id)
           })
-          BookingOrderBachUpdate(values).then(res => {
+          BookingOrderBachUpdate(values).then((res) => {
             if (res.success) {
               this.$message.success('编辑成功')
               this.editingHandleCancel()
@@ -474,7 +456,7 @@ export default {
         this.WebVessel = data
       }
 
-      GetVessellist({ KeyWord: data }).then(res => {
+      GetVessellist({ KeyWord: data }).then((res) => {
         this.vesselData = res.data
       })
     },
@@ -483,40 +465,40 @@ export default {
         setTimeout(() => {
           this.editingForm.setFieldsValue({
             ...this.editingForm.getFieldsValue(),
-            vessel: this.WebVessel
+            vessel: this.WebVessel,
           })
         }, 100)
       }
     },
     portDischargeSearch(data) {
-      GetPortlist({ KeyWord: data }).then(res => {
+      GetPortlist({ KeyWord: data }).then((res) => {
         this.portDischargeData = res.data
       })
     },
     portDischargeChange(value) {
-      this.portDischargeData.forEach(item => {
+      this.portDischargeData.forEach((item) => {
         if (item.enName == value) {
           setTimeout(() => {
             this.editingForm.setFieldsValue({
               ...this.editingForm.getFieldsValue(),
-              portDischargeId: item.ediCode
+              portDischargeId: item.ediCode,
             })
           }, 100)
         }
       })
     },
     destinationSearch(data) {
-      GetPortlist({ KeyWord: data }).then(res => {
+      GetPortlist({ KeyWord: data }).then((res) => {
         this.destinationData = res.data
       })
     },
     destinationChange(value) {
-      this.destinationData.forEach(item => {
+      this.destinationData.forEach((item) => {
         if (item.enName == value) {
           setTimeout(() => {
             this.editingForm.setFieldsValue({
               ...this.editingForm.getFieldsValue(),
-              destinationid: item.ediCode
+              destinationid: item.ediCode,
             })
           }, 100)
         }
@@ -536,16 +518,16 @@ export default {
         total: 0,
         currentPage: 1,
         pageSize: this.gridOptions.pagerConfig.pageSize,
-        pageSizes: [10, 20, 50, 100, 200, 500]
+        pageSizes: [10, 20, 50, 100, 200, 500],
       }
       this.gridOptions.data = []
       this.getList(queryParam)
     },
     getConfigUser(isInit = false) {
       const query = {
-        typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page']
+        typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page'],
       }
-      DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then(res => {
+      DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then((res) => {
         const $data = {}
         res.data.map((item, index) => {
           switch (item.type) {
@@ -577,11 +559,11 @@ export default {
     },
     // 船公司 - start
     getCarrier() {
-      const Rdata = data => {
+      const Rdata = (data) => {
         let RData = {}
         for (var i = 0; i < 26; i++) {
           RData[String.fromCharCode(65 + i)] = []
-          data.forEach(item => {
+          data.forEach((item) => {
             if (String.fromCharCode(65 + i) == item.enName[0].toUpperCase()) {
               RData[String.fromCharCode(65 + i)].push(item)
             }
@@ -592,17 +574,17 @@ export default {
           'E-L': ['E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'],
           'M-R': ['M', 'N', 'O', 'P', 'Q', 'R'],
           'S-U': ['S', 'T', 'U'],
-          'V-Z': ['V', 'W', 'X', 'Y', 'Z']
+          'V-Z': ['V', 'W', 'X', 'Y', 'Z'],
         }
         let Data = {
           'A-D': [],
           'E-L': [],
           'M-R': [],
           'S-U': [],
-          'V-Z': []
+          'V-Z': [],
         }
-        Object.keys(Obj).forEach(e => {
-          Obj[e].forEach(item => {
+        Object.keys(Obj).forEach((e) => {
+          Obj[e].forEach((item) => {
             RData[item].forEach((Ai, AiIndex) => {
               let imgSrc = ''
               try {
@@ -618,15 +600,15 @@ export default {
         this.RcarrierData = Data
       }
       GetCarrierlist()
-        .then(res => {
+        .then((res) => {
           if (res.code === 200) {
             Rdata(res.data)
             DjyUserConfigGet({ type: 'booking_memory' })
-              .then(e => {
+              .then((e) => {
                 if (e.data) {
                   let data = []
-                  JSON.parse(e.data.configJson).forEach(item => {
-                    res.data.forEach(item2 => {
+                  JSON.parse(e.data.configJson).forEach((item) => {
+                    res.data.forEach((item2) => {
                       if (item == item2.code) {
                         data.push(item2)
                       }
@@ -640,7 +622,7 @@ export default {
               })
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -744,7 +726,7 @@ export default {
     },
 
     getFormData(isReset = false) {
-      DjyUserConfigGet({ type: 'booking_list_cond' }).then(res => {
+      DjyUserConfigGet({ type: 'booking_list_cond' }).then((res) => {
         this.setFormData(res.data)
       })
     },
@@ -766,7 +748,7 @@ export default {
     },
     getFromSelectData(func, ...args) {
       return new Promise((resolve, reject) => {
-        func(...args).then(res => {
+        func(...args).then((res) => {
           if (res.code === 200) {
             resolve(res.data)
           } else {
@@ -786,12 +768,12 @@ export default {
 
     editPageSizeSave(pageSize = 10) {
       const data = {
-        pageSize: pageSize
+        pageSize: pageSize,
       }
       DjyUserConfigAdd({
         type: 'booking_list_page',
-        configJson: JSON.stringify(data)
-      }).then(res => {
+        configJson: JSON.stringify(data),
+      }).then((res) => {
         console.log('页码设置成功')
       })
     },
@@ -839,7 +821,7 @@ export default {
         'D+': date.getDate(),
         'h+': date.getHours(),
         'm+': date.getMinutes(),
-        's+': date.getSeconds()
+        's+': date.getSeconds(),
       }
       for (const k in o) {
         if (new RegExp(`(${k})`).test(fmt)) {
@@ -883,8 +865,8 @@ export default {
       this.searchData = {}
       DjyUserConfigAdd({
         type: 'booking_list_cond',
-        configJson: JSON.stringify(arr)
-      }).then(res => {
+        configJson: JSON.stringify(arr),
+      }).then((res) => {
         this.$message.success('保存成功')
         this.$refs.setForm.handleCancel()
         Object.keys(this.$refs).map((label, index) => {
@@ -933,8 +915,8 @@ export default {
     editColumnsSave(data = {}) {
       DjyUserConfigAdd({
         type: 'booking_list_column',
-        configJson: JSON.stringify(data)
-      }).then(res => {
+        configJson: JSON.stringify(data),
+      }).then((res) => {
         this.$refs.setForm.handleCancel()
       })
     },
@@ -965,11 +947,11 @@ export default {
         ...{
           PageNo: currentPage,
           PageSize: pageSize,
-          ISDel:true
+          ISDel: true,
         },
         ...{
-          SortField: this.tableOrderLabel
-        }
+          SortField: this.tableOrderLabel,
+        },
       }
       Object.keys(query).map((item, index) => {
         if (!query[item]) {
@@ -987,8 +969,8 @@ export default {
         query.firstFlag = true
       }
       BookingOrderPage(query)
-        .then(res => {
-           console.log('BookingOrderPage==>>',query)
+        .then((res) => {
+          console.log('BookingOrderPage==>>', query)
           if (res.success) {
             let newBookingList = {}
             if (query.PageNo !== 1) {
@@ -1003,7 +985,7 @@ export default {
                 { staCode: 'sta_zhuangzai', isChecked: false },
                 { staCode: 'sta_mafang', isChecked: false },
                 { staCode: 'sta_zhuangchuan', isChecked: false },
-                { staCode: 'sta_atd', isChecked: false }
+                { staCode: 'sta_atd', isChecked: false },
               ]
               if (item.bookstatus.length > 0) {
                 bookstatus.map((book, bindex) => {
@@ -1042,7 +1024,7 @@ export default {
           this.ResetType = true
           console.log(this.gridOptions)
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -1078,7 +1060,7 @@ export default {
       let data = []
       data.push(this.carrierRadio)
       if (this.RecentlyCarrierData.length) {
-        this.RecentlyCarrierData.forEach(item => {
+        this.RecentlyCarrierData.forEach((item) => {
           if (item.code != this.carrierRadio && data.length < 10) {
             data.push(item.code)
           }
@@ -1087,8 +1069,8 @@ export default {
 
       DjyUserConfigAdd({
         type: 'booking_memory',
-        configJson: JSON.stringify(data)
-      }).then(res => {
+        configJson: JSON.stringify(data),
+      }).then((res) => {
         this.getCarrier()
         this.addVisible = false
         this.addNum = Math.round(Math.random() * 1000)
@@ -1110,7 +1092,7 @@ export default {
       this.moreNumVal
         .replace(/\n|\r/g, ',')
         .split(',')
-        .forEach(item => {
+        .forEach((item) => {
           if (item.replace(/\s*/g, '')) {
             if (data) {
               data = `${data},${item}`
@@ -1259,7 +1241,7 @@ export default {
           yardCode: this.traceValue.includes('1') ? item.yardid : '',
           carrierid: this.traceValue.includes('2') ? item.carrierid : '',
           carrier: this.traceValue.includes('2') ? item.carrier : '',
-          isBook: !!this.traceValue.includes('2')
+          isBook: !!this.traceValue.includes('2'),
         }
         arr.push(query)
       })
@@ -1270,7 +1252,7 @@ export default {
       }
 
       SendTrace(arr)
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             const tip = `订阅成功`
             this.$message.success(tip)
@@ -1282,7 +1264,7 @@ export default {
             this.traceValue = []
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -1301,50 +1283,50 @@ export default {
           'ISSUEPLACE',
           'PREPARDAT',
           'SERVICE',
-          'SHIPAGENCY'
+          'SHIPAGENCY',
         ].includes(form.label)
       ) {
         // 船公司  卸货港
         query = {
-          KeyWord: value
+          KeyWord: value,
         }
       } else if (form.label === 'CUSTOMERNAME') {
         // 客户/ 委托单位
         query = {
           KeyWord: value,
-          type: 'consignor'
+          type: 'consignor',
         }
       } else if (form.label === 'FORWARDER') {
         // 订舱代理
         query = {
           KeyWord: value,
-          type: 'booking_agent'
+          type: 'booking_agent',
         }
       } else if (['SALE', 'CUSTSERVICE', 'DOC', 'ROUTE', 'OP'].includes(form.label)) {
         // 销售 、 揽货人, 航线操作
         query = {
-          name: value
+          name: value,
         }
       } else if (form.label === 'CUSTOMSER') {
         // 报关行
         query = {
           SearchValue: value,
-          PropString: 'customs_broker'
+          PropString: 'customs_broker',
         }
       } else if (form.label === 'AGENTID') {
         query = {
           SearchValue: value,
-          PropString: 'out_agent'
+          PropString: 'out_agent',
         }
       } else if (form.label === 'TRUCKER') {
         query = {
           SearchValue: value,
-          PropString: 'fleet'
+          PropString: 'fleet',
         }
       }
       const fun = this.emnuCompleteApi(form.label)
       if (fun) {
-        this.getFromSelectData(this.emnuCompleteApi(form.label), query).then(data => {
+        this.getFromSelectData(this.emnuCompleteApi(form.label), query).then((data) => {
           if (['CUSTOMERNAME', 'FORWARDER', 'CUSTOMSER', 'AGENTID', 'TRUCKER'].includes(form.label)) {
             this.$refs[`fromlabel-${form.label}`][0].$data.dataSourceList = data.rows
           } else {
@@ -1406,7 +1388,7 @@ export default {
     getSelectFirst({ form, index, value }) {
       const fun = this.emnuSelectApi(form.label)
       if (fun) {
-        this.getFromSelectData(fun).then(data => {
+        this.getFromSelectData(fun).then((data) => {
           this.formData[index].dataList = data
           this.$refs[`fromlabel-${form.label}`][0].$data.dataList = data
         })
@@ -1425,15 +1407,14 @@ export default {
       this.deleteBookingOrder(removeArr)
     },
     removeFun(data) {
-
       this.deleteBookingOrder([data.id])
     },
     deleteBookingOrder(arr) {
-        RecoverDeleteOrder(arr.toString())
-        .then(res => {
+      RecoverDeleteOrder(arr.toString())
+        .then((res) => {
           if (res.success) {
             this.$message.success('恢复成功')
-            const _data = this.gridOptions.data.filter(item => !arr.includes(item.id))
+            const _data = this.gridOptions.data.filter((item) => !arr.includes(item.id))
             this.$refs.xGrid.reloadData(_data).then(() => {
               this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length
             })
@@ -1442,7 +1423,7 @@ export default {
             this.$message.error(res.message)
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -1472,7 +1453,7 @@ export default {
       }
       this.spinning = true
       ExcuteShippingOrderCompareBatch(arr)
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             this.spinning = false
             if (!res.data.succ) {
@@ -1491,16 +1472,16 @@ export default {
             this.$message.error(res.data.msg)
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
           this.spinning = false
         })
-    }
-  }
+    },
+  },
 }
 </script>
   <style lang="less">
-  /*.ant-layout{
+/*.ant-layout{
   background: #f4f4f4;
 }*/
 /*列表排序按钮 */
@@ -1666,171 +1647,170 @@ export default {
     }
   }
 }
-
-  </style>
+</style>
   <style lang="less" scoped>
-  /*订舱表格内字体颜色 */
-  .mblno {
-    text-align: left;
-    color: @primary-color;
-    span {
-      margin-right: 0.5rem;
-      cursor: pointer;
-    }
-    .CSMblnoCopy {
-      cursor: pointer;
-    }
+/*订舱表格内字体颜色 */
+.mblno {
+  text-align: left;
+  color: @primary-color;
+  span {
+    margin-right: 0.5rem;
+    cursor: pointer;
+  }
+  .CSMblnoCopy {
+    cursor: pointer;
   }
-  // .vessel {
-  //   color: #77c950;
-  // }
-  .nav-box {
+}
+// .vessel {
+//   color: #77c950;
+// }
+.nav-box {
+  padding: 0 10px;
+
+  .nav {
+    display: inline-block;
+    margin-right: 8px;
+    cursor: pointer;
+    border: 1px solid rgba(255, 255, 255, 0);
     padding: 0 10px;
-  
-    .nav {
-      display: inline-block;
-      margin-right: 8px;
-      cursor: pointer;
+    height: 28px;
+    line-height: 26px;
+
+    .iconfont {
+      margin-right: 6px;
+    }
+
+    &:hover {
       border: 1px solid rgba(255, 255, 255, 0);
-      padding: 0 10px;
-      height: 28px;
-      line-height: 26px;
-  
+      border-radius: 4px;
+    }
+
+    &:nth-of-type(1) {
       .iconfont {
-        margin-right: 6px;
+        color: #1d8aff;
       }
-  
       &:hover {
-        border: 1px solid rgba(255, 255, 255, 0);
-        border-radius: 4px;
+        background: #fff;
+        box-shadow: 0 0 10px #eee;
       }
-  
-      &:nth-of-type(1) {
-        .iconfont {
-          color: #1d8aff;
-        }
-        &:hover {
-          background: #fff;
-          box-shadow: 0 0 10px #eee;
-        }
+    }
+
+    &:nth-of-type(2) {
+      .iconfont {
+        color: #865ef8;
       }
-  
-      &:nth-of-type(2) {
-        .iconfont {
-          color: #865ef8;
-        }
-        &:hover {
-          background: #fff;
-          box-shadow: 0 0 10px #eee;
-        }
+      &:hover {
+        background: #fff;
+        box-shadow: 0 0 10px #eee;
       }
-  
-      &:nth-of-type(3) {
-        .iconfont {
-          color: #ff9702;
-        }
-        &:hover {
-          background: #fff;
-          box-shadow: 0 0 10px #eee;
-        }
+    }
+
+    &:nth-of-type(3) {
+      .iconfont {
+        color: #ff9702;
       }
-  
-      &:nth-of-type(4) {
-        .iconfont {
-          color: #1d8aff;
-        }
-        &:hover {
-          background: #fff;
-          box-shadow: 0 0 10px #eee;
-        }
+      &:hover {
+        background: #fff;
+        box-shadow: 0 0 10px #eee;
       }
-  
-      &:nth-of-type(5) {
-        .iconfont {
-          color: #ff1062;
-        }
-        &:hover {
-          background: #fff;
-          box-shadow: 0 0 10px #eee;
-        }
+    }
+
+    &:nth-of-type(4) {
+      .iconfont {
+        color: #1d8aff;
       }
-  
-      &:nth-of-type(6) {
-        .iconfont {
-          color: #1ebeca;
-        }
-        &:hover {
-          background: #fff;
-          box-shadow: 0 0 10px #eee;
-        }
+      &:hover {
+        background: #fff;
+        box-shadow: 0 0 10px #eee;
       }
-  
-      &:nth-of-type(7) {
-        .iconfont {
-          color: #82c93d;
-        }
-        &:hover {
-          background: #fff;
-          box-shadow: 0 0 10px #eee;
-        }
+    }
+
+    &:nth-of-type(5) {
+      .iconfont {
+        color: #ff1062;
       }
-  
-      &:nth-of-type(8) {
-        .iconfont {
-          color: #1d8aff;
-        }
-        &:hover {
-          background: #fff;
-          box-shadow: 0 0 10px #eee;
-        }
+      &:hover {
+        background: #fff;
+        box-shadow: 0 0 10px #eee;
       }
-      &:nth-of-type(9) {
-        .iconfont {
-          color: #f6826b;
-        }
-        &:hover {
-          background: #fff;
-          box-shadow: 0 0 10px #eee;
-        }
+    }
+
+    &:nth-of-type(6) {
+      .iconfont {
+        color: #1ebeca;
+      }
+      &:hover {
+        background: #fff;
+        box-shadow: 0 0 10px #eee;
+      }
+    }
+
+    &:nth-of-type(7) {
+      .iconfont {
+        color: #82c93d;
+      }
+      &:hover {
+        background: #fff;
+        box-shadow: 0 0 10px #eee;
+      }
+    }
+
+    &:nth-of-type(8) {
+      .iconfont {
+        color: #1d8aff;
+      }
+      &:hover {
+        background: #fff;
+        box-shadow: 0 0 10px #eee;
+      }
+    }
+    &:nth-of-type(9) {
+      .iconfont {
+        color: #f6826b;
+      }
+      &:hover {
+        background: #fff;
+        box-shadow: 0 0 10px #eee;
       }
     }
   }
-  
-  .right {
-    float: right;
+}
+
+.right {
+  float: right;
+  cursor: pointer;
+  padding-top: 6px;
+}
+.BookTopButton {
+  height: 33px;
+  .tab-btn {
+    padding: 6px 9px;
+    border: 1px solid #c7c7c9;
+    background: #f9fafe;
+    border-radius: 2px;
+    margin-right: 10px;
     cursor: pointer;
-    padding-top: 6px;
+    -webkit-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02);
+    box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02);
+    -webkit-user-select: 0 2px 0 rgba(0, 0, 0, 0.02);
   }
-  .BookTopButton {
-    height: 33px;
-    .tab-btn {
-      padding: 6px 9px;
-      border: 1px solid #c7c7c9;
-      background: #f9fafe;
-      border-radius: 2px;
-      margin-right: 10px;
-      cursor: pointer;
-      -webkit-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02);
-      box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02);
-      -webkit-user-select: 0 2px 0 rgba(0, 0, 0, 0.02);
-    }
+}
+.table-page-search-submitButtons {
+  text-align: right;
+  padding-top: 6px;
+  .reset {
+    margin-left: 8px;
+    margin-right: 8px;
   }
-  .table-page-search-submitButtons {
-    text-align: right;
-    padding-top: 6px;
-    .reset {
-      margin-left: 8px;
-      margin-right: 8px;
-    }
-    .more-search {
-      margin-left: 8px;
-      margin-right: 20px;
-      padding-right: 20px;
-      border: none;
-      position: relative;
-      box-shadow: none !important;
-    }
-    /*.tab-btn{
+  .more-search {
+    margin-left: 8px;
+    margin-right: 20px;
+    padding-right: 20px;
+    border: none;
+    position: relative;
+    box-shadow: none !important;
+  }
+  /*.tab-btn{
       margin-left:8px;
       margin-right: 10px;
       padding:6px 9px;
@@ -1839,659 +1819,659 @@ export default {
       border-radius: 3px;
       cursor: pointer;
     }*/
-    .tab-btn {
-      cursor: pointer;
-      position: relative;
-      i {
-        font-size: 14px;
-        margin-left: 8px;
-      }
-    }
-    .tab-btn::before {
-      content: '';
-      position: absolute;
-      width: 1px;
-      height: 17px;
-      background: #ccc;
-      top: 2px;
-      left: -20px;
-    }
-    .senior-search {
-      margin-left: 36px;
-      color: rgba(0, 0, 0, 0.65);
-      position: relative;
-      i {
-        margin-left: 3px;
-        font-size: 15px;
-      }
-    }
-    .senior-search::before {
-      content: '';
-      position: absolute;
-      width: 1px;
-      height: 17px;
-      background: #ccc;
-      top: 2px;
-      left: -16px;
-    }
-    .senior-search:hover {
-      color: @primary-color;
-      i {
-        color: @primary-color;
-      }
-    }
-  }
-  .ant-btn {
-    margin-right: 8px;
-  }
-  .table {
-    margin: 8px auto 20px;
-  }
-  
-  .radio-logo {
-    width: 50px;
-    // height: 40px;
-    display: inline-block;
-  }
-  .group-label-box {
-    width: 100%;
-    .group-label {
-      width: 100%;
-      display: flex;
-      flex-wrap: wrap;
-      .ant-radio-wrapper {
-        height: 45px !important;
-        line-height: 45px !important;
-        width: 10%;
-        margin: 0;
-      }
-      // .label-flex {
-      //   flex: 1;
-      // }
+  .tab-btn {
+    cursor: pointer;
+    position: relative;
+    i {
+      font-size: 14px;
+      margin-left: 8px;
     }
   }
-  .Awrapper {
-    width: 100% !important;
-    display: flex !important;
-    height: 45px !important;
-    line-height: 45px !important;
-    width: 10%;
-    margin: 0;
-    .line {
-      margin-left: 10px;
-      margin-right: 40px;
-      height: 24px;
-      flex: 1;
-      border-bottom: 1px solid #c9c9c9;
-    }
+  .tab-btn::before {
+    content: '';
+    position: absolute;
+    width: 1px;
+    height: 17px;
+    background: #ccc;
+    top: 2px;
+    left: -20px;
   }
-  /*查询区日期默认颜色 */
-  /deep/ .ant-calendar-today {
-    .ant-calendar-date {
-      color: @primary-color !important;
-      border-color: @primary-color !important;
+  .senior-search {
+    margin-left: 36px;
+    color: rgba(0, 0, 0, 0.65);
+    position: relative;
+    i {
+      margin-left: 3px;
+      font-size: 15px;
     }
   }
-  /*方块边框按钮 */
-  .tab-btn:hover {
-    border-color: @primary-color;
-    color: @primary-color;
-    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  .senior-search::before {
+    content: '';
+    position: absolute;
+    width: 1px;
+    height: 17px;
+    background: #ccc;
+    top: 2px;
+    left: -16px;
   }
-  /*列表双列背景色 */
-  // /deep/ .vxe-table--render-default .vxe-body--row.row--stripe {
-  //   // background: #f5f9fe;
-  //   position: relative;
-  //   background: #fff;
-  //   z-index: 1;
-  //   &::after {
-  //     content: '';
-  //     position: absolute;
-  //     top: 0;
-  //     left: 0;
-  //     width: 100%;
-  //     height: 100%;
-  //     z-index: 0;
-  //     background: @primary-color;
-  //     opacity: 0.04;
-  //     z-index: -1;
-  //   }
-  // }
-  /*列表操作按钮颜色 */
-  /deep/ .operate-btn {
+  .senior-search:hover {
     color: @primary-color;
-  }
-  /deep/ .operate-btn:hover {
-    color: @primary-color !important;
-    opacity: 0.7;
-  }
-  .book-btn {
-    display: inline-block;
-    padding: 0 10px;
-    height: 24px;
-    margin-right: 8px;
-    border: 1px solid #eee;
-    color: #999;
-    font-size: 12px;
-    line-height: 24px;
     i {
-      display: none;
-    }
-    &.sta_so {
-      color: #8bc34a;
-      border: 1px solid #8bc34a;
-    }
-    &.sta_bc {
-      color: #fbc02d;
-      border: 1px solid #fbc02d;
-    }
-    &.sta_letter_yard {
-      color: #00bcd4;
-      border: 1px solid #00bcd4;
-    }
-    &.sta_xhz {
-      color: #e64a19;
-      border: 1px solid #e64a19;
+      color: @primary-color;
     }
   }
-  .billtrace-box {
+}
+.ant-btn {
+  margin-right: 8px;
+}
+.table {
+  margin: 8px auto 20px;
+}
+
+.radio-logo {
+  width: 50px;
+  // height: 40px;
+  display: inline-block;
+}
+.group-label-box {
+  width: 100%;
+  .group-label {
     width: 100%;
-    // display: flex;
-    // height: 48px;
-    // flex-wrap:wrap;
-    // padding:3px 0;
-    // text-align: center;
-    .billtrace-btn {
-      display: inline-block;
-      font-size: 12px;
-      height: 16px;
-      // width:30%;
-      // display: flex;
-      span {
-        // flex: 1;
-        text-align: right;
-        color: #999;
-      }
-      i {
-        font-size: 12px;
-        color: #ccc;
-        // flex: 1;
-        text-align: center;
-        &.hide {
-          opacity: 0;
-        }
-      }
-      .active {
-        cursor: pointer;
-        // color: @primary-color;
-        color: #336600;
-      }
-    }
-  }
-  .normal-box {
-    .billtrace-btn {
-      display: inline-block;
-    }
-  }
-  .flex-box {
     display: flex;
-    height: 48px;
     flex-wrap: wrap;
-    padding: 3px 0;
-    text-align: center;
-    justify-content: center;
-    .billtrace-btn {
-      font-size: 12px;
-      height: 16px;
-      width: 30%;
-      display: flex;
-      span {
-        flex: 1;
-        text-align: right;
-        color: #999;
-      }
-      i {
-        font-size: 12px;
-        color: #ccc;
-        flex: 1;
-        text-align: center;
-        &.hide {
-          opacity: 0;
-        }
-      }
-      .active {
-        cursor: pointer;
-        // color: @primary-color;
-        color: #336600;
-      }
-      &:nth-of-type(3) {
-        i {
-          opacity: 0;
-        }
-      }
+    .ant-radio-wrapper {
+      height: 45px !important;
+      line-height: 45px !important;
+      width: 10%;
+      margin: 0;
     }
+    // .label-flex {
+    //   flex: 1;
+    // }
   }
-  /deep/ .ant-form-item {
-    margin-bottom: 10px !important;
-  }
-  /deep/ .table-page-search-submitButtons {
-    margin-bottom: 10px !important;
-  }
-  /deep/ .ant-input {
-    height: 28px;
-    margin-top: 4px;
-    // transform: scaleY(.8);
-  }
-  /deep/ .ant-card-body {
-    padding-top: 10px;
+}
+.Awrapper {
+  width: 100% !important;
+  display: flex !important;
+  height: 45px !important;
+  line-height: 45px !important;
+  width: 10%;
+  margin: 0;
+  .line {
+    margin-left: 10px;
+    margin-right: 40px;
+    height: 24px;
+    flex: 1;
+    border-bottom: 1px solid #c9c9c9;
   }
-  /deep/ .ant-calendar-picker-input {
-    padding: 0 4px;
+}
+/*查询区日期默认颜色 */
+/deep/ .ant-calendar-today {
+  .ant-calendar-date {
+    color: @primary-color !important;
+    border-color: @primary-color !important;
   }
-  /deep/ .ant-calendar-range-picker-input {
-    height: 28px;
-    font-size: 12px;
-    vertical-align: top;
-    text-align: center;
-    // background: #f99;
+}
+/*方块边框按钮 */
+.tab-btn:hover {
+  border-color: @primary-color;
+  color: @primary-color;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+}
+/*列表双列背景色 */
+// /deep/ .vxe-table--render-default .vxe-body--row.row--stripe {
+//   // background: #f5f9fe;
+//   position: relative;
+//   background: #fff;
+//   z-index: 1;
+//   &::after {
+//     content: '';
+//     position: absolute;
+//     top: 0;
+//     left: 0;
+//     width: 100%;
+//     height: 100%;
+//     z-index: 0;
+//     background: @primary-color;
+//     opacity: 0.04;
+//     z-index: -1;
+//   }
+// }
+/*列表操作按钮颜色 */
+/deep/ .operate-btn {
+  color: @primary-color;
+}
+/deep/ .operate-btn:hover {
+  color: @primary-color !important;
+  opacity: 0.7;
+}
+.book-btn {
+  display: inline-block;
+  padding: 0 10px;
+  height: 24px;
+  margin-right: 8px;
+  border: 1px solid #eee;
+  color: #999;
+  font-size: 12px;
+  line-height: 24px;
+  i {
+    display: none;
   }
-  .reamrk-btns {
-    overflow: visible;
+  &.sta_so {
+    color: #8bc34a;
+    border: 1px solid #8bc34a;
   }
-  /deep/ .from-label {
-    padding: 0 !important;
+  &.sta_bc {
+    color: #fbc02d;
+    border: 1px solid #fbc02d;
   }
-  
-  .booking-from-box {
-    padding: 0 10px;
+  &.sta_letter_yard {
+    color: #00bcd4;
+    border: 1px solid #00bcd4;
   }
-  
-  @media (min-width: 1200px) and (max-width: 1600px) {
-    .from-label {
-      padding-right: 0 !important;
-    }
+  &.sta_xhz {
+    color: #e64a19;
+    border: 1px solid #e64a19;
   }
-  
-  @media (min-width: 1200px) and (max-width: 1438px) {
-    .table-page-search-submitButtons {
-      .ant-btn {
-        margin-left: 4px;
-        margin-right: 4px;
-      }
+}
+.billtrace-box {
+  width: 100%;
+  // display: flex;
+  // height: 48px;
+  // flex-wrap:wrap;
+  // padding:3px 0;
+  // text-align: center;
+  .billtrace-btn {
+    display: inline-block;
+    font-size: 12px;
+    height: 16px;
+    // width:30%;
+    // display: flex;
+    span {
+      // flex: 1;
+      text-align: right;
+      color: #999;
     }
-    .table-page-search-submitButtons .senior-search {
-      margin-left: 20px;
-      &::before {
-        left: -7px;
+    i {
+      font-size: 12px;
+      color: #ccc;
+      // flex: 1;
+      text-align: center;
+      &.hide {
+        opacity: 0;
       }
     }
-  }
-  
-  /deep/ .book-remark-box {
-    > .vxe-cell {
-      overflow: visible !important;
-    }
-    /deep/ .vxe-cell {
-      overflow: visible !important;
-    }
-  }
-  
-  .bookremark {
-    position: relative;
-    .reamrk-label {
-      width: 100%;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      display: block;
+    .active {
       cursor: pointer;
+      // color: @primary-color;
+      color: #336600;
     }
   }
-  
-  // 货物状态
-  .goods-status {
-    width: 100%;
+}
+.normal-box {
+  .billtrace-btn {
+    display: inline-block;
+  }
+}
+.flex-box {
+  display: flex;
+  height: 48px;
+  flex-wrap: wrap;
+  padding: 3px 0;
+  text-align: center;
+  justify-content: center;
+  .billtrace-btn {
+    font-size: 12px;
+    height: 16px;
+    width: 30%;
     display: flex;
-    height: 48px;
-    align-items: center;
-    .goods-status-left {
+    span {
       flex: 1;
-      overflow: hidden;
-      height: 48px;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      .goods-tip {
-        font-size: 12px;
-        margin: 0 4px;
-        cursor: pointer;
-        height: 48px;
-        line-height: 48px;
-        display: inline-block;
-        color: @primary-color;
-      }
+      text-align: right;
+      color: #999;
     }
-    .goods-status-right {
-      width: 30px;
+    i {
+      font-size: 12px;
+      color: #ccc;
+      flex: 1;
       text-align: center;
-      height: 48px;
-      i {
-        color: @primary-color;
-        cursor: pointer;
-        height: 48px;
-        line-height: 48px;
+      &.hide {
+        opacity: 0;
       }
     }
-    .TablelstShipOrderCompareRltRedo {
+    .active {
       cursor: pointer;
-      margin-left: 0.5rem;
-      color: #13c2c2;
+      // color: @primary-color;
+      color: #336600;
+    }
+    &:nth-of-type(3) {
+      i {
+        opacity: 0;
+      }
     }
   }
-  
-  .dzRemark,
-  .czRemark {
-    display: block;
-    text-align: left;
+}
+/deep/ .ant-form-item {
+  margin-bottom: 10px !important;
+}
+/deep/ .table-page-search-submitButtons {
+  margin-bottom: 10px !important;
+}
+/deep/ .ant-input {
+  height: 28px;
+  margin-top: 4px;
+  // transform: scaleY(.8);
+}
+/deep/ .ant-card-body {
+  padding-top: 10px;
+}
+/deep/ .ant-calendar-picker-input {
+  padding: 0 4px;
+}
+/deep/ .ant-calendar-range-picker-input {
+  height: 28px;
+  font-size: 12px;
+  vertical-align: top;
+  text-align: center;
+  // background: #f99;
+}
+.reamrk-btns {
+  overflow: visible;
+}
+/deep/ .from-label {
+  padding: 0 !important;
+}
+
+.booking-from-box {
+  padding: 0 10px;
+}
+
+@media (min-width: 1200px) and (max-width: 1600px) {
+  .from-label {
+    padding-right: 0 !important;
+  }
+}
+
+@media (min-width: 1200px) and (max-width: 1438px) {
+  .table-page-search-submitButtons {
+    .ant-btn {
+      margin-left: 4px;
+      margin-right: 4px;
+    }
+  }
+  .table-page-search-submitButtons .senior-search {
+    margin-left: 20px;
+    &::before {
+      left: -7px;
+    }
+  }
+}
+
+/deep/ .book-remark-box {
+  > .vxe-cell {
+    overflow: visible !important;
+  }
+  /deep/ .vxe-cell {
+    overflow: visible !important;
+  }
+}
+
+.bookremark {
+  position: relative;
+  .reamrk-label {
     width: 100%;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: block;
+    cursor: pointer;
+  }
+}
+
+// 货物状态
+.goods-status {
+  width: 100%;
+  display: flex;
+  height: 48px;
+  align-items: center;
+  .goods-status-left {
+    flex: 1;
     overflow: hidden;
+    height: 48px;
     text-overflow: ellipsis;
     white-space: nowrap;
-  }
-  
-  /deep/ .line-box:nth-last-of-type(-n + 5) {
-    .book-remark-box {
-      .bookremark {
-        .reamrk-list {
-          top: inherit;
-          bottom: calc(100% + 8px);
-        }
-      }
+    .goods-tip {
+      font-size: 12px;
+      margin: 0 4px;
+      cursor: pointer;
+      height: 48px;
+      line-height: 48px;
+      display: inline-block;
+      color: @primary-color;
     }
   }
-  
-  /deep/.line-box:nth-of-type(2n) {
-    position: relative;
-    background: #fff;
-    > * {
-      z-index: 1;
-    }
-    &::after {
-      content: '';
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      z-index: 0;
-      background: @primary-color;
-      opacity: 0.04;
+  .goods-status-right {
+    width: 30px;
+    text-align: center;
+    height: 48px;
+    i {
+      color: @primary-color;
+      cursor: pointer;
+      height: 48px;
+      line-height: 48px;
     }
-    .book-remark-box {
-      .bookremark {
-        .reamrk-list {
-          top: inherit;
-          bottom: calc(100% + 8px);
-        }
+  }
+  .TablelstShipOrderCompareRltRedo {
+    cursor: pointer;
+    margin-left: 0.5rem;
+    color: #13c2c2;
+  }
+}
+
+.dzRemark,
+.czRemark {
+  display: block;
+  text-align: left;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+/deep/ .line-box:nth-last-of-type(-n + 5) {
+  .book-remark-box {
+    .bookremark {
+      .reamrk-list {
+        top: inherit;
+        bottom: calc(100% + 8px);
       }
     }
   }
-  
-  .hovers-list {
-    max-height: 400px;
-    position: fixed;
+}
+
+/deep/.line-box:nth-of-type(2n) {
+  position: relative;
+  background: #fff;
+  > * {
+    z-index: 1;
+  }
+  &::after {
+    content: '';
+    position: absolute;
     top: 0;
     left: 0;
-    z-index: 999;
-    width: 300px;
-    background: #fff;
-    box-shadow: 0 0 10px #eee;
-    border-radius: 4px;
-    border: 1px solid #eee;
-    padding: 5px 20px 10px 20px;
-    white-space: normal;
-    text-align: left;
-    z-index: 999 !important;
-    .title {
-      height: 30px;
-      line-height: 30px;
-      font-size: 12px;
-      font-weight: 600;
-    }
-    .list {
-      border-bottom: 1px solid #eee;
-      padding: 6px 0;
-      line-height: 18px;
-      font-size: 12px;
-      color: #666;
-      word-break: break-all;
-      &:nth-last-of-type(1) {
-        border: none;
-      }
-      .icon {
-        margin-right: 4px;
-        color: @primary-color;
+    width: 100%;
+    height: 100%;
+    z-index: 0;
+    background: @primary-color;
+    opacity: 0.04;
+  }
+  .book-remark-box {
+    .bookremark {
+      .reamrk-list {
+        top: inherit;
+        bottom: calc(100% + 8px);
       }
     }
   }
-  .goods-hovers-list {
-    max-height: 400px;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 999;
-    width: 300px;
-    background: #fff;
-    box-shadow: 0 0 50px #eee;
-    border-radius: 4px;
-    border: 1px solid #eee;
-    padding: 5px 20px 10px 20px;
-    white-space: normal;
-    text-align: left;
-    z-index: 999 !important;
-    transition: 0.5s all;
-    display: block;
-    opacity: 1;
-    &.seat-top {
-      &::before {
-        display: none;
-        // content: '';
-        // bottom: -15px;
-        // left: 50%;
-      }
+}
+
+.hovers-list {
+  max-height: 400px;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 999;
+  width: 300px;
+  background: #fff;
+  box-shadow: 0 0 10px #eee;
+  border-radius: 4px;
+  border: 1px solid #eee;
+  padding: 5px 20px 10px 20px;
+  white-space: normal;
+  text-align: left;
+  z-index: 999 !important;
+  .title {
+    height: 30px;
+    line-height: 30px;
+    font-size: 12px;
+    font-weight: 600;
+  }
+  .list {
+    border-bottom: 1px solid #eee;
+    padding: 6px 0;
+    line-height: 18px;
+    font-size: 12px;
+    color: #666;
+    word-break: break-all;
+    &:nth-last-of-type(1) {
+      border: none;
     }
-    &.hide-goods-hover {
-      display: none;
-      opacity: 0;
+    .icon {
+      margin-right: 4px;
+      color: @primary-color;
     }
-    // overflow: auto;
+  }
+}
+.goods-hovers-list {
+  max-height: 400px;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 999;
+  width: 300px;
+  background: #fff;
+  box-shadow: 0 0 50px #eee;
+  border-radius: 4px;
+  border: 1px solid #eee;
+  padding: 5px 20px 10px 20px;
+  white-space: normal;
+  text-align: left;
+  z-index: 999 !important;
+  transition: 0.5s all;
+  display: block;
+  opacity: 1;
+  &.seat-top {
     &::before {
-      content: '';
-      float: left;
-      width: 0;
-      height: 0;
-      border-width: 8px;
-      border-style: solid;
-      border-color: transparent #fff transparent transparent;
-      -webkit-transform: rotate(90deg);
-      transform: rotate(90deg);
-      position: absolute;
-      top: -15px;
-      left: 50%;
-      margin-left: -16px;
-    }
-  
-    .title {
-      height: 30px;
-      line-height: 30px;
-      font-size: 12px;
-      font-weight: 600;
-    }
-    .goods-btn {
-      display: inline-block;
-      font-size: 12px;
-      color: #666;
-      word-break: break-all;
-      width: 82px;
-      height: 28px;
-      line-height: 28px;
-      border-radius: 4px;
-      border: 1px solid #eee;
-      margin-bottom: 6px;
-      text-align: center;
-      margin: 0 2px 8px;
-      cursor: pointer;
-      &.active {
-        color: @primary-color;
-        border: 1px solid @primary-color;
-      }
-      .icon {
-        margin-right: 4px;
-        color: @primary-color;
-      }
+      display: none;
+      // content: '';
+      // bottom: -15px;
+      // left: 50%;
     }
   }
-  
-  @media (min-width: 1192px) and (max-width: 1591px) {
-    .booking-from-box {
-      padding-right: 24px;
-      /deep/ .ant-calendar-picker-icon {
-        display: none;
-      }
+  &.hide-goods-hover {
+    display: none;
+    opacity: 0;
+  }
+  // overflow: auto;
+  &::before {
+    content: '';
+    float: left;
+    width: 0;
+    height: 0;
+    border-width: 8px;
+    border-style: solid;
+    border-color: transparent #fff transparent transparent;
+    -webkit-transform: rotate(90deg);
+    transform: rotate(90deg);
+    position: absolute;
+    top: -15px;
+    left: 50%;
+    margin-left: -16px;
+  }
+
+  .title {
+    height: 30px;
+    line-height: 30px;
+    font-size: 12px;
+    font-weight: 600;
+  }
+  .goods-btn {
+    display: inline-block;
+    font-size: 12px;
+    color: #666;
+    word-break: break-all;
+    width: 82px;
+    height: 28px;
+    line-height: 28px;
+    border-radius: 4px;
+    border: 1px solid #eee;
+    margin-bottom: 6px;
+    text-align: center;
+    margin: 0 2px 8px;
+    cursor: pointer;
+    &.active {
+      color: @primary-color;
+      border: 1px solid @primary-color;
+    }
+    .icon {
+      margin-right: 4px;
+      color: @primary-color;
     }
   }
-  
+}
+
+@media (min-width: 1192px) and (max-width: 1591px) {
   .booking-from-box {
+    padding-right: 24px;
     /deep/ .ant-calendar-picker-icon {
-      margin-top: -4px !important;
-    }
-  }
-  /deep/ .ant-form-item-control-wrapper {
-    overflow: hidden !important;
-  }
-  
-  .no-data {
-    display: block;
-    color: #aaa;
-    font-size: 14px;
-    i {
-      line-height: 120px;
-      font-size: 100px;
+      display: none;
     }
   }
-  .pono {
-    text-align: left;
+}
+
+.booking-from-box {
+  /deep/ .ant-calendar-picker-icon {
+    margin-top: -4px !important;
   }
-  /deep/ .vxe-header--row th {
-    text-align: left !important;
+}
+/deep/ .ant-form-item-control-wrapper {
+  overflow: hidden !important;
+}
+
+.no-data {
+  display: block;
+  color: #aaa;
+  font-size: 14px;
+  i {
+    line-height: 120px;
+    font-size: 100px;
   }
-  /deep/ .vxe-cell--title {
-    width: 100%;
-    text-align: left;
+}
+.pono {
+  text-align: left;
+}
+/deep/ .vxe-header--row th {
+  text-align: left !important;
+}
+/deep/ .vxe-cell--title {
+  width: 100%;
+  text-align: left;
+}
+.TaskShippingOrderCompareP {
+  border-bottom: 1px solid #000;
+  padding: 5px;
+  background: #0000000e;
+  .TaskShippingOrderCompareSpan {
+    font-weight: bolder;
+    color: red;
   }
-  .TaskShippingOrderCompareP {
-    border-bottom: 1px solid #000;
-    padding: 5px;
-    background: #0000000e;
-    .TaskShippingOrderCompareSpan {
-      font-weight: bolder;
-      color: red;
+}
+.TaskShippingOrderCompareMainBox {
+  height: 55vh;
+  overflow-y: auto;
+  .TaskShippingOrderCompareMain {
+    p {
+      margin-bottom: 0;
     }
-  }
-  .TaskShippingOrderCompareMainBox {
-    height: 55vh;
-    overflow-y: auto;
-    .TaskShippingOrderCompareMain {
-      p {
-        margin-bottom: 0;
-      }
-      .TaskShippingOrderCompareMainHeader {
-        display: flex;
-        > div {
-          &:nth-child(1) {
-            flex: 3;
-          }
-          &:nth-child(2) {
-            width: 46px;
-          }
-          &:nth-child(3) {
-            flex: 3;
-          }
-  
-          > p {
-            &:first-child {
-              font-weight: bolder;
-            }
-          }
+    .TaskShippingOrderCompareMainHeader {
+      display: flex;
+      > div {
+        &:nth-child(1) {
+          flex: 3;
         }
-        &.Box {
-          border-top: 1px solid #000;
-          // border-bottom: 1px solid #000;
-          padding: 0.5rem 0 0 0;
-          margin-bottom: 0.5rem;
+        &:nth-child(2) {
+          width: 46px;
         }
-      }
-      .TaskShippingOrderCompareMainList {
-        display: flex;
-        align-items: center;
-        margin-bottom: 0.5rem;
+        &:nth-child(3) {
+          flex: 3;
+        }
+
         > p {
-          flex: 2;
-          &:nth-child(1) {
-            flex: 1;
-          }
-          &:nth-child(3) {
-            flex: 0;
-            margin: 0 1rem;
-          }
-          &:nth-child(4) {
-            flex: 1;
+          &:first-child {
+            font-weight: bolder;
           }
-          // &:nth-child(3) {
-          //   flex: 2;
-          //   margin: 0 1rem;
-          //   padding-left: 0.5rem;
-          //   &.TaskShippingOrderCompareMainThird {
-          //     background: #facd91;
-          //     border: 1px solid red;
-          //   }
-          // }
-          // &.TaskShippingOrderCompareMainThird {
-          //   flex: 2;
-          //   background: #facd91;
-          //   border: 1px solid red;
-          //   margin: 0 1rem;
-          //   padding-left: 0.5rem;
-          // }
         }
-        &.BoxNo {
-          padding-top: 0.5rem;
-          border-top: 1px solid #000;
-          &:nth-child(1) {
-            padding-top: 0;
-            border: none;
-          }
+      }
+      &.Box {
+        border-top: 1px solid #000;
+        // border-bottom: 1px solid #000;
+        padding: 0.5rem 0 0 0;
+        margin-bottom: 0.5rem;
+      }
+    }
+    .TaskShippingOrderCompareMainList {
+      display: flex;
+      align-items: center;
+      margin-bottom: 0.5rem;
+      > p {
+        flex: 2;
+        &:nth-child(1) {
+          flex: 1;
+        }
+        &:nth-child(3) {
+          flex: 0;
+          margin: 0 1rem;
+        }
+        &:nth-child(4) {
+          flex: 1;
+        }
+        // &:nth-child(3) {
+        //   flex: 2;
+        //   margin: 0 1rem;
+        //   padding-left: 0.5rem;
+        //   &.TaskShippingOrderCompareMainThird {
+        //     background: #facd91;
+        //     border: 1px solid red;
+        //   }
+        // }
+        // &.TaskShippingOrderCompareMainThird {
+        //   flex: 2;
+        //   background: #facd91;
+        //   border: 1px solid red;
+        //   margin: 0 1rem;
+        //   padding-left: 0.5rem;
+        // }
+      }
+      &.BoxNo {
+        padding-top: 0.5rem;
+        border-top: 1px solid #000;
+        &:nth-child(1) {
+          padding-top: 0;
+          border: none;
         }
       }
     }
   }
-  // .form-box{
-  //   .form-main{
-  //     float: left;
-  //     margin-right: 10px;
-  //     display: flex;
-  //     width: 16%;
-  //     overflow: hidden;
-  //     .form-label{
-  //       display: inline-block;
-  //       margin-right: 10px;
-  //     }
-  //     .form-content{
-  //       flex: 1;
-  //     }
-  //   }
-  //   .more-btn{
-  //   }
-  // }
-  </style>
+}
+// .form-box{
+//   .form-main{
+//     float: left;
+//     margin-right: 10px;
+//     display: flex;
+//     width: 16%;
+//     overflow: hidden;
+//     .form-label{
+//       display: inline-block;
+//       margin-right: 10px;
+//     }
+//     .form-content{
+//       flex: 1;
+//     }
+//   }
+//   .more-btn{
+//   }
+// }
+</style>
   
   
\ No newline at end of file

From 27a3931a1ea3066f0947fe05ef71b6197c480673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Tue, 25 Apr 2023 13:39:41 +0800
Subject: [PATCH 2/2] 4/25

---
 src/views/main/SendCar/addForm.vue | 36 ++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/views/main/SendCar/addForm.vue b/src/views/main/SendCar/addForm.vue
index bdd9431..06af5b8 100644
--- a/src/views/main/SendCar/addForm.vue
+++ b/src/views/main/SendCar/addForm.vue
@@ -482,19 +482,41 @@
           </a-col>
         </a-row>
         <a-row :style="{ marginTop: '20px' }">
-          <a-col :span="8">
-            <a-form-item label="注意事项:" :labelCol="labelCol8" :wrapperCol="wrapperCol8" has-feedback>
+          <a-col :span="12">
+            <a-form-item
+              label="注意事项:"
+              :labelCol="{
+                xs: { span: 24 },
+                sm: { span: 3 }
+              }"
+              :wrapperCol="{
+                xs: { span: 25 },
+                sm: { span: 21 }
+              }"
+              has-feedback
+            >
               <a-textarea
-                :auto-size="{ minRows: 3, maxRows: 5 }"
+                :auto-size="{ minRows: 7, maxRows: 10 }"
                 v-decorator="['attention']"
                 :style="{ lineHeight: 'initial' }"
               />
             </a-form-item>
           </a-col>
-          <a-col :span="8">
-            <a-form-item label="备注:" :labelCol="labelCol8" :wrapperCol="wrapperCol8" has-feedback>
+          <a-col :span="12">
+            <a-form-item
+              label="备注:"
+              :labelCol="{
+                xs: { span: 24 },
+                sm: { span: 3 }
+              }"
+              :wrapperCol="{
+                xs: { span: 25 },
+                sm: { span: 21 }
+              }"
+              has-feedback
+            >
               <a-textarea
-                :auto-size="{ minRows: 3, maxRows: 5 }"
+                :auto-size="{ minRows: 7, maxRows: 10 }"
                 v-decorator="['remark']"
                 :style="{ lineHeight: 'initial' }"
               />
@@ -887,7 +909,7 @@ export default {
     },
     FnRtruckId(data) {
       // console.log('FnRtruckId', data, this.AlltruckIdData)
-      let Rdata = {}
+      let Rdata = ''
       this.AlltruckIdData.forEach(item => {
         if (item.id == data) {
           Rdata = item.shortName