diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx index a4f3a0cb..87db8688 100644 --- a/src/views/operation/seaexport/columns.tsx +++ b/src/views/operation/seaexport/columns.tsx @@ -2154,7 +2154,7 @@ export const mailingInfoFormSchemaR: FormSchema[] = [ // }, ] // cargoInfo表单 -export const cargoInfoFormSchema: FormSchema[] = [ +export const cargoInfoFormSchema1: FormSchema[] = [ { field: 'marks', label: `唛头`, @@ -2163,15 +2163,14 @@ export const cargoInfoFormSchema: FormSchema[] = [ dynamicDisabled: false, defaultValue: '', colProps: { - span: 4, - style: { - color: 'red', - }, + span: 24, }, componentProps: { rows: 4, }, }, +] +export const cargoInfoFormSchema2: FormSchema[] = [ { field: 'goodsName', label: '品名', @@ -2179,7 +2178,7 @@ export const cargoInfoFormSchema: FormSchema[] = [ required: false, dynamicDisabled: false, defaultValue: '', - colProps: { span: 6 }, + colProps: { span: 8 }, componentProps: { options: ListData.goodsName, allowClear: true, @@ -2196,7 +2195,7 @@ export const cargoInfoFormSchema: FormSchema[] = [ required: false, dynamicDisabled: false, defaultValue: '', - colProps: { span: 6 }, + colProps: { span: 8 }, componentProps: { options: ListData.cargoId, allowClear: true, @@ -2211,15 +2210,29 @@ export const cargoInfoFormSchema: FormSchema[] = [ field: 'hsCode', component: 'Input', required: false, - colProps: { span: 3 }, + colProps: { span: 8 }, }, + { + field: 'description', + label: '货物描述', + component: 'InputTextArea', + required: false, + dynamicDisabled: false, + defaultValue: '', + colProps: { span: 24 }, + componentProps: { + rows: 4, + }, + }, +] +export const cargoInfoFormSchema3: FormSchema[] = [ { label: '件数', field: 'pkgs', component: 'InputNumber', required: false, - colProps: { span: 3 }, + colProps: { span: 12 }, componentProps: ({ schema, tableAction, formActionType, formModel }) => { return { onChange: (SS) => { @@ -2375,9 +2388,11 @@ export const cargoInfoFormSchema: FormSchema[] = [ enCapital = 'SAY:' + ToEn(strNum).toUpperCase() + ' ' + strKind + ' ONLY.' } } - formModel.totalNo = enCapital + formActionType.submit() + // formModel.totalNo = enCapital } else { - formModel.totalNo = '' + formActionType.submit() + // formModel.totalNo = '' } }, } @@ -2390,7 +2405,7 @@ export const cargoInfoFormSchema: FormSchema[] = [ required: false, dynamicDisabled: false, defaultValue: '', - colProps: { span: 3 }, + colProps: { span: 12 }, componentProps: { options: ListData.FngoodsName, allowClear: true, @@ -2400,33 +2415,23 @@ export const cargoInfoFormSchema: FormSchema[] = [ }, }, }, - { - field: 'description', - label: '货物描述', - component: 'InputTextArea', - required: false, - dynamicDisabled: false, - defaultValue: '', - colProps: { span: 8 }, - componentProps: { - rows: 4, - }, - }, + { label: '毛重', field: 'kgs', component: 'InputNumber', required: false, - colProps: { span: 3 }, + colProps: { span: 12 }, }, { label: '尺寸', field: 'cbm', component: 'InputNumber', required: false, - colProps: { span: 3 }, + colProps: { span: 12 }, }, - +] +export const cargoInfoFormSchema4: FormSchema[] = [ { field: 'totalNo', label: '件数大写', diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue index 71469699..dec11f96 100644 --- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue +++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue @@ -13,7 +13,20 @@ >
- + + + + + + + + + + + + + +