From a21068472df814220a9f7d6799e12766fa78f983 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 10:53:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=8F=82=E6=95=B0=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseinfo/infoclient/customerParams/columns.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/baseinfo/infoclient/customerParams/columns.tsx b/src/views/baseinfo/infoclient/customerParams/columns.tsx index 9ab69259..96296397 100644 --- a/src/views/baseinfo/infoclient/customerParams/columns.tsx +++ b/src/views/baseinfo/infoclient/customerParams/columns.tsx @@ -20,13 +20,13 @@ export const columns: BasicColumn[] = [ // width: 150, // }, { - title: '客户参数类型', - dataIndex: 'paramType', + title: '客户参数类别', + dataIndex: 'paramName', width: 150, }, { title: '客户参数名称', - dataIndex: 'paramName', + dataIndex: 'itemName', width: 200, }, { @@ -38,7 +38,7 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { - field: 'paramName', + field: 'itemName', label: '客户参数名称', colProps: { span: 6 }, component: 'Input', @@ -70,11 +70,12 @@ export const formSchema: FormSchema[] = [ GetTenantParamDataSelectList({ code: e }).then((res) => { itemNameOption.value = res.data }) - if (obj) { + if (e && obj) { formModel.paramName = obj.label formModel.paramId = obj.id formModel.paramType = obj.type - } else { + } + if (!e && !obj) { formModel.paramName = '' formModel.paramId = '' formModel.paramType = '' From 191dd9e91f2fb60c885eee2e7074a396b0ebed2b 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 16:38:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infoclient/TenantAuditStepModal.vue | 36 ++++++- src/views/baseinfo/infoclient/columns.tsx | 102 +++++++++++++++--- 2 files changed, 118 insertions(+), 20 deletions(-) diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue index b0856e19..db8ab9e4 100644 --- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue +++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue @@ -140,6 +140,7 @@ DeleteInvoiceHeader, cbDelete, } from './api' + import { GetClientSourceDetailSelectList } from '/@/views/operation/seaexport/api/BookingLedger' import ClientAccountDateModal from './ClientAccountDateModal.vue' import { useMessage } from '/@/hooks/web/useMessage' const { notification } = useMessage() @@ -179,11 +180,12 @@ console.log(nval, oval) } }) - const [registerForm1, { resetFields, getFieldsValue, setFieldsValue, validate }] = useForm({ - labelWidth: 100, - schemas: formSchema, - showActionButtonGroup: false, - }) + const [registerForm1, { resetFields, getFieldsValue, setFieldsValue, validate, updateSchema }] = + useForm({ + labelWidth: 100, + schemas: formSchema, + showActionButtonGroup: false, + }) const [ registerForm2, { @@ -333,6 +335,30 @@ await setFieldsValue({ ...res.data, }) + let Arr: any = [] + await GetClientSourceDetailSelectList({ id: res.data.sourceId }).then((res) => { + res.data.forEach((item) => { + Arr.push({ label: item.detailName, value: item.id }) + }) + }) + updateSchema({ + label: '来源明细', + field: 'sourceDetailId', + component: 'Select', + required: false, + dynamicDisabled: ({ values }) => { + return !values.sourceId + }, + colProps: { span: 4 }, + componentProps: { + allowClear: true, + options: Arr, + showSearch: true, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + }, + }) activeKey.value = '2' await setFieldsValue1({ ...res.data, diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index 1f2d6e70..d593d7b5 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -19,7 +19,10 @@ import { getDeptList, GetFeeCurrencySelectList, } from '/@/api/common' +import { GetClientSourceDetailSelectList } from '/@/views/operation/seaexport/api/BookingLedger' import { getOrgTree } from '/@/api/system/org' +import { useOptionsStore } from '/@/store/modules/options' +const optionsStore = useOptionsStore() let ClientFrtList = [] const res: API.DataResult = await getClientFrtSelectList() if (res.succeeded) { @@ -550,12 +553,12 @@ export const formSchema: FormSchema[] = [ { field: 'codeName', label: '助记码', - required: true, + // required: true, component: 'Input', defaultValue: '', - // dynamicDisabled: ({ values }) => { - // return values.id != '' - // }, + dynamicDisabled: ({ values }) => { + return true + }, colProps: { span: 4 }, }, { @@ -736,26 +739,95 @@ export const formSchema: FormSchema[] = [ }, }, { - field: 'divider-selects', + field: 'divider-selects2', component: 'Divider', label: '业务属性及干系人', colProps: { span: 24 }, }, + // { + // field: 'sourceId', + // label: '业务来源', + // component: 'Select', + // colProps: { span: 4 }, + // defaultValue: '', + // componentProps: { + // options: ClientSourceList, + // allowClear: true, + // showSearch: true, + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // }, + // }, { - field: 'sourceId', label: '业务来源', - component: 'Select', + field: 'sourceId', + component: 'ApiSelect', + required: false, + dynamicDisabled: false, + // defaultValue: '', colProps: { span: 4 }, - defaultValue: '', - componentProps: { - options: ClientSourceList, - allowClear: true, - showSearch: true, - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, + componentProps: ({ formActionType, formModel }) => { + return { + allowClear: true, + showSearch: true, + option: optionsStore.getOptionsByCode('GetClientSourceSelectList'), + labelField: 'sourceName', + valueField: 'id', + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + onChange: async (e, obj) => { + // if (e && obj) { + // formModel.sourceCode = obj.sourceCode + // } + // if (!e && !obj) { + // formModel.sourceCode = null + // } + if (e) { + if (formActionType) { + const { updateSchema } = formActionType + let Arr: any = [] + await GetClientSourceDetailSelectList({ id: e }).then((res) => { + res.data.forEach((item) => { + Arr.push({ label: item.detailName, value: item.id }) + }) + }) + updateSchema({ + label: '来源明细', + field: 'sourceDetailId', + component: 'Select', + required: false, + dynamicDisabled: ({ values }) => { + return !values.sourceId + }, + colProps: { span: 4 }, + componentProps: { + allowClear: true, + options: Arr, + showSearch: true, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + }, + }) + } + } + formModel.sourceDetailId = '' + }, + } }, }, + { + label: '来源明细', + field: 'sourceDetailId', + component: 'Select', + required: false, + dynamicDisabled: ({ values }) => { + return !values.sourceId + }, + colProps: { span: 4 }, + }, { field: 'saleId', label: '揽货人', 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 3/5] =?UTF-8?q?=E7=A7=9F=E7=AE=B1=E6=9C=88=E7=BB=93?= =?UTF-8?q?=E8=B4=A6=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') + }, }, }, ] From 5b558fb3c39cc89c16ae73434470f92eaa9c0d6e 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:41:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BE=85=E4=B8=8A=E7=BA=BF=E7=AE=B1?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ContainerManagement/dsxxcl/api.ts | 13 +++++++++++-- src/views/ContainerManagement/dsxxcl/index.vue | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) 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 @@