From 9723f5359460e5088d5914559b1bdc91ab40bb09 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: Tue, 29 Oct 2024 17:29:47 +0800 Subject: [PATCH] =?UTF-8?q?10/29=20=20=E7=A6=85=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContainerManagement/BaseInfo/columns.tsx | 7 ++- .../ContainerManagement/BaseInfo/index.vue | 2 +- .../CurrentState/columns.tsx | 8 ++- .../CurrentState/index.vue | 1 + .../CustFeeDui/columns.tsx | 62 ++++++++++++------- .../StateChange/columns.tsx | 25 +++++--- .../ContainerManagement/StateChange/index.vue | 1 + 7 files changed, 69 insertions(+), 37 deletions(-) diff --git a/src/views/ContainerManagement/BaseInfo/columns.tsx b/src/views/ContainerManagement/BaseInfo/columns.tsx index 687bfcf3..ae321158 100644 --- a/src/views/ContainerManagement/BaseInfo/columns.tsx +++ b/src/views/ContainerManagement/BaseInfo/columns.tsx @@ -49,8 +49,13 @@ export const searchFormSchema: FormSchema[] = [ { field: 'cntrno', label: '箱号', - component: 'Input', + component: 'InputTextArea', colProps: { span: 8 }, + componentProps: { + validateOnRuleChange: false, + placeholder: '可输入多个箱号', + rows: 1, + }, }, { field: 'ctnCode', diff --git a/src/views/ContainerManagement/BaseInfo/index.vue b/src/views/ContainerManagement/BaseInfo/index.vue index e9ab400e..e4e8f16f 100644 --- a/src/views/ContainerManagement/BaseInfo/index.vue +++ b/src/views/ContainerManagement/BaseInfo/index.vue @@ -38,7 +38,7 @@ let data = JSON.parse(Rdata.queryCondition) data.forEach((item, index) => { if (item.FieldName == 'cntrno') { - console.log(item) + item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',') item.ConditionalType = 15 } }) diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx index 47fb8fb0..d1561d9b 100644 --- a/src/views/ContainerManagement/CurrentState/columns.tsx +++ b/src/views/ContainerManagement/CurrentState/columns.tsx @@ -334,8 +334,13 @@ export const searchFormSchema: FormSchema[] = [ { field: 'cntrno', label: '箱号', - component: 'Input', + component: 'InputTextArea', colProps: { span: 8 }, + componentProps: { + validateOnRuleChange: false, + placeholder: '可输入多个箱号', + rows: 1, + }, }, { field: 'portid', @@ -367,6 +372,7 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', colProps: { span: 4 }, }, + // { // field: 'ctnSourceId', // label: '箱来源', diff --git a/src/views/ContainerManagement/CurrentState/index.vue b/src/views/ContainerManagement/CurrentState/index.vue index d51f5729..30699ee3 100644 --- a/src/views/ContainerManagement/CurrentState/index.vue +++ b/src/views/ContainerManagement/CurrentState/index.vue @@ -61,6 +61,7 @@ let CM_ctnSize: any = null data.forEach((item, index) => { if (item.FieldName == 'cntrno') { + item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',') item.ConditionalType = 15 } if (item.FieldName == 'CM_ctnCode') { diff --git a/src/views/ContainerManagement/CustFeeDui/columns.tsx b/src/views/ContainerManagement/CustFeeDui/columns.tsx index 0c8121c5..1f6ae756 100644 --- a/src/views/ContainerManagement/CustFeeDui/columns.tsx +++ b/src/views/ContainerManagement/CustFeeDui/columns.tsx @@ -163,14 +163,15 @@ export const searchFormSchema: FormSchema[] = [ api: () => { return new Promise((resolve) => { getDictOption('CM_RentDirect').then((res) => { - let data: any = [] - res.forEach((item) => { - item.value = parseInt(item.value) - if (!item.label.indexOf('租入')) { - data.push(item) - } - }) - resolve(data) + // let data: any = [] + // res.forEach((item) => { + // item.value = parseInt(item.value) + // if (!item.label.indexOf('租入')) { + // data.push(item) + // } + // }) + // resolve(data) + resolve(res) }) }) }, @@ -184,27 +185,40 @@ export const searchFormSchema: FormSchema[] = [ }, }, { - field: 'etd', - label: 'ETD', - component: 'DatePicker', - colProps: { span: 4 }, - defaultValue: '', - componentProps: { - showTime: true, - style: 'width:100%', - }, - }, - { - field: 'eta', - label: 'ETA', - component: 'DatePicker', + field: 'accdate', + label: '会计期间', + component: 'MonthPicker', colProps: { span: 4 }, - defaultValue: '', + // defaultValue: moment(), componentProps: { showTime: true, - style: 'width:100%', + allowClear: true, + valueFormat: 'YYYY-MM', + format: 'YYYY-MM', }, }, + // { + // field: 'etd', + // label: 'ETD', + // component: 'DatePicker', + // colProps: { span: 4 }, + // defaultValue: '', + // componentProps: { + // showTime: true, + // style: 'width:100%', + // }, + // }, + // { + // field: 'eta', + // label: 'ETA', + // component: 'DatePicker', + // colProps: { span: 4 }, + // defaultValue: '', + // componentProps: { + // showTime: true, + // style: 'width:100%', + // }, + // }, ] export const formSchema: FormSchema[] = [ { diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx index e5cbb857..a5bcb0dd 100644 --- a/src/views/ContainerManagement/StateChange/columns.tsx +++ b/src/views/ContainerManagement/StateChange/columns.tsx @@ -166,21 +166,26 @@ export const searchFormSchema: FormSchema[] = [ { field: 'cntrno', label: '箱号', - component: 'Input', + component: 'InputTextArea', colProps: { span: 8 }, - }, - { - field: 'changeTime', - label: '状态时间', - component: 'RangePicker', - required: false, - dynamicDisabled: false, - colProps: { span: 4 }, componentProps: { - allowClear: true, + validateOnRuleChange: false, + placeholder: '可输入多个箱号', + rows: 2, }, }, // { + // field: 'changeTime', + // label: '状态时间', + // component: 'RangePicker', + // required: false, + // dynamicDisabled: false, + // colProps: { span: 4 }, + // componentProps: { + // allowClear: true, + // }, + // }, + // { // field: 'ctnBizState', // label: '箱业务状态', // component: 'ApiSelect', diff --git a/src/views/ContainerManagement/StateChange/index.vue b/src/views/ContainerManagement/StateChange/index.vue index 62e64cf3..075c45e2 100644 --- a/src/views/ContainerManagement/StateChange/index.vue +++ b/src/views/ContainerManagement/StateChange/index.vue @@ -55,6 +55,7 @@ let data = JSON.parse(Rdata.queryCondition) data.forEach((item, index) => { if (item.FieldName == 'cntrno') { + item.FieldValue = item.FieldValue.replace(/ {1,}/g, ',') item.ConditionalType = 15 } })