Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
88862b3f
Commit
88862b3f
authored
Feb 26, 2024
by
huangjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*
parent
5165b094
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
356 additions
and
65 deletions
+356
-65
index.js
dsk-operate-ui/src/api/projectCostLedger/index.js
+28
-4
index.vue
.../projectCostLedger/detail/components/ProfitLoss/index.vue
+208
-0
index.vue
dsk-operate-ui/src/views/projectCostLedger/detail/index.vue
+7
-1
index.vue
dsk-operate-ui/src/views/projectCostLedger/index.vue
+112
-60
index.vue
dsk-operate-ui/src/views/projectCostLedger/upload/index.vue
+1
-0
No files found.
dsk-operate-ui/src/api/projectCostLedger/index.js
View file @
88862b3f
...
...
@@ -2,8 +2,8 @@ import request from '@/utils/request';
/**
* 获取项目详情
* @param {*} params
* @returns
* @param {*} params
* @returns
*/
export
const
getProjectDetailApi
=
(
params
=
{})
=>
request
({
url
:
""
,
...
...
@@ -34,6 +34,13 @@ export function editProjectInfo(data) {
data
:
data
,
});
}
//删除项目
export
function
batchDeleteProject
(
ids
)
{
return
request
({
url
:
'/cbProjectRecord/batchDeleteProject/'
+
ids
,
method
:
'Delete'
,
});
}
//新增新阶段项目
export
function
addNewStageProject
(
data
)
{
return
request
({
...
...
@@ -90,12 +97,29 @@ export function getProjectCbStageNotDraft(relatedId) {
});
}
//查询当前项目可删除成本阶段
export
function
getProjectList
(
data
)
{
return
request
({
url
:
'/cbProjectRecord/getProjectList'
,
method
:
'get'
,
params
:
data
});
}
//盈亏分析对比 左侧菜单
export
const
getProfitLossMenuTreeApi
=
(
params
=
{})
=>
request
({
url
:
"/cbSummary/cbNameList"
,
method
:
"get"
,
params
})
// 工料汇总
/**
* 获取供料汇总左侧菜单
* @param {*} params
* @returns
* @param {*} params
* @returns
*/
export
const
getFeedSummaryMenuTreeApi
=
(
params
=
{})
=>
request
({
url
:
"/cb/quantity/summary/subjectTree"
,
...
...
dsk-operate-ui/src/views/projectCostLedger/detail/components/ProfitLoss/index.vue
0 → 100644
View file @
88862b3f
<
template
>
<div
class=
"otherProjects-container"
>
<div
class=
"otherProjects-cont"
>
<div
class=
"left"
>
<div
class=
"left-menu"
>
</div>
</div>
<!--
<div
class=
"right-table"
>
-->
<!--
<div
class=
"table-item"
>
-->
<!--
<tables-->
<!--v-if="!isSkeleton"-->
<!--:tableLoading="tableLoading"-->
<!--:tableData="tableData"-->
<!--:forData="forData1"-->
<!--:MaxPage=500-->
<!--:tableDataTotal="tableDataTotal"-->
<!--:queryParams="queryParams"-->
<!--@handle-current-change="handleCurrentChange"-->
<!--@sort-change="sortChange"-->
<!-->-->
<!--
<template
slot=
"number"
slot-scope=
"scope"
>
-->
<!--
<div>
{{
scope
.
row
.
number
||
'--'
}}
</div>
-->
<!--
</
template
>
-->
<!--<template slot="proportion" slot-scope="scope">-->
<!--<div>{{scope.row.proportion || '--'}}{{scope.row.proportion ? '%':''}}</div>-->
<!--</template>-->
<!--</tables>-->
<!--</div>-->
<!--</div>-->
</div>
</div>
</template>
<
script
>
import
Tables
from
"../../../../component/Tables"
import
{
getProfitLossMenuTreeApi
}
from
'@/api/projectCostLedger/index'
export
default
{
name
:
"ProfitLoss"
,
props
:{
// 项目ID
projectId
:
{
type
:
String
,
required
:
true
,
default
:
""
},
// // 详情信息
// projectDetailInfo: {
// type: Object,
// default: () => ({})
// }
},
watch
:
{
// projectDetailInfo: {
// handler(newValue) {
// this.comProjectDetailInfo = newValue ? newValue : {};
// this.init(this.comProjectDetailInfo);
// },
// deep: true,
// immediate: true
// },
// projectId: {
// handler(newValue) {
// this.comProjectId = newValue;
// },
// immediate: true
// }
},
components
:
{
Tables
,
},
data
()
{
return
{
menuOptions
:
{
nodeName
:
"name"
,
nodeValue
:
"name"
,
},
comProjectDetailInfo
:
{},
comProjectId
:
""
,
defaultActive
:
""
,
menuTreeList
:
[
// {
// nodeName: "房建类成本科目",
// id: "1",
// children: [
// {
// nodeName: "劳务分包工程",
// id: "1-1",
// children: [
// {
// nodeName: "主体工程-结构劳务",
// id: "1-1-1",
// children: [
// {
// nodeName: "结构劳务分包",
// id: "1-1-1-1",
// }
// ]
// },
// {
// nodeName: "二次结构及粗装修劳务",
// id: "1-2-1",
// children: [
// {
// nodeName: "二次机构及粗装修劳务",
// id: "1-2-1",
// }
// ]
// },
// {
// nodeName: "拆除、修缮、清理、改造劳...",
// id: "1-3-1",
// children: [
// {
// nodeName: "拆除、修缮、清理、改造劳...",
// id: "1-3-1",
// }
// ]
// }
// ]
// },
// {
// nodeName: "专业分包工程",
// id: "2-1",
// },
// {
// nodeName: "实体工程材料(土建)",
// id: "3-1",
// },
// {
// nodeName: "其他直接费成本",
// id: "4-1",
// },
// ]
// },
// {
// nodeName: "未归类项目",
// id: "2",
// children: []
// }
]
}
},
//可访问data属性
created
()
{
console
.
log
(
this
.
projectId
)
this
.
init
()
},
//计算集
computed
:
{
},
async
init
(
detail
=
{})
{
let
cbStage
=
1
try
{
const
{
projectId
,
cbStage
}
=
detail
;
if
(
!
projectId
)
return
;
await
this
.
getProfitLossMenuTree
({
projectId
,
cbStage
});
}
catch
(
error
)
{
}
},
async
getProfitLossMenuTree
(
params
)
{
try
{
const
result
=
await
getProfitLossMenuTreeApi
(
params
);
if
(
result
.
code
==
200
)
{
const
_tempArray
=
result
.
data
;
this
.
menuTreeList
=
_tempArray
;
}
}
catch
(
error
)
{
}
},
}
</
script
>
<
style
lang=
"scss"
scoped
>
.otherProjects-container
{
width
:
100%
;
box-sizing
:
border-box
;
background
:
#ffffff
;
height
:
100%
;
align-items
:
center
;
.otherProjects-cont
{
display
:
flex
;
width
:
100%
;
height
:
100%
;
}
.left
{
width
:
220px
;
height
:
100%
;
.left-menu
{
width
:
100%
;
height
:
100%
;
border-right
:
1px
solid
#eeeeee
;
overflow
:
auto
;
}
white-space
:
nowrap
;
/* 不换行 */
overflow
:
hidden
;
/* 超出部分隐藏 */
text-overflow
:
ellipsis
;
/* 显示省略号 */
}
.right-table
{
width
:
calc
(
100%
-
220px
);
padding
:
16px
;
}
}
</
style
>
dsk-operate-ui/src/views/projectCostLedger/detail/index.vue
View file @
88862b3f
...
...
@@ -20,6 +20,9 @@
<!-- 其他项目 -->
<other-projects
v-if=
"current == 'otherItems'"
></other-projects>
<!-- 盈亏分析对比 -->
<profit-Loss
v-if=
"current == 'profitAndLoss'"
:project-id=
"projectID"
></profit-Loss>
</div>
</div>
</div>
...
...
@@ -35,6 +38,8 @@ import DirectCost from "@/views/projectCostLedger/detail/components/DirectCost";
import
FeedSummary
from
"@/views/projectCostLedger/detail/components/FeedSummary"
;
// 其他项目
import
OtherProjects
from
"@/views/projectCostLedger/detail/components/OtherProjects"
;
// 盈亏分析对比
import
ProfitLoss
from
"@/views/projectCostLedger/detail/components/ProfitLoss"
;
import
{
v4
}
from
"uuid"
;
import
{
cloneDeep
}
from
"lodash-es"
;
import
{
getProjectDetailApi
}
from
"@/api/projectCostLedger"
;
...
...
@@ -46,7 +51,8 @@ export default {
FeedSummary
,
EngineeringInformation
,
DirectCost
,
OtherProjects
OtherProjects
,
ProfitLoss
},
data
()
{
return
{
...
...
dsk-operate-ui/src/views/projectCostLedger/index.vue
View file @
88862b3f
This diff is collapsed.
Click to expand it.
dsk-operate-ui/src/views/projectCostLedger/upload/index.vue
View file @
88862b3f
...
...
@@ -275,6 +275,7 @@
this
.
formdata
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
uploadData
))
this
.
formdata
.
cbStage
=
this
.
formdata
.
cbStage
.
toString
()
this
.
getDetail
()
console
.
log
(
this
.
uploadData
)
},
methods
:{
goback
(){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment