diff --git a/.env b/.env
index 8a0c6fd..214e7c0 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,8 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
-VUE_APP_TYPE = 'customer'
+# VUE_APP_TYPE = 'customer'
 # VUE_APP_TYPE = 'hechuan'
-# VUE_APP_TYPE = 'yunyingduan'
+VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_TYPE = 'gangjie'
 # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy
 
@@ -19,16 +19,16 @@ VUE_APP_TYPE = 'customer'
 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30813
 
 # 运营端测试
-# VUE_APP_API_BASE_URL=http://60.209.125.238:30814
-# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
+VUE_APP_API_BASE_URL=http://60.209.125.238:30814
+VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
 
 # 港捷
 # VUE_APP_API_BASE_URL=http://118.190.144.189:5001
 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
 
 # 客户端正式
-VUE_APP_API_BASE_URL=http://118.190.144.189:6001
-VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001
+# VUE_APP_API_BASE_URL=http://118.190.144.189:6001
+# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001
 
 # 运营端正式
 # VUE_APP_API_BASE_URL=http://118.190.144.189:6002
diff --git a/.env.development b/.env.development
index 75bff01..2afe06a 100644
--- a/.env.development
+++ b/.env.development
@@ -19,8 +19,8 @@ VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30813
 
 # 运营端测试
-VUE_APP_API_BASE_URL=http://60.209.125.238:30814
-VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
+# VUE_APP_API_BASE_URL=http://60.209.125.238:30814
+# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
 
 # VUE_APP_API_BASE_URL=http://192.168.0.80:7373/
 # VUE_APP_SOCKET_BASE_URL=http://192.168.0.80:7373/
@@ -30,8 +30,8 @@ VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
 
 # 运营端正式
-# VUE_APP_API_BASE_URL=http://118.190.144.189:6002
-# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
+VUE_APP_API_BASE_URL=http://118.190.144.189:6002
+VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
 
 # 客户端正式
 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001
diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js
index 32a1d31..a253ca1 100644
--- a/src/api/modular/main/BookingLedger.js
+++ b/src/api/modular/main/BookingLedger.js
@@ -956,6 +956,27 @@ export function RefreshBillTrace(parameter) {
   })
 }
 
+export function SetTxxpEndTime(parameter) {
+  return axios({
+    url: '/BookingOrder/SetTxxpEndTime',
+    method: 'post',
+    params: parameter
+  })
+}
+export function RefreshYGT(parameter) {
+  return axios({
+    url: '/BookingYunZong/RefreshYGT?' + parameter,
+    method: 'post'
+  })
+}
+
+export function RefreshYard(parameter) {
+  return axios({
+    url: '/BookingYunZong/RefreshYard?' + parameter,
+    method: 'post'
+  })
+}
+
 export function GetToDoBCList(parameter) {
   return axios({
     url: '/TaskManageBC/GetToDoBCList',
@@ -1168,6 +1189,14 @@ export function GetDraftCompareResultInfo(parameter) {
   })
 }
 
+export function SaveDraftComparellanual(parameter) {
+  return axios({
+    url: '/TaskDraftCompare/SaveDraftCompareManual',
+    method: 'post',
+    data: parameter
+  })
+}
+
 export function GetShippingOrderCompareResult(parameter) {
   return axios({
     url: '/TaskShippingOrderCompare/GetShippingOrderCompareResult',
diff --git a/src/components/mskBookingOrder/index.vue b/src/components/mskBookingOrder/index.vue
index d9f9d6a..147d677 100644
--- a/src/components/mskBookingOrder/index.vue
+++ b/src/components/mskBookingOrder/index.vue
@@ -373,10 +373,10 @@
         <a-button type="danger" @click="showFlag = false">取消</a-button>
       </template>
     </a-modal>
-    <a-modal title="检索船期" :visible="visible" width="1200px" @cancel="visible = false">
+    <a-modal title="检索船期" :footer="null" :visible="visible" width="1200px" @cancel="visible = false">
       <div style="display: flex;align-items: center;">
-        <a-row style="width:90%">
-          <a-form-model :model="searchForm" :label-col="{ span: 7 }" :wrapper-col="{ span: 17 }">
+        <a-row style="width:95%">
+          <a-form-model :model="searchForm" :label-col="{ span: 6 }" :wrapper-col="{ span: 15 }">
             <a-col :span="6">
               <a-form-model-item label="始发地">
                 {{ this.form.placeOfReceiptCityName }}
@@ -387,19 +387,33 @@
                 {{ this.form.placeOfDeliveryCityName }}
               </a-form-model-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :span="3">
+              <a-form-model-item label="箱型">
+                <a-select
+                  show-search
+                  v-model="searchForm.isoEquipmentCode"
+                  :filter-option="filterOption"
+                  size="small"
+                  style="width: 100%">
+                  <a-select-option v-for="(item, index) in ctnallList" :key="index" :value="item.code">
+                    {{ item.name }}
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="4">
               <a-form-model-item label="船名">
-                <a-input v-model="searchForm.vesselName" />
+                <a-input size="small" v-model="searchForm.vesselName" />
               </a-form-model-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :span="4">
               <a-form-model-item label="航次号">
-                <a-input v-model="searchForm.carrierDepartureVoyageNumber" />
+                <a-input size="small" v-model="searchForm.carrierDepartureVoyageNumber" />
               </a-form-model-item>
             </a-col>
           </a-form-model>
         </a-row>
-        <a-button style="margin-left: 20px;" @click="handleOpenCQ" type="primary">检索</a-button>
+        <a-button style="margin-left: 10px;" @click="handleOpenCQ" type="primary">检索</a-button>
       </div>
       <a-spin :spinning="cqLoading">
         <div class="box" v-for="(item, index) in shipList" :key="index">
@@ -497,6 +511,7 @@ import {
   CheckWarningBatchCopy, maskCopy
 } from '@/api/modular/main/BookingLedger'
 import { mapGetters } from 'vuex'
+import moment from 'moment'
 export default {
   data() {
     return {
@@ -514,7 +529,9 @@ export default {
       mskType: '',
       mskNumber: '',
       mskCopyId: '',
-      searchForm: {},
+      searchForm: {
+        isoEquipmentCode: ''
+      },
       formLoading: false,
       shipData: [],
       contractnoList: [],
@@ -614,6 +631,8 @@ export default {
         importServiceMode: this.form.importServiceMode,
         vesselOperatorCarrierCode: this.form.carrierCode,
         startDate: this.form.earliestDepartureDate,
+        carrierCollectionOriginGeoID: this.form.carrierCollectionOriginGeoID,
+        carrierDeliveryDestinationGeoID: this.form.carrierDeliveryDestinationGeoID,
         ...this.searchForm
       }
       SearchShipSailingSchedule(data).then(res => {
@@ -639,15 +658,20 @@ export default {
       this.mskCopyId = copyId
       this.getContractnoList()
       this.shipData = []
+      // 获取当前时间
       if (!id) {
         this.form = {
-          ctns: [],
+          ctns: [
+            { ctnSufferWeight: 15000, ctnNum: 1, ctnCode: '22G1', ctnName: '20GP' },
+            { ctnSufferWeight: 15000, ctnNum: 1, ctnCode: '45G11', ctnName: '40HC' }
+          ],
           isReefer: false,
           productCode: 'MaerskContract',
           carrierCode: 'MAEU',
           isBookingPartOwnPrice: true,
           importServiceMode: 'CY',
           exportServiceMode: 'CY',
+          earliestDepartureDate: moment().format('YYYY-MM-DD'),
           cargoType: 'DRY',
           sender: 'BOOKAPI',
           commodityCodeType: 'MaerskCode'
@@ -739,6 +763,7 @@ export default {
     handleSelectCQ(item) {
       this.shipData = []
       this.form.originDepartureDateTimeLocal = item.etd
+      this.form.isoEquipmentCode = this.searchForm.isoEquipmentCode
       this.form.destinationArrivalDateTimeLocal = item.atd
       this.form.placeOfReceiptUnLocCode = item.orignUNLocationCode
       this.form.placeOfDeliveryUnLocCode = item.deliveryUNLocationCode
@@ -748,6 +773,19 @@ export default {
       this.form.estSailingDays = item.days
       this.form.transportMode = item.transportMode
       this.form.carrierProductId = item.carrierProductId
+      const arr = []
+      if (this.form.ctns.length > 0) {
+        this.form.ctns.forEach(item => {
+          if (item.ctnCode === this.searchForm.isoEquipmentCode) {
+            arr.push(1)
+          }
+        })
+      } else {
+        this.form.ctns.push({ ctnCode: this.searchForm.isoEquipmentCode, ctnNum: 1, ctnSufferWeight: 0 })
+      }
+      if (arr.length === 0) {
+        this.form.ctns.push({ ctnCode: this.searchForm.isoEquipmentCode, ctnNum: 1, ctnSufferWeight: 0 })
+      }
       this.shipData.push(item)
       this.visible = false
       this.$forceUpdate()
@@ -782,6 +820,7 @@ export default {
       });
     },
     handleSave() {
+      console.log(this.form);
       this.$refs.form.validate(valid => {
         if (valid) {
           this.form.carrierId = 'MSK'
@@ -858,6 +897,7 @@ export default {
       this.portloadList.forEach(item => {
         if (item.carrierGeoID === val) {
           this.form.placeOfReceiptCityName = item.cityName
+          this.form.carrierCollectionOriginGeoID = item.carrierGeoID
           this.form.placeOfReceiptCountryCode = item.countryCode
           this.form.userPlaceOfReceiptUnLocCode = item.unLocationCode
           this.form.userPlaceOfReceiptCityName = item.cityName
@@ -872,6 +912,7 @@ export default {
         if (item.carrierGeoID === val) {
           this.form.placeOfDeliveryCityName = item.cityName
           this.form.placeOfDeliveryCountryCode = item.countryCode
+          this.form.carrierDeliveryDestinationGeoID = item.carrierGeoID
           this.form.userPlaceOfDeliveryUnLocCode = item.unLocationCode
           this.form.userPlaceOfDeliveryCityName = item.cityName
           this.form.userPlaceOfDeliveryCountryCode = item.countryCode
diff --git a/src/views/main/BookingDjy/detail/index.vue b/src/views/main/BookingDjy/detail/index.vue
index 9848d2a..bc38dbd 100644
--- a/src/views/main/BookingDjy/detail/index.vue
+++ b/src/views/main/BookingDjy/detail/index.vue
@@ -492,7 +492,11 @@
           </a-row>
           <a-row>
             其他信息
-            <div>账号：{{ details.extendData.Account }}&nbsp;&nbsp;&nbsp;密码：{{ details.extendData.Password }}</div>
+            <div>
+              账号：{{ details.extendData.Account }}&nbsp;&nbsp;&nbsp;
+              密码：{{ details.extendData.Password }}&nbsp;&nbsp;&nbsp;
+              邮箱{{ details.extendData.OpMail }}
+            </div>
           </a-row>
         </a-form-model>
       </div>
diff --git a/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue b/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue
index 4a90a45..b27422e 100644
--- a/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue
@@ -519,21 +519,15 @@
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
                 <a-form-model-item
                   class="from-label"
-                  label="航线操作"
+                  label="客户操作"
                   :labelCol="userLabelCol"
                   :wrapperCol="userWrapperCol"
                   has-feedback
-                  prop="route">
-                  <selectView
-                    type="route"
-                    :defaultVal="details.route"
-                    :disabled="BookingLockOrder['route'] && isLockBooking"
-                    searchApi="GetSysUserPage"
-                    :searchQuery="{ name: '' }"
-                    :showLabel="['name']"
-                    :openSearch="true"
-                    :isCopy="true"
-                    @change="getSelectViewRes"></selectView>
+                  prop="bookingUserName">
+                  <inputView
+                    type="bookingUserName"
+                    :parentVal="details.bookingUserName"
+                    @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
@@ -934,9 +928,10 @@ export default {
       },
       deep: true
     },
-    '$route.query': {
+    '$route': {
       immediate: true,
       handler(nD, oD) {
+        console.log(this.$route,111)
         this.id = this.$route.query.id
         if (this.$route.name === 'BookingDetail') {
           this.init()
diff --git a/src/views/main/BookingDjyLedger/list/index.vue b/src/views/main/BookingDjyLedger/list/index.vue
index f3c1cad..08cd91b 100644
--- a/src/views/main/BookingDjyLedger/list/index.vue
+++ b/src/views/main/BookingDjyLedger/list/index.vue
@@ -2362,7 +2362,7 @@ export default {
       document.body.removeChild(cInput);
     },
     editColumns(row) {
-      this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } })
+      this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno ? row.mblno : '' } })
     },
     getList(queryParam = {}, isInit = false, isAdd = 'normal') {
       this.$set(this.gridOptions, 'loading', true)
diff --git a/src/views/main/BookingGangjie/detail/modules/goodsTable.vue b/src/views/main/BookingGangjie/detail/modules/goodsTable.vue
index e236d2f..39154a1 100644
--- a/src/views/main/BookingGangjie/detail/modules/goodsTable.vue
+++ b/src/views/main/BookingGangjie/detail/modules/goodsTable.vue
@@ -4,10 +4,12 @@
       <a-card :bordered="false" :bodyStyle="{ padding: '10px 20px' }">
         <div class="from-line">
           <div class="left" v-if="!isLockBooking">
-            <a-button class="btn btn-add" type="primary" @click="addboxLine"> <span style="margin-right: 5px;"
-                class="iconfont icon-zhizhishu"></span>添加</a-button>
+            <a-button class="btn btn-add" type="primary" @click="addboxLine"> <span
+              style="margin-right: 5px;"
+              class="iconfont icon-zhizhishu"></span>添加</a-button>
             <a-button class="btn btn-delete" @click="removeLine" :style="{ marginRight: '20px' }"><span
-                style="margin-right: 5px;" class="iconfont icon-shanchu1"></span>删除</a-button>
+              style="margin-right: 5px;"
+              class="iconfont icon-shanchu1"></span>删除</a-button>
             <a-button class="btn btn-more-name" type="primary" @click="openDialog" :disabled="tableData.length === 0">
               <a-icon type="appstore" />多品名
             </a-button>
@@ -23,15 +25,24 @@
             <a-button class="btn btn-weight" type="primary" @click="arrowsWeight">
               <a-icon type="arrows-alt" />展开箱量
             </a-button>
-            <a-button class="btn btn-add" type="primary" @click="handleRefsh"><span style="margin-right: 5px;"
-                class="iconfont icon-shuaxin"></span>刷新</a-button>
+            <a-button class="btn btn-add" type="primary" @click="handleRefsh"><span
+              style="margin-right: 5px;"
+              class="iconfont icon-shuaxin"></span>刷新</a-button>
           </div>
-          <div v-if="details.autoYardImport && !details.autoYardImport.isRead"
+          <div
+            v-if="details.autoYardImport && !details.autoYardImport.isRead"
             style="display: inline-block;margin-left: 10px;padding-top: 5px;">
-            <a-icon v-if="details.autoYardImport && details.autoYardImport.status == '已导入'" @click="handleOpen"
-              type="check-circle" theme="filled" style="color: green;font-size: 19px;cursor: pointer;" />
-            <a-icon v-if="details.autoYardImport && details.autoYardImport.status == '未导入'" @click="handleOpen"
-              type="exclamation-circle" theme="filled"
+            <a-icon
+              v-if="details.autoYardImport && details.autoYardImport.status == '已导入'"
+              @click="handleOpen"
+              type="check-circle"
+              theme="filled"
+              style="color: green;font-size: 19px;cursor: pointer;" />
+            <a-icon
+              v-if="details.autoYardImport && details.autoYardImport.status == '未导入'"
+              @click="handleOpen"
+              type="exclamation-circle"
+              theme="filled"
               style="color: rgb(197, 194, 16);font-size: 19px;cursor: pointer;" />
           </div>
           <div class="table-right">
@@ -44,9 +55,18 @@
         </div>
         <div v-if="tableLoaded">
           <!-- rowKeyFieldName="rowKey" -->
-          <ve-table :columns="columns" :table-data="tableData" borderY ref="tableRef" style="min-width: 970"
-            :cell-autofill-option="cellAutofillOption" :editOption="editOption" :rowKeyFieldName="rowKeyName"
-            :rowStyleOption="rowStyleOption" :checkbox-option="checkboxOption" :clipboard-option="clipboardOption"
+          <ve-table
+            :columns="columns"
+            :table-data="tableData"
+            borderY
+            ref="tableRef"
+            style="min-width: 970"
+            :cell-autofill-option="cellAutofillOption"
+            :editOption="editOption"
+            :rowKeyFieldName="rowKeyName"
+            :rowStyleOption="rowStyleOption"
+            :checkbox-option="checkboxOption"
+            :clipboard-option="clipboardOption"
             :cellSelectionOption="cellSelectionOption" />
           <div class="table-no-data" v-if="tableData.length === 0">暂无数据</div>
         </div>
@@ -54,10 +74,19 @@
       </a-card>
     </a-spin>
 
-    <a-modal title="多品名维护" width="80%" :visible="moreVisible" :confirmLoading="moreModelconfirm" :maskClosable="false"
+    <a-modal
+      title="多品名维护"
+      width="80%"
+      :visible="moreVisible"
+      :confirmLoading="moreModelconfirm"
+      :maskClosable="false"
       @cancel="handleModelCancel">
       <div class="model-content">
-        <ve-table style="width: 100%" :columns="modelColumns" :table-data="tableData" :radio-option="radioOption"
+        <ve-table
+          style="width: 100%"
+          :columns="modelColumns"
+          :table-data="tableData"
+          :radio-option="radioOption"
           row-key-field-name="rowKey" />
         <div class="model-botton-box">
           <a-button class="btn" type="primary" @click="addChildData">新增</a-button>
@@ -65,9 +94,15 @@
           <a-button class="btn" type="primary" @click="saveChildData">保存</a-button>
         </div>
         <div class="model-child-table">
-          <ve-table :columns="childColumns" :table-data="childTableData" borderY
-            :cell-autofill-option="cellAutofillOption" :editOption="editChildOption" rowKeyFieldName="rowKey"
-            :rowStyleOption="rowStyleOption" :checkbox-option="checkChildboxOption"
+          <ve-table
+            :columns="childColumns"
+            :table-data="childTableData"
+            borderY
+            :cell-autofill-option="cellAutofillOption"
+            :editOption="editChildOption"
+            rowKeyFieldName="rowKey"
+            :rowStyleOption="rowStyleOption"
+            :checkbox-option="checkChildboxOption"
             :clipboard-option="clipboardChildOption" />
           <div class="table-no-data" v-if="childTableData.length === 0">暂无数据</div>
         </div>
@@ -1910,15 +1945,17 @@ export default {
               data.map((item, index) => {
                 const _data = {
                   rowKey: lastNum + index,
-                  weightype: '',
-                  weighkgs: ''
+                  weightype: ''
                 }
                 ctnSetArr.forEach(ite => {
-                  if (ite.code !== 'KINDPKGS') {
-                    _data[ite.intoName] = item[ite.code]
-                  } else {
+                  if (ite.code === 'KINDPKGS') {
                     _data.kindpkgs = kindpkgsOld || item.KINDPKGS
                   }
+                  if (ite.code === 'WEIGHKGS') {
+                    const setWeighkgs = this.calc(Number(item.KGS), Number(item.TAREWEIGHT), '+')
+                    _data.weighkgs = setWeighkgs
+                  }
+                  _data[ite.intoName] = item[ite.code]
                 })
                 addTable.push(_data)
               })
diff --git a/src/views/main/BookingGangjie/list/index.vue b/src/views/main/BookingGangjie/list/index.vue
index e6928e2..8e9db2a 100644
--- a/src/views/main/BookingGangjie/list/index.vue
+++ b/src/views/main/BookingGangjie/list/index.vue
@@ -279,22 +279,25 @@
                   </a-popconfirm>
                 </template>
                 <template #bookstatus="{ row, column, rowIndex }">
-                  <div style="display: flex;align-items: center;">
+                  <div style="display: flex; align-items: center">
                     <a-icon
                       v-if="row.isBookingYZ != 0"
-                      style="cursor: pointer;color: rgb(7, 231, 56);"
+                      style="cursor: pointer; color: rgb(7, 231, 56)"
                       @click="handleRefshYZOnce(row, rowIndex)"
-                      type="reload" />
+                      type="reload"
+                    />
                     <a-spin :spinning="row.refshYzitemLoad">
                       <div
                         :style="row.isBookingYZ == 0 ? 'padding-left:14px' : ''"
                         class="billtrace-box"
-                        :class="column.resizeWidth > 240 ? 'normal-box' : 'flex-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">
+                          :key="bindex"
+                        >
                           <a-popover placement="topLeft" v-if="btn.staTime">
                             <div slot="content">{{ btn.staTime }}</div>
                             <span @click="handleGetWebDataYZ(row, btn.staCode)" :class="{ active: btn.isChecked }">{{
@@ -302,13 +305,16 @@
                             }}</span>
                           </a-popover>
                           <span
-                            style="cursor: pointer;"
+                            style="cursor: pointer"
                             @click="handleGetWebDataYZ(row, btn.staCode)"
                             :class="{ active: btn.isChecked }"
-                            v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
+                            v-else
+                          >{{ enmuBookingBtn(btn.staCode) }}</span
+                          >
                           <i
                             class="iconfont icon-xiaoyoujiantou"
-                            :class="{ hide: bindex === row.bookstatus.length - 1 }"></i>
+                            :class="{ hide: bindex === row.bookstatus.length - 1 }"
+                          ></i>
                         </div>
                       </div>
                     </a-spin>
@@ -317,34 +323,41 @@
                 <template #statuslogs="{ row, column }">
                   <div v-if="row.statuslogs1">
                     <div v-if="row.statuslogs1.length > 0">
-                      <div class="billtrace-btn1" style="display: flex;align-items: center;">
+                      <div class="billtrace-btn1" style="display: flex; align-items: center">
+                        <a-icon
+                          style="cursor: pointer; color: rgb(7, 231, 56); margin-right: 5px"
+                          @click="handleRefshYard(row)"
+                          type="reload"
+                        />
                         <a-spin :spinning="row.webDataLoad">
                           <a-popover placement="topLeft">
                             <div slot="content">
                               <div>
-                                <span class="txfcSpan" style="width: 120px;">箱号</span>
+                                <span class="txfcSpan" style="width: 120px">箱号</span>
                                 <span @click="handleGetWebData(row, 'YARD')" class="txfcSpan">提箱</span>
                                 <span @click="handleGetWebData(row, 'YARD')" class="txfcSpan">返场</span>
                               </div>
                               <div v-for="(item, index) in row.statuslogs1" :key="index">
-                                <span class="txfcSpan" style="width: 120px;">{{ item.cntrno }}</span>
+                                <span class="txfcSpan" style="width: 120px">{{ item.cntrno }}</span>
                                 <span class="txfcSpan">{{ item.txopTime }}</span>
                                 <span class="txfcSpan">{{ item.fcopTime }}</span>
                               </div>
                             </div>
                             <div
                               @click="handleGetWebData(row, 'YARD')"
-                              :class="{ active: row.statuslogs1[0].txopTime }">
+                              :class="{ active: row.statuslogs1[0].txopTime }"
+                            >
                               提箱
                             </div>
                             <div
                               @click="handleGetWebData(row, 'YARD')"
-                              :class="{ active: row.statuslogs1[0].fcopTime }">
+                              :class="{ active: row.statuslogs1[0].fcopTime }"
+                            >
                               返场
                             </div>
                           </a-popover>
                         </a-spin>
-                        <span style="margin-left: 10px;">未提：{{ row.txopNumber }}/{{ row.statuslogs1.length }}</span>
+                        <span style="margin-left: 5px">未提：{{ row.txopNumber }}/{{ row.statuslogs1.length }}</span>
                       </div>
                     </div>
                   </div>
@@ -360,13 +373,19 @@
                 </template>
                 <template #txxp="{ row }">
                   <div style="display: flex;align-items: center;">
-                    <span style="margin-right: 10px;cursor: pointer;color: #36cfc9;" class="iconfont icon-dayinxiaopiao" @click="TxxpLink(row)"></span>
-                    <div v-if="row.extendState" style="display: flex;align-items: center;">
+                    <span
+                      style="margin-right: 10px;cursor: pointer;color: #36cfc9;"
+                      class="iconfont icon-dayinxiaopiao"
+                      @click="TxxpLink(row)"></span>
+                    <div style="display: flex;align-items: center;">
                       <div>
-                        <div>{{ row.extendState.txxpBeginTime.substring(0,16) }}</div>
-                        <div>{{ row.extendState.txxpEndTime.substring(0,16) }}</div>
+                        <div v-if="row.extendState && row.extendState.txxpEndTime">{{ row.extendState.txxpEndTime.substring(0, 16) }}</div>
+                        <div> <a @click="openStop(row)" style="font-size: 12px;" href="javascript:;">修改到期时间</a></div>
                       </div>
-                      <div v-if="row.extendState.txxpPdfUrl" @click="handleLookPdf(row)" style="cursor: pointer;color: #36cfc9;margin-left:10px;">查看</div>
+                      <div
+                        v-if="row.extendState && row.extendState.txxpPdfUrl"
+                        @click="handleLookPdf(row)"
+                        style="cursor: pointer;color: #36cfc9;margin-left:10px;">查看</div>
                     </div>
                   </div>
                 </template>
@@ -389,7 +408,7 @@
                           比对时间: <span>{{ row.lstShipOrderCompareDate }}</span>
                         </p>
                       </template>
-                      <div style="cursor: pointer;" @click="handleOpenResult(row)" v-if="row.lstShipOrderCompareRlt">
+                      <div style="cursor: pointer" @click="handleOpenResult(row)" v-if="row.lstShipOrderCompareRlt">
                         <div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
                           <a-icon type="close-circle" :style="{ color: 'red' }" />
                         </div>
@@ -417,7 +436,8 @@
                     <a-icon
                       class="TablelstShipOrderCompareRltRedo"
                       @click="excuteShippingOrderCompareBatch(row)"
-                      type="redo" />
+                      type="redo"
+                    />
                   </div>
                 </template>
                 <template #lstDraftCompareRlt="{ row }">
@@ -442,7 +462,8 @@
                       title="查看比对结果"
                       class="TablelstShipOrderCompareRltRedo"
                       @click="handleFormatContrast(row)"
-                      type="diff" />
+                      type="diff"
+                    />
                   </div>
                 </template>
                 <template #goodsStatusList="{ row }">
@@ -607,16 +628,28 @@
         :title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'"
         @cancel="TaskShippingOrderCompareHandleCancel"
         :visible="TaskShippingOrderCompareVisible"
-        width="40%">
+        class="formatSheetModal"
+        width="40%"
+      >
         <template slot="footer">
           <a-button key="back" @click="TaskShippingOrderCompareHandleCancel"> 关闭 </a-button>
         </template>
+        <div
+          style="margin:10px 0;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+          :title="TaskShippingOrderCompareData.manualFeedBackResult.operNote"
+          v-if="TaskShippingOrderCompareData.manualFeedBackResult">
+          {{ TaskShippingOrderCompareData.manualFeedBackResult.operTime }}
+          【人工修正】 {{ TaskShippingOrderCompareData.manualFeedBackResult.operUser }}，
+          【原因】{{ TaskShippingOrderCompareData.manualFeedBackResult.reason }}，
+          【备注】 {{ TaskShippingOrderCompareData.manualFeedBackResult.operNote }}
+        </div>
         <p class="TaskShippingOrderCompareP">
           {{ TaskShippingOrderCompareData.compareTime }}
           <span v-if="TaskShippingOrderCompareData.isExistsDiff">
             比对异常 合计
             <span class="TaskShippingOrderCompareSpan">{{ TaskShippingOrderCompareData.total }}</span>
             条
+            <a v-if="TaskShippingOrderCompareData.lstShipOrderCompareRlt === 'DIFF'" href="javascript:;" @click="openPersonal">人工处理</a>
           </span>
         </p>
         <div class="TaskShippingOrderCompareMainBox">
@@ -638,7 +671,8 @@
               class="TaskShippingOrderCompareMainList"
               v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
               :key="index"
-              v-show="item.pCode != 'ContaList'">
+              v-show="item.pCode != 'ContaList'"
+            >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
               <p v-if="item.msg">
@@ -664,8 +698,10 @@
               v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
               :key="index"
               v-show="item.pCode == 'ContaList'"
-              :class="item.fieldName == '箱号' ? 'TaskShippingOrderCompareMainList BoxNo' : 'TaskShippingOrderCompareMainList'
-              ">
+              :class="
+                item.fieldName == '箱号' ? 'TaskShippingOrderCompareMainList BoxNo' : 'TaskShippingOrderCompareMainList'
+              "
+            >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
               <p v-if="item.msg">
@@ -683,212 +719,261 @@
         :title="formatSheet.isExistsDiff ? '格式单比对（有差异）' : '格式单比对（正常）'"
         @cancel="formatSheetVisible = false"
         :visible="formatSheetVisible"
-        width="90%">
+        class="formatSheetModal"
+        width="90%"
+      >
         <template slot="footer">
           <a-button key="back" @click="formatSheetVisible = false"> 关闭 </a-button>
         </template>
-        <div style="display: flex;">
-          <div style="width:55%">
-            <div>
-              <div
-                v-if="formatSheet.total > 0"
-                style="display: flex;justify-content: space-between;"
-                class="TaskShippingOrderCompareP">
-                <div>
-                  {{ formatSheet.compareTime }}
-                  <span v-if="formatSheet.isExistsDiff">
-                    比对异常 合计
-                    <span class="TaskShippingOrderCompareSpan">{{ formatSheet.total }}</span>
-                    条
-                  </span>
-                </div>
-                <div>
-                  显示全部
-                  <a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
-                </div>
-              </div>
-              <div style="display: flex;align-items: flex-start;" v-else>
-                <a-icon
-                  style="color: rgb(82,196,26);font-size: 50px;margin-top: 5px;"
-                  type="check-circle"
-                  theme="filled" />
-                <div style="margin-left: 20px;">
-                  <div style="font-weight: bold;font-size: 22px;">格式单比对(正常)</div>
-                  <div style="font-weight: bold;">提单号:{{ formatSheet.mBlNo }}</div>
-                  <div style="font-weight: bold;">{{ formatSheet.compareTime }}</div>
-                </div>
-                <div style="margin:5px 0px 0px 40px">
-                  显示全部
-                  <a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
-                </div>
-              </div>
-              <div
-                v-if="!formatFlag && formatSheet.total > 0"
-                class="TaskShippingOrderCompareMainBox"
-                style="height: 600px;">
-                <div class="TaskShippingOrderCompareMain">
-                  <div class="TaskShippingOrderCompareMainHeader">
-                    <div>
-                      <p>提单号</p>
-                      <div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
-                      <p>{{ formatSheet.mBlNo }}</p>
-                    </div>
+        <div>
+          <div style="margin:10px 0" v-if="formatSheet.manualFeedBackResult">
+            {{ formatSheet.manualFeedBackResult.operTime }}
+            【人工修正】 {{ formatSheet.manualFeedBackResult.operUser }}，
+            【原因】{{ formatSheet.manualFeedBackResult.reason }}，
+            【备注】 {{ formatSheet.manualFeedBackResult.operNote }}
+          </div>
+          <div style="display: flex">
+            <div style="width: 55%">
+              <div>
+                <div
+                  v-if="formatSheet.total > 0"
+                  style="display: flex; justify-content: space-between"
+                  class="TaskShippingOrderCompareP"
+                >
+                  <div>
+                    {{ formatSheet.compareTime }}
+                    <span v-if="formatSheet.isExistsDiff">
+                      比对异常 合计
+                      <span class="TaskShippingOrderCompareSpan">{{ formatSheet.total }}</span>
+                      条
+                      <a v-if="formatSheet.lstDraftCompareRlt === 'DIFF'" href="javascript:;" @click="openPersonal">人工处理</a>
+                    </span>
                   </div>
-                  <div
-                    v-for="(item, index) in formatSheet.showDetailList"
-                    :key="index"
-                    style="display: flex;margin-top: 15px;"
-                    v-show="item.pCode != 'ContaList' && item.isDiff">
-                    <p style="padding-top: 4px;" v-if="item.msg">
-                      <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>
-                    <div v-if="item.isDiff" style="width:60%">
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
-                        <div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
-                      </div>
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
-                        <div v-html="item.mergeHtml"></div>
-                      </div>
-                    </div>
+                  <div>
+                    显示全部
+                    <a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
                   </div>
                 </div>
-                <div class="TaskShippingOrderCompareMain">
-                  <div>
-                    <div>
-                      <p>箱信息</p>
-                      <div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
-                    </div>
+                <div style="display: flex; align-items: flex-start" v-else>
+                  <a-icon
+                    style="color: rgb(82, 196, 26); font-size: 50px; margin-top: 5px"
+                    type="check-circle"
+                    theme="filled"
+                  />
+                  <div style="margin-left: 20px">
+                    <div style="font-weight: bold; font-size: 22px">格式单比对(正常)</div>
+                    <div style="font-weight: bold">提单号:{{ formatSheet.mBlNo }}</div>
+                    <div style="font-weight: bold">{{ formatSheet.compareTime }}</div>
                   </div>
-                  <div
-                    v-for="(item, index) in formatSheet.showDetailList"
-                    :key="index"
-                    v-show="(item.pCode == 'ContaList' && item.isDiff) || item.fieldName == '箱号'"
-                    style="display: flex;margin-top: 15px;align-items: flex-start;">
-                    <div v-if="item.fieldName == '箱号' && formatSheet.isShowCntall">箱号:{{ item.primaryKey }}</div>
-                    <p style="padding-top: 4px;" v-if="item.msg && item.isDiff && item.fieldName != '箱号'">
-                      <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 && item.fieldName != '箱号'" style="width: 90px;margin-right: 20px;">{{
-                      item.fieldName }}:</p>
-                    <div v-if="item.isDiff && item.fieldName != '箱号'" style="width:60%">
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
-                        <div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
+                  <div style="margin: 5px 0px 0px 40px">
+                    显示全部
+                    <a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
+                  </div>
+                </div>
+                <div
+                  v-if="!formatFlag && formatSheet.total > 0"
+                  class="TaskShippingOrderCompareMainBox"
+                  style="height: 600px"
+                >
+                  <div class="TaskShippingOrderCompareMain">
+                    <div class="TaskShippingOrderCompareMainHeader">
+                      <div>
+                        <p>提单号</p>
+                        <div style="width: 100%; height: 1px; border-bottom: 1px dashed; margin: 5px 0"></div>
+                        <p>{{ formatSheet.mBlNo }}</p>
                       </div>
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
-                        <div v-html="item.mergeHtml"></div>
+                    </div>
+                    <div
+                      v-for="(item, index) in formatSheet.showDetailList"
+                      :key="index"
+                      style="display: flex; margin-top: 15px"
+                      v-show="item.pCode != 'ContaList' && item.isDiff"
+                    >
+                      <p style="padding-top: 4px" v-if="item.msg">
+                        <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>
+                      <div v-if="item.isDiff" style="width: 60%">
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(0, 153, 204)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">本地</span>
+                          <div style="margin-bottom: 15px">{{ item.reqVal }}</div>
+                        </div>
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(100, 163, 90)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">格式单</span>
+                          <div v-html="item.mergeHtml"></div>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </div>
-              <div v-if="!formatFlag && formatSheet.total == 0"></div>
-              <div v-if="formatFlag" class="TaskShippingOrderCompareMainBox" style="height: 600px;">
-                <div class="TaskShippingOrderCompareMain">
-                  <div class="TaskShippingOrderCompareMainHeader">
+                  <div class="TaskShippingOrderCompareMain">
                     <div>
-                      <p>提单号</p>
-                      <div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
-                      <p>{{ formatSheet.mBlNo }}</p>
-                    </div>
-                  </div>
-                  <div
-                    v-for="(item, index) in formatSheet.showDetailList"
-                    :key="index"
-                    style="display: flex;margin-top: 15px;"
-                    v-show="item.pCode != 'ContaList'">
-                    <p style="padding-top: 4px;" v-if="item.msg">
-                      <a-icon
-                        style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;"
-                        type="close-circle"
-                        theme="filled" />
-                    </p>
-                    <p style="padding-top: 4px;" v-else>
-                      <a-icon
-                        style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;"
-                        type="check-circle"
-                        theme="filled" />
-                    </p>
-                    <p style="width: 90px;margin-right: 20px;">{{ item.fieldName }}:</p>
-                    <div style="width:60%">
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
-                        <div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
+                      <div>
+                        <p>箱信息</p>
+                        <div style="width: 100%; height: 1px; border-bottom: 1px dashed; margin: 5px 0"></div>
                       </div>
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
-                        <div v-if="item.isDiff" v-html="item.mergeHtml"></div>
-                        <div v-else v-html="item.targetVal"></div>
+                    </div>
+                    <div
+                      v-for="(item, index) in formatSheet.showDetailList"
+                      :key="index"
+                      v-show="(item.pCode == 'ContaList' && item.isDiff) || item.fieldName == '箱号'"
+                      style="display: flex; margin-top: 15px; align-items: flex-start"
+                    >
+                      <div v-if="item.fieldName == '箱号' && formatSheet.isShowCntall">箱号:{{ item.primaryKey }}</div>
+                      <p style="padding-top: 4px" v-if="item.msg && item.isDiff && item.fieldName != '箱号'">
+                        <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 && item.fieldName != '箱号'" style="width: 90px; margin-right: 20px">
+                        {{ item.fieldName }}:
+                      </p>
+                      <div v-if="item.isDiff && item.fieldName != '箱号'" style="width: 60%">
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(0, 153, 204)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">本地</span>
+                          <div style="margin-bottom: 15px">{{ item.reqVal }}</div>
+                        </div>
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(100, 163, 90)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">格式单</span>
+                          <div v-html="item.mergeHtml"></div>
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
-                <div class="TaskShippingOrderCompareMain">
-                  <div>
-                    <div>
-                      <p>箱信息</p>
-                      <div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
-                      <!-- <div>箱号:{{ formatSheet.primaryKey }}</div> -->
+                <div v-if="!formatFlag && formatSheet.total == 0"></div>
+                <div v-if="formatFlag" class="TaskShippingOrderCompareMainBox" style="height: 600px">
+                  <div class="TaskShippingOrderCompareMain">
+                    <div class="TaskShippingOrderCompareMainHeader">
+                      <div>
+                        <p>提单号</p>
+                        <div style="width: 100%; height: 1px; border-bottom: 1px dashed; margin: 5px 0"></div>
+                        <p>{{ formatSheet.mBlNo }}</p>
+                      </div>
                     </div>
-                  </div>
-                  <div
-                    v-for="(item, index) in formatSheet.showDetailList"
-                    :key="index"
-                    v-show="item.pCode == 'ContaList'"
-                    style="display: flex;margin-top: 15px;align-items: flex-start;">
-                    <div v-if="item.fieldName == '箱号'">箱号:{{ item.primaryKey }}</div>
-                    <div style="display: flex;align-items: flex-start;" v-else>
-                      <p style="padding-top: 4px;" v-if="item.msg">
+                    <div
+                      v-for="(item, index) in formatSheet.showDetailList"
+                      :key="index"
+                      style="display: flex; margin-top: 15px"
+                      v-show="item.pCode != 'ContaList'"
+                    >
+                      <p style="padding-top: 4px" v-if="item.msg">
                         <a-icon
-                          style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;"
+                          style="color: rgb(194, 5, 5); font-size: 18px; margin-right: 35px"
                           type="close-circle"
-                          theme="filled" />
+                          theme="filled"
+                        />
                       </p>
-                      <p style="padding-top: 4px;" v-else>
+                      <p style="padding-top: 4px" v-else>
                         <a-icon
-                          style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;"
+                          style="color: rgb(0, 153, 68); font-size: 18px; margin-right: 35px"
                           type="check-circle"
-                          theme="filled" />
+                          theme="filled"
+                        />
                       </p>
-                      <p style="width: 90px;margin-right: 20px;flex-shrink:0">{{ item.fieldName }}:</p>
-                      <div style="width:60%">
-                        <div style="display: flex;">
-                          <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);" type="right-circle" />
-                          <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
-                          <div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
+                      <p style="width: 90px; margin-right: 20px">{{ item.fieldName }}:</p>
+                      <div style="width: 60%">
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(0, 153, 204)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">本地</span>
+                          <div style="margin-bottom: 15px">{{ item.reqVal }}</div>
                         </div>
-                        <div style="display: flex;">
-                          <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);" type="right-circle" />
-                          <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(100, 163, 90)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">格式单</span>
                           <div v-if="item.isDiff" v-html="item.mergeHtml"></div>
                           <div v-else v-html="item.targetVal"></div>
                         </div>
                       </div>
                     </div>
                   </div>
+                  <div class="TaskShippingOrderCompareMain">
+                    <div>
+                      <div>
+                        <p>箱信息</p>
+                        <div style="width: 100%; height: 1px; border-bottom: 1px dashed; margin: 5px 0"></div>
+                      <!-- <div>箱号:{{ formatSheet.primaryKey }}</div> -->
+                      </div>
+                    </div>
+                    <div
+                      v-for="(item, index) in formatSheet.showDetailList"
+                      :key="index"
+                      v-show="item.pCode == 'ContaList'"
+                      style="display: flex; margin-top: 15px; align-items: flex-start"
+                    >
+                      <div v-if="item.fieldName == '箱号'">箱号:{{ item.primaryKey }}</div>
+                      <div style="display: flex; align-items: flex-start" v-else>
+                        <p style="padding-top: 4px" v-if="item.msg">
+                          <a-icon
+                            style="color: rgb(194, 5, 5); font-size: 18px; margin-right: 35px"
+                            type="close-circle"
+                            theme="filled"
+                          />
+                        </p>
+                        <p style="padding-top: 4px" v-else>
+                          <a-icon
+                            style="color: rgb(0, 153, 68); font-size: 18px; margin-right: 35px"
+                            type="check-circle"
+                            theme="filled"
+                          />
+                        </p>
+                        <p style="width: 90px; margin-right: 20px; flex-shrink: 0">{{ item.fieldName }}:</p>
+                        <div style="width: 60%">
+                          <div style="display: flex">
+                            <a-icon
+                              style="margin-top: 4px; margin-right: 5px; color: rgb(0, 153, 204)"
+                              type="right-circle"
+                            />
+                            <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">本地</span>
+                            <div style="margin-bottom: 15px">{{ item.reqVal }}</div>
+                          </div>
+                          <div style="display: flex">
+                            <a-icon
+                              style="margin-top: 4px; margin-right: 5px; color: rgb(100, 163, 90)"
+                              type="right-circle"
+                            />
+                            <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">格式单</span>
+                            <div v-if="item.isDiff" v-html="item.mergeHtml"></div>
+                            <div v-else v-html="item.targetVal"></div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
+            <a-spin class="padUrl" style="width: 100%; min-height: 600px" :spinning="pdfLoading">
+              <iframe style="width: 100%; height: 100%" :src="formatPdf" frameborder="0"></iframe>
+            </a-spin>
           </div>
-          <a-spin class="padUrl" style="width: 100%;min-height: 600px;" :spinning="pdfLoading">
-            <iframe style="width: 100%;height: 100%;" :src="formatPdf" frameborder="0"></iframe>
-          </a-spin>
         </div>
       </a-modal>
       <a-modal :maskClosable="false" :width="1700" :visible="addVisible" @ok="addSubmit" @cancel="addCancel">
@@ -1241,6 +1326,34 @@
       <a-modal title="提箱小票" width="900px" :visible="txxpUrlFlag" :footer="null" @cancel="txxpUrlFlag = false">
         <iframe :src="txxpUrl" width="800" height="600" frameborder="0"></iframe>
       </a-modal>
+      <a-modal title="修改到期时间" width="400px" @ok="handleStopTxxpTime" :visible="txxpEndFlag" @cancel="txxpEndFlag = false">
+        <a-spin :spinning="txxpEndLoad">
+          <a-date-picker
+            valueFormat="YYYY-MM-DD HH:mm:ss"
+            showTime
+            style="width: 100%;"
+            v-model="stopTxxpTime"
+          />
+        </a-spin>
+      </a-modal>
+      <a-modal
+        :title="formatTitle"
+        width="900px"
+        :visible="personalFlag"
+        @ok="handleSubPer"
+        @cancel="personalFlag = false"
+      >
+        修正说明
+        <a-textarea v-model="personal.notes" :auto-size="{ minRows: 4, maxRows: 8 }" />
+        <div style="display: flex; align-items: center; margin-top: 20px">
+          原因
+          <div style="margin-left: 20px">
+            <a-checkbox v-model="personal.isOCRError">识别有问题</a-checkbox>
+            <a-checkbox v-model="personal.isEditError">订舱录入有问题</a-checkbox>
+            <a-checkbox v-model="personal.isAgentError">代理录入有问题</a-checkbox>
+          </div>
+        </div>
+      </a-modal>
       <a-modal :title="webDataTitle" width="1400px" :visible="webDataFlag" :footer="null" @cancel="webDataFlag = false">
         <iframe frameborder="0" height="700px" style="width: 100%;" :srcdoc="webData">
           <!-- <div v-html="webData" style="overflow: hidden;"></div> -->
@@ -1281,6 +1394,7 @@ import {
   GetVessellist,
   SendTrace,
   getVesselInfoService,
+  SaveDraftComparellanual,
   GetPortlist,
   GetPortloadlist,
   BookingOrderBachUpdate,
@@ -1316,7 +1430,10 @@ import {
   BachUpdateShipagency,
   TxxpLink,
   DownloadOriginal,
-  SubmitTelex
+  SubmitTelex,
+  RefreshYard,
+  RefreshYGT,
+  SetTxxpEndTime
 } from '@/api/modular/main/BookingLedger'
 
 import initData from '../../BookingLedger/list/modules/initData'
@@ -1346,7 +1463,15 @@ export default {
     return {
       spinning: false,
       isUpload: false,
+      txxpEndLoad: false,
+      txxpEndFlag: false,
+      stopTxxpTime: '',
       telxLoad: false,
+      personal: {},
+      personalFlag: false,
+      formatContRow: {},
+      formatType: '',
+      formatTitle: '',
       fileLoading: false,
       webDataTitle: '',
       serviceFlag: false,
@@ -2101,9 +2226,34 @@ export default {
         })
       }
     },
+    handleRefshYard(row) {
+      row.webDataLoad = true
+      RefreshYard('ids=' + row.id).then(res => {
+        if (res.success) {
+          PageDataByBooking({ id: row.id }).then(ress => {
+            const item = ress.data.items[0]
+            row.webDataLoad = false
+            row.statuslogs1 = item.statuslogs1
+            if (row.statuslogs1.length > 0) {
+              let num1 = row.statuslogs1.length
+              row.statuslogs1.forEach(item => {
+                if (item.txopTime) {
+                  num1 -= 1
+                }
+              })
+              row.txopNumber = num1
+            }
+            this.$message.success('操作成功')
+          })
+        } else {
+          row.webDataLoad = false
+          this.$message.error(res.message)
+        }
+      })
+    },
     handleRefshYZOnce(row, rowIndex) {
       row.refshYzitemLoad = true
-      RefreshBillTrace('ids=' + row.id).then(res => {
+      RefreshYGT('ids=' + row.id).then(res => {
         if (res.success) {
           PageDataByBooking({ id: row.id }).then(ress => {
             const item = ress.data.items[0]
@@ -2167,6 +2317,35 @@ export default {
         this.$refs.xGrid.sort(key, sort)
       }
     },
+    openStop(row) {
+      this.txxpEndFlag = true
+      this.stopRow = row
+      this.stopTxxpTime = ''
+    },
+    handleStopTxxpTime() {
+      const data = {
+        extId: this.stopRow.extendState ? this.stopRow.extendState.id : 0,
+        bookId: this.stopRow.id,
+        date: this.stopTxxpTime
+      }
+      this.txxpEndLoad = true
+      SetTxxpEndTime(data).then(res => {
+        if (res.success) {
+          this.$message.success('操作成功')
+          this.stopRow.extendState = {}
+          this.stopRow.extendState.txxpEndTime = this.stopTxxpTime
+          PageDataByBooking({ id: this.stopRow.id }).then(res => {
+            const item = res.data.items[0]
+            this.stopRow.extendState = item.extendState
+            this.$forceUpdate()
+          })
+        } else {
+          this.$message.error(res.message)
+        }
+        this.txxpEndFlag = false
+        this.txxpEndLoad = false
+      })
+    },
     // 船公司 - start
     getCarrier() {
       const Rdata = data => {
@@ -2303,14 +2482,19 @@ export default {
     },
     handleOpenResult(row) {
       this.spinning = true
-      GetShippingOrderCompareResult({ bookingId: row.id }).then(res => {
+      this.formatContRow = row
+      this.formatSheet = {}
+      GetShippingOrderCompareResult({ bookingId: row.id }).then((res) => {
         if (res.success) {
           if (!res.data.succ) {
             this.spinning = false
             this.$message.success(res.data.msg)
           } else {
             if (res.data.extra) {
+              this.formatType = 'SHIPORDER'
+              this.formatTitle = '下货纸比对-人工处理'
               this.TaskShippingOrderCompareData = res.data.extra
+              this.TaskShippingOrderCompareData.lstShipOrderCompareRlt = row.lstShipOrderCompareRlt
               this.TaskShippingOrderCompareData.total = res.data.total
               this.TaskShippingOrderCompareVisible = true
               this.spinning = false
@@ -2908,6 +3092,34 @@ export default {
           console.log(err)
         })
     },
+    handleSubPer() {
+      const data = {
+        bookingId: this.formatSheet.origPKId || this.TaskShippingOrderCompareData.origPKId,
+        mblNo: this.formatSheet.mBlNo || this.TaskShippingOrderCompareData.mBlNo,
+        taskCompareId: this.formatSheet.taskCompareId || this.TaskShippingOrderCompareData.taskCompareId,
+        compareType: this.formatType,
+        compareTime: this.personal.compareTime,
+        isOCRError: this.personal.isOCRError ? 1 : 0,
+        isEditError: this.personal.isEditError ? 1 : 0,
+        isAgentError: this.personal.isAgentError ? 1 : 0,
+        notes: this.personal.notes
+      }
+      SaveDraftComparellanual(data).then(res => {
+        if (res.success) {
+          this.$message.success('操作成功')
+          this.formatSheetVisible = false
+          this.TaskShippingOrderCompareVisible = false
+          this.personalFlag = false
+          if (this.formatType === 'DRAFT') {
+            this.formatContRow.lstDraftCompareRlt = 'NO DIFF'
+          } else {
+            this.formatContRow.lstShipOrderCompareRlt = 'NO_DIFF'
+          }
+        } else {
+          this.$message.error(res.message)
+        }
+      })
+    },
     handleOpenShip() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
@@ -2955,6 +3167,10 @@ export default {
     addBooking() {
       this.addVisible = !this.addVisible
     },
+    openPersonal() {
+      this.personalFlag = true
+      this.personal = {}
+    },
     copyBooking() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
@@ -3076,8 +3292,12 @@ export default {
     },
     handleFormatContrast(row) {
       this.spinning = true
+      this.formatContRow = row
+      this.formatType = 'DRAFT'
+      this.formatTitle = '格式单比对-人工处理'
       this.pdfUrl = ''
-      GetDraftCompareResultInfo({ bookingid: row.id }).then(res => {
+      this.TaskShippingOrderCompareData = {}
+      GetDraftCompareResultInfo({ bookingid: row.id }).then((res) => {
         if (res.success) {
           if (!res.data.succ) {
             this.spinning = false
@@ -3085,10 +3305,11 @@ export default {
           } else {
             if (res.data.extra) {
               this.formatSheet = res.data.extra
+              this.formatSheet.lstDraftCompareRlt = row.lstDraftCompareRlt
               this.formatSheet.total = res.data.total
               this.formatSheetVisible = true
               const arr = []
-              this.formatSheet.showDetailList.forEach(item => {
+              this.formatSheet.showDetailList.forEach((item) => {
                 if (item.pCode === 'ContaList' && item.isDiff) {
                   arr.push(1)
                 }
@@ -3104,7 +3325,7 @@ export default {
             this.spinning = false
             if (res.data.extra3) {
               this.pdfLoading = true
-              BookingOrderDownload({ id: res.data.extra3 }).then(res => {
+              BookingOrderDownload({ id: res.data.extra3 }).then((res) => {
                 this.pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'application/pdf;charset=utf-8' }))
                 this.formatPdf = this.pdfUrl
                 this.pdfLoading = false
diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
index 9a3388a..b5121b3 100644
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@@ -938,9 +938,11 @@ export default {
       immediate: true,
       handler(nD, oD) {
         this.id = this.$route.query.id
-        if (this.$route.name === 'BookingDetail') {
+        if (process.env.VUE_APP_TYPE === 'hechuan') {
+          if (this.$route.name === 'BookingDetail') {
           this.init()
         }
+        }
       }
     }
   },
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 0e85678..bfc493b 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -14,7 +14,8 @@
                       :xl="!advanced && formLabel.title != '开船日期' ? 3 : 4"
                       :key="findex"
                       v-show="(findex < 6 && !advanced) || advanced"
-                      class="from-label">
+                      class="from-label"
+                    >
                       <a-form-item style="padding-left: 10px; padding-right: 10px" :label="formLabel.title">
                         <formLabel
                           :ref="`fromlabel-${formLabel.label}`"
@@ -25,14 +26,16 @@
                           @change="formChange"
                           @pressEnter="pressEnterFun"
                           @getCompleteList="getCompleteListFun"
-                          @selectFirst="getSelectFirst"></formLabel>
+                          @selectFirst="getSelectFirst"
+                        ></formLabel>
                       </a-form-item>
                     </a-col>
                   </template>
-                  <a-col style="padding: 0px;" :xl="!advanced ? 5 : 8" :lg="24" :md="24" :sm="24">
+                  <a-col style="padding: 0px" :xl="!advanced ? 5 : 8" :lg="24" :md="24" :sm="24">
                     <span
                       class="table-page-search-submitButtons"
-                      :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}">
+                      :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
+                    >
                       <a-button size="small" type="primary" @click="tableRefresh">查询</a-button>
                       <a-button size="small" class="reset" @click="tableReset">重置</a-button>
                       <template v-if="screenWidth > 1600">
@@ -75,9 +78,7 @@
                     <div class="nav" @click="copyBookingMore"><i class="iconfont icon-fuzhi1"></i>复制多票</div>
                     <div class="nav">
                       <a-dropdown>
-                        <span>
-                          <i class="iconfont icon-bianjiwenjian"></i>批量操作
-                        </span>
+                        <span> <i class="iconfont icon-bianjiwenjian"></i>批量操作 </span>
                         <a-menu slot="overlay">
                           <a-menu-item>
                             <a @click="batchEditing()" href="javascript:;">批量编辑</a>
@@ -93,11 +94,10 @@
                       ok-text="是"
                       cancel-text="否"
                       @confirm="removeMoreFun"
-                      @cancel="cancelRemove">
+                      @cancel="cancelRemove"
+                    >
                       <div class="nav">
-                        <a-spin :spinning="deletLoad">
-                          <i class="iconfont icon-shanchu2"></i>删除
-                        </a-spin>
+                        <a-spin :spinning="deletLoad"> <i class="iconfont icon-shanchu2"></i>删除 </a-spin>
                       </div>
                     </a-popconfirm>
                     <div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
@@ -110,7 +110,9 @@
                         <a-spin :spinning="fileLoading">
                           <span>
                             <i
-                              class="iconfont icon-a-wendangcaozuoxiazaishangchuanshanchuxinzengfujianyasuochakan-01"></i>船公司文件
+                              class="iconfont icon-a-wendangcaozuoxiazaishangchuanshanchuxinzengfujianyasuochakan-01"
+                            ></i
+                            >船公司文件
                           </span>
                         </a-spin>
                         <a-menu slot="overlay">
@@ -137,9 +139,7 @@
                     </div>
                     <div class="nav" @click="GoExpress"><i class="iconfont icon-goods"></i>快递</div>
                     <div class="nav" @click="handleSubmitTelex">
-                      <a-spin :spinning="telxLoad">
-                        <i class="iconfont icon-dengjizongshu"></i>船公司电放
-                      </a-spin>
+                      <a-spin :spinning="telxLoad"> <i class="iconfont icon-dengjizongshu"></i>船公司电放 </a-spin>
                     </div>
                   </div>
                 </template>
@@ -170,7 +170,8 @@
                 @resizable-change="resizableChange"
                 @sort-change="tableSortChange"
                 @scroll="pageClick"
-                @checkbox-change="checkboxChangeEvent">
+                @checkbox-change="checkboxChangeEvent"
+              >
                 <template #mblno="{ row }">
                   <div class="mblno">
                     <span @click="editColumns(row)">{{ row.mblno }}</span>
@@ -178,7 +179,7 @@
                   </div>
                 </template>
                 <template #IsVGM="{ row }">
-                  <div v-if="row.isVGM" style="text-align: center;">
+                  <div v-if="row.isVGM" style="text-align: center">
                     <a-popover placement="topLeft">
                       <div slot="content">{{ row.isVGM }}</div>
                       <i class="iconfont icon-chenggong flag-icon"></i>
@@ -186,7 +187,7 @@
                   </div>
                 </template>
                 <template #IsZZFX="{ row }">
-                  <div v-if="row.isZZFX" style="text-align: center;">
+                  <div v-if="row.isZZFX" style="text-align: center">
                     <a-popover placement="topLeft">
                       <div slot="content">{{ row.isZZFX }}</div>
                       <i class="iconfont icon-chenggong flag-icon"></i>
@@ -194,7 +195,7 @@
                   </div>
                 </template>
                 <template #IsCanDan="{ row }">
-                  <div v-if="row.isCanDan" style="text-align: center;">
+                  <div v-if="row.isCanDan" style="text-align: center">
                     <a-popover placement="topLeft">
                       <div slot="content">{{ row.isCanDan }}</div>
                       <i class="iconfont icon-chenggong flag-icon"></i>
@@ -224,19 +225,20 @@
                 </template>
                 <template #fangdan="{ row }">
                   <a-spin :spinning="row.serviceLoad">
-                    <div style="font-size:16px;cursor: pointer;">
+                    <div style="font-size: 16px; cursor: pointer">
                       <a-icon
                         title="已放单"
                         type="plus-circle"
-                        style="margin-right:15px;color:rgb(38 129 58);"
-                        @click="handleSaveService(row)" />
+                        style="margin-right: 15px; color: rgb(38 129 58)"
+                        @click="handleSaveService(row)"
+                      />
                       <!-- <a-icon
                         title="取消已放单"
                         type="minus-circle"
                         style="margin-right:10px;color:rgb(255, 32, 2);"
                         @click="handleCancelService(row)"
                       /> -->
-                      <span style="font-size: 12px;" @click="handleOpenService(row)">更多</span>
+                      <span style="font-size: 12px" @click="handleOpenService(row)">更多</span>
                       <!-- <a-icon style="color:rgb(34, 184, 221)" @click="handleOpenService(row)" type="profile" /> -->
                     </div>
                   </a-spin>
@@ -245,9 +247,10 @@
                   <a-spin :spinning="row.atdLoading">
                     <a-icon
                       v-if="!row.atd"
-                      style="cursor: pointer;"
+                      style="cursor: pointer"
                       @click="handleRefshAtd(row, rowIndex)"
-                      type="reload" />
+                      type="reload"
+                    />
                     <span v-if="row.atd"> {{ row.atd.substring(0, 10) }}</span>
                   </a-spin>
                 </template>
@@ -262,33 +265,38 @@
                     class="operate-btn"
                     type="text"
                     icon="vxe-icon-edit"
-                    @click="editColumns(row)"></vxe-button>
+                    @click="editColumns(row)"
+                  ></vxe-button>
                   <a-popconfirm
                     title="确定删除当前订舱？"
                     ok-text="是"
                     cancel-text="否"
                     @confirm="removeFun(row)"
-                    @cancel="cancelRemove">
+                    @cancel="cancelRemove"
+                  >
                     <vxe-button class="operate-btn" type="text" icon="vxe-icon-delete"></vxe-button>
                   </a-popconfirm>
                 </template>
                 <template #bookstatus="{ row, column, rowIndex }">
-                  <div style="display: flex;align-items: center;">
+                  <div style="display: flex; align-items: center">
                     <a-icon
                       v-if="row.isBookingYZ != 0"
-                      style="cursor: pointer;color: rgb(7, 231, 56);"
+                      style="cursor: pointer; color: rgb(7, 231, 56)"
                       @click="handleRefshYZOnce(row, rowIndex)"
-                      type="reload" />
+                      type="reload"
+                    />
                     <a-spin :spinning="row.refshYzitemLoad">
                       <div
                         :style="row.isBookingYZ == 0 ? 'padding-left:14px' : ''"
                         class="billtrace-box"
-                        :class="column.resizeWidth > 240 ? 'normal-box' : 'flex-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">
+                          :key="bindex"
+                        >
                           <a-popover placement="topLeft" v-if="btn.staTime">
                             <div slot="content">{{ btn.staTime }}</div>
                             <span @click="handleGetWebDataYZ(row, btn.staCode)" :class="{ active: btn.isChecked }">{{
@@ -296,13 +304,16 @@
                             }}</span>
                           </a-popover>
                           <span
-                            style="cursor: pointer;"
+                            style="cursor: pointer"
                             @click="handleGetWebDataYZ(row, btn.staCode)"
                             :class="{ active: btn.isChecked }"
-                            v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
+                            v-else
+                          >{{ enmuBookingBtn(btn.staCode) }}</span
+                          >
                           <i
                             class="iconfont icon-xiaoyoujiantou"
-                            :class="{ hide: bindex === row.bookstatus.length - 1 }"></i>
+                            :class="{ hide: bindex === row.bookstatus.length - 1 }"
+                          ></i>
                         </div>
                       </div>
                     </a-spin>
@@ -311,34 +322,41 @@
                 <template #statuslogs="{ row, column }">
                   <div v-if="row.statuslogs1">
                     <div v-if="row.statuslogs1.length > 0">
-                      <div class="billtrace-btn1" style="display: flex;align-items: center;">
+                      <div class="billtrace-btn1" style="display: flex; align-items: center">
+                        <a-icon
+                          style="cursor: pointer; color: rgb(7, 231, 56); margin-right: 5px"
+                          @click="handleRefshYard(row)"
+                          type="reload"
+                        />
                         <a-spin :spinning="row.webDataLoad">
                           <a-popover placement="topLeft">
                             <div slot="content">
                               <div>
-                                <span class="txfcSpan" style="width: 120px;">箱号</span>
+                                <span class="txfcSpan" style="width: 120px">箱号</span>
                                 <span @click="handleGetWebData(row, 'YARD')" class="txfcSpan">提箱</span>
                                 <span @click="handleGetWebData(row, 'YARD')" class="txfcSpan">返场</span>
                               </div>
                               <div v-for="(item, index) in row.statuslogs1" :key="index">
-                                <span class="txfcSpan" style="width: 120px;">{{ item.cntrno }}</span>
+                                <span class="txfcSpan" style="width: 120px">{{ item.cntrno }}</span>
                                 <span class="txfcSpan">{{ item.txopTime }}</span>
                                 <span class="txfcSpan">{{ item.fcopTime }}</span>
                               </div>
                             </div>
                             <div
                               @click="handleGetWebData(row, 'YARD')"
-                              :class="{ active: row.statuslogs1[0].txopTime }">
+                              :class="{ active: row.statuslogs1[0].txopTime }"
+                            >
                               提箱
                             </div>
                             <div
                               @click="handleGetWebData(row, 'YARD')"
-                              :class="{ active: row.statuslogs1[0].fcopTime }">
+                              :class="{ active: row.statuslogs1[0].fcopTime }"
+                            >
                               返场
                             </div>
                           </a-popover>
                         </a-spin>
-                        <span style="margin-left: 10px;">未提：{{ row.txopNumber }}/{{ row.statuslogs1.length }}</span>
+                        <span style="margin-left: 5px">未提：{{ row.txopNumber }}/{{ row.statuslogs1.length }}</span>
                       </div>
                     </div>
                   </div>
@@ -353,20 +371,28 @@
                   </div>
                 </template>
                 <template #txxp="{ row }">
-                  <div style="display: flex;align-items: center;">
+                  <div style="display: flex; align-items: center">
                     <span
-                      style="margin-right: 10px;cursor: pointer;color: #36cfc9;"
+                      style="margin-right: 10px; cursor: pointer; color: #36cfc9"
                       class="iconfont icon-dayinxiaopiao"
-                      @click="TxxpLink(row)"></span>
-                    <div v-if="row.extendState" style="display: flex;align-items: center;">
+                      @click="TxxpLink(row)"
+                    ></span>
+                    <div style="display: flex; align-items: center">
                       <div>
-                        <div>{{ row.extendState.txxpBeginTime.substring(0, 16) }}</div>
-                        <div>{{ row.extendState.txxpEndTime.substring(0, 16) }}</div>
+                        <div v-if="row.extendState && row.extendState.txxpEndTime">
+                          {{ row.extendState.txxpEndTime.substring(0, 16) }}
+                        </div>
+                        <div>
+                          <a @click="openStop(row)" style="font-size: 12px" href="javascript:;">修改到期时间</a>
+                        </div>
                       </div>
                       <div
-                        v-if="row.extendState.txxpPdfUrl"
+                        v-if="row.extendState && row.extendState.txxpPdfUrl"
                         @click="handleLookPdf(row)"
-                        style="cursor: pointer;color: #36cfc9;margin-left:10px;">查看</div>
+                        style="cursor: pointer; color: #36cfc9; margin-left: 10px"
+                      >
+                        查看
+                      </div>
                     </div>
                   </div>
                 </template>
@@ -389,7 +415,7 @@
                           比对时间: <span>{{ row.lstShipOrderCompareDate }}</span>
                         </p>
                       </template>
-                      <div style="cursor: pointer;" @click="handleOpenResult(row)" v-if="row.lstShipOrderCompareRlt">
+                      <div style="cursor: pointer" @click="handleOpenResult(row)" v-if="row.lstShipOrderCompareRlt">
                         <div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
                           <a-icon type="close-circle" :style="{ color: 'red' }" />
                         </div>
@@ -408,16 +434,14 @@
                         <div v-if="row.lstShipOrderCompareRlt == 'DIFF_U'">
                           <a-icon type="close-circle" :style="{ color: '#red' }" />
                         </div>
-                        <!-- <div v-else>
-                        {{ row.lstShipOrderCompareRltName }}
-                      </div> -->
                       </div>
                     </a-popover>
 
                     <a-icon
                       class="TablelstShipOrderCompareRltRedo"
                       @click="excuteShippingOrderCompareBatch(row)"
-                      type="redo" />
+                      type="redo"
+                    />
                   </div>
                 </template>
                 <template #lstDraftCompareRlt="{ row }">
@@ -442,7 +466,8 @@
                       title="查看比对结果"
                       class="TablelstShipOrderCompareRltRedo"
                       @click="handleFormatContrast(row)"
-                      type="diff" />
+                      type="diff"
+                    />
                   </div>
                 </template>
                 <template #goodsStatusList="{ row }">
@@ -472,19 +497,21 @@
                       <template slot="content">
                         {{ row.dzRemark }}
                       </template>
-                      <div style="display: flex;align-items: center;">
+                      <div style="display: flex; align-items: center">
                         <a-input
                           @blur="getBlurMark(row, 'rowDzMark')"
                           @focus="getFocusMark(row, 'rowDzMark')"
-                          style="margin-top: 0px;"
-                          v-model="row.dzRemark">
+                          style="margin-top: 0px"
+                          v-model="row.dzRemark"
+                        >
                         </a-input>
                         <a-icon
                           v-show="row.rowDzMark"
-                          style="cursor: pointer;margin-left: 5px;color:#36cfc9;"
+                          style="cursor: pointer; margin-left: 5px; color: #36cfc9"
                           @mousedown.native="handleSaveMark(row, 1)"
                           type="check-circle"
-                          theme="filled" />
+                          theme="filled"
+                        />
                       </div>
                     </a-popover>
                   </a-spin>
@@ -497,19 +524,21 @@
                         <template slot="content">
                           {{ row.czRemark }}
                         </template>
-                        <div style="display: flex;align-items: center;">
+                        <div style="display: flex; align-items: center">
                           <a-input
                             @blur="getBlurMark(row, 'rowCzMark')"
                             @focus="getFocusMark(row, 'rowCzMark')"
-                            style="margin-top: 0px;"
-                            v-model="row.czRemark">
+                            style="margin-top: 0px"
+                            v-model="row.czRemark"
+                          >
                           </a-input>
                           <a-icon
                             v-show="row.rowCzMark"
-                            style="cursor: pointer;margin-left: 5px;color:#36cfc9;"
+                            style="cursor: pointer; margin-left: 5px; color: #36cfc9"
                             @mousedown.native="handleSaveMark(row, 2)"
                             type="check-circle"
-                            theme="filled" />
+                            theme="filled"
+                          />
                         </div>
                       </a-popover>
                     </a-spin>
@@ -523,19 +552,21 @@
                         <template slot="content">
                           {{ row.shenQingXiangShi }}
                         </template>
-                        <div style="display: flex;align-items: center;">
+                        <div style="display: flex; align-items: center">
                           <a-input
                             @blur="getBlurMark(row, 'rowSqxs')"
                             @focus="getFocusMark(row, 'rowSqxs')"
-                            style="margin-top: 0px;"
-                            v-model="row.shenQingXiangShi">
+                            style="margin-top: 0px"
+                            v-model="row.shenQingXiangShi"
+                          >
                           </a-input>
                           <a-icon
                             v-show="row.rowSqxs"
-                            style="cursor: pointer;margin-left: 5px;color:#36cfc9;"
+                            style="cursor: pointer; margin-left: 5px; color: #36cfc9"
                             @mousedown.native="handleSaveMark(row, 4)"
                             type="check-circle"
-                            theme="filled" />
+                            theme="filled"
+                          />
                         </div>
                       </a-popover>
                     </a-spin>
@@ -549,19 +580,21 @@
                         <template slot="content">
                           {{ row.pono }}
                         </template>
-                        <div style="display: flex;align-items: center;">
+                        <div style="display: flex; align-items: center">
                           <a-input
                             @blur="getBlurMark(row, 'rowPono')"
                             @focus="getFocusMark(row, 'rowPono')"
-                            style="margin-top: 0px;"
-                            v-model="row.pono">
+                            style="margin-top: 0px"
+                            v-model="row.pono"
+                          >
                           </a-input>
                           <a-icon
                             v-show="row.rowPono"
-                            style="cursor: pointer;margin-left: 5px;color:#36cfc9;"
+                            style="cursor: pointer; margin-left: 5px; color: #36cfc9"
                             @mousedown.native="handleSaveMark(row, 5)"
                             type="check-circle"
-                            theme="filled" />
+                            theme="filled"
+                          />
                         </div>
                       </a-popover>
                     </a-spin>
@@ -574,19 +607,21 @@
                       <template slot="content">
                         {{ row.custno }}
                       </template>
-                      <div style="display: flex;align-items: center;">
+                      <div style="display: flex; align-items: center">
                         <a-input
                           @blur="getBlurMark(row, 'rowCustno')"
                           @focus="getFocusMark(row, 'rowCustno')"
-                          style="margin-top: 0px;"
-                          v-model="row.custno">
+                          style="margin-top: 0px"
+                          v-model="row.custno"
+                        >
                         </a-input>
                         <a-icon
                           v-show="row.rowCustno"
-                          style="cursor: pointer;margin-left: 5px;color:#36cfc9;"
+                          style="cursor: pointer; margin-left: 5px; color: #36cfc9"
                           @mousedown.native="handleSaveMark(row, 3)"
                           type="check-circle"
-                          theme="filled" />
+                          theme="filled"
+                        />
                       </div>
                     </a-popover>
                   </a-spin>
@@ -607,16 +642,28 @@
         :title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'"
         @cancel="TaskShippingOrderCompareHandleCancel"
         :visible="TaskShippingOrderCompareVisible"
-        width="40%">
+        class="formatSheetModal"
+        width="40%"
+      >
         <template slot="footer">
           <a-button key="back" @click="TaskShippingOrderCompareHandleCancel"> 关闭 </a-button>
         </template>
+        <div
+          style="margin:10px 0;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+          :title="TaskShippingOrderCompareData.manualFeedBackResult.operNote"
+          v-if="TaskShippingOrderCompareData.manualFeedBackResult">
+          {{ TaskShippingOrderCompareData.manualFeedBackResult.operTime }}
+          【人工修正】 {{ TaskShippingOrderCompareData.manualFeedBackResult.operUser }}，
+          【原因】{{ TaskShippingOrderCompareData.manualFeedBackResult.reason }}，
+          【备注】 {{ TaskShippingOrderCompareData.manualFeedBackResult.operNote }}
+        </div>
         <p class="TaskShippingOrderCompareP">
           {{ TaskShippingOrderCompareData.compareTime }}
           <span v-if="TaskShippingOrderCompareData.isExistsDiff">
             比对异常 合计
             <span class="TaskShippingOrderCompareSpan">{{ TaskShippingOrderCompareData.total }}</span>
             条
+            <a v-if="TaskShippingOrderCompareData.lstShipOrderCompareRlt === 'DIFF'" href="javascript:;" @click="openPersonal">人工处理</a>
           </span>
         </p>
         <div class="TaskShippingOrderCompareMainBox">
@@ -638,7 +685,8 @@
               class="TaskShippingOrderCompareMainList"
               v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
               :key="index"
-              v-show="item.pCode != 'ContaList'">
+              v-show="item.pCode != 'ContaList'"
+            >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
               <p v-if="item.msg">
@@ -664,8 +712,10 @@
               v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
               :key="index"
               v-show="item.pCode == 'ContaList'"
-              :class="item.fieldName == '箱号' ? 'TaskShippingOrderCompareMainList BoxNo' : 'TaskShippingOrderCompareMainList'
-              ">
+              :class="
+                item.fieldName == '箱号' ? 'TaskShippingOrderCompareMainList BoxNo' : 'TaskShippingOrderCompareMainList'
+              "
+            >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
               <p v-if="item.msg">
@@ -683,216 +733,261 @@
         :title="formatSheet.isExistsDiff ? '格式单比对（有差异）' : '格式单比对（正常）'"
         @cancel="formatSheetVisible = false"
         :visible="formatSheetVisible"
-        width="90%">
+        class="formatSheetModal"
+        width="90%"
+      >
         <template slot="footer">
           <a-button key="back" @click="formatSheetVisible = false"> 关闭 </a-button>
         </template>
-        <div style="display: flex;">
-          <div style="width:55%">
-            <div>
-              <div
-                v-if="formatSheet.total > 0"
-                style="display: flex;justify-content: space-between;"
-                class="TaskShippingOrderCompareP">
-                <div>
-                  {{ formatSheet.compareTime }}
-                  <span v-if="formatSheet.isExistsDiff">
-                    比对异常 合计
-                    <span class="TaskShippingOrderCompareSpan">{{ formatSheet.total }}</span>
-                    条
-                  </span>
-                </div>
-                <div>
-                  显示全部
-                  <a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
-                </div>
-              </div>
-              <div style="display: flex;align-items: flex-start;" v-else>
-                <a-icon
-                  style="color: rgb(82,196,26);font-size: 50px;margin-top: 5px;"
-                  type="check-circle"
-                  theme="filled" />
-                <div style="margin-left: 20px;">
-                  <div style="font-weight: bold;font-size: 22px;">格式单比对(正常)</div>
-                  <div style="font-weight: bold;">提单号:{{ formatSheet.mBlNo }}</div>
-                  <div style="font-weight: bold;">{{ formatSheet.compareTime }}</div>
-                </div>
-                <div style="margin:5px 0px 0px 40px">
-                  显示全部
-                  <a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
-                </div>
-              </div>
-              <div
-                v-if="!formatFlag && formatSheet.total > 0"
-                class="TaskShippingOrderCompareMainBox"
-                style="height: 600px;">
-                <div class="TaskShippingOrderCompareMain">
-                  <div class="TaskShippingOrderCompareMainHeader">
-                    <div>
-                      <p>提单号</p>
-                      <div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
-                      <p>{{ formatSheet.mBlNo }}</p>
-                    </div>
+        <div>
+          <div style="margin:10px 0" v-if="formatSheet.manualFeedBackResult">
+            {{ formatSheet.manualFeedBackResult.operTime }}
+            【人工修正】 {{ formatSheet.manualFeedBackResult.operUser }}，
+            【原因】{{ formatSheet.manualFeedBackResult.reason }}，
+            【备注】 {{ formatSheet.manualFeedBackResult.operNote }}
+          </div>
+          <div style="display: flex">
+            <div style="width: 55%">
+              <div>
+                <div
+                  v-if="formatSheet.total > 0"
+                  style="display: flex; justify-content: space-between"
+                  class="TaskShippingOrderCompareP"
+                >
+                  <div>
+                    {{ formatSheet.compareTime }}
+                    <span v-if="formatSheet.isExistsDiff">
+                      比对异常 合计
+                      <span class="TaskShippingOrderCompareSpan">{{ formatSheet.total }}</span>
+                      条
+                      <a v-if="formatSheet.lstDraftCompareRlt === 'DIFF'" href="javascript:;" @click="openPersonal">人工处理</a>
+                    </span>
                   </div>
-                  <div
-                    v-for="(item, index) in formatSheet.showDetailList"
-                    :key="index"
-                    style="display: flex;margin-top: 15px;"
-                    v-show="item.pCode != 'ContaList' && item.isDiff">
-                    <p style="padding-top: 4px;" v-if="item.msg">
-                      <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>
-                    <div v-if="item.isDiff" style="width:60%">
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
-                        <div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
-                      </div>
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
-                        <div v-html="item.mergeHtml"></div>
-                      </div>
-                    </div>
+                  <div>
+                    显示全部
+                    <a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
                   </div>
                 </div>
-                <div class="TaskShippingOrderCompareMain">
-                  <div>
-                    <div>
-                      <p>箱信息</p>
-                      <div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
-                    </div>
+                <div style="display: flex; align-items: flex-start" v-else>
+                  <a-icon
+                    style="color: rgb(82, 196, 26); font-size: 50px; margin-top: 5px"
+                    type="check-circle"
+                    theme="filled"
+                  />
+                  <div style="margin-left: 20px">
+                    <div style="font-weight: bold; font-size: 22px">格式单比对(正常)</div>
+                    <div style="font-weight: bold">提单号:{{ formatSheet.mBlNo }}</div>
+                    <div style="font-weight: bold">{{ formatSheet.compareTime }}</div>
                   </div>
-                  <div
-                    v-for="(item, index) in formatSheet.showDetailList"
-                    :key="index"
-                    v-show="(item.pCode == 'ContaList' && item.isDiff) || item.fieldName == '箱号'"
-                    style="display: flex;margin-top: 15px;align-items: flex-start;">
-                    <div v-if="item.fieldName == '箱号' && formatSheet.isShowCntall">箱号:{{ item.primaryKey }}</div>
-                    <p style="padding-top: 4px;" v-if="item.msg && item.isDiff && item.fieldName != '箱号'">
-                      <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 && item.fieldName != '箱号'" style="width: 90px;margin-right: 20px;">{{
-                      item.fieldName }}:</p>
-                    <div v-if="item.isDiff && item.fieldName != '箱号'" style="width:60%">
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
-                        <div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
+                  <div style="margin: 5px 0px 0px 40px">
+                    显示全部
+                    <a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
+                  </div>
+                </div>
+                <div
+                  v-if="!formatFlag && formatSheet.total > 0"
+                  class="TaskShippingOrderCompareMainBox"
+                  style="height: 600px"
+                >
+                  <div class="TaskShippingOrderCompareMain">
+                    <div class="TaskShippingOrderCompareMainHeader">
+                      <div>
+                        <p>提单号</p>
+                        <div style="width: 100%; height: 1px; border-bottom: 1px dashed; margin: 5px 0"></div>
+                        <p>{{ formatSheet.mBlNo }}</p>
                       </div>
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
-                        <div v-html="item.mergeHtml"></div>
+                    </div>
+                    <div
+                      v-for="(item, index) in formatSheet.showDetailList"
+                      :key="index"
+                      style="display: flex; margin-top: 15px"
+                      v-show="item.pCode != 'ContaList' && item.isDiff"
+                    >
+                      <p style="padding-top: 4px" v-if="item.msg">
+                        <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>
+                      <div v-if="item.isDiff" style="width: 60%">
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(0, 153, 204)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">本地</span>
+                          <div style="margin-bottom: 15px">{{ item.reqVal }}</div>
+                        </div>
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(100, 163, 90)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">格式单</span>
+                          <div v-html="item.mergeHtml"></div>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </div>
-              <div v-if="!formatFlag && formatSheet.total == 0"></div>
-              <div v-if="formatFlag" class="TaskShippingOrderCompareMainBox" style="height: 600px;">
-                <div class="TaskShippingOrderCompareMain">
-                  <div class="TaskShippingOrderCompareMainHeader">
+                  <div class="TaskShippingOrderCompareMain">
                     <div>
-                      <p>提单号</p>
-                      <div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
-                      <p>{{ formatSheet.mBlNo }}</p>
-                    </div>
-                  </div>
-                  <div
-                    v-for="(item, index) in formatSheet.showDetailList"
-                    :key="index"
-                    style="display: flex;margin-top: 15px;"
-                    v-show="item.pCode != 'ContaList'">
-                    <p style="padding-top: 4px;" v-if="item.msg">
-                      <a-icon
-                        style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;"
-                        type="close-circle"
-                        theme="filled" />
-                    </p>
-                    <p style="padding-top: 4px;" v-else>
-                      <a-icon
-                        style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;"
-                        type="check-circle"
-                        theme="filled" />
-                    </p>
-                    <p style="width: 90px;margin-right: 20px;">{{ item.fieldName }}:</p>
-                    <div style="width:60%">
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
-                        <div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
+                      <div>
+                        <p>箱信息</p>
+                        <div style="width: 100%; height: 1px; border-bottom: 1px dashed; margin: 5px 0"></div>
                       </div>
-                      <div style="display: flex;">
-                        <a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);" type="right-circle" />
-                        <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
-                        <div v-if="item.isDiff" v-html="item.mergeHtml"></div>
-                        <div v-else v-html="item.targetVal"></div>
+                    </div>
+                    <div
+                      v-for="(item, index) in formatSheet.showDetailList"
+                      :key="index"
+                      v-show="(item.pCode == 'ContaList' && item.isDiff) || item.fieldName == '箱号'"
+                      style="display: flex; margin-top: 15px; align-items: flex-start"
+                    >
+                      <div v-if="item.fieldName == '箱号' && formatSheet.isShowCntall">箱号:{{ item.primaryKey }}</div>
+                      <p style="padding-top: 4px" v-if="item.msg && item.isDiff && item.fieldName != '箱号'">
+                        <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 && item.fieldName != '箱号'" style="width: 90px; margin-right: 20px">
+                        {{ item.fieldName }}:
+                      </p>
+                      <div v-if="item.isDiff && item.fieldName != '箱号'" style="width: 60%">
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(0, 153, 204)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">本地</span>
+                          <div style="margin-bottom: 15px">{{ item.reqVal }}</div>
+                        </div>
+                        <div style="display: flex">
+                          <a-icon
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(100, 163, 90)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">格式单</span>
+                          <div v-html="item.mergeHtml"></div>
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
-                <div class="TaskShippingOrderCompareMain">
-                  <div>
-                    <div>
-                      <p>箱信息</p>
-                      <div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
-                      <!-- <div>箱号:{{ formatSheet.primaryKey }}</div> -->
+                <div v-if="!formatFlag && formatSheet.total == 0"></div>
+                <div v-if="formatFlag" class="TaskShippingOrderCompareMainBox" style="height: 600px">
+                  <div class="TaskShippingOrderCompareMain">
+                    <div class="TaskShippingOrderCompareMainHeader">
+                      <div>
+                        <p>提单号</p>
+                        <div style="width: 100%; height: 1px; border-bottom: 1px dashed; margin: 5px 0"></div>
+                        <p>{{ formatSheet.mBlNo }}</p>
+                      </div>
                     </div>
-                  </div>
-                  <div
-                    v-for="(item, index) in formatSheet.showDetailList"
-                    :key="index"
-                    v-show="item.pCode == 'ContaList'"
-                    style="display: flex;margin-top: 15px;align-items: flex-start;">
-                    <div v-if="item.fieldName == '箱号'">箱号:{{ item.primaryKey }}</div>
-                    <div style="display: flex;align-items: flex-start;" v-else>
-                      <p style="padding-top: 4px;" v-if="item.msg">
+                    <div
+                      v-for="(item, index) in formatSheet.showDetailList"
+                      :key="index"
+                      style="display: flex; margin-top: 15px"
+                      v-show="item.pCode != 'ContaList'"
+                    >
+                      <p style="padding-top: 4px" v-if="item.msg">
                         <a-icon
-                          style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;"
+                          style="color: rgb(194, 5, 5); font-size: 18px; margin-right: 35px"
                           type="close-circle"
-                          theme="filled" />
+                          theme="filled"
+                        />
                       </p>
-                      <p style="padding-top: 4px;" v-else>
+                      <p style="padding-top: 4px" v-else>
                         <a-icon
-                          style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;"
+                          style="color: rgb(0, 153, 68); font-size: 18px; margin-right: 35px"
                           type="check-circle"
-                          theme="filled" />
+                          theme="filled"
+                        />
                       </p>
-                      <p style="width: 90px;margin-right: 20px;flex-shrink:0">{{ item.fieldName }}:</p>
-                      <div style="width:60%">
-                        <div style="display: flex;">
+                      <p style="width: 90px; margin-right: 20px">{{ item.fieldName }}:</p>
+                      <div style="width: 60%">
+                        <div style="display: flex">
                           <a-icon
-                            style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);"
-                            type="right-circle" />
-                          <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
-                          <div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(0, 153, 204)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">本地</span>
+                          <div style="margin-bottom: 15px">{{ item.reqVal }}</div>
                         </div>
-                        <div style="display: flex;">
+                        <div style="display: flex">
                           <a-icon
-                            style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);"
-                            type="right-circle" />
-                          <span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
+                            style="margin-top: 4px; margin-right: 5px; color: rgb(100, 163, 90)"
+                            type="right-circle"
+                          />
+                          <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">格式单</span>
                           <div v-if="item.isDiff" v-html="item.mergeHtml"></div>
                           <div v-else v-html="item.targetVal"></div>
                         </div>
                       </div>
                     </div>
                   </div>
+                  <div class="TaskShippingOrderCompareMain">
+                    <div>
+                      <div>
+                        <p>箱信息</p>
+                        <div style="width: 100%; height: 1px; border-bottom: 1px dashed; margin: 5px 0"></div>
+                      <!-- <div>箱号:{{ formatSheet.primaryKey }}</div> -->
+                      </div>
+                    </div>
+                    <div
+                      v-for="(item, index) in formatSheet.showDetailList"
+                      :key="index"
+                      v-show="item.pCode == 'ContaList'"
+                      style="display: flex; margin-top: 15px; align-items: flex-start"
+                    >
+                      <div v-if="item.fieldName == '箱号'">箱号:{{ item.primaryKey }}</div>
+                      <div style="display: flex; align-items: flex-start" v-else>
+                        <p style="padding-top: 4px" v-if="item.msg">
+                          <a-icon
+                            style="color: rgb(194, 5, 5); font-size: 18px; margin-right: 35px"
+                            type="close-circle"
+                            theme="filled"
+                          />
+                        </p>
+                        <p style="padding-top: 4px" v-else>
+                          <a-icon
+                            style="color: rgb(0, 153, 68); font-size: 18px; margin-right: 35px"
+                            type="check-circle"
+                            theme="filled"
+                          />
+                        </p>
+                        <p style="width: 90px; margin-right: 20px; flex-shrink: 0">{{ item.fieldName }}:</p>
+                        <div style="width: 60%">
+                          <div style="display: flex">
+                            <a-icon
+                              style="margin-top: 4px; margin-right: 5px; color: rgb(0, 153, 204)"
+                              type="right-circle"
+                            />
+                            <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">本地</span>
+                            <div style="margin-bottom: 15px">{{ item.reqVal }}</div>
+                          </div>
+                          <div style="display: flex">
+                            <a-icon
+                              style="margin-top: 4px; margin-right: 5px; color: rgb(100, 163, 90)"
+                              type="right-circle"
+                            />
+                            <span style="margin-right: 10px; font-weight: bold; width: 42px; flex-shrink: 0">格式单</span>
+                            <div v-if="item.isDiff" v-html="item.mergeHtml"></div>
+                            <div v-else v-html="item.targetVal"></div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
+            <a-spin class="padUrl" style="width: 100%; min-height: 600px" :spinning="pdfLoading">
+              <iframe style="width: 100%; height: 100%" :src="formatPdf" frameborder="0"></iframe>
+            </a-spin>
           </div>
-          <a-spin class="padUrl" style="width: 100%;min-height: 600px;" :spinning="pdfLoading">
-            <iframe style="width: 100%;height: 100%;" :src="formatPdf" frameborder="0"></iframe>
-          </a-spin>
         </div>
       </a-modal>
       <a-modal :maskClosable="false" :width="1700" :visible="addVisible" @ok="addSubmit" @cancel="addCancel">
@@ -924,7 +1019,8 @@
         :width="400"
         :visible="moreNumVisible"
         @ok="moreNumSubmit"
-        @cancel="moreNumCancel">
+        @cancel="moreNumCancel"
+      >
         <div>
           <a-textarea v-model="moreNumVal" style="height: 200px" />
         </div>
@@ -939,18 +1035,25 @@
         </div>
       </a-modal>
 
-      <a-modal title="批量修改船代" :width="600" :visible="shipagencyFlag" :footer="null" @cancel="shipagencyFlag = false">
+      <a-modal
+        title="批量修改船代"
+        :width="600"
+        :visible="shipagencyFlag"
+        :footer="null"
+        @cancel="shipagencyFlag = false"
+      >
         <a-select
           placeholder="请选择船代"
           v-model="shipagency"
           show-search
-          style="width:200px;margin-right: 20px;"
+          style="width: 200px; margin-right: 20px"
           @focus="shipagencySearch"
           @search="shipagencySearch"
           :default-active-first-option="false"
           :show-arrow="false"
           :filter-option="false"
-          :not-found-content="null">
+          :not-found-content="null"
+        >
           <a-select-option v-for="item in shipagencyData" :key="item.showCode" :value="item.showCode">
             {{ item.name }}
           </a-select-option>
@@ -973,7 +1076,8 @@
         :formAllData="formMoreData"
         type="from"
         @ok="submitForm"
-        v-if="formMoreData"></setFormModel>
+        v-if="formMoreData"
+      ></setFormModel>
 
       <setFormModel
         ref="setTableForm"
@@ -985,7 +1089,8 @@
         type="table"
         @ok="submitTableForm"
         @sortList="submitSort"
-        v-if="formMoreTableData"></setFormModel>
+        v-if="formMoreTableData"
+      ></setFormModel>
 
       <importBc :form="bcObj" @handleClose="bcClose" ref="importBc" @handleSuccess="handleSuccess"></importBc>
 
@@ -1006,7 +1111,8 @@
           { 'seat-top': goodStatusSeat === 'top' },
           { 'seat-bottom': goodStatusSeat === 'bottom' }
         ]"
-        :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }">
+        :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }"
+      >
         <div class="title">货运动态</div>
         <template v-for="(goodStatusItem, gindex) in goodStatusData">
           <template v-if="goodStatusItem.finishTime || goodStatusItem.remark">
@@ -1025,7 +1131,8 @@
             <div
               class="goods-btn"
               :key="gindex"
-              :class="{ active: goodStatusItem.finishTime || goodStatusItem.remark }">
+              :class="{ active: goodStatusItem.finishTime || goodStatusItem.remark }"
+            >
               {{ goodStatusItem.statusName }}
             </div>
           </template>
@@ -1040,13 +1147,15 @@
                   label="请选择订阅内容"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-checkbox-group
                     class="trace-check"
                     v-model="traceValue"
                     name="checkboxgroup"
                     :options="traceOptions"
-                    @change="onTraceChange" />
+                    @change="onTraceChange"
+                  />
                 </a-form-item>
               </a-col>
             </a-row>
@@ -1062,7 +1171,8 @@
         v-model="editingModalVisible"
         title="批量编辑"
         @ok="editingHandleOk"
-        @cancel="editingHandleCancel">
+        @cancel="editingHandleCancel"
+      >
         <div class="trace-box">
           <a-form :form="editingForm">
             <a-row :gutter="26">
@@ -1071,7 +1181,8 @@
                   label="船名"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-select
                     placeholder="请选择船名"
                     v-decorator="['vessel']"
@@ -1082,7 +1193,8 @@
                     :default-active-first-option="false"
                     :show-arrow="false"
                     :filter-option="false"
-                    :not-found-content="null">
+                    :not-found-content="null"
+                  >
                     <a-select-option v-for="item in vesselData" :key="item.vessel" :value="item.vessel">
                       {{ item.vessel }}
                     </a-select-option>
@@ -1094,12 +1206,14 @@
                   label="开船日期"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-date-picker
                     v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期！' }] }]"
                     :style="{ width: '100%' }"
                     placeholder="请选择开船日期"
-                    valueFormat="YYYY-MM-DD" />
+                    valueFormat="YYYY-MM-DD"
+                  />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
@@ -1107,7 +1221,8 @@
                   label="内部航次"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-input v-decorator="['voynoinner']" />
                 </a-form-item>
               </a-col>
@@ -1117,7 +1232,8 @@
                   label="海关航次"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-input v-decorator="['voyno']" />
                 </a-form-item>
               </a-col>
@@ -1126,7 +1242,8 @@
                   label="卸货港"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-select
                     placeholder="请选择卸货港"
                     v-decorator="['portDischarge']"
@@ -1137,7 +1254,8 @@
                     :default-active-first-option="false"
                     :show-arrow="false"
                     :filter-option="false"
-                    :not-found-content="null">
+                    :not-found-content="null"
+                  >
                     <a-select-option v-for="item in portDischargeData" :key="item.code" :value="item.enName">
                       {{ item.enName }}
                     </a-select-option>
@@ -1149,7 +1267,8 @@
                   label="卸货代码"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-input v-decorator="['portDischargeId']" />
                 </a-form-item>
               </a-col>
@@ -1158,7 +1277,8 @@
                   label="目的港"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-select
                     placeholder="请选择目的港"
                     v-decorator="['destination']"
@@ -1169,7 +1289,8 @@
                     :default-active-first-option="false"
                     :show-arrow="false"
                     :filter-option="false"
-                    :not-found-content="null">
+                    :not-found-content="null"
+                  >
                     <a-select-option v-for="item in destinationData" :key="item.code" :value="item.enName">
                       {{ item.enName }}
                     </a-select-option>
@@ -1181,7 +1302,8 @@
                   label="目的代码"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-input v-decorator="['destinationid']" />
                 </a-form-item>
               </a-col>
@@ -1190,14 +1312,16 @@
                   label="截港时间"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-date-picker
                     show-time
                     v-decorator="['closingdate']"
                     :style="{ width: '100%' }"
                     placeholder="请选择截港时间"
                     valueFormat="YYYY-MM-DD HH:mm:ss"
-                    format="YYYY-MM-DD HH" />
+                    format="YYYY-MM-DD HH"
+                  />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
@@ -1205,14 +1329,16 @@
                   label="截单时间"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback>
+                  has-feedback
+                >
                   <a-date-picker
                     show-time
                     v-decorator="['closedocdate']"
                     :style="{ width: '100%' }"
                     placeholder="请选择截单时间"
                     valueFormat="YYYY-MM-DD HH:mm:ss"
-                    format="YYYY-MM-DD HH" />
+                    format="YYYY-MM-DD HH"
+                  />
                 </a-form-item>
               </a-col>
             </a-row>
@@ -1221,7 +1347,7 @@
       </a-modal>
       <a-modal title="提示信息" :visible="bcFileFlag" :footer="null" @cancel="bcFileFlag = false">
         <div class="bcfile-title">
-          <div><a-icon style="margin-right: 10px;" @click="handleCopy" type="copy" />时间{{ bcFile.executeTime }}</div>
+          <div><a-icon style="margin-right: 10px" @click="handleCopy" type="copy" />时间{{ bcFile.executeTime }}</div>
           <span> {{ bcFile.batchTotal }}</span>
         </div>
         <div ref="bcBox" class="bc-box" v-if="bcFile.ext && bcFile.ext.length > 0">
@@ -1237,12 +1363,14 @@
           :form="copyMoreForm"
           :label-col="{ span: 5 }"
           :wrapper-col="{ span: 12 }"
-          @submit="handleSubmitCopyMore">
+          @submit="handleSubmitCopyMore"
+        >
           <a-form-item label="数量">
             <a-input-number
               :min="1"
               :max="10"
-              v-decorator="['number', { rules: [{ required: true, message: '请输入数量' }] }]" />
+              v-decorator="['number', { rules: [{ required: true, message: '请输入数量' }] }]"
+            />
           </a-form-item>
           <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
             <a-button type="primary" html-type="submit">确定</a-button>
@@ -1253,14 +1381,41 @@
         <iframe :src="txxpUrl" width="800" height="600" frameborder="0"></iframe>
       </a-modal>
       <a-modal :title="webDataTitle" width="1400px" :visible="webDataFlag" :footer="null" @cancel="webDataFlag = false">
-        <iframe frameborder="0" height="700px" style="width: 100%;" :srcdoc="webData">
-          <!-- <div v-html="webData" style="overflow: hidden;"></div> -->
-          <!-- {{ webData }} -->
-        </iframe>
+        <iframe frameborder="0" height="700px" style="width: 100%" :srcdoc="webData"> </iframe>
+      </a-modal>
+      <a-modal
+        :title="formatTitle"
+        width="900px"
+        :visible="personalFlag"
+        :zIndex="1100"
+        @ok="handleSubPer"
+        @cancel="personalFlag = false"
+      >
+        修正说明
+        <a-textarea v-model="personal.notes" :auto-size="{ minRows: 4, maxRows: 8 }" />
+        <div style="display: flex; align-items: center; margin-top: 20px">
+          原因
+          <div style="margin-left: 20px">
+            <a-checkbox v-model="personal.isOCRError">识别有问题</a-checkbox>
+            <a-checkbox v-model="personal.isEditError">订舱录入有问题</a-checkbox>
+            <a-checkbox v-model="personal.isAgentError">代理录入有问题</a-checkbox>
+          </div>
+        </div>
+      </a-modal>
+      <a-modal
+        title="修改到期时间"
+        width="400px"
+        @ok="handleStopTxxpTime"
+        :visible="txxpEndFlag"
+        @cancel="txxpEndFlag = false"
+      >
+        <a-spin :spinning="txxpEndLoad">
+          <a-date-picker valueFormat="YYYY-MM-DD HH:mm:ss" showTime style="width: 100%" v-model="stopTxxpTime" />
+        </a-spin>
       </a-modal>
       <div v-if="serviceFlag" class="fangdan-modal">
         <p>{{ editRow.mblno }}</p>
-        <a-select v-model="serviceFd" style="width:230px;margin-right: 20px;">
+        <a-select v-model="serviceFd" style="width: 230px; margin-right: 20px">
           <a-select-option value="HDGSD">核对格式单</a-select-option>
           <a-select-option value="HDGSD1">核对格式单-取消</a-select-option>
           <a-select-option value="YFKCGSD">已发开船格式单</a-select-option>
@@ -1275,7 +1430,7 @@
           <a-select-option value="YFD1">已放单-取消</a-select-option>
         </a-select>
         <a-button type="primary" @click="handleSubimtServe">提交</a-button>
-        <a-icon style="margin-left: 20px;" @click="serviceFlag = false" type="close" />
+        <a-icon style="margin-left: 20px" @click="serviceFlag = false" type="close" />
       </div>
     </a-spin>
   </div>
@@ -1327,7 +1482,11 @@ import {
   BachUpdateShipagency,
   TxxpLink,
   SubmitTelex,
-  DownloadOriginal
+  DownloadOriginal,
+  RefreshYGT,
+  RefreshYard,
+  SetTxxpEndTime,
+  SaveDraftComparellanual
 } from '@/api/modular/main/BookingLedger'
 
 import initData from './modules/initData'
@@ -1355,10 +1514,16 @@ export default {
   data() {
     return {
       spinning: false,
+      stopTxxpTime: '',
+      txxpEndLoad: false,
       isUpload: false,
+      txxpEndFlag: false,
       deletLoad: false,
+      formatType: '',
+      formatTitle: '',
       webDataTitle: '',
       serviceFlag: false,
+      personalFlag: false,
       serviceFd: '',
       markFlag: false,
       shipagency: '',
@@ -1401,6 +1566,7 @@ export default {
       telxLoad: false,
       showColumns: null,
       importBcData: {},
+      personal: {},
       gridOptions: {
         border: false,
         resizable: true,
@@ -1427,6 +1593,7 @@ export default {
       fromTableAllData: null,
       formMoreTableData: null,
       addVisible: false,
+      formatContRow: {},
       carrierRadio: 'CMA',
       radioStyle: {
         display: 'block',
@@ -1456,6 +1623,7 @@ export default {
       goodStatusScreenY: 0,
       txxpUrl: '',
       txxpUrlFlag: false,
+      stopRow: {},
       goodStatusData: null,
       goodStatusSeat: 'bottom',
       editingForm: this.$form.createForm(this),
@@ -1485,7 +1653,7 @@ export default {
     next()
   },
   beforeRouteEnter(to, from, next) {
-    next(vm => {
+    next((vm) => {
       vm.upDate()
     })
   },
@@ -1559,7 +1727,7 @@ export default {
         this.$message.error('只能选择一条数据')
       }
       this.fileLoading = true
-      DownloadOriginal({ id: pkIdArr[0], isCheck: true }).then(res => {
+      DownloadOriginal({ id: pkIdArr[0], isCheck: true }).then((res) => {
         if (res.data.status == 0) {
           this.$message.success('下载成功')
         }
@@ -1572,7 +1740,7 @@ export default {
             title: '正本文件已下载，是否重新下载？',
             onOk() {
               that.fileLoading = true
-              DownloadOriginal({ id: pkIdArr[0], isCheck: false }).then(res => {
+              DownloadOriginal({ id: pkIdArr[0], isCheck: false }).then((res) => {
                 if (res.data.status == 0) {
                   that.$message.success('下载成功')
                 }
@@ -1582,11 +1750,16 @@ export default {
                 that.fileLoading = false
               })
             }
-          });
+          })
         }
         this.fileLoading = false
       })
     },
+    openStop(row) {
+      this.txxpEndFlag = true
+      this.stopRow = row
+      this.stopTxxpTime = ''
+    },
     handleGetWebData(row, code) {
       const data = {
         bookingId: row.id,
@@ -1595,7 +1768,7 @@ export default {
       this.webData = ''
       this.webDataTitle = '场站数据'
       row.webDataLoad = true
-      GetWebData(data).then(res => {
+      GetWebData(data).then((res) => {
         if (res.code === 200) {
           this.webData = res.data
           this.webDataFlag = true
@@ -1620,7 +1793,7 @@ export default {
         webCode: webCode
       }
       row.refshYzitemLoad = true
-      GetWebData(data).then(res => {
+      GetWebData(data).then((res) => {
         if (res.code === 200) {
           this.webData = res.data
           this.webDataFlag = true
@@ -1634,7 +1807,7 @@ export default {
       this.bcObj = {}
     },
     getListByone(listId, listIndex) {
-      PageDataByBooking({ id: listId }).then(res => {
+      PageDataByBooking({ id: listId }).then((res) => {
         const item = res.data.items[0]
         const bookstatus = [
           { staCode: 'sta_cangdan', isChecked: false },
@@ -1656,7 +1829,7 @@ export default {
         }
         if (item.bsstatusname) {
           if (this.statusDIct) {
-            this.statusDIct.forEach(ite => {
+            this.statusDIct.forEach((ite) => {
               if (ite.name == item.bsstatusname) {
                 item.bsstatusnameColor = ite.remark
               }
@@ -1715,7 +1888,7 @@ export default {
       formData.append('file', file)
       formData.append('bookingOrderId', pkIdArr[0])
       singleBCFileRead(formData)
-        .then(res => {
+        .then((res) => {
           if (res.data.succ) {
             this.bcObj = res.data.ext
             this.$message.success('上传成功')
@@ -1725,7 +1898,7 @@ export default {
             this.$refs.importBc.loading = false
           }
         })
-        .catch(res => {
+        .catch((res) => {
           this.$message.error('上传失败')
           this.$refs.importBc.loading = false
         })
@@ -1757,10 +1930,10 @@ export default {
         statusCodes: [{ statusCode: 'YFD' }]
       }
       row.serviceLoad = true
-      SaveServiceStatusByList(data).then(res => {
+      SaveServiceStatusByList(data).then((res) => {
         if (res.code === 200) {
           this.$message.success(res.data.msg)
-          PageDataByBooking({ id: row.id }).then(ress => {
+          PageDataByBooking({ id: row.id }).then((ress) => {
             const itme = ress.data.items[0]
             row.bsstatusname = itme.bsstatusname
             row.serviceLoad = false
@@ -1777,10 +1950,10 @@ export default {
         statusCodes: [{ statusCode: 'YFD' }]
       }
       row.serviceLoad = true
-      CancelServiceStatusByList(data).then(res => {
+      CancelServiceStatusByList(data).then((res) => {
         if (res.code === 200) {
           this.$message.success(res.data.msg)
-          PageDataByBooking({ id: row.id }).then(ress => {
+          PageDataByBooking({ id: row.id }).then((ress) => {
             const itme = ress.data.items[0]
             row.bsstatusname = itme.bsstatusname
             row.serviceLoad = false
@@ -1799,10 +1972,10 @@ export default {
         }
         this.editRow.serviceLoad = true
         this.serviceFlag = false
-        SaveServiceStatusByList(data).then(res => {
+        SaveServiceStatusByList(data).then((res) => {
           if (res.code === 200) {
             this.$message.success(res.data.msg)
-            PageDataByBooking({ id: this.editRow.id }).then(ress => {
+            PageDataByBooking({ id: this.editRow.id }).then((ress) => {
               const itme = ress.data.items[0]
               this.editRow.bsstatusname = itme.bsstatusname
             })
@@ -1818,10 +1991,10 @@ export default {
         }
         this.editRow.serviceLoad = true
         this.serviceFlag = false
-        CancelServiceStatusByList(data).then(res => {
+        CancelServiceStatusByList(data).then((res) => {
           if (res.code === 200) {
             this.$message.success(res.data.msg)
-            PageDataByBooking({ id: this.editRow.id }).then(ress => {
+            PageDataByBooking({ id: this.editRow.id }).then((ress) => {
               const itme = ress.data.items[0]
               this.editRow.bsstatusname = itme.bsstatusname
             })
@@ -1848,6 +2021,35 @@ export default {
         }
       }
     },
+    handleSubPer() {
+      const data = {
+        bookingId: this.formatSheet.origPKId || this.TaskShippingOrderCompareData.origPKId,
+        mblNo: this.formatSheet.mBlNo || this.TaskShippingOrderCompareData.mBlNo,
+        taskCompareId: this.formatSheet.taskCompareId || this.TaskShippingOrderCompareData.taskCompareId,
+        compareType: this.formatType,
+        compareTime: this.personal.compareTime,
+        isOCRError: this.personal.isOCRError ? 1 : 0,
+        isEditError: this.personal.isEditError ? 1 : 0,
+        isAgentError: this.personal.isAgentError ? 1 : 0,
+        notes: this.personal.notes
+      }
+      SaveDraftComparellanual(data).then(res => {
+        if (res.success) {
+          this.$message.success('操作成功')
+          this.formatSheetVisible = false
+          this.TaskShippingOrderCompareVisible = false
+          this.personalFlag = false
+          if (this.formatType === 'DRAFT') {
+            this.formatContRow.lstDraftCompareRlt = 'NO DIFF'
+          } else {
+            this.formatContRow.lstShipOrderCompareRlt = 'NO_DIFF'
+          }
+          this.$forceUpdate()
+        } else {
+          this.$message.error(res.message)
+        }
+      })
+    },
     upDate1() {
       if (Object.keys(this.gridOptions).length > 0) {
         if (Object.keys(this.bookingGridOptions).length === 0) {
@@ -1890,7 +2092,7 @@ export default {
         this.spinning = true
         if (type === 1) {
           downloadBookingConfirm(pkIdArr)
-            .then(res => {
+            .then((res) => {
               if (res.success) {
                 this.spinning = false
                 this.bcFileFlag = true
@@ -1899,13 +2101,13 @@ export default {
                 this.$message.error(res.message)
               }
             })
-            .catch(err => {
+            .catch((err) => {
               console.log(err)
             })
         }
         if (type === 2) {
           downloadDraft(pkIdArr)
-            .then(res => {
+            .then((res) => {
               if (res.success) {
                 this.spinning = false
                 this.bcFileFlag = true
@@ -1914,13 +2116,13 @@ export default {
                 this.$message.error(res.message)
               }
             })
-            .catch(err => {
+            .catch((err) => {
               console.log(err)
             })
         }
         if (type === 4) {
           checkUpdateManifestNo(pkIdArr)
-            .then(res => {
+            .then((res) => {
               if (res.success) {
                 this.spinning = false
                 this.bcFileFlag = true
@@ -1929,12 +2131,16 @@ export default {
                 this.$message.error(res.message)
               }
             })
-            .catch(err => {
+            .catch((err) => {
               console.log(err)
             })
         }
       }
     },
+    openPersonal() {
+      this.personalFlag = true
+      this.personal = {}
+    },
     // 批量编辑
     editingHandleOk() {
       const {
@@ -1944,10 +2150,10 @@ export default {
         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()
@@ -1974,7 +2180,7 @@ export default {
         this.WebVessel = data
       }
 
-      getVesselInfoService({ KeyWord: data }).then(res => {
+      getVesselInfoService({ KeyWord: data }).then((res) => {
         this.vesselData = res.data
       })
     },
@@ -1989,17 +2195,17 @@ export default {
       }
     },
     shipagencySearch(data) {
-      GetForwarderlist({ KeyWord: data }).then(res => {
+      GetForwarderlist({ KeyWord: data }).then((res) => {
         this.shipagencyData = res.data
       })
     },
     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({
@@ -2011,12 +2217,12 @@ export default {
       })
     },
     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({
@@ -2050,7 +2256,7 @@ export default {
       const query = {
         typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page', 'booking_sort']
       }
-      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) {
@@ -2086,7 +2292,7 @@ export default {
     handleRefshYZ() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const arr = []
-      select.forEach(item => {
+      select.forEach((item) => {
         arr.push(item.id)
       })
       if (arr.length === 0) {
@@ -2101,7 +2307,7 @@ export default {
           }
         })
         this.refshYZloading = true
-        RefreshBillTrace(str).then(res => {
+        RefreshBillTrace(str).then((res) => {
           if (res.success) {
             this.refshYZloading = false
             this.$message.success('操作成功')
@@ -2112,11 +2318,36 @@ export default {
         })
       }
     },
+    handleRefshYard(row) {
+      row.webDataLoad = true
+      RefreshYard('ids=' + row.id).then((res) => {
+        if (res.success) {
+          PageDataByBooking({ id: row.id }).then((ress) => {
+            const item = ress.data.items[0]
+            row.webDataLoad = false
+            row.statuslogs1 = item.statuslogs1
+            if (row.statuslogs1.length > 0) {
+              let num1 = row.statuslogs1.length
+              row.statuslogs1.forEach((item) => {
+                if (item.txopTime) {
+                  num1 -= 1
+                }
+              })
+              row.txopNumber = num1
+            }
+            this.$message.success('操作成功')
+          })
+        } else {
+          row.webDataLoad = false
+          this.$message.error(res.message)
+        }
+      })
+    },
     handleRefshYZOnce(row, rowIndex) {
       row.refshYzitemLoad = true
-      RefreshBillTrace('ids=' + row.id).then(res => {
+      RefreshYGT('ids=' + row.id).then((res) => {
         if (res.success) {
-          PageDataByBooking({ id: row.id }).then(ress => {
+          PageDataByBooking({ id: row.id }).then((ress) => {
             const item = ress.data.items[0]
             row.refshYzitemLoad = false
             const bookstatus = [
@@ -2150,7 +2381,7 @@ export default {
     handleSubmitTelex() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const arr = []
-      select.forEach(item => {
+      select.forEach((item) => {
         arr.push(item.id)
       })
       if (arr.length === 0) {
@@ -2158,21 +2389,27 @@ export default {
         return false
       }
       this.telxLoad = true
-      SubmitTelex(arr).then(res => {
+      SubmitTelex(arr).then((res) => {
         if (res.success) {
           this.$notification.open({
             message: '批量电放',
-            description: (<div>
-              {res.data.map(item => {
-                if (item.isSuccess) {
-                  return <div>{item.mblno} 成功 </div>
-                } else {
-                  return <div style={{ color: 'red' }} >{item.mblno} 失败 {item.failReason}</div>
-                }
-              })}
-            </div>),
+            description: (
+              <div>
+                {res.data.map((item) => {
+                  if (item.isSuccess) {
+                    return <div>{item.mblno} 成功 </div>
+                  } else {
+                    return (
+                      <div style={{ color: 'red' }} >
+                        {item.mblno} 失败 {item.failReason}
+                      </div>
+                    )
+                  }
+                })}
+              </div>
+            ),
             duration: 5
-          });
+          })
         } else {
           this.$message.error(res.message)
         }
@@ -2188,7 +2425,7 @@ export default {
           this.tableOrderLabel = key || ''
           this.tableOrderType = sort ? 'desc' : 'asc'
           const newArr = []
-          this.sortLabelList.forEach(item => {
+          this.sortLabelList.forEach((item) => {
             newArr.push({
               sortField: item.sortField,
               descSort: item.descSort
@@ -2212,11 +2449,11 @@ export default {
     },
     // 船公司 - start
     getCarrier() {
-      const Rdata = data => {
+      const Rdata = (data) => {
         const 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)
             }
@@ -2236,8 +2473,8 @@ export default {
           'S-U': [],
           '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 {
@@ -2253,15 +2490,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) {
                   const 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)
                       }
@@ -2275,7 +2512,7 @@ export default {
               })
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -2341,14 +2578,19 @@ export default {
     },
     handleOpenResult(row) {
       this.spinning = true
-      GetShippingOrderCompareResult({ bookingId: row.id }).then(res => {
+      this.formatContRow = row
+      this.formatSheet = {}
+      GetShippingOrderCompareResult({ bookingId: row.id }).then((res) => {
         if (res.success) {
           if (!res.data.succ) {
             this.spinning = false
             this.$message.success(res.data.msg)
           } else {
             if (res.data.extra) {
+              this.formatType = 'SHIPORDER'
+              this.formatTitle = '下货纸比对-人工处理'
               this.TaskShippingOrderCompareData = res.data.extra
+              this.TaskShippingOrderCompareData.lstShipOrderCompareRlt = row.lstShipOrderCompareRlt
               this.TaskShippingOrderCompareData.total = res.data.total
               this.TaskShippingOrderCompareVisible = true
               this.spinning = false
@@ -2363,11 +2605,11 @@ export default {
         }
       })
     },
-    customSortMethod() { },
+    customSortMethod() {},
     setTableList(data) {
       if (Object.keys(data).length > 0 && JSON.parse(data.configJson).length) {
         this.formTableData = JSON.parse(data.configJson)
-        this.formTableData.forEach(item => {
+        this.formTableData.forEach((item) => {
           if (!item.slots && item.field === 'bsstatusname') {
             item.slots = { default: 'bsstatusname' }
           }
@@ -2443,7 +2685,7 @@ export default {
     },
 
     getFormData(isReset = false) {
-      DjyUserConfigGet({ type: 'booking_list_cond' }).then(res => {
+      DjyUserConfigGet({ type: 'booking_list_cond' }).then((res) => {
         this.setFormData(res.data)
       })
     },
@@ -2465,7 +2707,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 {
@@ -2500,12 +2742,12 @@ export default {
       DjyUserConfigAdd({
         type: 'booking_list_page',
         configJson: JSON.stringify(data)
-      }).then(res => {
+      }).then((res) => {
         console.log('页码设置成功')
       })
     },
     handleLookPdf(row) {
-      window.open(row.extendState.txxpPdfUrl);
+      window.open(row.extendState.txxpPdfUrl)
     },
     toggleAdvanced() {
       this.advanced = !this.advanced
@@ -2555,7 +2797,7 @@ export default {
     submitSort(arr) {
       const newArr = []
       if (arr.length > 0) {
-        arr.forEach(item => {
+        arr.forEach((item) => {
           newArr.push({
             sortField: item.field,
             descSort: item.descSort
@@ -2565,7 +2807,7 @@ export default {
         DjyUserConfigAdd({
           type: 'booking_sort',
           configJson: JSON.stringify(newArr)
-        }).then(res => {
+        }).then((res) => {
           const key = newArr[0].sortField
           const sort = newArr[0].descSort
           this.sortLabelList = newArr
@@ -2578,7 +2820,7 @@ export default {
         DjyUserConfigAdd({
           type: 'booking_sort',
           configJson: JSON.stringify([])
-        }).then(res => {
+        }).then((res) => {
           this.searchData.multisort = []
           this.tableOrderLabel = ''
           this.tableOrderType = ''
@@ -2588,14 +2830,14 @@ export default {
     },
     TxxpLink(row) {
       TxxpLink(row.id)
-        .then(res => {
+        .then((res) => {
           if (res.success) {
-            window.open(res.data);
+            window.open(res.data)
           } else {
             this.$message.error(res.message)
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -2605,7 +2847,7 @@ export default {
         return item.id
       })
       this.txxpLoading = true
-      SaveBookingTxxp({ Id: pkIdArr[0] }).then(res => {
+      SaveBookingTxxp({ Id: pkIdArr[0] }).then((res) => {
         if (res.success) {
           this.txxpFlag = true
           this.txxpForm = res.data
@@ -2666,7 +2908,7 @@ export default {
       DjyUserConfigAdd({
         type: 'booking_list_cond',
         configJson: JSON.stringify(arr)
-      }).then(res => {
+      }).then((res) => {
         this.$message.success('保存成功')
         this.$refs.setForm.handleCancel()
         Object.keys(this.$refs).map((label, index) => {
@@ -2680,7 +2922,7 @@ export default {
     },
     handleRefshAtd(row, index) {
       row.atdLoading = true
-      refreshSailingDate({ id: row.id }).then(res => {
+      refreshSailingDate({ id: row.id }).then((res) => {
         if (res.success) {
           row.atdLoading = false
           row.atd = res.data.atd
@@ -2706,7 +2948,7 @@ export default {
       } else if (form.type === 'selectTree') {
         this.formRes[form.label] = value
       } else if (form.type === 'multiple') {
-        if (value.length == 0) {
+        if (value.length === 0) {
           this.formRes[form.label] = ''
         } else {
           this.formRes[form.label] = value
@@ -2714,9 +2956,30 @@ export default {
       }
       this.$forceUpdate()
     },
-
-    // table
-
+    handleStopTxxpTime() {
+      const data = {
+        extId: this.stopRow.extendState ? this.stopRow.extendState.id : 0,
+        bookId: this.stopRow.id,
+        date: this.stopTxxpTime
+      }
+      this.txxpEndLoad = true
+      SetTxxpEndTime(data).then((res) => {
+        if (res.success) {
+          this.$message.success('操作成功')
+          this.stopRow.extendState = {}
+          this.stopRow.extendState.txxpEndTime = this.stopTxxpTime
+          PageDataByBooking({ id: this.stopRow.id }).then((res) => {
+            const item = res.data.items[0]
+            this.stopRow.extendState = item.extendState
+            this.$forceUpdate()
+          })
+        } else {
+          this.$message.error(res.message)
+        }
+        this.txxpEndFlag = false
+        this.txxpEndLoad = false
+      })
+    },
     /// 表格编辑
     tableHeaderEdit() {
       this.$refs.setTableForm.open()
@@ -2737,7 +3000,7 @@ export default {
       DjyUserConfigAdd({
         type: 'booking_list_column',
         configJson: JSON.stringify(data)
-      }).then(res => {
+      }).then((res) => {
         this.$refs.setForm.handleCancel()
       })
     },
@@ -2811,7 +3074,7 @@ export default {
         query.multisort = this.searchData.multisort
       }
       PageDataByBooking(query)
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             let newBookingList = {}
             if (query.PageNo !== 1) {
@@ -2838,17 +3101,17 @@ export default {
                 })
               }
               if (item.statuslogs1.length > 0) {
-                  let num1 = item.statuslogs1.length
-                  item.statuslogs1.forEach(item => {
-                    if (item.txopTime) {
-                      num1 -= 1
-                    }
-                  })
-                  item.txopNumber = num1
+                let num1 = item.statuslogs1.length
+                item.statuslogs1.forEach((item) => {
+                  if (item.txopTime) {
+                    num1 -= 1
+                  }
+                })
+                item.txopNumber = num1
               }
               if (item.bsstatusname) {
                 if (this.statusDIct) {
-                  this.statusDIct.forEach(ite => {
+                  this.statusDIct.forEach((ite) => {
                     if (ite.name == item.bsstatusname) {
                       item.bsstatusnameColor = ite.remark
                     }
@@ -2908,7 +3171,7 @@ export default {
           this.ResetType = true
           this.$store.commit('SET_FIRSTFLAG', false)
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -2929,7 +3192,7 @@ export default {
         return item.id
       })
       let shipagencyName = ''
-      this.shipagencyData.forEach(item => {
+      this.shipagencyData.forEach((item) => {
         if (item.showCode == this.shipagency) {
           shipagencyName = item.name
         }
@@ -2940,7 +3203,7 @@ export default {
         shipagency: shipagencyName
       }
       this.shipagencyLoad = true
-      BachUpdateShipagency(data).then(res => {
+      BachUpdateShipagency(data).then((res) => {
         if (res.success) {
           this.$message.success('操作成功')
           this.shipagencyFlag = false
@@ -2991,7 +3254,7 @@ export default {
       const 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)
           }
@@ -3001,7 +3264,7 @@ export default {
       DjyUserConfigAdd({
         type: 'booking_memory',
         configJson: JSON.stringify(data)
-      }).then(res => {
+      }).then((res) => {
         this.getCarrier()
         this.addVisible = false
         this.addNum = Math.round(Math.random() * 1000)
@@ -3035,7 +3298,7 @@ export default {
         row.ponoLoading = true
         data.pono = row.pono
       }
-      SaveDataInList(data).then(res => {
+      SaveDataInList(data).then((res) => {
         if (res.success) {
           this.$message.success('修改成功')
         } else {
@@ -3060,7 +3323,7 @@ export default {
       this.moreNumVal
         .replace(/\n|\r/g, ',')
         .split(',')
-        .forEach(item => {
+        .forEach((item) => {
           if (item.replace(/\s*/g, '')) {
             if (data) {
               data = `${data},${item}`
@@ -3080,8 +3343,12 @@ export default {
     },
     handleFormatContrast(row) {
       this.spinning = true
+      this.formatContRow = row
+      this.formatType = 'DRAFT'
+      this.formatTitle = '格式单比对-人工处理'
       this.pdfUrl = ''
-      GetDraftCompareResultInfo({ bookingid: row.id }).then(res => {
+      this.TaskShippingOrderCompareData = {}
+      GetDraftCompareResultInfo({ bookingid: row.id }).then((res) => {
         if (res.success) {
           if (!res.data.succ) {
             this.spinning = false
@@ -3089,10 +3356,11 @@ export default {
           } else {
             if (res.data.extra) {
               this.formatSheet = res.data.extra
+              this.formatSheet.lstDraftCompareRlt = row.lstDraftCompareRlt
               this.formatSheet.total = res.data.total
               this.formatSheetVisible = true
               const arr = []
-              this.formatSheet.showDetailList.forEach(item => {
+              this.formatSheet.showDetailList.forEach((item) => {
                 if (item.pCode === 'ContaList' && item.isDiff) {
                   arr.push(1)
                 }
@@ -3108,7 +3376,7 @@ export default {
             this.spinning = false
             if (res.data.extra3) {
               this.pdfLoading = true
-              BookingOrderDownload({ id: res.data.extra3 }).then(res => {
+              BookingOrderDownload({ id: res.data.extra3 }).then((res) => {
                 this.pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'application/pdf;charset=utf-8' }))
                 this.formatPdf = this.pdfUrl
                 this.pdfLoading = false
@@ -3134,7 +3402,7 @@ export default {
       DjyUserConfigAdd({
         type: 'booking_sort',
         configJson: JSON.stringify(data)
-      }).then(res => {
+      }).then((res) => {
         this.sortLabelList = []
         this.searchData.multisort = data
         this.getList(this.searchData)
@@ -3305,7 +3573,7 @@ export default {
       }
 
       SendTrace(arr)
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             const tip = `订阅成功`
             this.$message.success(tip)
@@ -3317,7 +3585,7 @@ export default {
             this.traceValue = []
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -3376,8 +3644,8 @@ export default {
           PropString: 'fleet'
         }
       } else if (form.label === 'VESSEL') {
-        const etdStart = moment().subtract(3, 'days').format('YYYY-MM-DD');
-        const etdEnd = moment().add(3, 'days').format('YYYY-MM-DD');
+        const etdStart = moment().subtract(3, 'days').format('YYYY-MM-DD')
+        const etdEnd = moment().add(3, 'days').format('YYYY-MM-DD')
         query = {
           KeyWord: value,
           sortField: 'etd',
@@ -3388,7 +3656,7 @@ export default {
       }
       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 if (['VESSEL'].includes(form.label)) {
@@ -3458,7 +3726,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
         })
@@ -3482,10 +3750,10 @@ export default {
     deleteBookingOrder(arr) {
       this.deletLoad = true
       DeleteBookingOrder(arr.toString())
-        .then(res => {
+        .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.gridOptions.data = _data
             this.$refs.xGrid.reloadData(_data).then(() => {
               this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length
@@ -3497,7 +3765,7 @@ export default {
           }
           this.deletLoad = false
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -3527,7 +3795,7 @@ export default {
       }
       this.spinning = true
       ExcuteShippingOrderCompareBatch(arr)
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             if (!res.data.succ) {
               this.spinning = false
@@ -3537,7 +3805,7 @@ export default {
                 this.TaskShippingOrderCompareData = res.data.extra
                 this.TaskShippingOrderCompareData.total = res.data.total
                 this.TaskShippingOrderCompareVisible = true
-                PageDataByBooking({ id: data.id }).then(ress => {
+                PageDataByBooking({ id: data.id }).then((ress) => {
                   const itme = ress.data.items[0]
                   this.spinning = false
                   data.lstShipOrderCompareRlt = itme.lstShipOrderCompareRlt
@@ -3554,7 +3822,7 @@ export default {
             this.$message.error(res.data.msg)
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
           this.spinning = false
         })
diff --git a/src/views/main/BookingLedger/list/list.less b/src/views/main/BookingLedger/list/list.less
index b9a981c..63562dc 100644
--- a/src/views/main/BookingLedger/list/list.less
+++ b/src/views/main/BookingLedger/list/list.less
@@ -1036,4 +1036,8 @@
     pointer-events: auto;
     padding: 20px;
     z-index: 999;
+  }
+
+  .formatSheetModal /deep/ .ant-modal-body{
+    padding-top: 0px !important;
   }
\ No newline at end of file
diff --git a/src/views/main/BookingLedgerByCustomer/detail/modules/basicInfo.vue b/src/views/main/BookingLedgerByCustomer/detail/modules/basicInfo.vue
index 498486c..3237bc3 100644
--- a/src/views/main/BookingLedgerByCustomer/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedgerByCustomer/detail/modules/basicInfo.vue
@@ -729,7 +729,7 @@ export default {
       },
       deep: true
     },
-    '$route.query': {
+    '$route': {
       immediate: true,
       handler(nD, oD) {
         this.id = this.$route.query.id
diff --git a/src/views/main/BookingLedgerByCustomer/list/index.vue b/src/views/main/BookingLedgerByCustomer/list/index.vue
index adc70ce..6aa16eb 100644
--- a/src/views/main/BookingLedgerByCustomer/list/index.vue
+++ b/src/views/main/BookingLedgerByCustomer/list/index.vue
@@ -2189,7 +2189,7 @@ export default {
       document.body.removeChild(cInput);
     },
     editColumns(row) {
-      this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } })
+      this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno ? row.mblno : '' } })
     },
     getList(queryParam = {}, isInit = false, isAdd = 'normal') {
       this.$set(this.gridOptions, 'loading', true)
diff --git a/src/views/main/CommondbPortload/editForm.vue b/src/views/main/CommondbPortload/editForm.vue
index 3bde926..76aaa6f 100644
--- a/src/views/main/CommondbPortload/editForm.vue
+++ b/src/views/main/CommondbPortload/editForm.vue
@@ -99,7 +99,7 @@ export default {
           code: record.code,
           enName: record.enName,
           cnName: record.cnName,
-          // ediCode: record.ediCode,
+          ediCode: record.ediCode,
           description: record.description,
           remark: record.remark
         })
diff --git a/src/views/main/Printing/index.vue b/src/views/main/Printing/index.vue
index d31c43c..62c4480 100644
--- a/src/views/main/Printing/index.vue
+++ b/src/views/main/Printing/index.vue
@@ -181,7 +181,7 @@
       <vxe-toolbar>
         <template #buttons>
           <vxe-button @click="insertEvent(-1)">添加一行</vxe-button>
-          <vxe-button @click="$refs.xTable.removeCheckboxRow()">删除选中</vxe-button>
+          <vxe-button @click="handleDelete">删除选中</vxe-button>
           <vxe-button icon="vxe-icon-save" @click="saveEvent">保存</vxe-button>
         </template>
       </vxe-toolbar>
@@ -198,7 +198,7 @@
         <vxe-column type="checkbox" width="60"></vxe-column>
         <vxe-column field="Ffield" title="对象名" :edit-render="{}">
           <template #edit="{ row }">
-            <vxe-select v-model="row.Ffield" style="width: 100%" placeholder="请选择对象名">
+            <vxe-select @change="roleChangeEvent($event, row)" v-model="row.Ffield" style="width: 100%" placeholder="请选择对象名">
               <vxe-option
                 v-for="(item, index) in fieldList"
                 :key="index"
@@ -343,7 +343,7 @@ export default {
     focusEvent1(row) {
       this.visible1 = false
       this.fieldData = []
-      let fieldData = []
+      const fieldData = []
       Object.keys(this.data1).forEach(ele => {
         this.fieldList.forEach(e => {
           if (e.name == row.Ffield) {
@@ -379,7 +379,8 @@ export default {
     saveEvent() {
       const $table = this.$refs.xTable
       const { insertRecords, removeRecords, updateRecords } = $table.getRecordset()
-      let tableData = []
+      const tableData = []
+      const arr = []
       this.tableData.forEach(item => {
         this.fieldList.forEach(item2 => {
           if (item.Ffield == item2.name) {
@@ -389,8 +390,15 @@ export default {
             })
           }
         })
+        if (!item.fieldName) {
+          arr.push(1)
+        }
       })
-      let children = [...tableData, ...insertRecords]
+      if (arr.length > 0) {
+        this.$message.warning('请选择字段名称')
+        return false
+      }
+      const children = [...tableData, ...insertRecords]
       if (removeRecords.length) {
         children.forEach((item, index) => {
           removeRecords.forEach(ele => {
@@ -409,6 +417,7 @@ export default {
           })
         })
       }
+      console.log(children, this.fieldList)
       BookingTemplateAddOrUpdateExcelTemplate({
         pid: this.ExcelPid,
         children
@@ -478,7 +487,7 @@ export default {
     },
     columnChange(data) {
       this.ColumnsQuery = [...data]
-      let Data = []
+      const Data = []
       data.forEach(item => {
         if (item.checked) {
           Data.push(item.dataIndex)
@@ -491,13 +500,27 @@ export default {
         console.log(res)
       })
     },
+    handleDelete() {
+      const selectRecords = this.$refs.xTable.getCheckboxRecords()
+      for (let i = 0; i < selectRecords.length; i++) {
+          const delIndex = this.tableData.indexOf(selectRecords[i])
+          if (delIndex != -1) {
+            this.tableData.splice(delIndex, 1)
+            i--;
+          }
+        }
+    },
+    roleChangeEvent(row, row1) {
+      console.log(row, row1)
+      row1.fieldName = ''
+    },
     columnChange1(data) {
       this.TableType = true
       this.TableColumns = data
       this.$nextTick(() => {
         this.TableType = false
       })
-      let Data = []
+      const Data = []
       data.forEach(item => {
         if (item.checked) {
           Data.push(item.dataIndex)
@@ -557,7 +580,7 @@ export default {
           columns.forEach(item => {
             item.checked = false
           })
-          let Arr = []
+          const Arr = []
           JSON.parse(res.data.configJson).forEach(item => {
             columns.forEach(item2 => {
               if (item2.dataIndex == item) {
@@ -590,7 +613,7 @@ export default {
           columns.forEach(item => {
             this.ColumnsQuery.push({ ...item, checked: false })
           })
-          let Arr = []
+          const Arr = []
           JSON.parse(res.data.configJson).forEach(item => {
             this.ColumnsQuery.forEach(item2 => {
               if (item == item2.dataIndex) {
@@ -622,7 +645,7 @@ export default {
     },
     FnGetData() {
       this.loading = true
-      let Data = {}
+      const Data = {}
       BookingPrintTemplatePage({ ...this.queryParam, ...Data }).then(res => {
         this.loadData = res.data.rows
         this.loading = false
diff --git a/src/views/main/intoYardConfig/Data.json b/src/views/main/intoYardConfig/Data.json
index 865f08f..ff19e1f 100644
--- a/src/views/main/intoYardConfig/Data.json
+++ b/src/views/main/intoYardConfig/Data.json
@@ -11,7 +11,8 @@
       { "name": "货重", "code": "KGS","intoName": "kgs","type":"ctn","checked":false },
       { "name": "尺码", "code": "CBM","intoName": "cbm","type":"ctn","checked":false },
       { "name": "皮重", "code": "TAREWEIGHT","intoName": "tareweight","type":"ctn","checked":false },
-      { "name": "称重日期", "code": "WEIGHDATE","intoName": "weighdate","type":"ctn","checked":false }
+      { "name": "称重日期", "code": "WEIGHDATE","intoName": "weighdate","type":"ctn","checked":false },
+      { "name": "称重重量", "code": "WEIGHKGS","intoName": "WEIGHKGS","type":"ctn","checked":false }
     ]
   },
   {
diff --git a/src/views/main/ruleTemp/index.vue b/src/views/main/ruleTemp/index.vue
index 85d83f0..201e0e4 100644
--- a/src/views/main/ruleTemp/index.vue
+++ b/src/views/main/ruleTemp/index.vue
@@ -30,6 +30,18 @@
                     <a-input size="small" placeholder="请输入模板名称" v-model="queryParam.TemplateName" />
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="合约号">
+                    <a-input size="small" placeholder="请输入合约号" v-model="queryParam.ContractNO" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+              <a-row>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="订舱账号">
+                    <a-input size="small" placeholder="请输入订舱账号" v-model="queryParam.BookingAccount" />
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -146,6 +158,16 @@ export default {
                     align: 'center',
                     field: 'templateName'
                 },
+                {
+                    title: '合约号',
+                    align: 'center',
+                    field: 'contractNO'
+                },
+                {
+                    title: '订舱编号',
+                    align: 'center',
+                    field: 'bookingAccount'
+                },
                 {
                     title: '是否启用',
                     align: 'center',
@@ -195,6 +217,16 @@ export default {
                     align: 'center',
                     field: 'templateName'
                 },
+                {
+                    title: '合约号',
+                    align: 'center',
+                    field: 'contractNO'
+                },
+                {
+                    title: '订舱编号',
+                    align: 'center',
+                    field: 'bookingAccount'
+                },
                 {
                     title: '是否启用',
                     align: 'center',