Browse Source

Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

liuhj 1 year ago
parent
commit
88ae74d07b
1 changed files with 4 additions and 3 deletions
  1. 4 3
      src/components/Finance/Cost.vue

+ 4 - 3
src/components/Finance/Cost.vue

@@ -244,8 +244,9 @@
                     :label="item.label" @change="(val) => { topcheckboxChange(val, item.label) }"></el-checkbox>
             </el-checkbox-group>
             <el-table class="tables" style="font-size:10px" :summary-method="getSummaries" show-summary show-overflow-tooltip :data="tableData" :border="true"
-                size="small" row-class-name="row" cell-class-name="column" :highlight-current-row="true" :fit="true"
-                :height="centerheight">
+                size="small" row-class-name="row" cell-class-name="column" :highlight-current-row="true" :fit="true">
+                <!-- :height="centerheight" -->
+
                 <template v-for="(  item, index  ) in      tableLabel     ">
                     <el-table-column :key="index" :prop="item.prop"
                         :width="item.width == 140 ? columnWidth : item.width" :label="item.label"
@@ -612,7 +613,7 @@
                                                 <span v-else-if="itemcabinone.prop === 'singleProfit'"
                                                     :title="scope.row[itemcabinone.prop]">{{
         (scope.row['singleQuote'] - scope.row['costPerson']).toFixed(2)
-                                                    }}</span>
+    }}</span>
                                                 <span v-else-if="itemcabinone.prop === 'totalProfit'"
                                                     :title="scope.row[itemcabinone.prop]">{{
                                                     ((scope.row['singleQuote'] - scope.row['costPerson']) *