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" 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" 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" 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,8 @@
            <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"
                placeholder="请选择"
@@ -73,16 +97,17 @@
        <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+'px'"
          stripe
          highlight-current-row
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :style="{width: 100+'%',height:(tableHeight-50)+'px'}"
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
@@ -129,7 +154,7 @@
          </el-table-column>
          <el-table-column
            prop="input_date"
            label="投入时间"
            label="投入日期"
            sortable="custom"
            width="120"
          >
@@ -174,8 +199,8 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="del(row.id)">删除</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
          </el-table-column>
@@ -195,41 +220,108 @@
    </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="OrgCode">
          <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
        <el-form-item label="设备编码" prop="devicecode">
          <el-input v-model="dialogForm.devicecode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="设备名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        <el-form-item label="设备名称" prop="devicename">
          <el-input v-model="dialogForm.devicename" style="width: 200px" />
        </el-form-item>
        <el-form-item label="设备类型" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        <el-form-item label="设备类型" prop="devicetypecode">
          <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"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="设备组" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        <el-form-item label="设备组" prop="devicegroupcode">
          <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"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="投入日期" prop="OrgName">
        <el-form-item label="投入日期" prop="importdate">
          <el-date-picker
            v-model="dialogForm.OrgCode"
            v-model="dialogForm.importdate"
            style="width: 200px"
            type="date"
            placeholder="选择日期"
            popper-class="dateStyle"
          />
        </el-form-item>
        <el-form-item label="所属车间" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        <el-form-item label="所属车间" prop="workshopcode">
          <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"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="所属产线" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        <el-form-item label="所属产线" prop="linecode">
          <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"
              :label="item.linename"
              :value="item.linecode"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="使用状态" prop="OrgName">
          <el-select v-model="form.Status" placeholder="请选择">
        <el-form-item label="使用状态" prop="status">
          <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"
@@ -238,8 +330,9 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="稼动率" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        <el-form-item label="稼动率" prop="ratio">
          <el-input v-model="dialogForm.ratio" style="width: 195px" />
          <span style="margin-left: 10px">%</span>
        </el-form-item>

      </el-form>
@@ -255,8 +348,9 @@
    <el-dialog
      title="设备类型"
      :visible.sync="DeviceTypeDialogVisible"
      width="50%"
      width="800px"
      top="15vh"
      :close-on-click-modal="false"
      class="DeviceTypeDialogVisible"
      @close="handleCloseDeviceType"
    >
@@ -267,8 +361,8 @@
      <el-table
        :data="DeviceTypeArray"
        border
        height="300"
        highlight-current-row
        :style="{width: 100+'%',height:tableHeight-300+'px'}"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfDeviceType"
@@ -341,7 +435,8 @@
    <el-dialog
      title="设备组"
      :visible.sync="DeviceGroupDialogVisible"
      width="70%"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      class="DeviceTypeDialogVisible"
      @close="handleCloseDeviceGroup"
@@ -353,7 +448,7 @@
        :data="DeviceGroupArray"
        border
        highlight-current-row
        :style="{width: 100+'%',height:tableHeight-300+'px'}"
        height="300"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfDeviceGroup"
@@ -389,8 +484,13 @@
          sortable="custom"
        >
          <template slot-scope="{row}">
            <!--            <el-input v-if="row.isVisible===1" v-model="row.eqptype_code" placeholder="请输入" />-->
            <el-select v-if="row.isVisible===1" v-model="row.eqptype_code" 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"
@@ -404,7 +504,6 @@
        <el-table-column
          prop="remark"
          label="分组描述"
          show-overflow-tooltip
          sortable="custom"
        >
          <template slot-scope="{row}">
@@ -448,28 +547,22 @@

<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdateOrganization,
  DeleteOrganization,
  OrganizationSearch,
  PrentOrganization,
  RoleTypeDelete
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import {
  AddUpdateDeviceGroup,
  AddUpdateDeviceType, DeleteDeviceType,
  AddUpdateDeviceGroup, AddUpdateDeviceManger,
  AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
  DeviceGroupSearch,
  DeviceMangerSearch,
  DeviceTypeSearch,
  DeviceTypeSelect,
  DeviceTypeSelectGroup,
  WorkShopSelect
  WorkShopSelect, WorkShopSelectLine
} from '@/api/sbgl'
import { handleDatetime } from '@/utils/global'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  name: 'SBQD',
  components: {
    Pagination
  },
@@ -483,13 +576,6 @@
        } else {
          callback()
        }
      }
    }
    const validateTypeCode = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请选择上级'))
      } else {
        callback()
      }
    }
    return {
@@ -518,24 +604,44 @@
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// 上级单位
        id: '',
        devicecode: '',
        devicename: '',
        devicetypecode: '',
        devicegroupcode: '',
        importdate: '',
        workshopcode: '',
        linecode: '',
        status: '',
        ratio: ''
      },
      DeviceGroupDialogArr: [], // 设备组数组
      WorkLineArr: [], // 所属产线数组
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
        devicecode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
        devicename: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ],
        SupUnit: [
          { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
        devicetypecode: [
          { required: true, message: '请选择设备类型', trigger: ['blur', 'change'] }
        ],
        devicegroupcode: [
          { required: true, message: '请选择设备组', trigger: ['blur', 'change'] }
        ],
        importdate: [
          { required: true, message: '请选择投入日期', trigger: ['blur', 'change'] }
        ],
        workshopcode: [
          { required: true, message: '请选择所属车间', trigger: ['blur', 'change'] }
        ],
        linecode: [
          { required: true, message: '请选择所属产线', trigger: ['blur', 'change'] }
        ],
        status: [
          { required: true, message: '请选择使用状态', trigger: ['blur', 'change'] }
        ]
      },
      DeviceTypeDialogVisible: false,
@@ -589,7 +695,7 @@
    },
    // 设备类型改变时
    async deviceTypeChange(val) {
      this.form.DeviceType = val
      this.form.DeviceGroup = ''
      const { data: res } = await DeviceTypeSelectGroup({ eqptypecode: val })
      this.DeviceGroupArr = res
    },
@@ -633,40 +739,66 @@
      this.dialogVisible = true
    },
    // 修改按钮
    edit(operation, row) {
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

      await this.devicetypecodeChange(row.eqptype_code)
      await this.workshopcodeChange(row.wksp_code)
      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
        this.dialogForm.id = row.id
        this.dialogForm.devicecode = row.code
        this.dialogForm.devicename = row.name
        this.dialogForm.devicetypecode = row.eqptype_code
        this.dialogForm.devicegroupcode = row.eqpgroup_code
        this.dialogForm.importdate = row.input_date
        this.dialogForm.workshopcode = row.wksp_code
        this.dialogForm.linecode = row.Line_code
        this.dialogForm.status = row.enable
        this.dialogForm.ratio = row.operation_ration
      })
    },
    // 删除按钮
    async del(id) {
    async del(row) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        // DeleteOrganization({ orgid: id }).then(res => {
        //   if (res.code === '200') {
        //     this.$message.success('删除成功!')
        //     this.getDeviceMangerSearch()
        //   }
        // })
        DeleteDeviceManger({ devicecode: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getDeviceMangerSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.dialogForm.id = ''
      this.dialogForm.devicecode = ''
      this.dialogForm.devicename = ''
      this.dialogForm.devicetypecode = ''
      this.dialogForm.devicegroupcode = ''
      this.dialogForm.importdate = ''
      this.dialogForm.workshopcode = ''
      this.dialogForm.linecode = ''
      this.dialogForm.status = ''
      this.dialogForm.ratio = ''
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框所属车间下拉选择改变时
    async workshopcodeChange(val) {
      const { data: res } = await WorkShopSelectLine({ workshopcode: val })
      this.WorkLineArr = res
      this.dialogForm.linecode = ''
    },
    // 对话框设备类型下拉选择改变时
    async devicetypecodeChange(val) {
      const { data: res } = await DeviceTypeSelectGroup({ eqptypecode: val })
      this.DeviceGroupDialogArr = res
      this.dialogForm.devicegroupcode = ''
    },
    // 对话框取消
    dialogVisibleCancel() {
@@ -677,12 +809,19 @@
      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')
            id: this.dialogForm.id,
            devicecode: this.dialogForm.devicecode,
            devicename: this.dialogForm.devicename,
            devicetypecode: this.dialogForm.devicetypecode,
            devicegroupcode: this.dialogForm.devicegroupcode,
            importdate: handleDatetime(this.dialogForm.importdate),
            workshopcode: this.dialogForm.workshopcode,
            linecode: this.dialogForm.linecode,
            status: this.dialogForm.status,
            ratio: this.dialogForm.ratio,
            OperType: this.operation === 'add' ? 'Add' : 'Update'
          }
          AddUpdateOrganization(data).then(res => {
          AddUpdateDeviceManger(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
              this.dialogVisible = false
@@ -697,8 +836,11 @@
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 200
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    },

@@ -740,7 +882,9 @@
    },
    // 新增按钮
    addDeviceType() {
      this.DeviceTypeArray.unshift({ code: '', name: '', group: '', remark: '', isVisible: 1 })
      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? (10 + Math.random()) : number
      this.DeviceTypeArray.unshift({ code: '', name: '', group: '', remark: '', isVisible: 1, number: number })
    },
    // 删除
    DeviceTypeDel(row) {
@@ -785,7 +929,7 @@
    // 取消
    DeviceTypeCancel(row) {
      this.DeviceTypeArray.forEach((item, index) => {
        if (item.isVisible === 1 && item.code === row.code) {
        if (item.isVisible === 1 && item.number === row.number) {
          this.DeviceTypeArray.splice(index, 1)
        }
      })
@@ -815,7 +959,17 @@
    },
    // 新增
    addDeviceGroup() {
      this.DeviceGroupArray.unshift({ code: '', name: '', eqptype_code: '', eqptype_name: '', remark: '', isVisible: 1 })
      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 }) {
@@ -889,7 +1043,7 @@
    // 取消按钮
    DeviceGroupCancel(row) {
      this.DeviceGroupArray.forEach((item, index) => {
        if (item.isVisible === 1 && item.code === row.code) {
        if (item.isVisible === 1 && item.number === row.number) {
          this.DeviceGroupArray.splice(index, 1)
        }
      })
@@ -905,8 +1059,13 @@
  height: 30px;
  display: flex;
  align-items: center;
  border: 1px solid $main_color;
  //border: 1px solid $main_color;
  border: none;
  padding: 0 20px;
}

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

::v-deep .el-button--info {
@@ -955,6 +1114,7 @@
  ::v-deep .el-select .el-input .el-select__caret {
    display: flex;
    align-items: center;
    justify-content: center;
  }

}
@@ -1037,12 +1197,32 @@
  margin: 10px 30px 0px 0;
}

.body ::v-deep .el-divider{
.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}
::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 {
  border-color: $main_color;
}

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