From 6d3f92d705973e403e2b5f98d2f3804eb4067866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
<14166000+zhangtonghai@user.noreply.gitee.com>
Date: Tue, 22 Oct 2024 18:00:32 +0800
Subject: [PATCH] =?UTF-8?q?10/22=20=20=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CurrentState/columns.tsx | 250 ++++++++++++++----
.../StateChange/columns.tsx | 159 ++++++++++-
.../ContainerManagement/StateChange/index.vue | 3 -
.../TemplatImport/TenantAuditStepModal.vue | 15 ++
src/views/baseinfo/ctn/columns.tsx | 4 -
5 files changed, 357 insertions(+), 74 deletions(-)
diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx
index 015b007a..8773cda2 100644
--- a/src/views/ContainerManagement/CurrentState/columns.tsx
+++ b/src/views/ContainerManagement/CurrentState/columns.tsx
@@ -30,12 +30,91 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 150,
},
+ // {
+ // title: '序号',
+ // dataIndex: 'index',
+ // width: 50,
+ // },
+ {
+ title: '当前箱业务状态',
+ dataIndex: 'ctnBizState',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '关联合同号',
+ dataIndex: 'ctnReleaseNo',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '船名航次',
+ dataIndex: 'vesselVoyno',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '当前业务编号',
+ dataIndex: 'mblno',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '状态时间',
+ dataIndex: 'stateTime',
+ sorter: true,
+ width: 200,
+ },
{
title: '箱型',
dataIndex: 'ctnall',
sorter: true,
width: 150,
},
+ {
+ title: '空重箱',
+ dataIndex: 'isHeavy',
+ sorter: true,
+ width: 80,
+ customRender: ({ text }) => {
+ if (text) {
+ return 重箱
+ } else {
+ return 空箱
+ }
+ return text
+ },
+ },
+ {
+ title: '始发港',
+ dataIndex: 'portLoad',
+ sorter: true,
+ width: 150,
+ },
+ {
+ title: '目的港',
+ dataIndex: 'portDelivery',
+ sorter: true,
+ width: 150,
+ },
+ {
+ title: '预抵港',
+ dataIndex: 'portDischarge',
+ sorter: true,
+ width: 150,
+ },
+ {
+ title: '码头或场站',
+ dataIndex: 'depot',
+ sorter: true,
+ width: 150,
+ },
+ {
+ title: '备注',
+ dataIndex: 'remark',
+ sorter: true,
+ width: 200,
+ },
{
title: '新旧箱',
dataIndex: 'usedState',
@@ -60,24 +139,14 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 200,
},
- {
- title: '当前箱业务状态',
- dataIndex: 'ctnBizState',
- sorter: true,
- width: 200,
- },
+
{
title: '箱业务编号',
dataIndex: 'billno',
sorter: true,
width: 200,
},
- {
- title: '关联合同号',
- dataIndex: 'ctnReleaseNo',
- sorter: true,
- width: 200,
- },
+
{
title: '箱状态',
dataIndex: 'ctnState',
@@ -96,44 +165,14 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 200,
},
- {
- title: '空重箱',
- dataIndex: 'isHeavy',
- sorter: true,
- width: 80,
- customRender: ({ text }) => {
- if (text) {
- return 重箱
- } else {
- return 空箱
- }
- return text
- },
- },
+
{
title: '当前港口',
dataIndex: 'port',
sorter: true,
width: 150,
},
- {
- title: '码头或场站',
- dataIndex: 'depot',
- sorter: true,
- width: 150,
- },
- {
- title: '船名航次',
- dataIndex: 'vesselVoyno',
- sorter: true,
- width: 200,
- },
- {
- title: '当前业务编号',
- dataIndex: 'mblno',
- sorter: true,
- width: 200,
- },
+
{
title: '业务委托单位',
dataIndex: 'customerName',
@@ -164,18 +203,6 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 200,
},
- {
- title: '状态时间',
- dataIndex: 'stateTime',
- sorter: true,
- width: 200,
- },
- {
- title: '备注',
- dataIndex: 'remark',
- sorter: true,
- width: 200,
- },
]
export const searchFormSchema: FormSchema[] = [
@@ -656,6 +683,117 @@ export const formSchema: FormSchema[] = [
unCheckedChildren: '空箱',
},
},
+ {
+ label: '',
+ field: 'portLoadCode',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ label: '',
+ field: 'portLoad',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ field: 'portLoadid',
+ label: '始发港',
+ component: 'ApiSelect',
+ colProps: { span: 6 },
+ required: false,
+ componentProps: ({ formModel }) => {
+ return {
+ option: optionsStore.getOptionsByCode('GetClientPortSelectList'),
+ labelField: 'portName',
+ valueField: 'id',
+ resultField: 'data',
+ filterOption: (input: string, option: any) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+ onChange: (v, obj) => {
+ console.log(v, obj)
+ formModel.portLoad = obj?.label || ''
+ formModel.portLoadCode = obj?.ediCode || ''
+ },
+ }
+ },
+ },
+ {
+ label: '',
+ field: 'portDeliveryCode',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ label: '',
+ field: 'portDelivery',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ field: 'portDeliveryid',
+ label: '目的港',
+ component: 'ApiSelect',
+ colProps: { span: 6 },
+ required: false,
+ componentProps: ({ formModel }) => {
+ return {
+ option: optionsStore.getOptionsByCode('GetClientPortSelectList'),
+ labelField: 'portName',
+ valueField: 'id',
+ resultField: 'data',
+ filterOption: (input: string, option: any) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+ onChange: (v, obj) => {
+ console.log(v, obj)
+ formModel.portDelivery = obj?.label || ''
+ formModel.portDeliveryCode = obj?.ediCode || ''
+ },
+ }
+ },
+ },
+ {
+ label: '',
+ field: 'portDischargeCode',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ label: '',
+ field: 'portDischarge',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ field: 'portDischargeid',
+ label: '预抵港',
+ component: 'ApiSelect',
+ colProps: { span: 6 },
+ required: false,
+ componentProps: ({ formModel }) => {
+ return {
+ option: optionsStore.getOptionsByCode('GetClientPortSelectList'),
+ labelField: 'portName',
+ valueField: 'id',
+ resultField: 'data',
+ filterOption: (input: string, option: any) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+ onChange: (v, obj) => {
+ console.log(v, obj)
+ formModel.portDischarge = obj?.label || ''
+ formModel.portDischargeCode = obj?.ediCode || ''
+ },
+ }
+ },
+ },
{
label: '',
field: 'port',
diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx
index 8c1cada1..32299eca 100644
--- a/src/views/ContainerManagement/StateChange/columns.tsx
+++ b/src/views/ContainerManagement/StateChange/columns.tsx
@@ -29,10 +29,16 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 150,
},
+ // {
+ // title: '序号',
+ // dataIndex: 'index',
+ // width: 50,
+ // },
{
- title: '序号',
- dataIndex: 'index',
- width: 50,
+ title: '箱业务状态',
+ dataIndex: 'ctnBizState',
+ sorter: true,
+ width: 200,
},
{
title: '关联合同号',
@@ -41,11 +47,12 @@ export const columns: BasicColumn[] = [
width: 150,
},
{
- title: 'DEPOT/TEIMINAL',
- dataIndex: 'depot',
+ title: '船名航次',
+ dataIndex: 'vesselVoyno',
sorter: true,
- width: 150,
+ width: 200,
},
+
{
title: '当前业务编号',
dataIndex: 'mblno',
@@ -79,17 +86,36 @@ export const columns: BasicColumn[] = [
},
},
{
- title: '当前港口',
- dataIndex: 'port',
+ title: '始发港',
+ dataIndex: 'portLoad',
sorter: true,
width: 150,
},
{
- title: '箱业务状态',
- dataIndex: 'ctnBizState',
+ title: '目的港',
+ dataIndex: 'portDelivery',
sorter: true,
- width: 200,
+ width: 150,
+ },
+ {
+ title: '预抵港',
+ dataIndex: 'portDischarge',
+ sorter: true,
+ width: 150,
+ },
+ {
+ title: 'DEPOT/TEIMINAL',
+ dataIndex: 'depot',
+ sorter: true,
+ width: 150,
+ },
+ {
+ title: '当前港口',
+ dataIndex: 'port',
+ sorter: true,
+ width: 150,
},
+
{
title: '变动来源',
dataIndex: 'changeSource',
@@ -443,6 +469,117 @@ export const formSchema: FormSchema[] = [
unCheckedChildren: '空箱',
},
},
+ {
+ label: '',
+ field: 'portLoadCode',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ label: '',
+ field: 'portLoad',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ field: 'portLoadid',
+ label: '始发港',
+ component: 'ApiSelect',
+ colProps: { span: 6 },
+ required: false,
+ componentProps: ({ formModel }) => {
+ return {
+ option: optionsStore.getOptionsByCode('GetClientPortSelectList'),
+ labelField: 'portName',
+ valueField: 'id',
+ resultField: 'data',
+ filterOption: (input: string, option: any) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+ onChange: (v, obj) => {
+ console.log(v, obj)
+ formModel.portLoad = obj?.label || ''
+ formModel.portLoadCode = obj?.ediCode || ''
+ },
+ }
+ },
+ },
+ {
+ label: '',
+ field: 'portDeliveryCode',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ label: '',
+ field: 'portDelivery',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ field: 'portDeliveryid',
+ label: '目的港',
+ component: 'ApiSelect',
+ colProps: { span: 6 },
+ required: false,
+ componentProps: ({ formModel }) => {
+ return {
+ option: optionsStore.getOptionsByCode('GetClientPortSelectList'),
+ labelField: 'portName',
+ valueField: 'id',
+ resultField: 'data',
+ filterOption: (input: string, option: any) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+ onChange: (v, obj) => {
+ console.log(v, obj)
+ formModel.portDelivery = obj?.label || ''
+ formModel.portDeliveryCode = obj?.ediCode || ''
+ },
+ }
+ },
+ },
+ {
+ label: '',
+ field: 'portDischargeCode',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ label: '',
+ field: 'portDischarge',
+ component: 'Input',
+ defaultValue: '',
+ show: false,
+ },
+ {
+ field: 'portDischargeid',
+ label: '预抵港',
+ component: 'ApiSelect',
+ colProps: { span: 6 },
+ required: false,
+ componentProps: ({ formModel }) => {
+ return {
+ option: optionsStore.getOptionsByCode('GetClientPortSelectList'),
+ labelField: 'portName',
+ valueField: 'id',
+ resultField: 'data',
+ filterOption: (input: string, option: any) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+ onChange: (v, obj) => {
+ console.log(v, obj)
+ formModel.portDischarge = obj?.label || ''
+ formModel.portDischargeCode = obj?.ediCode || ''
+ },
+ }
+ },
+ },
{
label: '',
field: 'port',
diff --git a/src/views/ContainerManagement/StateChange/index.vue b/src/views/ContainerManagement/StateChange/index.vue
index 954f6612..bc270603 100644
--- a/src/views/ContainerManagement/StateChange/index.vue
+++ b/src/views/ContainerManagement/StateChange/index.vue
@@ -41,9 +41,6 @@
notification.warning({ message: '请输入查询条件！', duration: 3 })
} else {
const res: API.DataResult = await ApiChangeList(p)
- res.data.forEach((e, index) => {
- e.index = index + 1
- })
return new Promise((resolve) => {
resolve({ data: [...res.data], total: res.count })
})
diff --git a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
index 67aba9f7..8b582b21 100644
--- a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
@@ -384,6 +384,21 @@
width: 120,
data: 'port',
},
+ {
+ title: '始发港',
+ width: 120,
+ data: 'portLoad',
+ },
+ {
+ title: '目的港',
+ width: 120,
+ data: 'portDelivery',
+ },
+ {
+ title: '预抵港',
+ width: 120,
+ data: 'portDischarge',
+ },
{
title: '场站/码头',
width: 120,
diff --git a/src/views/baseinfo/ctn/columns.tsx b/src/views/baseinfo/ctn/columns.tsx
index 229ecc4e..e7611621 100644
--- a/src/views/baseinfo/ctn/columns.tsx
+++ b/src/views/baseinfo/ctn/columns.tsx
@@ -109,7 +109,6 @@ export const formSchema: FormSchema[] = [
field: 'ctnSize',
label: '集装箱尺寸',
component: 'Input',
-
colProps: { span: 12 },
},
{
@@ -138,19 +137,16 @@ export const formSchema: FormSchema[] = [
required: true,
colProps: { span: 12 },
},
-
{
field: 'afrCode',
label: 'AFR代码',
component: 'Input',
-
colProps: { span: 12 },
},
{
field: 'limitWeight',
label: '默认限重',
component: 'InputNumber',
-
colProps: { span: 12 },
},
{