From e4659d3639e1de224244b74b6579fed384aa1e22 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: Thu, 15 Aug 2024 17:30:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E7=AE=B1=E6=9C=88=E7=BB=93=E8=B4=A6?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustFeeDui/TenantAuditStepModal.vue | 83 ++++++++++++++----- .../CustFeeDui/columns.tsx | 78 ++++++++++------- 2 files changed, 109 insertions(+), 52 deletions(-) diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue index 4875ff62..8ef4eb4d 100644 --- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue @@ -43,7 +43,7 @@
- +
重置 { + queryCondition.push(item) + }) + } ApiDetailView({ - queryCondition, + queryCondition: JSON.stringify(queryCondition), pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] }, }).then((res) => { Viewlist.value.splice(0) @@ -245,7 +294,6 @@ list.value.splice(0) let Arr = ['pickupDate', 'dropoffDate', 'feeStartDate', 'bsdate'] res.data.forEach((item) => { - console.log(item) Arr.forEach((e) => { if (item[e]) { item[e] = item[e].split(' ')[0] @@ -579,6 +627,8 @@ } } //--------------------------------------- tab1 View --------------------------------------- + const disabledDate = ref(['2024/08/10', '2024/08/20']) + const [ registerSearchBoxForm, { resetFields: resetSearchBoxFields, validate: validateSearchBox }, @@ -785,15 +835,10 @@ Object.keys(values).forEach((item) => { if (values[item]) { console.log(values[item].split(',')) - - if (item == 'cntrno') { - ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 15 }) - } else { - ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 1 }) - } + ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 5 }) } }) - GetViewListDetail(JSON.stringify(ApiData)) + GetViewListDetail(ApiData, null) } function ViewTableAdd() { let ApiData: any = { id: rowId.value, ids: [] } @@ -814,9 +859,7 @@ ViewlsomeCheck.value = false GetListDetail() resetSearchBoxFields() - GetViewListDetail( - `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`, - ) + GetViewListDetail(null, null) } // getData(false) notification.success({ message: res.message, duration: 3 }) diff --git a/src/views/ContainerManagement/CustFeeDui/columns.tsx b/src/views/ContainerManagement/CustFeeDui/columns.tsx index 82855ee1..e8268c7b 100644 --- a/src/views/ContainerManagement/CustFeeDui/columns.tsx +++ b/src/views/ContainerManagement/CustFeeDui/columns.tsx @@ -1,6 +1,7 @@ import { ref } from 'vue' import { BasicColumn, FormSchema } from '/@/components/Table' import { Tag } from 'ant-design-vue' +import dayjs from 'dayjs' import { GetCtnSelectList, GetClientListByCode } from '/@/api/common' import { GetDeptList } from '/@/views/operation/seaexport/api/BookingLedger' import { useOptionsStore } from '/@/store/modules/options' @@ -24,6 +25,7 @@ const usedStateList = [ value: 'new', }, ] +const billEndDate = ref() // 业务类型字典 const businessTypeDict = ref([]) getDictOption('CM_BusinessType').then((res) => { @@ -101,8 +103,26 @@ export const columns: BasicColumn[] = [ }, }, { - title: '费用状态？？', - dataIndex: 'billno', + 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, }, @@ -276,12 +296,27 @@ export const formSchema: FormSchema[] = [ colProps: { span: 6 }, defaultValue: '', required: true, - componentProps: { - showTime: false, - allowClear: true, - valueFormat: 'YYYY-MM-DD', - format: 'YYYY-MM-DD', - style: 'width:100%', + + componentProps: ({ formModel }) => { + return { + showTime: false, + allowClear: true, + valueFormat: 'YYYY-MM-DD', + format: 'YYYY-MM-DD', + style: 'width:100%', + onChange: (e, obj) => { + if (e && obj) { + setTimeout(() => { + billEndDate.value = formModel.billEndDate + }, 100) + } + if (!obj && !e) { + setTimeout(() => { + billEndDate.value = '' + }, 100) + } + }, + } }, }, { @@ -344,30 +379,6 @@ export const formSchema: FormSchema[] = [ ] export const formSearchBoxSchema: FormSchema[] = [ - { - field: 'ctnBizstateId', - label: '业务信息', - component: 'ApiSelect', - required: 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: 'feestartdate', label: '按日明细', @@ -380,6 +391,9 @@ export const formSearchBoxSchema: FormSchema[] = [ valueFormat: 'YYYY-MM-DD', format: 'YYYY-MM-DD', style: 'width:100%', + disabledDate: (current) => { + return current && current <= dayjs(billEndDate.value).subtract(0, 'day') + }, }, }, ]