BUG修改

liuchengxin

2022-05-27 d138b7df8fa97dc7ed6b07acdfef804ebb186a74

 src/views/construction/exchange/index.vue

@@ -1,5 +1,5 @@
<template>
  <div class="app-container">
  <div class="construction-view">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="安装位置" prop="buildingId">
        <building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
@@ -10,61 +10,66 @@
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="型号" prop="model">
        <el-input
      <template v-if="showMoreCondition">
        <el-form-item label="型号" prop="model">
          <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="生产厂商" prop="manufacturerId">
        <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
      </el-form-item>
      <el-form-item label="网络端口" prop="networkPort">
        <el-select v-model="queryParams.networkPort" placeholder="请选择网络端口" clearable size="small">
          <el-option
          />
        </el-form-item>
        <el-form-item label="生产厂商" prop="manufacturerId">
          <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
        </el-form-item>
        <el-form-item label="网络端口" prop="networkPort">
          <el-select v-model="queryParams.networkPort" placeholder="请选择网络端口" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT113"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="指标A" prop="idnexA">
        <el-select v-model="queryParams.idnexA" placeholder="请选择指标A" clearable size="small">
          <el-option
            />
          </el-select>
        </el-form-item>
        <el-form-item label="指标A" prop="idnexA">
          <el-select v-model="queryParams.idnexA" placeholder="请选择指标A" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT114"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="级联端口" prop="cascadePort">
        <el-select v-model="queryParams.cascadePort" placeholder="请选择级联端口" clearable size="small">
          <el-option
            />
          </el-select>
        </el-form-item>
        <el-form-item label="级联端口" prop="cascadePort">
          <el-select v-model="queryParams.cascadePort" placeholder="请选择级联端口" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT113"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="指标B" prop="indexB">
        <el-select v-model="queryParams.indexB" placeholder="请选择指标B" clearable size="small">
          <el-option
            />
          </el-select>
        </el-form-item>
        <el-form-item label="指标B" prop="indexB">
          <el-select v-model="queryParams.indexB" placeholder="请选择指标B" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT114"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
            />
          </el-select>
        </el-form-item>
      </template>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -76,7 +81,6 @@
            icon="el-icon-plus"
            size="mini"
            @click="handleAdd"
            v-hasPermi="['oa:exchange:add']"
        >新增
        </el-button>
      </el-col>
@@ -88,7 +92,6 @@
            size="mini"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['oa:exchange:edit']"
        >修改
        </el-button>
      </el-col>
@@ -100,7 +103,6 @@
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
            v-hasPermi="['oa:exchange:remove']"
        >删除
        </el-button>
      </el-col>
@@ -133,13 +135,14 @@
          <dict-tag :options="dict.type.DICT114" :value="scope.row.indexB"/>
        </template>
      </el-table-column>
      <el-table-column label="安装位置" align="center" prop="buildingId_dictText"/>
      <el-table-column label="具体位置" align="center" prop="address"/>
      <el-table-column label="所属单位" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" align="center" prop="constructionBatchId_dictText"/>
      <el-table-column label="型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="序列号" min-width="180" align="center" prop="serialNumber"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="安装位置" min-width="180" align="center" prop="buildingId_dictText"/>
<!--      <el-table-column label="具体位置" min-width="220" align="center" prop="address"/>-->
<!--      <el-table-column label="所属单位" min-width="180" align="center" prop="organizationId_dictText"/>-->
<!--      <el-table-column label="施工批次" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
<!--      <el-table-column label="型号" min-width="180" align="center" prop="model"/>-->
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
              size="mini"
@@ -153,7 +156,6 @@
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['oa:exchange:edit']"
          >修改
          </el-button>
          <el-button
@@ -169,7 +171,6 @@
              class="del-btn"
              icon="el-icon-delete"
              @click="handleDelete(scope.row)"
              v-hasPermi="['oa:exchange:remove']"
          >删除
          </el-button>
        </template>
@@ -295,6 +296,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
import ShowMore from "@/views/components/showMore";

export default {
  name: "Exchange",
@@ -304,7 +306,8 @@
    organization,
    constructionBatch,
    manufacturer,
    nvr
    nvr,
    ShowMore
  },
  props: {
    schoolId: {
@@ -382,7 +385,8 @@
        ],
      },
      disabled: false,
      fileOpen: false
      fileOpen: false,
      showMoreCondition: false
    };
  },
  created() {
@@ -516,7 +520,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除交换设备编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delExchange(ids);
      }).then(() => {