1.连接自动打印,2.修改bug

loulijun2021

2022-07-15 869f6c069e86c2ff90393c1441854a6f05989481

 src/views/sbgl/sbqd.vue

@@ -17,7 +17,13 @@
              <el-input v-model="form.DeviceName" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="使用状态" style=" display: flex;">
              <el-select v-model="form.Status" :popper-append-to-body="false" filterable style="width: 200px" placeholder="请选择">
              <el-select
                v-model="form.Status"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in StatusArr"
                  :key="item.value"
@@ -27,7 +33,14 @@
              </el-select>
            </el-form-item>
            <el-form-item label="所属车间" style=" display: flex;">
              <el-select v-model="form.WorkShop" :popper-append-to-body="false" filterable style="width: 200px" placeholder="请选择">
              <el-select
                v-model="form.WorkShop"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <!--                @focus="getWorkShopSelect"-->
                <el-option
                  v-for="item in WorkShopArr"
                  :key="item.code"
@@ -37,7 +50,16 @@
              </el-select>
            </el-form-item>
            <el-form-item filterable label="设备类型" style="display: flex;">
              <el-select v-model="form.DeviceType" :popper-append-to-body="false" style="width: 200px" placeholder="请选择" @change="deviceTypeChange">
              <el-select
                v-model="form.DeviceType"
                :popper-append-to-body="false"
                style="width: 200px"
                filterable
                placeholder="请选择"

                @change="deviceTypeChange"
              >
                <!--                @focus="getDeviceTypeSelect"-->
                <el-option
                  v-for="item in DeviceTypeArr"
                  :key="item.code"
@@ -49,6 +71,7 @@
            <el-form-item label="设备组" style=" display: flex;">
              <el-select
                v-model="form.DeviceGroup"
                filterable
                :popper-append-to-body="false"
                :disabled="form.DeviceType===''"
                style="width: 200px"
@@ -74,14 +97,14 @@
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-c-scale-to-original" @click="deviceTypeButton">设备类型</el-button>
        <el-button type="primary" icon="el-icon-document-copy" @click="deviceGroupButton">设备组</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
        <el-table
          :data="tableData"
          border
          :height="tableHeight"
          :height="tableHeight+'px'"
          stripe
          highlight-current-row
          :style="{width: 100+'%',height:(tableHeight-50)+'px'}"
@@ -176,7 +199,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 +220,30 @@
    </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="请选择"
            filterable
            @change="devicetypecodeChange"
          >
            <el-option
              v-for="item in DeviceTypeArr"
              :key="item.code"
@@ -222,7 +253,14 @@
          </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"
            filterable
            placeholder="请选择"
          >
            <el-option
              v-for="item in DeviceGroupDialogArr"
              :key="item.code"
@@ -234,14 +272,23 @@
        <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"
            filterable
            :popper-append-to-body="false"
            style="width: 200px"
            placeholder="请选择"
            @change="workshopcodeChange"
          >
            <!--            @focus="getWorkShopSelect"-->

            <el-option
              v-for="item in WorkShopArr"
              :key="item.code"
@@ -251,7 +298,14 @@
          </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"
            filterable
            :popper-append-to-body="false"
            :disabled="dialogForm.workshopcode===''"
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in WorkLineArr"
              :key="item.linecode"
@@ -261,7 +315,13 @@
          </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"
            filterable
            :popper-append-to-body="false"
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in StatusArr"
              :key="item.value"
@@ -271,7 +331,8 @@
          </el-select>
        </el-form-item>
        <el-form-item label="稼动率" prop="ratio">
          <el-input v-model="dialogForm.ratio" style="width: 195px" /><span style="margin-left: 10px">%</span>
          <el-input v-model="dialogForm.ratio" style="width: 195px" />
          <span style="margin-left: 10px">%</span>
        </el-form-item>

      </el-form>
@@ -287,9 +348,9 @@
    <el-dialog
      title="设备类型"
      :visible.sync="DeviceTypeDialogVisible"
      width="50%"
      width="800px"
      top="15vh"

      :close-on-click-modal="false"
      class="DeviceTypeDialogVisible"
      @close="handleCloseDeviceType"
    >
@@ -300,7 +361,7 @@
      <el-table
        :data="DeviceTypeArray"
        border
        height="400"
        height="300"
        highlight-current-row
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
@@ -374,7 +435,8 @@
    <el-dialog
      title="设备组"
      :visible.sync="DeviceGroupDialogVisible"
      width="70%"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      class="DeviceTypeDialogVisible"
      @close="handleCloseDeviceGroup"
@@ -386,7 +448,7 @@
        :data="DeviceGroupArray"
        border
        highlight-current-row
        height="400"
        height="300"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfDeviceGroup"
@@ -422,7 +484,13 @@
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-select v-if="row.isVisible===1" v-model="row.eqptype_code" :popper-append-to-body="false" placeholder="请选择">
            <el-select
              v-if="row.isVisible===1"
              v-model="row.eqptype_code"
              filterable
              :popper-append-to-body="false"
              placeholder="请选择"
            >
              <el-option
                v-for="item in DeviceTypeArr"
                :key="item.code"
@@ -436,7 +504,6 @@
        <el-table-column
          prop="remark"
          label="分组描述"
          show-overflow-tooltip
          sortable="custom"
        >
          <template slot-scope="{row}">
@@ -491,11 +558,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
  },
@@ -722,7 +789,7 @@
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框所属车间下拉选择改变时
    async   workshopcodeChange(val) {
    async workshopcodeChange(val) {
      const { data: res } = await WorkShopSelectLine({ workshopcode: val })
      this.WorkLineArr = res
      this.dialogForm.linecode = ''
@@ -747,7 +814,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 +838,9 @@
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    },

@@ -812,7 +882,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,8 +959,17 @@
    },
    // 新增
    addDeviceGroup() {
      const number = Math.random() * Math.random()// 作为删除时的标识符
      this.DeviceGroupArray.unshift({ code: '', name: '', eqptype_code: '', eqptype_name: '', remark: '', isVisible: 1, number: number })
      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
      })
    },
    // 排序
    sortChangeOfDeviceGroup({ column, prop, order }) {
@@ -983,9 +1063,11 @@
  border: none;
  padding: 0 20px;
}

::v-deep .el-button--primary:hover {
  border: none;
}

::v-deep .el-button--info {
  //background-color: $main_color !important;
  height: 30px;
@@ -1032,6 +1114,7 @@
  ::v-deep .el-select .el-input .el-select__caret {
    display: flex;
    align-items: center;
    justify-content: center;
  }

}
@@ -1114,29 +1197,31 @@
  margin: 10px 30px 0px 0;
}

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

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

::v-deep .el-input__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select .el-input__inner:focus{
::v-deep .el-select .el-input__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select-dropdown__item.selected{
::v-deep .el-select-dropdown__item.selected {
  color: $main_color;
}
</style>
<style lang="scss">
.dateStyle{
  .el-date-table td.today span{
.dateStyle {
  .el-date-table td.today span {
    color: #42b983;
  }
}