diff --git a/src/locales/lang/en/common.ts b/src/locales/lang/en/common.ts index 79b5db51..83580cbe 100644 --- a/src/locales/lang/en/common.ts +++ b/src/locales/lang/en/common.ts @@ -4,6 +4,7 @@ export default { cancelText: 'Cancel', loadingText: 'Loading...', saveText: 'Save', + addText: 'Add', delText: 'Delete', resetText: 'Reset', editText: 'Edit', diff --git a/src/locales/lang/zh-CN/common.ts b/src/locales/lang/zh-CN/common.ts index fd2ced50..60cef184 100644 --- a/src/locales/lang/zh-CN/common.ts +++ b/src/locales/lang/zh-CN/common.ts @@ -4,6 +4,7 @@ export default { cancelText: '取消', loadingText: '加载中...', saveText: '保存', + addText: '新建', delText: '删除', resetText: '重置', editText: '编辑', diff --git a/src/views/baseinfo/accountMaintenance/components/Modal.vue b/src/views/baseinfo/accountMaintenance/components/Modal.vue index b5fc6e8b..3873dcce 100644 --- a/src/views/baseinfo/accountMaintenance/components/Modal.vue +++ b/src/views/baseinfo/accountMaintenance/components/Modal.vue @@ -57,30 +57,32 @@ showActionButtonGroup: false, }) - const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner(async (data) => { - resetFields() - setModalProps({ confirmLoading: false, loading: true }) - isUpdate.value = !!data?.isUpdate - if (unref(isUpdate)) { - // setModalProps({ confirmLoading: true }); - rowId.value = data.record.id - updateFormField(updateSchema) - const res: API.DataResult = await ApiInfo({ id: unref(rowId) }) - if (res.succeeded) { - setFieldsValue({ - ...res.data, - }) - // console.log('返回数据Form', getFieldsValue()); - // setFieldsValue({ trainId: unref(res.data.trainId) }); + const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner( + async (data) => { + resetFields() + setModalProps({ confirmLoading: false, loading: true }) + isUpdate.value = !!data?.isUpdate + if (unref(isUpdate)) { + // setModalProps({ confirmLoading: true }); + rowId.value = data.record.id + updateFormField(updateSchema) + const res: API.DataResult = await ApiInfo({ id: unref(rowId) }) + if (res.succeeded) { + setFieldsValue({ + ...res.data, + }) + // console.log('返回数据Form', getFieldsValue()); + // setFieldsValue({ trainId: unref(res.data.trainId) }); + } + // setModalProps({ confirmLoading: false }); + } else { + setFieldsValue({ permissionIdentity: unref(2) }) } - // setModalProps({ confirmLoading: false }); - } else { - setFieldsValue({ permissionIdentity: unref(2) }) - } - setModalProps({ loading: false }) - }) + setModalProps({ loading: false }) + }, + ) - const getTitle = computed(() => (!unref(isUpdate) ? '新增集装箱信息' : '编辑集装箱信息')) + const getTitle = computed(() => (!unref(isUpdate) ? '新增第三方账户' : '编辑第三方账户')) async function handleSave(exit) { try { diff --git a/src/views/finance/businessLocking/api.ts b/src/views/finance/businessLocking/api.ts new file mode 100644 index 00000000..c5693ffc --- /dev/null +++ b/src/views/finance/businessLocking/api.ts @@ -0,0 +1,56 @@ +// @ts-ignore +import { request } from '/@/utils/request' +import { DataResult, PageRequest } from '/@/api/model/baseModel' +enum Api { + list = '/financeApi/BusinessLocking/GetBusinessLockingList', + + BLocking = '/financeApi/BusinessLocking/BusinessLocking', + BUnLocking = '/financeApi/BusinessLocking/BusinessUnLocking', + + FLocking = '/financeApi/BusinessLocking/FeeLocking', + FUnLocking = '/financeApi/BusinessLocking/FeeUnLocking', +} +// 列表 (Auth) +export function ApiList(data: PageRequest) { + return request({ + url: Api.list, + method: 'post', + data, + }) +} + +// 业务锁定 (Auth) +export function ApiBLocking(data: PageRequest) { + return request({ + url: Api.BLocking, + method: 'post', + data, + }) +} + +// 业务解除锁定 (Auth) +export function ApiBUnLocking(data: PageRequest) { + return request({ + url: Api.BUnLocking, + method: 'post', + data, + }) +} + +// 费用锁定 (Auth) +export function ApiFLocking(data: PageRequest) { + return request({ + url: Api.FLocking, + method: 'post', + data, + }) +} + +// 费用解除锁定 (Auth) +export function ApiFUnLocking(data: PageRequest) { + return request({ + url: Api.FUnLocking, + method: 'post', + data, + }) +} \ No newline at end of file diff --git a/src/views/finance/businessLocking/columns.tsx b/src/views/finance/businessLocking/columns.tsx new file mode 100644 index 00000000..652769bc --- /dev/null +++ b/src/views/finance/businessLocking/columns.tsx @@ -0,0 +1,487 @@ +import { BasicColumn, FormSchema } from '/@/components/Table' +import { Tag } from 'ant-design-vue' +export const columns: BasicColumn[] = [ + { + title: '主提单号', + dataIndex: 'mblno', + sorter: true, + width: 150, + }, + { + title: '是否业务锁定', + dataIndex: 'isBusinessLocking', + sorter: true, + width: 150, + customRender: ({ text }) => { + if (text) { + return + } else { + return + } + return text + }, + }, + { + title: '是否费用锁定', + dataIndex: 'isFeeLocking', + sorter: true, + width: 150, + customRender: ({ text }) => { + if (text) { + return + } else { + return + } + return text + }, + }, + { + title: '单据类型', + dataIndex: 'businessTypeName', + sorter: true, + width: 150, + }, + { + title: '业务状态', + dataIndex: 'businessStatus', + sorter: true, + width: 150, + }, + + { + title: '分提单号', + dataIndex: 'hblno', + sorter: true, + width: 150, + }, + { + title: '委托编号', + dataIndex: 'customerNo', + sorter: true, + width: 150, + }, + { + title: '委托单位', + dataIndex: 'customerName', + sorter: true, + width: 150, + }, + { + title: '装运方式', + dataIndex: 'blType', + sorter: true, + width: 150, + }, + { + title: '场站', + dataIndex: 'yard', + sorter: true, + width: 150, + }, + { + title: '船名', + dataIndex: 'vessel', + sorter: true, + width: 150, + }, + { + title: '航次', + dataIndex: 'voyno', + sorter: true, + width: 150, + }, + { + title: '开船日期', + dataIndex: 'etd', + sorter: true, + width: 150, + }, + { + title: '预抵日期', + dataIndex: 'eta', + sorter: true, + width: 150, + }, + { + title: 'ATD', + dataIndex: 'atd', + sorter: true, + width: 150, + }, + { + title: 'ATA', + dataIndex: 'ata', + sorter: true, + width: 150, + }, + { + title: '截港日期', + dataIndex: 'closingDate', + sorter: true, + width: 150, + }, + { + title: '收货地', + dataIndex: 'receiptPlace', + sorter: true, + width: 150, + }, + { + title: '装货港', + dataIndex: 'loadPort', + sorter: true, + width: 150, + }, + { + title: '卸货港', + dataIndex: 'dischargePort', + sorter: true, + width: 150, + }, + { + title: '目的地', + dataIndex: 'destination', + sorter: true, + width: 150, + }, + { + title: '签单方式', + dataIndex: 'issueType', + sorter: true, + width: 150, + }, + { + title: '运输条款 ', + dataIndex: 'service', + sorter: true, + width: 150, + }, + { + title: '箱号封号', + dataIndex: 'cntrSealNo', + sorter: true, + width: 150, + }, + { + title: '品名', + dataIndex: 'goodsName', + sorter: true, + width: 150, + }, + { + title: '件数', + dataIndex: 'pkgs', + sorter: true, + width: 150, + }, + { + title: '包装', + dataIndex: 'kindPkgs', + sorter: true, + width: 150, + }, + { + title: '毛重', + dataIndex: 'kgs', + sorter: true, + width: 150, + }, + { + title: '尺码', + dataIndex: 'cbm', + sorter: true, + width: 150, + }, + { + title: '箱TEU', + dataIndex: 'teu', + sorter: true, + width: 150, + }, + { + title: '集装箱', + dataIndex: 'cntrTotal', + sorter: true, + width: 150, + }, + { + title: '客服', + dataIndex: 'customerService', + sorter: true, + width: 150, + }, + { + title: '外国客服', + dataIndex: 'foreignCustomerService', + sorter: true, + width: 150, + }, + { + title: '航线', + dataIndex: 'lane', + sorter: true, + width: 150, + }, + { + title: '揽货人', + dataIndex: 'sale', + sorter: true, + width: 150, + }, + { + title: '船公司', + dataIndex: 'carrier', + sorter: true, + width: 150, + }, + { + title: '货代公司', + dataIndex: 'forwarder', + sorter: true, + width: 150, + }, + { + title: '承运车队', + dataIndex: 'trucker', + sorter: true, + width: 150, + }, + { + title: '发票号', + dataIndex: 'invoiceNo', + sorter: true, + width: 150, + }, + { + title: '危险品分类', + dataIndex: 'dangerClass', + sorter: true, + width: 150, + }, + { + title: '报关票数', + dataIndex: 'customsNum', + sorter: true, + width: 150, + }, + { + title: '运费协议号', + dataIndex: 'contractNo', + sorter: true, + width: 150, + }, + { + title: '订舱编号', + dataIndex: 'bookingNo', + sorter: true, + width: 150, + }, + { + title: '是否生成凭证', + dataIndex: 'isVoucher', + sorter: true, + width: 150, + }, + { + title: '凭证号', + dataIndex: 'voucherNo', + sorter: true, + width: 150, + }, + { + title: '备注', + dataIndex: 'remark', + sorter: true, + width: 150, + }, + { + title: '单证', + dataIndex: 'doc', + sorter: true, + width: 150, + }, + { + title: '截单日期', + dataIndex: 'closeDocDate', + sorter: true, + width: 150, + }, + { + title: 'MBL付费方式', + dataIndex: 'mblFrt', + sorter: true, + width: 150, + }, + { + title: '结算方式', + dataIndex: 'stlName', + sorter: true, + width: 150, + }, + { + title: '月结算时间', + dataIndex: 'stlDate', + sorter: true, + width: 150, + }, + { + title: '订舱编号', + dataIndex: 'orderNo', + sorter: true, + width: 150, + }, + { + title: '服务合同号', + dataIndex: 'serviceContractNo', + sorter: true, + width: 150, + }, + { + title: '申请放箱号', + dataIndex: 'applyNo', + sorter: true, + width: 150, + }, + { + title: '报关单号', + dataIndex: 'customNo', + sorter: true, + width: 150, + }, + { + title: '商检单号', + dataIndex: 'inspectionNo', + sorter: true, + width: 150, + }, + { + title: '商检日期', + dataIndex: 'inspectionDate', + sorter: true, + width: 150, + }, + { + title: '贸易条款', + dataIndex: 'tradeTerm', + sorter: true, + width: 150, + }, + { + title: '船代', + dataIndex: 'shipAgency', + sorter: true, + width: 150, + }, + { + title: '是否打印小票', + dataIndex: 'isPrintReceipt', + sorter: true, + width: 150, + }, + { + title: '交货日期', + dataIndex: 'deliveryDate', + sorter: true, + width: 150, + }, + { + title: '创建时间', + dataIndex: 'createTime', + sorter: true, + width: 150, + }, + { + title: '销售人', + dataIndex: 'saleName', + sorter: true, + width: 150, + }, + { + title: '操作人员', + dataIndex: 'operatorName', + sorter: true, + width: 150, + }, + { + title: '应收开票状态', + dataIndex: 'arInvoiceStatus', + sorter: true, + width: 150, + }, + { + title: '应付开票状态', + dataIndex: 'apInvoiceStatus', + sorter: true, + width: 150, + }, + { + title: '应收对账状态', + dataIndex: 'arCheckStatus', + sorter: true, + width: 150, + }, + + { + title: '整单费用状态时间', + dataIndex: 'billFeeStatusTime', + sorter: true, + width: 150, + }, + { + title: '业务锁定人', + dataIndex: 'businessLockingUserName', + sorter: true, + width: 150, + }, + { + title: '业务锁定时间', + dataIndex: 'businessLockingTime', + sorter: true, + width: 150, + }, + { + title: '业务解锁人', + dataIndex: 'businessUnLockingUserName', + sorter: true, + width: 150, + }, + { + title: '业务解锁时间', + dataIndex: 'businessUnLockingTime', + sorter: true, + width: 150, + }, + { + title: '费用锁定人', + dataIndex: 'feeLockingUserName', + sorter: true, + width: 150, + }, + { + title: '费用锁定时间', + dataIndex: 'feeLockingTime', + sorter: true, + width: 150, + }, + { + title: '用解锁人', + dataIndex: 'feeUnLockingUserName', + sorter: true, + width: 150, + }, + { + title: '费用解锁时间', + dataIndex: 'feeUnLockingTime', + sorter: true, + width: 150, + }, +] + +export const searchFormSchema: FormSchema[] = [ + { + field: 'mblno', + label: '主提单号', + component: 'Input', + colProps: { span: 6 }, + }, +] diff --git a/src/views/finance/businessLocking/index.vue b/src/views/finance/businessLocking/index.vue new file mode 100644 index 00000000..6af0b63f --- /dev/null +++ b/src/views/finance/businessLocking/index.vue @@ -0,0 +1,160 @@ + + diff --git a/src/views/operation/autoduizang/TenantAuditStepModal.vue b/src/views/operation/autoduizang/TenantAuditStepModal.vue index 79920bfc..a7e4eb13 100644 --- a/src/views/operation/autoduizang/TenantAuditStepModal.vue +++ b/src/views/operation/autoduizang/TenantAuditStepModal.vue @@ -24,18 +24,29 @@ 导入对账excel - - 删除明细 - - 重新匹配 - 生成对账单 - 生成付费申请 + + + 删除明细 + + + + 重新匹配 + + + 生成对账单 + + + 取消对账单 + +