Merge branch 'master' of http://192.168.65.113:9001/r/lims-before

zouyu

2023-09-05 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff

 src/views/laboratory/measure/index.vue

@@ -8,6 +8,7 @@
            </el-input>
          </el-form-item>
          <el-form-item v-if="this.radioValue === 1">
            <!-- <el-col :span="12"><span  hidden>2121</span></el-col> -->
            <el-button type="primary" @click="searchPlan">查询</el-button>
          </el-form-item>
          <el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '仪器设备名称:' : '设备名称'"
@@ -42,8 +43,8 @@
          </div>
        </div>
        <div class="table-box">
          <el-table v-if="this.radioValue == 0" :max-height="500" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
          <el-table v-if="this.radioValue == 0" :max-height="500" :cell-style="{ textAlign: 'left' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
            :data="measureLedgerTable" style="width: 100%">
            <el-table-column type="index" min-width="10%" />
            <el-table-column prop="equipmentCode" label="仪器设备编号" min-width="10%" />
@@ -126,7 +127,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,8 +397,8 @@
      });
      this.lookVisible = false
      this.addBtn = false
      // this.limitGetPlanMeasureInstrument()
      this.getPlanPageList()
      this.limitGetPlanMeasureInstrument()
    },
    async handleSizeChangePlan(num) {
      this.pageSizePlan = num
@@ -521,7 +522,7 @@
      this.reset()
    },
    async getPlanPageList() {
      console.log(111);
      // console.log(111);
      let param = {
        currentPage: this.currentPage,
        pageSize: this.pageSize,