1.个人工资报表更新

小小儁爺

5 天以前 fe2da43a5c79c2e7c41b2525d959346e2a4f0588

1.个人工资报表更新

 src/views/statistic/personSalaryList.vue

@@ -139,199 +139,17 @@
        </div>
      </div>

      <el-tabs type="border-card" style="margin-top: 10px" @tab-click="tabClick">
        <el-tab-pane label="末道工序">
          <div class="elTableDiv" style="margin: 0 auto 10px;">
      <div class="elTableDiv">
            <el-table
              ref="tableDataRef"
          ref="tableDataRef2"
              class="tableFixed"
              :data="tableData"
          :data="tableData2"
              :height="isExpandForm?(tableHeight-120):(tableHeight-40)+'px'"
              border
              :summary-method="getSummaries"
              show-summary
              :row-class-name="tableRowClassName"
              :style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
              highlight-current-row
              :header-cell-style="this.$headerCellStyle"
              :cell-style="this.$cellStyle"
              @sort-change="sortChange"
            >
              <el-table-column
                prop="rowNum"
                width="50"
                fixed
                label="序号"
              />
              <el-table-column
                prop="wo_code"
                label="工单编号"
                width="160"
                sortable="custom"
              />
              <el-table-column
                prop="saleOrderCode"
                label="销售单号"
                width="160"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="partcode"
                label="产品编码"
                width="160"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="partname"
                label="产品名称"
                width="160"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="partspec"
                label="产品规格"
                width="160"
                show-tooltip-when-overflow
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.partspec">{{ row.partspec }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="wkshp_name"
                label="车间名称"
                width="130"
                show-tooltip-when-overflow
                sortable="custom"
              />

              <el-table-column
                prop="step_code"
                label="工序编码"
                width="110"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="stepname"
                label="工序名称"
                width="110"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="plan_quantity"
                label="任务数量"
                sortable="custom"
                show-overflow-tooltip
                min-width="110"
              />
              <el-table-column
                prop="task_qty"
                label="总可报数量"
                sortable="custom"
                show-overflow-tooltip
                min-width="120"
              />
              <!--              <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="报工数量"
                width="110"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.report_qty">{{ row.report_qty }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="step_price"
                label="工序单价"
                width="110"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <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="moneys"
                label="个人计件工资"
                width="130"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.moneys">{{ row.moneys }} 元</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="username"
                label="报工人员"
                width="110"
                sortable="custom"
              />
              <el-table-column
                prop="report_date"
                label="报工时间"
                width="160"
                sortable="custom"
              />

            </el-table>
          </div>
          <!--分页-->
          <pagination
            :total="total"
            :page.sync="form.page"
            :limit.sync="form.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            popper-class="select_bottom"
            @pagination="getPeopleSalaryReportSearch"
          />
        </el-tab-pane>
        <el-tab-pane label="逐道工序">
          <div class="elTableDiv" style="margin: 0 auto 10px;">
            <el-table
              ref="tableDataRef2"
              class="tableFixed"
              :data="tableData2"
              :height="isExpandForm?(tableHeight-80):(tableHeight-40)+'px'"
              border
              :summary-method="getSummaries"
              show-summary
              :row-class-name="tableRowClassName"
              :style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
          :style="{width: 100+'%',height:isExpandForm?(tableHeight-120):(tableHeight-40)+'px',}"
              highlight-current-row
              :header-cell-style="this.$headerCellStyle"
              :cell-style="this.$cellStyle"
@@ -478,7 +296,6 @@

            </el-table>
          </div>
          <!--分页-->
          <pagination
            :total="total"
            :page.sync="form.page"
@@ -488,8 +305,6 @@
            popper-class="select_bottom"
            @pagination="getPeopleSalaryReportSearch"
          />
        </el-tab-pane>
      </el-tabs>
    </div>

    <el-dialog
@@ -571,9 +386,10 @@
        reportname: '', // 操作人员
        reportdate: '', // 操作时间
        rejectstepcode: [], // 剔除工序(固定薪资工序不参与计算
        compute: 'last', // 计件方式
        prop: 'partcode', // 排序字段
        order: 'desc', // 排序字段
        compute: 'contin', // 计件方式
        // prop: 'partcode', // 排序字段
        prop: 'saleOrderCode,wo_code,step_seq', // 排序字段
        order: 'asc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
@@ -620,7 +436,7 @@
  },
  // updated() {
  //   this.$nextTick(() => {
  //     this.$refs.tableDataRef.doLayout()
  //
  //     this.$refs.tableDataRef2.doLayout()
  //   })
  // },
@@ -691,7 +507,6 @@
      })

      this.$nextTick(() => {
        this.$refs.tableDataRef.doLayout()
        this.$refs.tableDataRef2.doLayout()
      })
      // (Math.round(sums * 100) / 100).toS
@@ -805,6 +620,8 @@
      this.form.groupcode = ''
      this.form.reportname = ''
      this.form.reportdate = ''
      this.form.prop = 'saleOrderCode,wo_code,step_seq'
      this.form.order = 'asc'
      this.getPeopleSalaryReportSearch()
    },

@@ -885,8 +702,7 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 245
        this.$refs.tableDataRef.doLayout()
        this.tableHeight = this.mainHeight - 175
        this.$refs.tableDataRef2.doLayout()
      })
    },