1.优化

loulijun2021

2023-10-23 e7d48e5d05e8575163e3508a1adda24f7c9141e4

 src/views/statistic/personSalaryList.vue

@@ -169,7 +169,7 @@
                </template>
              </el-table-column>
              <el-table-column
                prop="stepcode"
                prop="step_code"
                label="工序编码"
                width="110"
                show-tooltip-when-overflow
@@ -189,18 +189,18 @@
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="group_name"
                label="生产班组"
                width="110"
                show-tooltip-when-overflow
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.group_name">{{ row.group_name }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <!--              <el-table-column-->
              <!--                prop="group_name"-->
              <!--                label="生产班组"-->
              <!--                width="110"-->
              <!--                show-tooltip-when-overflow-->
              <!--                sortable="custom"-->
              <!--              >-->
              <!--                <template slot-scope="{row}">-->
              <!--                  <div v-if="row.group_name">{{ row.group_name }}</div>-->
              <!--                  <div v-else>/</div>-->
              <!--                </template>-->
              <!--              </el-table-column>-->
              <el-table-column
                prop="report_qty"
                label="报工数量"
@@ -213,35 +213,35 @@
                </template>
              </el-table-column>
              <el-table-column
                prop="unprice"
                prop="step_price"
                label="工序单价"
                width="110"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.unprice">{{ row.unprice }} 元</div>
                  <div v-if="row.step_price">{{ row.step_price }} 元</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <!--              <el-table-column-->
              <!--                prop="ratio"-->
              <!--                label="分配比例"-->
              <!--                width="110"-->
              <!--                sortable="custom"-->
              <!--              >-->
              <!--                <template slot-scope="{row}">-->
              <!--                  <div v-if="row.step_price">{{ row.ratio }} %</div>-->
              <!--                  <div v-else>/</div>-->
              <!--                </template>-->
              <!--              </el-table-column>-->
              <el-table-column
                prop="ratio"
                label="分配比例"
                width="110"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.unprice">{{ row.ratio }} %</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="usermoney"
                prop="moneys"
                label="个人计件工资"
                width="130"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.usermoney">{{ row.usermoney }} 元</div>
                  <div v-if="row.moneys">{{ row.moneys }} 元</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
@@ -347,18 +347,18 @@
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="group_name"
                label="生产班组"
                width="110"
                show-tooltip-when-overflow
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.group_name">{{ row.group_name }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <!--              <el-table-column-->
              <!--                prop="group_name"-->
              <!--                label="生产班组"-->
              <!--                width="110"-->
              <!--                show-tooltip-when-overflow-->
              <!--                sortable="custom"-->
              <!--              >-->
              <!--                <template slot-scope="{row}">-->
              <!--                  <div v-if="row.group_name">{{ row.group_name }}</div>-->
              <!--                  <div v-else>/</div>-->
              <!--                </template>-->
              <!--              </el-table-column>-->
              <el-table-column
                prop="report_qty"
                label="报工数量"
@@ -371,24 +371,24 @@
                </template>
              </el-table-column>
              <el-table-column
                prop="unprice"
                prop="step_price"
                label="工序单价"
                width="110"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.unprice">{{ row.unprice }} 元</div>
                  <div v-if="row.step_price">{{ row.step_price }} 元</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="usermoney"
                prop="moneys"
                label="个人计件工资"
                width="130"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.usermoney">{{ row.usermoney }} 元</div>
                  <div v-if="row.moneys">{{ row.moneys }} 元</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
@@ -573,7 +573,7 @@
      const { columns, data } = param
      const sums = []

      const i = this.form.compute === 'last' ? 11 : 10
      const i = this.form.compute === 'last' ? 9 : 9

      columns.forEach((column, index) => {
        if (index === i) {
@@ -581,7 +581,7 @@
          return
        }
        const values = data.map(item => Number(item[column.property]))
        if (column.property === 'usermoney') {
        if (column.property === 'moneys') {
          sums[index] = values.reduce((prev, curr) => {
            const value = Number(curr)
            if (!isNaN(value)) {