diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx index e92381d0..39c2b401 100644 --- a/src/views/ContainerManagement/CurrentState/columns.tsx +++ b/src/views/ContainerManagement/CurrentState/columns.tsx @@ -153,8 +153,8 @@ export const columns: BasicColumn[] = [ width: 200, }, { - title: '生产日期？？', - dataIndex: '', + title: '生产日期', + dataIndex: 'productionDate', sorter: true, width: 200, }, diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue index 4875ff62..06e5a3a0 100644 --- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue @@ -43,7 +43,7 @@
- +
重置 保存并关闭 + + 生成费用 + @@ -178,7 +187,7 @@ const loading = ref(false) const rowId = ref('') const height = ref(300) - const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({ + const [registerForm, { resetFields, setFieldsValue, getFieldsValue, validate }] = useForm({ labelWidth: 100, schemas: formSchema, showActionButtonGroup: false, @@ -192,6 +201,7 @@ Viewlist.value.splice(0) list.value.splice(0) + if (unref(isUpdate)) { // setModalProps({ confirmLoading: true }); rowId.value = data.record.id @@ -199,8 +209,6 @@ if (res.succeeded) { allCheck.value = false someCheck.value = false - console.log(res.data) - setFieldsValue({ ...res.data, }) @@ -209,19 +217,69 @@ ViewlallCheck.value = false ViewlsomeCheck.value = false resetSearchBoxFields() - GetViewListDetail( - `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`, - ) + GetViewListDetail(null, res.data) } } else { + setFieldsValue({}) rowId.value = '' } + setModalProps({ loading: false }) }) - function GetViewListDetail(queryCondition) { + function GetViewListDetail(data, resData) { + console.log(data, resData) + + let queryCondition: any = [] + + if (getFieldsValue().customerId || resData.customerId) { + queryCondition.push({ + ConditionalList: [ + { + Key: 0, + Value: { + FieldName: 'oldContainerOwnerId', + FieldValue: getFieldsValue().customerId || resData.customerId, + ConditionalType: 0, + }, + }, + { + Key: 1, + Value: { + FieldName: 'rentCustomerId', + FieldValue: getFieldsValue().customerId || resData.customerId, + ConditionalType: 0, + }, + }, + ], + }) + } + if (getFieldsValue().billStartDate || resData.billStartDate) { + queryCondition.push({ + ConditionalList: [ + { + Key: 0, + Value: { FieldName: 'dropoffdate', FieldValue: 'null', ConditionalType: 0 }, + }, + { + Key: 1, + Value: { + FieldName: 'dropoffdate', + FieldValue: getFieldsValue().billStartDate || resData.billStartDate, + ConditionalType: 3, + }, + }, + ], + }) + } + + if (data) { + data.forEach((item) => { + queryCondition.push(item) + }) + } ApiDetailView({ - queryCondition, + queryCondition: JSON.stringify(queryCondition), pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] }, }).then((res) => { Viewlist.value.splice(0) @@ -245,7 +303,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] @@ -255,6 +312,11 @@ }) }) } + function MakeFee() { + ApiMakeFee({ id: rowId.value }).then((res) => { + notification.success({ message: res.message, duration: 3 }) + }) + } async function handleSave(exit) { try { const values = await validate() @@ -579,6 +641,8 @@ } } //--------------------------------------- tab1 View --------------------------------------- + const disabledDate = ref(['2024/08/10', '2024/08/20']) + const [ registerSearchBoxForm, { resetFields: resetSearchBoxFields, validate: validateSearchBox }, @@ -785,15 +849,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 +873,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/api.ts b/src/views/ContainerManagement/CustFeeDui/api.ts index 25f2ae53..d0dde988 100644 --- a/src/views/ContainerManagement/CustFeeDui/api.ts +++ b/src/views/ContainerManagement/CustFeeDui/api.ts @@ -13,7 +13,7 @@ enum Api { // Confirm = '/containerManagementApi/CM_RentIn/CM_RentIn_Confirm', // Cancel = '/containerManagementApi/CM_RentIn/CM_RentIn_Cancel', - // MakeFee = '/containerManagementApi/CM_RentIn/CM_RentIn_MakeFee', + MakeFee = '/containerManagementApi/CM_CustFeeDui/CM_CustFeeDui_MakeFee', DetailView = '/containerManagementApi/CM_CustFeeDui/GetVW_CM_FeeBase_Detail', AddCtn = '/containerManagementApi/CM_CustFeeDui/AddVW_CM_FeeBase_Detail', 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') + }, }, }, ] diff --git a/src/views/ContainerManagement/dsxxcl/api.ts b/src/views/ContainerManagement/dsxxcl/api.ts index d2747be8..0189a306 100644 --- a/src/views/ContainerManagement/dsxxcl/api.ts +++ b/src/views/ContainerManagement/dsxxcl/api.ts @@ -2,7 +2,8 @@ import { request } from '/@/utils/request' import { DataResult, PageRequest } from '/@/api/model/baseModel' enum Api { - list = '/containerManagementApi/CM_State_Change/GetCM_State_ChangeList', + list = '/containerManagementApi/CM_CurrentState/GetCM_CurrentStateList', + Changelist = '/containerManagementApi/CM_State_Change/GetCM_State_ChangeList', edit = '/containerManagementApi/CM_State_Change/EditCM_State_Change', multiEdit = '/containerManagementApi/CM_State_Change/CM_State_Change_Multi', Changeinfo = '/containerManagementApi/CM_State_Change/GetCM_State_Change', @@ -16,6 +17,14 @@ enum Api { ExistList = '/mainApi/CodeCtn/GetExistCodeCtnList', Import = '/mainApi/CodeCtn/ImportCodeCtn', } +// 列表 (Auth) +export function ApiList(data: PageRequest) { + return request({ + url: Api.list, + method: 'post', + data, + }) +} // 批量上线 (Auth) export function ApiOnLine(data: PageRequest) { return request({ @@ -35,7 +44,7 @@ export function ApiOffLine(data: PageRequest) { // 列表 (Auth) export function ApiChangeList(data: PageRequest) { return request({ - url: Api.list, + url: Api.Changelist, method: 'post', data, }) diff --git a/src/views/ContainerManagement/dsxxcl/index.vue b/src/views/ContainerManagement/dsxxcl/index.vue index b138e2b5..1417bd8c 100644 --- a/src/views/ContainerManagement/dsxxcl/index.vue +++ b/src/views/ContainerManagement/dsxxcl/index.vue @@ -17,7 +17,7 @@