1.周报填报返回列表增加字段id,方便新增/编辑
2.新增项目预算执行率监控周报 页面/路由/方法
This commit is contained in:
parent
ec9b394f34
commit
432a83c643
@ -59,9 +59,9 @@
|
||||
//table单选操作
|
||||
tableShowSingleOperation: {
|
||||
show: true,
|
||||
showEdit: false,
|
||||
showDelete: false,
|
||||
showCheck: true,
|
||||
showEdit: true,
|
||||
showDelete: true,
|
||||
showCheck: true
|
||||
},
|
||||
//分页
|
||||
pageNo: 1,
|
||||
@ -97,6 +97,7 @@
|
||||
let dataList = result.data.ls;
|
||||
for (let i=0; i<dataList.length; i++) {
|
||||
this.tableRowsData.push({
|
||||
id: dataList[i].id,
|
||||
projectNo: dataList[i].projectNo,
|
||||
projectName: dataList[i].projectName,
|
||||
userName: dataList[i].userName,
|
||||
|
@ -330,7 +330,7 @@ export default {
|
||||
Api.ProjectManagements.addWeekly(data.projectWeeklyAddReq).then(result => {
|
||||
this.isSave = true
|
||||
if (result.status === 0) {
|
||||
this.$message.info('添加成功!')
|
||||
this.$message.success('添加成功!')
|
||||
this.$router.push({name: 'WeeklyClaimApply'})
|
||||
} else {
|
||||
this.$message.error(result.data)
|
||||
|
@ -213,7 +213,7 @@ export default {
|
||||
if (this.$route.name === 'ExpenseClaimApplyEdit') {
|
||||
this.isEdit = true
|
||||
this.flowId = this.$route.params.id
|
||||
console.log("路由ID为",this.$route.params.id)
|
||||
console.log('路由ID为', this.$route.params.id)
|
||||
this.checkOrVerify = true
|
||||
} else if (this.$route.name === 'ExpenseClaimApplyVerify') {
|
||||
this.isVerify = true
|
||||
@ -278,7 +278,10 @@ export default {
|
||||
// })
|
||||
},
|
||||
getWeekly () {
|
||||
Api.ProjectManagements.getWeekly().then(result => {
|
||||
let ProjectWeekly = {
|
||||
id: this.reimburseId
|
||||
}
|
||||
Api.ProjectManagements.getWeekly(ProjectWeekly).then(result => {
|
||||
this.tableRowsData = []
|
||||
this.pageLoading = false
|
||||
if (result.status === 0) {
|
||||
|
@ -318,7 +318,9 @@ const DispatchDetails = r => require.ensure([], () => r(require('../pages/projec
|
||||
const WeeklyClaimApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApply.vue')), 'WeeklyClaimApply')
|
||||
const AddClaimApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApplyAdd.vue')), 'AddClaimApply')
|
||||
const ClaimApplyDetail = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue')), 'ClaimApplyDetail')
|
||||
|
||||
const ProjectBudgetApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue')), 'ProjectBudgetApply')
|
||||
const ProjectBudgetApplyAdd = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyAdd.vue')), 'ProjectBudgetApplyAdd')
|
||||
const ProjectBudgetApplyDetail = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue')), 'ProjectBudgetApplyDetail')
|
||||
//财务管理
|
||||
const ExpenseReceipteManagement = r => require.ensure([], () => r(require('../pages/financialManagement/expenseReceipteManagement/ExpenseReceipteManagement.vue')), 'ExpenseReceipteManagement')
|
||||
const ExpenseReceipteDetail = r => require.ensure([], () => r(require('../pages/financialManagement/expenseReceipteManagement/ExpenseReceipteDetail.vue')), 'ExpenseReceipteDetail')
|
||||
@ -2295,6 +2297,36 @@ export default new Router({
|
||||
module: 'finance'
|
||||
}
|
||||
},
|
||||
{
|
||||
//项目管理-->周报填报-->项目预算执行率监控周报
|
||||
name: 'ProjectBudgetApply',
|
||||
path: '/project/managements/weekly/budget/expenses/claim/apply',
|
||||
component: ProjectBudgetApply,
|
||||
meta: {
|
||||
info: 'ProjectBudgetApply',
|
||||
module: 'project'
|
||||
}
|
||||
},
|
||||
{
|
||||
//项目管理-->周报填报-->新增项目预算执行率监控周报
|
||||
name: 'ProjectBudgetApplyAdd',
|
||||
path: '/project/managements/weekly/budget/expenses/claim/apply/add',
|
||||
component: ProjectBudgetApplyAdd,
|
||||
meta: {
|
||||
info: 'ProjectBudgetApplyAdd',
|
||||
module: 'project'
|
||||
}
|
||||
},
|
||||
{
|
||||
//项目管理-->周报填报-->项目预算执行率监控周报详情
|
||||
name: 'ProjectBudgetApplyDetail',
|
||||
path: '/project/managements/weekly/budget/expenses/claim/apply/edit/:id',
|
||||
component: ProjectBudgetApplyDetail,
|
||||
meta: {
|
||||
info: 'ProjectBudgetApplyDetail',
|
||||
module: 'finance'
|
||||
}
|
||||
},
|
||||
//
|
||||
// {
|
||||
// //项目管理-->项目立项
|
||||
|
@ -42,8 +42,15 @@ export default {
|
||||
getOrgNames:(param) => Ax('post', `/api/common/orgs/getName`,param),
|
||||
|
||||
/**
|
||||
* 周报填报管理
|
||||
* 个人周报填报管理
|
||||
*/
|
||||
addWeekly: (param) => Ax('post', '/api/project/weekly/add', param),
|
||||
getWeekly: (param) => Ax('post', '/api/project/weekly', param)
|
||||
getWeekly: (param) => Ax('post', '/api/project/weekly', param),
|
||||
/**
|
||||
* 项目预算执行率监控周报管理
|
||||
*
|
||||
*/
|
||||
getBudget:(param) => Ax('post', '/api/project/weekly/budget', param),
|
||||
addBudget:(param) => Ax('post', '/api/project/weekly/budget/add', param),
|
||||
delBudget:(param) => Ax('delete', '/api/project/weekly/budget/del', param),
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user