diff --git a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue index 5b7c0b3b..62798693 100644 --- a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue @@ -752,7 +752,7 @@ if (ApiData.ids.length) { ApiDelDetail(ApiData).then((res) => { if (res.succeeded) { - GetListDetail() + refresh() notification.success({ message: res.message, duration: 3 }) } }) diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx index 32176231..9a9ca243 100644 --- a/src/views/ContainerManagement/CurrentState/columns.tsx +++ b/src/views/ContainerManagement/CurrentState/columns.tsx @@ -248,18 +248,12 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', colProps: { span: 4 }, }, - { - field: 'billno', - label: '箱业务编号', - component: 'Input', - colProps: { span: 4 }, - }, { field: 'isOnlineId', label: '是否上线', component: 'ApiSelect', colProps: { span: 4 }, - defaultValue: '', + defaultValue: '1', componentProps: ({ formModel }) => { return { api: () => { @@ -278,6 +272,13 @@ export const searchFormSchema: FormSchema[] = [ } }, }, + { + field: 'billno', + label: '箱业务编号', + component: 'Input', + colProps: { span: 4 }, + }, + { field: 'portid', label: '当前港口', diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue index c8542e53..62d7faea 100644 --- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue @@ -655,7 +655,7 @@ if (ApiData.ids.length) { ApiDelDetail(ApiData).then((res) => { if (res.succeeded) { - GetListDetail() + refresh() notification.success({ message: res.message, duration: 3 }) } }) diff --git a/src/views/ContainerManagement/CustFeeDui/columns.tsx b/src/views/ContainerManagement/CustFeeDui/columns.tsx index 3643d2a7..ec580684 100644 --- a/src/views/ContainerManagement/CustFeeDui/columns.tsx +++ b/src/views/ContainerManagement/CustFeeDui/columns.tsx @@ -238,15 +238,15 @@ export const formSchema: FormSchema[] = [ colProps: { span: 6 }, componentProps: ({ formModel }) => { return { - api: () => { - return new Promise((resolve) => { - const arr = getOptions('custom') - resolve(arr) - }) - }, - labelField: 'shortName', - valueField: 'id', + 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 }, diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue index f3f69324..22e8f674 100644 --- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue @@ -1084,7 +1084,7 @@ if (ApiData.ids.length) { ApiDelDetail(ApiData).then((res) => { if (res.succeeded) { - GetListDetail() + refresh() notification.success({ message: res.message, duration: 3 }) } }) diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue index f0fb299f..1471886c 100644 --- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue @@ -853,7 +853,7 @@ if (ApiData.ids.length) { ApiDelDetail(ApiData).then((res) => { if (res.succeeded) { - GetListDetail() + refresh() notification.success({ message: res.message, duration: 3 }) } }) diff --git a/src/views/ContainerManagement/RentOneWay/columns.tsx b/src/views/ContainerManagement/RentOneWay/columns.tsx index 29cb08ff..41c46b0c 100644 --- a/src/views/ContainerManagement/RentOneWay/columns.tsx +++ b/src/views/ContainerManagement/RentOneWay/columns.tsx @@ -378,7 +378,7 @@ export const formSchema: FormSchema[] = [ allowClear: true, showSearch: true, api: GetClientListByCode, - params: { code: 'tradingAgency' }, + params: { code: 'leasing' }, labelField: 'pinYinCode', showName: 'shortName', valueField: 'shortName', diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue index eb87b906..d860e9bf 100644 --- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue @@ -1175,7 +1175,7 @@ if (ApiData.ids.length) { ApiDelDetail(ApiData).then((res) => { if (res.succeeded) { - GetListDetail() + refresh() notification.success({ message: res.message, duration: 3 }) } }) diff --git a/src/views/ContainerManagement/RentOut/columns.tsx b/src/views/ContainerManagement/RentOut/columns.tsx index e0991fcc..0bb0544e 100644 --- a/src/views/ContainerManagement/RentOut/columns.tsx +++ b/src/views/ContainerManagement/RentOut/columns.tsx @@ -411,7 +411,7 @@ export const formSchema: FormSchema[] = [ allowClear: true, showSearch: true, api: GetClientListByCode, - params: { code: 'tradingAgency' }, + params: { code: 'leasing' }, labelField: 'pinYinCode', showName: 'shortName', valueField: 'shortName', diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue index b0b33ef8..4738ead3 100644 --- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue @@ -903,7 +903,7 @@ if (ApiData.ids.length) { ApiDelDetail(ApiData).then((res) => { if (res.succeeded) { - GetListDetail() + refresh() notification.success({ message: res.message, duration: 3 }) } }) diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index 361a7ce0..d17ba75b 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -1166,15 +1166,34 @@ export const formSchema: FormSchema[] = [ }, }, { - field: 'saleOrgIdList', + label: '所属分部Name', + field: 'saleOrgName', + component: 'Input', + defaultValue: '', + show: false, + }, + { + field: 'saleOrgId', label: '所属分部', component: 'Select', colProps: { span: 8 }, - componentProps: { - options: DeptList, - allowClear: true, - mode: 'multiple', - class: 'NoLimitHeight', + componentProps: ({ formModel }) => { + return { + options: DeptList, + allowClear: true, + onChange: (e, obj) => { + console.log(e, obj) + + if (e && obj) { + formModel.saleOrgName = obj.label + formModel.saleOrgId = obj.value + } + if (!e && !obj) { + formModel.saleOrgName = '' + formModel.saleOrgId = '' + } + }, + } }, }, {