BUG修改

liuchengxin

2022-05-23 1c01e669cca92f94eea5d1a73ff60f3bd34b9079

 src/views/construction/ipc/index.vue

@@ -10,19 +10,24 @@
      <el-form-item label="所属单位" prop="organizationId">
        <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
      </el-form-item>
      <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="constructionBatchId">
          <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
        </el-form-item>
        <el-form-item label="型号" prop="model">
          <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
          />
        </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>

@@ -81,9 +86,9 @@
      <el-table-column label="安装位置" min-width="240" align="center" prop="buildingId_dictText"/>
      <el-table-column label="所属单位" min-width="200" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" min-width="120" align="center" prop="constructionBatchId_dictText"/>
      <el-table-column label="序列号" align="center" prop="serialNumber"/>
      <el-table-column label="型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="序列号" min-width="180" align="center" prop="serialNumber"/>
      <el-table-column label="型号" min-width="180" align="center" prop="model"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -213,6 +218,7 @@
import manufacturer from "../../components/manufacturer";
import nvr from '../../components/nvr'
import nvrForm from '../../components/nvr/form'
import ShowMore from "@/views/components/showMore";

export default {
  name: "Ipc",
@@ -223,7 +229,8 @@
    constructionBatch,
    manufacturer,
    nvr,
    nvrForm
    nvrForm,
    ShowMore
  },
  props: {
    schoolId: {
@@ -305,7 +312,8 @@
      },
      disabled: false,
      nvrOpen: false,
      nvrId: undefined
      nvrId: undefined,
      showMoreCondition: false
    };
  },
  computed: {