diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue index 08448889..71281aa9 100644 --- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue @@ -658,9 +658,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', width: 120, - data: 'vesselVoyno', + data: 'vessel', + }, + { + title: '航次', + width: 120, + data: 'voyno', }, ] const settings = { diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx index 8773cda2..8bba591e 100644 --- a/src/views/ContainerManagement/CurrentState/columns.tsx +++ b/src/views/ContainerManagement/CurrentState/columns.tsx @@ -30,14 +30,20 @@ export const columns: BasicColumn[] = [ sorter: true, width: 150, }, - // { - // title: '序号', - // dataIndex: 'index', - // width: 50, - // }, { - title: '当前箱业务状态', - dataIndex: 'ctnBizState', + title: '序号', + dataIndex: 'index', + width: 50, + }, + { + title: '箱状态', + dataIndex: 'ctnState', + sorter: true, + width: 200, + }, + { + title: '箱流转状态', + dataIndex: 'ctnFlowState', sorter: true, width: 200, }, @@ -48,8 +54,14 @@ export const columns: BasicColumn[] = [ width: 200, }, { - title: '船名航次', - dataIndex: 'vesselVoyno', + title: '船名', + dataIndex: 'vessel', + sorter: true, + width: 200, + }, + { + title: '航次', + dataIndex: 'voyno', sorter: true, width: 200, }, @@ -60,7 +72,7 @@ export const columns: BasicColumn[] = [ width: 200, }, { - title: '状态时间', + title: '发生日期', dataIndex: 'stateTime', sorter: true, width: 200, @@ -115,94 +127,88 @@ export const columns: BasicColumn[] = [ sorter: true, width: 200, }, - { - title: '新旧箱', - dataIndex: 'usedState', - sorter: true, - width: 200, - }, - { - title: '箱主', - dataIndex: 'ctnOwner', - sorter: true, - width: 200, - }, // { - // title: '所属分部', - // dataIndex: 'orgid', + // title: '新旧箱', + // dataIndex: 'usedState', + // sorter: true, + // width: 200, + // }, + // { + // title: '箱主', + // dataIndex: 'ctnOwner', + // sorter: true, + // width: 200, + // }, + // { + // title: '箱来源', + // dataIndex: 'ctnSource', // sorter: true, // width: 200, // }, - { - title: '箱来源', - dataIndex: 'ctnSource', - sorter: true, - width: 200, - }, - { - title: '箱业务编号', - dataIndex: 'billno', - sorter: true, - width: 200, - }, + // { + // title: '箱业务编号', + // dataIndex: 'billno', + // sorter: true, + // width: 200, + // }, - { - title: '箱状态', - dataIndex: 'ctnState', - sorter: true, - width: 200, - }, - { - title: '箱损坏', - dataIndex: 'ctnBreakState', - sorter: true, - width: 200, - }, - { - title: '是否上线', - dataIndex: 'isOnline', - sorter: true, - width: 200, - }, + // { + // title: '箱状态', + // dataIndex: 'ctnState', + // sorter: true, + // width: 200, + // }, + // { + // title: '箱损坏', + // dataIndex: 'ctnBreakState', + // sorter: true, + // width: 200, + // }, + // { + // title: '是否上线', + // dataIndex: 'isOnline', + // sorter: true, + // width: 200, + // }, - { - title: '当前港口', - dataIndex: 'port', - sorter: true, - width: 150, - }, + // { + // title: '当前港口', + // dataIndex: 'port', + // sorter: true, + // width: 150, + // }, - { - title: '业务委托单位', - dataIndex: 'customerName', - sorter: true, - width: 200, - }, - { - title: 'ETD', - dataIndex: 'etd', - sorter: true, - width: 200, - }, - { - title: 'ETA', - dataIndex: 'eta', - sorter: true, - width: 200, - }, - { - title: '生产日期', - dataIndex: 'productionDate', - sorter: true, - width: 200, - }, - { - title: '箱初期成本', - dataIndex: 'ctnValue_Base', - sorter: true, - width: 200, - }, + // { + // title: '业务委托单位', + // dataIndex: 'customerName', + // sorter: true, + // width: 200, + // }, + // { + // title: 'ETD', + // dataIndex: 'etd', + // sorter: true, + // width: 200, + // }, + // { + // title: 'ETA', + // dataIndex: 'eta', + // sorter: true, + // width: 200, + // }, + // { + // title: '生产日期', + // dataIndex: 'productionDate', + // sorter: true, + // width: 200, + // }, + // { + // title: '箱初期成本', + // dataIndex: 'ctnValue_Base', + // sorter: true, + // width: 200, + // }, ] export const searchFormSchema: FormSchema[] = [ @@ -277,8 +283,14 @@ export const searchFormSchema: FormSchema[] = [ }, }, { - field: 'vesselVoyno', - label: '船名航次', + field: 'vessel', + label: '船名', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'Voyno', + label: '航次', component: 'Input', colProps: { span: 4 }, }, @@ -849,8 +861,14 @@ export const formSchema: FormSchema[] = [ }, }, { - field: 'vesselVoyno', - label: '船名航次', + field: 'vessel', + label: '船名', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'Voyno', + label: '航次', component: 'Input', colProps: { span: 6 }, }, diff --git a/src/views/ContainerManagement/CurrentState/index.vue b/src/views/ContainerManagement/CurrentState/index.vue index 466a7bfb..d51f5729 100644 --- a/src/views/ContainerManagement/CurrentState/index.vue +++ b/src/views/ContainerManagement/CurrentState/index.vue @@ -46,6 +46,9 @@ title: '集装箱信息列表', api: async (p) => { const res: API.DataResult = await ApiList(p) + res.data.forEach((item, index) => { + item.index = index + 1 + }) return new Promise((resolve) => { resolve({ data: [...res.data], total: res.count }) }) diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue index 85caeea9..48488713 100644 --- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue @@ -902,9 +902,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', width: 120, - data: 'vesselVoyno', + data: 'vessel', + }, + { + title: '航次', + width: 120, + data: 'voyno', }, ] const Viewsettings = { diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue index 466ee4bf..39827b7e 100644 --- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue @@ -775,9 +775,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', width: 120, - data: 'vesselVoyno', + data: 'vessel', + }, + { + title: '航次', + width: 120, + data: 'voyno', }, { title: '合同号', @@ -1082,9 +1087,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', + width: 120, + data: 'vessel', + }, + { + title: '航次', width: 120, - data: 'vesselVoyno', + data: 'voyno', }, ] const settings2 = { diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue index 68096a8a..4bf1d52a 100644 --- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue @@ -760,9 +760,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', width: 120, - data: 'vesselVoyno', + data: 'vessel', + }, + { + title: '航次', + width: 120, + data: 'voyno', }, // { diff --git a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue index d1574c1f..c14f56f1 100644 --- a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue @@ -711,9 +711,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', width: 120, - data: 'vesselVoyno', + data: 'vessel', + }, + { + title: '航次', + width: 120, + data: 'voyno', }, // { diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue index 85f44f3b..5b7d0784 100644 --- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue @@ -810,9 +810,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', width: 120, - data: 'vesselVoyno', + data: 'vessel', + }, + { + title: '航次', + width: 120, + data: 'voyno', }, ] const settings = { @@ -1142,9 +1147,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', + width: 120, + data: 'vessel', + }, + { + title: '航次', width: 120, - data: 'vesselVoyno', + data: 'voyno', }, ] const settings2 = { @@ -1399,9 +1409,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', width: 120, - data: 'vesselVoyno', + data: 'vessel', + }, + { + title: '航次', + width: 120, + data: 'voyno', }, { title: '状态时间', @@ -1587,9 +1602,14 @@ data: 'mblno', }, { - title: '船名航次', + title: '船名', + width: 120, + data: 'vessel', + }, + { + title: '航次', width: 120, - data: 'vesselVoyno', + data: 'voyno', }, { title: '合同号', diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx index 32299eca..e5cbb857 100644 --- a/src/views/ContainerManagement/StateChange/columns.tsx +++ b/src/views/ContainerManagement/StateChange/columns.tsx @@ -29,14 +29,20 @@ export const columns: BasicColumn[] = [ sorter: true, width: 150, }, - // { - // title: '序号', - // dataIndex: 'index', - // width: 50, - // }, { - title: '箱业务状态', - dataIndex: 'ctnBizState', + title: '序号', + dataIndex: 'index', + width: 50, + }, + { + title: '箱状态', + dataIndex: 'ctnState', + sorter: true, + width: 200, + }, + { + title: '箱流转状态', + dataIndex: 'ctnFlowState', sorter: true, width: 200, }, @@ -47,8 +53,14 @@ export const columns: BasicColumn[] = [ width: 150, }, { - title: '船名航次', - dataIndex: 'vesselVoyno', + title: '船名', + dataIndex: 'vessel', + sorter: true, + width: 200, + }, + { + title: '航次', + dataIndex: 'voyno', sorter: true, width: 200, }, @@ -60,7 +72,7 @@ export const columns: BasicColumn[] = [ width: 200, }, { - title: 'DATE', + title: '发生日期', dataIndex: 'changeTime', sorter: true, width: 150, @@ -110,38 +122,44 @@ export const columns: BasicColumn[] = [ width: 150, }, { - title: '当前港口', - dataIndex: 'port', - sorter: true, - width: 150, - }, - - { - title: '变动来源', - dataIndex: 'changeSource', - sorter: true, - width: 150, - }, - { - title: '状态变动', - dataIndex: 'ctnFlowState', + title: '备注', + dataIndex: 'remark', sorter: true, width: 200, }, + // { + // title: '当前港口', + // dataIndex: 'port', + // sorter: true, + // width: 150, + // }, - { - title: '新旧箱', - dataIndex: 'usedState', - sorter: true, - width: 200, - }, + // { + // title: '变动来源', + // dataIndex: 'changeSource', + // sorter: true, + // width: 150, + // }, + // { + // title: '状态变动', + // dataIndex: 'ctnFlowState', + // sorter: true, + // width: 200, + // }, - { - title: '箱状态', - dataIndex: 'ctnState', - sorter: true, - width: 200, - }, + // { + // title: '新旧箱', + // dataIndex: 'usedState', + // sorter: true, + // width: 200, + // }, + + // { + // title: '箱状态', + // dataIndex: 'ctnState', + // sorter: true, + // width: 200, + // }, ] export const searchFormSchema: FormSchema[] = [ @@ -627,8 +645,14 @@ export const formSchema: FormSchema[] = [ }, }, { - field: 'vesselVoyno', - label: '船名航次', + field: 'vessel', + label: '船名', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'Voyno', + label: '航次', component: 'Input', colProps: { span: 6 }, }, diff --git a/src/views/ContainerManagement/StateChange/index.vue b/src/views/ContainerManagement/StateChange/index.vue index bc270603..62e64cf3 100644 --- a/src/views/ContainerManagement/StateChange/index.vue +++ b/src/views/ContainerManagement/StateChange/index.vue @@ -41,6 +41,9 @@ notification.warning({ message: '请输入查询条件!', duration: 3 }) } else { const res: API.DataResult = await ApiChangeList(p) + res.data.forEach((item, index) => { + item.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 8b582b21..e528b672 100644 --- a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue @@ -369,6 +369,11 @@ width: 200, data: 'dealRemark', }, + { + title: '箱流转状态', + width: 120, + data: 'ctnFlowState', + }, { title: '当前箱业务状态', width: 120, @@ -405,9 +410,14 @@ data: 'depot', }, { - title: '船名航次', + title: '船名', + width: 120, + data: 'vessel', + }, + { + title: '航次', width: 120, - data: 'vesselVoyno', + data: 'voyno', }, { title: '业务编号', diff --git a/src/views/ContainerManagement/dsxxcl/columns.tsx b/src/views/ContainerManagement/dsxxcl/columns.tsx index 5c265406..539bfd90 100644 --- a/src/views/ContainerManagement/dsxxcl/columns.tsx +++ b/src/views/ContainerManagement/dsxxcl/columns.tsx @@ -94,8 +94,14 @@ export const columns: BasicColumn[] = [ width: 200, }, { - title: '船名航次', - dataIndex: 'vesselVoyno', + title: '船名', + dataIndex: 'vessel', + sorter: true, + width: 200, + }, + { + title: '航次', + dataIndex: 'voyno', sorter: true, width: 200, }, diff --git a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx index 495952e0..e3c8942c 100644 --- a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx +++ b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx @@ -91,8 +91,14 @@ export const columns: BasicColumn[] = [ width: 200, }, { - title: '船名航次', - dataIndex: 'vesselVoyno', + title: '船名', + dataIndex: 'vessel', + sorter: true, + width: 200, + }, + { + title: '航次', + dataIndex: 'voyno', sorter: true, width: 200, }, @@ -407,8 +413,14 @@ export const formSchema: FormSchema[] = [ }, }, { - field: 'vesselVoyno', - label: '船名航次', + field: 'vessel', + label: '船名', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'Voyno', + label: '航次', component: 'Input', colProps: { span: 6 }, }, diff --git a/src/views/baseinfo/ClientStakeholder/columns.tsx b/src/views/baseinfo/ClientStakeholder/columns.tsx index fb80c8d9..83f5eb6f 100644 --- a/src/views/baseinfo/ClientStakeholder/columns.tsx +++ b/src/views/baseinfo/ClientStakeholder/columns.tsx @@ -79,7 +79,7 @@ if (res.succeeded) { export const columns: BasicColumn[] = [ { title: '干系人姓名', - dataIndex: 'createByName', + dataIndex: 'userName', sorter: true, width: 150, }, @@ -105,7 +105,7 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { - field: 'createByName', + field: 'userName', label: '干系人姓名', component: 'Input', colProps: { span: 4 }, diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/api.ts b/src/views/baseinfo/infoclient/ClientStakeholder/api.ts index bab62442..dc5b9a29 100644 --- a/src/views/baseinfo/infoclient/ClientStakeholder/api.ts +++ b/src/views/baseinfo/infoclient/ClientStakeholder/api.ts @@ -6,6 +6,7 @@ enum Api { Audit = '/mainApi/ClientStakeholder/Audit', Get = '/mainApi/ClientStakeholder/Get', edit = '/mainApi/ClientStakeholder/Edit', + Del = '/mainApi/ClientStakeholder/Delete', } // 列表 (Auth) @@ -40,3 +41,11 @@ export function ApiEdit(data) { data, }) } +// 删除干系人 (Auth) +export function ApiDel(data) { + return request({ + url: Api.Del, + method: 'post', + data, + }) +} diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue index 868012f5..aee0e266 100644 --- a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue +++ b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue @@ -7,10 +7,10 @@ 添加 - +