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 @@
干系人列表
-
+
添加
-
+
删除
@@ -26,7 +26,11 @@
-
+
-
+
取消
@@ -29,6 +35,7 @@
pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem"
@click="handleSave(false)"
+ :disabled="props.disabled"
>
仅保存
@@ -37,6 +44,7 @@
type="primary"
:loading="loading"
@click="handleSave(true)"
+ :disabled="props.disabled"
>
保存并关闭
@@ -61,6 +69,10 @@
const props = defineProps({
customerName: { type: String },
customerId: { type: String },
+ disabled: {
+ type: Boolean,
+ default: false,
+ },
})
// 声明Emits
const emit = defineEmits(['success', 'register'])
@@ -88,6 +100,7 @@
labelWidth: 100,
schemas: formSchema,
showActionButtonGroup: false,
+ disabled: props.disabled,
})
const unitArr = ref([])
const BulkInfoArr = ref([])
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
index 035c2ab6..b443ed09 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
@@ -440,7 +440,7 @@ export const searchFormSchema: FormSchema[] = [
// label: '客户名称',
// component: 'ApiSelect',
// required: false,
- // dynamicDisabled: false,
+ //
// colProps: { span: 4 },
// componentProps: ({ formModel }) => {
// return {
@@ -514,7 +514,7 @@ export const searchFormSchema: FormSchema[] = [
label: '起运港',
field: 'polCode',
component: 'ApiSelect',
- dynamicDisabled: false,
+
colProps: { span: 4 },
componentProps: () => {
return {
@@ -535,7 +535,7 @@ export const searchFormSchema: FormSchema[] = [
field: 'podCode',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
colProps: { span: 4 },
componentProps: () => {
return {
@@ -556,7 +556,7 @@ export const searchFormSchema: FormSchema[] = [
label: '航线',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
@@ -575,7 +575,7 @@ export const searchFormSchema: FormSchema[] = [
field: 'sourceId',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
@@ -608,7 +608,7 @@ export const searchFormSchema: FormSchema[] = [
component: 'ApiSelect',
required: false,
// labelSlot: 'yardId',
- dynamicDisabled: false,
+
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
@@ -629,7 +629,7 @@ export const searchFormSchema: FormSchema[] = [
label: '付费方式',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
colProps: { span: 4 },
componentProps: () => {
return {
@@ -841,7 +841,7 @@ export const formSchema: FormSchema[] = [
label: '起运港',
field: 'polCode',
component: 'ApiSelect',
- dynamicDisabled: false,
+
colProps: { span: 6 },
componentProps: () => {
return {
@@ -862,7 +862,7 @@ export const formSchema: FormSchema[] = [
field: 'podCode',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
colProps: { span: 6 },
componentProps: () => {
return {
@@ -883,7 +883,7 @@ export const formSchema: FormSchema[] = [
label: '航线',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
colProps: { span: 6 },
componentProps: ({ formModel }) => {
return {
@@ -902,7 +902,7 @@ export const formSchema: FormSchema[] = [
field: 'sourceId',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
colProps: { span: 6 },
componentProps: ({ formActionType, formModel }) => {
return {
@@ -1001,7 +1001,7 @@ export const formSchema: FormSchema[] = [
component: 'ApiSelect',
required: false,
// labelSlot: 'yardId',
- dynamicDisabled: false,
+
colProps: { span: 6 },
componentProps: ({ formModel }) => {
return {
@@ -1022,7 +1022,7 @@ export const formSchema: FormSchema[] = [
label: '付费方式',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
defaultValue: null,
colProps: { span: 6 },
componentProps: ({ formModel, formActionType }) => {
@@ -1151,7 +1151,7 @@ export const detailsFormSchema: FormSchema[] = [
label: '费用名称',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
defaultValue: null,
colProps: { span: 6 },
componentProps: ({ formModel }) => {
@@ -1212,7 +1212,7 @@ export const detailsFormSchema: FormSchema[] = [
label: '客户类别',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
defaultValue: null,
colProps: { span: 6 },
componentProps: ({ formModel }) => {
@@ -1258,7 +1258,7 @@ export const detailsFormSchema: FormSchema[] = [
label: '单位标准',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
defaultValue: null,
colProps: { span: 6 },
componentProps: ({ formModel }) => {
@@ -1306,7 +1306,7 @@ export const detailsFormSchema: FormSchema[] = [
label: '币别',
component: 'ApiSelect',
required: false,
- dynamicDisabled: false,
+
defaultValue: null,
colProps: { span: 6 },
componentProps: ({ formModel }) => {
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
index 42bae383..21efc563 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
@@ -3,15 +3,15 @@
费用明细
-
+
设置方案条件
-
+
添加
-
+
复制
@@ -25,7 +25,7 @@
cancel-text="否"
@confirm="deleteRow"
>
-
+
删除
@@ -61,14 +61,7 @@