1.生产开报工新增计件方式2.班组、人员计件工资报表改变

loulijun2021

2023-02-15 599a565adfdb4fb04ab6a8f17fcf0995e25d8810

 src/views/bbgl/rygz.vue

@@ -86,17 +86,19 @@
        </div>
      </div>

      <el-tabs type="border-card" style="margin-top: 10px" @tab-click="tabClick">
        <el-tab-pane label="末道工序">
      <div class="elTableDiv">
        <el-table
          ref="tableDataRef"
              ref="tableDataRef2"
          class="tableFixed"
          :data="tableData"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
              :height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
          border
          :summary-method="getSummaries"
          show-summary
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
              :style="{width: 100+'%',height:isExpandForm?(tableHeight-70):(tableHeight-30)+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -167,7 +169,12 @@
            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="报工数量"
@@ -226,6 +233,155 @@
        popper-class="select_bottom"
        @pagination="getPeopleSalaryReportSearch"
      />
        </el-tab-pane>
        <el-tab-pane label="逐道工序">
          <div class="elTableDiv">
            <el-table
              ref="tableDataRef"
              class="tableFixed"
              :data="tableData"
              :height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
              border
              :summary-method="getSummaries"
              show-summary
              :row-class-name="tableRowClassName"
              :style="{width: 100+'%',height:isExpandForm?(tableHeight-70):(tableHeight-30)+'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="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="stepcode"
                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="task_qty"
                label="任务数量"
                width="110"
                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="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="unprice"
                label="工序单价"
                width="110"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.unprice">{{ row.unprice }} 元</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="usermoney"
                label="个人记件工资"
                width="130"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.usermoney">{{ row.usermoney }} 元</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-tabs>
    </div>

    <el-dialog
@@ -303,6 +459,7 @@
        groupcode: '', // 生产班组
        reportname: '', // 操作人员
        reportdate: '', // 操作时间
        compute: 'last', // 计件方式
        prop: 'partcode', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
@@ -346,6 +503,12 @@
      }
    }
  },
  // updated() {
  //   this.$nextTick(() => {
  //     this.$refs.tableDataRef.doLayout()
  //     this.$refs.tableDataRef2.doLayout()
  //   })
  // },
  created() {
    this.handleRequest()
  },
@@ -390,6 +553,7 @@

      this.$nextTick(() => {
        this.$refs.tableDataRef.doLayout()
        this.$refs.tableDataRef2.doLayout()
      })

      return sums
@@ -406,6 +570,7 @@
        partspec: this.form.partspec,
        stepname: this.form.stepname,
        groupcode: this.form.groupcode,
        compute: this.form.compute,
        reportname: this.form.reportname,
        reportdate: tempDate,
        prop: this.form.prop,
@@ -425,6 +590,10 @@
    async getMesOrderStepReportSelectUserGroup() {
      const { data: res } = await MesOrderStepReportSelectUserGroup()
      this.groupArr = res
    },
    tabClick(val) {
      this.form.compute = val.label === '末道工序' ? 'last' : 'contin'
      this.getPeopleSalaryReportSearch()
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
@@ -452,6 +621,7 @@
        partspec: this.form.partspec,
        stepname: this.form.stepname,
        groupcode: this.form.groupcode,
        compute: this.form.compute,
        reportname: this.form.reportname,
        reportdate: tempDate
      }
@@ -563,6 +733,7 @@
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 255
        this.$refs.tableDataRef.doLayout()
        this.$refs.tableDataRef2.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
@@ -697,6 +868,7 @@
  ::v-deep .el-table__fixed-right{
    height: 100% !important;
  }

  ::v-deep .el-table__fixed{
    height: 100% !important;
  }