From 7e4f1378bcfa175e174387102bdb4dbd5ea4037e Mon Sep 17 00:00:00 2001 From: lijingjia Date: Fri, 25 Oct 2024 16:41:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=88=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CostEntry/feeTable.vue | 3 + src/components/Print/index.vue | 2 +- src/design/public.less | 1 + src/views/operation/seaexport/columns.tsx | 65 +++++++++++-------- .../operation/seaexport/detail/index.vue | 6 +- .../modules/Letter/OpBusinessYardColumns.tsx | 11 +--- .../seaexport/detail/modules/baseInfo.tsx | 2 +- .../detail/modules/operationArea.vue | 2 + .../seaexport/detail/modules/preOrder.tsx | 4 +- src/views/operation/seaexport/index.vue | 7 +- 10 files changed, 59 insertions(+), 44 deletions(-) diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue index 91eb43c5..851a3afa 100644 --- a/src/components/CostEntry/feeTable.vue +++ b/src/components/CostEntry/feeTable.vue @@ -670,6 +670,9 @@ }) if (item) dict = item[0] list.value[changes[0][0]]['unit'] = dict?.value + if (changes[0][3].indexOf('-') > -1) { + changes[0][3] = changes[0][3].split('-')[0] + } list.value[changes[0][0]]['unitText'] = changes[0][3] if (dict && dict?.value && dict.isCtn) { // 箱型带出指定的箱量 diff --git a/src/components/Print/index.vue b/src/components/Print/index.vue index b3a20a6a..7823c76a 100644 --- a/src/components/Print/index.vue +++ b/src/components/Print/index.vue @@ -233,7 +233,7 @@ }) GetPrintInfo({ businessType: 1, ids, id: props.bookingData.id, value: 'ProfitAccountingReport' }).then(res => { const postData = { - jsonDataStr: JSON.stringify(res.data.details) || '', + jsonDataStr: JSON.stringify(res.data) || '', printType: type, templateId: item.id } diff --git a/src/design/public.less b/src/design/public.less index c0461ff4..4d8050f9 100644 --- a/src/design/public.less +++ b/src/design/public.less @@ -202,6 +202,7 @@ h5 { .YFD, .YFC, .YSDBC, +.WTJ, .YDC { padding: 4px 13px; border-radius: 30px; diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx index 9109ee33..30a409b8 100644 --- a/src/views/operation/seaexport/columns.tsx +++ b/src/views/operation/seaexport/columns.tsx @@ -6,7 +6,7 @@ import { ref } from 'vue' import { BasicColumn, FormSchema } from '/@/components/Table' // 下拉框数据接口 -import { GetClientListByCode, GetCarrierSelectList } from '/@/api/common' +import { GetClientListByCode, GetCarrierSelectList, GetSupplierListByCode } from '/@/api/common' // 接口 import { GetControllerClientList, @@ -116,6 +116,17 @@ export const searchFormSchema: FormSchema[] = [ allowClear: true, }, }, + { + field: 'closeDocDate', + label: '截单时间', + component: 'RangePicker', + required: false, + dynamicDisabled: false, + colProps: { span: 4 }, + componentProps: { + allowClear: true, + }, + }, { label: '操作', field: 'operatorId', @@ -512,12 +523,12 @@ export const columns: BasicColumn[] = [ { dataIndex: 'lstDraftCompareRlt', title: '格式单比对', - width: 120, + width: 100, }, { dataIndex: 'lstShipOrderCompareRlt', title: '下货纸比对', - width: 120, + width: 100, }, { dataIndex: 'arFeeStatus', @@ -565,7 +576,7 @@ export const columns: BasicColumn[] = [ value: '9', }, ], - width: 120, + width: 100, }, { dataIndex: 'apFeeStatus', @@ -613,36 +624,36 @@ export const columns: BasicColumn[] = [ value: '9', }, ], - width: 120, + width: 100, }, { dataIndex: 'arInvoiceStatus', title: '应收开票', sorter: true, - width: 120, + width: 100, }, { dataIndex: 'apInvoiceStatus', title: '应付开票', sorter: true, - width: 120, + width: 100, }, { dataIndex: 'arCheckStatus', title: '应收对账', sorter: true, - width: 120, + width: 100, }, { dataIndex: 'isBusinessLocking', title: '业务锁定', sorter: true, - width: 100 + width: 80 }, { dataIndex: 'isFeeLocking', title: '费用锁定', - width: 100, + width: 80, sorter: true }, { @@ -688,7 +699,7 @@ export const columns: BasicColumn[] = [ width: 130, }, { - title: '截单日期', + title: '截单时间', sorter: true, dataIndex: 'closeDocDate', width: 90, @@ -703,25 +714,25 @@ export const columns: BasicColumn[] = [ title: '中转港', dataIndex: 'transport', sorter: true, - width: 130, + width: 120, }, { dataIndex: 'yard', title: '场站', sorter: true, - width: 130 + width: 120 }, { dataIndex: 'customser', title: '报关行', sorter: true, - width: 130 + width: 120 }, { dataIndex: 'trucker', title: '承运车队', sorter: true, - width: 130 + width: 120 }, // { // dataIndex: 'termDelivery', @@ -739,31 +750,31 @@ export const columns: BasicColumn[] = [ dataIndex: 'shipper', title: '发货人', sorter: true, - width: 150 + width: 120 }, { dataIndex: 'consignee', title: '收货人', sorter: true, - width: 150 + width: 120 }, { dataIndex: 'notifyParty', title: '通知人', - width: 150, + width: 120, sorter: true }, { title: '收货地', dataIndex: 'receiptPlace', sorter: true, - width: 150, + width: 120, }, { dataIndex: 'kindPkgsName', title: '包装', sorter: true, - width: 150 + width: 120 }, { title: '件数', @@ -787,7 +798,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'marks', title: `唛头`, sorter: true, - width: 100, + width: 80, }, { dataIndex: 'description', @@ -840,13 +851,13 @@ export const columns: BasicColumn[] = [ title: '签单地点', sorter: true, dataIndex: 'issuePlace', - width: 150, + width: 120, }, { dataIndex: 'noBill', sorter: true, title: '提单份数', - width: 150, + width: 80, customRender: ({ record }) => { let name = '' FnnoBill.value.some((item) => { @@ -862,7 +873,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'copyNoBill', title: '副本份数', sorter: true, - width: 150, + width: 80, customRender: ({ record }) => { let name = '' FncopyNoBill.value.some((item) => { @@ -878,13 +889,13 @@ export const columns: BasicColumn[] = [ dataIndex: 'mblFrt', title: '付费方式', sorter: true, - width: 150 + width: 100 }, { dataIndex: 'prepareAt', title: '预付地点', sorter: true, - width: 150 + width: 120 }, { dataIndex: 'note', @@ -1199,7 +1210,7 @@ export const BatchModificationFormSchema: FormSchema[] = [ colProps: { span: 4 }, componentProps: () => { return { - api: GetCustomClientList, + api: GetSupplierListByCode, labelField: 'shortName', valueField: 'id', resultField: 'data', diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue index 30ea4b26..c678d578 100644 --- a/src/views/operation/seaexport/detail/index.vue +++ b/src/views/operation/seaexport/detail/index.vue @@ -99,12 +99,12 @@ rejectText="驳回任务" :approve="approveDc" :source="source" - :status="route.query.status == 'WAIT_SI' ? 'WAIT_SI' : undefined" + :status="route.query.status == 'WAIT_SI' ? 'WAIT_SI' : (route.query.status == 'RETURN_CABIN_AUDIT' ? 'RETURN_CABIN_AUDIT' : undefined)" :id="id" businessType="1" > - + {{ completeText }} @@ -1152,7 +1152,7 @@ // } // // cvisible.value = false // } - // 订舱审核 + // 审核***(审单、SI、退舱) const approveDc = async (remark) => { if (!remark) { // 审批通过判断是否是最后一个审批人 diff --git a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx index 79e2962c..ed025ef5 100644 --- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx +++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx @@ -2,7 +2,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table' import Space from '/@/views/operation/seaexport/components/Space.vue' import { useComponentRegister } from '/@/components/Form' // 下拉框数据接口 -import { GetClientListByCode } from '/@/api/common' +import { GetClientListByCode, GetSupplierListByCode } from '/@/api/common' import { t } from '/@/hooks/web/useI18n' useComponentRegister('Space', Space) export const columns: BasicColumn[] = [ @@ -436,7 +436,7 @@ export const formSchema: FormSchema[] = [ colProps: { span: 8 }, componentProps: ({ formModel }) => { return { - api: GetClientListByCode, + api: GetSupplierListByCode, params: { code: 'yard' }, labelField: 'pinYinCode', showName: 'shortName', @@ -468,13 +468,6 @@ export const formSchema: FormSchema[] = [ field: 'yardTel', component: 'Input', defaultValue: null, - rules: [ - { - pattern: /^1\d{10}$/, - message: '请输入正确格式的手机号', - trigger: 'blur', - }, - ], colProps: { span: 8 } diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx index fd1418a8..026bc227 100644 --- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx +++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx @@ -2828,7 +2828,7 @@ export const otherInfoFormSchema: FormSchema[] = [ componentProps: ({ formModel }) => { return { api: GetSupplierListByCode, - params: { code: 'isShipAgency' }, + params: { code: 'shipagency' }, labelField: 'pinYinCode', showName: 'description', valueField: 'shortName', diff --git a/src/views/operation/seaexport/detail/modules/operationArea.vue b/src/views/operation/seaexport/detail/modules/operationArea.vue index 389b4209..59a2930d 100644 --- a/src/views/operation/seaexport/detail/modules/operationArea.vue +++ b/src/views/operation/seaexport/detail/modules/operationArea.vue @@ -1683,6 +1683,8 @@ console.log('Cancel') } }) + } else { + createMessage.success(res.message) } }).catch(() => { cabinLoad.value = false diff --git a/src/views/operation/seaexport/detail/modules/preOrder.tsx b/src/views/operation/seaexport/detail/modules/preOrder.tsx index 2ddeab30..e0ab1ee1 100644 --- a/src/views/operation/seaexport/detail/modules/preOrder.tsx +++ b/src/views/operation/seaexport/detail/modules/preOrder.tsx @@ -9,7 +9,7 @@ import { GetVoynoSelectList, GetVesselSelectList, } from '/@/views/operation/seaexport/api/BookingLedger' -import { GetClientListByCode, GetCarrierSelectList } from '/@/api/common' +import { GetClientListByCode, GetCarrierSelectList, GetSupplierListByCode } from '/@/api/common' import { pl } from 'element-plus/es/locales.mjs' let countryList = [] // 基础信息表单 @@ -616,7 +616,7 @@ export const yardSchema: FormSchema[] = [ colProps: { span: 12 }, componentProps: ({ formModel }) => { return { - api: GetClientListByCode, + api: GetSupplierListByCode, params: { code: 'yard' }, labelField: 'pinYinCode', placeholder: '场站', diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue index 0c50b0ce..0ab1bde3 100644 --- a/src/views/operation/seaexport/index.vue +++ b/src/views/operation/seaexport/index.vue @@ -18,7 +18,7 @@ {{ record.businessStatusName }} {{ record.businessStatusName }} {{ record.businessStatusName }} - {{ record.businessStatusName }} + {{ record.businessStatusName || '未提交' }}