From 31e0b48caba002e0551571f876ea049ebf614a35 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: Thu, 14 Nov 2024 09:07:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=90=8E=20=E7=BC=96=E8=BE=91=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infoclient/ClientAccountDateModal.vue | 12 ++- .../TenantAuditStepModal.vue | 10 +++ .../infoclient/ClientStakeholder/columns.tsx | 2 +- .../infoclient/ClientStakeholder/index.vue | 14 +++- .../FeeCustTemplate/TenantAuditStepModal.vue | 15 +++- .../infoclient/FeeCustTemplate/columns.tsx | 34 ++++---- .../infoclient/FeeCustTemplate/feeField.vue | 24 +++--- .../infoclient/FeeCustTemplate/index.vue | 12 ++- .../ReleaseType/TenantAuditStepModal.vue | 10 +++ .../infoclient/ReleaseType/columns.tsx | 4 +- .../baseinfo/infoclient/ReleaseType/index.vue | 20 ++++- .../infoclient/TenantAuditStepModal.vue | 81 ++++++++++++++++--- .../customerParams/components/Modal.vue | 10 +++ .../infoclient/customerParams/index.vue | 11 ++- .../infoclient/menu2/TenantAuditStepModal.vue | 10 +++ src/views/baseinfo/infoclient/menu2/index.vue | 13 ++- .../infoclient/menu3/TenantAuditStepModal.vue | 10 +++ src/views/baseinfo/infoclient/menu3/index.vue | 13 ++- .../infoclient/tabs3/TenantAuditStepModal.vue | 10 +++ src/views/baseinfo/infoclient/tabs3/index.vue | 22 +++-- .../CustomerReconciliation/columns.tsx | 31 +++---- .../CustomerReconciliation/index.vue | 77 ++++++------------ src/views/system/org/columns.tsx | 2 +- 23 files changed, 310 insertions(+), 137 deletions(-) diff --git a/src/views/baseinfo/infoclient/ClientAccountDateModal.vue b/src/views/baseinfo/infoclient/ClientAccountDateModal.vue index b2010f54..396410ed 100644 --- a/src/views/baseinfo/infoclient/ClientAccountDateModal.vue +++ b/src/views/baseinfo/infoclient/ClientAccountDateModal.vue @@ -17,6 +17,7 @@ ghost style="margin-right: 0.8rem" @click="closeModal" + :disabled="props.disabled" >取消 仅保存 保存并关闭 @@ -46,11 +49,17 @@ import { useMessage } from '/@/hooks/web/useMessage' // 声明Emits const emit = defineEmits(['success', 'register']) + const props = defineProps({ + disabled: { + type: Boolean, + default: false, + }, + }) const isUpdate = ref(true) const loading = ref(false) const rowId = ref('') const { notification } = useMessage() - const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({ + const [registerForm, { resetFields, setProps, setFieldsValue, validate }] = useForm({ labelWidth: 100, schemas: CADformSchema, showActionButtonGroup: false, @@ -73,6 +82,7 @@ } else { setFieldsValue({ clientId: data.record.id }) } + setProps({ disabled: props.disabled }) setModalProps({ loading: false }) }) diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue index 59eb8bd6..0b4e2b6f 100644 --- a/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue +++ b/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue @@ -17,6 +17,7 @@ ghost style="margin-right: 0.8rem" @click="closeModal" + :disabled="props.disabled" >取消 仅保存 保存并关闭 @@ -47,6 +50,12 @@ import { useMessage } from '/@/hooks/web/useMessage' // 声明Emits const emit = defineEmits(['success', 'register']) + const props = defineProps({ + disabled: { + type: Boolean, + default: false, + }, + }) const isUpdate = ref(true) const loading = ref(false) const rowId = ref('') @@ -55,6 +64,7 @@ labelWidth: 100, schemas: formSchema, showActionButtonGroup: false, + disabled: props.disabled, }) const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx index 3f0ebfee..04d74056 100644 --- a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx +++ b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx @@ -80,7 +80,7 @@ export const formSchema: FormSchema[] = [ field: 'userName', component: 'ApiSelect', required: false, - dynamicDisabled: false, + colProps: { span: 24 }, componentProps: ({ formModel }) => { return { diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue index aee0e266..4696139a 100644 --- a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue +++ b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue @@ -3,11 +3,11 @@ - + - +