1.不良明细报表、品质异常排行报表、维修明细报表开发完成

loulijun2021

2022-09-22 dc1226c67b9b34b602254ed3ca3de0e5b272cffa

1.不良明细报表、品质异常排行报表、维修明细报表开发完成

 src/utils/myEcharts.js

@@ -426,8 +426,8 @@
          // },
          formatter: function(params) {
            var val = ''
            if (params.length > 5) {
              val = params.substr(0, 5) + '...'
            if (params.length > 8) {
              val = params.substr(0, 8) + '...'
              return val
            } else {
              return params

 src/views/bbgl/blmx.vue

@@ -1,11 +1,635 @@
<template />
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup">
        <el-button type="primary" icon="el-icon-download" @click="download">导出</el-button>
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          inline
          style="display: flex;justify-content: space-between"
        >
          <div class="elForm">
            <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;">
              <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-form-item>
            <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-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="缺陷代码" style=" display: flex;">
              <el-input v-model="form.defectcode" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="缺陷名称" style=" display: flex;">
              <el-input v-model="form.defectname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">
              <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
                v-model="form.reportdate"
                type="daterange"
                range-separator="~"
                class="timeMini"
                size="mini"
                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
                :clearable="false"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
              />
              <!--              font-size: 14px!important;-->
              <!--              :picker-options="expireTimeOption"-->

            </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>
        </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"
        >
          <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="产品规格"
            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="plan_qty"
            label="任务数量"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="defect_qty"
            label="不良数量"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="defect_code"
            label="缺陷代码"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="defect_name"
            label="缺陷名称"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="style"
            label="操作类型"
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.style==='B'">报工</div>
              <div v-if="row.style==='S'">收料</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_user"
            label="操作人员"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="lm_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="getDefectDetailsReportSearch"
      />
    </div>

    <el-dialog
      :title="operation==='add'?'新增':'人员明细'"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <div style="height: 300px;width: 100%;background-color: aliceblue;padding:20px">
        <el-tag
          v-for="tag in tagArr"
          :key="tag.name"
          type="success"
          style="margin-right: 15px;min-width: 80px;text-align: center"
        >
          {{ 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>-->
        </div>
      </span>
    </el-dialog>

    <!--导入组件-->
    <import-picker
      ref="importPickerFunc"
      class="importPickerClass"
      :shows.sync="shows"
      :title="title_value"
      :colos="colos"
      :code="code"
    />

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime, validateCode } from '@/utils/global'
import {
  DefectDetailsReportExcelSearch,
  DefectDetailsReportSearch,
  GroupSalaryReportSearchUser
} from '@/api/bbgl'
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'

export default {
  name: 'Blmx'
  name: 'Zzjg',
  components: {
    Pagination, ImportPicker
  },
  data() {
    return {
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wocode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
        partspec: '', // 规格型号
        stepname: '', // 工序名称
        defectcode: '', // 缺陷代码
        defectname: '', // 缺陷名称
        reportname: '', // 操作人员
        reportdate: '', // 操作时间
        prop: 'partcode', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      // groupArr: [],
      total: 10,
      tableData: [],
      dialogVisible: false,
      tagArr: [], //
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// 上级单位
      },
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ]

      },

      title_value: '数据导入 / 点检部位',
      code: '4',
      shows: false

    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getDefectDetailsReportSearch()
      }
    }
  },
  created() {
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    handleRequest() {
      this.getDefectDetailsReportSearch().then(res => {
        // if (res.code === '200') {
        //   this.getMesOrderStepReportSelectUserGroup()
        // }
      })
    },
    async getDefectDetailsReportSearch() {
      let tempDate = this.form.reportdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
        partspec: this.form.partspec,
        stepname: this.form.stepname,
        defectcode: this.form.defectcode,
        defectname: this.form.defectname,
        reportname: this.form.reportname,
        reportdate: tempDate,
        prop: this.form.prop,
        order: this.form.order,
        page: this.form.page,
        rows: this.form.rows
      }

      const res = await DefectDetailsReportSearch(data)
      this.tableData = res.data
      this.total = res.count

      return { code: res.code }
    },

    // async getMesOrderStepReportSelectUserGroup() {
    //   const { data: res } = await MesOrderStepReportSelectUserGroup()
    //   this.groupArr = res
    // },
    // 排序改变时
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
        order = 'asc'
      } else {
        order = 'desc'
      }
      this.form.order = order
      this.form.prop = prop
      this.getDefectDetailsReportSearch()
    },
    async download() {
      let tempDate = this.form.reportdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }

      const data = {
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
        partspec: this.form.partspec,
        stepname: this.form.stepname,
        defectcode: this.form.defectcode,
        defectname: this.form.defectname,
        reportname: this.form.reportname,
        reportdate: tempDate
      }

      const { data: res } = await DefectDetailsReportExcelSearch(data)
      window.location.href = res
    },
    // 查询
    search() {
      this.getDefectDetailsReportSearch()
    },
    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // 重置
    reset() {
      this.form.wocode = ''
      this.form.partcode = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.stepname = ''
      this.form.defectcode = ''
      this.form.defectname = ''
      this.form.reportname = ''
      this.form.reportdate = ''
      this.getDefectDetailsReportSearch()
    },

    // 新增按钮
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // 修改按钮
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

      const res = await GroupSalaryReportSearchUser({ id: row.id })
      this.tagArr = res.data.map(r => r.reportname)
      // this.tagArr = ['楼李俊', '张三', '李四']
      // this.$nextTick(() => {
      //   this.dialogForm.OrgCode = row.org_code
      //   this.dialogForm.OrgName = row.org_name
      //   this.dialogForm.SupUnit = row.parent_id
      // })
    },
    // 删除按钮
    async del(row) {
      // this.$confirm('是否确认删除?', '提示', {
      //   confirmButtonText: '确定',
      //   cancelButtonText: '取消',
      //   type: 'warning'
      // }).then(() => {
      //   DeleteOrganization({ orgid: row.code }).then(res => {
      //     if (res.code === '200') {
      //       this.$message.success('删除成功!')
      //       if (this.form.page > 1 && this.tableData.length === 1) {
      //         this.form.page--
      //       }
      //       this.getDefectDetailsReportSearch()
      //     }
      //   })
      // }).catch(() => {
      //   this.$message.info('已取消删除')
      // })
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // 对话框确认
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
            OrganCode: this.dialogForm.OrgCode,
            OrganName: this.dialogForm.OrgName,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            Operator: getCookie('admin')
          }
          // AddUpdateOrganization(data).then(res => {
          //   if (res.code === '200') {
          //     this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
          //     this.dialogVisible = false
          //     this.getDefectDetailsReportSearch()
          //   } else {
          //     this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
          //   }
          // })
        }
      })
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 245
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }
  }
}
</script>

<style scoped>
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-range__icon {
  line-height: 28px !important;
}

::v-deep .el-range-separator {
  line-height: 28px !important;
}

::v-deep .el-range-input {
  font-size: 14px;
}

::v-deep .el-range-separator {
  display: flex;
  justify-content: center;
  align-items: center;
}

::v-deep .el-button--text {
  font-size: 14px;
  cursor: pointer;
}

.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}

.el-icon-edit-outline {
  margin-right: 15px;
}

::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
  align-items: center;
  padding: 0 15px;
}

::v-deep .el-button--primary {
  //background-color: $main_color !important;
}

::v-deep .el-button--default {
  background-color: #f8f8fa;
  border: none;
}

::v-deep .el-input__inner {
  height: 34px;
  line-height: 34px;
  //color: #a7a7a7;
}

::v-deep .el-dialog__body {
  //padding: 20px 100px !important;
  padding: 20px 20px !important;
}

::v-deep .dialogVisibleRoles .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .importPickerClass .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}

::v-deep .el-table .caret-wrapper {
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex;
  align-items: center;
  justify-content: space-between;
}

::v-deep .el-table::before {
  height: 0;
}

::v-deep .el-table__body-wrapper {
  background-color: #f8f8fa;
}

::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}

::v-deep .el-form--inline .el-form-item__label {
  color: #a7a7a7;
}

.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}

.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-select__caret {
  display: flex;
  align-items: center;
  justify-content: center;
}
</style>
<style>

.el-table .custom-row {
  background: #f8f8fa;
}
</style>

 src/views/bbgl/pzyc.vue

@@ -1,8 +1,265 @@
<template />
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div style="margin: 30px auto;width: 1600px;" :style="{height:mainHeight+'px'}">
        <div id="Echarts" style="width: 100%;height: 100%" />
      </div>
    </div>
  </div>
</template>

<script>
import * as echarts from 'echarts'
import { QuaneryDefectReportSearch } from '@/api/bbgl'

export default {
  name: 'Pzyc'
  name: 'Pzyc',
  data() {
    return {
      mainHeight: 400,
      echartsData: []
    }
  },
  created() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  mounted() {
    this.getQuaneryDefectReportSearch()
  },
  methods: {
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
      })
    },
    async getQuaneryDefectReportSearch() {
      const res = await QuaneryDefectReportSearch()
      if (res.code === '200') {
        this.echartsData = res.data
        this.getEcharts()
      }
    },
    getEcharts() {
      const option = {
        title: {
          text: '品质异常排行报表',
          left: '50%',
          top: '5%',
          textAlign: 'center',
          textStyle: {
            // color: '#fff',
            color: '#00ffff',
            fontSize: '20',
            fontWeight: 'bolder'
          }
        },
        backgroundColor: '#323a5e',
        tooltip: {
          trigger: 'axis',
          axisPointer: { // 坐标轴指示器，坐标轴触发有效
            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
          }
        },
        grid: {
          left: '2%',
          right: '4%',
          bottom: '10%',
          top: '15%',
          containLabel: true
        },
        legend: {
          data: ['1', '2', '3'],
          right: 10,
          top: 12,
          textStyle: {
            color: '#fff'
          },
          itemWidth: 12,
          itemHeight: 10
          // itemGap: 35
        },
        xAxis: {
          name: '种类',
          nameTextStyle: {
            // color: ,
            fontSize: 16,
            lineHeight: 20
          },
          type: 'category',
          data: this.echartsData.map(r => r.name),
          axisLine: {
            lineStyle: {
              color: 'white'
            }
          },
          axisLabel: {
            interval: 0,
            rotate: 20,
            textStyle: {
              fontSize: 16,
              fontFamily: 'Microsoft YaHei'
            }
          }
        },
        yAxis: {
          name: '数量',
          nameTextStyle: {
            // color: ,
            fontSize: 16,
            lineHeight: 20
          },
          type: 'value',
          // max: '1200',
          axisLine: {
            show: false,
            lineStyle: {
              color: 'white'
            }
          },
          splitLine: {
            show: true,
            lineStyle: {
              color: 'rgba(255,255,255,0.3)'
            }
          },
          axisLabel: {}
        },
        dataZoom: [{
          show: true,
          height: 30,
          xAxisIndex: [
            0
          ],
          bottom: 30,
          start: 10,
          end: 80,
          handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
          handleSize: '110%',
          handleStyle: {
            color: '#d3dee5'

          },
          textStyle: {
            color: '#fff'
          },
          borderColor: '#90979c'

        }, {
          type: 'inside',
          show: true,
          height: 15,
          start: 1,
          end: 35
        }],
        series: [{
          name: '数量',
          type: 'bar',
          barWidth: '15%',
          itemStyle: {
            normal: {
              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                offset: 0,
                color: '#fccb05'
              }, {
                offset: 1,
                color: '#f5804d'
              }]),
              barBorderRadius: 12
            }
          },
          data: this.echartsData.map(r => r.cont)
        }
          // {
          //   name: '2',
          //   type: 'bar',
          //   barWidth: '15%',
          //   itemStyle: {
          //     normal: {
          //         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
          //             offset: 0,
          //             color: '#8bd46e'
          //         }, {
          //             offset: 1,
          //             color: '#09bcb7'
          //         }]),
          //         barBorderRadius: 11,
          //     }

          //   },
          //   data: [400, 500, 500, 500, 500, 400,400, 500, 500]
          // },
          // {
          //   name: '3',
          //   type: 'bar',
          //   barWidth: '15%',
          //   itemStyle: {
          //     normal: {
          //         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
          //             offset: 0,
          //             color: '#248ff7'
          //         }, {
          //             offset: 1,
          //             color: '#6851f1'
          //         }]),
          //     barBorderRadius: 11,
          //     }
          //   },
          //   data: [400, 600, 700, 700, 1000, 400, 400, 600, 700]
          // }
        ]
      }

      var app = {
        currentIndex: -1
      }

      const myChart = echarts.init(document.getElementById('Echarts'))

      setInterval(function() {
        var dataLen = option.series[0].data.length

        // 取消之前高亮的图形
        myChart.dispatchAction({
          type: 'downplay',
          seriesIndex: 0,
          dataIndex: app.currentIndex
        })
        app.currentIndex = (app.currentIndex + 1) % dataLen
        // console.log(app.currentIndex);
        // 高亮当前图形
        myChart.dispatchAction({
          type: 'highlight',
          seriesIndex: 0,
          dataIndex: app.currentIndex
        })
        // 显示 tooltip
        myChart.dispatchAction({
          type: 'showTip',
          seriesIndex: 0,
          dataIndex: app.currentIndex
        })
      }, 1000)

      if (option.textStyle == null) {
        option.textStyle = {
          fontFamily: 'Microsoft YaHei',
          color: '#ffffff'
        }
      }

      // 使用刚指定的配置项和数据显示图表。
      myChart.clear()
      myChart.setOption(option, true)

      window.addEventListener('resize', function() {
        myChart.resize()
      })

      return myChart
    }
  }
}
</script>


 src/views/bbgl/rygz.vue

@@ -259,10 +259,7 @@
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime, validateCode } from '@/utils/global'
import {
  GroupSalaryReportExcelSearch,
  GroupSalaryReportSearch,
  GroupSalaryReportSearchUser,
  OutSourceReportExcelSearch, PeopleSalaryReportExcelSearch, PeopleSalaryReportSearch
  GroupSalaryReportSearchUser, PeopleSalaryReportExcelSearch, PeopleSalaryReportSearch
} from '@/api/bbgl'
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'


 src/views/bbgl/wwgx.vue

@@ -43,7 +43,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" :label="form.type==='F'?'发料时间':'收料时间'">
            <el-form-item v-show="isExpandForm" style="display: flex;align-items: center" :label="form.type==='F'?'发料时间':'收料时间'">
              <el-date-picker
                v-model="form.receivdate"
                type="daterange"

 src/views/bbgl/wxmx.vue

@@ -1,11 +1,649 @@
<template />
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup">
        <el-button type="primary" icon="el-icon-download" @click="download">导出</el-button>
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          inline
          style="display: flex;justify-content: space-between"
        >
          <div class="elForm">
            <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;">
              <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-form-item>
            <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-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="操作类型" style=" display: flex;">
              <!--              <el-input v-model="form.style" style="width: 200px" placeholder="请输入" />-->
              <el-select v-model="form.style" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in styleArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="缺陷名称" style=" display: flex;">
              <el-input v-model="form.defectname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">
              <el-input v-model="form.repairname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.repairdate"
                type="daterange"
                range-separator="~"
                class="timeMini"
                size="mini"
                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
                :clearable="false"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
              />
              <!--              font-size: 14px!important;-->
              <!--              :picker-options="expireTimeOption"-->

            </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>
        </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"
        >
          <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="120"
            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="style"
            label="操作类型"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="plan_qty"
            label="任务数量"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="repair_qty"
            label="维修数量"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="bad_qty"
            label="报废数量"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="defect_code"
            label="缺陷代码"
            width="110"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="defect_name"
            label="缺陷名称"
            width="110"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="lm_user"
            label="操作人员"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="操作时间"
            width="160"
            fixed="right"
            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="getMaintenanceDetailsReportSearch"
      />
    </div>

    <el-dialog
      :title="operation==='add'?'新增':'人员明细'"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <div style="height: 300px;width: 100%;background-color: aliceblue;padding:20px">
        <el-tag
          v-for="tag in tagArr"
          :key="tag.name"
          type="success"
          style="margin-right: 15px;min-width: 80px;text-align: center"
        >
          {{ 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>-->
        </div>
      </span>
    </el-dialog>

    <!--导入组件-->
    <import-picker
      ref="importPickerFunc"
      class="importPickerClass"
      :shows.sync="shows"
      :title="title_value"
      :colos="colos"
      :code="code"
    />

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime, validateCode } from '@/utils/global'
import {
  GroupSalaryReportSearchUser, MaintenanceDetailsReportExcelSearch, MaintenanceDetailsReportSearch
} from '@/api/bbgl'

export default {
  name: 'Wxmx'
  name: 'Zzjg',
  components: {
    Pagination, ImportPicker
  },
  data() {
    return {
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wocode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
        partspec: '', // 规格型号
        stepname: '', // 工序名称
        style: '', // 操作类型
        defectname: '', // 缺陷名称
        repairname: '', // 操作人员
        repairdate: '', // 操作时间
        prop: 'partcode', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      styleArr: [
        { code: 'B', name: '报工' },
        { code: 'S', name: '收料' }
      ],
      // groupArr: [],
      total: 10,
      tableData: [],
      dialogVisible: false,
      tagArr: [], //
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// 上级单位
      },
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ]

      },

      title_value: '数据导入 / 点检部位',
      code: '4',
      shows: false

    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getMaintenanceDetailsReportSearch()
      }
    }
  },
  created() {
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    handleRequest() {
      this.getMaintenanceDetailsReportSearch().then(res => {
        // if (res.code === '200') {
        //   this.getMesOrderStepReportSelectUserGroup()
        // }
      })
    },
    async getMaintenanceDetailsReportSearch() {
      let tempDate = this.form.repairdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
        partspec: this.form.partspec,
        stepname: this.form.stepname,
        style: this.form.style,
        defectname: this.form.defectname,
        repairname: this.form.repairname,
        repairdate: tempDate,
        prop: this.form.prop,
        order: this.form.order,
        page: this.form.page,
        rows: this.form.rows
      }

      const res = await MaintenanceDetailsReportSearch(data)
      this.tableData = res.data
      this.total = res.count

      return { code: res.code }
    },

    // async getMesOrderStepReportSelectUserGroup() {
    //   const { data: res } = await MesOrderStepReportSelectUserGroup()
    //   this.groupArr = res
    // },
    // 排序改变时
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
        order = 'asc'
      } else {
        order = 'desc'
      }
      this.form.order = order
      this.form.prop = prop
      this.getMaintenanceDetailsReportSearch()
    },
    async download() {
      let tempDate = this.form.repairdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }

      const data = {
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
        partspec: this.form.partspec,
        stepname: this.form.stepname,
        style: this.form.style,
        defectname: this.form.defectname,
        repairname: this.form.repairname,
        repairdate: tempDate
      }

      const { data: res } = await MaintenanceDetailsReportExcelSearch(data)
      window.location.href = res
    },
    // 查询
    search() {
      this.getMaintenanceDetailsReportSearch()
    },
    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // 重置
    reset() {
      this.form.wocode = ''
      this.form.partcode = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.stepname = ''
      this.form.style = ''
      this.form.defectname = ''
      this.form.repairname = ''
      this.form.repairdate = ''
      this.getMaintenanceDetailsReportSearch()
    },

    // 新增按钮
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // 修改按钮
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

      const res = await GroupSalaryReportSearchUser({ id: row.id })
      this.tagArr = res.data.map(r => r.repairname)
      // this.tagArr = ['楼李俊', '张三', '李四']
      // this.$nextTick(() => {
      //   this.dialogForm.OrgCode = row.org_code
      //   this.dialogForm.OrgName = row.org_name
      //   this.dialogForm.SupUnit = row.parent_id
      // })
    },
    // 删除按钮
    async del(row) {
      // this.$confirm('是否确认删除?', '提示', {
      //   confirmButtonText: '确定',
      //   cancelButtonText: '取消',
      //   type: 'warning'
      // }).then(() => {
      //   DeleteOrganization({ orgid: row.code }).then(res => {
      //     if (res.code === '200') {
      //       this.$message.success('删除成功!')
      //       if (this.form.page > 1 && this.tableData.length === 1) {
      //         this.form.page--
      //       }
      //       this.getMaintenanceDetailsReportSearch()
      //     }
      //   })
      // }).catch(() => {
      //   this.$message.info('已取消删除')
      // })
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // 对话框确认
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
            OrganCode: this.dialogForm.OrgCode,
            OrganName: this.dialogForm.OrgName,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            Operator: getCookie('admin')
          }
          // AddUpdateOrganization(data).then(res => {
          //   if (res.code === '200') {
          //     this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
          //     this.dialogVisible = false
          //     this.getMaintenanceDetailsReportSearch()
          //   } else {
          //     this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
          //   }
          // })
        }
      })
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 245
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }
  }
}
</script>

<style scoped>
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-range__icon {
  line-height: 28px !important;
}

::v-deep .el-range-separator {
  line-height: 28px !important;
}

::v-deep .el-range-input {
  font-size: 14px;
}

::v-deep .el-range-separator {
  display: flex;
  justify-content: center;
  align-items: center;
}

::v-deep .el-button--text {
  font-size: 14px;
  cursor: pointer;
}

.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}

.el-icon-edit-outline {
  margin-right: 15px;
}

::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
  align-items: center;
  padding: 0 15px;
}

::v-deep .el-button--primary {
  //background-color: $main_color !important;
}

::v-deep .el-button--default {
  background-color: #f8f8fa;
  border: none;
}

::v-deep .el-input__inner {
  height: 34px;
  line-height: 34px;
  //color: #a7a7a7;
}

::v-deep .el-dialog__body {
  //padding: 20px 100px !important;
  padding: 20px 20px !important;
}

::v-deep .dialogVisibleRoles .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .importPickerClass .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}

::v-deep .el-table .caret-wrapper {
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex;
  align-items: center;
  justify-content: space-between;
}

::v-deep .el-table::before {
  height: 0;
}

::v-deep .el-table__body-wrapper {
  background-color: #f8f8fa;
}

::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}

::v-deep .el-form--inline .el-form-item__label {
  color: #a7a7a7;
}

.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}

.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-select__caret {
  display: flex;
  align-items: center;
  justify-content: center;
}
</style>
<style>

.el-table .custom-row {
  background: #f8f8fa;
}
</style>

 src/views/jcsz/yhqd.vue

@@ -396,7 +396,7 @@
          show-checkbox
          node-key="code"
          default-expand-all
          style="height: 300px"
          style="height: 300px;overflow-y: scroll"
          :props="defaultPropsOfRoleTree"
          @check="checkBoxClick"
        />

 src/views/kb/bzcj.vue

@@ -22,7 +22,7 @@
          <div class="kb_left_top_title01 kb_title_text">
            <!--            <div class="PG01" />-->
            <!--            <svg-icon icon-class="sccx" />-->
            产线加工中任务
            产线加工中任务 <div style="margin-left: 30px">{{ number1 }} 单</div>
          </div>

          <div class="kb_left_top kb_pd10">
@@ -101,7 +101,7 @@
          <!-- 2-->
          <div class="kb_left_bottom kb_pd10">
            <div class="kb_left_bottom_content">
              <div class="content_head kb_title_text">产线加工任务</div>
              <div class="content_head kb_title_text">产线加工任务 <div style="margin-left: 30px">{{ number2 }} 单</div></div>
              <div class="content_body">
                <el-table
                  ref="tableData"
@@ -308,8 +308,7 @@
  LineSearchBottomLeftData,
  LineSearchBottomRightData,
  LineSearchTopLeftData,
  LineSearchTopRightData, ShopSearch,
  ShopSearchLine, WkspReportNotice
  LineSearchTopRightData, ShopSearch, WkspReportNotice
} from '@/api/dzkb'
import MarqueeTips from 'vue-marquee-tips'

@@ -331,6 +330,9 @@
      lineCodeArr: [],

      ShopArr: ['CJ003'], // 车间编码数组

      number1: '',
      number2: '',

      MarqueeTipsContent: '', // 公告
      speed: 100// 公告播放的速度
@@ -406,6 +408,8 @@
        length = this.lineContent.length
        count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
        this.lineContent3 = this.lineContent.slice(0, 3)

        this.number1 = this.lineContent.length
      })

      let start = 0
@@ -417,6 +421,8 @@
            length = this.lineContent.length
            count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
            this.lineContent3 = this.lineContent.slice(0, 3)

            this.number1 = this.lineContent.length
          })
        } else if (count === 0) {
          clearInterval(task)
@@ -431,6 +437,7 @@
    getTableDataRoll() {
      LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
        this.tableData = res.data
        this.number2 = this.tableData.length

        const divData = this.$refs.tableData.bodyWrapper
        // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
@@ -444,6 +451,7 @@
            divData.scrollTop = 0
            LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
              this.tableData = res.data
              this.number2 = this.tableData.length
              if (this.tableData.length > 10) {
                clearInterval(task)
                this.getTableDataRoll()
@@ -689,6 +697,7 @@
        flex-direction: column;

        .content_head {
          display: flex;
          line-height: 20px;
          margin-bottom: 10px;
          margin-top: -10px;

 src/views/kb/cgdd.vue

@@ -44,7 +44,7 @@
          <!-- 2-->
          <div class="kb_left_bottom kb_pd10">
            <div class="kb_left_bottom_content">
              <div class="content_head kb_title_text">采购到货跟踪</div>
              <div class="content_head kb_title_text">采购到货跟踪 <div style="margin-left: 30px">{{ number1 }} 单</div></div>
              <div class="content_body">
                <el-table
                  ref="tableData"
@@ -269,6 +269,8 @@
      tableData: [],
      tableDataRank: [],

      number1: '',

      MarqueeTipsContent: '', // 公告
      speed: 100// 公告播放的速度

@@ -308,6 +310,7 @@
    getPurchaseLeftBottom() {
      PurchaseLeftBottom().then(res => {
        this.tableData = res.data
        this.number1 = this.tableData.length

        const divData = this.$refs.tableData.bodyWrapper
        // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
@@ -320,6 +323,7 @@
            divData.scrollTop = 0
            PurchaseLeftBottom().then(res => {
              this.tableData = res.data
              this.number1 = this.tableData.length
              if (this.tableData.length > 14) {
                clearInterval(task)
                this.getPurchaseLeftBottom()
@@ -479,6 +483,7 @@
        flex-direction: column;

        .content_head {
          display: flex;
          color: #00ffff;
          line-height: 20px;
          //font-size: 18px;

 src/views/kb/ckgl.vue

@@ -21,7 +21,7 @@
          <!-- 1-->
          <div class="kb_left_top kb_pd10">
            <div class="kb_left_top_block" style="margin-top: 10px">
              <div class="headTitle kb_title_text">产品待入库</div>
              <div class="headTitle kb_title_text">产品待入库 <div style="margin-left: 30px">{{ number1 }} 单</div></div>
              <div class="content">
                <el-table
                  ref="tableDataTopRef"
@@ -151,7 +151,7 @@
              </div>
            </div>
            <div class="kb_left_top_block" style="margin-top: 25px">
              <div class="headTitle kb_title_text">产品待发货</div>
              <div class="headTitle kb_title_text">产品待发货 <div style="margin-left: 30px">{{ number2 }} 单</div></div>
              <div class="content">
                <el-table
                  ref="tableDataBottomRef"
@@ -330,6 +330,9 @@
      tableDataTop: [],
      tableDataBottom: [],

      number1: '',
      number2: '',

      MarqueeTipsContent: '', // 公告
      speed: 100// 公告播放的速度
    }
@@ -357,7 +360,7 @@
    getWareHouseTopLeftData() {
      WareHouseTopLeftData().then(res => {
        this.tableDataTop = res.data

        this.number1 = this.tableDataTop.length
        const divData = this.$refs.tableDataTopRef.bodyWrapper
        // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
        const task = setInterval(() => {
@@ -370,6 +373,7 @@
            divData.scrollTop = 0
            WareHouseTopLeftData().then(res => {
              this.tableDataTop = res.data
              this.number1 = this.tableDataTop.length
              if (this.tableDataTop.length > 9) {
                clearInterval(task)
                this.getWareHouseTopLeftData()
@@ -383,7 +387,7 @@
    getWareHouseTopBottomData() {
      WareHouseTopBottomData().then(res => {
        this.tableDataBottom = res.data

        this.number2 = this.tableDataBottom.length
        const divData = this.$refs.tableDataBottomRef.bodyWrapper
        // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
        const task = setInterval(() => {
@@ -396,7 +400,7 @@
            divData.scrollTop = 0
            WareHouseTopBottomData().then(res => {
              this.tableDataBottom = res.data

              this.number2 = this.tableDataBottom.length
              if (this.tableDataBottom.length > 10) {
                clearInterval(task)
                this.getWareHouseTopBottomData()
@@ -508,6 +512,7 @@
          //font-size: 18px;
          margin-bottom: 10px;
          margin-top: -10px;
          display: flex;
          color: #00ffff;

        }

 src/views/kb/dccj.vue

@@ -22,7 +22,7 @@
          <div class="kb_left_top_title01 kb_title_text">
            <!--            <div class="PG01" />-->
            <!--            <svg-icon icon-class="sccx" />-->
            产线加工中任务
            产线加工中任务 <div style="margin-left: 30px">{{ number1 }} 单</div>
          </div>

          <div class="kb_left_top kb_pd10">
@@ -101,7 +101,7 @@
          <!-- 2-->
          <div class="kb_left_bottom kb_pd10">
            <div class="kb_left_bottom_content">
              <div class="content_head kb_title_text">产线加工任务</div>
              <div class="content_head kb_title_text">产线加工任务 <div style="margin-left: 30px">{{ number2 }} 单</div></div>
              <div class="content_body">
                <el-table
                  ref="tableData"
@@ -308,8 +308,7 @@
  LineSearchBottomLeftData,
  LineSearchBottomRightData,
  LineSearchTopLeftData,
  LineSearchTopRightData, ShopSearch,
  ShopSearchLine, WkspReportNotice
  LineSearchTopRightData, ShopSearch, WkspReportNotice
} from '@/api/dzkb'
import MarqueeTips from 'vue-marquee-tips'

@@ -331,6 +330,9 @@
      lineCodeArr: [],

      ShopArr: ['CJ002'], // 车间编码数组

      number1: '',
      number2: '',

      MarqueeTipsContent: '', // 公告
      speed: 100// 公告播放的速度
@@ -406,6 +408,8 @@
        length = this.lineContent.length
        count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
        this.lineContent3 = this.lineContent.slice(0, 3)

        this.number1 = this.lineContent.length
      })

      let start = 0
@@ -417,6 +421,8 @@
            length = this.lineContent.length
            count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
            this.lineContent3 = this.lineContent.slice(0, 3)

            this.number1 = this.lineContent.length
          })
        } else if (count === 0) {
          clearInterval(task)
@@ -431,6 +437,7 @@
    getTableDataRoll() {
      LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
        this.tableData = res.data
        this.number2 = this.tableData.length

        const divData = this.$refs.tableData.bodyWrapper
        // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
@@ -444,6 +451,7 @@
            divData.scrollTop = 0
            LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
              this.tableData = res.data
              this.number2 = this.tableData.length
              if (this.tableData.length > 10) {
                clearInterval(task)
                this.getTableDataRoll()
@@ -689,6 +697,7 @@
        flex-direction: column;

        .content_head {
          display: flex;
          line-height: 20px;
          margin-bottom: 10px;
          margin-top: -10px;

 src/views/kb/zhkb.vue

@@ -22,7 +22,7 @@
          <div class="kb_left_top_title01 kb_title_text">
            <!--            <div class="PG01" />-->
            <!--            <svg-icon icon-class="sccx" />-->
            产线加工中任务
            产线加工中任务 <div style="margin-left: 30px">{{ number1 }} 单</div>
          </div>

          <div class="kb_left_top kb_pd10">
@@ -101,7 +101,7 @@
          <!-- 2-->
          <div class="kb_left_bottom kb_pd10">
            <div class="kb_left_bottom_content">
              <div class="content_head kb_title_text">产线加工任务</div>
              <div class="content_head kb_title_text">产线加工任务 <div style="margin-left: 30px">{{ number2 }} 单</div></div>
              <div class="content_body">
                <el-table
                  ref="tableData"
@@ -308,8 +308,7 @@
  LineSearchBottomLeftData,
  LineSearchBottomRightData,
  LineSearchTopLeftData,
  LineSearchTopRightData, ShopSearch,
  ShopSearchLine, WkspReportNotice
  LineSearchTopRightData, ShopSearch, WkspReportNotice
} from '@/api/dzkb'
import MarqueeTips from 'vue-marquee-tips'

@@ -331,6 +330,9 @@
      lineCodeArr: [],

      ShopArr: [], // 车间编码数组

      number1: '',
      number2: '',

      MarqueeTipsContent: '', // 公告
      speed: 100// 公告播放的速度
@@ -406,6 +408,8 @@
        length = this.lineContent.length
        count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
        this.lineContent3 = this.lineContent.slice(0, 3)

        this.number1 = this.lineContent.length
      })

      let start = 0
@@ -417,6 +421,8 @@
            length = this.lineContent.length
            count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
            this.lineContent3 = this.lineContent.slice(0, 3)

            this.number1 = this.lineContent.length
          })
        } else if (count === 0) {
          clearInterval(task)
@@ -431,6 +437,7 @@
    getTableDataRoll() {
      LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
        this.tableData = res.data
        this.number2 = this.tableData.length

        const divData = this.$refs.tableData.bodyWrapper
        // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
@@ -444,6 +451,7 @@
            divData.scrollTop = 0
            LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
              this.tableData = res.data
              this.number2 = this.tableData.length
              if (this.tableData.length > 10) {
                clearInterval(task)
                this.getTableDataRoll()
@@ -689,6 +697,7 @@
        flex-direction: column;

        .content_head {
          display: flex;
          line-height: 20px;
          margin-bottom: 10px;
          margin-top: -10px;

 src/views/kb/zpcj.vue

@@ -22,7 +22,7 @@
          <div class="kb_left_top_title01 kb_title_text">
            <!--            <div class="PG01" />-->
            <!--            <svg-icon icon-class="sccx" />-->
            产线加工中任务
            产线加工中任务 <div style="margin-left: 30px">{{ number1 }} 单</div>
          </div>

          <div class="kb_left_top kb_pd10">
@@ -101,7 +101,7 @@
          <!-- 2-->
          <div class="kb_left_bottom kb_pd10">
            <div class="kb_left_bottom_content">
              <div class="content_head kb_title_text">产线加工任务</div>
              <div class="content_head kb_title_text">产线加工任务 <div style="margin-left: 30px">{{ number2 }} 单</div></div>
              <div class="content_body">
                <el-table
                  ref="tableData"
@@ -308,8 +308,7 @@
  LineSearchBottomLeftData,
  LineSearchBottomRightData,
  LineSearchTopLeftData,
  LineSearchTopRightData, ShopSearch,
  ShopSearchLine, WkspReportNotice
  LineSearchTopRightData, ShopSearch, WkspReportNotice
} from '@/api/dzkb'
import MarqueeTips from 'vue-marquee-tips'

@@ -331,6 +330,9 @@
      lineCodeArr: [],

      ShopArr: ['CJ001'], // 车间编码数组

      number1: '',
      number2: '',

      MarqueeTipsContent: '', // 公告
      speed: 100// 公告播放的速度
@@ -406,6 +408,8 @@
        length = this.lineContent.length
        count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
        this.lineContent3 = this.lineContent.slice(0, 3)

        this.number1 = this.lineContent.length
      })

      let start = 0
@@ -417,6 +421,8 @@
            length = this.lineContent.length
            count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
            this.lineContent3 = this.lineContent.slice(0, 3)

            this.number1 = this.lineContent.length
          })
        } else if (count === 0) {
          clearInterval(task)
@@ -431,6 +437,7 @@
    getTableDataRoll() {
      LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
        this.tableData = res.data
        this.number2 = this.tableData.length

        const divData = this.$refs.tableData.bodyWrapper
        // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
@@ -444,6 +451,7 @@
            divData.scrollTop = 0
            LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
              this.tableData = res.data
              this.number2 = this.tableData.length
              if (this.tableData.length > 10) {
                clearInterval(task)
                this.getTableDataRoll()
@@ -689,6 +697,7 @@
        flex-direction: column;

        .content_head {
          display: flex;
          line-height: 20px;
          margin-bottom: 10px;
          margin-top: -10px;

 src/views/sbgl/djjl.vue

@@ -38,8 +38,18 @@
            <el-form-item label="点检人员" style=" display: flex;">
              <el-input v-model="form.checkuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="点检时间" style=" display: flex;">
              <el-input v-model="form.checkdate" style="width: 200px" placeholder="请输入" />
            <el-form-item v-show="isExpandForm" label="点检时间" style=" display: flex;font-size:14px;align-items: center">
              <el-date-picker
                v-model="form.checkdate"
                type="daterange"
                :clearable="false"
                class="timeMini"
                range-separator="~"
                start-placeholder="开始日期"
                style="width: 200px;display: flex;line-height: 34px ;height: 34px;"
                end-placeholder="结束日期"
                size="mini"
              />
            </el-form-item>
            <!--            <el-form-item v-show="isExpandForm" label="点检结果" style=" display: flex;">-->
            <!--              <el-select v-model="form.isOK" style="width: 200px" placeholder="请选择">-->
@@ -85,7 +95,7 @@
            label="序号"
          />
          <el-table-column
            prop="org_code"
            prop="djwo"
            label="点检单号"
            sortable="custom"
          />
@@ -95,45 +105,50 @@
            sortable="custom"
          />
          <el-table-column
            prop="description"
            prop="eqp_code"
            label="设备编号"
            sortable="custom"
          />
          <el-table-column
            prop="parentorg_name"
            prop="eqp_name"
            label="设备名称"
            sortable="custom"
          />
          <el-table-column
            prop="lm_user"
            prop="stanedcode"
            label="点检标准编码"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            prop="stanedname"
            label="点检标准名称"
            width="160"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            prop="chk_user"
            label="点检人员"
            width="160"
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.chk_user&&row.chk_user!=='null'">{{ row.chk_user }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="djjg"
            prop="chk_result"
            label="点检结果"
            width="160"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.djjg==='Y'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />正常</div>
              <div v-if="row.djjg==='N'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />异常</div>
              <div v-if="row.chk_result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />正常</div>
              <div v-if="row.chk_result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />异常</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_date"
            prop="chk_date"
            label="点检时间"
            width="160"
            sortable="custom"
@@ -196,30 +211,36 @@
          @sort-change="sortChange"
        >
          <el-table-column
            prop="RowNum"
            prop="seq"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
            prop="RowNum"
            prop="itemcode"
            label="部位编码"
          />
          <el-table-column
            prop="RowNum"
            prop="itemname"
            label="部位名称"
          />
          <el-table-column
            prop="RowNum"
            prop="result"
            label="点检结果"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />正常</div>
              <div v-if="row.result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />异常</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="RowNum"
            prop="chk_value"
            label="数值"
          />
          <el-table-column
            prop="bz"
            prop="remark"
            label="备注"
            show-tooltip-when-overflow
          />
        </el-table>
      </div>
@@ -251,7 +272,7 @@
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { validateCode } from '@/utils/global'
import { handleDatetime, validateCode } from '@/utils/global'
import { DeviceCheckSubTakeSearch, DeviceCheckTakeOutExcel, DeviceCheckTakeSearch } from '@/api/sbgl'
import { ShopSearch } from '@/api/dzkb'

@@ -272,7 +293,7 @@
        stanedname: '', // 标准名称
        checkuser: '', // 点检人员
        checkdate: '', // 点检时间
        prop: 'eqp_code', // 排序字段
        prop: 'chk_date', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
@@ -321,13 +342,27 @@
      })
    },
    async getDeviceCheckTakeSearch() {
      const res = await DeviceCheckTakeSearch(this.form)
      this.tableData = res.data
      // this.tableData = [
      //   { RowNum: 1, djjg: 'N' }
      // ]
      this.total = res.count
      let tempDate = this.form.checkdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }

      const data = {
        wkshopcode: this.form.wkshopcode,
        eqpcode: this.form.eqpcode,
        eqpname: this.form.eqpname,
        stanedname: this.form.stanedname,
        checkuser: this.form.checkuser,
        checkdate: tempDate,
        prop: this.form.prop, // 排序字段
        order: this.form.order, // 排序字段
        page: this.form.page, // 第几页
        rows: this.form.rows // 每页多少条
      }

      const res = await DeviceCheckTakeSearch(data)
      this.tableData = res.data
      this.total = res.count
      return { code: res.code }
    },
    // 获取执行车间下拉数组
@@ -381,11 +416,9 @@
      this.operation = operation
      this.dialogVisible = true

      // const res = await DeviceCheckSubTakeSearch({djwo:row.id})
      const res = await DeviceCheckSubTakeSearch({ djwo: row.djwo })

      this.tableDataDialog = [
        { bz: '1231' }
      ]
      this.tableDataDialog = res.data
      // this.$nextTick(() => {
      //   this.dialogForm.OrgCode = row.org_code
      //   this.dialogForm.OrgName = row.org_name
@@ -448,7 +481,19 @@
      })
    },
    async download() {
      const { data: res } = await DeviceCheckTakeOutExcel(this.form)
      let tempDate = this.form.checkdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        eqpcode: this.form.eqpcode,
        eqpname: this.form.eqpname,
        stanedname: this.form.stanedname,
        checkuser: this.form.checkuser,
        checkdate: tempDate
      }
      const { data: res } = await DeviceCheckTakeOutExcel(data)
      window.location.href = res
    },
    // 获取页面高度
@@ -469,6 +514,21 @@
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-range__icon{
  line-height: 28px !important;
}
::v-deep .el-range-separator{
  line-height: 28px !important;
}
::v-deep .el-range-input{
  font-size: 14px;
}
::v-deep .el-range-separator{
  display: flex;
  justify-content: center;
  align-items: center;
}

::v-deep .el-button--text {
  font-size: 14px;
  cursor: pointer;

 src/views/scgl/gd.vue

@@ -1771,11 +1771,11 @@
      printSize: 1,
      printSizeSelectArr: [// 宽*高
        { code: 0, name: '80*50' },
        { code: 1, name: '78*60' },
        { code: 2, name: '50*60' },
        { code: 3, name: '50*40' },
        { code: 4, name: '50*80' },
        { code: 5, name: '40*30' }
        { code: 1, name: '78*60' }
        // { code: 2, name: '50*60' },
        // { code: 3, name: '50*40' },
        // { code: 4, name: '50*80' },
        // { code: 5, name: '40*30' }
      ]
    }
  },