Merge branch 'dev-threejs'

ZhangXianQiang

2024-04-26 38781aa31a50c6d1eb121e4f05ab30fb06587da3

Merge branch 'dev-threejs'

 src/views/system/calculate/report/index.vue

@@ -132,7 +132,7 @@
          </el-table-column>
          <el-table-column
            label="扣减金额(元)"
            prop="money"
            prop="deductMoney"
            width="180">
            <template slot-scope="scope">
              <el-input type="number"
@@ -338,6 +338,7 @@
          sums[index] = '合计';
          return;
        }
        
        const values = data.map(item => Number(item[column.property]));
        if (!values.every(value => isNaN(value))) {
          sums[index] = values.reduce((prev, curr) => {
@@ -351,7 +352,7 @@
          if (column.property === 'score') {
            sums[index] = '-';
          }
          if (column.property === 'value') {
          if (column.property === 'deductMoney') {
            sums[index] += '元';
          }
        } else {