zouyu
2026-04-28 3115fcc80036ec4bfe3a2cd1128c5fdc82a01f42
limsTable表格自适应高度&手动下单调整
已修改78个文件
已删除3个文件
1472 ■■■■■ 文件已修改
src/components/Table/lims-table.vue 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/externalService/supplierManage/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/components/Edit.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/components/ViewRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/index.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/tabs/communicate.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/tabs/mandate.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue 338 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/complaint/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/disposal/sampleDisposal/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/disposal/sampleReceipt/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/ensureResults/managementReview/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/method/standardMethod/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/method/standardMethodsChange/component/ViewTestRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/method/standardMethodsChange/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/reportResults/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/uncertainty/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/device/component/borrow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/device/component/equipmentMaintenance.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/device/component/management.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/standardMaterial/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentControl/components/FileList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/costStatistics/components/viewInfoDia.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/costStatistics/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionReview/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/components/EditInspectionItem.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/components/viewManHourDia.vue 204 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/index.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/inspection.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionView/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/customsInspectionOrder.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/index.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/outsourcingFinishProduct/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/productOrder/components/addOrder.vue 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/productOrder/components/addView.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/productOrder/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/productSamplingInfo/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/rawMaterialInspection/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/reportPreparation/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/unpass/index-manage.vue 277 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/unpass/index.vue 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/competency/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/manHour/workTimeConfig.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/manHour/workTimeManagement.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/manHour/workTimeStatistics.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/rewardAndPunishment/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/standard/model/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statisticalCharts/inspectionItemWarning/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statisticalCharts/itemInspectionAnalysis/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statisticalCharts/qualificationRateStatistics/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/structural/capabilityAndLaboratory/capability/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/structural/capabilityAndLaboratory/laboratory/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/structural/premises/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/Table/lims-table.vue
@@ -2,11 +2,11 @@
  <div>
    <!-- è¡¨æ ¼ -->
    <el-table ref="multipleTable" v-loading="tableLoading" :border="border" :data="tableData"
      :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" :height="height"
      :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" :height="tableHeight"
      :highlight-current-row="highlightCurrentRow" :row-class-name="rowClassName" :row-style="rowStyle"
      :row-key="rowKey" :span-method="spanMethod" :show-summary="showSummary" :summary-method="summaryMethod" stripe style="width: 100%" tooltip-effect="dark" @row-click="rowClick"
      @current-change="currentChange" @selection-change="handleSelectionChange" class="lims-table">
      <el-table-column align="center" type="selection" width="55" v-if="isSelection" />
      <el-table-column align="center" type="selection" width="55" :selectable="selectionSelectable" v-if="isSelection" />
      <el-table-column align="center" label="序号" type="index" width="60" :index="indexMethod" />
      <el-table-column v-for="(item, index) in column" :key="index" :column-key="item.columnKey"
@@ -186,8 +186,12 @@
      default: false,
    },
    height: {
      type: String,
      default: null,
      type: Number,
      default: 0,
    },
    more:{
      type:Boolean,
      default: false,
    },
    tableLoading: {
      type: Boolean,
@@ -198,6 +202,10 @@
      default: () => {
        return () => { };
      },
    },
    selectionSelectable: {
      type: Function,
      default: () => true,
    },
    rowClick: {
      type: Function,
@@ -275,10 +283,22 @@
      btnWidth: "120px",
      uploadRefs: [],
      currentFiles: {}, // ç”¨äºŽå­˜å‚¨æ¯è¡Œçš„当前文件
      uploadKeys: {} // ç”¨äºŽåŠ¨æ€é‡ç½®ç»„ä»¶
      uploadKeys: {}, // ç”¨äºŽåŠ¨æ€é‡ç½®ç»„ä»¶
      tableHeight:0,
      resizeHandler: null, // é˜²æŠ–函数引用
    };
  },
  created(){
    this.calcTableHeight()
    this.resizeHandler = this.debounce(() => {
      this.calcTableHeight();
    }, 200);
  },
  beforeDestroy(){
    window.removeEventListener("resize",this.resizeHandler)
  },
  mounted() {
    window.addEventListener("resize",this.resizeHandler)
    this.calculateSpanInfo();
    this.$nextTick(() => {
      this.$refs.multipleTable.doLayout();
@@ -295,16 +315,44 @@
        this.tableData.forEach((_, index) => {
          this.$set(this.uploadKeys, index, Date.now());
        });
        this.$nextTick(() => {
          if (this.$refs.multipleTable) {
            this.$refs.multipleTable.doLayout();
          }
        });
        this.refreshTableLayout();
      },
      immediate: true
    }
    },
    more() {
      this.refreshTableLayout();
    },
    height() {
      this.refreshTableLayout();
    },
  },
  methods: {
    refreshTableLayout() {
      this.$nextTick(() => {
        this.calcTableHeight();
        if (this.$refs.multipleTable) {
          this.$refs.multipleTable.doLayout();
        }
      });
    },
    calcTableHeight(){
      const innerHeight = window.innerHeight;
      const naviHeight = 96;//导航栏高度
      const pageHeight = this.page?52:0;//分页组件高度
      const mainMarginHeight = 40;//主组件上下间距
      const otherHeight = this.height;//其余高度
      const searchHeight = this.more?101:51;//搜索栏高度
      this.tableHeight = innerHeight - naviHeight - pageHeight - mainMarginHeight - otherHeight - searchHeight
    },
    //防抖函数
    debounce(fn, delay) {
      let timer = null;
      return (...args) => {
        clearTimeout(timer);
        timer = setTimeout(() => fn.apply(this, args), delay);
      };
    },
    getWidth(row, row0) {
      let count = 0;
      row.forEach((a) => {
src/views/CNAS/externalService/supplierManage/index.vue
@@ -18,7 +18,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
      <lims-table :tableData="tableData" :column="tableColumn" :height="150" @pagination="pagination"
        :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <form-dia ref="formDia" v-if="formDia" @closeDia="closeDia"></form-dia>
src/views/CNAS/personnel/personnelInfo/components/Edit.vue
@@ -119,7 +119,7 @@
      <div v-if="selectUserDia" class="body" style="height: 60vh;">
        <lims-table :tableData="tableData1" :column="column1"
                    :isSelection="true" :handleSelectionChange="selectMethod"
                    height="500" :tableLoading="tableLoading1"></lims-table>
                    :height="500" :tableLoading="tableLoading1"></lims-table>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="selectUserDia = false">取 æ¶ˆ</el-button>
src/views/CNAS/personnel/personnelInfo/components/ViewRecord.vue
@@ -15,7 +15,7 @@
      </div>
      <div>
        <lims-table :tableData="tableData" :column="columnData"
                    :height="'calc(100vh - 47em)'"
                    :height="200"
                    :highlightCurrentRow="true"
                    :tableLoading="tableLoading"></lims-table>
      </div>
src/views/CNAS/personnel/personnelInfo/index.vue
@@ -66,10 +66,6 @@
                                :departId="departId"
                                :isDepartment="isDepartment"></job-responsibilities>
        </el-tab-pane>
        <!-- <el-tab-pane label="奖惩记录" name="奖惩记录">
          <rewardPunishmentRecord v-if="activeName === '奖惩记录'"
                                  :departId="departId" :isDepartment="isDepartment"></rewardPunishmentRecord> -->
        <!-- </el-tab-pane> -->
        <el-tab-pane label="培训记录" name="培训记录">
          <training-record v-if="activeName === '培训记录'" ref="trainingRecord"
                           :departId="departId"
@@ -112,7 +108,6 @@
import personnelInformation from './tabs/personnel-information.vue'
import PersonnelTraining from './tabs/personnelTraining';
import JobResponsibilities from './tabs/job-responsibilities.vue';
import rewardPunishmentRecord from "./tabs/reward-punishment-record.vue";
import TrainingRecord from './tabs/training-record.vue';
import Mandate from './tabs/mandate.vue';
import PersonnelCapacity from './tabs/personnel-capacity.vue';
@@ -121,7 +116,7 @@
export default {
  name: 'PersonnelInfo',
  components: {
    PersonnelList, personnelInformation, PersonnelTraining, JobResponsibilities, rewardPunishmentRecord, TrainingRecord, Mandate, PersonnelCapacity, Communicate
    PersonnelList, personnelInformation, PersonnelTraining, JobResponsibilities, TrainingRecord, Mandate, PersonnelCapacity, Communicate
  },
  data() {
    return {
src/views/CNAS/personnel/personnelInfo/tabs/communicate.vue
@@ -5,7 +5,7 @@
      <el-button size="small" type="primary" icon="el-icon-plus" @click="openDialog">新增</el-button>
    </div>
    <lims-table :tableData="tableData" :column="columnData"
                @pagination="page" :height="'calc(100vh - 18em)'"
                @pagination="page" :height="50"
                :page="pagination" :tableLoading="loading"></lims-table>
    <Add ref="communicateModal" @submit="getTableData"></Add>
  </div>
src/views/CNAS/personnel/personnelInfo/tabs/mandate.vue
@@ -6,7 +6,7 @@
        <el-button size="small" type="primary" icon="el-icon-plus" @click="openDialog">新增</el-button>
      </div>
      <lims-table :tableData="tableData" :column="columnData"
                  @pagination="page" :height="'calc(100vh - 18em)'"
                  @pagination="page" :height="50"
                  :page="pagination" :tableLoading="loading"></lims-table>
    </div>
    <Add ref="mandateModal" @refresh="getTableData"></Add>
@@ -19,7 +19,6 @@
  deletePersonPostAuthorizationRecord, exportPersonPostAuthorizationRecord,
  PersonPostAuthorizationRecordPage
} from "@/api/cnas/personal/personPostAuthorizationRecord";
import {delCustomById} from "@/api/system/customer";
export default {
  components: {
src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
@@ -17,7 +17,7 @@
      </div>
    </div>
    <lims-table :tableData="tableData" :column="yearColumnData"
                @pagination="pagination" :height="'calc(100vh - 20em)'"
                @pagination="pagination" :height="50"
                :page="search" :tableLoading="yearLoading">
      <div slot="jobResponsibilities" slot-scope="scope">
        <div v-html="changeLine(scope.row.responsibilities)"></div>
@@ -263,23 +263,23 @@
        {
          label: '岗位',
          prop: 'postName',
          width: '100'
          width: '120'
        }, {
          label: '姓名',
          prop: 'userName',
          width: '100'
          width: '120'
        }, {
          label: '学历',
          prop: 'academicDegree',
          width: '100'
          width: '120'
        }, {
          label: '专业',
          prop: 'major',
          width: '100'
          width: '120'
        }, {
          label: '职称',
          prop: 'professionalTitle',
          width: '100'
          width: '120'
        }, {
          dataType: 'slot',
          label: '岗位职责',
@@ -289,7 +289,6 @@
        }, {
          dataType: 'tag',
          label: '综合评价',
          width: '140px',
          prop: 'comprehensiveAssessment',
          formatData: (params) => {
            if (params == 'Qualified this position') {
src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
@@ -1,7 +1,7 @@
<template>
  <div>
    <div style="text-align: right;margin-bottom: 10px">
      <!--       <el-button size="small" @click="$emit('goBackList')">返回</el-button>-->
<!--             <el-button size="small" @click="$emit('goBackList')">返回</el-button>-->
      <el-button size="small" type="primary" @click="downPerson">下载档案</el-button>
      <el-button size="small" type="primary" @click="dialogVisible = true">人员分类</el-button>
      <el-button :loading="saveLoading" size="small" type="primary" @click="save">保存</el-button>
@@ -311,7 +311,7 @@
                  @click="annexAdd(0)">新增</el-button>
              </el-col>
            </el-row>
            <lims-table :tableData="annexList" :column="columnData2" style="width: 96%;margin-left: 34px" height="200"
            <lims-table :tableData="annexList" :column="columnData2" style="width: 96%;margin-left: 34px" :height="700"
              :tableLoading="tableLoading2"></lims-table>
            <el-row style="margin-top: 10px">
              <el-col :span="20">
@@ -328,7 +328,7 @@
                </el-upload>
              </el-col>
            </el-row>
            <lims-table :tableData="tableData" :column="columnData" style="width: 96%;float: right;" height="200"
            <lims-table :tableData="tableData" :column="columnData" style="width: 96%;float: right;" :height="700"
              :tableLoading="tableLoading"></lims-table>
            <el-row style="margin-top: 10px">
              <el-col :span="20">
src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
@@ -22,17 +22,17 @@
                :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
                height="calc(100vh - 21em)" style="width: 100%;">
        <el-table-column align="center" label="序号" type="index" width="60"></el-table-column>
        <el-table-column label="员工编号" prop="account" width="150"></el-table-column>
        <el-table-column label="姓名" prop="name" width="120"></el-table-column>
        <el-table-column label="籍贯" prop="nativePlace" width="120"></el-table-column>
        <el-table-column label="证件地址" prop="idAddress" show-overflow-tooltip width="100"></el-table-column>
        <el-table-column label="手机号" prop="telephone" show-overflow-tooltip width="100"></el-table-column>
        <el-table-column label="毕业院校" prop="graduatedInstitutions1" width="100"></el-table-column>
        <el-table-column label="所学专业" prop="major1" width="100"></el-table-column>
        <el-table-column label="毕业时间" prop="graduationTime1" width="100"></el-table-column>
        <el-table-column label="最高学历" prop="officialAcademicRedentials" width="100"></el-table-column>
        <el-table-column label="最高学位" prop="highestDegree" width="100"></el-table-column>
        <el-table-column label="职称" prop="professionalTitle" width="100"></el-table-column>
        <el-table-column label="员工编号" prop="account" min-width="150"></el-table-column>
        <el-table-column label="姓名" prop="name" min-width="120"></el-table-column>
        <el-table-column label="籍贯" prop="nativePlace" min-width="120"></el-table-column>
        <el-table-column label="证件地址" prop="idAddress" show-overflow-tooltip min-width="100"></el-table-column>
        <el-table-column label="手机号" prop="telephone" show-overflow-tooltip min-width="100"></el-table-column>
        <el-table-column label="毕业院校" prop="graduatedInstitutions1" min-width="100"></el-table-column>
        <el-table-column label="所学专业" prop="major1" min-width="100"></el-table-column>
        <el-table-column label="毕业时间" prop="graduationTime1" min-width="100"></el-table-column>
        <el-table-column label="最高学历" prop="officialAcademicRedentials" min-width="100"></el-table-column>
        <el-table-column label="最高学位" prop="highestDegree" min-width="100"></el-table-column>
        <el-table-column label="职称" prop="professionalTitle" min-width="100"></el-table-column>
        <el-table-column fixed="right" label="操作" width="120" align="center">
          <template slot-scope="scope">
            <el-button size="small" type="text" @click="$emit('updatePerson', scope.row)">编辑</el-button>
@@ -59,7 +59,7 @@
      </div>
      <div v-if="selectUserDia" class="body" style="height: 60vh;">
        <lims-table :tableData="tableData1" :column="column1" :isSelection="true" :handleSelectionChange="selectMethod"
          height="520" :tableLoading="tableLoading1"></lims-table>
          :height="500" :tableLoading="tableLoading1"></lims-table>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="selectUserDia = false">取 æ¶ˆ</el-button>
src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
@@ -21,7 +21,7 @@
        </div>
      </div>
      <lims-table :tableData="yearPlanTableData" :column="yearPlanColumn" :currentChange="currentChange"
        @pagination="pagination" height="40vh" :page="page" :tableLoading="yearLoading"></lims-table>
        @pagination="pagination" :height="500" :page="page" :tableLoading="yearLoading"></lims-table>
    </div>
    <div v-if="!editPlanShow" class="table">
      <div>
@@ -47,7 +47,7 @@
          </div>
        </div>
        <lims-table :tableData="inDetailPlanTableData" :column="inDetailPlanColumn"
          :height="isDepartment ? '40vh' : '62vh'" :isSelection="true" :handleSelectionChange="handleSelectionChange"
          :height="isDepartment ? 500 : 300" :isSelection="true" :handleSelectionChange="handleSelectionChange"
          @pagination="pagination1" :page="inDetailPagination" :tableLoading="yearDetailLoading"></lims-table>
      </div>
    </div>
src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
ÎļþÒÑɾ³ý
src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue
@@ -22,7 +22,7 @@
        <lims-table :tableData="trainingTableData" :column="trainingColumn"
                    ref="trainingTableData"
                    :currentChange="currentChange" :highlightCurrentRow="true"
                    @pagination="pagination" :height="'calc(100vh - 22em)'"
                    @pagination="pagination" :height="100"
                    :page="trainingPagination" :tableLoading="trainingLoading"></lims-table>
      </div>
      <div :style="`width: ${isDepartment ? '49%' : '100%'};`">
@@ -52,7 +52,7 @@
          </div>
        </div>
        <lims-table :tableData="trainingPersonTableData" :column="trainingPersonColumn"
                    :height="'calc(100vh - 22em)'" @pagination="pagination1"
                    :height="100" @pagination="pagination1"
                    :page="trainingPersonPagination" :tableLoading="trainingPersonLoading"></lims-table>
      </div>
    </div>
src/views/CNAS/process/complaint/index.vue
@@ -23,7 +23,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 290px)'"
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="150"
        :page="page" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :visible.sync="addDialogVisible" title="新增" width="400px">
src/views/CNAS/process/disposal/sampleDisposal/index.vue
@@ -16,12 +16,12 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData0" :column="column0" :tableLoading="tableLoading"
                  key="tableData0" :height="'calc(100vh - 240px)'" :page="page0" @pagination="pagination0"></lims-table>
                  key="tableData0" :height="150" :page="page0" @pagination="pagination0"></lims-table>
    </div>
    <el-dialog title="详情" :visible.sync="editDialogVisible" width="70%">
      <el-button size="small" type="primary" @click="handleAdd('add')" style="margin-bottom: 10px">新增</el-button>
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading"
                  key="tableData" :height="'calc(100vh - 290px)'">
                  key="tableData" :height="150">
      </lims-table>
      <span slot="footer" class="dialog-footer">
        <el-button @click="editDialogVisible = false">取消</el-button>
src/views/CNAS/process/disposal/sampleReceipt/index.vue
@@ -18,7 +18,7 @@
    <div class="table">
      <lims-table :tableData="tableData0" :column="column0" :tableLoading="tableLoading0"
                  key="tableData0"
                  :height="'calc(100vh - 240px)'" :page="page0" @pagination="pagination0">
                  :height="150" :page="page0" @pagination="pagination0">
        <div slot="action" slot-scope="scope">
          <el-button type="text" @click="handleAdd(scope.row)">编辑</el-button>
          <el-button type="text" @click="delRow(scope.row)">
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue
@@ -15,7 +15,7 @@
      </div>
      <div>
        <lims-table :tableData="tableData" :column="columnData" :tableLoading="tableLoading"
                    :height="'calc(100vh - 270px)'" key="tableData"></lims-table>
                    :height="150" key="tableData"></lims-table>
      </div>
    </el-dialog>
    <el-dialog
src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
@@ -19,7 +19,7 @@
        </div>
      </div>
      <lims-table :tableData="yearTableData" :column="yearColumnData" :page="yearPage" :tableLoading="yearLoading"
                  :height="'calc(100vh - 34em)'" @pagination="pagination" :rowClick="rowClick" key="yearTableData"></lims-table>
                  :height="100" @pagination="pagination" :rowClick="rowClick" key="yearTableData"></lims-table>
    </div>
    <div style="margin-top: 20px">
      <div style="display: flex;justify-content: space-between">
@@ -45,7 +45,7 @@
        </div>
      </div>
      <lims-table :tableData="yearDetailTableData" :column="yearDetailColumnData" :page="yearDetailPage"
        :tableLoading="yearDetailLoading" :height="'calc(100vh - 34em)'" @pagination="pagination1" ref="yearDetailTableData"
        :tableLoading="yearDetailLoading" :height="100" @pagination="pagination1" ref="yearDetailTableData"
        key="yearDetailTableData"></lims-table>
    </div>
    <!--新增修改弹框-->
src/views/CNAS/process/ensureResults/managementReview/index.vue
@@ -17,7 +17,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 270px)'"
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="150"
                  :page="page" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :visible.sync="addDialogVisible" title="评价" width="900px" @close="closeDia">
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
@@ -19,7 +19,7 @@
        </div>
      </div>
      <lims-table :tableData="yearTableData" :column="yearColumnData" :page="yearPage" :tableLoading="yearLoading"
        height="40vh" @pagination="pagination" :rowClick="rowClick" key="yearTableData"></lims-table>
        :height="200" @pagination="pagination" :rowClick="rowClick" key="yearTableData"></lims-table>
    </div>
    <div style="margin-top: 20px">
      <div style="display: flex;justify-content: space-between">
@@ -50,7 +50,7 @@
        </div>
      </div>
      <lims-table :tableData="yearDetailTableData" :column="yearDetailColumnData" :page="yearDetailPage"
        :tableLoading="yearDetailLoading" height="40vh" @pagination="pagination1" key="yearDetailColumnData"></lims-table>
        :tableLoading="yearDetailLoading" :height="200" @pagination="pagination1" key="yearDetailColumnData"></lims-table>
    </div>
    <!--新增修改弹框-->
    <detail-form-dialog v-if="formDia" ref="formDia" :superviseId="superviseId"
src/views/CNAS/process/method/standardMethod/index.vue
@@ -30,7 +30,7 @@
      </div>
    </div>
    <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
      :height="'calc(100vh - 250px)'" @pagination="pagination"></lims-table>
      @pagination="pagination"></lims-table>
    <!-- æ–°å¢ž/编辑 -->
    <el-dialog :title="title" :visible.sync="addDlog" width="500px">
      <el-form :model="addForm" ref="addForm" :rules="addRules" label-position="right" label-width="120px">
src/views/CNAS/process/method/standardMethodsChange/component/ViewTestRecord.vue
@@ -18,7 +18,7 @@
        <lims-table
          ref="yearTable"
          :column="columnData"
          :height="'calc(100vh - 47em)'"
          :height="150"
          :highlightCurrentRow="true"
          :table-data="tableData"
          :table-loading="tableLoading"
src/views/CNAS/process/method/standardMethodsChange/index.vue
@@ -17,7 +17,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'"
      <lims-table :tableData="tableData" :column="tableColumn" :height="150"
                  @pagination="pagination" :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <formDIaChange v-if="formDIa" ref="formDIa" :operationType="operationType" @closeDia="closeDia"></formDIaChange>
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
@@ -37,12 +37,12 @@
          </el-radio-group>
        </div>
        <div v-if="tabIndex === '0'">
          <lims-table :column="tableColumn" :height="'calc(100vh - 26em)'" :table-data="tableData"
          <lims-table :column="tableColumn" :height="100" :table-data="tableData"
                      :table-loading="tableLoading" :page="page" @pagination="pagination">
          </lims-table>
        </div>
        <div v-if="tabIndex === '1'">
          <lims-table :column="oldTableColumn" :height="'calc(100vh - 20em)'" :table-data="oldTableData"
          <lims-table :column="oldTableColumn" :height="100" :table-data="oldTableData"
                      :table-loading="oldTableLoading" :page="oldPage" @pagination="oldPagination">
          </lims-table>
        </div>
src/views/CNAS/process/reportResults/index.vue
@@ -18,7 +18,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 270px)'"
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="150"
        :page="page" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :title="title" :visible.sync="addDialogVisible" width="400px" top="6vh">
src/views/CNAS/process/uncertainty/index.vue
@@ -21,7 +21,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 270px)'"
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="150"
        :page="page" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :visible.sync="addDialogVisible" title="评价" width="400px">
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -172,7 +172,7 @@
    <el-dialog title="添加检验项" :visible.sync="dialogVisible5" width="1000px">
      <lims-table :tableData="tableData5" :column="column5"
                  :isSelection="true" :handleSelectionChange="selectMethod"
                  height="540" :page="page5" :tableLoading="tableLoading5"
                  :height="400" :page="page5" :tableLoading="tableLoading5"
                  @pagination="pagination5"></lims-table>
      <span slot="footer" class="dialog-footer">
        <el-button @click="dialogVisible5 = false">取 æ¶ˆ</el-button>
src/views/CNAS/resourceDemand/device/component/borrow.vue
@@ -18,7 +18,7 @@
      </div>
    </div>
    <div class="tables">
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 290px)'"
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="150"
        :page="page" @pagination="pagination"></lims-table>
    </div>
    <el-dialog title="仪器设备领(借)用登记" top="5vh" :visible.sync="dialogVisible" width="60%">
src/views/CNAS/resourceDemand/device/component/equipmentMaintenance.vue
@@ -7,7 +7,7 @@
    </div>
    <div>
      <lims-table :tableData="tableData" :column="column"
                  height="calc(100vh - 20em)" @pagination="pagination"
                  :height="100" @pagination="pagination"
                  :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <el-dialog :visible.sync="dialogVisible" title="仪器设备使用维护保养表" width="55%">
src/views/CNAS/resourceDemand/device/component/management.vue
@@ -33,7 +33,7 @@
      </div>
    </div>
        <div class="table" v-show="!showData">
            <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 300px)'"
            <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="100"
                :page="page" @pagination="pagination" :row-class-name="tableRowClassName"></lims-table>
        </div>
        <el-dialog :title="isUp ? '设备详情' : '档案修订'" :visible.sync="dialogVisible" width="70%" top="5vh"
src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue
@@ -6,7 +6,7 @@
    </div>
    <div>
      <lims-table :tableData="tableData" :column="column"
                  height="calc(100vh - 20em)" @pagination="pagination"
                  :height="100" @pagination="pagination"
                  :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="usageTableDia"
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
@@ -20,7 +20,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
      <lims-table :tableData="tableData" :column="tableColumn" :height="100" @pagination="pagination"
        :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <personnel-management-dia v-if="threeWastesDia" ref="threeWastesDia"
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
@@ -17,7 +17,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
      <lims-table :tableData="tableData" :column="tableColumn" :height="100" @pagination="pagination"
        :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <three-wastes-dialog v-if="threeWastesDia" ref="threeWastesDia"
src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
@@ -19,7 +19,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
      <lims-table :tableData="tableData" :column="tableColumn" :height="100" @pagination="pagination"
        :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
  </div>
src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -23,7 +23,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
      <lims-table :tableData="tableData" :column="tableColumn" :height="100" @pagination="pagination"
        :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <form-dia v-if="formDia" ref="formDia" @closeYearDia="closeYearDia"></form-dia>
src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
@@ -82,7 +82,7 @@
        </el-form-item>
      </el-col>
      <el-col :span="24">
        <lims-table :tableData="list" :column="spareColumns" height="300">
        <lims-table :tableData="list" :column="spareColumns" :height="300">
          <template slot="name" slot-scope="{ row, index }">
            <el-input v-if="row.isEdit" size="small" v-model="row.name"></el-input>
            <span v-else>{{ row.name }}</span>
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -18,7 +18,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="columns" :height="'calc(100vh - 250px)'" @pagination="pagination"
      <lims-table :tableData="tableData" :column="columns" :height="150" @pagination="pagination"
        :page="page" :tableLoading="tableLoading">
        <template slot="action" slot-scope="{ row }">
          <el-button type="text" @click="edit(row)">编辑</el-button>
src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
@@ -20,7 +20,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
        :height="150" @pagination="pagination"></lims-table>
    </div>
    <el-dialog title="文件受控申请" :visible.sync="addDialogVisible" width="800px" top="10vh">
      <el-row>
src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
@@ -26,7 +26,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
        :height="150" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :title="'添加' + radio + '记录'" :visible.sync="addDialogVisible" top="10vh" width="800px">
      <el-row v-if="addDialogVisible">
src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
@@ -21,7 +21,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
        :height="150" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :title="title" :visible.sync="addDialogVisible" top="0vh" width="950px">
      <div v-loading="diaLoading">
src/views/CNAS/systemManagement/documentControl/components/FileList.vue
@@ -29,7 +29,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
        :height="150" @pagination="pagination"></lims-table>
    </div>
    <el-dialog title="上传" :visible.sync="addDialogVisible" width="1000px" top="3vh">
      <UpPdfStamp ref="UpPdfStamp" v-if="addDialogVisible" @uploadPDF="uploadPDF" :isUpFile="true"
src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
@@ -21,7 +21,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
        :height="150" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :visible.sync="addDialogVisible" title="文件作废申请" top="10vh" width="800px">
      <el-row>
src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
@@ -29,7 +29,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :height="'calc(100vh - 230px)'" @pagination="pagination"></lims-table>
        :height="100" @pagination="pagination"></lims-table>
    </div>
    <!-- æ–°å¢ž/编辑 -->
    <el-dialog :title="title" :visible.sync="addDia" width="500px">
src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
@@ -29,7 +29,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :height="'calc(100vh - 260px)'" @pagination="pagination"></lims-table>
        :height="150" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :title="title" :visible.sync="addDialogVisible" width="400px" top="6vh">
      <el-row>
src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
@@ -29,7 +29,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :height="'calc(100vh - 260px)'" @pagination="pagination"></lims-table>
        :height="150" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :title="title" :visible.sync="addDialogVisible" width="400px" top="6vh">
      <el-row>
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -11,7 +11,7 @@
            <el-button size="small" type="primary" :loading="upLoading">导入</el-button></el-upload>
        </div>
        <lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading0"
                    :height="'calc(100vh - 290px)'" @pagination="pagination0"></lims-table>
                    :height="150" @pagination="pagination0"></lims-table>
      </el-tab-pane>
      <el-tab-pane label="历史记录" name="历史记录" style="height: 100%;">
        <div>
@@ -28,7 +28,7 @@
          </el-form>
        </div>
        <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
                    :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
                    :height="150" @pagination="pagination"></lims-table>
      </el-tab-pane>
    </el-tabs>
    <!-- è¯¦æƒ…/下载/审核 -->
src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
@@ -30,7 +30,7 @@
        </div>
        <div class="table">
          <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
            :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
                      :height="150" @pagination="pagination"></lims-table>
        </div>
      </el-tab-pane>
      <el-tab-pane label="历史记录" name="历史记录" style="height: 100%;">
@@ -49,7 +49,7 @@
        </div>
        <div class="table">
          <lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading"
            :height="'calc(100vh - 290px)'" @pagination="pagination0"></lims-table>
            :height="150" @pagination="pagination0"></lims-table>
        </div>
      </el-tab-pane>
    </el-tabs>
src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
@@ -22,7 +22,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :height="'calc(100vh - 260px)'" @pagination="pagination"></lims-table>
                  :height="150" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :title="title" :visible.sync="addDialogVisible" width="800px" top="6vh">
      <el-row>
src/views/business/costStatistics/components/viewInfoDia.vue
@@ -2,7 +2,7 @@
  <div>
    <el-dialog title="详情" :visible.sync="viewInfoDia" width="1000px">
      <limsTable :tableData="tableData" :column="column"
                 height="600" @pagination="pagination"
                 :height="300" @pagination="pagination"
                 :page="page" :tableLoading="tableLoading"></limsTable>
    </el-dialog>
  </div>
src/views/business/costStatistics/index.vue
@@ -29,7 +29,7 @@
    </div>
    <div>
      <lims-table :tableData="tableData" :column="column"
                  :height="'calc(100vh - 250px)'" @pagination="pagination"
                   @pagination="pagination"
                  :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <viewInfoDia ref="viewInfoDia" v-if="viewInfoDia"></viewInfoDia>
src/views/business/inspectionReview/index.vue
@@ -43,7 +43,7 @@
    </div>
    <div>
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
        :rowClassName="rowClassName" :height="'calc(100vh - 270px)'" @pagination="pagination"
        :rowClassName="rowClassName" :height="37" @pagination="pagination"
        key="tableData0"></lims-table>
    </div>
    <!--报告查看-->
src/views/business/inspectionTask/components/EditInspectionItem.vue
@@ -21,7 +21,7 @@
        :table-data="editTableData"
        :table-loading="editLoading"
        :page="page"
        height="560"
        :height="500"
        @pagination="pagination"
      >
      </lims-table>
src/views/business/inspectionTask/components/viewManHourDia.vue
ÎļþÒÑɾ³ý
src/views/business/inspectionTask/index.vue
@@ -64,7 +64,7 @@
          </div>
        </div>
        <lims-table :tableData="tableData" :column="column" :page="page" :rowClassName="rowClassName"
          :height="'calc(100vh - 300px)'" @pagination="pagination" key="tableData0">
          :height="66" @pagination="pagination" key="tableData0">
          <div slot="action" slot-scope="scope">
            <el-button size="small" type="text" @click="handleDataLook(scope.row)">数据查看</el-button>
            <el-button type="text" size="small"
@@ -217,8 +217,6 @@
    ></ShowInfo> -->
    <!--修改检验值弹框-->
    <edit-inspection-item ref="editInspectionItem"></edit-inspection-item>
    <!--查看工时弹框-->
    <viewManHourDia ref="viewManHourDia"></viewManHourDia>
    <!--不合格复测查看弹框-->
    <un-pass-retest-result v-if="retestVisible" :retestInfo="retestInfo" :retestVisible="retestVisible"
      @closeRetestLook="closeRetestLook"></un-pass-retest-result>
@@ -246,7 +244,6 @@
import EditInspectionItem from "./components/EditInspectionItem.vue";
import limsTable from "@/components/Table/lims-table.vue";
import viewManHourDia from "./components/viewManHourDia.vue"
import UnPassRetestResult from "@/components/rawMaterialInspection/unPassRetestResult.vue"
import {
  claimInsOrderPlan,
@@ -265,14 +262,12 @@
import { upReportUrl } from "@/api/business/insReport";
import onlyoffice from "@/components/Onlyoffice/onlyoffice.vue";
import filePreview from "@/components/Preview/filePreview.vue";
import tab from "../../../plugins/tab";
export default {
  name: 'InspectionTask',
  components: {
    filePreview, onlyoffice,
    EditInspectionItem,
    limsTable,
    viewManHourDia,
    UnPassRetestResult
  },
  dicts: ["urgency_level", "inspection_task_state", 'material_prop_type'],
@@ -684,10 +679,6 @@
    // ä¿®æ”¹æ£€éªŒå€¼
    editInspection(row) {
      this.$refs.editInspectionItem.showDialog(row.id);
    },
    // æŸ¥çœ‹å·¥æ—¶
    viewManHour(row) {
      this.$refs.viewManHourDia.showDialog(row.id, row.insState);
    },
    // æ•°æ®æŸ¥çœ‹
    handleDataLook(row) {
src/views/business/inspectionTask/inspection.vue
@@ -78,7 +78,6 @@
          "
          >样品切换</el-button
        >
        <!--        <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">任务切换</el-button>-->
        <el-button
          v-if="state == 1"
          size="small"
@@ -777,7 +776,7 @@
        :column="column"
        :page="page"
        :tableLoading="tableLoading"
        :height="'calc(100vh - 290px)'"
        :height="700"
        @pagination="pagination"
        style="height: 100%; margin-top: 16px"
      ></lims-table>
@@ -871,16 +870,6 @@
          show-overflow-tooltip
        ></el-table-column>
      </el-table>
    </el-drawer>
    <el-drawer :size="500" :visible.sync="taskVisible" title="任务切换">
      <lims-table
        :tableData="tableData0"
        :column="column0"
        :page="page0"
        :tableLoading="tableLoading0"
        :height="'calc(100vh - 90px)'"
        :currentChange="handleChangeTask"
      ></lims-table>
    </el-drawer>
    <el-dialog
      title="哑铃片设备试样类型"
@@ -1188,11 +1177,6 @@
      :purchaseDialog="purchaseDialog"
      @resetPurchaseDialog="resetPurchaseDialog"
    ></purchase-verification>
    <!--查看工时弹框-->
    <viewManHourDia
      ref="viewManHourDia"
      @submit="openAddVerifyDia"
    ></viewManHourDia>
    <!--    IFS物料属性编辑弹框-->
    <el-dialog
      title="更新IFS库存物料批次属性"
@@ -1308,7 +1292,6 @@
import DataWorker from "@/workers/DataWorker.worker.js";
import html2canvas from "html2canvas";
import { mapGetters } from "vuex";
import viewManHourDia from "@/views/business/inspectionTask/components/viewManHourDia.vue";
import {
  getOneByIfsId,
  saveOrUpdateProps,
@@ -1317,7 +1300,6 @@
export default {
  name: "Inspection",
  components: {
    viewManHourDia,
    PurchaseVerification,
    AddUnPass,
    limsTable,
@@ -1364,7 +1346,6 @@
      dataGetDia: false,
      fileAdd: false,
      sampleVisible: false,
      taskVisible: false,
      submitLoading: false,
      searchForm: {
        sampleName: null,
@@ -2591,11 +2572,6 @@
        }
      }
    },
    // æ”¹å˜ä»»åŠ¡
    handleChangeTask(row) {
      if (row) this.id = row.id;
      this.taskVisible = false;
    },
    // å­—典获取信息
    getTypeDicts() {
      this.getDicts("urgency_level").then((response) => {
@@ -3529,10 +3505,6 @@
      } else {
        this.$message.error("未输入不通过原因");
      }
    },
    // æŸ¥çœ‹å·¥æ—¶
    viewManHour() {
      this.$refs.viewManHourDia.showDialog(this.id, 99);
    },
    openAddVerifyDia() {
      this.addVerifyDia = true;
src/views/business/inspectionView/index.vue
@@ -514,8 +514,6 @@
    <!-- è¿›è´§éªŒè¯å¼¹æ¡†-->
    <purchase-verification v-if="purchaseDialog" ref="purchaseDialog" :orderId="orderId"
                           :purchaseDialog="purchaseDialog" @resetPurchaseDialog="resetPurchaseDialog"></purchase-verification>
    <!--查看工时弹框-->
    <viewManHourDia ref="viewManHourDia" @submit="openAddVerifyDia"></viewManHourDia>
  </div>
</template>
@@ -549,11 +547,9 @@
import DataWorker from '../../../workers/DataWorker.worker';
import html2canvas from "html2canvas";
import { mapGetters } from "vuex";
import viewManHourDia from "@/views/business/inspectionTask/components/viewManHourDia.vue";
export default {
  name: 'InspectionView',
  components: {
    viewManHourDia,
    PurchaseVerification,
    AddUnPass,
    limsTable,
@@ -2543,10 +2539,6 @@
      } else {
        this.$message.error("未输入不通过原因");
      }
    },
    // æŸ¥çœ‹å·¥æ—¶
    viewManHour() {
      this.$refs.viewManHourDia.showDialog(this.id, 99);
    },
    openAddVerifyDia() {
      this.addVerifyDia = true;
src/views/business/materialOrder/customsInspectionOrder.vue
@@ -1884,10 +1884,10 @@
          this.$set(row, 'sectionCopy', row.section)
        }
      }
      if (row.ask.includes('[')) {
      if (row.ask && row.ask.includes('[')) {
        this.$set(row, 'askCopy', row.ask)
      }
      if (row.tell.includes('[')) {
      if (row.tell && row.tell.includes('[')) {
        this.$set(row, 'tellCopy', row.tell)
      }
      let arr = this.productList.filter(m=>m.state==1&&row.sectionCopy&&row.sectionCopy.includes(m.sectionCopy)&&m.ask&&m.sectionCopy.indexOf('[')==-1)
@@ -1950,10 +1950,10 @@
            this.$set(p, 'sectionCopy', p.section)
          }
        }
        if (p.ask.includes('[')) {
        if (p.ask && p.ask.includes('[')) {
          this.$set(p, 'askCopy', p.ask)
        }
        if (p.tell.includes('[')) {
        if (p.tell && p.tell.includes('[')) {
          this.$set(p, 'tellCopy', p.tell)
        }
        if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
src/views/business/materialOrder/index.vue
@@ -53,9 +53,10 @@
            </el-select>
          </el-form-item>
          <el-form-item label="下发时间" prop="date" v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
            <el-date-picker v-model="entity.date" end-placeholder="结束日期" format="yyyy-MM-dd" placeholder="选择日期"
              @change="goSearch" range-separator="至" size="small" start-placeholder="开始日期" type="daterange"
              value-format="yyyy-MM-dd">
            <el-date-picker v-model="entity.date" end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"
              @change="goSearch" range-separator="至" size="small" start-placeholder="开始日期" type="datetimerange"
                            :default-time="['00:00:00', '23:59:59']"
              value-format="yyyy-MM-dd HH:mm:ss">
            </el-date-picker>
          </el-form-item>
          <el-form-item>
@@ -92,32 +93,32 @@
        <!--待下单-->
        <div class="table">
          <lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
            ref="tableData" :rowClassName="changeRowClass" :height="'calc(100vh - 290px)'" key="tableData" :page="page"
            ref="tableData" :rowClassName="changeRowClass" :height="50" :more="more" key="tableData" :page="page"
            :tableLoading="tableLoading"></lims-table>
        </div>
        <!--检验中-->
        <div class="table">
          <lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 1" :isSelection="true"
            :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination1"
            :height="'calc(100vh - 290px)'" key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
            :height="50" :more="more" key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
        </div>
        <!--已检验-->
        <div class="table">
          <lims-table :tableData="tableData2" :column="column2" v-if="tabIndex === 2" :isSelection="true"
            :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination2"
            :height="'calc(100vh - 290px)'" key="tableData2" :page="page2" :tableLoading="tableLoading2"></lims-table>
            :height="50" :more="more" key="tableData2" :page="page2" :tableLoading="tableLoading2"></lims-table>
        </div>
        <!--全部-->
        <div class="table">
          <lims-table :tableData="tableData3" :column="column3" v-if="tabIndex === 3" :isSelection="true"
            :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination3"
            :height="'calc(100vh - 290px)'" key="tableData3" :page="page3" :tableLoading="tableLoading3"></lims-table>
            :height="50" :more="more" key="tableData3" :page="page3" :tableLoading="tableLoading3"></lims-table>
        </div>
        <!--季度检验-->
        <div class="table">
          <lims-table :tableData="tableData4" :column="column4" v-if="tabIndex === 4" :isSelection="true"
            :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination4"
            :height="'calc(100vh - 290px)'" key="tableData4" :page="page4" :tableLoading="tableLoading4"></lims-table>
            :height="50" :more="more" key="tableData4" :page="page4" :tableLoading="tableLoading4"></lims-table>
        </div>
      </div>
    </div>
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -6,7 +6,7 @@
      </ul>
      <div>
        <lims-table :tableData="tableData" :column="column"
                    @pagination="pagination" height="500px" key="tableData"
                    @pagination="pagination" :height="500" key="tableData"
                    :page="page" :tableLoading="tableLoading"></lims-table>
      </div>
    </el-dialog>
src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
@@ -15,7 +15,7 @@
        </el-upload>
      </div>
      <div v-if="filesDialogVisible">
        <lims-table :tableData="tableDataFile" :column="columnFile" @pagination="paginationFile" height="500px"
        <lims-table :tableData="tableDataFile" :column="columnFile" @pagination="paginationFile" :height="500"
          key="tableDataFile" :page="pageFile" :tableLoading="tableLoadingFile"></lims-table>
      </div>
    </el-dialog>
src/views/business/outsourcingFinishProduct/index.vue
@@ -90,26 +90,26 @@
        <!--待下单-->
        <div class="table">
          <lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
            ref="tableData" :rowClassName="changeRowClass" :height="'calc(100vh - 290px)'" key="tableData" :page="page"
            ref="tableData" :rowClassName="changeRowClass" :height="50" :more="more" key="tableData" :page="page"
            :tableLoading="tableLoading"></lims-table>
        </div>
        <!--检验中-->
        <div class="table">
          <lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 1" :isSelection="true"
            :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination1"
            :height="'calc(100vh - 290px)'" key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
            :height="50" :more="more" key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
        </div>
        <!--已检验-->
        <div class="table">
          <lims-table :tableData="tableData2" :column="column2" v-if="tabIndex === 2" :isSelection="true"
            :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination2"
            :height="'calc(100vh - 290px)'" key="tableData2" :page="page2" :tableLoading="tableLoading2"></lims-table>
            :height="50" :more="more" key="tableData2" :page="page2" :tableLoading="tableLoading2"></lims-table>
        </div>
        <!--全部-->
        <div class="table">
          <lims-table :tableData="tableData3" :column="column3" v-if="tabIndex === 3" :isSelection="true"
            :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination3"
            :height="'calc(100vh - 290px)'" key="tableData3" :page="page3" :tableLoading="tableLoading3"></lims-table>
            :height="50" :more="more" key="tableData3" :page="page3" :tableLoading="tableLoading3"></lims-table>
        </div>
      </div>
    </div>
src/views/business/productOrder/components/addOrder.vue
@@ -268,6 +268,8 @@
            <el-input v-model="specialStandardMethod" :disabled="!isSpecial" clearable size="small"></el-input>
            <el-button v-show="active==1" size="small" style="margin-left: 10px"
                       type="primary" @click="editSpecial">编辑</el-button>
            <el-button v-show="active==1" size="small" type="primary" @click="handleSplitCountNum">拆分</el-button>
            <el-button v-show="active==1" :disabled="sampleList.length<=1" size="small" type="danger" @click="handleDeleteSplitCountNum">删除拆分</el-button>
          </div>
        </div>
        <el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
@@ -277,18 +279,18 @@
          <el-table-column align="center" label="序号" type="index" width="65"></el-table-column>
          <el-table-column align="center" label="样品名称" min-width="100" prop="sample">
            <template slot-scope="scope">
              <el-input v-model="scope.row.sample" :disabled="active>1" clearable size="small"></el-input>
              <el-input v-model="scope.row.sample" :disabled="active>1 || scope.$index !== 0" clearable size="small"></el-input>
            </template>
          </el-table-column>
          <el-table-column align="center" label="样品编号" min-width="100" prop="sampleCode">
            <template slot-scope="scope">
              <el-input v-model="scope.row.sampleCode" :disabled="active>1" clearable placeholder="不填写则系统自动生成"
              <el-input v-model="scope.row.sampleCode" :disabled="active>1 || scope.$index !== 0" clearable placeholder="不填写则系统自动生成"
                size="small"></el-input>
            </template>
          </el-table-column>
          <el-table-column align="center" label="样品型号" min-width="60" prop="model">
            <template slot-scope="scope">
              <el-select v-model="scope.row.model" :disabled="active>1" allow-create default-first-option filterable
              <el-select v-model="scope.row.model" :disabled="active>1 || scope.$index !== 0" allow-create default-first-option filterable
                placeholder="样品型号" size="small" style="width: 100%;" @change="handleChangeModel">
                <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
                </el-option>
@@ -315,7 +317,7 @@
          <el-table-column align="center" label="检验标准" min-width="100" prop="standardMethodListId">
            <template slot-scope="scope">
              <el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1"
                :loading="methodLoad" :readonly="active>1" clearable placeholder="检验标准"
                :loading="methodLoad" :readonly="active>1 || scope.$index !== 0" clearable placeholder="检验标准"
                size="small" style="width: 100%;" @change="(value)=>methodChange(value, scope.row)" @clear="productList = []" @focus="methodFocus">
                <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
                </el-option>
@@ -416,12 +418,12 @@
          <el-table-column label="区间" min-width="120" prop="section" show-overflow-tooltip></el-table-column>
          <el-table-column :filter-method="filterHandler" :filters="filters" label="子实验室" min-width="130" prop="sonLaboratory"
            show-overflow-tooltip></el-table-column>
            <el-table-column v-if="isSpecial&&active==1" label="操作" width="100">
            <template slot-scope="scope">
              <el-button v-if="!scope.row.repetitionTag" size="small" type="text" @click="addProductList(productList,scope.row,scope.$index)">插入行</el-button>
              <el-button v-if="!!scope.row.repetitionTag&&scope.row.delete" size="small" type="text" @click="deleteProductList(scope.$index,productList)">删除</el-button>
            </template>
          </el-table-column>
<!--            <el-table-column v-if="isSpecial&&active==1" label="操作" width="100">-->
<!--            <template slot-scope="scope">-->
<!--              <el-button v-if="!scope.row.repetitionTag" size="small" type="text" @click="addProductList(productList,scope.row,scope.$index)">插入行</el-button>-->
<!--              <el-button v-if="!!scope.row.repetitionTag&&scope.row.delete" size="small" type="text" @click="deleteProductList(scope.$index,productList)">删除</el-button>-->
<!--            </template>-->
<!--          </el-table-column>-->
        </el-table>
      </div>
    </div>
@@ -429,7 +431,7 @@
      <div v-if="selectUserDia" class="body">
        <lims-table :tableData="tableData1" :column="column1"
                    :isSelection="true" :handleSelectionChange="selectMethod"
                    @pagination="pagination1" height="400px" key="tableData1"
                    @pagination="pagination1" :height="400" key="tableData1"
                    :page="page1" :tableLoading="tableLoading1"></lims-table>
      </div>
      <span slot="footer" class="dialog-footer">
@@ -904,6 +906,37 @@
    this.getInfo();
  },
  methods: {
    // æ‹†åˆ†
    handleSplitCountNum () {
      if(!this.sampleList || this.sampleList.length===0){
        this.$message.error("请先选择样品")
        return
      }
      this.sample.joinName = null
      this.sample.joinModel = null
      this.sample.joinNum = 1
      // ä¸¤æ¡æ•°æ®ä¿æŒä¸€è‡´
      this.sample.sample = this.sampleList[0].sample
      this.sample.model = this.sampleList[0].model
      this.sample.unit = this.sampleList[0].unit
      this.sample.modelNum = this.sampleList[0].modelNum
      this.sample.standardMethodListId = this.sampleList[0].standardMethodListId
      this.sample.insProduct = this.sampleList[0].insProduct
      this.sample.id = this.count
      this.sample.childSampleList = this.sampleList[0].childSampleList
      this.sample.insulating = null
      this.sample.sheath = null
      this.sampleList.push(this.HaveJson(this.sample))
      this.sampleList.forEach(item => {
        item.quantity = 1
      })
      this.count++
    },
    //删除拆分行
    handleDeleteSplitCountNum(){
      this.count--;
      this.sampleList.pop()
    },
    getInfo() {
      this.selectStandardTreeList()
      this.getAuthorizedPerson();
@@ -961,14 +994,14 @@
      },
      changeProductList0(){
        this.productList0.forEach(a=>{
          let obj = this.productList.find(m => {
            if(a.repetitionTag){
              return m.id === a.id&&m.repetitionTag == a.repetitionTag
            }else{
              return m.id === a.id&&!m.repetitionTag
            }
          })
        //   let obj = this.productList.find(m => {
        //     if(a.repetitionTag){
        //       return m.id === a.id&&m.repetitionTag == a.repetitionTag
        //     }else{
        //       return m.id === a.id&&!m.repetitionTag
        //     }
        //   })
          let obj = this.productList.find(m => m.id == a.id)
          if(obj){
            a.state = obj.state
            a.section = obj.section
@@ -1695,10 +1728,10 @@
            this.$set(row, 'sectionCopy', row.section)
          }
        }
        if (row.ask.includes('[')) {
        if (row.ask && row.ask.includes('[')) {
          this.$set(row, 'askCopy', row.ask)
        }
        if (row.tell.includes('[')) {
        if (row.tell && row.tell.includes('[')) {
          this.$set(row, 'tellCopy', row.tell)
        }
        let arr = this.productList.filter(m=>m.state==1&&row.sectionCopy&&row.sectionCopy.includes(m.sectionCopy)&&m.ask&&m.sectionCopy.indexOf('[')==-1)
@@ -1969,24 +2002,35 @@
      },
      // è¦æ±‚值变化时
      requestChange(e, row,type) {
        //this.currentMethod å½“前样品id
        this.sampleList.forEach(item=>{
          if(item.id == this.currentMethod.id){
            item.insProduct.forEach(i=>{
              if(i.id == row.id){
                if(row.repetitionTag){
                  if(row.repetitionTag==i.repetitionTag){
                    i[type] = e
                  }
                }else{
                  if(!i.repetitionTag){
                    i[type] = e
                  }
                }
        this.sampleList.map(item => {
          if (this.sampleIds.indexOf(item.id) > -1) {
            item.insProduct.map(m => {
              if (m.id == row.id) {
                m[type] = e;
              }
              return m;
            })
          }
          return item
        })
        //this.currentMethod å½“前样品id
        // this.sampleList.forEach(item=>{
        //   if(item.id == this.currentMethod.id){
        //     item.insProduct.forEach(i=>{
        //       if(i.id == row.id){
        //         if(row.repetitionTag){
        //           if(row.repetitionTag==i.repetitionTag){
        //             i[type] = e
        //           }
        //         }else{
        //           if(!i.repetitionTag){
        //             i[type] = e
        //           }
        //         }
        //       }
        //     })
        //   }
        // })
      },
      selectStandardMethods() {
        selectStandardMethodEnum().then(res => {
@@ -2001,7 +2045,12 @@
        }
      },
      selectable0(row,index) {
        if (this.active > 1||row.repetitionTag) {
        // if (this.active > 1||row.repetitionTag) {
        //   return false
        // } else {
        //   return true
        // }
        if (this.active > 1) {
          return false
        } else {
          return true
@@ -2028,18 +2077,12 @@
              this.$set(p, 'sectionCopy', p.section)
            }
          }
          if (p.ask.includes('[')) {
          if (p.ask && p.ask.includes('[')) {
            this.$set(p, 'askCopy', p.ask)
          }
          if (p.tell.includes('[')) {
          if (p.tell && p.tell.includes('[')) {
            this.$set(p, 'tellCopy', p.tell)
          }
          // if (p.manHour.includes('[')) {
          //   this.$set(p, 'manHourCopy', p.manHour)
          // }
          // if (p.price.includes('[')) {
          //   this.$set(p, 'priceCopy', p.price)
          // }
          if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
            if (p.sectionCopy.indexOf('[') > -1) {
              p.bsmRow = this.HaveJson(p)
@@ -2072,11 +2115,6 @@
            return item
          })
        }
        this.productList.forEach(item => {
          if (item.id == row.id) {
            item.state = row.state;
          }
        })
        this.changeProductList0()
        this.currentMethod.insProduct = this.productList0
        this.getProNum()
src/views/business/productOrder/components/addView.vue
@@ -418,7 +418,7 @@
      <div v-if="selectUserDia" class="body">
        <lims-table :tableData="tableData1" :column="column1"
                    :isSelection="true" :handleSelectionChange="selectMethod"
                    @pagination="pagination1" height="400px" key="tableData1"
                    @pagination="pagination1" :height="400" key="tableData1"
                    :page="page1" :tableLoading="tableLoading1"></lims-table>
      </div>
      <span slot="footer" class="dialog-footer">
src/views/business/productOrder/index.vue
@@ -62,7 +62,7 @@
      </div>
      <div class="table">
        <lims-table :tableData="tableData" :column="column" :isSelection="true" :handleSelectionChange="selectMethod"
                    @pagination="pagination" :height="'calc(100vh - 280px)'" :key="upIndex" :page="page"
                    @pagination="pagination" :height="50" :more="more" :key="upIndex" :page="page"
                    :tableLoading="tableLoading"></lims-table>
      </div>
    </div>
src/views/business/productSamplingInfo/index.vue
@@ -24,10 +24,10 @@
        </ul>
        <!--季度-->
        <lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
          :height="'calc(100vh - 290px)'" :page="page" :tableLoading="tableLoading"></lims-table>
                    :height="50" :page="page" :tableLoading="tableLoading"></lims-table>
        <!--年度-->
        <lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 1" @pagination="pagination1"
          :height="'calc(100vh - 290px)'" key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
                    :height="50" key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
      </div>
    </div>
    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="yearSampleDia" title="年度抽样"
src/views/business/rawMaterialInspection/index.vue
@@ -34,9 +34,10 @@
            </el-select>
          </el-form-item>
          <el-form-item label="下发时间" prop="date" v-if="(tabIndex === 3 || tabIndex === 4) && more">
            <el-date-picker v-model="componentData.date" end-placeholder="结束日期" format="yyyy-MM-dd" placeholder="选择日期"
                            range-separator="至" size="small" start-placeholder="开始日期" style="width: 100%;" type="daterange" @change="refreshTable()"
                            value-format="yyyy-MM-dd">
            <el-date-picker v-model="componentData.date" end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"
                            range-separator="至" size="small" start-placeholder="开始日期" style="width: 100%;" type="datetimerange" @change="refreshTable()"
                            :default-time="['00:00:00','23:59:59']"
                            value-format="yyyy-MM-dd HH:mm:ss">
            </el-date-picker>
          </el-form-item>
          <el-form-item label="委托编号" prop="entrustCode" v-if="(tabIndex === 3 || tabIndex === 4) && more">
@@ -81,13 +82,13 @@
      <!--待报检、待下单-->
      <div class="table">
        <lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0 || tabIndex === 1" :isSelection="true"
          :handleSelectionChange="selectMethod" @pagination="pagination" :height="'calc(100vh - 290px)'" :page="page"
          :handleSelectionChange="selectMethod" @pagination="pagination" :height="50" :more="more"  :page="page"
          :tableLoading="tableLoading"></lims-table>
      </div>
      <!--已完成、全部-->
      <div class="table">
        <lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 3 || tabIndex === 4"
          @pagination="pagination1" :height="'calc(100vh - 290px)'" :page="page1"
          @pagination="pagination1" :page="page1" :height="50" :more="more"
          :tableLoading="tableLoading1"></lims-table>
      </div>
    </div>
@@ -323,12 +324,16 @@
import { getDicts } from "@/api/system/dict/data";
import limsTable from "@/components/Table/lims-table.vue";
import {transformExcel} from '@/utils/file'
import tab from "../../../plugins/tab";
export default {
  name: 'RawMaterialInspection',
  // import å¼•入的组件需要注入到对象中才能使用
  components: { limsTable, DataLookVisible },
  computed:{
    tab() {
      return tab
    },
    splitOrderAction(){
      return this.javaApi + '/rawMaterialOrder/importSplitOrderData'
    }
src/views/business/reportPreparation/index.vue
@@ -63,7 +63,7 @@
    </div>
    <div>
      <lims-table highlightCurrentRow :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
        :isSelection="true" :handleSelectionChange="handleChange" :height="'calc(100vh - 320px)'"
        :isSelection="true" :handleSelectionChange="handleChange"  :height="38" :more="true"
        @pagination="pagination" key="valueTableData">
        <div slot="action" slot-scope="scope">
          <el-button size="small" type="text" @click="viewIssued(scope.row)">查看报告</el-button>
src/views/business/unpass/index-manage.vue
@@ -60,13 +60,14 @@
            <el-button type="primary" size="mini" @click="refreshTable">查询</el-button>
            <el-button size="mini" @click="refresh">重置</el-button>
            <el-button :loading="exportLoading" type="success" size="mini" @click="exportUnqualifiedHandler">导出</el-button>
            <el-button type="primary" size="mini" @click="openInsOrderDialog">新增不合格处理</el-button>
          </el-form-item>
        </el-form>
      </div>
    </div>
    <div>
      <lims-table :tableData="tableData" :column="column"
                  :height="'calc(100vh - 250px)'" @pagination="pagination"
                  :more="true" @pagination="pagination"
                  :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <el-dialog
@@ -95,6 +96,38 @@
        <el-button type="primary" @click="cancelOA" :loading="cancelOALoading">ç¡® å®š</el-button>
      </span>
    </el-dialog>
    <el-dialog
      title="选择不合格订单"
      :show-close="false"
      :close-on-press-escape="false"
      :close-on-click-modal="false"
      :visible.sync="insOrderVisible"
      width="50%">
      <el-row :gutter="20" style="margin-bottom:10px">
        <el-col :span="12">
          <el-input clearable size="small" v-model="lotBatchNo" placeholder="请输入批次号"></el-input>
        </el-col>
        <el-col :span="12">
          <el-button size="small" type="primary" @click="searchInsOrderList">搜索</el-button>
        </el-col>
      </el-row>
      <lims-table ref="insOrderTable"
                  :tableData="insOrderDataList"
                  :column="insOrderTableDataColumn"
                  :isSelection="true"
                  :selectionSelectable="insOrderSelectable"
                  :handleSelectionChange="selectMethod"
                  :rowClassName="insOrderRowClassName"
                  @pagination="insOrderPageination"
                  height="400px"
                  :page="insOrderPage"
                  :tableLoading="insOrderTableLoading">
      </lims-table>
      <span slot="footer" class="dialog-footer">
        <el-button @click="resetInsOrderForm">取 æ¶ˆ</el-button>
        <el-button type="primary" @click="openAddUnqualifiedHandlerView">ç¡® å®š</el-button>
      </span>
    </el-dialog>
    <UnPassDialog ref="unPassDialog" v-if="unPassDialog"
                  :orderId="orderId"
                  @resetForm="resetForm1"
@@ -107,6 +140,7 @@
</template>
<script>
import {getIfsByAll} from "@/api/business/rawMaterialOrder";
import UnPassDialog from "./components/unPassDialog.vue";
import OAProcess from "./components/OAProcess.vue";
import limsTable from "@/components/Table/lims-table.vue";
@@ -121,6 +155,143 @@
  dicts: ['material_prop_type','oa_workflow_state'],
  data() {
    return {
      lotBatchNo:null,
      insOrderVisible:false,
      insOrderTableLoading:false,
      insOrderDataList:[],
      insOrderTableDataColumn:[
        {
          label: 'IFS域',
          prop: 'contract',
          width: '120px',
          dataType: 'tag',
          formatData: (params) => {
            return params
          },
          formatType: (params) => {
            if (params === 'ZTNS') {
              return ''
            } else if (params === 'KJNS') {
              return 'success'
            }else {
              return null
            }
          }
        },
        { label: '委托编号', prop: 'entrustCode', width: "160px", },
        {
          dataType: 'tag',
          label: '检验状态',
          prop: 'inspectStatus',
          formatData: (params) => {
            if (params == 0) {
              return '检验中'
            } else if (params == 1) {
              return '合格'
            } else if (params == 2) {
              return '不合格'
            } else if (params == 3) {
              return '未下单'
            } else if (params == 4) {
              return '让步放行'
            } else {
              return null
            }
          },
          formatType: (params) => {
            if (params == 0) {
              return 'warning'
            } else if (params == 1) {
              return 'success'
            } else if (params == 2) {
              return 'danger'
            } else if (params == 3) {
              return 'info'
            } else if (params == 4) {
              return ''
            } else {
              return null
            }
          }
        },
        { label: '订单号', prop: 'orderNo' },
        { label: '抵达的采购数量', prop: 'purQtyInStore' ,width:'160' },
        { label: '下发时间', prop: 'sendTime',width:'160' },
        { label: '批号', prop: 'updateBatchNo',width:'160' },
        { label: '零件号', prop: 'partNo',width:'140' },
        { label: '零件描述', prop: 'partDesc' },
        { label: '供应商名称', prop: 'supplierName' },
        { label: '不合格描述', prop: 'unqualifiedDesc',width:'160' },
        {
          dataType: 'tag',
          label: '免检',
          prop: 'isExemption',
          formatData: (params) => {
            if (params == 1) {
              return '免检'
            } else {
              return null
            }
          },
          formatType: (params) => {
            if (params == 1) {
              return 'success'
            } else {
              return null
            }
          }
        },
        {
          label: '样品名称',
          prop: 'sampleName',
          width: "160px"
        },
        { label: '样品型号', prop: 'sampleModel' },
        { label: '检验人', prop: 'userName' },
        {
          label: '物料属性',
          prop: 'materialProp',
          formatData: (params) => {
            if (!params) return null
            for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
              const item = this.dict.type.material_prop_type[i]
              if (item.value == params) {
                return item.label
              }
            }
            return null
          }
        },
        {
          dataType: 'tag',
          label: '物料类型',
          prop: 'isExpire',
          formatData: (params) => {
            if (params == 1) {
              return '过期物料'
            } else {
              return null
            }
          },
          formatType: (params) => {
            if (params == 1) {
              return 'info'
            } else {
              return null
            }
          }
        },
        { label: '单位', prop: 'buyUnitMeas' },
        { label: '接收时间', prop: 'receiverDate',width:'160' },
        { label: '报检时间', prop: 'declareDate',width:'160' },
      ],
      insOrderPage:{
        total: 0,
        size: 20,
        current: 1
      },
      handlerId: null,
      contract:null,
      entity: {
@@ -239,18 +410,18 @@
          dataType: "tag",
          formatData: (params) => {
            if (params == 0) {
              return "生产反馈不合格";
            } else if(params == 1) {
              return "检测不合格";
            } else if(params == 1) {
              return "生产反馈不合格";
            } else {
              return null
            }
          },
          formatType: (params) => {
            if (params == 0) {
              return "warning";
              return "danger";
            } else if(params == 1) {
              return "info";
              return "warning";
            } else {
              return "null";
            }
@@ -315,6 +486,95 @@
    this.refreshTable()
  },
  methods: {
    getInsOrderRowId(row) {
      if (!row) {
        return ''
      }
      const currentId = row.enterOrderId || row.insOrderId || row.orderId || row.id
      return currentId ? String(currentId) : ''
    },
    getExistingInsOrderIds() {
      const ids = new Set()
      this.tableData.forEach(row => {
        ['insOrderId'].forEach(key => {
          if (row[key] !== undefined && row[key] !== null && row[key] !== '') {
            ids.add(String(row[key]))
          }
        })
      })
      return ids
    },
    isDisabledInsOrderRow(row) {
      const currentId = this.getInsOrderRowId(row)
      if (!currentId) {
        return false
      }
      return this.getExistingInsOrderIds().has(currentId)
    },
    insOrderSelectable(row) {
      return !this.isDisabledInsOrderRow(row)
    },
    insOrderRowClassName({ row }) {
      return this.isDisabledInsOrderRow(row) ? 'disabled-selection-row' : ''
    },
    resetInsOrderForm(){
      this.insOrderDataList = []
      this.lotBatchNo = null
      this.orderId = ''
      this.$nextTick(()=>{
        this.insOrderVisible = false
      })
    },
    openInsOrderDialog(){
      this.insOrderVisible = true
    },
    searchInsOrderList(){
      this.insOrderTableLoading = true
      const params = {
        updateBatchNo: this.lotBatchNo,
        isInspect: 1,
        ...this.insOrderPage
      }
      getIfsByAll(params).then(res => {
        this.insOrderTableLoading = false
        if (res.code === 200) {
          this.insOrderDataList = res.data.records
          this.insOrderPage.total = res.data.total
        }
      }).catch(err => {
        this.insOrderTableLoading = false
      })
    },
    insOrderPageination(page){
      this.insOrderPage.size = page.limit
      this.searchInsOrderList()
    },
    selectMethod(val){
      if (!val || val.length === 0) {
        this.orderId = ''
        return
      }
      const currentRow = val[val.length - 1]
      this.orderId = this.getInsOrderRowId(currentRow)
      if (val.length > 1 && this.$refs.insOrderTable && this.$refs.insOrderTable.$refs.multipleTable) {
        this.$refs.insOrderTable.$refs.multipleTable.clearSelection()
        this.$refs.insOrderTable.$refs.multipleTable.toggleRowSelection(currentRow, true)
      }
    },
    //打开新增不合格处理弹框
    openAddUnqualifiedHandlerView(){
      if(!this.orderId){
        this.$message.warning("请选择一条订单记录")
        return;
      }
      this.insOrderVisible = false
      this.unPassDialog = true;
      this.$nextTick(() => {
        this.$refs.unPassDialog.getInsOrder('add');
      });
    },
    exportUnqualifiedHandler(){
      this.exportLoading = true
      const newEntity = { ...this.entity }
@@ -433,3 +693,10 @@
  }
};
</script>
<style scoped>
.capacity-scope >>> .disabled-selection-row td {
  background-color: #f5f7fa !important;
  color: #c0c4cc;
}
</style>
src/views/business/unpass/index.vue
ÎļþÒÑɾ³ý
src/views/performance/competency/index.vue
@@ -213,12 +213,6 @@
        this.levelDictList = response.data;
      });
    },
    getTableHeader() {
      listConfig({ isEnable: true }).then((response) => {
        this.tableHeaderList = this.handleTree(response.data, "id");
        this.scheduleTableLayout()
      });
    },
    /** æŸ¥è¯¢åˆ—表 */
    getList() {
      this.loading = true
src/views/performance/manHour/workTimeConfig.vue
@@ -29,7 +29,7 @@
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 290px)'"
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="50"
        :page="page" @pagination="pagination"></lims-table>
    </div>
    <!-- æ–°å¢ž/编辑 -->
src/views/performance/manHour/workTimeManagement.vue
@@ -56,11 +56,11 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
                  key="tableData" :height="'calc(100vh - 330px)'"
                  key="tableData" :height="90"
                  :isSelection="true" v-if="currentTable == 'ValueTable0'"
                  @pagination="pagination" :handleSelectionChange="handleSelectionChange"></lims-table>
      <lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading"
                  key="tableData0" :height="'calc(100vh - 330px)'"
                  key="tableData0" :height="90"
                  v-if="currentTable == 'ValueTable1'" @pagination="pagination0"></lims-table>
    </div>
    <el-dialog :before-close="handleClose" :title="formData.id ? '编辑' : '录入数据'" :visible.sync="addVisible"
src/views/performance/manHour/workTimeStatistics.vue
@@ -35,15 +35,6 @@
          </el-form>
        </div>
      </div>
<!--      <limsTable-->
<!--        :column="tableColumn"-->
<!--        :table-data="tableData"-->
<!--        :table-loading="tableLoading"-->
<!--        :page="page"-->
<!--        :height="'calc(100vh - 290px)'"-->
<!--        @pagination="pagination"-->
<!--      >-->
<!--      </limsTable>-->
      <el-table
        :data="tableData"
        v-loading="tableLoading"
src/views/performance/rewardAndPunishment/index.vue
@@ -95,7 +95,7 @@
        }"
        :cell-style="{ textAlign: 'center' }"
        border
        height="66.5vh"
        :height="'calc( 100vh - 240px)'"
        style="width: 100%"
      >
        <el-table-column label="序号" type="index" width="80"></el-table-column>
@@ -219,7 +219,7 @@
            <el-col :span="12">
              <el-form-item label="员工姓名" prop="userId">
                <el-select
                  :disabled="form.id == null"
                  :disabled="form.id && form.id+''!==''"
                  v-model="form.userId"
                  placeholder="请选择员工姓名"
                  size="small"
@@ -506,7 +506,6 @@
      const index = this.responsibleOptions.findIndex(
        (item) => item.id === val
      );
      console.log(val, index);
      if (index > -1) {
        this.form.userName = this.responsibleOptions[index].name;
        this.form.account = this.responsibleOptions[index].account;
src/views/standard/model/index.vue
@@ -17,7 +17,7 @@
      </div>
    </div>
    <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
      :height="'calc(100vh - 250px)'" @pagination="pagination"></lims-table>
       @pagination="pagination"></lims-table>
    <el-dialog :before-close="isClose" :close-on-click-modal="false" :close-on-press-escape="false"
      :visible.sync="isShow" title="模板编制" width="85%">
      <div v-if="isShow" style="width: 100%; height: 82vh; overflow: auto">
src/views/statisticalCharts/inspectionItemWarning/index.vue
@@ -2,7 +2,7 @@
  <div class="app-container">
    <div>
      <lims-table :tableData="tableData" :column="column"
                  :height="'calc(100vh - 500px)'" @pagination="pagination"
                   @pagination="pagination"
                  :rowClick="rowClick"
                  :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
src/views/statisticalCharts/itemInspectionAnalysis/index.vue
@@ -50,7 +50,7 @@
              <el-button size="small" type="primary" @click="openShowData">查看数据分析</el-button>
            </div>
            <lims-table :tableData="editTableData" :column="editColumn"
                        height="400" key="tableData" :isSelection="true"
                        :height="400" key="tableData" :isSelection="true"
                        :handleSelectionChange="handleSelectionChange"
                        :tableLoading="editLoading"></lims-table>
          </div>
src/views/statisticalCharts/qualificationRateStatistics/index.vue
@@ -89,7 +89,7 @@
            </el-button>
          </div>
          <lims-table :tableData="tableData" :column="tableColumn" :tableLoading="tableLoading"
            :height="'calc(40vh - 40px)'" :show-summary="true" :summary-method="getSummaries"></lims-table>
            :height="550" :show-summary="true" :summary-method="getSummaries"></lims-table>
        </div>
      </el-col>
    </el-row>
src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -56,13 +56,13 @@
<!--      æ£€éªŒé¡¹ç›®å‚数表格-->
      <div class="table" v-if="radio===0">
        <lims-table :tableData="tableData" :column="column" key="tableData"
                    @pagination="pagination" :height="'calc(100vh - 290px)'"
                    @pagination="pagination" :height="50"
                    :page="page" :tableLoading="tableLoading"></lims-table>
      </div>
<!--      æ£€éªŒå¯¹è±¡è¡¨æ ¼-->
      <div class="table" v-if="radio===1">
        <lims-table :tableData="testObjectTableData" :column="testObjectColumn" key="testObjectTableData"
                    @pagination="pagination" :height="'calc(100vh - 290px)'"
                    @pagination="pagination" :height="50"
                    :page="testObjectPage" :tableLoading="tableLoading"></lims-table>
      </div>
    </div>
src/views/structural/capabilityAndLaboratory/laboratory/index.vue
@@ -32,7 +32,7 @@
    </div>
    <div v-if="radio === 0">
      <lims-table :tableData="tableData" :column="column" :isSelection="true"
        :handleSelectionChange="handleSelectionChange" @pagination="pagination" :height="'calc(100vh - 300px)'"
        :handleSelectionChange="handleSelectionChange" @pagination="pagination" :height="50"
        :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <div class="table" v-if="radio === 1" v-loading="pageLoading" @scroll="scrollFn">
src/views/structural/premises/index.vue
@@ -48,7 +48,6 @@
      <lims-table
        :tableData="tableData"
        :column="column"
        :height="'calc(100vh - 250px)'"
        @pagination="pagination"
        :page="page"
        :tableLoading="tableLoading"