Merge remote-tracking branch 'origin/xuqiubangeng1026'

# Conflicts:
#	src/views/incomePayments/meetManage/AddOrDetailMeet.vue
This commit is contained in:
fengachen
2021-11-01 09:26:22 +08:00
19 changed files with 575 additions and 237 deletions
+11 -2
View File
@@ -23,7 +23,7 @@ const submitAudit = (param) => postAction('/contract/payIncomeContract/submitAud
// 获取不存在成员单位的工作组信息
const getWorkingGroupListByNotCompany = (param) => getAction('/project/payWorkingGroup/queryListByNotCompany', param)
// 收入合同存档
const archiveRevenueContract = (param) => postAction('contract/payIncomeContract/archive', param)
const archiveRevenueContract = (param) => postAction('/contract/payIncomeContract/archive', param)
// 根据部门id获取用户信息
const queryUserByDepartId = (param) => getAction('/sys/user/listRoleAndDepart', param)
// 企业联系人新建重名校验
@@ -80,6 +80,12 @@ const checkCompanyAduit = (param) => getAction('/payMailContract/payMailContract
const getAllDepartTreeList = (param) => getAction('/sys/sysDepart/queryTreeAllList', param)
// 验证项目是否关联合同
const getIsAssociatedProject = (param) => getAction('/contract/payIncomeContract/getAssociatedProject', param)
// 支出合同审核
const aduitExpenditureContract = (param) => postAction('/contract/paySpendingContract/audit', param)
// 支出合同存档
const archiveExpenditureContract = (param) => postAction('/contract/paySpendingContract/archive', param)
// 获取全部收入合同(通过企业id查询列表)
const getAllRevenueContract = (param) => getAction('/contract/payIncomeContract/queryByCompanyId', param)
export {
getWorkingGroupById,
@@ -121,5 +127,8 @@ export {
sysReminders,
checkCompanyAduit,
getAllDepartTreeList,
getIsAssociatedProject
getIsAssociatedProject,
aduitExpenditureContract,
archiveExpenditureContract,
getAllRevenueContract
}