修改

dsk-operate-ui/src/views/projectCostLedger/detail/components/DirectCost/index.vue

@@ -44,12 +44,34 @@
                 <el-table-column prop="cbSubject" label="成本科目" width="130"></el-table-column>
                 <el-table-column prop="tenderControlUnitPrice" label="招标控制单价" width="120"></el-table-column>
                 <el-table-column prop="tenderControlSumPrice" label="招标控制合价" width="120"></el-table-column>
-                <el-table-column prop="excludeTaxCbUnitPrice" label="不含税成本单价" width="122"></el-table-column>
-                <el-table-column prop="excludeTaxCbSumPrice" label="不含税成本合计" width="122"></el-table-column>
-                <el-table-column prop="cbTaxSum" label="成本税金合计" width="120"></el-table-column>
-                <el-table-column prop="includeTaxCbUnitPrice" label="含税成本单价" width="120"></el-table-column>
-                <el-table-column prop="includeTaxCbSumPrice" label="含税成本合价" width="120"></el-table-column>
-                <el-table-column prop="sumPriceDeviation" label="合价偏差" width="120"></el-table-column>
+                <el-table-column prop="excludeTaxCbUnitPrice" label="不含税成本单价" width="122">
+
+                </el-table-column>
+                <el-table-column prop="excludeTaxCbSumPrice" label="不含税成本合计" width="122">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.excludeTaxCbSumPrice)}}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cbTaxSum" label="成本税金合计" width="120">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.cbTaxSum)}}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="includeTaxCbUnitPrice" label="含税成本单价" width="120">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.includeTaxCbUnitPrice)}}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="includeTaxCbSumPrice" label="含税成本合价" width="120">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.includeTaxCbSumPrice)}}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="sumPriceDeviation" label="合价偏差" width="120">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.sumPriceDeviation)}}
+                  </template>
+                </el-table-column>
               </el-table-column>
               <el-table-column label="盈亏率" width="100" prop="profitLossRatio"></el-table-column>
               <el-table-column label="标准费用项" width="100" prop="standardCbItem"></el-table-column>

dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue

@@ -77,10 +77,10 @@
               <template slot="pushQuantities" slot-scope="scope">
                 {{$decimalFormat(scope.row.pushQuantities)}}
               </template>
-              <template slot="quantities" slot-scope="scope">
-                <div v-if="scope.row.pushQuantities" style="color:#FF204E;">{{$decimalFormat(scope.row.quantities)}}</div>
-                <div v-else>{{$decimalFormat(scope.row.quantities)}}</div>
-              </template>
+              <!--<template slot="quantities" slot-scope="scope">-->
+                <!--<div v-if="scope.row.pushQuantities" style="color:#FF204E;">{{$decimalFormat(scope.row.quantities)}}</div>-->
+                <!--<div v-else>{{$decimalFormat(scope.row.quantities)}}</div>-->
+              <!--</template>-->
               <!-- 本月工程量 -->
               <template slot="quantities" slot-scope="scope">
                 <!-- 编辑单元格 -->
@@ -89,7 +89,10 @@
                   <el-input placeholder="请输入" v-model="scope.row.quantities" clearable
                     @input="v => statisticsSum(v,'quantities',scope.row)"></el-input>
                 </el-form-item>
-                <span v-else-if="!addActualCostEditStatus">{{$decimalFormat(scope.row.quantities)}}</span>
+                <div v-else-if="!addActualCostEditStatus">
+                  <div v-if="scope.row.pushQuantities" style="color:#FF204E;">{{$decimalFormat(scope.row.quantities)}}</div>
+                  <div v-else>{{$decimalFormat(scope.row.quantities)}}</div>
+                </div>
               </template>
               <!-- 本月采购单价 -->
               <template slot="purchaseUnitPrice" slot-scope="scope">
@@ -485,7 +488,8 @@ export default {
         if (list.code == 200 && list.data instanceof Array) {
           const _temp = list.data;
           // 计算总和
-          if (this.hasTarget && _temp.length) {
+          // if (this.hasTarget && _temp.length) {
+          if (_temp.length) {
             const row = this.countRowParams(_temp, statisticsPropNames);
             _temp.unshift(row);
           }