diff --git a/src/views/sales/Customer/components/bankListModal.vue b/src/components/common/bankListModal.vue similarity index 100% rename from src/views/sales/Customer/components/bankListModal.vue rename to src/components/common/bankListModal.vue diff --git a/src/views/sales/Customer/components/bankModal.vue b/src/components/common/bankModal.vue similarity index 98% rename from src/views/sales/Customer/components/bankModal.vue rename to src/components/common/bankModal.vue index 11d4c51..8c02bb8 100644 --- a/src/views/sales/Customer/components/bankModal.vue +++ b/src/components/common/bankModal.vue @@ -48,7 +48,7 @@ import { useI18n } from '/@/hooks/web/useI18n'; import type { Rule } from 'ant-design-vue/es/form'; import { useMessage } from '/@/hooks/web/useMessage'; import { getDictionary } from '/@/api/sales/Customer'; -import bankListModal from './bankListModal.vue' +import bankListModal from '/@/components/common/bankListModal.vue' import { useModal } from '/@/components/Modal'; const { t } = useI18n(); diff --git a/src/views/sales/Customer/components/certificateModal.vue b/src/components/common/certificateModal.vue similarity index 100% rename from src/views/sales/Customer/components/certificateModal.vue rename to src/components/common/certificateModal.vue diff --git a/src/views/sales/Customer/components/contactModal.vue b/src/components/common/contactModal.vue similarity index 100% rename from src/views/sales/Customer/components/contactModal.vue rename to src/components/common/contactModal.vue diff --git a/src/views/sales/CustomerGroup/components/customerListModal.vue b/src/components/common/customerListModal.vue similarity index 100% rename from src/views/sales/CustomerGroup/components/customerListModal.vue rename to src/components/common/customerListModal.vue diff --git a/src/views/sales/Customer/components/createForm.vue b/src/views/sales/Customer/components/createForm.vue index 287168a..983cf64 100644 --- a/src/views/sales/Customer/components/createForm.vue +++ b/src/views/sales/Customer/components/createForm.vue @@ -305,9 +305,9 @@ import useEventBus from '/@/hooks/event/useEventBus'; import type { Rule } from 'ant-design-vue/es/form'; import { getDocCpList, getDictionary } from '/@/api/sales/Customer'; - import certificateModal from './certificateModal.vue'; - import contactModal from './contactModal.vue'; - import bankModal from './bankModal.vue'; + import certificateModal from '/@/components/common/certificateModal.vue'; + import contactModal from '/@/components/common/contactModal.vue'; + import bankModal from '/@/components/common/bankModal.vue'; import { useModal } from '/@/components/Modal'; import { addLngCustomer,updateLngCustomer,getLngCustomer } from '/@/api/sales/Customer'; import dayjs from 'dayjs'; @@ -485,7 +485,7 @@ optionSelect.validList = await getDictionary('LNG_VALID') optionSelect.approCodeList = await getDictionary('LNG_APPRO') - optionSelect.docCpList = await getDocCpList({'valid': 'Y'}) + optionSelect.docCpList = await getDocCpList() } function stateSignChange(val) { if (val!='Y'){ @@ -621,7 +621,7 @@ arr.push(v) } }) - if (arr.length > 1 || !arr.length) { + if (arr.length !== 1) { notification.warning({ message: 'Tip', description: '默认银行有且仅有一个' diff --git a/src/views/supplier/Supplier/components/createForm.vue b/src/views/supplier/Supplier/components/createForm.vue index f7de1d3..19fcedc 100644 --- a/src/views/supplier/Supplier/components/createForm.vue +++ b/src/views/supplier/Supplier/components/createForm.vue @@ -231,9 +231,9 @@ import useEventBus from '/@/hooks/event/useEventBus'; import type { Rule } from 'ant-design-vue/es/form'; import { getDocCpList, getDictionary } from '/@/api/sales/Customer'; - import certificateModal from '/@/views/sales/Customer/components/certificateModal.vue'; - import contactModal from '/@/views/sales/Customer/components/contactModal.vue'; - import bankModal from '/@/views/sales/Customer/components/bankModal.vue'; + import certificateModal from '/@/components/common/certificateModal.vue'; + import contactModal from '/@/components/common/contactModal.vue'; + import bankModal from '/@/components/common/bankModal.vue'; import { useModal } from '/@/components/Modal'; import { addLngSupplier,updateLngSupplier,getLngSupplier } from '/@/api/supplier/Supplier'; import dayjs from 'dayjs'; @@ -399,7 +399,7 @@ optionSelect.signList = await getDictionary('LNG_YN') optionSelect.validList = await getDictionary('LNG_VALID') optionSelect.approCodeList = await getDictionary('LNG_APPRO') - optionSelect.docCpList = await getDocCpList({'valid': 'Y'}) + optionSelect.docCpList = await getDocCpList() } const handleAdd = (val)=> { curIdx.value = null @@ -524,7 +524,7 @@ arr.push(v) } }) - if (arr.length > 1 || !arr.length) { + if (arr.length !== 1) { notification.warning({ message: 'Tip', description: '默认银行有且仅有一个'