修改问题

public/index.html

@@ -95,8 +95,8 @@
     <% 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_qbc103sjo2g.css" /> -->
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_qbc103sjo2g.css" />
-    <link rel="stylesheet" href="iconfont.css">
+    <!-- <link rel="stylesheet" href="iconfont.css"> -->
     <!-- 1.8K仔百度收录 -->
     <meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
   </head>

src/utils/request.js

@@ -65,15 +65,8 @@ service.interceptors.response.use(response => {
   }
   const code = response.data.code
   if (code === 1011006 || code === 1011007 || code === 1011008 || code === 1011009 || code === 401) {
-    Modal.error({
+    Vue.ls.remove(ACCESS_TOKEN)
-      title: '提示：',
+    window.location.reload()
-      content: response.data.message,
-      okText: '重新登录',
-      onOk: () => {
-        Vue.ls.remove(ACCESS_TOKEN)
-        window.location.reload()
-      }
-    })
   } else if (code === 1013002 || code === 1016002 || code === 1015002) {
     message.error(response.data.message)
     return response.data

src/views/main/BookingLedger/detail/index.vue

@@ -1040,6 +1040,7 @@ export default {
               this.hasTableRules = true
             }
           })
+          console.log(this.tableRules,this.checkFrom)
           this.$forceUpdate()
         })
         .catch(err => {

src/views/main/BookingLedger/list/index.vue

@@ -664,11 +664,11 @@
                   <div
                     v-for="(item, index) in formatSheet.showDetailList"
                     :key="index"
-                    v-show="item.pCode == 'ContaList' && item.isDiff"
+                    v-show="(item.pCode == 'ContaList' && item.isDiff) || item.fieldName=='箱号'"
                     style="display: flex;margin-top: 15px;align-items: flex-start;"
                   >
                     <div v-if="item.fieldName=='箱号'">箱号:{{ item.primaryKey }}</div>
-                    <p style="padding-top: 4px;" v-if="item.msg">
+                    <p style="padding-top: 4px;" v-if="item.msg && item.isDiff">
                       <a-icon style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;" type="close-circle" theme="filled" />
                     </p>
                     <p v-if="item.isDiff" style="width: 90px;margin-right: 20px;">{{ item.fieldName }}:</p>
@@ -1378,6 +1378,9 @@ export default {
         item.rowCustno = false
         item.rowDzMark = false
         item.atdLoading = false
+        if (!item.shenQingXiangShi) {
+                item.shenQingXiangShi = ''
+              }
         let hasGoods = 0
         item.goodsStatusList.map((gitem, gindex) => {
           if (gitem.finishTime || gitem.remark) {
@@ -2386,6 +2389,9 @@ export default {
               item.dzmarkLoading = false
               item.sqxsLoading = false
               item.ponoLoading = false
+              if (!item.shenQingXiangShi) {
+                item.shenQingXiangShi = ''
+              }
               let hasGoods = 0
               if (item.goodsStatusList) {
                 item.goodsStatusList.map((gitem, gindex) => {

src/views/main/ViewDeletedList/ViewDeletedList.vue

@@ -11,6 +11,14 @@
                     <a-input allow-clear v-model="SearchContent" />
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="删除时间">
+                    <a-range-picker
+                      v-model="delDate"
+                      valueFormat="YYYY-MM-DD"
+                      format="YYYY-MM-DD" />
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -30,13 +38,7 @@
     <vxe-toolbar>
       <template #buttons>
         <div class="nav-box">
-          <a-popconfirm
+          <a-popconfirm title="确定恢复当前选中订舱？" ok-text="是" cancel-text="否" @confirm="removeMoreFun" @cancel="cancelRemove">
-            title="确定恢复当前选中订舱？"
-            ok-text="是"
-            cancel-text="否"
-            @confirm="removeMoreFun"
-            @cancel="cancelRemove"
-          >
             <div class="nav"><i class="iconfont icon-fanhui"></i>批量恢复</div>
           </a-popconfirm>
         </div>
@@ -54,8 +56,7 @@
       @resizable-change="resizableChange"
       @sort-change="tableSortChange"
       @scroll="pageClick"
-      @checkbox-change="checkboxChangeEvent"
+      @checkbox-change="checkboxChangeEvent">
-    >
       <template #mblno="{ row }">
         <div class="mblno">
           <span>{{ row.mblno }}</span>
@@ -98,13 +99,7 @@
                     icon="vxe-icon-edit"
                     @click="editColumns(row)"
                   ></vxe-button> -->
-        <a-popconfirm
+        <a-popconfirm title="确定恢复当前订舱？" ok-text="是" cancel-text="否" @confirm="removeFun(row)" @cancel="cancelRemove">
-          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>
@@ -275,6 +270,7 @@ export default {
       formAllData: null,
       formMoreData: null,
       formBtnCol: 8,
+      delDate: [],
       formBtnLoading: false,
       setVisible: false,
       showColumns: null,
@@ -367,10 +363,18 @@ export default {
             showHeaderOverflow: true,
             sortable: true
           },
+          {
+            field: 'deleteTime',
+            label: 'deleteTime',
+            width: 160,
+            title: '删除时间',
+            showHeaderOverflow: true,
+            sortable: true
+          },
           {
             field: 'operate',
             title: '操作',
-            minwidth: 110,
+            width: 80,
             noDraggable: true,
             slots: { default: 'operate' },
             fixed: 'right',
@@ -669,7 +673,7 @@ export default {
     // 船公司 - start
     getCarrier() {
       const Rdata = data => {
-        let RData = {}
+        const RData = {}
         for (var i = 0; i < 26; i++) {
           RData[String.fromCharCode(65 + i)] = []
           data.forEach(item => {
@@ -678,14 +682,14 @@ export default {
             }
           })
         }
-        let Obj = {
+        const Obj = {
           'A-D': ['A', 'B', 'C', 'D'],
           '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']
         }
-        let Data = {
+        const Data = {
           'A-D': [],
           'E-L': [],
           'M-R': [],
@@ -715,7 +719,7 @@ export default {
             DjyUserConfigGet({ type: 'booking_memory' })
               .then(e => {
                 if (e.data) {
-                  let data = []
+                  const data = []
                   JSON.parse(e.data.configJson).forEach(item => {
                     res.data.forEach(item2 => {
                       if (item == item2.code) {
@@ -735,7 +739,7 @@ export default {
           console.log(err)
         })
     },
-    //日期
+    // 日期
     setFormData(data, isReset = false, isInit = false) {
       if (Object.keys(data).length > 0 && JSON.parse(data.configJson).length) {
         const arr = JSON.parse(data.configJson)
@@ -895,7 +899,7 @@ export default {
     toggleAdvanced() {
       this.advanced = !this.advanced
       this.$forceUpdate()
-      let start = new Date().getTime()
+      const start = new Date().getTime()
       console.log('== 点击展开 ==', start)
       if (!this.advanced) {
         const len = this.formData.length % 4
@@ -915,6 +919,13 @@ export default {
       this.formRes.MBLNO = this.SearchContent
       const data = { ...this.formRes }
       this.searchData = JSON.parse(JSON.stringify(data))
+      if (this.delDate) {
+        this.searchData.BDELETETIME = this.delDate[0]
+        this.searchData.EDELETETIME = this.delDate[1]
+      } else {
+        this.searchData.BDELETETIME = ''
+        this.searchData.EDELETETIME = ''
+      }
       this.init(this.searchData)
       this.formRes = data
     },
@@ -953,6 +964,7 @@ export default {
 
     tableReset() {
       this.SearchContent = ''
+      this.delDate = []
     },
 
     submitForm(data) {
@@ -1068,6 +1080,7 @@ export default {
       if (isInit) {
         query.firstFlag = true
       }
+      query.multisort = [{ 'sortField': 'deleteTime', 'descSort': true }]
       PageDataByBooking(query)
         .then(res => {
           console.log('BookingOrderPage==>>', query)
@@ -1157,7 +1170,7 @@ export default {
       }
     },
     addSubmit() {
-      let data = []
+      const data = []
       data.push(this.carrierRadio)
       if (this.RecentlyCarrierData.length) {
         this.RecentlyCarrierData.forEach(item => {
@@ -1587,22 +1600,27 @@ export default {
 /*列表排序按钮 */
 .vxe-cell--sort {
   margin-top: -6px;
+
   i {
     font-size: 10px;
   }
+
   .vxe-sort--asc-btn {
     margin-top: 6px;
   }
 }
+
 /*列表表头 */
 .vxe-header--row {
   position: relative;
   background: #fff !important;
+
   .vxe-cell--sort {
     position: absolute;
     z-index: 3;
     right: 0;
   }
+
   &::after {
     content: '';
     position: absolute;
@@ -1615,6 +1633,7 @@ export default {
     opacity: 0.04;
   }
 }
+
 /*列表分页 */
 .vxe-pager {
   margin: 8px 0;
@@ -1625,14 +1644,17 @@ export default {
 .mblno {
   text-align: left;
   color: @primary-color;
+
   span {
     margin-right: 0.5rem;
     cursor: pointer;
   }
+
   .CSMblnoCopy {
     cursor: pointer;
   }
 }
+
 // .vessel {
 //   color: #77c950;
 // }
@@ -1661,6 +1683,7 @@ export default {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1671,6 +1694,7 @@ export default {
       .iconfont {
         color: #865ef8;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1681,6 +1705,7 @@ export default {
       .iconfont {
         color: #ff9702;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1691,6 +1716,7 @@ export default {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1701,6 +1727,7 @@ export default {
       .iconfont {
         color: #ff1062;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1711,6 +1738,7 @@ export default {
       .iconfont {
         color: #1ebeca;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1721,6 +1749,7 @@ export default {
       .iconfont {
         color: #82c93d;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1731,15 +1760,18 @@ export default {
       .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;
@@ -1753,14 +1785,17 @@ export default {
 .mblno {
   text-align: left;
   color: @primary-color;
+
   span {
     margin-right: 0.5rem;
     cursor: pointer;
   }
+
   .CSMblnoCopy {
     cursor: pointer;
   }
 }
+
 // .vessel {
 //   color: #77c950;
 // }
@@ -1789,6 +1824,7 @@ export default {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1799,6 +1835,7 @@ export default {
       .iconfont {
         color: #865ef8;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1809,6 +1846,7 @@ export default {
       .iconfont {
         color: #ff9702;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1819,6 +1857,7 @@ export default {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1829,6 +1868,7 @@ export default {
       .iconfont {
         color: #ff1062;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1839,6 +1879,7 @@ export default {
       .iconfont {
         color: #1ebeca;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1849,6 +1890,7 @@ export default {
       .iconfont {
         color: #82c93d;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -1859,15 +1901,18 @@ export default {
       .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;
@@ -1881,8 +1926,10 @@ export default {
   cursor: pointer;
   padding-top: 6px;
 }
+
 .BookTopButton {
   height: 33px;
+
   .tab-btn {
     padding: 6px 9px;
     border: 1px solid #c7c7c9;
@@ -1895,13 +1942,16 @@ export default {
     -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;
   }
+
   .more-search {
     margin-left: 8px;
     margin-right: 20px;
@@ -1910,6 +1960,7 @@ export default {
     position: relative;
     box-shadow: none !important;
   }
+
   /*.tab-btn{
       margin-left:8px;
       margin-right: 10px;
@@ -1922,11 +1973,13 @@ export default {
   .tab-btn {
     cursor: pointer;
     position: relative;
+
     i {
       font-size: 14px;
       margin-left: 8px;
     }
   }
+
   .tab-btn::before {
     content: '';
     position: absolute;
@@ -1936,15 +1989,18 @@ export default {
     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;
@@ -1954,16 +2010,20 @@ export default {
     top: 2px;
     left: -16px;
   }
+
   .senior-search:hover {
     color: @primary-color;
+
     i {
       color: @primary-color;
     }
   }
 }
+
 .ant-btn {
   margin-right: 8px;
 }
+
 .table {
   margin: 8px auto 20px;
 }
@@ -1973,23 +2033,28 @@ export default {
   // 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;
     // }
   }
 }
+
 .Awrapper {
   width: 100% !important;
   display: flex !important;
@@ -1997,6 +2062,7 @@ export default {
   line-height: 45px !important;
   width: 10%;
   margin: 0;
+
   .line {
     margin-left: 10px;
     margin-right: 40px;
@@ -2005,6 +2071,7 @@ export default {
     border-bottom: 1px solid #c9c9c9;
   }
 }
+
 /*查询区日期默认颜色 */
 /deep/ .ant-calendar-today {
   .ant-calendar-date {
@@ -2012,12 +2079,14 @@ export default {
     border-color: @primary-color !important;
   }
 }
+
 /*方块边框按钮 */
 .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;
@@ -2041,10 +2110,12 @@ export default {
 /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;
@@ -2054,28 +2125,35 @@ export default {
   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;
   }
 }
+
 .billtrace-box {
   width: 100%;
+
   // display: flex;
   // height: 48px;
   // flex-wrap:wrap;
@@ -2085,6 +2163,7 @@ export default {
     display: inline-block;
     font-size: 12px;
     height: 16px;
+
     // width:30%;
     // display: flex;
     span {
@@ -2092,15 +2171,18 @@ export default {
       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;
@@ -2109,11 +2191,13 @@ export default {
     }
   }
 }
+
 .normal-box {
   .billtrace-btn {
     display: inline-block;
   }
 }
+
 .flex-box {
   display: flex;
   height: 48px;
@@ -2121,31 +2205,37 @@ export default {
   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: #ff9702;
       font-weight: bold;
     }
+
     &:nth-of-type(3) {
       i {
         opacity: 0;
@@ -2153,23 +2243,29 @@ export default {
     }
   }
 }
+
 /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;
@@ -2177,9 +2273,11 @@ export default {
   text-align: center;
   // background: #f99;
 }
+
 .reamrk-btns {
   overflow: visible;
 }
+
 /deep/ .from-label {
   padding: 0 !important;
 }
@@ -2201,8 +2299,10 @@ export default {
       margin-right: 4px;
     }
   }
+
   .table-page-search-submitButtons .senior-search {
     margin-left: 20px;
+
     &::before {
       left: -7px;
     }
@@ -2210,9 +2310,10 @@ export default {
 }
 
 /deep/ .book-remark-box {
-  > .vxe-cell {
+  >.vxe-cell {
     overflow: visible !important;
   }
+
   /deep/ .vxe-cell {
     overflow: visible !important;
   }
@@ -2220,6 +2321,7 @@ export default {
 
 .bookremark {
   position: relative;
+
   .reamrk-label {
     width: 100%;
     white-space: nowrap;
@@ -2236,12 +2338,14 @@ export default {
   display: flex;
   height: 48px;
   align-items: center;
+
   .goods-status-left {
     flex: 1;
     overflow: hidden;
     height: 48px;
     text-overflow: ellipsis;
     white-space: nowrap;
+
     .goods-tip {
       font-size: 12px;
       margin: 0 4px;
@@ -2252,10 +2356,12 @@ export default {
       color: @primary-color;
     }
   }
+
   .goods-status-right {
     width: 30px;
     text-align: center;
     height: 48px;
+
     i {
       color: @primary-color;
       cursor: pointer;
@@ -2263,6 +2369,7 @@ export default {
       line-height: 48px;
     }
   }
+
   .TablelstShipOrderCompareRltRedo {
     cursor: pointer;
     margin-left: 0.5rem;
@@ -2294,9 +2401,11 @@ export default {
 /deep/.line-box:nth-of-type(2n) {
   position: relative;
   background: #fff;
-  > * {
+
+  >* {
     z-index: 1;
   }
+
   &::after {
     content: '';
     position: absolute;
@@ -2308,6 +2417,7 @@ export default {
     background: @primary-color;
     opacity: 0.04;
   }
+
   .book-remark-box {
     .bookremark {
       .reamrk-list {
@@ -2333,12 +2443,14 @@ export default {
   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;
@@ -2346,15 +2458,18 @@ export default {
     font-size: 12px;
     color: #666;
     word-break: break-all;
+
     &:nth-last-of-type(1) {
       border: none;
     }
+
     .icon {
       margin-right: 4px;
       color: @primary-color;
     }
   }
 }
+
 .goods-hovers-list {
   max-height: 400px;
   position: fixed;
@@ -2373,6 +2488,7 @@ export default {
   transition: 0.5s all;
   display: block;
   opacity: 1;
+
   &.seat-top {
     &::before {
       display: none;
@@ -2381,10 +2497,12 @@ export default {
       // left: 50%;
     }
   }
+
   &.hide-goods-hover {
     display: none;
     opacity: 0;
   }
+
   // overflow: auto;
   &::before {
     content: '';
@@ -2408,6 +2526,7 @@ export default {
     font-size: 12px;
     font-weight: 600;
   }
+
   .goods-btn {
     display: inline-block;
     font-size: 12px;
@@ -2422,10 +2541,12 @@ export default {
     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;
@@ -2436,6 +2557,7 @@ export default {
 @media (min-width: 1192px) and (max-width: 1591px) {
   .booking-from-box {
     padding-right: 24px;
+
     /deep/ .ant-calendar-picker-icon {
       display: none;
     }
@@ -2447,6 +2569,7 @@ export default {
     margin-top: -4px !important;
   }
 }
+
 /deep/ .ant-form-item-control-wrapper {
   overflow: hidden !important;
 }
@@ -2455,56 +2578,69 @@ export default {
   display: block;
   color: #aaa;
   font-size: 14px;
+
   i {
     line-height: 120px;
     font-size: 100px;
   }
 }
+
 .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;
   }
 }
+
 .TaskShippingOrderCompareMainBox {
   height: 55vh;
   overflow-y: auto;
+
   .TaskShippingOrderCompareMain {
     p {
       margin-bottom: 0;
     }
+
     .TaskShippingOrderCompareMainHeader {
       display: flex;
-      > div {
+
+      >div {
         &:nth-child(1) {
           flex: 3;
         }
+
         &:nth-child(2) {
           width: 46px;
         }
+
         &:nth-child(3) {
           flex: 3;
         }
 
-        > p {
+        >p {
           &:first-child {
             font-weight: bolder;
           }
         }
       }
+
       &.Box {
         border-top: 1px solid #000;
         // border-bottom: 1px solid #000;
@@ -2512,22 +2648,28 @@ export default {
         margin-bottom: 0.5rem;
       }
     }
+
     .TaskShippingOrderCompareMainList {
       display: flex;
       align-items: center;
       margin-bottom: 0.5rem;
-      > p {
+
+      >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;
@@ -2545,9 +2687,11 @@ export default {
         //   padding-left: 0.5rem;
         // }
       }
+
       &.BoxNo {
         padding-top: 0.5rem;
         border-top: 1px solid #000;
+
         &:nth-child(1) {
           padding-top: 0;
           border: none;
@@ -2556,6 +2700,7 @@ export default {
     }
   }
 }
+
 // .form-box{
 //   .form-main{
 //     float: left;
@@ -2573,5 +2718,4 @@ export default {
 //   }
 //   .more-btn{
 //   }
-// }
+// }</style>
-</style>