Merge branch 'dev' into dev_tides

Crunchy

2025-03-17 0a26d58a3906b9e13946c7cb46fae51a0de98920

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

@@ -1,37 +1,26 @@
<template>
  <div>
    <div>
      <!-- <div class="view-title">
        <span>不符合项的分布</span>
        <span>
          <el-button size="medium" type="primary" @click="openFormDia('add')">新 增</el-button>
        </span>
      </div> -->
      <div class="search-background">
        <span class="search-group">
          <span style="width: 120px">年份：</span>
          <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-button size="small" type="primary" @click="openFormDia('add')">新 增</el-button>
        </div>
  <div class="capacity-scope">
    <div class="search">
      <div>
        <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>
          </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 class="table">
        <div>
          <TableCard :showForm="false" :showTitle="false">
            <template v-slot:table>
              <limsTable :column="tableColumn" :height="'calc(100vh - 19em)'" :table-data="tableData"
                :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" :page="page"
                @pagination="pagination">
              </limsTable>
            </template>
          </TableCard>
        </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" :page="page"
                 @pagination="pagination">
      </limsTable>
    </div>
    <form-dia v-if="formDia" ref="formDia" @closeDia="closeDia"></form-dia>
  </div>
@@ -39,7 +28,6 @@

<script>
import limsTable from "@/components/Table/lims-table.vue";
import TableCard from '@/components/TableCard/index.vue';
import FormDia from './components/formDia.vue';
import {
  pageInconsistentDistribution,
@@ -48,9 +36,9 @@
} from '@/api/cnas/process/nonconformingWork.js'

export default {
  name: 'a7-distribution-of-nonconforming',
  name: 'NonconformingDistribution',
  // import 引入的组件需要注入到对象中才能使用
  components: { FormDia, TableCard, limsTable },
  components: { FormDia, limsTable },
  data() {
    // 这里存放数据
    return {
@@ -200,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>