From cfce311d839378cfdb42acfce448384b2fcc03af 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: Fri, 20 Sep 2024 17:36:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E7=AE=A1=20=E5=BE=80=E6=9D=A5?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Tinymce/src/Editor.vue | 3 +++ .../ContainerManagement/CtnScrap/columns.tsx | 15 ++++++------- .../CurrentState/columns.tsx | 9 ++++++++ .../ContainerManagement/RentIn/columns.tsx | 21 ++++++++++--------- .../ContainerManagement/RentOut/columns.tsx | 21 ++++++++++--------- .../ContainerManagement/SellCtn/columns.tsx | 15 ++++++------- src/views/baseinfo/infoclient/EditColumns.tsx | 7 ++++++- src/views/baseinfo/infoclient/columns.tsx | 7 ++++++- .../baseinfo/infoclient/tabs3/columns.tsx | 9 +++++++- 9 files changed, 70 insertions(+), 37 deletions(-) diff --git a/src/components/Tinymce/src/Editor.vue b/src/components/Tinymce/src/Editor.vue index 75efb4e7..0107427d 100644 --- a/src/components/Tinymce/src/Editor.vue +++ b/src/components/Tinymce/src/Editor.vue @@ -163,6 +163,9 @@ auto_focus: true, skin: skinName.value, skin_url: publicPath + 'resource/tinymce/skins/ui/' + skinName.value, + font_formats: + 'Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;微软雅黑=Microsoft YaHei,sans-serif;黑体=SimHei,sans-serif;新宋体=NSimSun,sans-serif;仿宋=FangSong,sans-serif;仿宋_GB2312=FangSong_GB2312,sans-serif;微软正黑体=Microsoft JhengHei,sans-serif;隶书=LiSu,sans-serif;新宋体-宋体=NSimSun-SimSun,sans-serif', + content_css: publicPath + 'resource/tinymce/skins/ui/' + skinName.value + '/content.min.css', ...options, diff --git a/src/views/ContainerManagement/CtnScrap/columns.tsx b/src/views/ContainerManagement/CtnScrap/columns.tsx index aa28b2d9..8391efd3 100644 --- a/src/views/ContainerManagement/CtnScrap/columns.tsx +++ b/src/views/ContainerManagement/CtnScrap/columns.tsx @@ -189,12 +189,6 @@ export const formSearchBoxSchema: FormSchema[] = [ } }, }, - { - field: 'cntrno', - label: '箱号', - component: 'Input', - colProps: { span: 6 }, - }, { field: 'ctnreleaseno', label: '放箱单号', @@ -205,6 +199,13 @@ export const formSearchBoxSchema: FormSchema[] = [ field: 'remark', label: '备注', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 12 }, + }, + { + field: 'cntrno', + label: '箱号', + component: 'Input', + placeholder: '可以逗号隔开，查询多个箱号。', + colProps: { span: 18 }, }, ] diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx index 0beec2fd..db253911 100644 --- a/src/views/ContainerManagement/CurrentState/columns.tsx +++ b/src/views/ContainerManagement/CurrentState/columns.tsx @@ -755,6 +755,15 @@ export const formSchema: FormSchema[] = [ component: 'InputNumber', colProps: { span: 6 }, }, + { + field: 'remark', + label: '备注', + component: 'InputTextArea', + colProps: { span: 18 }, + componentProps: { + rows: 2, + }, + }, ] export const InfoColumns: BasicColumn[] = [ diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx index 7ddfcebe..91c2ea22 100644 --- a/src/views/ContainerManagement/RentIn/columns.tsx +++ b/src/views/ContainerManagement/RentIn/columns.tsx @@ -491,7 +491,7 @@ export const formSearchBoxSchema: FormSchema[] = [ component: 'ApiSelect', required: false, dynamicDisabled: false, - colProps: { span: 4 }, + colProps: { span: 6 }, componentProps: ({ formModel }) => { return { allowClear: true, @@ -515,7 +515,7 @@ export const formSearchBoxSchema: FormSchema[] = [ component: 'ApiSelect', required: false, dynamicDisabled: false, - colProps: { span: 4 }, + colProps: { span: 6 }, componentProps: () => { return { allowClear: true, @@ -533,22 +533,23 @@ export const formSearchBoxSchema: FormSchema[] = [ } }, }, - { - field: 'cntrno', - label: '箱号', - component: 'Input', - colProps: { span: 8 }, - }, { field: 'ctnreleaseno', label: '放箱单号', component: 'Input', - colProps: { span: 4 }, + colProps: { span: 6 }, }, { field: 'remark', label: '备注', component: 'Input', - colProps: { span: 4 }, + colProps: { span: 6 }, + }, + { + field: 'cntrno', + label: '箱号', + component: 'Input', + placeholder: '可以逗号隔开，查询多个箱号。', + colProps: { span: 18 }, }, ] diff --git a/src/views/ContainerManagement/RentOut/columns.tsx b/src/views/ContainerManagement/RentOut/columns.tsx index 53dd0635..533392e7 100644 --- a/src/views/ContainerManagement/RentOut/columns.tsx +++ b/src/views/ContainerManagement/RentOut/columns.tsx @@ -499,7 +499,7 @@ export const formSearchBoxSchema: FormSchema[] = [ component: 'ApiSelect', required: false, dynamicDisabled: false, - colProps: { span: 4 }, + colProps: { span: 6 }, // api: GetClientListByCode({ code: 'leasing' }), componentProps: ({ formModel }) => { return { @@ -524,7 +524,7 @@ export const formSearchBoxSchema: FormSchema[] = [ component: 'ApiSelect', required: false, dynamicDisabled: false, - colProps: { span: 4 }, + colProps: { span: 6 }, componentProps: () => { return { allowClear: true, @@ -548,7 +548,7 @@ export const formSearchBoxSchema: FormSchema[] = [ component: 'ApiSelect', required: false, dynamicDisabled: false, - colProps: { span: 4 }, + colProps: { span: 6 }, componentProps: () => { return { api: GetClientPortSelectList, @@ -561,21 +561,22 @@ export const formSearchBoxSchema: FormSchema[] = [ }, }, { - field: 'cntrno', - label: '箱号', + field: 'ctnreleaseno', + label: '放箱单号', component: 'Input', - colProps: { span: 4 }, + colProps: { span: 6 }, }, { - field: 'ctnreleaseno', - label: '放箱单号', + field: 'cntrno', + label: '箱号', component: 'Input', - colProps: { span: 4 }, + placeholder: '可以逗号隔开，查询多个箱号。', + colProps: { span: 18 }, }, { field: 'remark', label: '备注', component: 'Input', - colProps: { span: 4 }, + colProps: { span: 6 }, }, ] diff --git a/src/views/ContainerManagement/SellCtn/columns.tsx b/src/views/ContainerManagement/SellCtn/columns.tsx index 98368446..c451ed2e 100644 --- a/src/views/ContainerManagement/SellCtn/columns.tsx +++ b/src/views/ContainerManagement/SellCtn/columns.tsx @@ -277,12 +277,6 @@ export const formSearchBoxSchema: FormSchema[] = [ } }, }, - { - field: 'cntrno', - label: '箱号', - component: 'Input', - colProps: { span: 6 }, - }, { field: 'ctnreleaseno', label: '放箱单号', @@ -293,6 +287,13 @@ export const formSearchBoxSchema: FormSchema[] = [ field: 'remark', label: '备注', component: 'Input', - colProps: { span: 6 }, + colProps: { span: 12 }, + }, + { + field: 'cntrno', + label: '箱号', + component: 'Input', + placeholder: '可以逗号隔开，查询多个箱号。', + colProps: { span: 18 }, }, ] diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx index 48163025..e8e1e16c 100644 --- a/src/views/baseinfo/infoclient/EditColumns.tsx +++ b/src/views/baseinfo/infoclient/EditColumns.tsx @@ -392,14 +392,19 @@ export const EditformSchema: FormSchema[] = [ valueField: 'userName', immediate: false, resultField: 'data', - onChange: async (e, obj) => { + onChange: (e, obj) => { if (e && obj) { formModel.saleId = obj.id formModel.sale = obj.pinYinCode + formModel.saleOrgId = obj.defaultOrgId + formModel.saleOrgName = obj.defaultOrgName + console.log(e, obj) } if (!e && !obj) { formModel.saleId = '' formModel.sale = '' + formModel.saleOrgId = '' + formModel.saleOrgName = '' } }, onEdit: () => { diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index 887fb196..dae5006b 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -731,14 +731,19 @@ export const formSchema: FormSchema[] = [ showName: 'userName', valueField: 'userName', resultField: 'data', - onChange: async (e, obj) => { + onChange: (e, obj) => { if (e && obj) { formModel.saleId = obj.id formModel.sale = obj.pinYinCode + formModel.saleOrgId = obj.defaultOrgId + formModel.saleOrgName = obj.defaultOrgName + console.log(e, obj) } if (!e && !obj) { formModel.saleId = '' formModel.sale = '' + formModel.saleOrgId = '' + formModel.saleOrgName = '' } }, } diff --git a/src/views/baseinfo/infoclient/tabs3/columns.tsx b/src/views/baseinfo/infoclient/tabs3/columns.tsx index 521fbd31..a78e402a 100644 --- a/src/views/baseinfo/infoclient/tabs3/columns.tsx +++ b/src/views/baseinfo/infoclient/tabs3/columns.tsx @@ -28,7 +28,14 @@ if (FnbusinessType.length) { }) } // 账期 字典 -const accountTypeList = await getDictOption('infoclient_business_accountType') +let accountTypeList: any = [] +const res9: any = await getDictOption('infoclient_business_accountType') +// if (res9.succeeded) { +accountTypeList = [] +res9.forEach((e) => { + accountTypeList.push({ ...e, value: e.name }) +}) +// } function RaccountTypeLabel(values) { let RData = '' accountTypeList.forEach((item) => {