Skip to content

D
dsk-operate-sys-cscec
Commit 66ccf57f authored by danfuman's avatar danfuman
Browse files
Options

修改

parent b459ca4a
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 40 deletions
dsk-operate-ui/src/views/projectCostLedger/detail/components/DirectCost/index.vue
View file @ 66ccf57f
...@@ -33,52 +33,52 @@ ...@@ -33,52 +33,52 @@
highlight-current-row highlight-current-row
> >
<el-table-column label="序号" width="60" align="left" prop="index" fixed="left"></el-table-column> <el-table-column label="序号" width="60" align="left" prop="index" fixed="left"></el-table-column>
<el-table-column label="编码" width="130" prop="code"></el-table-column> <el-table-column label="编码" width="130" prop="code" :formatter="formatStatus"></el-table-column>
<el-table-column label="名称" width="230" prop="expenseName"></el-table-column> <el-table-column label="名称" width="230" prop="expenseName" :formatter="formatStatus"></el-table-column>
<el-table-column label="清单" width="110" prop="expenseCategoryTag"></el-table-column> <el-table-column label="清单" width="110" prop="expenseCategoryTag" :formatter="formatStatus"></el-table-column>
<el-table-column label="项目特征" width="340" prop="projectFeature"></el-table-column> <el-table-column label="项目特征" width="340" prop="projectFeature" :formatter="formatStatus"></el-table-column>
<el-table-column label="单位" width="110" prop="unit"></el-table-column> <el-table-column label="单位" width="110" prop="unit" :formatter="formatStatus"></el-table-column>
<el-table-column label="计划成本" align="center"> <el-table-column label="计划成本" align="center">
<el-table-column prop="engineeringVolumeExpression" label="工程表达式" width="120"></el-table-column> <el-table-column prop="engineeringVolumeExpression" label="工程表达式" width="120" :formatter="formatStatus"></el-table-column>
<el-table-column prop="engineeringVolume" label="工程量" width="120"></el-table-column> <el-table-column prop="engineeringVolume" label="工程量" width="120" :formatter="formatStatus"></el-table-column>
<el-table-column prop="cbSubject" label="成本科目" width="130"></el-table-column> <el-table-column prop="cbSubject" label="成本科目" width="130" :formatter="formatStatus"></el-table-column>
<el-table-column prop="tenderControlUnitPrice" label="招标控制单价" width="120"></el-table-column> <el-table-column prop="tenderControlUnitPrice" label="招标控制单价" width="120" :formatter="formatStatus"></el-table-column>
<el-table-column prop="tenderControlSumPrice" label="招标控制合价" width="120"></el-table-column> <el-table-column prop="tenderControlSumPrice" label="招标控制合价" width="120" :formatter="formatStatus"></el-table-column>
<el-table-column prop="excludeTaxCbUnitPrice" label="不含税成本单价" width="122"> <el-table-column prop="excludeTaxCbUnitPrice" label="不含税成本单价" width="122" :formatter="formatStatus">
</el-table-column> </el-table-column>
<el-table-column prop="excludeTaxCbSumPrice" label="不含税成本合计" width="122"> <el-table-column prop="excludeTaxCbSumPrice" label="不含税成本合计" width="122" :formatter="formatStatus">
<template slot-scope="scope"> <template slot-scope="scope">
{{$decimalFormat(scope.row.excludeTaxCbSumPrice)}} {{$decimalFormat(scope.row.excludeTaxCbSumPrice)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="cbTaxSum" label="成本税金合计" width="120"> <el-table-column prop="cbTaxSum" label="成本税金合计" width="120" :formatter="formatStatus">
<template slot-scope="scope"> <template slot-scope="scope">
{{$decimalFormat(scope.row.cbTaxSum)}} {{$decimalFormat(scope.row.cbTaxSum)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="includeTaxCbUnitPrice" label="含税成本单价" width="120"> <el-table-column prop="includeTaxCbUnitPrice" label="含税成本单价" width="120" :formatter="formatStatus">
<template slot-scope="scope"> <template slot-scope="scope">
{{$decimalFormat(scope.row.includeTaxCbUnitPrice)}} {{$decimalFormat(scope.row.includeTaxCbUnitPrice)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="includeTaxCbSumPrice" label="含税成本合价" width="120"> <el-table-column prop="includeTaxCbSumPrice" label="含税成本合价" width="120" :formatter="formatStatus">
<template slot-scope="scope"> <template slot-scope="scope">
{{$decimalFormat(scope.row.includeTaxCbSumPrice)}} {{$decimalFormat(scope.row.includeTaxCbSumPrice)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sumPriceDeviation" label="合价偏差" width="120"> <el-table-column prop="sumPriceDeviation" label="合价偏差" width="120" :formatter="formatStatus">
<template slot-scope="scope"> <template slot-scope="scope">
{{$decimalFormat(scope.row.sumPriceDeviation)}} {{$decimalFormat(scope.row.sumPriceDeviation)}}
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="盈亏率" width="100" prop="profitLossRatio"></el-table-column> <el-table-column label="盈亏率" width="100" prop="profitLossRatio" :formatter="formatStatus"></el-table-column>
<el-table-column label="标准费用项" width="100" prop="standardCbItem"></el-table-column> <el-table-column label="标准费用项" width="100" prop="standardCbItem" :formatter="formatStatus"></el-table-column>
<el-table-column label="规格型号" width="100" prop="specificationModel"></el-table-column> <el-table-column label="规格型号" width="100" prop="specificationModel" :formatter="formatStatus"></el-table-column>
<el-table-column label="计算规则" width="100" prop="calculateRule"></el-table-column> <el-table-column label="计算规则" width="100" prop="calculateRule" :formatter="formatStatus"></el-table-column>
<el-table-column label="甲供材料" width="150" prop="supplierMaterial"></el-table-column> <el-table-column label="甲供材料" width="150" prop="supplierMaterial" :formatter="formatStatus"></el-table-column>
<el-table-column label="备注" width="120" prop="remark"></el-table-column> <el-table-column label="备注" width="120" prop="remark" :formatter="formatStatus"></el-table-column>
<el-table-column label="操作" min-width="120" fixed="right"> <el-table-column label="操作" min-width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.expenseCategoryTag ==='清'" style="color:#0081FF;font-size: 14px;cursor: pointer;" @click="handleDialogVisible(scope.row)">增加费用项</span> <span v-if="scope.row.expenseCategoryTag ==='清'" style="color:#0081FF;font-size: 14px;cursor: pointer;" @click="handleDialogVisible(scope.row)">增加费用项</span>
...@@ -116,10 +116,10 @@ ...@@ -116,10 +116,10 @@
<el-form-item label="规格型号" prop="specificationModel"> <el-form-item label="规格型号" prop="specificationModel">
<el-input v-model="ruleForm.specificationModel" placeholder="请输入规格型号"></el-input> <el-input v-model="ruleForm.specificationModel" placeholder="请输入规格型号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="计算规则" prop="calculateRule"> <el-form-item label="计算规则">
<el-input v-model="ruleForm.calculateRule" placeholder="请输入计算规则"></el-input> <el-input v-model="ruleForm.calculateRule" placeholder="请输入计算规则"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="甲供材料" prop="supplierMaterial"> <el-form-item label="甲供材料">
<el-input v-model="ruleForm.supplierMaterial" placeholder="请输入甲供材料"></el-input> <el-input v-model="ruleForm.supplierMaterial" placeholder="请输入甲供材料"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="特征描述" prop="projectFeature"> <el-form-item label="特征描述" prop="projectFeature">
...@@ -189,8 +189,6 @@ export default { ...@@ -189,8 +189,6 @@ export default {
includeTaxCbUnitPrice:{ required: true, message: '含税成本单价不能为空', trigger: 'blur' }, // 限制必填 includeTaxCbUnitPrice:{ required: true, message: '含税成本单价不能为空', trigger: 'blur' }, // 限制必填
specificationModel:{ required: true, message: '规格型号不能为空', trigger: 'blur' }, // 限制必填 specificationModel:{ required: true, message: '规格型号不能为空', trigger: 'blur' }, // 限制必填
calculateRule:{ required: true, message: '计算规则不能为空', trigger: 'blur' }, // 限制必填 calculateRule:{ required: true, message: '计算规则不能为空', trigger: 'blur' }, // 限制必填
supplierMaterial:{ required: true, message: '甲供材料不能为空', trigger: 'blur' }, // 限制必填
projectFeature:{ required: true, message: '特征描述不能为空', trigger: 'blur' }, // 限制必填
}, },
dialogVisible:false, dialogVisible:false,
defaultActive: "", defaultActive: "",
...@@ -291,7 +289,6 @@ export default { ...@@ -291,7 +289,6 @@ export default {
this.detailsId=row.id; this.detailsId=row.id;
}, },
handleAdd(){ handleAdd(){
this.ruleForm.qingId = this.detailsId this.ruleForm.qingId = this.detailsId
cbDirectExpenseAdd(JSON.stringify(this.ruleForm)).then(res=>{ cbDirectExpenseAdd(JSON.stringify(this.ruleForm)).then(res=>{
if(res.code == 200){ if(res.code == 200){
...@@ -338,8 +335,10 @@ export default { ...@@ -338,8 +335,10 @@ export default {
async maxHeightInit() { async maxHeightInit() {
const divHeight = this.$refs.rightTable.clientHeight-32; const divHeight = this.$refs.rightTable.clientHeight-32;
this.maxHeight=divHeight; this.maxHeight=divHeight;
console.log('DIV的高度是：', divHeight); },
} formatStatus: function(row, column, cellValue) {
return cellValue? cellValue : '-'
},
}, },
} }
</script> </script>
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
View file @ 66ccf57f
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
<custom-table :tableData="dataForm.tableDataList" :formColum="formColum" :max-height="true" :tableDataTotal="total" :paging="false" v-if="total > 0 && !tableLoading" <custom-table :tableData="dataForm.tableDataList" :formColum="formColum" :max-height="true" :tableDataTotal="total" :paging="false" v-if="total > 0 && !tableLoading"
:header-cell-class-name="headerCellClassName" :cell-class-name="cellClassName"> :header-cell-class-name="headerCellClassName" :cell-class-name="cellClassName">
<template slot="action-field-bar" slot-scope="scope"> <template slot="action-field-bar" slot-scope="scope">
<div class="project-action-field-bar"> <div class="project-action-field-bar" v-if="rowCanEditInput(scope.rowIndex,hasTarget)">
<span class="push-project-use" @click="pushProjectUse(scope.row)" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}">修改本月差值</span> <span class="push-project-use" @click="!rowHasLastPush(scope.rowIndex) ? pushProjectUse(scope.row) :''" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}">修改本月差值</span>
</div> </div>
<!--<div class="project-action-field-bar" v-if="rowCanEditInput(scope.rowIndex,hasTarget)">--> <!--<div class="project-action-field-bar" v-if="rowCanEditInput(scope.rowIndex,hasTarget)">-->
<!--<span class="push-project-use" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}"--> <!--<span class="push-project-use" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}"-->
...@@ -306,7 +306,7 @@ export default { ...@@ -306,7 +306,7 @@ export default {
{ label: '本月差值', prop: "pushQuantities", width: "110", uid: v4(), slot: true }, { label: '本月差值', prop: "pushQuantities", width: "110", uid: v4(), slot: true },
{ label: '累计差值', prop: "cumulativeDifference", width: "110", uid: v4(), slot: true }, { label: '累计差值', prop: "cumulativeDifference", width: "110", uid: v4(), slot: true },
{ label: '备注', prop: "remark", width: "115", uid: v4(), slot: true }, { label: '备注', prop: "remark", width: "115", uid: v4(), slot: true },
{ label: '操作', prop: "action-field-bar", width: "99", uid: v4(), fixed: "right" }, { label: '操作', prop: "action-field-bar", width: "120", uid: v4(), fixed: "right" },
], ],
// 实体工程材料表头 // 实体工程材料表头
entityMaterialsFormColum: [ entityMaterialsFormColum: [
...@@ -341,7 +341,7 @@ export default { ...@@ -341,7 +341,7 @@ export default {
{ label: '填写时间', prop: "createTime", minWidth: "160", uid: v4(), slot: true }, { label: '填写时间', prop: "createTime", minWidth: "160", uid: v4(), slot: true },
] ]
}, },
{ label: '操作', prop: "action-field-bar", width: "120", uid: v4(), fixed: "right" }, { label: '操作', prop: "action-field-bar", width: "140", uid: v4(), fixed: "right" },
], ],
// 已记录月份集合 // 已记录月份集合
monthList: [], monthList: [],
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/MeasureItems/index.vue
View file @ 66ccf57f
...@@ -525,15 +525,28 @@ ...@@ -525,15 +525,28 @@
addcost() { addcost() {
this.cbVisible = true this.cbVisible = true
}, },
getTreeData(data){
for(var i=0;i<data.length;i++){
//projectVolume/monthCostRate/costEffective
if(data[i].projectVolume || data[i].monthCostRate || data[i].costEffective){
data[i].planMeasureId = data[i].id
data[i].actualId = data[i].id
data[i].month = this.expenseDate
data[i].monthCostRate = data[i].monthCostRate?parseInt(data[i].monthCostRate.replace('%','')):null
}
if(data[i].children){
this.getTreeData(data[i].children);
}else {
data[i].children=undefined;
}
}
return data;
},
addinputs(){ addinputs(){
let tables = JSON.parse(JSON.stringify(this.tableData)) let tables = JSON.parse(JSON.stringify(this.tableData))
tables.forEach(item=>{ let params=this.getTreeData(tables)
item.planMeasureId = item.id saveBatch(JSON.stringify(params)).then(res=>{
item.actualId = item.id
item.month = this.expenseDate
item.monthCostRate = item.monthCostRate?parseInt(item.monthCostRate.replace('%','')):null
})
saveBatch(JSON.stringify(tables)).then(res=>{
if(res.code == 200){ if(res.code == 200){
this.$message.success(res.msg) this.$message.success(res.msg)
this.isinput = false this.isinput = false
......
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