From 362efd60fc3f9dcbb0d36459601af43b71ae1591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Mon, 17 Apr 2023 15:33:11 +0800
Subject: [PATCH 1/2] 4/17

---
 src/views/main/BookingLedger/list/index.vue   |  49 +-
 .../BookingLedger/list/modules/initData.js    | 477 ++++++++++++++++--
 2 files changed, 465 insertions(+), 61 deletions(-)

diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index e37ccbc..1426bda 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -83,7 +83,7 @@
                       title="确定进行下货纸比对？"
                       ok-text="是"
                       cancel-text="否"
-                      @confirm="excuteShippingOrderCompareBatch"
+                      @confirm="excuteShippingOrderCompareBatch()"
                       @cancel="cancelRemove"
                     >
                       <div class="nav"><i class="iconfont icon-duibi"></i>下货纸比对</div>
@@ -213,7 +213,24 @@
                     </span>
                   </div>
                 </template>
-
+                <template #lstShipOrderCompareRlt="{ row }">
+                  <div class="goods-status" v-if="row.lstShipOrderCompareRlt">
+                    <div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
+                      <a-icon type="close-circle" :style="{ color: '#ff9200' }" />
+                    </div>
+                    <div v-else-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">
+                      <a-icon type="check-circle" :style="{ color: '#54bc25' }" />
+                    </div>
+                    <div v-else>
+                      {{ row.LstShipOrderCompareRltName }}
+                    </div>
+                    <a-icon
+                      class="TablelstShipOrderCompareRltRedo"
+                      @click="excuteShippingOrderCompareBatch(row)"
+                      type="redo"
+                    />
+                  </div>
+                </template>
                 <template #goodsStatusList="{ row }">
                   <div class="goods-status">
                     <div class="goods-status-left">
@@ -1471,6 +1488,7 @@ export default {
             })
             this.$set(this.gridOptions.pagerConfig, 'columns', JSON.parse(JSON.stringify(initData.columns)))
             this.$set(this.gridOptions, 'data', [..._data])
+
             this.$refs.xGrid.reloadData(_data).then(() => {
               this.$set(this.gridOptions, 'loading', false)
             })
@@ -1483,6 +1501,7 @@ export default {
             this.$forceUpdate()
           }
           this.ResetType = true
+          console.log(this.gridOptions)
         })
         .catch(err => {
           console.log(err)
@@ -1897,14 +1916,19 @@ export default {
     checkboxChangeEvent() {
       console.log('== 选中，取消选中 ==', this.$refs.xGrid.getCheckboxRecords())
     },
-    excuteShippingOrderCompareBatch() {
-      const select = this.$refs.xGrid.getCheckboxRecords()
-      const arr = select.map((item, index) => {
-        return item.id.toString()
-      })
-      if (arr.length === 0) {
-        this.$message.error('请选择操作订单')
-        return false
+    excuteShippingOrderCompareBatch(data) {
+      let arr = []
+      if (data) {
+        arr.push(data.id.toString())
+      } else {
+        const select = this.$refs.xGrid.getCheckboxRecords()
+        arr = select.map((item, index) => {
+          return item.id.toString()
+        })
+        if (arr.length === 0) {
+          this.$message.error('请选择操作订单')
+          return false
+        }
       }
       this.spinning = true
       ExcuteShippingOrderCompareBatch(arr)
@@ -2459,6 +2483,7 @@ export default {
   width: 100%;
   display: flex;
   height: 48px;
+  align-items: center;
   .goods-status-left {
     flex: 1;
     overflow: hidden;
@@ -2486,6 +2511,10 @@ export default {
       line-height: 48px;
     }
   }
+  .TablelstShipOrderCompareRltRedo {
+    cursor: pointer;
+    margin-left: 0.5rem;
+  }
 }
 
 .dzRemark,
diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js
index 3c52d9c..4a212f9 100644
--- a/src/views/main/BookingLedger/list/modules/initData.js
+++ b/src/views/main/BookingLedger/list/modules/initData.js
@@ -4,65 +4,258 @@ export default {
     { type: 'checkbox', width: 60, noDraggable: true },
     { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true },
     { field: 'yard', label: 'YARD', width: 120, title: '场站', showHeaderOverflow: true, sortable: true },
-    { field: 'mblno', label: 'MBLNO', width: 160, title: '主提单号', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'mblno' } },
+    {
+      field: 'mblno',
+      label: 'MBLNO',
+      width: 160,
+      title: '主提单号',
+      showHeaderOverflow: true,
+      showOverflow: false,
+      sortable: true,
+      slots: { default: 'mblno' }
+    },
     { field: 'vessel', label: 'VESSEL', width: 120, title: '船名', showHeaderOverflow: true, sortable: true },
-    { field: 'etd', label: 'ETD', width: 110, title: '开船日期', showHeaderOverflow: true, sortable: true, slots: { default: 'etd' } },
+    {
+      field: 'etd',
+      label: 'ETD',
+      width: 110,
+      title: '开船日期',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'etd' }
+    },
     { field: 'voyno', label: 'VOYNO', width: 120, title: '海关航次', showHeaderOverflow: true },
     // { field: 'bookingStatus', label: 'BOOKINGSTATUS', width: 120, title: '订舱状态', showHeaderOverflow: true },
     // { field: 'vgm', label: 'VGM', width: 120, title: 'VGM', showHeaderOverflow: true },
     // { field: 'billStatus', label: 'BILLSTATUS', width: 120, title: '提单状态', showHeaderOverflow: true },
-    { field: 'portdischarge', label: 'PORTDISCHARGE', width: 120, title: '卸货港', showHeaderOverflow: true, sortable: true },
-    { field: 'createdUserName', label: 'CREATEDUSERNAME', width: 120, title: '创建人', showHeaderOverflow: true, sortable: true },
-    { field: 'createdTime', label: 'CREATEDTIME', width: 160, title: '创建日期', showHeaderOverflow: true, sortable: true },
-    { field: 'cntrtotal', label: 'CNTRTOTAL', width: 120, title: '箱型*箱量', showHeaderOverflow: true, sortable: true },
-    { field: 'operate', title: '操作', width: 110, noDraggable: true, slots: { default: 'operate' }, fixed: 'right', resizable: false }
+    {
+      field: 'portdischarge',
+      label: 'PORTDISCHARGE',
+      width: 120,
+      title: '卸货港',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'createdUserName',
+      label: 'CREATEDUSERNAME',
+      width: 120,
+      title: '创建人',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'createdTime',
+      label: 'CREATEDTIME',
+      width: 160,
+      title: '创建日期',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'cntrtotal',
+      label: 'CNTRTOTAL',
+      width: 120,
+      title: '箱型*箱量',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'operate',
+      title: '操作',
+      width: 110,
+      noDraggable: true,
+      slots: { default: 'operate' },
+      fixed: 'right',
+      resizable: false
+    }
   ],
   columnsAllData: [
-    { field: 'mblno', label: 'MBLNO', width: 160, title: '主提单号', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'mblno' } },
+    {
+      field: 'mblno',
+      label: 'MBLNO',
+      width: 160,
+      title: '主提单号',
+      showHeaderOverflow: true,
+      showOverflow: false,
+      sortable: true,
+      slots: { default: 'mblno' }
+    },
     { field: 'hblno', label: 'HBLNO', width: 120, title: '分提单号', showHeaderOverflow: true, sortable: true },
-    { field: 'customername', label: 'CUSTOMERNAME', width: 120, title: '委托单位', showHeaderOverflow: true, sortable: true }, // 客户
+    {
+      field: 'customername',
+      label: 'CUSTOMERNAME',
+      width: 120,
+      title: '委托单位',
+      showHeaderOverflow: true,
+      sortable: true
+    }, // 客户
     { field: 'consignee', label: 'CONSIGNEE', width: 120, title: '收货人', showHeaderOverflow: true, sortable: true },
-    { field: 'notifyparty', label: 'NOTIFYPARTY', width: 120, title: '通知人', showHeaderOverflow: true, sortable: true },
+    {
+      field: 'notifyparty',
+      label: 'NOTIFYPARTY',
+      width: 120,
+      title: '通知人',
+      showHeaderOverflow: true,
+      sortable: true
+    },
     { field: 'yard', label: 'YARD', width: 120, title: '场站', showHeaderOverflow: true, sortable: true },
     { field: 'vessel', label: 'VESSEL', width: 120, title: '船名', showHeaderOverflow: true, sortable: true },
-    { field: 'voynoinner', label: 'VOYNOINNER', width: 120, title: '内部航次', showHeaderOverflow: true, sortable: true }, // 内部航次 / 海关航次 ？ 暂时放内部航次
-    { field: 'etd', label: 'ETD', width: 110, title: '开船日期', showHeaderOverflow: true, sortable: true, slots: { default: 'etd' } },
-    { field: 'atd', label: 'ATD', width: 160, title: '实际开船日期', showHeaderOverflow: true, sortable: true, slots: { default: 'atd' } },
+    {
+      field: 'voynoinner',
+      label: 'VOYNOINNER',
+      width: 120,
+      title: '内部航次',
+      showHeaderOverflow: true,
+      sortable: true
+    }, // 内部航次 / 海关航次 ？ 暂时放内部航次
+    {
+      field: 'etd',
+      label: 'ETD',
+      width: 110,
+      title: '开船日期',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'etd' }
+    },
+    {
+      field: 'atd',
+      label: 'ATD',
+      width: 160,
+      title: '实际开船日期',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'atd' }
+    },
     { field: 'blfrt', label: 'BLFRT', width: 120, title: '付费方式', showHeaderOverflow: true, sortable: true },
     { field: 'payableat', label: 'PAYABLEAT', width: 120, title: '到付地点', showHeaderOverflow: true, sortable: true },
     { field: 'pkgs', label: 'PKGS', width: 120, title: '件数', showHeaderOverflow: true, sortable: true },
     { field: 'kindpkgs', label: 'KINDPKGS', width: 120, title: '包装', showHeaderOverflow: true, sortable: true },
     { field: 'kgs', label: 'KGS', width: 120, title: '重量', showHeaderOverflow: true, sortable: true },
     { field: 'cbm', label: 'CBM', width: 90, title: '尺码', showHeaderOverflow: true, sortable: true },
-    { field: 'cntrtotal', label: 'CNTRTOTAL', width: 120, title: '箱型*箱量', showHeaderOverflow: true, sortable: true },
-    { field: 'custservice', label: 'CUSTSERVICE', width: 120, title: '客服员', showHeaderOverflow: true, sortable: true },
-    { field: 'createdUserName', label: 'CREATEDUSERNAME', width: 120, title: '创建人', showHeaderOverflow: true, sortable: true },
-    { field: 'createdTime', label: 'CREATEDTIME', width: 160, title: '创建日期', showHeaderOverflow: true, sortable: true },
+    {
+      field: 'cntrtotal',
+      label: 'CNTRTOTAL',
+      width: 120,
+      title: '箱型*箱量',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'custservice',
+      label: 'CUSTSERVICE',
+      width: 120,
+      title: '客服员',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'createdUserName',
+      label: 'CREATEDUSERNAME',
+      width: 120,
+      title: '创建人',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'createdTime',
+      label: 'CREATEDTIME',
+      width: 160,
+      title: '创建日期',
+      showHeaderOverflow: true,
+      sortable: true
+    },
     { field: 'op', label: 'OP', width: 120, title: '操作员', showHeaderOverflow: true, sortable: true },
     { field: 'doc', label: 'DOC', width: 120, title: '单证员', showHeaderOverflow: true, sortable: true },
     { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true },
     { field: 'customser', label: 'CUSTOMSER', width: 120, title: '报关行', showHeaderOverflow: true, sortable: true },
     { field: 'hscode', label: 'HSCODE', width: 120, title: 'HS编码', showHeaderOverflow: true, sortable: true },
     { field: 'issuetype', label: 'ISSUETYPE', width: 120, title: '签单方式', showHeaderOverflow: true, sortable: true },
-    { field: 'issueplace', label: 'ISSUEPLACE', width: 120, title: '签单地点', showHeaderOverflow: true, sortable: true },
-    { field: 'placedelivery', label: 'PLACEDELIVERY', width: 120, title: '交货地点', showHeaderOverflow: true, sortable: true },
+    {
+      field: 'issueplace',
+      label: 'ISSUEPLACE',
+      width: 120,
+      title: '签单地点',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'placedelivery',
+      label: 'PLACEDELIVERY',
+      width: 120,
+      title: '交货地点',
+      showHeaderOverflow: true,
+      sortable: true
+    },
     { field: 'nobill', label: 'NOBILL', width: 120, title: '提单份数', showHeaderOverflow: true, sortable: true },
-    { field: 'portdischarge', label: 'PORTDISCHARGE', width: 120, title: '卸货港', showHeaderOverflow: true, sortable: true },
-    { field: 'bookremark', label: 'BOOKREMARK', width: 120, title: '备注', className: 'book-remark-box', showOverflow: false, slots: { default: 'bookremark' } }, // 标题 合同号备注 改为 备注
+    {
+      field: 'portdischarge',
+      label: 'PORTDISCHARGE',
+      width: 120,
+      title: '卸货港',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'bookremark',
+      label: 'BOOKREMARK',
+      width: 120,
+      title: '备注',
+      className: 'book-remark-box',
+      showOverflow: false,
+      slots: { default: 'bookremark' }
+    }, // 标题 合同号备注 改为 备注
     // { field: 'remarks', label: 'REMARKS', width: 120, title: '其他备注', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'remarks' } }, // 暂时写为so备注 + si备注  数据量太大，不要了
-    { field: 'bookstatus', label: 'BOOKSTATUS', minWidth: 140, title: '运踪', showHeaderOverflow: true, slots: { default: 'bookstatus' } },
-    { field: 'closingdate', label: 'CLOSINGDATE', width: 160, title: '截港日期', showHeaderOverflow: true, sortable: true, slots: { default: 'closingdate' } },
+    {
+      field: 'bookstatus',
+      label: 'BOOKSTATUS',
+      minWidth: 140,
+      title: '运踪',
+      showHeaderOverflow: true,
+      slots: { default: 'bookstatus' }
+    },
+    {
+      field: 'closingdate',
+      label: 'CLOSINGDATE',
+      width: 160,
+      title: '截港日期',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'closingdate' }
+    },
     { field: 'eta', label: 'ETA', width: 160, title: '预计到港日期', showHeaderOverflow: true, sortable: true },
     { field: 'portload', label: 'PORTLOAD', width: 160, title: '装货港', showHeaderOverflow: true, sortable: true },
     { field: 'shipper', label: 'SHIPPER', width: 160, title: '发货人', showHeaderOverflow: true, sortable: true },
-    { field: 'destination', label: 'DESTINATION', width: 160, title: '目的地', showHeaderOverflow: true, sortable: true },
-    { field: 'issuedate', label: 'ISSUEDATE', width: 160, title: '签单日期', showHeaderOverflow: true, sortable: true, slots: { default: 'issuedate' } },
+    {
+      field: 'destination',
+      label: 'DESTINATION',
+      width: 160,
+      title: '目的地',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'issuedate',
+      label: 'ISSUEDATE',
+      width: 160,
+      title: '签单日期',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'issuedate' }
+    },
     { field: 'prepardat', label: 'PREPARDAT', width: 160, title: '预付地点', showHeaderOverflow: true, sortable: true },
     { field: 'service', label: 'SERVICE', width: 160, title: '运输条款', showHeaderOverflow: true, sortable: true },
     { field: 'sale', label: 'SALE', width: 160, title: '揽货人', showHeaderOverflow: true, sortable: true }, // 销售
     { field: 'lanename', label: 'LANENAME', width: 160, title: '船司航线', showHeaderOverflow: true, sortable: true },
     // { field: 'servicecontractno', label: 'SERVICECONTRACTNO', width: 160, title: '客户合同号', showHeaderOverflow: true, sortable: true }, // 没有设置该字段的地方 - 暂时去掉
-    { field: 'bsstatusname', label: 'BSSTATUSNAME', width: 160, title: '业务状态', showHeaderOverflow: true, sortable: true },
+    {
+      field: 'bsstatusname',
+      label: 'BSSTATUSNAME',
+      width: 160,
+      title: '业务状态',
+      showHeaderOverflow: true,
+      sortable: true
+    },
     { field: 'bookingno', label: 'BOOKINGNO', width: 160, title: '业务编号', showHeaderOverflow: true, sortable: true },
     { field: 'agentid', label: 'AGENTID', width: 160, title: '国外代理', showHeaderOverflow: true, sortable: true },
     { field: 'trucker', label: 'TRUCKER', width: 160, title: '车队', showHeaderOverflow: true, sortable: true },
@@ -73,7 +266,14 @@ export default {
     // { field: 'vgm', label: 'VGM', width: 120, title: 'VGM', showHeaderOverflow: true },
     { field: 'forwarder', label: 'FORWARDER', width: 120, title: '订舱代理', showHeaderOverflow: true, sortable: true },
     // { field: 'bookingStatus', label: 'BOOKINGSTATUS', width: 120, title: '订舱状态', showHeaderOverflow: true },
-    { field: 'freightpayer', label: 'FREIGHTPAYER', width: 120, title: '付款方', showHeaderOverflow: true, sortable: true },
+    {
+      field: 'freightpayer',
+      label: 'FREIGHTPAYER',
+      width: 120,
+      title: '付款方',
+      showHeaderOverflow: true,
+      sortable: true
+    },
     { field: 'voyno', label: 'VOYNO', width: 120, title: '海关航次', showHeaderOverflow: true },
     { field: 'cargoid', label: 'CARGOID', width: 120, title: '货物标识', showHeaderOverflow: true, sortable: true },
     { field: 'marks', label: 'MARKS', width: 120, title: '唛头', showHeaderOverflow: true, sortable: true },
@@ -82,36 +282,175 @@ export default {
     { field: 'contractno', label: 'CONTRACTNO', width: 120, title: '合约号', showHeaderOverflow: true, sortable: true },
     { field: 'route', label: 'ROUTE', width: 120, title: '航线操作', showHeaderOverflow: true, sortable: true },
     // { field: 'lanecode', label: 'LANECODE', width: 120, title: '航线代码', showHeaderOverflow: true, sortable: true },
-    { field: 'shipperid', label: 'SHIPPERID', width: 120, title: '发货人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段
-    { field: 'notifypartyid', label: 'NOTIFYPARTYID', width: 120, title: '通知人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段
-    { field: 'notifypartY2', label: 'NOTIFYPARTY2', width: 120, title: '第二通知人', showHeaderOverflow: true, sortable: true }, // 台账无，详情有
-    { field: 'consigneeid', label: 'CONSIGNEEID', width: 120, title: '收货人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段
-    { field: 'closedocdate', label: 'CLOSEDOCDATE', width: 120, title: '截单日期', showHeaderOverflow: true, sortable: true },
+    {
+      field: 'shipperid',
+      label: 'SHIPPERID',
+      width: 120,
+      title: '发货人代码',
+      showHeaderOverflow: true,
+      sortable: true
+    }, // 台账无字段
+    {
+      field: 'notifypartyid',
+      label: 'NOTIFYPARTYID',
+      width: 120,
+      title: '通知人代码',
+      showHeaderOverflow: true,
+      sortable: true
+    }, // 台账无字段
+    {
+      field: 'notifypartY2',
+      label: 'NOTIFYPARTY2',
+      width: 120,
+      title: '第二通知人',
+      showHeaderOverflow: true,
+      sortable: true
+    }, // 台账无，详情有
+    {
+      field: 'consigneeid',
+      label: 'CONSIGNEEID',
+      width: 120,
+      title: '收货人代码',
+      showHeaderOverflow: true,
+      sortable: true
+    }, // 台账无字段
+    {
+      field: 'closedocdate',
+      label: 'CLOSEDOCDATE',
+      width: 120,
+      title: '截单日期',
+      showHeaderOverflow: true,
+      sortable: true
+    },
     { field: 'bsdate', label: 'BSDATE', width: 120, title: '业务日期', showHeaderOverflow: true, sortable: true }, // 台账无字段
     { field: 'vesselid', label: 'VESSELID', width: 120, title: '船舶呼号', showHeaderOverflow: true, sortable: true }, // 台账无字段
-    { field: 'closevgmdate', label: 'CLOSEVGMDATE', width: 120, title: '截VGM时间', showHeaderOverflow: true, sortable: true },
-    { field: 'placereceipt', label: 'PLACERECEIPT', width: 120, title: '收货地', showHeaderOverflow: true, sortable: true },
-    { field: 'placereceiptid', label: 'PLACERECEIPTID', width: 120, title: '收货地代码', showHeaderOverflow: true, sortable: true },
-    { field: 'destinationid', label: 'DESTINATIONID', width: 120, title: '目的地代码', showHeaderOverflow: true, sortable: true },
-    { field: 'placedeliveryid', label: 'PLACEDELIVERYID', width: 120, title: '交货地代码', showHeaderOverflow: true, sortable: true },
-    { field: 'portloadid', label: 'PORTLOADID', width: 120, title: '装货港代码', showHeaderOverflow: true, sortable: true },
-    { field: 'portdischargeid', label: 'PORTDISCHARGEID', width: 120, title: '卸货港代码', showHeaderOverflow: true, sortable: true },
-    { field: 'pono', label: 'PONO', width: 120, title: 'PO NO', showHeaderOverflow: true, sortable: true, slots: { default: 'pono' } },
+    {
+      field: 'closevgmdate',
+      label: 'CLOSEVGMDATE',
+      width: 120,
+      title: '截VGM时间',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'placereceipt',
+      label: 'PLACERECEIPT',
+      width: 120,
+      title: '收货地',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'placereceiptid',
+      label: 'PLACERECEIPTID',
+      width: 120,
+      title: '收货地代码',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'destinationid',
+      label: 'DESTINATIONID',
+      width: 120,
+      title: '目的地代码',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'placedeliveryid',
+      label: 'PLACEDELIVERYID',
+      width: 120,
+      title: '交货地代码',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'portloadid',
+      label: 'PORTLOADID',
+      width: 120,
+      title: '装货港代码',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'portdischargeid',
+      label: 'PORTDISCHARGEID',
+      width: 120,
+      title: '卸货港代码',
+      showHeaderOverflow: true,
+      sortable: true
+    },
+    {
+      field: 'pono',
+      label: 'PONO',
+      width: 120,
+      title: 'PO NO',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'pono' }
+    },
     // 以下为新增字段
-    { field: 'dzRemark', label: 'DZREMARK', width: 160, title: '单证备注', showHeaderOverflow: true, sortable: true, slots: { default: 'dzRemark' } },
-    { field: 'czRemark', label: 'CZREMARK', width: 160, title: '操作备注', showHeaderOverflow: true, sortable: true, slots: { default: 'czRemark' } },
-    { field: 'goodsStatusList', label: 'GOODSSTATUSLIST', minWidth: 160, title: '货物状态', showHeaderOverflow: true, slots: { default: 'goodsStatusList' } },
+    {
+      field: 'dzRemark',
+      label: 'DZREMARK',
+      width: 160,
+      title: '单证备注',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'dzRemark' }
+    },
+    {
+      field: 'czRemark',
+      label: 'CZREMARK',
+      width: 160,
+      title: '操作备注',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'czRemark' }
+    },
+    {
+      field: 'goodsStatusList',
+      label: 'GOODSSTATUSLIST',
+      minWidth: 160,
+      title: '货物状态',
+      showHeaderOverflow: true,
+      slots: { default: 'goodsStatusList' }
+    },
     { field: 'tmblno', label: 'TMBLNO', width: 120, title: '真提单号', showHeaderOverflow: true, sortable: true },
-    { field: 'linename', label: 'LINENAME', width: 120, title: '航线', showHeaderOverflow: true, sortable: true }
+    { field: 'linename', label: 'LINENAME', width: 120, title: '航线', showHeaderOverflow: true, sortable: true },
+    {
+      field: 'lstShipOrderCompareRlt',
+      label: 'LSTSHIPORDERCOMPARERLT',
+      minWidth: 160,
+      title: '下货纸比对',
+      showHeaderOverflow: true,
+      slots: { default: 'lstShipOrderCompareRlt' }
+    }
   ],
   // ==== 表单部分 ====
   condAllData: [
     { title: '委托单位', align: 'center', width: 160, label: 'CUSTOMERNAME', type: 'complete', showLabel: 'shortName' }, // 客户
     { title: '主提单号', align: 'center', width: 160, label: 'MBLNO', type: 'input' },
     { title: '分提单号', align: 'center', width: 160, label: 'HBLNO', type: 'input' },
-    { title: '船公司', align: 'center', width: 120, label: 'CARRIER', type: 'select', showLabel: 'enName', showLabel2: 'cnName' },
+    {
+      title: '船公司',
+      align: 'center',
+      width: 120,
+      label: 'CARRIER',
+      type: 'select',
+      showLabel: 'enName',
+      showLabel2: 'cnName'
+    },
     { title: '订舱代理', align: 'center', width: 120, label: 'FORWARDER', type: 'complete', showLabel: 'shortName' },
-    { title: '场站', align: 'center', width: 120, label: 'YARDID', type: 'select', showLabel: 'code', showLabel2: 'name' }, // 场站显示 name , yardid 取字段 code
+    {
+      title: '场站',
+      align: 'center',
+      width: 120,
+      label: 'YARDID',
+      type: 'select',
+      showLabel: 'code',
+      showLabel2: 'name'
+    }, // 场站显示 name , yardid 取字段 code
     // { title: '船名/航次', align: 'center', width: 120, label: 'VESSEL', type: 'complete', showLabel: 'vessel', showLabel2: 'voyno' }, // 船名航次换接口 船名 vessel 航次 voyno
     { title: '船名', align: 'center', width: 120, label: 'VESSEL', type: 'complete', showLabel: 'name' }, // 船名航次换接口 船名 vessel 航次 voyno
     { title: '开船日期', align: 'center', width: 160, label: 'ETD', type: 'dateRange', resLabel: ['BETD', 'EETD'] },
@@ -138,12 +477,33 @@ export default {
     { title: '第二通知人', align: 'center', width: 120, label: 'NOTIFYPARTY2', type: 'input' },
     { title: '收货人', align: 'center', width: 120, label: 'CONSIGNEE', type: 'input' },
     { title: '收货人代码', align: 'center', width: 120, label: 'CONSIGNEEID', type: 'input' },
-    { title: '截单日期', align: 'center', width: 160, label: 'CLOSEDOCDATE', type: 'dateRange', resLabel: ['BCLOSEDOCDATE', 'ECLOSEDOCDATE'] },
+    {
+      title: '截单日期',
+      align: 'center',
+      width: 160,
+      label: 'CLOSEDOCDATE',
+      type: 'dateRange',
+      resLabel: ['BCLOSEDOCDATE', 'ECLOSEDOCDATE']
+    },
     { title: '业务日期', align: 'center', width: 120, label: 'BSDATE', type: 'date' },
     { title: '合约号', align: 'center', width: 120, label: 'CONTRACTNO', type: 'input' },
     { title: '船舶呼号', align: 'center', width: 120, label: 'VESSELID', type: 'input' },
-    { title: '截港日期', align: 'center', width: 160, label: 'CLOSINGDATE', type: 'dateRange', resLabel: ['BCLOSINGDATE', 'ECLOSINGDATE'] },
-    { title: '截VGM时间', align: 'center', width: 160, label: 'CLOSEVGMDATE', type: 'dateRange', resLabel: ['BCLOSEVGMDATE', 'ECLOSEVGMDATE'] },
+    {
+      title: '截港日期',
+      align: 'center',
+      width: 160,
+      label: 'CLOSINGDATE',
+      type: 'dateRange',
+      resLabel: ['BCLOSINGDATE', 'ECLOSINGDATE']
+    },
+    {
+      title: '截VGM时间',
+      align: 'center',
+      width: 160,
+      label: 'CLOSEVGMDATE',
+      type: 'dateRange',
+      resLabel: ['BCLOSEVGMDATE', 'ECLOSEVGMDATE']
+    },
     { title: '收货地', align: 'center', width: 120, label: 'PLACERECEIPT', type: 'complete', showLabel: 'enName' },
     { title: '目的地', align: 'center', width: 120, label: 'DESTINATION', type: 'complete', showLabel: 'enName' },
     { title: '交货地', align: 'center', width: 120, label: 'PLACEDELIVERY', type: 'complete', showLabel: 'enName' },
@@ -179,7 +539,15 @@ export default {
     { title: '船代', align: 'center', width: 160, label: 'SHIPAGENCY', type: 'complete', showLabel: 'name' },
     { title: '箱型', align: 'center', width: 120, label: 'CNTRTOTAL', type: 'select', showLabel: 'name' },
     { title: '包装', align: 'center', width: 120, label: 'KINDPKGS', type: 'select', showLabel: 'name' },
-    { title: '签单方式', align: 'center', width: 160, label: 'ISSUETYPE', type: 'select', showLabel: 'enName', showLabel2: 'cnName' },
+    {
+      title: '签单方式',
+      align: 'center',
+      width: 160,
+      label: 'ISSUETYPE',
+      type: 'select',
+      showLabel: 'enName',
+      showLabel2: 'cnName'
+    },
     { title: '航线', align: 'center', width: 160, label: 'LINENAME', type: 'select', showLabel: 'name' },
     {
       title: '提单份数',
@@ -216,7 +584,14 @@ export default {
         { code: 'O', name: '超限箱' }
       ]
     },
-    { title: '签单日期', align: 'center', width: 160, label: 'ISSUEDATE', type: 'dateRange', resLabel: ['BISSUEDATE', 'EISSUEDATE'] },
+    {
+      title: '签单日期',
+      align: 'center',
+      width: 160,
+      label: 'ISSUEDATE',
+      type: 'dateRange',
+      resLabel: ['BISSUEDATE', 'EISSUEDATE']
+    },
     { title: '真提单号', align: 'center', width: 160, label: 'TMBLNO', type: 'input' }
   ]
 }

From 7528d23bbb5df9e5cf451ee963e516d1be073b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Mon, 17 Apr 2023 15:45:22 +0800
Subject: [PATCH 2/2] 4/17

---
 src/views/main/BookingLedger/list/index.vue | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 1426bda..e6c5188 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -214,15 +214,17 @@
                   </div>
                 </template>
                 <template #lstShipOrderCompareRlt="{ row }">
-                  <div class="goods-status" v-if="row.lstShipOrderCompareRlt">
-                    <div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
-                      <a-icon type="close-circle" :style="{ color: '#ff9200' }" />
-                    </div>
-                    <div v-else-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">
-                      <a-icon type="check-circle" :style="{ color: '#54bc25' }" />
-                    </div>
-                    <div v-else>
-                      {{ row.LstShipOrderCompareRltName }}
+                  <div class="goods-status">
+                    <div v-if="row.lstShipOrderCompareRlt">
+                      <div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
+                        <a-icon type="close-circle" :style="{ color: '#ff9200' }" />
+                      </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-icon
                       class="TablelstShipOrderCompareRltRedo"