diff --git a/src/views/ContainerManagement/BuyCtn/columns.tsx b/src/views/ContainerManagement/BuyCtn/columns.tsx index 1dc8f556..9fbfb9e0 100644 --- a/src/views/ContainerManagement/BuyCtn/columns.tsx +++ b/src/views/ContainerManagement/BuyCtn/columns.tsx @@ -287,7 +287,7 @@ export const formSchema: FormSchema[] = [ label: '会计期间', component: 'MonthPicker', colProps: { span: 6 }, - defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'), + defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM'), componentProps: { showTime: true, allowClear: true, diff --git a/src/views/ContainerManagement/CtnScrap/columns.tsx b/src/views/ContainerManagement/CtnScrap/columns.tsx index 76988111..d390e081 100644 --- a/src/views/ContainerManagement/CtnScrap/columns.tsx +++ b/src/views/ContainerManagement/CtnScrap/columns.tsx @@ -144,7 +144,7 @@ export const formSchema: FormSchema[] = [ label: '会计期间', component: 'MonthPicker', colProps: { span: 6 }, - defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'), + defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM'), componentProps: { showTime: true, allowClear: true, diff --git a/src/views/ContainerManagement/CurrentState/index.vue b/src/views/ContainerManagement/CurrentState/index.vue index bbb72e67..f45494f0 100644 --- a/src/views/ContainerManagement/CurrentState/index.vue +++ b/src/views/ContainerManagement/CurrentState/index.vue @@ -118,7 +118,7 @@ } function handleAudit(record: Recordable) { openInfoModal(true, { - id: record.id, + cntrno: record.cntrno, }) } function handleSuccess() { diff --git a/src/views/ContainerManagement/CurrentState/infoModal.vue b/src/views/ContainerManagement/CurrentState/infoModal.vue index 90025776..4b40f775 100644 --- a/src/views/ContainerManagement/CurrentState/infoModal.vue +++ b/src/views/ContainerManagement/CurrentState/infoModal.vue @@ -17,10 +17,10 @@ import { BasicModal, useModalInner } from '/@/components/Modal' import { InfoColumns } from './columns' import { formatParams } from '/@/hooks/web/common' - const rowId = ref('') + const cntrno = ref('') const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { setModalProps({ confirmLoading: false, loading: true }) - rowId.value = data.id + cntrno.value = data.cntrno reload() setModalProps({ loading: false }) }) @@ -50,8 +50,8 @@ } let condition: API.ConditionItem[] = [] condition.push({ - FieldName: 'id', - FieldValue: rowId.value, + FieldName: 'cntrno', + FieldValue: cntrno.value, ConditionalType: 0, }) postParam.queryCondition = JSON.stringify(condition) diff --git a/src/views/ContainerManagement/CustFeeDui/columns.tsx b/src/views/ContainerManagement/CustFeeDui/columns.tsx index d6a11cc7..8a02f561 100644 --- a/src/views/ContainerManagement/CustFeeDui/columns.tsx +++ b/src/views/ContainerManagement/CustFeeDui/columns.tsx @@ -335,7 +335,7 @@ export const formSchema: FormSchema[] = [ label: '会计期间', component: 'MonthPicker', colProps: { span: 6 }, - defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'), + defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM'), componentProps: { showTime: true, allowClear: true, diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx index c43ea09d..71b40b8b 100644 --- a/src/views/ContainerManagement/RentIn/columns.tsx +++ b/src/views/ContainerManagement/RentIn/columns.tsx @@ -453,7 +453,7 @@ export const formSchema: FormSchema[] = [ label: '会计期间', component: 'MonthPicker', colProps: { span: 6 }, - defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'), + defaultValue: moment().format('YYYY-MM'), componentProps: { showTime: true, allowClear: true, diff --git a/src/views/ContainerManagement/RentOneWay/columns.tsx b/src/views/ContainerManagement/RentOneWay/columns.tsx index dad9c5a3..9857916d 100644 --- a/src/views/ContainerManagement/RentOneWay/columns.tsx +++ b/src/views/ContainerManagement/RentOneWay/columns.tsx @@ -429,7 +429,7 @@ export const formSchema: FormSchema[] = [ label: '会计期间', component: 'MonthPicker', colProps: { span: 6 }, - defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'), + defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM'), componentProps: { showTime: true, allowClear: true, diff --git a/src/views/ContainerManagement/RentOut/columns.tsx b/src/views/ContainerManagement/RentOut/columns.tsx index 817dac53..170c879d 100644 --- a/src/views/ContainerManagement/RentOut/columns.tsx +++ b/src/views/ContainerManagement/RentOut/columns.tsx @@ -462,7 +462,7 @@ export const formSchema: FormSchema[] = [ label: '会计期间', component: 'MonthPicker', colProps: { span: 6 }, - defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'), + defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM'), componentProps: { showTime: true, allowClear: true, diff --git a/src/views/ContainerManagement/SellCtn/columns.tsx b/src/views/ContainerManagement/SellCtn/columns.tsx index eeddb532..9f3ed260 100644 --- a/src/views/ContainerManagement/SellCtn/columns.tsx +++ b/src/views/ContainerManagement/SellCtn/columns.tsx @@ -222,7 +222,7 @@ export const formSchema: FormSchema[] = [ label: '会计期间', component: 'MonthPicker', colProps: { span: 6 }, - defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'), + defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM'), componentProps: { showTime: true, allowClear: true, diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx index 62488be2..06a689cf 100644 --- a/src/views/ContainerManagement/StateChange/columns.tsx +++ b/src/views/ContainerManagement/StateChange/columns.tsx @@ -458,17 +458,31 @@ export const formSchema: FormSchema[] = [ colProps: { span: 6 }, }, { + label: '', field: 'ctnall', + component: 'Input', + defaultValue: '', + show: false, + }, + { + field: 'ctnCode', label: '箱型', component: 'ApiSelect', colProps: { span: 6 }, - required: true, - componentProps: () => { + componentProps: ({ formModel }) => { return { api: GetCtnSelectList, labelField: 'ctnName', valueField: 'ediCode', resultField: 'data', + onChange: (e, obj) => { + if (e && obj) { + formModel.ctnall = obj.label + } + if (!e && !obj) { + formModel.ctnall = '' + } + }, } }, }, diff --git a/src/views/baseinfo/infoclient/menu3/columns.tsx b/src/views/baseinfo/infoclient/menu3/columns.tsx index 6b4ee85e..90ded0ac 100644 --- a/src/views/baseinfo/infoclient/menu3/columns.tsx +++ b/src/views/baseinfo/infoclient/menu3/columns.tsx @@ -160,7 +160,6 @@ export const formSchema: FormSchema[] = [ required: true, component: 'Select', colProps: { span: 12 }, - defaultValue: '', componentProps: { options: shipperTypeList, allowClear: true,