1.项目预算执行率增加部门名字
2.部门周报增加一个判断参数flag,用于判断当前是部门/全所周报修改 3.全所周报增加路由参数flag
This commit is contained in:
parent
b1974e3ca9
commit
6974020e51
@ -99,6 +99,7 @@ export default {
|
|||||||
id: dataList[i].id,
|
id: dataList[i].id,
|
||||||
projectNo: dataList[i].projectNo,
|
projectNo: dataList[i].projectNo,
|
||||||
projectName: dataList[i].projectName,
|
projectName: dataList[i].projectName,
|
||||||
|
deptName: dataList[i].deptName,
|
||||||
week: dataList[i].week,
|
week: dataList[i].week,
|
||||||
budget: dataList[i].budget,
|
budget: dataList[i].budget,
|
||||||
execute: dataList[i].execute,
|
execute: dataList[i].execute,
|
||||||
@ -172,6 +173,11 @@ export default {
|
|||||||
prop: 'projectName',
|
prop: 'projectName',
|
||||||
show: true
|
show: true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: "执行部门",
|
||||||
|
prop: 'deptName',
|
||||||
|
show: true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '周数',
|
label: '周数',
|
||||||
prop: 'week',
|
prop: 'week',
|
||||||
|
@ -105,6 +105,7 @@ export default {
|
|||||||
expandRight: false,
|
expandRight: false,
|
||||||
app: app,
|
app: app,
|
||||||
reimburseId: '',
|
reimburseId: '',
|
||||||
|
flag: '',
|
||||||
actionUrl: `${baseUrl}/api/common/file-upload`, // 上传路径
|
actionUrl: `${baseUrl}/api/common/file-upload`, // 上传路径
|
||||||
baseUrl: baseUrl,
|
baseUrl: baseUrl,
|
||||||
formAll: [],
|
formAll: [],
|
||||||
@ -173,12 +174,13 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
init () {
|
init () {
|
||||||
this.reimburseId = this.$route.params.id
|
this.reimburseId = this.$route.params.id
|
||||||
|
this.flag = this.$route.params.flag
|
||||||
this.getWeekly()
|
this.getWeekly()
|
||||||
|
|
||||||
},
|
},
|
||||||
getWeekly () {
|
getWeekly () {
|
||||||
let ProjectWeekly = {
|
let ProjectWeekly = {
|
||||||
id: this.reimburseId
|
id: this.reimburseId,
|
||||||
|
flag: this.flag
|
||||||
}
|
}
|
||||||
Api.ProjectManagements.getDepartmentWeekly(ProjectWeekly).then(result => {
|
Api.ProjectManagements.getDepartmentWeekly(ProjectWeekly).then(result => {
|
||||||
this.tableRowsData = []
|
this.tableRowsData = []
|
||||||
|
@ -294,7 +294,10 @@ export default {
|
|||||||
updateById (id) {
|
updateById (id) {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: "WholeFirmWeeklyEdit",
|
name: "WholeFirmWeeklyEdit",
|
||||||
params: {id}
|
params: {
|
||||||
|
id,
|
||||||
|
flag: '1'
|
||||||
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
updateWorkload (id) {
|
updateWorkload (id) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user