diff --git a/src/api/approve/Appro/index.ts b/src/api/approve/Appro/index.ts index 03292e1..100299a 100644 --- a/src/api/approve/Appro/index.ts +++ b/src/api/approve/Appro/index.ts @@ -74,11 +74,11 @@ export async function getDept( mode: ErrorMessageMode = 'modal') { /** * @description: 根据用户ID查询默认公司部门 */ -export async function getCompDept(userId: String, mode: ErrorMessageMode = 'modal') { +export async function getCompDept(userId: String,deptId:String, mode: ErrorMessageMode = 'modal') { return defHttp.get( { url: Api.compDept, - params: { userId }, + params: { userId, deptId }, }, { errorMessageMode: mode, diff --git a/src/api/contract/ContractFact/index.ts b/src/api/contract/ContractFact/index.ts index 6386b63..dde77c1 100644 --- a/src/api/contract/ContractFact/index.ts +++ b/src/api/contract/ContractFact/index.ts @@ -48,11 +48,11 @@ export async function getAllUser( mode: ErrorMessageMode = 'modal') { }, ); } -export async function getAllCurrency( mode: ErrorMessageMode = 'modal') { +export async function getAllCurrency(params: LngContractFactPageParams, mode: ErrorMessageMode = 'modal') { return defHttp.get( { url: Api.queryAllCurrency, - params: { }, + params, }, { errorMessageMode: mode, diff --git a/src/api/contract/ContractPurInt/index.ts b/src/api/contract/ContractPurInt/index.ts index f141167..7604c84 100644 --- a/src/api/contract/ContractPurInt/index.ts +++ b/src/api/contract/ContractPurInt/index.ts @@ -25,10 +25,11 @@ export async function getAllCom (mode: ErrorMessageMode = 'modal') { }, ); } -export async function getAllPriceTerm (mode: ErrorMessageMode = 'modal') { +export async function getAllPriceTerm (params: LngContractPageParams, mode: ErrorMessageMode = 'modal') { return defHttp.get( { url: Api.queryAllPriceTerm, + params }, { errorMessageMode: mode, diff --git a/src/api/sales/GradeSystem/index.ts b/src/api/sales/GradeSystem/index.ts index 0c2661a..c4b875c 100644 --- a/src/api/sales/GradeSystem/index.ts +++ b/src/api/sales/GradeSystem/index.ts @@ -5,7 +5,8 @@ import { ErrorMessageMode } from '/#/axios'; enum Api { // Page = '/sales/gradeSystem/page', Page = '/magic-api/sales/gradeSystem/page', - List = '/sales/gradeSystem/list', + // List = '/sales/gradeSystem/list', + List = '/magic-api/sales/gradeSystem/list', Info = '/sales/gradeSystem/info', LngGradeSystem = '/sales/gradeSystem', diff --git a/src/components/common/certificateModal.vue b/src/components/common/certificateModal.vue index 06f64ba..47e9179 100644 --- a/src/components/common/certificateModal.vue +++ b/src/components/common/certificateModal.vue @@ -84,7 +84,7 @@ const props = defineProps({ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { curData.value = '' formState.filePath = '' - getOption() + setModalProps({ confirmLoading: false }); isUpdate.value = !!data?.isUpdate; isDisable.value = data?.btnType == 'view' ? true : false @@ -95,6 +95,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data Object.assign(formState, {...data.record,dateFrom, dateTo}) let json = JSON.parse(JSON.stringify(data.record)) formState.filePath = (json?.fileList||[])[0]?.tableId + getOption() curData.value = json?.docTypeCode } }); @@ -128,7 +129,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data obj = {'suSign': 'Y'} tableName = 'supplier' } - optionList = await getDocCpList({'valid': 'Y',...obj }) + optionList = await getDocCpList({'valid': 'Y',...obj, docTypeCode: formState.docTypeCode }) } const handleCancel = () => { formRef.value.resetFields(); diff --git a/src/components/common/deptUserModal.vue b/src/components/common/deptUserModal.vue index f980bfe..4244711 100644 --- a/src/components/common/deptUserModal.vue +++ b/src/components/common/deptUserModal.vue @@ -106,7 +106,7 @@ return } closeModal(); - emit('success', selectedValues.value); + emit('success', selectedValues.value, deptId.value); }