Merge remote-tracking branch 'origin/dev' into dev

zhuo

2025-03-16 13a60da2424da8cd50e52e35e0126e23e34ea6f3

 src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue

@@ -1,25 +1,26 @@
<template>
  <div class="capacity-scope">
    <div class="search">
  <div>
    <div>
      <div class="search-background">
        <span class="search-group">
          <span style="width: 120px">年份：</span>
        <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
          <el-form-item label="年份" prop="laboratoryName">
          <el-input v-model="searchForm.distributionYear" clearable size="small"></el-input>
        </span>
        <span class="search-group">
          <el-button size="small" @click="resetSearchForm">重 置</el-button>
          <el-button size="small" type="primary" @click="searchList">查 询</el-button>
        </span>
        <div class="btn">
          </el-form-item>
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">查 询</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetSearchForm">重 置</el-button>
          </el-form-item>
        </el-form>
      </div>
      <div>
          <el-button size="small" type="primary" @click="openFormDia('add')">新 增</el-button>
        </div>
      </div>
      <div class="table">
        <limsTable :column="tableColumn" :height="'calc(100vh - 19em)'" :table-data="tableData"
                   :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" :page="page"
                 :table-loading="tableLoading" :page="page"
                   @pagination="pagination">
        </limsTable>
      </div>
    </div>
    <form-dia v-if="formDia" ref="formDia" @closeDia="closeDia"></form-dia>
  </div>
@@ -187,36 +188,9 @@
</script>

<style scoped>
.view-title {
.search {
  height: 46px;
  display: flex;
  justify-content: space-between;
  align-items: center;
  height: 60px;
  padding-left: 20px;
}

.search-background {
  width: 100%;
  height: 80px;
  line-height: 80px;
  background-color: #ffffff;
  display: flex;
  position: relative;
}

.search-group {
  display: flex;
  align-items: center;
  margin: 0 20px;
}

.table {
  background-color: #ffffff;
}

.btn {
  position: absolute;
  right: 20px;
  top: 16px;
}
</style>