1.递交

loulijun2021

2023-05-23 ff0604306c9cf18a05e5d8a3a136432284c290bb

 src/views/bbgl/rygz.vue

@@ -4,31 +4,32 @@
      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <el-button v-waves type="primary" icon="el-icon-download" @click="download">导出</el-button>

        <div
          style="color: red;margin: 10px 5px 0 0;"
        >当前报表只统计自制件工序
        </div>

        <!--        <div class="topRight" style="display: flex;align-items: center">-->
        <!--          &lt;!&ndash;          <div style="font-size: 14px;margin-right: 15px;color: #a7a7a7">剔除工序</div>&ndash;&gt;-->
        <!--          <el-select-->
        <!--            v-model="form.rejectstepcode"-->
        <!--            style="width: 170px;"-->
        <!--            multiple-->
        <!--            placeholder="请选择剔除工序"-->
        <!--            collapse-tags-->
        <!--            filterable-->
        <!--            clearable-->
        <!--            @change="getPeopleSalaryReportSearch"-->
        <!--          >-->
        <!--            <el-option-->
        <!--              v-for="item in StepSelectArr"-->
        <!--              :key="item.stepcode"-->
        <!--              :label="item.stepname"-->
        <!--              :value="item.stepcode"-->
        <!--            />-->
        <!--          </el-select>-->
        <!--        </div>-->
        <div class="topRight" style="display: flex;align-items: center">
          <div
            style="color: red;margin: 0px 10px 0 0;"
          >当前报表只统计自制件工序
          </div>

          <!--          <div style="font-size: 14px;margin-right: 15px;color: #a7a7a7">剔除工序</div>-->
          <el-select
            v-model="form.rejectstepcode"
            style="width: 220px;"
            multiple
            placeholder="请选择剔除车间"
            collapse-tags
            filterable
            clearable
            @change="getPeopleSalaryReportSearch"
          >
            <el-option
              v-for="item in WorkShopArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </div>
      </div>

      <div class="bodyTopFormGroup">
@@ -41,19 +42,19 @@
        >
          <div class="elForm">
            <el-form-item label="工单编号" style="display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px"/>
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px"/>
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入"/>
            </el-form-item>
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入"/>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入"/>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="生产班组" style=" display: flex;">
              <el-select v-model="form.groupcode" style="width: 200px" placeholder="请选择">
@@ -66,7 +67,7 @@
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">
              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入" />
              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入"/>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
@@ -121,8 +122,7 @@
              :data="tableData"
              :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',}"
              highlight-current-row
@@ -130,6 +130,8 @@
              :cell-style="this.$cellStyle"
              @sort-change="sortChange"
            >
<!--              :summary-method="getSummaries"-->
<!--              show-summary-->
              <el-table-column
                prop="RowNum"
                width="50"
@@ -279,8 +281,7 @@
              :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',}"
              highlight-current-row
@@ -288,6 +289,8 @@
              :cell-style="this.$cellStyle"
              @sort-change="sortChange"
            >
<!--              :summary-method="getSummaries"-->
<!--              show-summary-->
              <el-table-column
                prop="RowNum"
                width="50"
@@ -475,6 +478,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { StepSelect } from '@/api/zzmx'
import { WorkShopSelect } from '@/api/sbgl'

export default {
  name: 'Zzjg',
@@ -488,7 +492,8 @@
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      // StepSelectArr: [], // 剔除工序数组
      WorkShopArr: [],//剔除车间数组
      form: {
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -562,14 +567,19 @@
      this.getPeopleSalaryReportSearch().then(res => {
        if (res.code === '200') {
          this.getMesOrderStepReportSelectUserGroup()
          this.getStepSelect()
          this.getWorkShopSelect()
        }
      })
    },
    // 获取工序下拉接口
    async  getStepSelect() {
      const { data: res } = await StepSelect()
      this.StepSelectArr = res
    // async  getStepSelect() {
    //   const { data: res } = await StepSelect()
    //   this.StepSelectArr = res
    // },
    // 获取所属车间下拉
    async getWorkShopSelect() {
      const { data: res } = await WorkShopSelect()
      this.WorkShopArr = res
    },
    getSummaries(param) {
      const { columns, data } = param