1.生产开报工实现部分2.修改bug

loulijun2021

2022-07-09 bed893abbebac6a1e43478b693e1f862a6b6c8fe

 src/views/sbgl/sbqd.vue

@@ -176,7 +176,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -197,22 +197,23 @@
    </div>
    <!--设备清单新增编辑-->
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :close-on-click-modal="false"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      width="800px"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="设备编码" prop="devicecode">
          <el-input v-model="dialogForm.devicecode" :disabled="operation!=='add'" style="width: 220px" />
          <el-input v-model="dialogForm.devicecode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="设备名称" prop="devicename">
          <el-input v-model="dialogForm.devicename" style="width: 220px" />
          <el-input v-model="dialogForm.devicename" style="width: 200px" />
        </el-form-item>
        <el-form-item label="设备类型" prop="devicetypecode">
          <el-select v-model="dialogForm.devicetypecode" :popper-append-to-body="false" style="width: 220px" placeholder="请选择" @change="devicetypecodeChange">
          <el-select v-model="dialogForm.devicetypecode" :popper-append-to-body="false" style="width: 200px" placeholder="请选择" @change="devicetypecodeChange">
            <el-option
              v-for="item in DeviceTypeArr"
              :key="item.code"
@@ -222,7 +223,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="设备组" prop="devicegroupcode">
          <el-select v-model="dialogForm.devicegroupcode" :popper-append-to-body="false" :disabled="dialogForm.devicetypecode===''" style="width: 220px" placeholder="请选择">
          <el-select v-model="dialogForm.devicegroupcode" :popper-append-to-body="false" :disabled="dialogForm.devicetypecode===''" style="width: 200px" placeholder="请选择">
            <el-option
              v-for="item in DeviceGroupDialogArr"
              :key="item.code"
@@ -234,14 +235,14 @@
        <el-form-item label="投入日期" prop="importdate">
          <el-date-picker
            v-model="dialogForm.importdate"
            style="width: 220px"
            style="width: 200px"
            type="date"
            placeholder="选择日期"
            popper-class="dateStyle"
          />
        </el-form-item>
        <el-form-item label="所属车间" prop="workshopcode">
          <el-select v-model="dialogForm.workshopcode" :popper-append-to-body="false" style="width: 220px" placeholder="请选择" @change="workshopcodeChange">
          <el-select v-model="dialogForm.workshopcode" :popper-append-to-body="false" style="width: 200px" placeholder="请选择" @change="workshopcodeChange">
            <el-option
              v-for="item in WorkShopArr"
              :key="item.code"
@@ -251,7 +252,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="所属产线" prop="linecode">
          <el-select v-model="dialogForm.linecode" :popper-append-to-body="false" :disabled="dialogForm.workshopcode===''" style="width: 220px" placeholder="请选择">
          <el-select v-model="dialogForm.linecode" :popper-append-to-body="false" :disabled="dialogForm.workshopcode===''" style="width: 200px" placeholder="请选择">
            <el-option
              v-for="item in WorkLineArr"
              :key="item.linecode"
@@ -261,7 +262,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="使用状态" prop="status">
          <el-select v-model="dialogForm.status" :popper-append-to-body="false" style="width: 220px" placeholder="请选择">
          <el-select v-model="dialogForm.status" :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
            <el-option
              v-for="item in StatusArr"
              :key="item.value"
@@ -287,9 +288,9 @@
    <el-dialog
      title="设备类型"
      :visible.sync="DeviceTypeDialogVisible"
      width="50%"
      width="800px"
      top="15vh"

      :close-on-click-modal="false"
      class="DeviceTypeDialogVisible"
      @close="handleCloseDeviceType"
    >
@@ -300,7 +301,7 @@
      <el-table
        :data="DeviceTypeArray"
        border
        height="400"
        height="300"
        highlight-current-row
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
@@ -374,7 +375,8 @@
    <el-dialog
      title="设备组"
      :visible.sync="DeviceGroupDialogVisible"
      width="70%"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      class="DeviceTypeDialogVisible"
      @close="handleCloseDeviceGroup"
@@ -386,7 +388,7 @@
        :data="DeviceGroupArray"
        border
        highlight-current-row
        height="400"
        height="300"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfDeviceGroup"
@@ -436,7 +438,6 @@
        <el-table-column
          prop="remark"
          label="分组描述"
          show-overflow-tooltip
          sortable="custom"
        >
          <template slot-scope="{row}">
@@ -491,11 +492,11 @@
  DeviceTypeSelectGroup,
  WorkShopSelect, WorkShopSelectLine
} from '@/api/sbgl'
import { handleDatatime } from '@/utils/global'
import { handleDatetime } from '@/utils/global'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  name: 'SBQD',
  components: {
    Pagination
  },
@@ -747,7 +748,7 @@
            devicename: this.dialogForm.devicename,
            devicetypecode: this.dialogForm.devicetypecode,
            devicegroupcode: this.dialogForm.devicegroupcode,
            importdate: handleDatatime(this.dialogForm.importdate),
            importdate: handleDatetime(this.dialogForm.importdate),
            workshopcode: this.dialogForm.workshopcode,
            linecode: this.dialogForm.linecode,
            status: this.dialogForm.status,
@@ -771,6 +772,9 @@
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    },

@@ -812,7 +816,8 @@
    },
    // 新增按钮
    addDeviceType() {
      const number = Math.random() * Math.random()// 作为删除时的标识符
      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? (10 + Math.random()) : number
      this.DeviceTypeArray.unshift({ code: '', name: '', group: '', remark: '', isVisible: 1, number: number })
    },
    // 删除
@@ -888,7 +893,8 @@
    },
    // 新增
    addDeviceGroup() {
      const number = Math.random() * Math.random()// 作为删除时的标识符
      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? (10 + Math.random()) : number
      this.DeviceGroupArray.unshift({ code: '', name: '', eqptype_code: '', eqptype_name: '', remark: '', isVisible: 1, number: number })
    },
    // 排序
@@ -1032,6 +1038,7 @@
  ::v-deep .el-select .el-input .el-select__caret {
    display: flex;
    align-items: center;
    justify-content: center;
  }

}