From f14d250ca7495605b71f3d07517c4b09f9896a16 Mon Sep 17 00:00:00 2001 From: lijingjia Date: Fri, 19 Jul 2024 13:52:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ActionBar/index.vue | 8 +- src/design/iconfont.less | 9 +- src/hooks/web/common.ts | 3 +- src/views/baseinfo/orderContact/api.ts | 1 - .../operation/seaexport/api/BookingLedger.js | 15 +- .../detail/components/ladingInfo.tsx | 1 + .../seaexport/detail/modules/PersonModal.vue | 36 +++- .../seaexport/detail/modules/baseInfo.tsx | 101 ++++++++-- .../seaexport/detail/modules/basicInfo.vue | 55 +++-- .../seaexport/detail/modules/rightContent.vue | 6 +- src/views/operation/seaexport/index.vue | 27 +++ src/views/system/print/api.ts | 56 ++++++ src/views/system/print/columns.tsx | 190 ++++++++++++++++++ src/views/system/print/components/Modal.vue | 110 ++++++++++ src/views/system/print/index.vue | 115 +++++++++++ 15 files changed, 677 insertions(+), 56 deletions(-) create mode 100644 src/views/system/print/api.ts create mode 100644 src/views/system/print/columns.tsx create mode 100644 src/views/system/print/components/Modal.vue create mode 100644 src/views/system/print/index.vue diff --git a/src/components/ActionBar/index.vue b/src/components/ActionBar/index.vue index 835ccaa0..c1e9a514 100644 --- a/src/components/ActionBar/index.vue +++ b/src/components/ActionBar/index.vue @@ -126,13 +126,7 @@ } id = ids[index + 1] } - closePage() - go({ - path: route.path, - query: { - id - } - }) + closePage(route.path + '?id=' + id) } else { createMessage.warning('列表页面数据丢失,请回退列表页面后重试!') } diff --git a/src/design/iconfont.less b/src/design/iconfont.less index 7eb6960b..83a7239e 100644 --- a/src/design/iconfont.less +++ b/src/design/iconfont.less @@ -1,6 +1,9 @@ -.icon-locksuo { +.icon-locksuo, .icon-duihao1 { color: #17a6a3; } -.icon-lock-openkaisuo { - color: #7a8798; +.icon-lock-openkaisuo, .icon-chahao { + color: @msg-color; } +.icon-bingtu3 { + color: #257afa; +} \ No newline at end of file diff --git a/src/hooks/web/common.ts b/src/hooks/web/common.ts index 05e99357..42c95635 100644 --- a/src/hooks/web/common.ts +++ b/src/hooks/web/common.ts @@ -19,8 +19,7 @@ export function formatTableData(v) { */ export function closePage(topath) { const tabStore = useMultipleTabStore() - // 当前路由 - const fullPath = router?.currentRoute?._value?.fullPath + tabStore.closeTab(router.currentRoute._value, router) // 有目标路径则跳转 if (topath) { router.push(topath) diff --git a/src/views/baseinfo/orderContact/api.ts b/src/views/baseinfo/orderContact/api.ts index 5b52d2fe..09215188 100644 --- a/src/views/baseinfo/orderContact/api.ts +++ b/src/views/baseinfo/orderContact/api.ts @@ -5,7 +5,6 @@ enum Api { list = '/mainApi/OrderContact/GetOrderContactList', edit = '/mainApi/OrderContact/EditOrderContact', info = '/mainApi/OrderContact/GetOrderContactInfo', - OrderContact = '/mainApi/OrderContact/GetOrderContactListByClientId', Del = '/mainApi/OrderContact/BatchDelOrderContact', diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js index bcd56d31..b565967f 100644 --- a/src/views/operation/seaexport/api/BookingLedger.js +++ b/src/views/operation/seaexport/api/BookingLedger.js @@ -1999,10 +1999,19 @@ export function EditBusinessOrderContact(params) { } // 委托单位联系人详情 -export function GetBusinessOrderContactInfo(data) { +export function GetBusinessOrderContactInfo(params) { return request({ url: '/opApi/BusinessOrderContact/GetBusinessOrderContactInfo', - method: 'post', - data + method: 'get', + params + }) +} + +// 联系人下拉 +export function GetOrderContactListByClientId(params) { + return request({ + url: '/mainApi/OrderContact/GetOrderContactListByClientId', + method: 'get', + params }) } \ No newline at end of file diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.tsx b/src/views/operation/seaexport/detail/components/ladingInfo.tsx index 65e30b1f..4f636e82 100644 --- a/src/views/operation/seaexport/detail/components/ladingInfo.tsx +++ b/src/views/operation/seaexport/detail/components/ladingInfo.tsx @@ -221,6 +221,7 @@ export const formSchema2: FormSchema[] = [ }) }, labelField: 'ediCode', + showName: 'portName', valueField: 'id', resultField: 'data', filterOption: (input: string, option: any) => { diff --git a/src/views/operation/seaexport/detail/modules/PersonModal.vue b/src/views/operation/seaexport/detail/modules/PersonModal.vue index 007ec7c2..b64c7920 100644 --- a/src/views/operation/seaexport/detail/modules/PersonModal.vue +++ b/src/views/operation/seaexport/detail/modules/PersonModal.vue @@ -3,13 +3,24 @@ v-bind="$attrs" :use-wrapper="true" :title="getTitle" - :form-schema="formSchema" + :form-schema="personFormSchema" width="50%" @register="registerModal" @ok="handleSave" > - + + +