代码提交

liuchengxin

2022-01-07 f8e7dc84f30df6dbac5d32ce84a85c7d804f0f9d

 src/views/device/peripheralUnit/index.vue

@@ -29,23 +29,24 @@
        />
      </el-form-item>
      <el-form-item label="生产厂商" prop="manufacturer">
        <el-input
          v-model="queryParams.manufacturer"
          placeholder="请输入生产厂商"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
        <el-select v-model="queryParams.manufacturer" placeholder="请选择生产厂商" clearable size="small">
          <el-option
            v-for="item in manufacturerList"
            :key="item.id"
            :label="item.name"
            :value="item.id"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="厂商代码" prop="vendorCode">
        <el-input
          v-model="queryParams.vendorCode"
          placeholder="请输入厂商代码"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
<!--      <el-form-item label="厂商代码" prop="vendorCode">-->
<!--        <el-input-->
<!--          v-model="queryParams.vendorCode"-->
<!--          placeholder="请输入厂商代码"-->
<!--          clearable-->
<!--          size="small"-->
<!--          @keyup.enter.native="handleQuery"-->
<!--        />-->
<!--      </el-form-item>-->
      <el-form-item label="波特率" prop="baudRate">
        <el-select v-model="queryParams.baudRate" placeholder="请选择波特率" clearable size="small">
          <el-option
@@ -121,14 +122,14 @@
      <el-table-column label="外设代码" align="center" prop="code"/>
      <el-table-column label="外设名称" align="center" prop="name"/>
      <el-table-column label="规格型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturer"/>
      <el-table-column label="厂商代码" align="center" prop="vendorCode"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturer_dictText"/>
      <el-table-column label="厂商代码" align="center" prop="vendorCode_dictText"/>
      <el-table-column label="波特率" align="center" prop="baudRate">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/>
        </template>
      </el-table-column>
      <el-table-column label="读数指令" align="center" prop="readInstruction"/>
      <el-table-column label="读数指令" align="center" width="180" prop="readInstruction"/>
      <el-table-column label="回数长度" align="center" prop="loopLength"/>
      <el-table-column label="功能描述" align="center" prop="description"/>
      <el-table-column label="操作" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
@@ -136,7 +137,7 @@
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            icon="el-icon-view"
            @click="handleInfo(scope.row)"
            v-hasPermi="['oa:peripheralUnit:info']"
          >查看
@@ -152,17 +153,18 @@
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:peripheralUnit:remove']"
          >删除
            icon="el-icon-document"
            @click="handleUpload(scope.row)"
          >附件
          </el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleUpload(scope.row)"
          >附件
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:peripheralUnit:remove']"
          >删除
          </el-button>
        </template>
      </el-table-column>
@@ -189,11 +191,18 @@
          <el-input v-model="form.model" placeholder="请输入规格型号" :disabled="disabled"/>
        </el-form-item>
        <el-form-item label="生产厂商" prop="manufacturer">
          <el-input v-model="form.manufacturer" placeholder="请输入生产厂商" :disabled="disabled"/>
          <el-select v-model="form.manufacturer" placeholder="请选择生产厂商" clearable size="small" :disabled="disabled">
            <el-option
              v-for="item in manufacturerList"
              :key="item.id"
              :label="item.name"
              :value="item.id"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="厂商代码" prop="vendorCode">
          <el-input v-model="form.vendorCode" placeholder="请输入厂商代码" :disabled="disabled"/>
        </el-form-item>
<!--        <el-form-item label="厂商代码" prop="vendorCode">-->
<!--          <el-input v-model="form.vendorCode" placeholder="请输入厂商代码" :disabled="disabled"/>-->
<!--        </el-form-item>-->
        <el-form-item label="波特率" prop="baudRate">
          <el-select v-model="form.baudRate" placeholder="请选择波特率" :disabled="disabled">
            <el-option
@@ -246,6 +255,8 @@
  addPeripheralUnit,
  updatePeripheralUnit
} from "@/api/oa/peripheralUnit";
import {Base64} from 'js-base64';
import { listManufacturer } from "@/api/common/common"

export default {
  name: "PeripheralUnit",
@@ -295,7 +306,8 @@
          {required: true, message: "外设代码不能为空", trigger: "blur"}
        ],
        name: [
          {required: true, message: "外设名称不能为空", trigger: "blur"}
          {required: true, message: "外设名称不能为空", trigger: "blur"},
          {max: 32, message: '最多输入32中文字符', trigger: 'blur' }
        ],
        model: [
          {required: true, message: "规格型号不能为空", trigger: "blur"}
@@ -319,13 +331,21 @@
          {required: true, message: "附件不能为空", trigger: "blur"}
        ],
      },
      disabled: false
      disabled: false,
      // 生产厂商
      manufacturerList: []
    };
  },
  created() {
    this.getList();
    this.getManufacturerList();
  },
  methods: {
    getManufacturerList() {
      listManufacturer().then(res => {
        this.manufacturerList = res.data
      })
    },
    /** 查询外设单元列表 */
    getList() {
      this.loading = true;
@@ -367,11 +387,13 @@
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getManufacturerList();
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.resetForm("queryForm");
      this.getManufacturerList();
      this.handleQuery();
    },
    // 多选框选中数据
@@ -383,6 +405,7 @@
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.getManufacturerList();
      this.form.baudRate = '3'
      this.open = true;
      this.title = "添加外设单元";
@@ -403,6 +426,7 @@
    handleUpdate(row) {
      this.loading = true;
      this.reset();
      this.getManufacturerList();
      const id = row.id || this.ids
      getPeripheralUnit(id).then(response => {
        this.loading = false;
@@ -440,7 +464,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除外设单元编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delPeripheralUnit(ids);
      }).then(() => {