1.工单工序打印二维码bug问题修复

loulijun2021

2023-03-20 d68b12df7d3122fce36c344a3a65773648a75acf

1.工单工序打印二维码bug问题修复

 src/views/bbgl/bzgz.vue

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


        <div class="topRight" style="display: flex;align-items: center">
        <div
          style="color: red;margin: 10px 5px 0 0;"
            style="color: red;margin: 0px 10px 0 0;"
        >当前报表只统计自制件工序
        </div>

        <!--                <div class="topRight" style="display: flex;align-items: center">-->
        <!--                   <el-select-->
        <!--                    v-model="form.rejectstepcode"-->
        <!--                    style="width: 170px;"-->
        <!--                    multiple-->
        <!--                    placeholder="请选择剔除工序"-->
        <!--                    collapse-tags-->
        <!--                    filterable-->
        <!--                    clearable-->
        <!--                    @change="getGroupSalaryReportSearch"-->
        <!--                  >-->
        <!--                    <el-option-->
        <!--                      v-for="item in StepSelectArr"-->
        <!--                      :key="item.stepcode"-->
        <!--                      :label="item.stepname"-->
        <!--                      :value="item.stepcode"-->
        <!--                    />-->
        <!--                  </el-select>-->
        <!--                </div>-->
          <el-select
            v-model="form.rejectstepcode"
            style="width: 220px;"
            multiple
            placeholder="请选择剔除车间"
            collapse-tags
            filterable
            clearable
            @change="getGroupSalaryReportSearch"
          >
            <el-option
              v-for="item in WorkShopArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </div>

      </div>

@@ -502,6 +502,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',
@@ -515,7 +516,7 @@
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      WorkShopArr: [], // 剔除数组
      form: {
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -589,14 +590,18 @@
      this.getGroupSalaryReportSearch().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

 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 class="topRight" style="display: flex;align-items: center">
        <div
          style="color: red;margin: 10px 5px 0 0;"
            style="color: red;margin: 0px 10px 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 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">
@@ -475,6 +476,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 +490,8 @@
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      // StepSelectArr: [], // 剔除工序数组
      WorkShopArr: [],//剔除车间数组
      form: {
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -562,14 +565,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

 src/views/scgl/gd.vue

@@ -2577,6 +2577,10 @@
          this.$nextTick(() => {
            console.log(this.qrForm.qrvalue, 3333)
            this.bindQRCode2(this.qrForm.qrvalue)
            const div = document.getElementById('qrCode2')
            // 这么多代码只需要这一句实现我们所需要的功能，定位div滚动条位置在底部，scrollHeight计算出div的高度，再scrollTop 设置滚动条的高度为多少
            div.scrollTop = div.scrollHeight // 滚动条位于最底部
            // div.scrollTop = 0 // 滚动条位于最顶部
          })
        }
      })