Merge remote-tracking branch 'origin/master'

value

2023-09-07 523d7a54fb07fdf756fbc4faa5eb7fef7263a556

 src/views/laboratory/measure/index.vue

@@ -2,29 +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 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>
@@ -39,8 +42,8 @@
          </div>
        </div>
        <div class="table-box">
          <el-table v-if="this.radioValue == 0" :max-height="800" :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%" />
@@ -70,15 +73,15 @@
            <el-table-column prop="name" label="负责人" min-width="10%" />
            <el-table-column prop="createTime" label="创建日期" min-width="10%" />
            <el-table-column prop="name" label="创建人" min-width="8%" />
            <el-table-column prop="code" label="计量编号" min-width="8%" />
            <el-table-column prop="code" label="计量编号" min-width="12%" />
            <el-table-column label="操作" min-width="15%">
              <template slot-scope="scope">
                <el-button type="text" @click="lookMeasurement(scope.row.equipmentCode)" size="small">查看计量履历</el-button>
                <!-- <el-button type="text" @click="lookMeasurement(scope.row.equipmentCode)" size="small">查看计量履历</el-button> -->
                <el-button type="text" size="small">查看附件</el-button>
              </template>
            </el-table-column>
          </el-table>
          <el-table v-show="this.radioValue == 1" :max-height="800" :cell-style="{ textAlign: 'center' }"
          <el-table v-show="this.radioValue == 1" :max-height="500" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
            :data="measurePlanTable" style="width: 100%">
            <el-table-column type="index" min-width="10%" />
@@ -109,9 +112,9 @@
            </el-table-column>
          </el-table>
          <!-- 分页器 -->
          <div style="display: flex;justify-content: end;">
          <div style="display: flex;justify-content: end;padding: 10px 0;">
            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
              :current-page="currentPage" :page-sizes="[5, 10, 20]" :page-size="pageSize"
              :current-page="currentPage" :page-sizes="[10, 20, 30]" :page-size="pageSize"
              layout="total, sizes, prev, pager, next, jumper" :total="total">
            </el-pagination>
          </div>
@@ -123,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>
@@ -325,10 +328,10 @@
      measureLedgerTable: [],
      measurePlanTable: [],
      currentPage: 1,
      pageSize: 5,
      pageSize: 10,
      total: 0,
      currentPagePlan: 1,
      pageSizePlan: 5,
      pageSizePlan: 10,
      totalPlan: 0,
      direction: 'rtl',
      lookVisible: false,
@@ -393,7 +396,8 @@
      });
      this.lookVisible = false
      this.addBtn = false
      this.limitGetPlanMeasureInstrument()
      // this.limitGetPlanMeasureInstrument()
      this.getPlanPageList()
    },
    async handleSizeChangePlan(num) {
      this.pageSizePlan = num
@@ -504,6 +508,9 @@
    search() {
      this.getStandingPageList()
    },
    searchPlan(){
      this.getPlanPageList()
    },
    reset(formName) {
      this.searchData.name = ''
      this.searchData.code = ''
@@ -514,9 +521,11 @@
      this.reset()
    },
    async getPlanPageList() {
      // console.log(111);
      let param = {
        currentPage: this.currentPage, pageSize: this.pageSize,
        code: this.searchData.code, name: this.searchData.name, unit: this.searchData.measureunit
        currentPage: this.currentPage,
        pageSize: this.pageSize,
        plannedOrderNumber: this.searchData.code
      }
      const res = await getPlanPageList(param)
      res.data.list.forEach(item => {
@@ -524,6 +533,7 @@
      })
      this.measurePlanTable = res.data.list
      this.total = res.data.total
      console.log(333);
    },
    async lookMeasurement(code) {
    },
@@ -585,4 +595,5 @@
      margin: 10px 0;
    }
  }
}</style>
}
</style>