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
93a84408
Commit
93a84408
authored
Mar 11, 2024
by
danfuman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
866c1b33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
3 deletions
+45
-3
index.js
dsk-operate-ui/src/api/projectCostLedger/index.js
+11
-0
index.vue
...projectCostLedger/detail/components/FeedSummary/index.vue
+34
-3
No files found.
dsk-operate-ui/src/api/projectCostLedger/index.js
View file @
93a84408
...
...
@@ -213,6 +213,17 @@ export const getFeedSummaryMenuTreeApi = (params = {}) => request({
params
});
/**
* 实体工程材料-单位换算提示
* @param {*} params
* @returns
*/
export
const
getFeedSummaryConversionNotice
=
(
params
=
{})
=>
request
({
url
:
"/cb/quantity/summary/conversionNotice"
,
method
:
"get"
,
params
});
/**
* 获取已记录月份集合
* @param {*} params
...
...
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
View file @
93a84408
...
...
@@ -55,7 +55,7 @@
</template>
<
script
>
import
ProjectSideMenu
from
"@/views/projectCostLedger/detail/components/ProjectSideMenu"
;
import
{
getFeedSummaryMenuTreeApi
,
getFeedSummaryMonthListApi
,
getFeedSummaryListApi
}
from
"@/api/projectCostLedger"
;
import
{
getFeedSummaryMenuTreeApi
,
getFeedSummaryMonthListApi
,
getFeedSummaryListApi
,
getFeedSummaryConversionNotice
}
from
"@/api/projectCostLedger"
;
import
DskTableHeaderSetting
from
"@/components/DskTableHeaderSetting"
;
import
DskSkeleton
from
"@/components/DskSkeleton"
;
import
CustomTable
from
"@/components/CustomTable"
;
...
...
@@ -330,7 +330,7 @@ export default {
const
_now
=
this
.
getNowMonth
();
this
.
recordDate
=
_now
;
this
.
oldRecordDate
=
_now
;
// 默认以当前月数据为准 若不包含当前月 需要手动push数据
// 默认以当前月数据为准 若不包含当前月 需要手动push数据
if
(
!
data
.
includes
(
_now
))
{
data
.
push
(
_now
);
}
...
...
@@ -384,6 +384,37 @@ export default {
// 请求数据列表
const
params
=
this
.
createRequestConditions
();
this
.
getFeedSummaryList
(
params
);
if
(
this
.
currentParentName
.
indexOf
(
'实体工程材料'
)
!=
-
1
){
const
{
projectId
,
cbStage
}
=
this
.
comProjectDetailInfo
;
const
params
=
{
projectId
,
cbStage
};
params
[
"cbSubjectName"
]
=
this
.
currentNodeName
;
// 判断当月是否存在于server返回month集合中
const
_now
=
this
.
getNowMonth
();
if
(
this
.
includeNowMonth
(
_now
))
{
params
[
"recordDate"
]
=
_now
;
}
this
.
getFeedSummaryConversionNotice
(
params
)
}
},
async
getFeedSummaryConversionNotice
(
params
)
{
const
data
=
await
getFeedSummaryConversionNotice
(
params
);
if
(
data
.
data
==
500
)
{
this
.
$confirm
(
'系统检测到您近一月未进行物料单位换算,是否立即进行换算?'
,
'温馨提示'
,
{
confirmButtonText
:
'立即换算'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
}).
catch
(()
=>
{
this
.
$message
({
type
:
'info'
,
message
:
'已取消删除'
});
});
}
},
getCurrentType
(
parent
)
{
if
(
parent
.
level
==
2
)
{
...
...
@@ -415,7 +446,7 @@ export default {
const
_selectActualCostTime
=
this
.
selectActualCostTime
;
this
.
addActualCostEditStatus
=
false
;
this
.
selectActualCostTime
=
""
;
/**
/**
* 判断 当前需要编辑 或者新增的成本年份是否存在于server返回的month数组中
* 默认本月
*/
...
...
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