修改问题

src/store/mutation-types.js

@@ -11,6 +11,7 @@ export const DEFAULT_FIXED_HEADER_HIDDEN = 'DEFAULT_FIXED_HEADER_HIDDEN'
 export const DEFAULT_CONTENT_WIDTH_TYPE = 'DEFAULT_CONTENT_WIDTH_TYPE'
 export const DEFAULT_MULTI_TAB = 'DEFAULT_MULTI_TAB'
 export const DICT_TYPE_TREE_DATA = 'DICT_TYPE_TREE_DATA'
+export const X_ACCESS_TOKEN = 'X_ACCESS_TOKEN'
 export const NOTICE_RECEIVED="NOTICE_RECEIVED"
 export const DEFAULT_HEADER_COLOR="DEFAULT_HEADER_COLOR"
 export const DEFAULT_MENU_COLOR="DEFAULT_MENU_COLOR"

src/utils/request.js

@@ -3,7 +3,7 @@ import axios from 'axios'
 import store from '@/store'
 import { message, Modal, notification } from 'ant-design-vue' /// es/notification
 import { VueAxios } from './axios'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { ACCESS_TOKEN, X_ACCESS_TOKEN } from '@/store/mutation-types'
 
 // 创建 axios 实例
 const service = axios.create({
@@ -49,8 +49,18 @@ const err = error => {
 // request interceptor
 service.interceptors.request.use(config => {
   const token = Vue.ls.get(ACCESS_TOKEN)
+  // const XToken = Vue.ls.get(X_ACCESS_TOKEN)
   if (token) {
     config.headers['Authorization'] = 'Bearer ' + token
+    // const tokenX = token.replace(/_/g, "/").replace(/-/g, "+");
+    // var json = decodeURIComponent(escape(window.atob(tokenX.split(".")[1])));
+    // const data = JSON.parse(json)
+    // const expire = data.exp
+    // const nowTime = Math.floor(Date.now() / 1000);
+    // const time = expire - nowTime
+    // if (time <= 50000) {
+    //   config.headers['X-Authorization'] = 'Bearer ' + XToken
+    // }
   }
   return config
 }, err)
@@ -63,6 +73,9 @@ service.interceptors.response.use(response => {
   if (response.request.responseType === 'blob') {
     return response
   }
+  if (response.headers['x-access-token']) {
+    Vue.ls.set(X_ACCESS_TOKEN, response.headers['x-access-token'])
+  }
   const code = response.data.code
   if (code === 1011006 || code === 1011007 || code === 1011008 || code === 1011009 || code === 401) {
     Vue.ls.remove(ACCESS_TOKEN)

src/views/main/BookingLedger/detail/modules/mailingInfo.vue

@@ -478,7 +478,7 @@
                       type="trucker"
                       :defaultVal="details.trucker"
                       searchApi="DjyCustomerpage"
-                      :disabled="BookingLockOrder['trucker'] && isLockBooking"
+                      :disabled="true"
                       :searchQuery="{ SearchValue: '', PropString: 'fleet' }"
                       :showLabel="['shortName']"
                       :openSearch="true"

src/views/main/BookingLedger/detail/modules/sedOrder.vue

@@ -91,23 +91,6 @@
                     @pkgsEnCapital="pkgsEnCapitalFun"
                     @changeDetail="changeDetailFun"
                   ></cargoInfo>
-                  <!-- 签单信息 -->
-                  <!-- <billInfo
-                    ref="billInfo"
-                    :details="editDetails"
-                    :rules="billRules"
-                    :inSave="inSave"
-                    isParent="child"
-                    @changeDetail="changeDetailFun"
-                  ></billInfo>
-                  <remarksInfo
-                    ref="remarksInfo"
-                    :details="editDetails"
-                    :rules="remarksRules"
-                    :inSave="inSave"
-                    isParent="child"
-                    @changeDetail="changeDetailFun"
-                  ></remarksInfo> -->
                   <!-- 箱型 -->
                   <goodsTable
                     ref="goodsTable"

src/views/main/BookingLedger/detail/rules.js

@@ -40,7 +40,6 @@ export default {
     agentname: [{ required: false, message: '请输入国外代理', trigger: 'change' }],
     warehouse: [{ required: false, message: '请选择仓库', trigger: 'change' }],
     shippingMethod: [{ required: false, message: '请选择装运方式', trigger: 'change' }],
-    // eta: [{ required: false, message: '请选择预抵日期', trigger: 'change' }],
     closingdate: [{ required: false, message: '请选择截港时间', trigger: 'change' }],
     closedocdate: [{ required: false, message: '请选择截单时间', trigger: 'change' }],
     closevgmdate: [{ required: false, message: '请选择VGM时间', trigger: 'change' }],
@@ -59,7 +58,8 @@ export default {
     pkgs: [{ required: false, message: '请输入件数', trigger: 'change' }],
     kindpkgs: [{ required: false, message: '请输入包装', trigger: 'change' }],
     kgs: [{ required: false, message: '请输入毛重', trigger: 'change' }],
-    cbm: [{ required: false, message: '请输入尺寸', trigger: 'change' }]
+    cbm: [{ required: false, message: '请输入尺寸', trigger: 'change' }],
+    blfrt: [{ required: false, message: '请选择付费方式', trigger: 'change' }]
   },
   cargoRules: {
     marks: [{ required: false, message: '请输入Seal No.  Marks & Nos', trigger: 'change' }],

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

@@ -778,15 +778,15 @@
                     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">
+                    <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" style="width: 90px;margin-right: 20px;">{{ item.fieldName }}:</p>
-                    <div v-if="item.isDiff" style="width:60%">
+                    <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>