From a64b688a342aec91750f392e37ecb1a5e5783a0b 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: Wed, 23 Oct 2024 14:09:36 +0800 Subject: [PATCH] =?UTF-8?q?10/23=20=20=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infoclient/ClientStakeholder/columns.tsx | 28 +++++++++++++------ .../infoclient/TenantAuditStepModal.vue | 1 - src/views/baseinfo/infoclient/columns.tsx | 2 +- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx index 2c578f5f..879ab8e4 100644 --- a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx +++ b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx @@ -4,7 +4,7 @@ import { GetUserList } from '/@/api/common' export const columns: BasicColumn[] = [ { title: '干系人姓名', - dataIndex: 'createByName', + dataIndex: 'userName', sorter: true, width: 150, }, @@ -20,6 +20,18 @@ export const columns: BasicColumn[] = [ sorter: true, width: 150, }, + { + title: '创建人', + dataIndex: 'createByName', + sorter: true, + width: 150, + }, + { + title: '创建时间', + dataIndex: 'createTime', + sorter: true, + width: 150, + }, { title: '备注', dataIndex: 'remark', @@ -30,7 +42,7 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { - field: 'createByName', + field: 'userName', label: '干系人姓名', component: 'Input', colProps: { span: 4 }, @@ -59,13 +71,13 @@ export const formSchema: FormSchema[] = [ }, { label: '干系人Name', - field: 'createByName', + field: 'userName', component: 'Input', show: false, }, { label: '干系人', - field: 'createBy', + field: 'userId', component: 'ApiSelect', required: false, defaultValue: null, @@ -81,12 +93,12 @@ export const formSchema: FormSchema[] = [ onChange: (e, obj) => { if (e && obj) { console.log(e, obj) - formModel.createBy = obj.value - formModel.createByName = obj.label + formModel.userId = obj.value + formModel.userName = obj.label } if (!e && !obj) { - formModel.createBy = '' - formModel.createByName = '' + formModel.userId = '' + formModel.userName = '' } }, } diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue index 8984650a..7ff7e8df 100644 --- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue +++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue @@ -520,7 +520,6 @@ } } function ChangeCustomerOrSupplier() { - // setFieldsValue({ ArrclientTag: [] }) ChangeArrclientTag(true) } watch(activeKey, (nval, oval) => { diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index 2f6cbf3f..cf5f97d8 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -1261,7 +1261,7 @@ export const formSchema: FormSchema[] = [ field: 'ArrclientTag', component: 'ApiSelect', colProps: { span: 12 }, - defaultValue: 'isController', + defaultValue: ['isController'], componentProps: ({ formModel }) => { return { api: () => {