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

Fixiaobai

2023-09-09 34a7e21b3508ac0f5f011d958210fdb7176d726b

 src/views/laboratory/ledger/index.vue

@@ -2,7 +2,7 @@
  <div class="ledger-main">
    <div class="page-header-search">
      <div class="serve-btn">
        <el-button type="primary" icon="el-icon-plus"
        <el-button size="small" type="primary" icon="el-icon-plus"
          @click="showAddDrawer()">新增仪器</el-button>
      </div>
    </div>
@@ -11,7 +11,7 @@
        <div class="bom-item-search">
          <el-row>
            <el-col :span="19">
              <el-input v-model="filterText" clearable placeholder="输入关键字进行过滤" />
              <el-input size="small" v-model="filterText" clearable placeholder="输入关键字进行过滤" />
            </el-col>
            <el-col :span="5">
              <el-button type="primary" size="small" @click="addClassVisible = true"><i
@@ -28,14 +28,14 @@
            <el-row :gutter="20">
              <el-col :span="8">
                <el-form ref="form" :inline="true" :model="searchData">
                  <el-form-item>
                    <el-input v-model="searchData.keyword" placeholder="请输入编号/设备名称/型号规格">
                  <el-form-item width="200">
                    <el-input size="small" v-model="searchData.keyword" placeholder="请输入编号/设备名称/型号规格">
                      <i slot="prefix" class="el-input__icon el-icon-search" />
                    </el-input>
                  </el-form-item>
                  <el-form-item>
                    <el-button type="primary" @click="filterTableData">查询</el-button>
                    <el-button type="primary" plain @click="resetBtn">重置</el-button>
                    <el-button size="small" type="primary" @click="filterTableData">查询</el-button>
                    <el-button size="small" type="primary" plain @click="resetBtn">重置</el-button>
                  </el-form-item>
                </el-form>
              </el-col>
@@ -53,7 +53,7 @@
        <div class="table-box">
          <el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'left' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
            :data="equipmentTable" style="width: 100%;">
            :data="equipmentTable" style="width: 100%;height: 100vh">
            <el-table-column type="index" label="序号" min-width="90" />
            <el-table-column prop="equipment_code" label="仪器设备编号" min-width="200" />
            <el-table-column prop="equipment_name" label="仪器设备名称" min-width="150" />
@@ -180,7 +180,7 @@

            <el-table ref="codePointsTable" :cell-style="{ textAlign: 'center' }"
              :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
              :data="codePointsTable" style="width: 100%">
              :data="codePointsTable" style="width: 100%;overflow: scroll;height:314px;">
              <el-table-column type="index" label="序号" min-width="90" />
              <el-table-column prop="equipmentPoint" label="码点编码" min-width="150">
                <template slot-scope="scope">