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
bbe323ec
Commit
bbe323ec
authored
Feb 28, 2024
by
huangjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*
parent
eff1ab3d
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
346 additions
and
45 deletions
+346
-45
index.js
dsk-operate-ui/src/api/projectCostLedger/index.js
+19
-2
index.vue
...rojectCostLedger/detail/components/MeasureItems/index.vue
+288
-16
index.vue
.../projectCostLedger/detail/components/ProfitLoss/index.vue
+15
-10
index.vue
dsk-operate-ui/src/views/projectCostLedger/index.vue
+11
-9
index.vue
dsk-operate-ui/src/views/projectCostLedger/upload/index.vue
+13
-8
No files found.
dsk-operate-ui/src/api/projectCostLedger/index.js
View file @
bbe323ec
...
@@ -74,10 +74,11 @@ export function uploadCbProjectFile(data) {
...
@@ -74,10 +74,11 @@ export function uploadCbProjectFile(data) {
});
});
}
}
//删除文件
//删除文件
export
function
deleteCbProjectFile
(
fileId
)
{
export
function
deleteCbProjectFile
(
data
)
{
return
request
({
return
request
({
url
:
'/cbProjectFile/deleteCbProjectFile
/'
+
fileId
,
url
:
'/cbProjectFile/deleteCbProjectFile
'
,
method
:
'Delete'
,
method
:
'Delete'
,
data
:
data
});
});
}
}
...
@@ -153,6 +154,22 @@ export function getSummarydata(data) {
...
@@ -153,6 +154,22 @@ export function getSummarydata(data) {
data
:
data
data
:
data
});
});
}
}
//措施费推送工程量
export
function
pushProjectvolume
(
data
)
{
return
request
({
url
:
'/cb/cost/measures/push/project/volume'
,
method
:
'post'
,
data
:
data
});
}
//措措施费-获取上一次推送工程量
export
function
projectVolume
(
data
)
{
return
request
({
url
:
'/cb/cost/measures/last/project/volume/'
+
data
,
method
:
'GET'
,
});
}
// 工料汇总
// 工料汇总
...
...
dsk-operate-ui/src/views/projectCostLedger/detail/components/MeasureItems/index.vue
View file @
bbe323ec
This diff is collapsed.
Click to expand it.
dsk-operate-ui/src/views/projectCostLedger/detail/components/ProfitLoss/index.vue
View file @
bbe323ec
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
v-model=
"expenseDate"
v-model=
"expenseDate"
type=
"month"
type=
"month"
placeholder=
"选择月"
@
change=
"changetime"
placeholder=
"选择月"
@
change=
"changetime"
:picker-options=
"pickerOptions"
>
>
</el-date-picker>
</el-date-picker>
</div>
</div>
<div
class=
"table-item"
>
<div
class=
"table-item"
>
...
@@ -115,14 +115,14 @@
...
@@ -115,14 +115,14 @@
data
()
{
data
()
{
return
{
return
{
pickerOptions
:
{
pickerOptions
:
{
disabledDate
(
time
)
{
//
disabledDate(time) {
let
istrue
=
true
//
let istrue = true
let
month
=
new
Date
().
getMonth
()
+
1
//
let month = new Date().getMonth()+1
let
year
=
new
Date
().
getFullYear
()
//
let year = new Date().getFullYear()
let
times
=
(
year
+
5
)
+
'-'
+
month
+
'-01 '
+
'00:00:00'
//
let times = (year+5)+'-'+ month + '-01 ' + '00:00:00'
istrue
=
new
Date
().
getTime
()
<
time
.
getTime
()
&&
time
.
getTime
()
<
new
Date
(
times
).
getTime
()
//
istrue = new Date().getTime()
<
time
.
getTime
()
&&
time
.
getTime
()
<
new
Date
(
times
).
getTime
()
return
!
istrue
//
return !istrue
},
//
},
},
},
menuOptions
:
{
menuOptions
:
{
nodeName
:
"cbName"
,
nodeName
:
"cbName"
,
...
@@ -216,6 +216,7 @@
...
@@ -216,6 +216,7 @@
id
:
this
.
id
,
id
:
this
.
id
,
expenseDate
:
this
.
expenseDate
expenseDate
:
this
.
expenseDate
}
}
console
.
log
(
param
)
getAnalysislist
(
param
).
then
(
res
=>
{
getAnalysislist
(
param
).
then
(
res
=>
{
this
.
tableData
=
res
.
data
this
.
tableData
=
res
.
data
})
})
...
@@ -252,7 +253,11 @@
...
@@ -252,7 +253,11 @@
console
.
log
(
error
)
console
.
log
(
error
)
}
}
},
},
changetime
(){
changetime
(
val
){
console
.
log
(
val
)
// let month = val.getMonth() +1
// let year = val.getFullYear()
// this.expenseDate = year + '-' + (month>= 9? month:'0'+ month)
this
.
select
(
this
.
id
)
this
.
select
(
this
.
id
)
},
},
},
},
...
...
dsk-operate-ui/src/views/projectCostLedger/index.vue
View file @
bbe323ec
...
@@ -68,19 +68,18 @@
...
@@ -68,19 +68,18 @@
<el-table-column
label=
"工程名称"
width=
"416"
:resizable=
"false"
>
<el-table-column
label=
"工程名称"
width=
"416"
:resizable=
"false"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
style=
"display:flex;align-items:center"
>
<div
style=
"display:flex;align-items:center"
>
<!--
<el-tooltip
placement=
"top"
v-if=
"scope.row.customerText.length>20"
>
-->
<el-tooltip
placement=
"top"
v-if=
"scope.row.projectText.length>20"
>
<!--
<div
slot=
"content"
>
{{
scope
.
row
.
projectName
}}
</div>
-->
<div
class=
"renling"
>
<div
class=
"renling"
>
<router-link
v-if=
"scope.row.isGetProjectDetail"
:to=
"`/projectCostLedger/detail?projectID=$
{scope.row.id}`" tag="a"
<router-link
v-if=
"scope.row.isGetProjectDetail"
:to=
"`/projectCostLedger/detail?projectID=$
{scope.row.id}`" tag="a"
class="wordprimary" v-html="scope.row.projectName">
</router-link>
class="wordprimary" v-html="scope.row.projectName">
</router-link>
<span
v-else
v-html=
"scope.row.projectName"
></span>
<span
v-else
v-html=
"scope.row.projectName"
></span>
</div>
</div>
<
!--
</el-tooltip>
--
>
<
/el-tooltip
>
<
!--
<div
class=
"renling"
v-else
>
--
>
<
div
class=
"renling"
v-else
>
<
!--
<router-link
v-if=
"scope.row.companyId"
:to=
"`/enterprise/$
{encodeStr(scope.row.companyId)}?path=cooperationRecord
&
companyName=${scope.row.customerName}`" tag="a"-->
<
router-link
v-if=
"scope.row.isGetProjectDetail"
:to=
"`/projectCostLedger/detail?projectID=$
{scope.row.id}`" tag="a"
<!--class="wordprimary" v-html="scope.row.customerName">
</router-link>
--
>
class="wordprimary" v-html="scope.row.projectName">
</router-link
>
<
!--
<span
v-else
v-html=
"scope.row.customerName"
></span>
--
>
<
span
v-else
v-html=
"scope.row.projectName"
></span
>
<
!--
</div>
--
>
<
/div
>
</div>
</div>
</
template
>
</
template
>
...
@@ -342,6 +341,9 @@
...
@@ -342,6 +341,9 @@
this
.
total
=
res
.
total
this
.
total
=
res
.
total
this
.
formdata
.
pageNum
=
res
.
currentPage
this
.
formdata
.
pageNum
=
res
.
currentPage
this
.
tableData
=
res
.
rows
this
.
tableData
=
res
.
rows
this
.
tableData
.
forEach
(
item
=>
{
item
.
projectText
=
item
.
projectName
.
replace
(
/<
\/?[^
>
]
+
(
style=
(
'|"
)[^
'"
]
*
)?
>/gi
,
''
)
})
}
else
{
}
else
{
this
.
total
=
0
this
.
total
=
0
this
.
tableData
=
[]
this
.
tableData
=
[]
...
@@ -379,8 +381,8 @@
...
@@ -379,8 +381,8 @@
//查看进度
//查看进度
detailpro
(
row
){
detailpro
(
row
){
this
.
uploadData
=
row
this
.
uploadData
=
row
this
.
uploadData
.
id
=
this
.
uploadData
.
projectId
this
.
prodetail
=
true
this
.
prodetail
=
true
this
.
isupload
=
true
},
},
//删除项目
//删除项目
deleetpro
(
row
){
deleetpro
(
row
){
...
...
dsk-operate-ui/src/views/projectCostLedger/upload/index.vue
View file @
bbe323ec
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
class=
"i"
@
click=
"deletefille(item.id)"
v-if=
"prodetail == false"
>
删除
</div>
<div
class=
"i"
@
click=
"deletefille(item.id
,0
)"
v-if=
"prodetail == false"
>
删除
</div>
</div>
</div>
</div>
</div>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
...
@@ -91,7 +91,7 @@
...
@@ -91,7 +91,7 @@
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
class=
"i"
@
click=
"deletefille(item.id)"
v-if=
"prodetail == false"
>
删除
</div>
<div
class=
"i"
@
click=
"deletefille(item.id
,1
)"
v-if=
"prodetail == false"
>
删除
</div>
</div>
</div>
</div>
</div>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
class=
"i"
@
click=
"deletefille(item.id)"
v-if=
"prodetail == false"
>
删除
</div>
<div
class=
"i"
@
click=
"deletefille(item.id
,2
)"
v-if=
"prodetail == false"
>
删除
</div>
</div>
</div>
</div>
</div>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
class=
"i"
@
click=
"deletefille(item.id)"
v-if=
"prodetail == false"
>
删除
</div>
<div
class=
"i"
@
click=
"deletefille(item.id
,3
)"
v-if=
"prodetail == false"
>
删除
</div>
</div>
</div>
</div>
</div>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
...
@@ -175,7 +175,7 @@
...
@@ -175,7 +175,7 @@
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
class=
"i"
@
click=
"deletefille(item.id)"
v-if=
"prodetail == false"
>
删除
</div>
<div
class=
"i"
@
click=
"deletefille(item.id
,4
)"
v-if=
"prodetail == false"
>
删除
</div>
</div>
</div>
</div>
</div>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
...
@@ -203,7 +203,7 @@
...
@@ -203,7 +203,7 @@
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
class=
"cz"
v-if=
"item.fileParseStatus != 1"
>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus != 3"
><a
:href=
"item.fileOssUrl"
>
下载
</a></div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
v-if=
"item.fileParseStatus == 3 && prodetail == false"
>
重新上传
</div>
<div
class=
"i"
@
click=
"deletefille(item.id)"
v-if=
"prodetail == false"
>
删除
</div>
<div
class=
"i"
@
click=
"deletefille(item.id
,5
)"
v-if=
"prodetail == false"
>
删除
</div>
</div>
</div>
</div>
</div>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
<div
class=
"wrong"
v-if=
"item.fileParseStatus&&item.fileParseStatus == 3"
>
...
@@ -289,6 +289,7 @@
...
@@ -289,6 +289,7 @@
this
.
formdata
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
uploadData
))
this
.
formdata
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
uploadData
))
this
.
formdata
.
cbStage
=
this
.
formdata
.
cbStage
.
toString
()
this
.
formdata
.
cbStage
=
this
.
formdata
.
cbStage
.
toString
()
this
.
getDetail
()
this
.
getDetail
()
console
.
log
(
this
.
formdata
)
},
},
methods
:{
methods
:{
importdata
(){
importdata
(){
...
@@ -331,13 +332,17 @@
...
@@ -331,13 +332,17 @@
this
.
$refs
.
uploadpro
.
$el
.
querySelector
(
'input'
).
click
()
this
.
$refs
.
uploadpro
.
$el
.
querySelector
(
'input'
).
click
()
}
}
},
},
deletefille
(
id
){
deletefille
(
id
,
type
){
this
.
$confirm
(
'此操作将永久删除该文件, 是否继续?'
,
'提示'
,
{
this
.
$confirm
(
'此操作将永久删除该文件, 是否继续?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
deleteCbProjectFile
(
id
).
then
(
res
=>
{
let
param
=
{
fileId
:
id
,
cbType
:
type
,
}
deleteCbProjectFile
(
param
).
then
(
res
=>
{
if
(
res
.
code
==
200
){
if
(
res
.
code
==
200
){
this
.
$message
({
this
.
$message
({
type
:
'success'
,
type
:
'success'
,
...
...
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