From d73882d94116a4b2b7b802ab9b95bf803aa32a5c Mon Sep 17 00:00:00 2001 From: sunzehua Date: Wed, 29 Nov 2023 09:02:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 ++-- .env.development | 8 ++++---- .env.preview | 8 ++++---- src/views/main/BookingLedger/detail/modules/preOrder.vue | 4 +++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.env b/.env index e769c09..af3850a 100644 --- a/.env +++ b/.env @@ -4,10 +4,10 @@ VUE_APP_PREVIEW=true # VUE_APP_API_BASE_URL=http://127.0.0.1:5000 # VUE_APP_API_BASE_URL=http://60.209.125.238:25805 # 和川大简云正式 -# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api +VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api # VUE_APP_API_BASE_URL=http://localhost:5010 # 和川大简云测试 -VUE_APP_API_BASE_URL=http://60.209.125.238:35100 +# VUE_APP_API_BASE_URL=http://60.209.125.238:35100 # 大简云 # VUE_APP_API_BASE_URL=http://47.104.222.4:5020 diff --git a/.env.development b/.env.development index e6224fa..a404dd8 100644 --- a/.env.development +++ b/.env.development @@ -7,11 +7,11 @@ VUE_APP_PREVIEW=true # process.env.VUE_APP_API_BASE_URL # 和川大简云正式 -# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api -# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api +VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api +VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api # 和川大简云测试 -VUE_APP_API_BASE_URL=http://60.209.125.238:35100 -VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 +# VUE_APP_API_BASE_URL=http://60.209.125.238:35100 +# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 # # 大简云 # VUE_APP_API_BASE_URL=http://47.104.222.4:5020 # VUE_APP_SOCKET_BASE_URL=http://47.104.222.4:5020 diff --git a/.env.preview b/.env.preview index d081c56..b2b613c 100644 --- a/.env.preview +++ b/.env.preview @@ -3,13 +3,13 @@ VUE_APP_PREVIEW=true # VUE_APP_API_BASE_URL=http://60.209.125.238:25805 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805 # 和川大简云正式 -# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api -# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api +VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api +VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api # VUE_APP_API_BASE_URL=http://localhost:5010 # VUE_APP_SOCKET_BASE_URL=http://localhost:5010 # 和川大简云测试 -VUE_APP_API_BASE_URL=http://60.209.125.238:35100 -VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 +# VUE_APP_API_BASE_URL=http://60.209.125.238:35100 +# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 # 大简云 # VUE_APP_API_BASE_URL=http://47.104.222.4:5020 # VUE_APP_SOCKET_BASE_URL=http://47.104.222.4:5020 \ No newline at end of file diff --git a/src/views/main/BookingLedger/detail/modules/preOrder.vue b/src/views/main/BookingLedger/detail/modules/preOrder.vue index ec8865e..1e45fe4 100644 --- a/src/views/main/BookingLedger/detail/modules/preOrder.vue +++ b/src/views/main/BookingLedger/detail/modules/preOrder.vue @@ -1793,8 +1793,10 @@ export default { let Rdata = 0 if (this.orderDetails.ediCtn) { this.orderDetails.ediCtn.forEach((item) => { - console.log(item) Rdata = parseFloat(Rdata) + parseFloat(item[type]) || 0 + if (type == 'kgs') { + Rdata = Rdata.toFixed(2) + } }) } From 0f03ff8697b49ab4d2c689f2514108b4e5b5af1b Mon Sep 17 00:00:00 2001 From: sunzehua Date: Thu, 30 Nov 2023 13:47:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/mutation-types.js | 1 + src/utils/request.js | 15 ++++++++++++++- .../detail/modules/mailingInfo.vue | 2 +- .../BookingLedger/detail/modules/sedOrder.vue | 17 ----------------- src/views/main/BookingLedger/detail/rules.js | 4 ++-- src/views/main/BookingLedger/list/index.vue | 6 +++--- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js index 533e6d3..bc0bafd 100644 --- a/src/store/mutation-types.js +++ b/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" diff --git a/src/utils/request.js b/src/utils/request.js index f903abc..a8254db 100644 --- a/src/utils/request.js +++ b/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) diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue index 4920030..f59b857 100644 --- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue +++ b/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" diff --git a/src/views/main/BookingLedger/detail/modules/sedOrder.vue b/src/views/main/BookingLedger/detail/modules/sedOrder.vue index 060a398..2fe5d17 100644 --- a/src/views/main/BookingLedger/detail/modules/sedOrder.vue +++ b/src/views/main/BookingLedger/detail/modules/sedOrder.vue @@ -91,23 +91,6 @@ @pkgsEnCapital="pkgsEnCapitalFun" @changeDetail="changeDetailFun" > - -
箱号:{{ item.primaryKey }}
-

+

-

{{ item.fieldName }}:

-
+

{{ item.fieldName }}:

+
本地