1.点检、保养、维修记录 100% 2.新增模具履历查询

loulijun2021

2023-12-22 5e383c4995bfe823c4b6abcb24abe75fbec18253

1.点检、保养、维修记录 100%    2.新增模具履历查询

 src/api/MouldManager.js

@@ -323,3 +323,12 @@
    params: data
  })
}

// 模具出入库记录查询
export function MoldResumeSearch(data) {
  return request({
    url: 'MouldManager/MoldResumeSearch',
    method: 'get',
    params: data
  })
}

 src/views/deviceManager/checkRecord.vue

@@ -0,0 +1,595 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup">
        <!--        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
        <!--        <el-button v-waves icon="el-icon-download" @click="upload">导入</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="100px"
          inline
          style="display: flex;"
        >
          <div class="elForm" style="justify-content: flex-start">
            <el-form-item label="生产车间" style=" display: flex;">
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkshopSelectArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="设备编码" style=" display: flex;">
              <el-input v-model="form.eqpcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="设备名称" style=" display: flex;">
              <el-input v-model="form.eqpname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="标准名称" style=" display: flex;">
              <el-input v-model="form.stanedname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" 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;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>

          </div>
          <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
          class="bodyTopFormExpand"
        >
          <svg-icon
            v-show="mouseHoverType==='mouseout'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
            @mouseenter="mouseHoverType=$event.type"
          />
          <svg-icon
            v-show="mouseHoverType==='mouseenter'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
            @click="isExpandForm=!isExpandForm"
            @mouseout="mouseHoverType=$event.type"
          />
        </div>
      </div>

      <div class="elTableDiv">
        <!--        <TableColumnSettings-->
        <!--          :list1="tableColumnSettingsArray"-->
        <!--          @tableColumnUpdate="tableColumnUpdate"-->
        <!--        />-->
        <el-table
          ref="tableDataRef"
          :key="tableTimeStampKey"
          class="tableFixed"
          :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
            v-for="item in tableColumnSettingsArray"
            v-if="item.show"
            :key="item.id"
            :sortable="item.sortable"
            :prop="item.prop"
            :min-width="item.minWidth"
            :label="item.label"
            :width="item.width"
            show-tooltip-when-overflow
            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
          >
            <template slot-scope="{row}">
              <div v-if="!row[item.prop]">/</div>

              <div v-else-if="item.prop==='chk_result'">
                <div v-if="row[item.prop]==='OK'" style="display: flex;align-items: center">
                  <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                  正常
                </div>
                <div v-if="row[item.prop]==='NG'" style="display: flex;align-items: center">
                  <i class="el-icon-info" style="margin-right: 2px" />
                  异常
                </div>
              </div>
              <div v-else>{{ row[item.prop] }}</div>
            </template>
          </el-table-column>

          <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)" />-->
              <!--                </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>-->
              <i
                class="el-icon-tickets"
                :style="{color:$store.state.settings.theme}"
                style="cursor: pointer;margin-right: 15px"
                @click="edit('edit',row)"
              />
            </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="getDeviceCheckTakeSearch"
      />
    </div>

    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'点检明细'"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >

      <div class="elTableDiv" style="margin-top: 0">
        <el-table
          :data="tableDataDialog"
          :height="500+'px'"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:500+'px'}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <el-table-column
            prop="seq"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
            prop="itemcode"
            label="部位编码"
          />
          <el-table-column
            prop="itemname"
            label="部位名称"
          />
          <el-table-column
            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" />-->
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                正常
              </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" />-->
                <i class="el-icon-info" style="margin-right: 2px" />
                异常
              </div>
            </template>
          </el-table-column>
          <el-table-column
            prop="chk_value"
            label="数值"
          />
          <el-table-column
            prop="remark"
            label="备注"
            show-tooltip-when-overflow
          />
        </el-table>
      </div>

      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <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>

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization } from '@/api/basicSettings'
import { getCookie } from '@/utils/auth'
import { handleDatetime } from '@/utils/global'
import { DeviceCheckSubTakeSearch, DeviceCheckTakeOutExcel, DeviceCheckTakeSearch } from '@/api/DeviceManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  components: {
    Pagination, TableColumnSettings
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '', // 车间编码
        eqpcode: '', // 设备编码
        eqpname: '', // 设备名称
        stanedname: '', // 标准名称
        checkuser: '', // 点检人员
        checkdate: '', // 点检时间
        prop: 'chk_date', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      wkshopSelectArr: [],
      total: 10,
      tableData: [],
      tableColumnSettingsArray: [
        // { minWidth: false, width: 55, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 隐藏列  show: false隐藏，true显示
        { minWidth: false, width: 55, prop: 'rowNum', label: '序号', id: 2, show: true, fixed: 'left', sortable: false }, // custom
        {
          minWidth: 110,
          width: false,
          prop: 'djwo',
          label: '点检单号',
          id: 3,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 130,
          prop: 'org_code',
          label: '生产车间编码',
          id: 4,
          show: false,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'org_name',
          label: '生产车间',
          id: 5,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'eqp_code',
          label: '设备编码',
          id: 6,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'eqp_name',
          label: '设备名称',
          id: 7,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 130,
          prop: 'stanedcode',
          label: '点检标准编码',
          id: 8,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: 130,
          width: false,
          prop: 'stanedname',
          label: '点检标准名称',
          id: 9,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 110,
          prop: 'chk_user',
          label: '点检人员',
          id: 10,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 110,
          prop: 'chk_result',
          label: '点检结果',
          id: 11,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 160,
          prop: 'chk_date',
          label: '点检时间',
          id: 12,
          show: true,
          fixed: false,
          sortable: true
        }
      ],
      tableTimeStampKey: new Date().getTime(), // 表格key
      dialogVisible: false,
      // dialogForm: {
      //   OrgType: '',
      //   OrgCode: '',
      //   OrgName: '',
      //   SupUnit: ''// 上级单位
      // },
      operation: '',

      tableDataDialog: [], // 点检明细对话框table

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

    }
  },

  created() {
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    tableColumnUpdate(val, isCopyTrue) {
      if (isCopyTrue) {
        this.tableColumnSettingsArray = val
      }
      this.tableTimeStampKey = new Date().getTime()

      this.$refs.tableDataRef.doLayout()
    },
    handleRequest() {
      this.getDeviceCheckTakeSearch().then(res => {
        if (res.code === '200') {
          this.getShopSearch()
        }
      })
    },
    async getDeviceCheckTakeSearch() {
      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 }
    },
    // 获取执行车间下拉数组
    async getShopSearch() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopSelectArr = 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.getDeviceCheckTakeSearch()
    },
    // 查询
    search() {
      this.getDeviceCheckTakeSearch()
    },
    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.eqpcode = ''
      this.form.eqpname = ''
      this.form.stanedname = ''
      this.form.checkuser = ''
      this.form.checkdate = ''
      this.getDeviceCheckTakeSearch()
    },

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

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

      this.tableDataDialog = res.data
      // 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.getDeviceCheckTakeSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // 对话框关闭事件
    handleClose() {
      // this.dialogForm.OrgType = ''
      // this.dialogForm.OrgCode = ''
      // this.dialogForm.OrgName = ''
      // this.dialogForm.SupUnit = ''
      // this.$refs.dialogForm.clearValidate()
      this.tableDataDialog = []
    },
    // 对话框取消
    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.getDeviceCheckTakeSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
            }
          })
        }
      })
    },
    async download() {
      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
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 255

        this.$refs.tableDataRef.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }

  }
}
</script>


 src/views/deviceManager/maintainRecord.vue

@@ -0,0 +1,616 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup">
        <!--        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
        <!--        <el-button v-waves icon="el-icon-download" @click="upload">导入</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="100px"
          inline
          style="display: flex;"
        >
          <div class="elForm" style="justify-content: flex-start">
            <el-form-item label="生产车间" style=" display: flex;">
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkshopSelectArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="设备编码" style=" display: flex;">
              <el-input v-model="form.eqpcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="设备名称" style=" display: flex;">
              <el-input v-model="form.eqpname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="标准名称" style=" display: flex;">
              <el-input v-model="form.stanedname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="保养人员" style=" display: flex;">
              <el-input v-model="form.repairuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="保养时间" style=" display: flex;font-size:14px;align-items: center">
              <el-date-picker
                v-model="form.repairdate"
                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.repairresult" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in repairresultArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
          </div>
          <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
          class="bodyTopFormExpand"
        >
          <svg-icon
            v-show="mouseHoverType==='mouseout'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
            @mouseenter="mouseHoverType=$event.type"
          />
          <svg-icon
            v-show="mouseHoverType==='mouseenter'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
            @click="isExpandForm=!isExpandForm"
            @mouseout="mouseHoverType=$event.type"
          />
        </div>
      </div>

      <div class="elTableDiv">
        <!--        <TableColumnSettings-->
        <!--          :list1="tableColumnSettingsArray"-->
        <!--          @tableColumnUpdate="tableColumnUpdate"-->
        <!--        />-->
        <el-table
          ref="tableDataRef"
          :key="tableTimeStampKey"
          class="tableFixed"
          :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
            v-for="item in tableColumnSettingsArray"
            v-if="item.show"
            :key="item.id"
            :sortable="item.sortable"
            :prop="item.prop"
            :min-width="item.minWidth"
            :label="item.label"
            :width="item.width"
            show-tooltip-when-overflow
            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
          >
            <template slot-scope="{row}">
              <div v-if="!row[item.prop]">/</div>

              <div v-else-if="item.prop==='maint_cyc'">{{ cycleArr.find(i=>i.code===row[item.prop]).name }}</div>
              <div v-else-if="item.prop==='maint_result'">
                <div v-if="row[item.prop]==='OK'" style="display: flex;align-items: center">
                  <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                  正常
                </div>
                <div v-if="row[item.prop]==='NG'" style="display: flex;align-items: center">
                  <i class="el-icon-info" style="margin-right: 2px" />
                  异常
                </div>
              </div>
              <div v-else>{{ row[item.prop] }}</div>
            </template>
          </el-table-column>

          <el-table-column
            label="明细"
            width="120"
            fixed="right"
          >
            <template slot-scope="{row}">
              <i
                class="el-icon-tickets"
                :style="{color:$store.state.settings.theme}"
                style="cursor: pointer;margin-right: 15px"
                @click="edit('edit',row)"
              />
            </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="getDeviceRepairTakeSearch"
      />
    </div>

    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'保养明细'"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >

      <div class="elTableDiv" style="margin-top: 0">
        <el-table
          :data="tableDataDialog"
          :height="500+'px'"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:500+'px'}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <el-table-column
            prop="seq"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
            prop="itemcode"
            label="部位编码"
          />
          <el-table-column
            prop="itemname"
            label="部位名称"
          />
          <el-table-column
            prop="result"
            label="点检结果"
          >
            <template slot-scope="{row}">
              <div v-if="row.result==='OK'" style="display: flex;align-items: center">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                正常</div>
              <div v-if="row.result==='NG'" style="display: flex;align-items: center">
                <i class="el-icon-info" style="margin-right: 2px" />
                异常</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="maint_value"
            label="数值"
          />
          <el-table-column
            prop="remark"
            label="备注"
            show-tooltip-when-overflow
          />
        </el-table>
      </div>

      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <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>

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization } from '@/api/basicSettings'
import { getCookie } from '@/utils/auth'
import { handleDatetime } from '@/utils/global'
import { DeviceRepairSubTakeSearch, DeviceRepairTakeOutExcel, DeviceRepairTakeSearch
} from '@/api/DeviceManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  components: {
    Pagination, TableColumnSettings
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '', // 车间编码
        eqpcode: '', // 设备编码
        eqpname: '', // 设备名称
        stanedname: '', // 标准名称
        repairuser: '', // 点检人员
        repairdate: '', // 点检时间
        repairresult: '', // 保养结果
        prop: 'maint_date', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      wkshopSelectArr: [],
      cycleArr: [
        { code: 'Y', name: '年' },
        { code: 'S', name: '季' },
        { code: 'M', name: '月' },
        { code: 'W', name: '周' }
      ],
      repairresultArr: [
        { code: 'OK', name: '合格' },
        { code: 'NG', name: '不良' }
      ],
      total: 10,
      tableData: [],
      tableColumnSettingsArray: [
        // { minWidth: false, width: 55, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 隐藏列  show: false隐藏，true显示
        { minWidth: false, width: 55, prop: 'rowNum', label: '序号', id: 2, show: true, fixed: 'left', sortable: false }, // custom
        {
          minWidth: 110,
          width: false,
          prop: 'bywo',
          label: '保养单号',
          id: 3,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 130,
          prop: 'org_code',
          label: '生产车间编码',
          id: 4,
          show: false,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'org_name',
          label: '生产车间',
          id: 5,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'eqp_code',
          label: '设备编码',
          id: 6,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'eqp_name',
          label: '设备名称',
          id: 7,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 130,
          prop: 'stanedcode',
          label: '保养标准编码',
          id: 8,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: 130,
          width: false,
          prop: 'stanedname',
          label: '保养标准名称',
          id: 9,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 110,
          prop: 'maint_cyc',
          label: '保养周期',
          id: 10,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 110,
          prop: 'maint_user',
          label: '保养人员',
          id: 10,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 110,
          prop: 'maint_result',
          label: '保养结果',
          id: 11,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 160,
          prop: 'maint_date',
          label: '保养时间',
          id: 12,
          show: true,
          fixed: false,
          sortable: true
        }
      ],
      tableTimeStampKey: new Date().getTime(), // 表格key
      dialogVisible: false,
      // dialogForm: {
      //   OrgType: '',
      //   OrgCode: '',
      //   OrgName: '',
      //   SupUnit: ''// 上级单位
      // },
      operation: '',

      tableDataDialog: [], // 点检明细对话框table

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

    }
  },

  created() {
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    tableColumnUpdate(val, isCopyTrue) {
      if (isCopyTrue) {
        this.tableColumnSettingsArray = val
      }
      this.tableTimeStampKey = new Date().getTime()

      this.$refs.tableDataRef.doLayout()
    },
    handleRequest() {
      this.getDeviceRepairTakeSearch().then(res => {
        if (res.code === '200') {
          this.getShopSearch()
        }
      })
    },
    async getDeviceRepairTakeSearch() {
      let tempDate = this.form.repairdate
      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,
        repairuser: this.form.repairuser,
        repairdate: tempDate,
        repairresult: this.form.repairresult,
        prop: this.form.prop, // 排序字段
        order: this.form.order, // 排序字段
        page: this.form.page, // 第几页
        rows: this.form.rows // 每页多少条
      }

      const res = await DeviceRepairTakeSearch(data)
      this.tableData = res.data
      this.total = res.count
      return { code: res.code }
    },
    // 获取执行车间下拉数组
    async getShopSearch() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopSelectArr = 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.getDeviceRepairTakeSearch()
    },
    // 查询
    search() {
      this.getDeviceRepairTakeSearch()
    },
    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.eqpcode = ''
      this.form.eqpname = ''
      this.form.stanedname = ''
      this.form.repairuser = ''
      this.form.repairdate = ''
      this.form.repairresult = ''
      this.getDeviceRepairTakeSearch()
    },

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

      const res = await DeviceRepairSubTakeSearch({ bywo: row.bywo })

      this.tableDataDialog = res.data
      // 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.getDeviceRepairTakeSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // 对话框关闭事件
    handleClose() {
      // this.dialogForm.OrgType = ''
      // this.dialogForm.OrgCode = ''
      // this.dialogForm.OrgName = ''
      // this.dialogForm.SupUnit = ''
      // this.$refs.dialogForm.clearValidate()
      this.tableDataDialog = []
    },
    // 对话框取消
    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.getDeviceRepairTakeSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
            }
          })
        }
      })
    },
    async download() {
      let tempDate = this.form.repairdate
      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,
        repairuser: this.form.repairuser,
        repairdate: tempDate,
        repairresult: this.form.repairresult
      }
      const { data: res } = await DeviceRepairTakeOutExcel(data)
      window.location.href = res
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 255
        this.$refs.tableDataRef.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }

  }
}
</script>


 src/views/deviceManager/repairRecord.vue

@@ -0,0 +1,730 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <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="100px"
          inline
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="生产车间"style=" display: flex;">
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkshopSelectArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="设备编码" style=" display: flex;">
              <el-input v-model="form.eqpcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="设备名称" style=" display: flex;">
              <el-input v-model="form.eqpname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="报修人员" style=" display: flex;">
              <el-input v-model="form.reportuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="维修人员" style=" display: flex;">
              <el-input v-model="form.repairuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="验证人员" style=" display: flex;">
              <el-input v-model="form.vrifcatuser" placeholder="请输入" style="width: 200px" />
            </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"
                :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;align-items: center">
              <el-date-picker
                v-model="form.repairdate"
                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;align-items: center"
            >
              <el-date-picker
                v-model="form.vrifcatdate"
                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>
          </div>
          <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
          class="bodyTopFormExpand"
        >
          <svg-icon
            v-show="mouseHoverType==='mouseout'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
            @mouseenter="mouseHoverType=$event.type"
          />
          <svg-icon
            v-show="mouseHoverType==='mouseenter'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
            @click="isExpandForm=!isExpandForm"
            @mouseout="mouseHoverType=$event.type"
          />
        </div>
      </div>

      <div class="elTableDiv">
        <!--        <TableColumnSettings-->
        <!--          :list1="tableColumnSettingsArray"-->
        <!--          @tableColumnUpdate="tableColumnUpdate"-->
        <!--        />-->
        <el-table
          ref="tableDataRef"
          :key="tableTimeStampKey"
          class="tableFixed"
          :data="tableData"
          :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <el-table-column
            v-for="item in tableColumnSettingsArray"
            v-if="item.show"
            :key="item.id"
            :sortable="item.sortable"
            :prop="item.prop"
            :min-width="item.minWidth"
            :label="item.label"
            :width="item.width"
            show-tooltip-when-overflow
            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
          >
            <template slot-scope="{row}">
              <div v-if="!row[item.prop]">/</div>
              <div v-else-if="item.prop==='verify_result'">
                <div v-if="row[item.prop]==='通过'" style="display: flex;align-items: center">
                  <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                  通过
                </div>
                <div v-if="row[item.prop]==='不通过'" style="display: flex;align-items: center">
                  <i class="el-icon-info" style="margin-right: 2px" />
                  不通过
                </div>
              </div>
              <div v-else>{{ row[item.prop] }}</div>
            </template>
          </el-table-column>

          <el-table-column
            label="明细"
            width="120"
            fixed="right"
          >
            <template slot-scope="{row}">
              <i
                class="el-icon-tickets"
                :style="{color:$store.state.settings.theme}"
                style="cursor: pointer;margin-right: 15px"
                @click="edit('edit',row)"
              />
            </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="getDeviceUpdateSearch"
      />
    </div>

    <el-dialog
      v-el-drag-dialog
      title="维修明细"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
      top="10vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <div style="font-size:16px;">
        <div style="margin-bottom: 20px">
          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 设备报修信息：
        </div>
        <div style="display: flex;flex-direction: column;margin-left: 40px">
          <div style="margin-bottom: 10px">故障来源：{{ dialogData1.faultsource }}</div>
          <div style="margin-bottom: 10px">故障描述：{{ dialogData1.faultdescr }}</div>
          <div v-if="dialogData1.faultimage" style="display: flex;margin-bottom: 10px">故障图片：
            <div v-for="item in dialogData1.faultimage">
              <img
                style="width: 100px;margin-right: 10px"
                :src="baseUrl+item.img1url"
                alt=""
                @click="handlePictureCardPreview(baseUrl+item.img1url,'设备报修/故障图片')"
              >
            </div>
          </div>
        </div>
        <div style="margin-bottom: 20px">
          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 设备维修信息：
        </div>
        <div style="display: flex;flex-direction: column;margin-left: 40px">
          <div style="margin-bottom: 10px">故障描述：{{ dialogData2.faultdescr }}</div>
          <div v-if="dialogData2.repairimage" style="display: flex;margin-bottom: 10px">故障图片：
            <div v-for="item in dialogData2.repairimage" v-if="item.img1url!==''">
              <img
                style="width: 100px;margin-right: 10px"
                :src="baseUrl+item.img1url"
                alt=""
                @click="handlePictureCardPreview(baseUrl+item.img1url,'设备维修/故障图片')"
              >
            </div>
          </div>
          <div style="margin-bottom: 10px">停机维修：{{ dialogData2.isstoprepair === 'N' ? '否' : '是' }}</div>
          <div v-if="dialogData2.repaircontent" style="margin-bottom: 10px">维修内容：{{ dialogData2.repaircontent }}</div>
          <div v-if="dialogData2.repairpart" style="margin-bottom: 10px">更换备件：{{ dialogData2.repairpart }}</div>
          <div v-if="dialogData2.repairimage" style="display: flex;margin-bottom: 10px">备件图片：
            <div v-for="item in dialogData2.repairimage" v-if="item.img2url!==''">
              <img
                style="width: 100px;margin-right: 10px"
                :src="baseUrl+item.img2url"
                alt=""
                @click="handlePictureCardPreview(baseUrl+item.img2url,'设备维修/备件图片')"
              >
            </div>
          </div>
        </div>
        <div style="margin-bottom: 20px">
          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 设备维修验证信息：
        </div>
        <div style="display: flex;flex-direction: column;margin-left: 40px">
          <div style="margin-bottom: 10px;display: flex;">验证结果：

            <i
              v-if="isResult==='通过'"
              class="el-icon-success"
              :style="{color:$store.state.settings.theme}"
              style="margin-right: 2px"
            />
            <i v-if="isResult==='不通过'" class="el-icon-info" style="margin-right: 2px" />

            {{ isResult }}
          </div>

        </div>
      </div>
      <!--      图片预览对话框-->
      <el-dialog
        title="图片预览"
        :visible.sync="pictureVisible"
        width="800px"
        append-to-body
        @close="pictureHandleClose"
      >
        <div style="font-size: 16px;margin-bottom: 10px">
          <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> {{ pictureName }}
        </div>

        <img :key="new Date()" width="100%" :src="pictureUrl" alt="">

        <el-tooltip class="item" effect="light" content="上一张" placement="top">
          <div
            v-if="pictureUrlAll.findIndex(item => item.url === pictureUrl)!==0"
            style="position: absolute;top: 48%;left: 3.5%;"
          ><i
            :style="{color:$store.state.settings.theme}"
            style="cursor: pointer;font-size: 20px"
            class="el-icon-d-arrow-left"
            @click="arrowLeftClick(pictureUrl,pictureName)"
          /></div>
        </el-tooltip>
        <el-tooltip class="item" effect="light" content="下一张" placement="top">
          <div
            v-if="pictureUrlAll.findIndex(item => item.url === pictureUrl)!==pictureUrlAll.length-1"
            style="position: absolute;top: 48%;right: 3.5%;"
          >
            <i
              :style="{color:$store.state.settings.theme}"
              style="cursor: pointer;font-size: 20px"
              class="el-icon-d-arrow-right"
              @click="arrowRightClick(pictureUrl,pictureName)"
            /></div>
        </el-tooltip>
        <span slot="footer" class="dialog-footer">
          <div class="footerButton">
            <el-button v-waves @click="pictureVisible=false">返 回</el-button>
          </div>
        </span>
      </el-dialog>

      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button v-waves @click="dialogVisibleCancel">返 回</el-button>
          <!--          <el-button v-waves 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 { handleDatetime } from '@/utils/global'
import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } from '@/api/DeviceManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  components: {
    Pagination, TableColumnSettings
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '', // 车间编码
        eqpcode: '', // 设备编码
        eqpname: '', // 设备名称
        reportuser: '', // 报修人员
        repairuser: '', // 维修人员
        vrifcatuser: '', // 验证人员
        reportdate: '', // 报修时间
        repairdate: '', // 维修时间
        vrifcatdate: '', // 验证时间
        prop: 'repair_code', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      wkshopSelectArr: [],
      total: 10,
      tableData: [],

      tableColumnSettingsArray: [
        // { minWidth: false, width: 55, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 隐藏列  show: false隐藏，true显示
        { minWidth: false, width: 55, prop: 'rowNum', label: '序号', id: 2, show: true, fixed: 'left', sortable: false }, // custom
        {
          minWidth: 110,
          width: false,
          prop: 'repair_code',
          label: '维修单号',
          id: 3,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 130,
          prop: 'wksp_code',
          label: '所属车间编码',
          id: 4,
          show: false,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'wksp_name',
          label: '所属车间',
          id: 5,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 110,
          prop: 'eqp_code',
          label: '设备编码',
          id: 6,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'eqp_name',
          label: '设备名称',
          id: 7,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 110,
          prop: 'request_person',
          label: '报修人',
          id: 8,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 160,
          prop: 'request_date',
          label: '保修时间',
          id: 9,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 110,
          prop: 'repair_person',
          label: '维修人',
          id: 10,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 160,
          prop: 'repair_date',
          label: '维修完成时间',
          id: 11,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 110,
          prop: 'cycleDate',
          label: '维修时长',
          id: 12,
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: false,
          width: 110,
          prop: 'verify_person',
          label: '验证人',
          id: 13,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 160,
          prop: 'verify_date',
          label: '验证时间',
          id: 14,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 110,
          prop: 'verify_result',
          label: '验证结果',
          id: 15,
          show: true,
          fixed: false,
          sortable: true
        }
      ],
      tableTimeStampKey: new Date().getTime(), // 表格key

      dialogVisible: false,
      dialogData1: {},
      dialogData2: {},
      isResult: '', // 验证结果
      operation: '',

      baseUrl: '', // 图片预览地址前缀

      pictureVisible: false, // 图片预览对话框
      pictureUrl: '', // 图片预览Url
      pictureName: '', // 图片预览名称
      pictureUrlAll: [], // 图片预览地址的所有Url

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

    }
  },

  created() {
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()

    this.baseUrl = process.env.VUE_APP_BASE_API_FILE
  },
  methods: {
    tableColumnUpdate(val, isCopyTrue) {
      if (isCopyTrue) {
        this.tableColumnSettingsArray = val
      }
      this.tableTimeStampKey = new Date().getTime()

      this.$refs.tableDataRef.doLayout()
    },
    handleRequest() {
      this.getDeviceUpdateSearch().then(res => {
        if (res.code === '200') {
          this.getShopSearch()
        }
      })
    },
    async getDeviceUpdateSearch() {
      let reportdate = this.form.reportdate
      if (reportdate.length > 0) {
        reportdate = handleDatetime(reportdate[0]) + '~' + handleDatetime(reportdate[1])
      }
      let repairdate = this.form.repairdate
      if (repairdate.length > 0) {
        repairdate = handleDatetime(repairdate[0]) + '~' + handleDatetime(repairdate[1])
      }
      let vrifcatdate = this.form.vrifcatdate
      if (vrifcatdate.length > 0) {
        vrifcatdate = handleDatetime(vrifcatdate[0]) + '~' + handleDatetime(vrifcatdate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode, // 车间编码
        eqpcode: this.form.eqpcode, // 设备编码
        eqpname: this.form.eqpname, // 设备名称
        reportuser: this.form.reportuser, // 报修人员
        repairuser: this.form.repairuser, // 维修人员
        vrifcatuser: this.form.vrifcatuser, // 验证人员
        reportdate, // 报修时间
        repairdate, // 维修时间
        vrifcatdate, // 验证时间
        prop: 'repair_code', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      }

      const res = await DeviceUpdateSearch(data)
      this.tableData = res.data
      this.total = res.count
      return { code: res.code }
    },
    // 获取执行车间下拉数组
    async getShopSearch() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopSelectArr = 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.getDeviceUpdateSearch()
    },
    // 查询
    search() {
      this.getDeviceUpdateSearch()
    },
    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.eqpcode = ''
      this.form.eqpname = ''
      this.form.reportuser = ''
      this.form.repairuser = ''
      this.form.vrifcatuser = ''
      this.form.reportdate = ''
      this.form.repairdate = ''
      this.form.vrifcatdate = ''
      this.getDeviceUpdateSearch()
    },
    // 修改按钮
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

      const { data: res } = await DeviceUpdateSubSearch({ repair_code: row.repair_code })
      this.dialogData1 = res.data1
      this.dialogData2 = res.data2
      this.isResult = row.verify_result

      // 设备报修图片集合
      if (this.dialogData1.faultimage) {
        this.dialogData1.faultimage.forEach(item => {
          this.pictureUrlAll.push(
            { url: this.baseUrl + item.img1url, name: '设备报修/故障图片' }
          )
        })
      }
      // 设备维修图片集合
      if (this.dialogData2.repairimage) {
        this.dialogData2.repairimage.forEach(item => {
          this.pictureUrlAll.push(
            {
              url: item.img1url ? this.baseUrl + item.img1url : this.baseUrl + item.img2url,
              name: item.img1url ? '设备维修/故障图片' : '设备维修/备件图片'
            }
          )
        })
      }
    },
    handlePictureCardPreview(url, name) {
      this.pictureVisible = true
      this.pictureUrl = url
      this.pictureName = name
    },
    arrowLeftClick(pictureUrl, pictureName) {
      this.pictureUrlAll.forEach((item, index) => {
        if (item.url === pictureUrl) {
          this.pictureUrl = this.pictureUrlAll[index - 1].url
          this.pictureName = this.pictureUrlAll[index - 1].name
        }
      })
    },
    arrowRightClick(pictureUrl, pictureName) {
      this.pictureUrlAll.forEach((item, index) => {
        if (item.url === pictureUrl) {
          this.pictureUrl = this.pictureUrlAll[index + 1].url
          this.pictureName = this.pictureUrlAll[index + 1].name
        }
      })
    },
    pictureHandleClose() {
      this.pictureUrl = ''
      this.pictureName = ''
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogData1 = {}
      this.dialogData2 = {}
      this.isResult = ''
      this.pictureUrlAll = []
    },
    async download() {
      let reportdate = this.form.reportdate
      if (reportdate.length > 0) {
        reportdate = handleDatetime(reportdate[0]) + '~' + handleDatetime(reportdate[1])
      }
      let repairdate = this.form.repairdate
      if (repairdate.length > 0) {
        repairdate = handleDatetime(repairdate[0]) + '~' + handleDatetime(repairdate[1])
      }
      let vrifcatdate = this.form.vrifcatdate
      if (vrifcatdate.length > 0) {
        vrifcatdate = handleDatetime(vrifcatdate[0]) + '~' + handleDatetime(vrifcatdate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode, // 车间编码
        eqpcode: this.form.eqpcode, // 设备编码
        eqpname: this.form.eqpname, // 设备名称
        reportuser: this.form.reportuser, // 报修人员
        repairuser: this.form.repairuser, // 维修人员
        vrifcatuser: this.form.vrifcatuser, // 验证人员
        reportdate, // 报修时间
        repairdate, // 维修时间
        vrifcatdate // 验证时间
      }
      const { data: res } = await DeviceUpdateOutExcel(data)
      window.location.href = res
    },
    // 对话框取消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // 对话框确认
    dialogVisibleConfirm() {

    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 295
        this.$refs.tableDataRef.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }
  }
}
</script>


 src/views/mouldManager/mouldList.vue

@@ -248,6 +248,9 @@
                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                  <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
                </el-tooltip>
                <el-tooltip class="item" effect="dark" content="履历" placement="top">
                  <i class="el-icon-view" :style="{color:$store.state.settings.theme}" style="cursor: pointer" @click="view(row)" />
                </el-tooltip>
              </div>
            </template>
          </el-table-column>
@@ -363,6 +366,137 @@
      </span>
    </el-dialog>

    <el-dialog
      v-el-drag-dialog
      title="履历查看"
      :visible.sync="dialogVisibleResume"
      width="1000px"
      :close-on-click-modal="false"
      top="7vh"
      class="dialogFormClass"
      @closed="handleCloseResume"
    >
      <div style="display: flex;justify-content: center;font-size: 18px;font-weight: bolder">模具在线信息查询</div>
      <el-descriptions class="margin-top" title=" " :column="3" size="size" border>
        <!--        <template slot="extra">-->
        <!--          <el-button type="primary" size="small">操作</el-button>-->
        <!--        </template>-->
        <el-descriptions-item>
          <template slot="label">
            <!--            <i class="el-icon-user" />-->
            模具编码
          </template>
          {{ formResume.mouldcode }}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            模具名称
          </template>
          {{ formResume.mouldname }}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            规格型号
          </template>
          {{ formResume.mouldspec||'/' }}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            模具状态
          </template>
          <!--          {{ formResume.status ==='Y'?'正常':'异常' }}-->
          <el-tag v-if="formResume.status==='Y'" size="small" type="success">正常</el-tag>
          <el-tag v-if="formResume.status==='N'" size="small" type="danger">故障</el-tag>

        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            使用状态
          </template>
          <!--          {{ formResume.usestatus }}-->
          {{ formResume.usestatus?onstateArr.find(i => parseFloat(i.code) === parseFloat(formResume.usestatus)).name:'/' }}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            预计寿命(小时)
          </template>
          {{ formResume.surp_life }}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            剩余寿命(小时)
          </template>
          {{ formResume.serlife }}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            查看人员
          </template>
          {{ formResume.username }}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            查看时间
          </template>
          {{ formResume.lm_date }}
        </el-descriptions-item>
      </el-descriptions>

      <div style="display: flex;justify-content: center;font-size: 18px;font-weight: bolder;margin: 20px 0">模具流转记录</div>

      <div class="elTableDiv">
        <el-table
          ref="tableDataRef2"
          class="tableFixed"
          :data="tableResume"
          height="370px"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:'370px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
        >
          <el-table-column
            prop="rowNum"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
            prop="opertype"
            label="操作类型"
          />

          <el-table-column
            prop="operuser"
            label="操作人员"
          />

          <el-table-column
            prop="operdate"
            label="操作时间"
          />
          <el-table-column
            prop="opertype"
            label="结果/对象"
          />

        </el-table>
      </div>
      <!--分页-->
      <pagination
        :total="totalResume"
        :page.sync="formResume.page"
        :limit.sync="formResume.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getMoldResumeSearch"
      />

    </el-dialog>

  </div>
</template>

@@ -375,7 +509,7 @@
  ProductionScheduleReportExcelSearch,
  ProductionScheduleReportSearch
} from '@/api/ReportManager'
import { AddUpdateMouldManger, DeleteMouldManger, MouldMangerSearch } from '@/api/MouldManager'
import { AddUpdateMouldManger, DeleteMouldManger, MoldResumeSearch, MouldMangerSearch } from '@/api/MouldManager'
import { InventoryTreePermissions, WareHouse } from '@/api/GeneralBasicData'
import arrayToTree from 'array-to-tree'
import { TCunstomerDelete } from '@/api/basicSettings'
@@ -462,7 +596,16 @@
        // }
      ],

      wareHouseArr: []
      wareHouseArr: [],

      dialogVisibleResume: false,
      formResume: {
        mouldcode: '',
        page: 1,
        rows: 20
      },
      tableResume: [],
      totalResume: 10

    }
  },
@@ -629,6 +772,46 @@
        this.$notify.info('已取消删除')
      })
    },

    // 履历
    async view(row) {
      this.formResume.mouldcode = row.code
      this.formResume.mouldname = row.name
      this.formResume.mouldspec = row.spec
      this.formResume.username = row.username
      this.formResume.surp_life = row.surp_life
      this.formResume.serlife = row.serlife
      this.formResume.lm_date = row.lm_date
      this.formResume.status = row.status
      this.formResume.usestatus = row.usestatus

      await this.getMoldResumeSearch()
      this.dialogVisibleResume = true
      this.$nextTick(() => {
        this.$refs.tableDataRef2.doLayout()
      })
    },
    async getMoldResumeSearch() {
      const data = {
        mouldcode: this.formResume.mouldcode,
        createdate: '',
        page: this.formResume.page,
        rows: this.formResume.rows,
        prop: 'operdate',
        order: 'desc'
      }
      const res = await MoldResumeSearch(data)

      if (res.code === '200') {
        this.tableResume = res.data
        this.totalResume = res.count
      }
    },

    handleCloseResume() {
      this.tableResume = []
    },

    handleClose() {
      this.dialogForm = {
        mouldcode: '',