Merge remote-tracking branch 'origin/master'

value

2023-09-07 523d7a54fb07fdf756fbc4faa5eb7fef7263a556

 src/views/laboratory/measure/index.vue

@@ -2,32 +2,32 @@
  <div>
    <div class="content-main">
      <div class="top-bar">
        <el-form :hidden="lookVisible" ref="form" :inline="true" :model="searchData">
        <el-form style="margin-top: 10px;" :hidden="lookVisible" ref="form" :inline="true" :model="searchData">
          <el-form-item :label="this.radioValue === 0 ? '仪器设备编号:' : '计划编号:'" class="sermargin">
            <el-input v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="请输入">
            <el-input size="small" v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="请输入">
            </el-input>
          </el-form-item>
          <el-form-item v-if="this.radioValue === 1">
            <el-button type="primary" @click="searchPlan">查询</el-button>
            <el-button size="small" type="primary" @click="searchPlan">查询</el-button>
          </el-form-item>
          <el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '仪器设备名称:' : '设备名称'"
            class="sermargin">
            <el-input v-model="searchData.name" class="input-form" placeholder="请输入">
            <el-input size="small" v-model="searchData.name" class="input-form" placeholder="请输入">
            </el-input>
          </el-form-item>
          <el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '计量单位:' : '计量单位：'"
            style="margin-right: 20px;">
            <el-input v-model="searchData.measureunit" class="input-form" placeholder="请输入">
            <el-input size="small" v-model="searchData.measureunit" class="input-form" placeholder="请输入">
            </el-input>
          </el-form-item>
        </el-form>
        <el-form :hidden="lookVisible">
        <el-form :hidden="lookVisible" style="margin-top: 10px;">
          <el-form-item v-if="this.radioValue === 0" class="rightBtn">
            <el-button type="primary" @click="search">查询</el-button>
            <el-button type="primary" plain @click="reset()">重置</el-button>
            <el-button size="small" type="primary" @click="search">查询</el-button>
            <el-button size="small" type="primary" plain @click="reset()">重置</el-button>
          </el-form-item>
          <el-form-item v-if="this.radioValue === 1" class="rightBtn">
            <el-button type="primary" @click="addPlan()" icon="el-icon-plus">新增计划</el-button>
            <el-button size="small" type="primary" @click="addPlan()" icon="el-icon-plus">新增计划</el-button>
          </el-form-item>
        </el-form>
      </div>
@@ -126,7 +126,7 @@
          size="mini" plain>返回</el-button>
        <div v-if="addBtn"
          style="display: flex;justify-content: center;width: 10%;position: fixed;top: 43px;right: 14px; z-index: 1000;">
          <el-button @click="addTop = -82; addBtn = false" size="mini" style="width: 60px;">返回</el-button>
          <el-button @click="addTop = -82; addBtn = false;lookVisible= false" size="mini" style="width: 60px;">返回</el-button>
          <el-button size="mini" @click="measureAdd" style="width: 60px;" type="primary">保存</el-button>
        </div>
      </div>
@@ -396,7 +396,8 @@
      });
      this.lookVisible = false
      this.addBtn = false
      this.limitGetPlanMeasureInstrument()
      // this.limitGetPlanMeasureInstrument()
      this.getPlanPageList()
    },
    async handleSizeChangePlan(num) {
      this.pageSizePlan = num
@@ -520,7 +521,7 @@
      this.reset()
    },
    async getPlanPageList() {
      console.log(111);
      // console.log(111);
      let param = {
        currentPage: this.currentPage,
        pageSize: this.pageSize,