lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zth' into dev

Browse Source
feature-JimuReport-1106-yjl
张同海 1 month ago
parent abe4d1e69d 6d3f92d705
commit acb0427752
5 changed files with 357 additions and 74 deletions
Show Stats Download Patch File Download Diff File

250
src/views/ContainerManagement/CurrentState/columns.tsx
Unescape Escape View File

@ -30,12 +30,91 @@ export const columns: BasicColumn[] = [
sorter: true, sorter: true,
width: 150, 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: '箱型', title: '箱型',
dataIndex: 'ctnall', dataIndex: 'ctnall',
sorter: true, sorter: true,
width: 150, width: 150,
}, },
{
title: '空重箱',
dataIndex: 'isHeavy',
sorter: true,
width: 80,
customRender: ({ text }) => {
if (text) {
return <Tag color="success">重箱</Tag>
} else {
return <Tag color="error">空箱</Tag>
}
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: '新旧箱', title: '新旧箱',
dataIndex: 'usedState', dataIndex: 'usedState',
@ -60,24 +139,14 @@ export const columns: BasicColumn[] = [
sorter: true, sorter: true,
width: 200, width: 200,
}, },
{
title: '当前箱业务状态',
dataIndex: 'ctnBizState',
sorter: true,
width: 200,
},
{ {
title: '箱业务编号', title: '箱业务编号',
dataIndex: 'billno', dataIndex: 'billno',
sorter: true, sorter: true,
width: 200, width: 200,
}, },
{
title: '关联合同号',
dataIndex: 'ctnReleaseNo',
sorter: true,
width: 200,
},
{ {
title: '箱状态', title: '箱状态',
dataIndex: 'ctnState', dataIndex: 'ctnState',
@ -96,44 +165,14 @@ export const columns: BasicColumn[] = [
sorter: true, sorter: true,
width: 200, width: 200,
}, },
{
title: '空重箱',
dataIndex: 'isHeavy',
sorter: true,
width: 80,
customRender: ({ text }) => {
if (text) {
return <Tag color="success">重箱</Tag>
} else {
return <Tag color="error">空箱</Tag>
}
return text
},
},
{ {
title: '当前港口', title: '当前港口',
dataIndex: 'port', dataIndex: 'port',
sorter: true, sorter: true,
width: 150, width: 150,
}, },
{
title: '码头或场站',
dataIndex: 'depot',
sorter: true,
width: 150,
},
{
title: '船名航次',
dataIndex: 'vesselVoyno',
sorter: true,
width: 200,
},
{
title: '当前业务编号',
dataIndex: 'mblno',
sorter: true,
width: 200,
},
{ {
title: '业务委托单位', title: '业务委托单位',
dataIndex: 'customerName', dataIndex: 'customerName',
@ -164,18 +203,6 @@ export const columns: BasicColumn[] = [
sorter: true, sorter: true,
width: 200, width: 200,
}, },
{
title: '状态时间',
dataIndex: 'stateTime',
sorter: true,
width: 200,
},
{
title: '备注',
dataIndex: 'remark',
sorter: true,
width: 200,
},
] ]
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
@ -656,6 +683,117 @@ export const formSchema: FormSchema[] = [
unCheckedChildren: '空箱', 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: '', label: '',
field: 'port', field: 'port',

159
src/views/ContainerManagement/StateChange/columns.tsx
Unescape Escape View File

@ -29,10 +29,16 @@ export const columns: BasicColumn[] = [
sorter: true, sorter: true,
width: 150, width: 150,
}, },
// {
// title: '序号',
// dataIndex: 'index',
// width: 50,
// },
{ {
title: '序号', title: '箱业务状态',
dataIndex: 'index', dataIndex: 'ctnBizState',
width: 50, sorter: true,
width: 200,
}, },
{ {
title: '关联合同号', title: '关联合同号',
@ -41,11 +47,12 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: 'DEPOT/TEIMINAL', title: '船名航次',
dataIndex: 'depot', dataIndex: 'vesselVoyno',
sorter: true, sorter: true,
width: 150, width: 200,
}, },
{ {
title: '当前业务编号', title: '当前业务编号',
dataIndex: 'mblno', dataIndex: 'mblno',
@ -79,17 +86,36 @@ export const columns: BasicColumn[] = [
}, },
}, },
{ {
title: '当前港口', title: '始发港',
dataIndex: 'port', dataIndex: 'portLoad',
sorter: true, sorter: true,
width: 150, width: 150,
}, },
{ {
title: '箱业务状态', title: '目的港',
dataIndex: 'ctnBizState', dataIndex: 'portDelivery',
sorter: true, 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: '变动来源', title: '变动来源',
dataIndex: 'changeSource', dataIndex: 'changeSource',
@ -443,6 +469,117 @@ export const formSchema: FormSchema[] = [
unCheckedChildren: '空箱', 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: '', label: '',
field: 'port', field: 'port',

3
src/views/ContainerManagement/StateChange/index.vue
Unescape Escape View File

@ -41,9 +41,6 @@
notification.warning({ message: '请输入查询条件！', duration: 3 }) notification.warning({ message: '请输入查询条件！', duration: 3 })
} else { } else {
const res: API.DataResult = await ApiChangeList(p) const res: API.DataResult = await ApiChangeList(p)
res.data.forEach((e, index) => {
e.index = index + 1
})
return new Promise((resolve) => { return new Promise((resolve) => {
resolve({ data: [...res.data], total: res.count }) resolve({ data: [...res.data], total: res.count })
}) })

15
src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
Unescape Escape View File

@ -384,6 +384,21 @@
width: 120, width: 120,
data: 'port', data: 'port',
}, },
{
title: '始发港',
width: 120,
data: 'portLoad',
},
{
title: '目的港',
width: 120,
data: 'portDelivery',
},
{
title: '预抵港',
width: 120,
data: 'portDischarge',
},
{ {
title: '场站/码头', title: '场站/码头',
width: 120, width: 120,

4
src/views/baseinfo/ctn/columns.tsx
Unescape Escape View File

@ -109,7 +109,6 @@ export const formSchema: FormSchema[] = [
field: 'ctnSize', field: 'ctnSize',
label: '集装箱尺寸', label: '集装箱尺寸',
component: 'Input', component: 'Input',
colProps: { span: 12 }, colProps: { span: 12 },
}, },
{ {
@ -138,19 +137,16 @@ export const formSchema: FormSchema[] = [
required: true, required: true,
colProps: { span: 12 }, colProps: { span: 12 },
}, },
{ {
field: 'afrCode', field: 'afrCode',
label: 'AFR代码', label: 'AFR代码',
component: 'Input', component: 'Input',
colProps: { span: 12 }, colProps: { span: 12 },
}, },
{ {
field: 'limitWeight', field: 'limitWeight',
label: '默认限重', label: '默认限重',
component: 'InputNumber', component: 'InputNumber',
colProps: { span: 12 }, colProps: { span: 12 },
}, },
{ {

Write Preview
Loading…
Cancel
Save