From a6f3eba02a94a362f0187a7e054ec885301693df 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: Mon, 26 Aug 2024 19:11:50 +0800 Subject: [PATCH 1/3] 08/26 --- .../BuyCtn/TenantAuditStepModal.vue | 890 +++++++++++++++++ src/views/ContainerManagement/BuyCtn/api.ts | 91 ++ .../ContainerManagement/BuyCtn/columns.tsx | 379 ++++++++ .../ContainerManagement/BuyCtn/index.vue | 167 ++++ .../CtnScrap/TenantAuditStepModal.vue | 906 +++++++++++++++++ src/views/ContainerManagement/CtnScrap/api.ts | 118 +++ .../ContainerManagement/CtnScrap/columns.tsx | 202 ++++ .../ContainerManagement/CtnScrap/index.vue | 167 ++++ .../CustFeeDui/TenantAuditStepModal.vue | 1 + .../RentIn/TenantAuditStepModal.vue | 1 + .../RentOneWay/TenantAuditStepModal.vue | 1 + .../ContainerManagement/RentOneWay/api.ts | 47 - .../RentOut/TenantAuditStepModal.vue | 3 +- .../SellCtn/TenantAuditStepModal.vue | 907 ++++++++++++++++++ src/views/ContainerManagement/SellCtn/api.ts | 109 +++ .../ContainerManagement/SellCtn/columns.tsx | 302 ++++++ .../ContainerManagement/SellCtn/index.vue | 167 ++++ src/views/baseinfo/infoclient/columns.tsx | 36 +- .../infoclient/customerParams/index.vue | 1 + src/views/baseinfo/issuetype/index.vue | 6 +- src/views/baseinfo/shipping/columns.tsx | 12 +- src/views/baseinfo/shipping/index.vue | 34 +- 22 files changed, 4452 insertions(+), 95 deletions(-) create mode 100644 src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue create mode 100644 src/views/ContainerManagement/BuyCtn/api.ts create mode 100644 src/views/ContainerManagement/BuyCtn/columns.tsx create mode 100644 src/views/ContainerManagement/BuyCtn/index.vue create mode 100644 src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue create mode 100644 src/views/ContainerManagement/CtnScrap/api.ts create mode 100644 src/views/ContainerManagement/CtnScrap/columns.tsx create mode 100644 src/views/ContainerManagement/CtnScrap/index.vue create mode 100644 src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue create mode 100644 src/views/ContainerManagement/SellCtn/api.ts create mode 100644 src/views/ContainerManagement/SellCtn/columns.tsx create mode 100644 src/views/ContainerManagement/SellCtn/index.vue diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue new file mode 100644 index 00000000..140da32c --- /dev/null +++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue @@ -0,0 +1,890 @@ + + + diff --git a/src/views/ContainerManagement/BuyCtn/api.ts b/src/views/ContainerManagement/BuyCtn/api.ts new file mode 100644 index 00000000..58001b49 --- /dev/null +++ b/src/views/ContainerManagement/BuyCtn/api.ts @@ -0,0 +1,91 @@ +// @ts-ignore +import { request } from '/@/utils/request' +import { DataResult, PageRequest } from '/@/api/model/baseModel' +enum Api { + list = '/containerManagementApi/CM_BuyCtn/GetCM_BuyCtnList', + edit = '/containerManagementApi/CM_BuyCtn/EditCM_BuyCtn', + info = '/containerManagementApi/CM_BuyCtn/GetCM_BuyCtn', + del = '/containerManagementApi/CM_BuyCtn/DeleteCM_BuyCtn', + + listDetail = '/containerManagementApi/CM_BuyCtn_Detail/GetCM_BuyCtn_DetailList', + delDetail = '/containerManagementApi/CM_BuyCtn_Detail/DeleteCM_BuyCtn_Detail', + + Confirm = '/containerManagementApi/CM_BuyCtn/CM_BuyCtn_Confirm', + Cancel = '/containerManagementApi/CM_BuyCtn/CM_BuyCtn_Cancel', + MakeFee = '/containerManagementApi/CM_BuyCtn/CM_BuyCtn_MakeFee', + +} +// 列表 (Auth) +export function ApiList(data: PageRequest) { + return request({ + url: Api.list, + method: 'post', + data, + }) +} +// 编辑 (Auth) +export function ApiEdit(data: PageRequest) { + return request({ + url: Api.edit, + method: 'post', + data, + }) +} +// 详情 (Auth) +export function ApiInfo(query) { + return request({ + url: Api.info, + method: 'get', + params: query, + }) +} +// 删除 (Auth) +export function ApiDel(data: PageRequest) { + return request({ + url: Api.del, + method: 'post', + data, + }) +} + +// 列表详情 (Auth) +export function ApiListDetail(data: PageRequest) { + return request({ + url: Api.listDetail, + method: 'post', + data, + }) +} +// 删除详情 (Auth) +export function ApiDelDetail(data: PageRequest) { + return request({ + url: Api.delDetail, + method: 'post', + data, + }) +} + +// 租箱租入_生成费用 (Auth) +export function ApiMakeFee(data: PageRequest) { + return request({ + url: Api.MakeFee, + method: 'post', + data, + }) +} +// 租箱租入_确认 (Auth) +export function ApiConfirm(data: PageRequest) { + return request({ + url: Api.Confirm, + method: 'post', + data, + }) +} +// 租箱租入_取消 (Auth) +export function ApiCancel(data: PageRequest) { + return request({ + url: Api.Cancel, + method: 'post', + data, + }) +} \ No newline at end of file diff --git a/src/views/ContainerManagement/BuyCtn/columns.tsx b/src/views/ContainerManagement/BuyCtn/columns.tsx new file mode 100644 index 00000000..bf2fff61 --- /dev/null +++ b/src/views/ContainerManagement/BuyCtn/columns.tsx @@ -0,0 +1,379 @@ +import { ref } from 'vue' +import { BasicColumn, FormSchema } from '/@/components/Table' +import { Tag } from 'ant-design-vue' +import { GetCtnSelectList, GetClientListByCode } from '/@/api/common' +import { GetDeptList } from '/@/views/operation/seaexport/api/BookingLedger' +import { useOptionsStore } from '/@/store/modules/options' +const optionsStore = useOptionsStore() +// 字典 +import { getDictOption } from '/@/utils/dictUtil' +// 新旧箱数据 +const usedStateList = [ + { + label: '', + value: '', + }, + { + label: 'used', + value: 'used', + }, + { + label: 'new', + value: 'new', + }, +] +// 业务类型字典 +const businessTypeDict = ref([]) +getDictOption('CM_BusinessType').then((res) => { + businessTypeDict.value = res +}) +// 租箱类型字典 +const rentTypeIdDict = ref([]) +getDictOption('CM_RentType').then((res) => { + rentTypeIdDict.value = res +}) + +export const columns: BasicColumn[] = [ + { + title: '买箱业务编号', + dataIndex: 'billno', + sorter: true, + width: 150, + }, + { + title: '原箱主', + dataIndex: 'oldContainerOwner', + sorter: true, + width: 150, + }, + { + title: '箱型箱量', + dataIndex: 'ctntotal', + sorter: true, + width: 150, + }, + { + title: '买箱日期', + dataIndex: 'bsdate', + sorter: true, + width: 150, + }, + { + title: '会计期间', + dataIndex: 'accdate', + sorter: true, + width: 150, + }, + { + title: '已提箱', + dataIndex: 'pickupCtntotal', + sorter: true, + width: 150, + }, + { + title: '未提箱', + dataIndex: 'remainCtntotal', + sorter: true, + width: 150, + }, + { + title: '业务锁定', + dataIndex: 'isBusinessLocking', + sorter: true, + width: 150, + }, + { + title: '费用锁定', + dataIndex: 'isFeeLocking', + sorter: true, + width: 150, + }, + { + title: '应收费用状态', + dataIndex: 'arFeeStatusName', + sorter: true, + width: 150, + }, + { + title: '应付费用状态', + dataIndex: 'apFeeStatusName', + sorter: true, + width: 150, + }, + { + title: '应收开票状态', + dataIndex: 'arInvoiceStatusName', + sorter: true, + width: 150, + }, + { + title: '应付开票状态', + dataIndex: 'apInvoiceStatusName', + sorter: true, + width: 150, + }, + { + title: '备注', + dataIndex: 'remark', + sorter: true, + width: 150, + }, +] + +export const searchFormSchema: FormSchema[] = [ + { + field: 'billno', + label: '买箱业务编号', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'oldContainerOwner', + label: '原箱主', + component: 'ApiSelect', + required: false, + dynamicDisabled: false, + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + allowClear: true, + showSearch: true, + api: GetClientListByCode, + params: { code: 'leasing' }, + labelField: 'pinYinCode', + showName: 'shortName', + valueField: 'shortName', + resultField: 'data', + immediate: false, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + } + }, + }, + { + field: 'bsdate', + label: '买箱日期', + component: 'DatePicker', + colProps: { span: 4 }, + defaultValue: '', + componentProps: { + allowClear: true, + valueFormat: 'YYYY-MM-DD 00:00:00', + style: 'width:100%', + }, + }, + { + field: 'accdate', + label: '会计期间', + component: 'MonthPicker', + colProps: { span: 4 }, + defaultValue: '', + componentProps: { + showTime: true, + allowClear: true, + valueFormat: 'YYYY-MM', + format: 'YYYY-MM', + }, + }, +] +export const formSchema: FormSchema[] = [ + { + label: '', + field: 'id', + component: 'Input', + defaultValue: '', + show: false, + }, + { + field: 'businessType', + label: '业务类型', + component: 'ApiSelect', + colProps: { span: 6 }, + defaultValue: 104, + dynamicDisabled: ({}) => { + return true + }, + componentProps: ({}) => { + return { + api: () => { + return new Promise((resolve) => { + getDictOption('CM_BusinessType').then((res) => { + res.forEach((item) => { + item.value = parseInt(item.value) + }) + resolve(res) + }) + }) + }, + labelField: 'label', + valueField: 'value', + resultField: 'data', + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + } + }, + }, + { + field: 'oldContainerOwnerId', + label: '原箱主', + component: 'Input', + colProps: { span: 6 }, + show: false, + }, + { + field: 'oldContainerOwner', + label: '原箱主', + component: 'ApiSelect', + required: false, + dynamicDisabled: false, + colProps: { span: 6 }, + componentProps: ({ formModel }) => { + return { + allowClear: true, + showSearch: true, + api: GetClientListByCode, + params: { code: 'leasing' }, + labelField: 'pinYinCode', + showName: 'shortName', + valueField: 'shortName', + resultField: 'data', + immediate: false, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + onChange: (e, obj) => { + if (e && obj) { + formModel.oldContainerOwnerId = obj.id + } + if (!e && !obj) { + formModel.oldContainerOwnerId = '' + } + }, + } + }, + }, + { + field: 'bsdate', + label: '买箱日期', + component: 'DatePicker', + colProps: { span: 6 }, + defaultValue: '', + componentProps: { + allowClear: true, + valueFormat: 'YYYY-MM-DD 00:00:00', + style: 'width:100%', + }, + }, + { + field: 'ctntotal', + label: '箱型箱量', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'accdate', + label: '会计期间', + component: 'MonthPicker', + colProps: { span: 6 }, + defaultValue: '', + componentProps: { + showTime: true, + allowClear: true, + valueFormat: 'YYYY-MM', + format: 'YYYY-MM', + }, + }, + { + field: 'isBusinessLocking', + label: '业务锁定', + component: 'Switch', + defaultValue: false, + colProps: { span: 6 }, + componentProps: { + checkedChildren: '是', + unCheckedChildren: '否', + }, + dynamicDisabled: ({}) => { + return true + }, + }, + { + field: 'isFeeLocking', + label: '费用锁定', + component: 'Switch', + defaultValue: false, + colProps: { span: 6 }, + componentProps: { + checkedChildren: '是', + unCheckedChildren: '否', + }, + dynamicDisabled: ({}) => { + return true + }, + }, + { + field: 'remark', + label: '备注', + component: 'Input', + colProps: { span: 24 }, + }, +] + +export const formSearchBoxSchema: FormSchema[] = [ + { + field: 'rentCustomerName', + label: '租箱客户', + component: 'ApiSelect', + required: false, + dynamicDisabled: false, + colProps: { span: 6 }, + componentProps: ({ formModel }) => { + return { + allowClear: true, + showSearch: true, + api: GetClientListByCode, + params: { code: 'leasing' }, + labelField: 'pinYinCode', + showName: 'shortName', + valueField: 'shortName', + resultField: 'data', + immediate: false, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + } + }, + }, + { + field: 'ctnall', + label: '箱型', + component: 'ApiSelect', + required: false, + dynamicDisabled: false, + colProps: { span: 6 }, + componentProps: () => { + return { + allowClear: true, + showSearch: true, + api: GetCtnSelectList, + params: { code: 'leasing' }, + labelField: 'ctnName', + showName: 'ctnName', + valueField: 'ctnName', + resultField: 'data', + immediate: false, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + } + }, + }, + { + field: 'cntrno', + label: '箱号', + component: 'Input', + colProps: { span: 10 }, + }, +] diff --git a/src/views/ContainerManagement/BuyCtn/index.vue b/src/views/ContainerManagement/BuyCtn/index.vue new file mode 100644 index 00000000..85e4e069 --- /dev/null +++ b/src/views/ContainerManagement/BuyCtn/index.vue @@ -0,0 +1,167 @@ + + diff --git a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue new file mode 100644 index 00000000..9907b06b --- /dev/null +++ b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue @@ -0,0 +1,906 @@ + + + diff --git a/src/views/ContainerManagement/CtnScrap/api.ts b/src/views/ContainerManagement/CtnScrap/api.ts new file mode 100644 index 00000000..45690742 --- /dev/null +++ b/src/views/ContainerManagement/CtnScrap/api.ts @@ -0,0 +1,118 @@ +// @ts-ignore +import { request } from '/@/utils/request' +import { DataResult, PageRequest } from '/@/api/model/baseModel' +enum Api { + list = '/containerManagementApi/CM_CtnScrap/GetCM_CtnScrapList', + edit = '/containerManagementApi/CM_CtnScrap/EditCM_CtnScrap', + info = '/containerManagementApi/CM_CtnScrap/GetCM_CtnScrap', + del = '/containerManagementApi/CM_CtnScrap/DeleteCM_CtnScrap', + + listDetail = '/containerManagementApi/CM_CtnScrap_Detail/GetCM_CtnScrap_DetailList', + delDetail = '/containerManagementApi/CM_CtnScrap_Detail/DeleteCM_CtnScrap_Detail', + // editDetail = '/containerManagementApi/CM_CurrentState/EditCM_CurrentState', + + Confirm = '/containerManagementApi/CM_CtnScrap/CM_CtnScrap_Confirm', + Cancel = '/containerManagementApi/CM_CtnScrap/CM_CtnScrap_Cancel', + MakeFee = '/containerManagementApi/CM_CtnScrap/CM_CtnScrap_MakeFee', + + DetailView = '/containerManagementApi/CM_CtnScrap/CM_CtnScrap_Detail_View', + AddCtn = '/containerManagementApi/CM_CtnScrap/CM_CtnScrap_AddCtn', + +} +// 租箱租入明细视图 (Auth) +export function ApiDetailView(data: PageRequest) { + return request({ + url: Api.DetailView, + method: 'post', + data, + }) +} +// 租箱租入退租_添加 (Auth) +export function ApiAddCtn(data: PageRequest) { + return request({ + url: Api.AddCtn, + method: 'post', + data, + }) +} +// 租箱租入_生成费用 (Auth) +export function ApiMakeFee(data: PageRequest) { + return request({ + url: Api.MakeFee, + method: 'post', + data, + }) +} +// 租箱租入_确认 (Auth) +export function ApiConfirm(data: PageRequest) { + return request({ + url: Api.Confirm, + method: 'post', + data, + }) +} +// 租箱租入_取消 (Auth) +export function ApiCancel(data: PageRequest) { + return request({ + url: Api.Cancel, + method: 'post', + data, + }) +} +// 列表 (Auth) +export function ApiList(data: PageRequest) { + return request({ + url: Api.list, + method: 'post', + data, + }) +} +// 编辑 (Auth) +export function ApiEdit(data: PageRequest) { + return request({ + url: Api.edit, + method: 'post', + data, + }) +} +// 详情 (Auth) +export function ApiInfo(query) { + return request({ + url: Api.info, + method: 'get', + params: query, + }) +} +// 删除 (Auth) +export function ApiDel(data: PageRequest) { + return request({ + url: Api.del, + method: 'post', + data, + }) +} + +// 列表详情 (Auth) +export function ApiListDetail(data: PageRequest) { + return request({ + url: Api.listDetail, + method: 'post', + data, + }) +} +// // 编辑详情 (Auth) +// export function ApiEditDetail(data: PageRequest) { +// return request({ +// url: Api.editDetail, +// method: 'post', +// data, +// }) +// } +// 删除详情 (Auth) +export function ApiDelDetail(data: PageRequest) { + return request({ + url: Api.delDetail, + method: 'post', + data, + }) +} \ No newline at end of file diff --git a/src/views/ContainerManagement/CtnScrap/columns.tsx b/src/views/ContainerManagement/CtnScrap/columns.tsx new file mode 100644 index 00000000..b9719dfc --- /dev/null +++ b/src/views/ContainerManagement/CtnScrap/columns.tsx @@ -0,0 +1,202 @@ +import { ref } from 'vue' +import { BasicColumn, FormSchema } from '/@/components/Table' +import { Tag } from 'ant-design-vue' +import { GetCtnSelectList, GetClientListByCode } from '/@/api/common' +import { GetDeptList } from '/@/views/operation/seaexport/api/BookingLedger' +import { useOptionsStore } from '/@/store/modules/options' +const optionsStore = useOptionsStore() +// 字典 +import { getDictOption } from '/@/utils/dictUtil' +// 新旧箱数据 +const usedStateList = [ + { + label: '', + value: '', + }, + { + label: 'used', + value: 'used', + }, + { + label: 'new', + value: 'new', + }, +] +// 业务类型字典 +const businessTypeDict = ref([]) +getDictOption('CM_BusinessType').then((res) => { + businessTypeDict.value = res +}) +// 租箱类型字典 +const rentTypeIdDict = ref([]) +getDictOption('CM_RentType').then((res) => { + rentTypeIdDict.value = res +}) + +export const columns: BasicColumn[] = [ + { + title: '业务编号', + dataIndex: 'billno', + sorter: true, + width: 150, + }, + { + title: '报废日期', + dataIndex: 'bsdate', + sorter: true, + width: 200, + }, + { + title: '会计期间', + dataIndex: 'accdate', + sorter: true, + width: 200, + }, + { + title: '箱型箱量', + dataIndex: 'ctntotal', + sorter: true, + width: 200, + }, + { + title: '业务状态', + dataIndex: 'billState', + sorter: true, + width: 200, + }, + { + title: '备注', + dataIndex: 'remark', + sorter: true, + width: 200, + }, +] + +export const searchFormSchema: FormSchema[] = [ + { + field: 'billno', + label: '业务编号', + component: 'Input', + colProps: { span: 4 }, + }, + + { + field: 'bsdate', + label: '报废日期', + component: 'DatePicker', + colProps: { span: 4 }, + defaultValue: '', + componentProps: { + allowClear: true, + valueFormat: 'YYYY-MM-DD 00:00:00', + style: 'width:100%', + }, + }, + { + field: 'accdate', + label: '会计期间', + component: 'MonthPicker', + colProps: { span: 4 }, + defaultValue: '', + componentProps: { + showTime: true, + allowClear: true, + valueFormat: 'YYYY-MM', + format: 'YYYY-MM', + }, + }, +] +export const formSchema: FormSchema[] = [ + { + label: '', + field: 'id', + component: 'Input', + defaultValue: '', + show: false, + }, + { + field: 'bsdate', + label: '报废日期', + component: 'DatePicker', + colProps: { span: 6 }, + defaultValue: '', + componentProps: { + allowClear: true, + valueFormat: 'YYYY-MM-DD 00:00:00', + style: 'width:100%', + }, + }, + { + field: 'accdate', + label: '会计期间', + component: 'MonthPicker', + colProps: { span: 6 }, + defaultValue: '', + componentProps: { + showTime: true, + allowClear: true, + valueFormat: 'YYYY-MM', + format: 'YYYY-MM', + }, + }, + { + field: 'ctntotal', + label: '箱型箱量', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'billState', + label: '业务状态', + component: 'Input', + colProps: { span: 6 }, + dynamicDisabled: ({}) => { + return true + }, + }, + { + field: 'remark', + label: '备注', + component: 'Input', + colProps: { span: 24 }, + }, +] + +export const formSearchBoxSchema: FormSchema[] = [ + { + field: 'ctnReleaseNo', + label: '放箱单号', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'ctnall', + label: '箱型', + component: 'ApiSelect', + required: false, + dynamicDisabled: false, + colProps: { span: 6 }, + componentProps: () => { + return { + allowClear: true, + showSearch: true, + api: GetCtnSelectList, + params: { code: 'leasing' }, + labelField: 'ctnName', + showName: 'ctnName', + valueField: 'ctnName', + resultField: 'data', + immediate: false, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + } + }, + }, + { + field: 'cntrno', + label: '箱号', + component: 'Input', + colProps: { span: 10 }, + }, +] diff --git a/src/views/ContainerManagement/CtnScrap/index.vue b/src/views/ContainerManagement/CtnScrap/index.vue new file mode 100644 index 00000000..85e4e069 --- /dev/null +++ b/src/views/ContainerManagement/CtnScrap/index.vue @@ -0,0 +1,167 @@ + + diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue index 95640560..ec67eb34 100644 --- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue @@ -377,6 +377,7 @@ await setFieldsValue({ ...res.data, }) + GetListDetail() } } const activeKey = ref('1') diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue index d53f4923..ededcacb 100644 --- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue @@ -390,6 +390,7 @@ await setFieldsValue({ ...res.data, }) + GetListDetail() } } const activeKey = ref('1') diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue index 608e5a9d..e19c4a74 100644 --- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue @@ -389,6 +389,7 @@ await setFieldsValue({ ...res.data, }) + GetListDetail() } } const activeKey = ref('1') diff --git a/src/views/ContainerManagement/RentOneWay/api.ts b/src/views/ContainerManagement/RentOneWay/api.ts index 52106b38..319218b7 100644 --- a/src/views/ContainerManagement/RentOneWay/api.ts +++ b/src/views/ContainerManagement/RentOneWay/api.ts @@ -10,13 +10,6 @@ enum Api { listDetail = '/containerManagementApi/CM_RentOneWay_Detail/GetCM_RentOneWay_DetailList', editDetail = '/containerManagementApi/CM_RentOneWay_Detail/EditCM_RentOneWay_Detail', delDetail = '/containerManagementApi/CM_RentOneWay_Detail/DeleteCM_RentOneWay_Detail', - - // Confirm = '/containerManagementApi/CM_RentOut/CM_RentOut_Confirm', - // Cancel = '/containerManagementApi/CM_RentOut/CM_RentOut_Cancel', - // MakeFee = '/containerManagementApi/CM_RentOut/CM_RentOut_MakeFee', - - // DetailView = '/containerManagementApi/CM_RentOut/CM_RentOut_Detail_View', - // AddCtn = '/containerManagementApi/CM_RentOut/CM_RentOut_AddCtn', } // 列表 (Auth) @@ -77,43 +70,3 @@ export function ApiDelDetail(data: PageRequest) { }) } -// // 租箱租入明细视图 (Auth) -// export function ApiDetailView(data: PageRequest) { -// return request({ -// url: Api.DetailView, -// method: 'post', -// data, -// }) -// } -// // 租箱租入退租_添加 (Auth) -// export function ApiAddCtn(data: PageRequest) { -// return request({ -// url: Api.AddCtn, -// method: 'post', -// data, -// }) -// } -// // 租箱租入_生成费用 (Auth) -// export function ApiMakeFee(data: PageRequest) { -// return request({ -// url: Api.MakeFee, -// method: 'post', -// data, -// }) -// } -// // 租箱租入_确认 (Auth) -// export function ApiConfirm(data: PageRequest) { -// return request({ -// url: Api.Confirm, -// method: 'post', -// data, -// }) -// } -// // 租箱租入_取消 (Auth) -// export function ApiCancel(data: PageRequest) { -// return request({ -// url: Api.Cancel, -// method: 'post', -// data, -// }) -// } \ No newline at end of file diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue index c210e254..fc43ac91 100644 --- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue @@ -410,6 +410,7 @@ await setFieldsValue({ ...res.data, }) + GetListDetail() } } const activeKey = ref('1') @@ -950,7 +951,7 @@ data: 'CtnStateId', }, { - title: '箱流转状态！', + title: '箱流转状态', width: 120, data: 'CtnFlowStateId', }, diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue new file mode 100644 index 00000000..9a15d4b5 --- /dev/null +++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue @@ -0,0 +1,907 @@ + + + diff --git a/src/views/ContainerManagement/SellCtn/api.ts b/src/views/ContainerManagement/SellCtn/api.ts new file mode 100644 index 00000000..40d66811 --- /dev/null +++ b/src/views/ContainerManagement/SellCtn/api.ts @@ -0,0 +1,109 @@ +// @ts-ignore +import { request } from '/@/utils/request' +import { DataResult, PageRequest } from '/@/api/model/baseModel' +enum Api { + list = '/containerManagementApi/CM_SellCtn/GetCM_SellCtnList', + edit = '/containerManagementApi/CM_SellCtn/EditCM_SellCtn', + info = '/containerManagementApi/CM_SellCtn/GetCM_SellCtn', + del = '/containerManagementApi/CM_SellCtn/DeleteCM_SellCtn', + + listDetail = '/containerManagementApi/CM_SellCtn_Detail/GetCM_SellCtn_DetailList', + delDetail = '/containerManagementApi/CM_SellCtn_Detail/DeleteCM_SellCtn_Detail', + + Confirm = '/containerManagementApi/CM_SellCtn/CM_SellCtn_Confirm', + Cancel = '/containerManagementApi/CM_SellCtn/CM_SellCtn_Cancel', + MakeFee = '/containerManagementApi/CM_SellCtn/CM_SellCtn_MakeFee', + + DetailView = '/containerManagementApi/CM_SellCtn/CM_SellCtn_Detail_View', + AddCtn = '/containerManagementApi/CM_SellCtn/CM_SellCtn_AddCtn', + +} +// 租箱租入明细视图 (Auth) +export function ApiDetailView(data: PageRequest) { + return request({ + url: Api.DetailView, + method: 'post', + data, + }) +} +// 租箱租入退租_添加 (Auth) +export function ApiAddCtn(data: PageRequest) { + return request({ + url: Api.AddCtn, + method: 'post', + data, + }) +} +// 租箱租入_生成费用 (Auth) +export function ApiMakeFee(data: PageRequest) { + return request({ + url: Api.MakeFee, + method: 'post', + data, + }) +} +// 租箱租入_确认 (Auth) +export function ApiConfirm(data: PageRequest) { + return request({ + url: Api.Confirm, + method: 'post', + data, + }) +} +// 租箱租入_取消 (Auth) +export function ApiCancel(data: PageRequest) { + return request({ + url: Api.Cancel, + method: 'post', + data, + }) +} +// 列表 (Auth) +export function ApiList(data: PageRequest) { + return request({ + url: Api.list, + method: 'post', + data, + }) +} +// 编辑 (Auth) +export function ApiEdit(data: PageRequest) { + return request({ + url: Api.edit, + method: 'post', + data, + }) +} +// 详情 (Auth) +export function ApiInfo(query) { + return request({ + url: Api.info, + method: 'get', + params: query, + }) +} +// 删除 (Auth) +export function ApiDel(data: PageRequest) { + return request({ + url: Api.del, + method: 'post', + data, + }) +} + +// 列表详情 (Auth) +export function ApiListDetail(data: PageRequest) { + return request({ + url: Api.listDetail, + method: 'post', + data, + }) +} +// 删除详情 (Auth) +export function ApiDelDetail(data: PageRequest) { + return request({ + url: Api.delDetail, + method: 'post', + data, + }) +} \ No newline at end of file diff --git a/src/views/ContainerManagement/SellCtn/columns.tsx b/src/views/ContainerManagement/SellCtn/columns.tsx new file mode 100644 index 00000000..64b450b5 --- /dev/null +++ b/src/views/ContainerManagement/SellCtn/columns.tsx @@ -0,0 +1,302 @@ +import { ref } from 'vue' +import { BasicColumn, FormSchema } from '/@/components/Table' +import { Tag } from 'ant-design-vue' +import { GetCtnSelectList, GetClientListByCode } from '/@/api/common' +import { GetDeptList } from '/@/views/operation/seaexport/api/BookingLedger' +import { useOptionsStore } from '/@/store/modules/options' +const optionsStore = useOptionsStore() +// 字典 +import { getDictOption } from '/@/utils/dictUtil' +// 新旧箱数据 +const usedStateList = [ + { + label: '', + value: '', + }, + { + label: 'used', + value: 'used', + }, + { + label: 'new', + value: 'new', + }, +] +// 业务类型字典 +const businessTypeDict = ref([]) +getDictOption('CM_BusinessType').then((res) => { + businessTypeDict.value = res +}) +// 租箱类型字典 +const rentTypeIdDict = ref([]) +getDictOption('CM_RentType').then((res) => { + rentTypeIdDict.value = res +}) + +export const columns: BasicColumn[] = [ + { + title: '卖箱业务编号', + dataIndex: 'billno', + sorter: true, + width: 150, + }, + { + title: '新箱主', + dataIndex: 'BuyContainerOwner', + sorter: true, + width: 200, + }, + { + title: '箱型箱量', + dataIndex: 'ctntotal', + sorter: true, + width: 200, + }, + { + title: '卖箱日期', + dataIndex: 'bsdate', + sorter: true, + width: 200, + }, + { + title: '已提箱', + dataIndex: 'pickupCtntotal', + sorter: true, + width: 200, + }, + { + title: '未提箱', + dataIndex: 'remainCtntotal', + sorter: true, + width: 200, + }, + { + title: '业务锁定', + dataIndex: 'isBusinessLocking', + sorter: true, + width: 200, + }, + { + title: '费用锁定', + dataIndex: 'isFeeLocking', + sorter: true, + width: 200, + }, + { + title: '应收费用状态', + dataIndex: 'arFeeStatusName', + sorter: true, + width: 150, + }, + { + title: '应付费用状态', + dataIndex: 'apFeeStatusName', + sorter: true, + width: 150, + }, + { + title: '应收开票状态', + dataIndex: 'arInvoiceStatusName', + sorter: true, + width: 150, + }, + { + title: '应付开票状态', + dataIndex: 'apInvoiceStatusName', + sorter: true, + width: 150, + }, + { + title: '备注', + dataIndex: 'remark', + sorter: true, + width: 200, + }, +] + +export const searchFormSchema: FormSchema[] = [ + { + field: 'billno', + label: '卖箱业务编号', + component: 'Input', + colProps: { span: 4 }, + }, + + { + field: 'bsdate', + label: '卖箱日期', + component: 'DatePicker', + colProps: { span: 4 }, + defaultValue: '', + componentProps: { + allowClear: true, + valueFormat: 'YYYY-MM-DD 00:00:00', + style: 'width:100%', + }, + }, + { + field: 'accdate', + label: '会计期间', + component: 'MonthPicker', + colProps: { span: 4 }, + defaultValue: '', + componentProps: { + showTime: true, + allowClear: true, + valueFormat: 'YYYY-MM', + format: 'YYYY-MM', + }, + }, +] +export const formSchema: FormSchema[] = [ + { + label: '', + field: 'id', + component: 'Input', + defaultValue: '', + show: false, + }, + { + label: '购箱单位Id', + field: 'BuyContainerOwnerId', + component: 'Input', + defaultValue: '', + show: false, + }, + { + field: 'BuyContainerOwner', + label: '购箱单位', + component: 'ApiSelect', + required: false, + dynamicDisabled: false, + colProps: { span: 6 }, + componentProps: ({ formModel }) => { + return { + allowClear: true, + showSearch: true, + api: GetClientListByCode, + params: { code: 'leasing' }, + labelField: 'pinYinCode', + showName: 'shortName', + valueField: 'shortName', + resultField: 'data', + immediate: false, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + onChange: (e, obj) => { + if (e && obj) { + formModel.BuyContainerOwnerId = obj.id + } + if (!e && !obj) { + formModel.BuyContainerOwnerId = '' + } + }, + } + }, + }, + { + field: 'bsdate', + label: '卖箱日期', + component: 'DatePicker', + colProps: { span: 6 }, + defaultValue: '', + componentProps: { + allowClear: true, + valueFormat: 'YYYY-MM-DD 00:00:00', + style: 'width:100%', + }, + }, + { + field: 'ctntotal', + label: '箱型箱量', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'accdate', + label: '会计期间', + component: 'MonthPicker', + colProps: { span: 6 }, + defaultValue: '', + componentProps: { + showTime: true, + allowClear: true, + valueFormat: 'YYYY-MM', + format: 'YYYY-MM', + }, + }, + { + field: 'isBusinessLocking', + label: '业务锁定', + component: 'Switch', + defaultValue: false, + colProps: { span: 6 }, + componentProps: { + checkedChildren: '是', + unCheckedChildren: '否', + }, + dynamicDisabled: ({}) => { + return true + }, + }, + { + field: 'isFeeLocking', + label: '费用锁定', + component: 'Switch', + defaultValue: false, + colProps: { span: 6 }, + componentProps: { + checkedChildren: '是', + unCheckedChildren: '否', + }, + dynamicDisabled: ({}) => { + return true + }, + }, + { + field: 'remark', + label: '备注', + component: 'Input', + colProps: { span: 24 }, + }, +] + +export const formSearchBoxSchema: FormSchema[] = [ + { + field: 'ctnReleaseNo', + label: '放箱单号', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'ctnall', + label: '箱型', + component: 'ApiSelect', + required: false, + dynamicDisabled: false, + colProps: { span: 6 }, + componentProps: () => { + return { + allowClear: true, + showSearch: true, + api: GetCtnSelectList, + params: { code: 'leasing' }, + labelField: 'ctnName', + showName: 'ctnName', + valueField: 'ctnName', + resultField: 'data', + immediate: false, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + } + }, + }, + { + field: 'cntrno', + label: '箱号', + component: 'Input', + colProps: { span: 10 }, + }, +] diff --git a/src/views/ContainerManagement/SellCtn/index.vue b/src/views/ContainerManagement/SellCtn/index.vue new file mode 100644 index 00000000..85e4e069 --- /dev/null +++ b/src/views/ContainerManagement/SellCtn/index.vue @@ -0,0 +1,167 @@ + + diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index a1f8a006..830a7170 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -1071,24 +1071,24 @@ export const formSchema: FormSchema[] = [ return !values.isOverdueDeduction }, }, - { - field: 'auditStatus', - label: '审批状态', - component: 'Input', - colProps: { span: 4 }, - defaultValue: -1, - show: false, - }, - { - field: 'auditStatusText', - label: '审批状态', - component: 'Input', - colProps: { span: 4 }, - defaultValue: '', - dynamicDisabled: ({}) => { - return true - }, - }, + // { + // field: 'auditStatus', + // label: '审批状态', + // component: 'Input', + // colProps: { span: 4 }, + // defaultValue: -1, + // show: false, + // }, + // { + // field: 'auditStatusText', + // label: '审批状态', + // component: 'Input', + // colProps: { span: 4 }, + // defaultValue: '', + // dynamicDisabled: ({}) => { + // return true + // }, + // }, // { // field: 'status', // label: '是否可用', diff --git a/src/views/baseinfo/infoclient/customerParams/index.vue b/src/views/baseinfo/infoclient/customerParams/index.vue index 3992142e..c863dad6 100644 --- a/src/views/baseinfo/infoclient/customerParams/index.vue +++ b/src/views/baseinfo/infoclient/customerParams/index.vue @@ -58,6 +58,7 @@ }) const [registerTable, { reload, getForm, getPaginationRef }] = useTable({ title: '客户参数列表', + maxHeight: 250, api: async (p) => { const res: API.DataResult = await GetClientParamList(p) return new Promise((resolve) => { diff --git a/src/views/baseinfo/issuetype/index.vue b/src/views/baseinfo/issuetype/index.vue index dc804041..fee22f30 100644 --- a/src/views/baseinfo/issuetype/index.vue +++ b/src/views/baseinfo/issuetype/index.vue @@ -129,14 +129,14 @@ width: 60, }, canResize: true, - resizeHeightOffset: 35, + resizeHeightOffset: 15, immediate: true, actionColumn: { width: 80, title: '操作', dataIndex: 'action', - fixed: 'right', - }, + fixed: 'right' + } }) function handleDel() { const select = getSelectRows() diff --git a/src/views/baseinfo/shipping/columns.tsx b/src/views/baseinfo/shipping/columns.tsx index e29ddc3f..8bffee0a 100644 --- a/src/views/baseinfo/shipping/columns.tsx +++ b/src/views/baseinfo/shipping/columns.tsx @@ -1,5 +1,5 @@ /* - * @Description: 场站映射tsx + * @Description: 合作伙伴-船公司tsx * @Author: lijj * @Date: 2024-04-25 15:48:33 */ @@ -46,13 +46,19 @@ export const searchFormSchema: FormSchema[] = [ { field: 'cnName', label: '中文名称', - colProps: { span: 6 }, + colProps: { span: 4}, + component: 'Input' + }, + { + field: 'enName', + label: '英文名称', + colProps: { span: 4}, component: 'Input' }, { field: 'ediCode', label: 'EDI代码', - colProps: { span: 6 }, + colProps: { span: 4 }, component: 'Input' } ] diff --git a/src/views/baseinfo/shipping/index.vue b/src/views/baseinfo/shipping/index.vue index d5037612..fbcc2e3c 100644 --- a/src/views/baseinfo/shipping/index.vue +++ b/src/views/baseinfo/shipping/index.vue @@ -1,3 +1,8 @@ +