Skip to content

D
dsk-operate-sys-cscec
Commit d4cdf80f authored by tianhongyang's avatar tianhongyang
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys... 

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents 507a6ed6 610010ea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 346 additions and 45 deletions
dsk-operate-ui/src/api/projectCostLedger/index.js
View file @ d4cdf80f
......@@ -74,10 +74,11 @@ export function uploadCbProjectFile(data) {
});
}
//删除文件
export function deleteCbProjectFile(fileId) {
export function deleteCbProjectFile(data) {
return request({
url: '/cbProjectFile/deleteCbProjectFile/' + fileId,
url: '/cbProjectFile/deleteCbProjectFile',
method: 'Delete',
data:data
});
}
......@@ -154,6 +155,22 @@ export function getSummarydata(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/ProfitLoss/index.vue
View file @ d4cdf80f
......@@ -15,7 +15,7 @@
v-model="expenseDate"
type="month"
placeholder="选择月" @change="changetime"
:picker-options="pickerOptions">
>
</el-date-picker>
</div>
<div class="table-item">
......@@ -115,14 +115,14 @@
data() {
return {
pickerOptions: {
disabledDate(time) {
let istrue = true
let month = new Date().getMonth()+1
let year = new Date().getFullYear()
let times = (year+5)+'-'+ month + '-01 ' + '00:00:00'
istrue = new Date().getTime() < time.getTime() && time.getTime() < new Date(times).getTime()
return !istrue
},
// disabledDate(time) {
// let istrue = true
// let month = new Date().getMonth()+1
// let year = new Date().getFullYear()
// let times = (year+5)+'-'+ month + '-01 ' + '00:00:00'
// istrue = new Date().getTime() < time.getTime() && time.getTime() < new Date(times).getTime()
// return !istrue
// },
},
menuOptions: {
nodeName: "cbName",
......@@ -216,6 +216,7 @@
id:this.id,
expenseDate:this.expenseDate
}
console.log(param)
getAnalysislist(param).then(res=>{
this.tableData = res.data
})
......@@ -252,7 +253,11 @@
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)
},
},
......
dsk-operate-ui/src/views/projectCostLedger/index.vue
View file @ d4cdf80f
......@@ -68,19 +68,18 @@
<el-table-column label="工程名称" width="416" :resizable="false">
<template slot-scope="scope">
<div style="display:flex;align-items:center">
<!--<el-tooltip placement="top" v-if="scope.row.customerText.length>20">-->
<!--<div slot="content">{{scope.row.projectName}}</div>-->
<el-tooltip placement="top" v-if="scope.row.projectText.length>20">
<div class="renling">
<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>
<span v-else v-html="scope.row.projectName"></span>
</div>
<!--</el-tooltip>-->
<!--<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"-->
<!--class="wordprimary" v-html="scope.row.customerName"></router-link>-->
<!--<span v-else v-html="scope.row.customerName"></span>-->
<!--</div>-->
</el-tooltip>
<div class="renling" v-else>
<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>
<span v-else v-html="scope.row.projectName"></span>
</div>
</div>
</template>
......@@ -342,6 +341,9 @@
this.total = res.total
this.formdata.pageNum = res.currentPage
this.tableData = res.rows
this.tableData.forEach(item=>{
item.projectText = item.projectName.replace(/<\/?[^>]+(style=('|")[^'"]*)?>/gi, '')
})
}else{
this.total = 0
this.tableData = []
......@@ -379,8 +381,8 @@
//查看进度
detailpro(row){
this.uploadData = row
this.uploadData.id = this.uploadData.projectId
this.prodetail = true
this.isupload = true
},
//删除项目
deleetpro(row){
......
dsk-operate-ui/src/views/projectCostLedger/upload/index.vue
View file @ d4cdf80f
......@@ -63,7 +63,7 @@
<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 && 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 class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
......@@ -91,7 +91,7 @@
<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 && 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 class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
......@@ -119,7 +119,7 @@
<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 && 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 class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
......@@ -147,7 +147,7 @@
<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 && 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 class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
......@@ -175,7 +175,7 @@
<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 && 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 class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
......@@ -203,7 +203,7 @@
<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 && 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 class="wrong" v-if="item.fileParseStatus&&item.fileParseStatus == 3">
......@@ -289,6 +289,7 @@
this.formdata = JSON.parse(JSON.stringify(this.uploadData))
this.formdata.cbStage = this.formdata.cbStage.toString()
this.getDetail()
console.log(this.formdata )
},
methods:{
importdata(){
......@@ -331,13 +332,17 @@
this.$refs.uploadpro.$el.querySelector('input').click()
}
},
deletefille(id){
deletefille(id,type){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteCbProjectFile(id).then(res=>{
let param = {
fileId: id,
cbType: type,
}
deleteCbProjectFile(param).then(res=>{
if(res.code == 200){
this.$message({
type: 'success',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment