Skip to content

D
dsk-operate-sys-cscec
Commit f3856bd3 authored by huangjie's avatar huangjie
Browse files
Options

*

parent b55c8799
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 30 deletions
dsk-operate-ui/src/views/projectCostLedger/detail/components/MeasureItems/index.vue
View file @ f3856bd3
......@@ -267,20 +267,48 @@
cbVisible:false,
chooseDate:"",
isinput:false,//是否填写
tableHeight: window.innerHeight - 355
tableHeight: window.innerHeight - 355,
nowheight:null,
resizeTimer:null,
};
},
//可访问data属性
created() {
this.init(this.comProjectId);
// this.createResizeObserver();
this.getHeight()
},
//计算集
computed: {
computed: {},
beforeDestroy() {
this.clearResizeTimer()
if (this.observer) {
this.observer.disconnect()
}
},
//方法集
methods: {
async getHeight(list){
this.nowheight = new ResizeObserver(entries => {
this.clearResizeTimer();
this.resizeTimer = setTimeout(() => {
this.maxHeight();
}, 1000);
});
await this.$nextTick();
this.nowheight.observe(document.querySelector('.profitloss'));
},
maxHeight(){
const domhei = document.querySelector('.profitloss').offsetHeight - 36 - 16 - 32
const conhei = document.querySelector('.meafixed-table').offsetHeight - 32
// const height = window.getComputedStyle(dom).height;
console.log(domhei)
this.tableHeight = domhei
// console.log(height)
},
clearResizeTimer() {
clearTimeout(this.resizeTimer);
this.resizeTimer = null;
},
getGDT(){
let gdt = document.querySelector('.el-table__body-wrapper')
let w1 = document.querySelector('.el-table__fixed-right-patch')
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/ProfitLoss/index.vue
View file @ f3856bd3
......@@ -36,39 +36,43 @@
<template slot-scope="scope">{{scope.row.cbName || '--'}}</template>
</el-table-column>
<el-table-column label="招标控制价" align="center">
<el-table-column label="招标控制价合价" width="180" prop="tenderSumPrice"><template slot-scope="scope">{{scope.row.tenderSumPrice || '--'}}</template></el-table-column>
<el-table-column label="不含税招标合价" width="180" prop="tenderSumPrice"><template slot-scope="scope">{{scope.row.tenderSumPrice || '--'}}</template></el-table-column>
<el-table-column label="含税招标合价" width="180" prop="taxIncludeTenderSumPrice"><template slot-scope="scope">{{scope.row.taxIncludeTenderSumPrice || '--'}}</template></el-table-column>
<el-table-column label="招标控制价合价" width="180" prop="tenderSumPrice">
<template slot-scope="scope">{{changevalue(scope.row.tenderSumPrice)}}</template>
</el-table-column>
<el-table-column label="不含税招标合价" width="180" prop="taxExcludeTenderSumPrice">
<template slot-scope="scope">{{changevalue(scope.row.taxExcludeTenderSumPrice)}}</template>
</el-table-column>
<el-table-column label="含税招标合价" width="180" prop="taxIncludeTenderSumPrice"><template slot-scope="scope">{{changevalue(scope.row.taxIncludeTenderSumPrice)}}</template></el-table-column>
</el-table-column>
<el-table-column label="投标报价" align="center">
<el-table-column label="投标报价合价" width="180" prop="bidSumPrice"><template slot-scope="scope">{{scope.row.bidSumPrice || '--'}}</template></el-table-column>
<el-table-column label="不含税投标合价" width="180" prop="taxExcludeBidSumPrice"><template slot-scope="scope">{{scope.row.taxExcludeBidSumPrice || '--'}}</template></el-table-column>
<el-table-column label="含税投标合价" width="180" prop="taxIncludebBidSumPrice"><template slot-scope="scope">{{scope.row.taxIncludebBidSumPrice || '--'}}</template></el-table-column>
<el-table-column label="投标报价合价" width="180" prop="bidSumPrice"><template slot-scope="scope">{{changevalue(scope.row.bidSumPrice)}}</template></el-table-column>
<el-table-column label="不含税投标合价" width="180" prop="taxExcludeBidSumPrice"><template slot-scope="scope">{{changevalue(scope.row.taxExcludeBidSumPrice)}}</template></el-table-column>
<el-table-column label="含税投标合价" width="180" prop="taxIncludebBidSumPrice"><template slot-scope="scope">{{changevalue(scope.row.taxIncludebBidSumPrice)}}</template></el-table-column>
</el-table-column>
<el-table-column label="成本汇总" align="center">
<el-table-column label="不含税成本合价" width="180" prop="taxExclusiveTotal"><template slot-scope="scope">{{scope.row.taxExclusiveTotal || '--'}}</template></el-table-column>
<el-table-column label="成本税金合价" width="180" prop="cbTaxesTotal"><template slot-scope="scope">{{scope.row.cbTaxesTotal || '--'}}</template></el-table-column>
<el-table-column label="含税成本合价" width="180" prop="taxInclusiveTotal"><template slot-scope="scope">{{scope.row.taxInclusiveTotal || '--'}}</template></el-table-column>
<el-table-column label="不含税成本合价" width="180" prop="taxExclusiveTotal"><template slot-scope="scope">{{changevalue(scope.row.taxExclusiveTotal)}}</template></el-table-column>
<el-table-column label="成本税金合价" width="180" prop="cbTaxesTotal"><template slot-scope="scope">{{changevalue(scope.row.cbTaxesTotal)}}</template></el-table-column>
<el-table-column label="含税成本合价" width="180" prop="taxInclusiveTotal"><template slot-scope="scope">{{changevalue(scope.row.taxInclusiveTotal)}}</template></el-table-column>
</el-table-column>
<el-table-column label="造价指标（元/㎡）" align="center">
<el-table-column label="招标控制价" width="180" prop="costTender"><template slot-scope="scope">{{scope.row.costTender || '--'}}</template></el-table-column>
<el-table-column label="投标报价" width="180" prop="costBid"><template slot-scope="scope">{{scope.row.costBid || '--'}}</template></el-table-column>
<el-table-column label="成本" width="180" prop="costExpense"><template slot-scope="scope">{{scope.row.costExpense || '--'}}</template></el-table-column>
<el-table-column label="招标控制价" width="180" prop="costTender"><template slot-scope="scope">{{changevalue(scope.row.costTender )}}</template></el-table-column>
<el-table-column label="投标报价" width="180" prop="costBid"><template slot-scope="scope">{{changevalue(scope.row.costBid )}}</template></el-table-column>
<el-table-column label="成本" width="180" prop="costExpense"><template slot-scope="scope">{{changevalue(scope.row.costExpense)}}</template></el-table-column>
</el-table-column>
<el-table-column label="含税成本占比" width="180" prop="taxInclusiveExpenseProportion"><template slot-scope="scope">{{scope.row.taxInclusiveExpenseProportion || '--'}}</template></el-table-column>
<el-table-column label="含税成本占比" width="180" prop="taxInclusiveExpenseProportion"><template slot-scope="scope">{{changevalue(scope.row.taxInclusiveExpenseProportion)}}</template></el-table-column>
<el-table-column label="控制盈亏对比情况" align="center">
<el-table-column label="含税合价偏差" width="180" prop="tenderSumPriceDeviation"><template slot-scope="scope">{{scope.row.tenderSumPriceDeviation || '--'}}</template></el-table-column>
<el-table-column label="含税盈亏率" width="180" prop="tenderProfitLossRatio"><template slot-scope="scope">{{scope.row.tenderProfitLossRatio || '--'}}</template></el-table-column>
<el-table-column label="含税合价偏差" width="180" prop="tenderSumPriceDeviation"><template slot-scope="scope">{{changevalue(scope.row.tenderSumPriceDeviation )}}</template></el-table-column>
<el-table-column label="含税盈亏率" width="180" prop="tenderProfitLossRatio"><template slot-scope="scope">{{changevalue(scope.row.tenderProfitLossRatio)}}</template></el-table-column>
</el-table-column>
<el-table-column label="投标报价盈亏对比情况" align="center">
<el-table-column label="含税合价偏差" width="180" prop="bidSumPriceDeviation"><template slot-scope="scope">{{scope.row.bidSumPriceDeviation || '--'}}</template></el-table-column>
<el-table-column label="含税盈亏率" width="180" prop="bidProfitLossRatio"><template slot-scope="scope">{{scope.row.bidProfitLossRatio || '--'}}</template></el-table-column>
<el-table-column label="含税合价偏差" width="180" prop="bidSumPriceDeviation"><template slot-scope="scope">{{changevalue(scope.row.bidSumPriceDeviation)}}</template></el-table-column>
<el-table-column label="含税盈亏率" width="180" prop="bidProfitLossRatio"><template slot-scope="scope">{{changevalue(scope.row.bidProfitLossRatio )}}</template></el-table-column>
</el-table-column>
<el-table-column label="实际成本费用" align="center">
<el-table-column label="本月费用（含税）" width="180" prop="taxInclusiveExpense"><template slot-scope="scope">{{scope.row.taxInclusiveExpense || '--'}}</template></el-table-column>
<el-table-column label="本月费用（不含税）" width="180" prop="taxExclusiveExpense"><template slot-scope="scope">{{scope.row.taxExclusiveExpense || '--'}}</template></el-table-column>
<el-table-column label="截至本月费用（含税）" width="180" prop="sumTaxInclusiveExpense"><template slot-scope="scope">{{scope.row.sumTaxInclusiveExpense || '--'}}</template></el-table-column>
<el-table-column label="截至本月费用（不含税）" width="180" prop="sumTaxExclusiveExpense"><template slot-scope="scope">{{scope.row.sumTaxExclusiveExpense || '--'}}</template></el-table-column>
<el-table-column label="本月费用（含税）" width="180" prop="taxInclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.taxInclusiveExpense)}}</template></el-table-column>
<el-table-column label="本月费用（不含税）" width="180" prop="taxExclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.taxExclusiveExpense)}}</template></el-table-column>
<el-table-column label="截至本月费用（含税）" width="180" prop="sumTaxInclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.sumTaxInclusiveExpense)}}</template></el-table-column>
<el-table-column label="截至本月费用（不含税）" width="180" prop="sumTaxExclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.sumTaxExclusiveExpense)}}</template></el-table-column>
</el-table-column>
</el-table>
</div>
......@@ -154,6 +158,10 @@
},
//方法集
methods: {
changevalue(value){
let str = parseFloat(value)?value:'--'
return str
},
select(menuPath){
this.id = menuPath
this.defaultActive = menuPath
......
dsk-operate-ui/vue.config.js
View file @ f3856bd3
......@@ -35,8 +35,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://111.204.34.146:9099/prod-api`,//测试
// target: `http://172.17.0.12:9099//prod-api`,//测试
// target: `http://111.204.34.146:9099/prod-api`,//测试
target: `http://172.17.0.12:9099//prod-api`,//测试
// target: `http://192.168.60.5:9098`,//陈跃方
// target: `http://192.168.60.27:9098`,//邓
// target: `http://122.9.160.122:9011`, //线上
......
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