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

loulijun2021

2023-02-15 599a565adfdb4fb04ab6a8f17fcf0995e25d8810

 src/views/bbgl/bzgz.vue

@@ -2,19 +2,19 @@
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup">
        <el-button type="primary" icon="el-icon-download" @click="download">导出</el-button>
        <el-button v-waves type="primary" icon="el-icon-download" @click="download">导出</el-button>
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工单编号" style=" display: flex;">
            <el-form-item label="工单编号" style="display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
@@ -26,7 +26,7 @@
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="工序名称" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="工序名称" style="display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="生产班组" style=" display: flex;">
@@ -42,7 +42,7 @@
            <el-form-item v-show="isExpandForm" label="操作人员" style=" display: flex;">
              <el-input v-model="form.username" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="操作时间">
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.operdate"
                type="daterange"
@@ -59,170 +59,370 @@

            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <el-button v-waves type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
      </div>

      <div
        class="bodyTopFormExpand"
        @click="isExpandForm=!isExpandForm"
      >
        <i
          :class="!isExpandForm?'el-icon-arrow-down':'el-icon-arrow-up'"
          :style="{color:'#42B983'}"
        /></div>

      <div class="elTableDiv" style="margin-top: 0">
        <el-table
          :data="tableData"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        <div
          class="bodyTopFormExpand"
        >
          <el-table-column
            prop="RowNum"
            width="50"
            fixed
            label="序号"
          <svg-icon
            v-show="mouseHoverType==='mouseout'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
            @mouseenter="mouseHoverType=$event.type"
          />
          <el-table-column
            prop="wo_code"
            label="工单编号"
            width="160"
            sortable="custom"
          <svg-icon
            v-show="mouseHoverType==='mouseenter'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
            @click="isExpandForm=!isExpandForm"
            @mouseout="mouseHoverType=$event.type"
          />
          <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="产品规格"
            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"
          />
          <el-table-column
            prop="good_qty"
            label="报工数量"
            width="110"
            sortable="custom"
          />
          <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="110"
            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="lm_user"
            label="操作人员"
            width="110"
            sortable="custom"
          />
        </div>

          <el-table-column
            label="查看明细"
            width="120"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-tooltip class="item" effect="dark" content="人员明细" placement="top">
                  <!--                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
                  <i
                    class="el-icon-tickets"
                    style="cursor: pointer;color: #42b983;margin-right: 15px"
                    @click="edit('edit',row)"
                  />
                </el-tooltip>
                <!--                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">-->
                <!--                  <i class="el-icon-delete" @click="del(row)" />-->
                <!--                </el-tooltip>-->
              </div>
            </template>
          </el-table-column>
        </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="getGroupSalaryReportSearch"
      />

      <el-tabs type="border-card" style="margin-top: 10px" @tab-click="tabClick">
        <el-tab-pane label="末道工序">
          <div class="elTableDiv" style="margin: 0 auto 10px;">
            <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="150"
                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="good_qty"
                label="报工数量"
                width="110"
                sortable="custom"
              />
              <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="110"
                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="lm_user"
                label="操作人"
                width="110"
                sortable="custom"
              />
              <el-table-column
                prop="report_date"
                label="操作时间"
                width="160"
                sortable="custom"
              />

              <el-table-column
                label="查看明细"
                width="120"
                fixed="right"
              >
                <template slot-scope="{row}">
                  <div class="operationClass">
                    <el-tooltip class="item" effect="dark" content="人员明细" placement="top">
                      <!--                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
                      <i
                        class="el-icon-tickets"
                        :style="{color:$store.state.settings.theme}"
                        style="cursor: pointer;margin-right: 15px"
                        @click="edit('edit',row)"
                      />
                    </el-tooltip>
                    <!--                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">-->
                    <!--                  <i class="el-icon-delete" @click="del(row)" />-->
                    <!--                </el-tooltip>-->
                  </div>
                </template>
              </el-table-column>
            </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="getGroupSalaryReportSearch"
          />
        </el-tab-pane>
        <el-tab-pane label="逐道工序">
          <div class="elTableDiv" style="margin: 0 auto 10px;">
            <el-table
              ref="tableDataRef2"
              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="150"
                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="good_qty"
                label="报工数量"
                width="110"
                sortable="custom"
              />
              <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="110"
                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="lm_user"
                label="操作人"
                width="110"
                sortable="custom"
              />
              <el-table-column
                prop="report_date"
                label="操作时间"
                width="160"
                sortable="custom"
              />

              <el-table-column
                label="查看明细"
                width="120"
                fixed="right"
              >
                <template slot-scope="{row}">
                  <div class="operationClass">
                    <el-tooltip class="item" effect="dark" content="人员明细" placement="top">
                      <!--                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
                      <i
                        class="el-icon-tickets"
                        :style="{color:$store.state.settings.theme}"
                        style="cursor: pointer;margin-right: 15px"
                        @click="edit('edit',row)"
                      />
                    </el-tooltip>
                    <!--                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">-->
                    <!--                  <i class="el-icon-delete" @click="del(row)" />-->
                    <!--                </el-tooltip>-->
                  </div>
                </template>
              </el-table-column>
            </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="getGroupSalaryReportSearch"
          />
        </el-tab-pane>

      </el-tabs>
    </div>

    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'人员明细'"
      :visible.sync="dialogVisible"
      width="800px"
@@ -237,15 +437,16 @@
          :key="tag.name"
          type="success"
          style="margin-right: 15px;min-width: 80px;text-align: center"
          :style="{color:$store.state.settings.theme}"
        >
          {{ tag }}
        </el-tag>
      </div>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisible=false">返 回</el-button>
          <!--          <el-button @click="dialogVisibleCancel">取 消</el-button>-->
          <!--          <el-button type="primary" @click="dialogVisibleConfirm">确 定</el-button>-->
          <el-button v-waves @click="dialogVisible=false">返 回</el-button>
          <!--          <el-button v-waves @click="dialogVisibleCancel">取 消</el-button>-->
          <!--          <el-button v-waves type="primary" @click="dialogVisibleConfirm">确 定</el-button>-->
        </div>
      </span>
    </el-dialog>
@@ -271,18 +472,21 @@
import {
  GroupSalaryReportExcelSearch,
  GroupSalaryReportSearch,
  GroupSalaryReportSearchUser,
  OutSourceReportExcelSearch
  GroupSalaryReportSearchUser
} from '@/api/bbgl'
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'

export default {
  name: 'Zzjg',
  components: {
    Pagination, ImportPicker
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
@@ -295,6 +499,7 @@
        groupcode: '', // 生产班组
        username: '', // 操作人员
        operdate: '', // 操作时间
        compute: 'last', // 计件方式  逐道工序：contin   末道工序：last
        prop: 'lm_date', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
@@ -345,6 +550,12 @@
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  // updated() {
  //   this.$nextTick(() => {
  //     this.$refs.tableDataRef.doLayout()
  //     this.$refs.tableDataRef2.doLayout()
  //   })
  // },
  methods: {
    handleRequest() {
      this.getGroupSalaryReportSearch().then(res => {
@@ -352,6 +563,38 @@
          this.getMesOrderStepReportSelectUserGroup()
        }
      })
    },
    getSummaries(param) {
      const { columns, data } = param
      const sums = []

      columns.forEach((column, index) => {
        if (index === 10) {
          sums[index] = '总价'
          return
        }
        const values = data.map(item => Number(item[column.property]))
        if (column.property === 'usermoney') {
          sums[index] = values.reduce((prev, curr) => {
            const value = Number(curr)
            if (!isNaN(value)) {
              return prev + curr
            } else {
              return prev
            }
          }, 0)
          sums[index] += ' 元'
        } else {
          // sums[index] = 'N/A'
          sums[index] = ' '
        }
      })
      this.$nextTick(() => {
        this.$refs.tableDataRef.doLayout()
        this.$refs.tableDataRef2.doLayout()
      })

      return sums
    },
    async getGroupSalaryReportSearch() {
      let tempDate = this.form.operdate
@@ -367,13 +610,13 @@
        groupcode: this.form.groupcode,
        username: this.form.username,
        operdate: tempDate,
        compute: this.form.compute,
        prop: this.form.prop,
        order: this.form.order,
        page: this.form.page,
        rows: this.form.rows

      }
      console.log(data, 1)
      const res = await GroupSalaryReportSearch(data)
      this.tableData = res.data
      this.total = res.count
@@ -384,6 +627,11 @@
    async getMesOrderStepReportSelectUserGroup() {
      const { data: res } = await MesOrderStepReportSelectUserGroup()
      this.groupArr = res
    },
    tabClick(val) {
      // console.log(val.label)
      this.form.compute = val.label === '末道工序' ? 'last' : 'contin'
      this.getGroupSalaryReportSearch()
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
@@ -412,7 +660,8 @@
        stepname: this.form.stepname,
        groupcode: this.form.groupcode,
        username: this.form.username,
        operdate: tempDate
        operdate: tempDate,
        compute: this.form.compute
      }

      const { data: res } = await GroupSalaryReportExcelSearch(data)
@@ -520,7 +769,9 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 245
        this.tableHeight = this.mainHeight - 255
        this.$refs.tableDataRef.doLayout()
        this.$refs.tableDataRef2.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
@@ -650,6 +901,16 @@
  align-items: center;
  justify-content: center;
}

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

  ::v-deep .el-table__fixed {
    height: 100% !important;
  }
}
</style>
<style>