From 5dbb1004bdf178e957a57d36d92a20f10d09a265 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: Mon, 19 Aug 2024 09:19:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/baseinfo/infoclient/columns.tsx | 371 ++++++++++++---------- src/views/baseinfo/infoclient/index.vue | 61 ++-- 2 files changed, 229 insertions(+), 203 deletions(-) diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index 9717c93b..b9ad86dd 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -529,12 +529,6 @@ export const formSchema: FormSchema[] = [ defaultValue: '', show: false, }, - { - field: 'divider-selects', - component: 'Divider', - label: '基本信息', - colProps: { span: 24 }, - }, { field: 'description', label: '客户全称', @@ -543,6 +537,14 @@ export const formSchema: FormSchema[] = [ defaultValue: '', colProps: { span: 4 }, }, + { + field: 'shortName', + label: '客户简称', + required: true, + component: 'Input', + defaultValue: '', + colProps: { span: 4 }, + }, { field: 'enFullName', label: '客户英文全称', @@ -552,24 +554,25 @@ export const formSchema: FormSchema[] = [ colProps: { span: 8 }, }, { - field: 'codeName', - label: '助记码', + field: 'enShortName', + label: '英文简称', // required: true, component: 'Input', defaultValue: '', - dynamicDisabled: ({ values }) => { - return true - }, colProps: { span: 4 }, }, { - field: 'shortName', - label: '客户简称', - required: true, + field: 'codeName', + label: '助记码', + // required: true, component: 'Input', defaultValue: '', + dynamicDisabled: ({ values }) => { + return true + }, colProps: { span: 4 }, }, + { field: 'ediCode', label: 'EDI代码', @@ -588,8 +591,16 @@ export const formSchema: FormSchema[] = [ colProps: { span: 4 }, }, { - field: 'enShortName', - label: '英文简称', + field: 'registrationNo', + label: '海关备案号', + // required: true, + component: 'Input', + defaultValue: '', + colProps: { span: 4 }, + }, + { + field: 'inspectionNo', + label: '商检备案号', // required: true, component: 'Input', defaultValue: '', @@ -639,29 +650,14 @@ export const formSchema: FormSchema[] = [ }, }, { - field: 'saleOrgIdList', - label: '所属分部', - // required: true, - component: 'Select', - colProps: { span: 12 }, - componentProps: { - options: DeptList, - allowClear: true, - mode: 'multiple', - class: 'NoLimitHeight', - }, - }, - { - field: 'registrationNo', - label: '海关备案号', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 4 }, + field: 'Divider1', + component: 'Divider', + label: '', + colProps: { span: 24 }, }, { - field: 'inspectionNo', - label: '商检备案号', + field: 'tel1', + label: '法人？？？？？', // required: true, component: 'Input', defaultValue: '', @@ -683,22 +679,6 @@ export const formSchema: FormSchema[] = [ defaultValue: '', colProps: { span: 4 }, }, - { - field: 'address', - label: '通讯地址', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 12 }, - }, - { - field: 'chief', - label: '负责人', - // required: true, - component: 'Input', - defaultValue: '', - colProps: { span: 4 }, - }, { field: 'web', label: '网址', @@ -740,123 +720,18 @@ export const formSchema: FormSchema[] = [ }, }, { - field: 'divider-selects2', - component: 'Divider', - label: '业务属性及干系人', - colProps: { span: 24 }, - }, - // { - // field: 'sourceId', - // label: '业务来源', - // component: 'Select', - // colProps: { span: 4 }, - // defaultValue: '', - // componentProps: { - // options: ClientSourceList, - // allowClear: true, - // showSearch: true, - // filterOption: (input: string, option: any) => { - // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - // }, - // }, - // }, - { - label: '业务来源Name', - field: 'sourceName', - component: 'Input', - defaultValue: '', - show: false, - }, - { - label: '业务来源', - field: 'sourceId', - component: 'ApiSelect', - required: false, - dynamicDisabled: false, - // defaultValue: '', - colProps: { span: 4 }, - componentProps: ({ formActionType, formModel }) => { - return { - allowClear: true, - showSearch: true, - option: optionsStore.getOptionsByCode('GetClientSourceSelectList'), - labelField: 'sourceName', - valueField: 'id', - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, - onChange: async (e, obj) => { - console.log(obj) - if (e && obj) { - formModel.sourceId = obj.value - formModel.sourceName = obj.label - } - if (!e && !obj) { - formModel.sourceId = '' - formModel.sourceName = '' - } - if (e) { - if (formActionType) { - const { updateSchema } = formActionType - let Arr: any = [] - await GetClientSourceDetailSelectList({ id: e }).then((res) => { - res.data.forEach((item) => { - Arr.push({ label: item.detailName, value: item.id }) - }) - }) - updateSchema({ - label: '来源明细', - field: 'sourceDetailId', - component: 'Select', - required: false, - dynamicDisabled: ({ values }) => { - return !values.sourceId - }, - colProps: { span: 4 }, - componentProps: ({ formModel }) => { - return { - allowClear: true, - options: Arr, - showSearch: true, - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, - onChange: (e, obj) => { - if (e && obj) { - formModel.sourceDetailId = obj.value - formModel.sourceDetailName = obj.label - } - if (!e && !obj) { - formModel.sourceDetailId = '' - formModel.sourceDetailName = '' - } - }, - } - }, - }) - } - } - formModel.sourceDetailId = '' - }, - } - }, - }, - { - label: '来源明细Name', - field: 'sourceDetailName', + field: 'address', + label: '通讯地址', + // required: true, component: 'Input', defaultValue: '', - show: false, + colProps: { span: 12 }, }, { - label: '来源明细', - field: 'sourceDetailId', - component: 'Select', - required: false, - dynamicDisabled: ({ values }) => { - return !values.sourceId - }, - colProps: { span: 4 }, + field: 'Divider2', + component: 'Divider', + label: '', + colProps: { span: 24 }, }, { label: '揽货人Name', @@ -998,6 +873,162 @@ export const formSchema: FormSchema[] = [ } }, }, + { + field: 'commissionUserId', + label: '提成参与人', + component: 'Select', + defaultValue: '', + colProps: { span: 4 }, + }, + { + field: 'Divider3', + component: 'Divider', + label: '', + colProps: { span: 24 }, + }, + { + field: 'saleOrgIdList', + label: '所属分部', + // required: true, + component: 'Select', + colProps: { span: 12 }, + componentProps: { + options: DeptList, + allowClear: true, + mode: 'multiple', + class: 'NoLimitHeight', + }, + }, + + { + field: 'chief', + label: '负责人', + // required: true, + component: 'Input', + defaultValue: '', + colProps: { span: 4 }, + }, + + { + field: 'divider-selects2', + component: 'Divider', + label: '业务属性及干系人', + colProps: { span: 24 }, + }, + // { + // field: 'sourceId', + // label: '业务来源', + // component: 'Select', + // colProps: { span: 4 }, + // defaultValue: '', + // componentProps: { + // options: ClientSourceList, + // allowClear: true, + // showSearch: true, + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // }, + // }, + { + label: '业务来源Name', + field: 'sourceName', + component: 'Input', + defaultValue: '', + show: false, + }, + { + label: '业务来源', + field: 'sourceId', + component: 'ApiSelect', + required: false, + dynamicDisabled: false, + // defaultValue: '', + colProps: { span: 4 }, + componentProps: ({ formActionType, formModel }) => { + return { + allowClear: true, + showSearch: true, + option: optionsStore.getOptionsByCode('GetClientSourceSelectList'), + labelField: 'sourceName', + valueField: 'id', + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + onChange: async (e, obj) => { + console.log(obj) + if (e && obj) { + formModel.sourceId = obj.value + formModel.sourceName = obj.label + } + if (!e && !obj) { + formModel.sourceId = '' + formModel.sourceName = '' + } + if (e) { + if (formActionType) { + const { updateSchema } = formActionType + let Arr: any = [] + await GetClientSourceDetailSelectList({ id: e }).then((res) => { + res.data.forEach((item) => { + Arr.push({ label: item.detailName, value: item.id }) + }) + }) + updateSchema({ + label: '来源明细', + field: 'sourceDetailId', + component: 'Select', + required: false, + dynamicDisabled: ({ values }) => { + return !values.sourceId + }, + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + allowClear: true, + options: Arr, + showSearch: true, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + onChange: (e, obj) => { + if (e && obj) { + formModel.sourceDetailId = obj.value + formModel.sourceDetailName = obj.label + } + if (!e && !obj) { + formModel.sourceDetailId = '' + formModel.sourceDetailName = '' + } + }, + } + }, + }) + } + } + formModel.sourceDetailId = '' + }, + } + }, + }, + { + label: '来源明细Name', + field: 'sourceDetailName', + component: 'Input', + defaultValue: '', + show: false, + }, + { + label: '来源明细', + field: 'sourceDetailId', + component: 'Select', + required: false, + dynamicDisabled: ({ values }) => { + return !values.sourceId + }, + colProps: { span: 4 }, + }, + // { // field: 'unitPrice', // label: '冷藏费率', @@ -1020,13 +1051,7 @@ export const formSchema: FormSchema[] = [ colProps: { span: 4 }, defaultValue: 0, }, - { - field: 'commissionUserId', - label: '提成参与人', - component: 'Select', - defaultValue: '', - colProps: { span: 4 }, - }, + { field: 'feeFRT', label: '默认付费方式', diff --git a/src/views/baseinfo/infoclient/index.vue b/src/views/baseinfo/infoclient/index.vue index 16a929c3..8fb4a3f7 100644 --- a/src/views/baseinfo/infoclient/index.vue +++ b/src/views/baseinfo/infoclient/index.vue @@ -1,37 +1,27 @@