From 3115fcc80036ec4bfe3a2cd1128c5fdc82a01f42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 28 四月 2026 16:38:27 +0800
Subject: [PATCH] limsTable表格自适应高度&手动下单调整
---
src/views/CNAS/personnel/personnelInfo/index.vue | 7
src/views/structural/premises/index.vue | 1
src/views/CNAS/process/disposal/sampleDisposal/index.vue | 4
src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue | 2
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 4
src/views/CNAS/resourceDemand/standardMaterial/index.vue | 2
src/views/CNAS/systemManagement/documentControl/components/FileList.vue | 2
src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue | 2
src/views/business/productOrder/index.vue | 2
src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue | 2
src/views/CNAS/personnel/personnelInfo/tabs/mandate.vue | 3
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 4
src/views/business/inspectionTask/index.vue | 11
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue | 4
src/views/CNAS/process/disposal/sampleReceipt/index.vue | 2
src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue | 2
src/views/CNAS/process/uncertainty/index.vue | 2
src/views/structural/capabilityAndLaboratory/laboratory/index.vue | 2
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue | 2
src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue | 13
src/views/business/unpass/index-manage.vue | 277 +++++++++++++++++
src/views/structural/capabilityAndLaboratory/capability/index.vue | 4
src/views/business/productSamplingInfo/index.vue | 4
src/components/Table/lims-table.vue | 70 +++
src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue | 2
src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue | 2
src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue | 4
src/views/CNAS/personnel/personnelInfo/tabs/communicate.vue | 2
src/views/business/rawMaterialInspection/index.vue | 15
src/views/statisticalCharts/inspectionItemWarning/index.vue | 2
src/views/CNAS/personnel/personnelInfo/components/ViewRecord.vue | 2
src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue | 6
src/views/business/inspectionTask/inspection.vue | 30 -
src/views/CNAS/process/complaint/index.vue | 2
src/views/performance/manHour/workTimeManagement.vue | 4
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue | 2
src/views/performance/manHour/workTimeStatistics.vue | 9
src/views/CNAS/resourceDemand/device/component/equipmentMaintenance.vue | 2
src/views/CNAS/process/method/standardMethodsChange/component/ViewTestRecord.vue | 2
src/views/business/productOrder/components/addView.vue | 2
src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue | 2
src/views/business/outsourcingFinishProduct/index.vue | 8
src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue | 4
src/views/CNAS/resourceDemand/device/component/management.vue | 2
src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue | 24
src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue | 4
src/views/business/inspectionReview/index.vue | 2
src/views/CNAS/process/method/standardMethod/index.vue | 2
src/views/business/costStatistics/index.vue | 2
src/views/statisticalCharts/qualificationRateStatistics/index.vue | 2
src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue | 2
src/views/business/inspectionTask/components/EditInspectionItem.vue | 2
src/views/business/materialOrder/customsInspectionOrder.vue | 8
src/views/CNAS/externalService/supplierManage/index.vue | 2
src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue | 2
src/views/business/inspectionView/index.vue | 8
src/views/CNAS/process/ensureResults/managementReview/index.vue | 2
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue | 2
src/views/performance/rewardAndPunishment/index.vue | 5
src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue | 2
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue | 2
src/views/business/reportPreparation/index.vue | 2
src/views/CNAS/process/reportResults/index.vue | 2
src/views/CNAS/personnel/personnelInfo/components/Edit.vue | 2
src/views/business/costStatistics/components/viewInfoDia.vue | 2
src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue | 2
src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue | 4
src/views/business/materialOrder/index.vue | 17
src/views/CNAS/resourceDemand/device/component/borrow.vue | 2
src/views/standard/model/index.vue | 2
/dev/null | 136 --------
src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue | 2
src/views/business/productOrder/components/addOrder.vue | 136 +++++---
src/views/performance/competency/index.vue | 6
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 2
src/views/CNAS/process/method/standardMethodsChange/index.vue | 2
src/views/statisticalCharts/itemInspectionAnalysis/index.vue | 2
src/views/performance/manHour/workTimeConfig.vue | 2
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue | 2
79 files changed, 542 insertions(+), 388 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 6e3cec6..146e6ab 100644
--- a/src/components/Table/lims-table.vue
+++ b/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) => {
diff --git a/src/views/CNAS/externalService/supplierManage/index.vue b/src/views/CNAS/externalService/supplierManage/index.vue
index 35e2f1b..15decba 100644
--- a/src/views/CNAS/externalService/supplierManage/index.vue
+++ b/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>
diff --git a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
index af8e822..673eb55 100644
--- a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
+++ b/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>
diff --git a/src/views/CNAS/personnel/personnelInfo/components/ViewRecord.vue b/src/views/CNAS/personnel/personnelInfo/components/ViewRecord.vue
index e9938c7..2be9120 100644
--- a/src/views/CNAS/personnel/personnelInfo/components/ViewRecord.vue
+++ b/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>
diff --git a/src/views/CNAS/personnel/personnelInfo/index.vue b/src/views/CNAS/personnel/personnelInfo/index.vue
index c5a4ac2..bd7b0b1 100644
--- a/src/views/CNAS/personnel/personnelInfo/index.vue
+++ b/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 {
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/communicate.vue b/src/views/CNAS/personnel/personnelInfo/tabs/communicate.vue
index 186ee8e..a3724fc 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/communicate.vue
+++ b/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>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/mandate.vue b/src/views/CNAS/personnel/personnelInfo/tabs/mandate.vue
index 691970d..07dc9af 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/mandate.vue
+++ b/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: {
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
index 2dd7789..1eedf57 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
+++ b/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') {
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
index 0a7c9d5..4e4c7c5 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
+++ b/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">
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
index aac448d..8c08550 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
+++ b/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>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
index a003633..879336a 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
+++ b/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>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue b/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
deleted file mode 100644
index 408cbde..0000000
--- a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
+++ /dev/null
@@ -1,338 +0,0 @@
-<!-- 濂栨儵璁板綍 -->
-<template>
- <div>
- <div style="display: flex;justify-content: space-between">
- <div style="display: flex;">
- <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
- <span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">濮撳悕</span>
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="search.userName"
- @keyup.enter.native="getPersonnelTraining(departId)"></el-input>
- </div>
- <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
- <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">濂栨儵鏃ユ湡</span>
- <el-date-picker v-model="search.searchTimeList" :picker-options="pickerOptions" align="right" clearable
- @change="getPersonnelTraining(departId)" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" range-separator="鑷�"
- size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%" type="daterange" unlink-panels
- value-format="yyyy-MM-dd 00:00:00">
- </el-date-picker>
- </div>
- <div style="line-height: 30px;">
- <el-button size="mini" type="primary" @click="getPersonnelTraining(departId)">鏌ヨ</el-button>
- </div>
- </div>
- <div style="line-height: 30px;">
- <el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭</el-button>
- <el-button size="small" type="primary" @click="addRow">鏂板</el-button>
- </div>
- </div>
- <div class="table">
- <el-table :data="tableData" v-loading="tableLoading"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border height="66.5vh" style="width: 100%">
- <el-table-column label="搴忓彿" type="index" width="120">
- <template v-slot="scope">
- <span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鍛樺伐缂栧彿" min-width="180" prop="account">
- </el-table-column>
- <el-table-column label="濮撳悕" min-width="180" prop="userName">
- </el-table-column>
- <el-table-column label="濂栨儵绾у埆" min-width="180" prop="rewardPunishLevel">
- </el-table-column>
- <el-table-column label="濂栨儵鏃堕棿" min-width="180" prop="rewardPunishTime">
- </el-table-column>
- <el-table-column label="濂栨儵鍚嶇О" min-width="180" prop="rewardPunishName">
- </el-table-column>
- <el-table-column label="濂栨儵鍏蜂綋鍐呭" min-width="120" prop="rewardPunishContent">
- </el-table-column>
- <el-table-column label="濂栨儵鍗曚綅" min-width="180" prop="rewardPunishWorkUnit">
- </el-table-column>
- <el-table-column label="鍒涘缓浜�" min-width="180" prop="createUserName">
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
- <template v-slot="scope">
- <el-button size="small" type="text" @click="editForm(scope.row)">缂栬緫</el-button>
- <el-button size="small" type="text" style="color: #f56c6c" @click="deleteRow(scope.row)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]"
- :total="search.total" layout="->,total, sizes, prev, pager, next, jumper" background style="margin-top: 10px"
- @size-change="handleSizeChange" @current-change="handleCurrentChange">
- </el-pagination>
- </div>
- <el-dialog :visible.sync="dialogVisible" title="濂栨儵璁板綍" width="50%" @open="getUserList">
- <div style="height: 40vh">
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-col :span="12">
- <el-form-item label="鍛樺伐缂栧彿">
- <el-input v-model="form.account" disabled size="small"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍛樺伐濮撳悕" prop="userId">
- <el-select v-model="form.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%" value-key="id"
- @change="selectUserChange" :disabled="!isDepartment">
- <el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="濂栨儵绾у埆" prop="rewardPunishLevel">
- <el-input v-model="form.rewardPunishLevel" size="small"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="濂栨儵鍚嶇О" prop="rewardPunishName">
- <el-input v-model="form.rewardPunishName" size="small"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="濂栨儵鏃堕棿" prop="rewardPunishTime">
- <el-date-picker v-model="form.rewardPunishTime" format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鏃ユ湡"
- size="small" style="width: 100%" type="datetime" value-format="yyyy-MM-dd HH:mm:ss">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="濂栨儵鍗曚綅" prop="rewardPunishWorkUnit">
- <el-input v-model="form.rewardPunishWorkUnit" size="small"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="濂栨儵鍐呭">
- <el-input v-model="form.rewardPunishContent" :rows="2" size="small" type="textarea"></el-input>
- </el-form-item>
- </el-col>
- </el-form>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="saveOrUpdate">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import {
- addOrUpdateRewardPunishment, deleteRewardPunishment,
- rewardPunishmentExport,
- rewardPunishmentPage
-} from "@/api/cnas/personal/personRewardPunishmentRecord";
-import { selectUserCondition } from "@/api/system/user";
-import { delCustomById } from "@/api/system/customer";
-
-export default {
- props: {
- departId: {
- type: Number,
- default: () => {
- return null;
- }
- },
- isDepartment: {
- type: Boolean,
- default: false
- }
- },
- data() {
- return {
- tableData: [],
- tableLoading: false,
- search: {
- size: 20,
- current: 1,
- total: 0,
- userName: '',
- searchTimeList: []
- },
- form: {},
- dialogVisible: false,
- outLoading: false,
- pickerOptions: {
- shortcuts: [{
- text: '鏈�杩戜竴鍛�',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
- picker.$emit('pick', [start, end]);
- }
- }, {
- text: '鏈�杩戜竴涓湀',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
- picker.$emit('pick', [start, end]);
- }
- }, {
- text: '鏈�杩戜笁涓湀',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
- picker.$emit('pick', [start, end]);
- }
- }]
- },
- rules: {
- userId: [{
- required: true, message: '璇烽�夋嫨鍛樺伐', trigger: 'change'
- }],
- rewardPunishLevel: [{
- required: true, message: '璇疯緭鍏ュ鎯╃骇鍒�', trigger: 'blur'
- }],
- rewardPunishName: [{
- required: true, message: '璇疯緭鍏ュ鎯╁悕绉�', trigger: 'blur'
- }],
- rewardPunishTime: [{
- required: true, message: '璇疯緭鍏ュ鎯╂椂闂�', trigger: 'blur'
- }],
- rewardPunishWorkUnit: [{
- required: true, message: '璇疯緭鍏ュ鎯╁崟浣�', trigger: 'blur'
- }]
- },
- responsibleOptions: []
- };
- },
- mounted() {
- this.getPersonnelTraining(this.departId);
- this.getUserList();
- },
- methods: {
- handleSizeChange(val) {
- this.search.size = val
- this.getPersonnelTraining(this.departId);
- },
- handleCurrentChange(val) {
- this.search.current = val
- this.getPersonnelTraining(this.departId);
- },
- async getPersonnelTraining() {
- const params = {
- userId: this.isDepartment ? '' : this.departId,
- departmentId: this.isDepartment ? this.departId : '',
- current: this.search.curent,
- size: this.search.size,
- userName: this.search.userName,
- startTime: this.search.searchTimeList && this.search.searchTimeList[0],
- endTime: this.search.searchTimeList && this.search.searchTimeList[1],
- }
- this.tableLoading = true
- rewardPunishmentPage(params).then(res => {
- this.tableLoading = false
- this.tableData = res.data.records
- this.search.total = res.data.total
- }).catch(err => {
- this.tableLoading = false
- })
- },
- addRow() {
- this.dialogVisible = true
- if (!this.isDepartment) {
- this.form.userId = this.departId
- if (this.responsibleOptions.length > 0) {
- this.selectUserChange(this.form.userId)
- }
- }
- },
- handleDown() {
- this.outLoading = true
- rewardPunishmentExport({
- userId: this.isDepartment ? '' : this.departId,
- departmentId: this.isDepartment ? this.departId : '',
- userName: this.search.userName,
- startTime: this.search.searchTimeList && this.search.searchTimeList[0],
- endTime: this.search.searchTimeList && this.search.searchTimeList[1]
- }).then(res => {
- this.outLoading = false
- const blob = new Blob([res], {
- type: 'application/force-download'
- })
- this.$download.saveAs(blob, '濂栨儵璁板綍.xlsx')
- })
- },
- // 鑾峰彇璐熻矗浜轰俊鎭帴鍙�
- getUserList() {
- const params = {
- type: 2,
- departmentId: this.isDepartment ? this.departId : null
- };
- return selectUserCondition(params).then(res => {
- if (res.code == 200) {
- this.responsibleOptions = res.data;
- }
- });
- },
- selectUserChange(val) {
- const index = this.responsibleOptions.findIndex(item => item.id === val)
- if (index > -1) {
- this.form.userName = this.responsibleOptions[index].name
- this.form.account = this.responsibleOptions[index].account
- }
- },
- // 鎵撳紑琛ㄥ崟寮规
- editForm(row) {
- this.dialogVisible = true
- this.form = { ...row };
- },
- // 鎻愪氦琛ㄥ崟鏁版嵁
- saveOrUpdate() {
- this.$refs.form.validate(async (valid) => {
- if (valid) {
- addOrUpdateRewardPunishment(this.form).then(res => {
- this.dialogVisible = false
- this.$message.success("鎿嶄綔鎴愬姛")
- this.getPersonnelTraining(this.departId);
- })
- }
- })
- },
- deleteRow(row) {
- this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- deleteRewardPunishment({ id: row.id }).then(res => {
- if (res.code === 500) {
- return
- }
- this.$message.success('鍒犻櫎鎴愬姛')
- this.getPersonnelTraining(this.departId);
- }).catch(e => {
- this.$message.error('鍒犻櫎澶辫触')
- })
- }).catch(() => { })
-
- }
- },
- watch: {
- // 鐩戝惉鐐瑰嚮el-tree鐨勬暟鎹紝杩涜鏁版嵁鍒锋柊
- departId: {
- handler(newId, oldId) {
- this.getPersonnelTraining(newId);
- }
- },
- dialogVisible(newVal) {
- if (newVal === false) {
- this.form = {}
- this.$refs['form'].resetFields()
- }
- },
- responsibleOptions(val) {
- if (this.form.userId && val.length > 0) {
- this.selectUserChange(this.form.userId)
- }
- }
- }
-};
-</script>
-<style scoped>
-.dateTime>>>.el-form-item__content {
- width: 260px;
-}
-</style>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue b/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue
index 52d1c4b..5c871f0 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue
+++ b/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>
diff --git a/src/views/CNAS/process/complaint/index.vue b/src/views/CNAS/process/complaint/index.vue
index dad8264..2f7c30a 100644
--- a/src/views/CNAS/process/complaint/index.vue
+++ b/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">
diff --git a/src/views/CNAS/process/disposal/sampleDisposal/index.vue b/src/views/CNAS/process/disposal/sampleDisposal/index.vue
index 1cbcb06..19253f9 100644
--- a/src/views/CNAS/process/disposal/sampleDisposal/index.vue
+++ b/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>
diff --git a/src/views/CNAS/process/disposal/sampleReceipt/index.vue b/src/views/CNAS/process/disposal/sampleReceipt/index.vue
index 46ada41..a15d35a 100644
--- a/src/views/CNAS/process/disposal/sampleReceipt/index.vue
+++ b/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)">
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue
index eebccca..aeede79 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue
+++ b/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
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
index 0ae1168..cd76540 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
+++ b/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>
<!--鏂板淇敼寮规-->
diff --git a/src/views/CNAS/process/ensureResults/managementReview/index.vue b/src/views/CNAS/process/ensureResults/managementReview/index.vue
index 9e7a2a9..7219414 100644
--- a/src/views/CNAS/process/ensureResults/managementReview/index.vue
+++ b/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">
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
index 2bcb6aa..ed42c16 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
+++ b/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"
diff --git a/src/views/CNAS/process/method/standardMethod/index.vue b/src/views/CNAS/process/method/standardMethod/index.vue
index d07803f..f39c284 100644
--- a/src/views/CNAS/process/method/standardMethod/index.vue
+++ b/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">
diff --git a/src/views/CNAS/process/method/standardMethodsChange/component/ViewTestRecord.vue b/src/views/CNAS/process/method/standardMethodsChange/component/ViewTestRecord.vue
index e8cd69d..5dbea2d 100644
--- a/src/views/CNAS/process/method/standardMethodsChange/component/ViewTestRecord.vue
+++ b/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"
diff --git a/src/views/CNAS/process/method/standardMethodsChange/index.vue b/src/views/CNAS/process/method/standardMethodsChange/index.vue
index 9ecbf74..41f7793 100644
--- a/src/views/CNAS/process/method/standardMethodsChange/index.vue
+++ b/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>
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
index 955f69f..3e7a688 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
+++ b/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>
diff --git a/src/views/CNAS/process/reportResults/index.vue b/src/views/CNAS/process/reportResults/index.vue
index 88b1c7c..6b9f8ca 100644
--- a/src/views/CNAS/process/reportResults/index.vue
+++ b/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">
diff --git a/src/views/CNAS/process/uncertainty/index.vue b/src/views/CNAS/process/uncertainty/index.vue
index f09d6ac..9d6576c 100644
--- a/src/views/CNAS/process/uncertainty/index.vue
+++ b/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">
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 5f0165c..441c17e 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/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>
diff --git a/src/views/CNAS/resourceDemand/device/component/borrow.vue b/src/views/CNAS/resourceDemand/device/component/borrow.vue
index 4898f5f..ef62fa2 100644
--- a/src/views/CNAS/resourceDemand/device/component/borrow.vue
+++ b/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%">
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenance.vue b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenance.vue
index add36e0..8ddd7f6 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenance.vue
+++ b/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%">
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 928ab1c..2a1ff08 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/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"
diff --git a/src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue b/src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue
index d316543..255dc29 100644
--- a/src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue
+++ b/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"
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
index bfa51b8..c3968f5 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
+++ b/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"
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
index 05d5b6d..7a78e6c 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
+++ b/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"
diff --git a/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue b/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
index 6937c1f..38b775d 100644
--- a/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
+++ b/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>
diff --git a/src/views/CNAS/resourceDemand/standardMaterial/index.vue b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
index 4daf629..9cd3684 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/index.vue
+++ b/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>
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
index dc48446..1ca59e0 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
+++ b/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>
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 5028823..bed8a41 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/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>
diff --git a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
index 5c6b8da..38fed4d 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
+++ b/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>
diff --git a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
index 24b4063..9e8e26e 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
+++ b/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">
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
index a3205aa..222cd77 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
+++ b/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">
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue b/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
index 2a79b9a..a378b8e 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
+++ b/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"
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
index 181d5a7..b912a9d 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
+++ b/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>
diff --git a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue b/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
index 59cadd7..c3bd356 100644
--- a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
+++ b/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">
diff --git a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue b/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
index b969324..58b4f08 100644
--- a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
+++ b/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>
diff --git a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
index aabb2dc..0865dfe 100644
--- a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
+++ b/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>
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index 1554a54..d2dead0 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/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>
<!-- 璇︽儏/涓嬭浇/瀹℃牳 -->
diff --git a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
index 85fc6b4..5cd65af 100644
--- a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
+++ b/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>
diff --git a/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
index 63aba6d..5dc5df4 100644
--- a/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
+++ b/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>
diff --git a/src/views/business/costStatistics/components/viewInfoDia.vue b/src/views/business/costStatistics/components/viewInfoDia.vue
index 19d5876..fd26238 100644
--- a/src/views/business/costStatistics/components/viewInfoDia.vue
+++ b/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>
diff --git a/src/views/business/costStatistics/index.vue b/src/views/business/costStatistics/index.vue
index 4b34fe2..f65be51 100644
--- a/src/views/business/costStatistics/index.vue
+++ b/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>
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index 7002780..e6bba5a 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/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>
<!--鎶ュ憡鏌ョ湅-->
diff --git a/src/views/business/inspectionTask/components/EditInspectionItem.vue b/src/views/business/inspectionTask/components/EditInspectionItem.vue
index fc13ce9..844676e 100644
--- a/src/views/business/inspectionTask/components/EditInspectionItem.vue
+++ b/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>
diff --git a/src/views/business/inspectionTask/components/viewManHourDia.vue b/src/views/business/inspectionTask/components/viewManHourDia.vue
deleted file mode 100644
index 54268fd..0000000
--- a/src/views/business/inspectionTask/components/viewManHourDia.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
- <div>
- <el-dialog
- :visible.sync="editInspectionDia"
- title="鏌ョ湅宸ユ椂"
- width="80%"
- @close="editInspectionDia = false"
- >
- <div>
- <el-form :model="entity" :inline="true">
- <el-form-item label="妫�楠岄」" prop="outputWorkTime">
- <el-input v-model="entity.inspectionItem" clearable size="small"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button size="small" type="primary" @click="getList0">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- </div>
- <lims-table :tableData="tableData0" :column="column0"
- :page="page0" :tableLoading="tableLoading"
- height="500" @pagination="pagination0"></lims-table>
- <span slot="footer" class="dialog-footer" v-if="insState == 99">
- <el-button @click="editInspectionDia = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="handleSubmit">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog :visible.sync="editAskDia" title="淇敼" width="50%">
- <el-form ref="form" :model="editForm" label-width="100px">
- <el-form-item label="妫�娴嬩汉" prop="name">
- <el-select v-model="editForm.name" clearable size="small">
- <el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浜ч噺宸ユ椂" prop="outputWorkTime">
- <el-input v-model="editForm.outputWorkTime" clearable size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏃ユ湡" prop="dateTime">
- <el-date-picker
- v-model="editForm.dateTime"
- placeholder="閫夋嫨鏃ユ湡"
- size="small"
- style="width: 100%;"
- type="date"
- format="yyyy-MM-dd"
- value-format="yyyy-MM-dd">
- </el-date-picker>
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="editAskDia = false">鍙� 娑�</el-button>
- <el-button
- :loading="handleEditLoading"
- type="primary"
- @click="handleEdit"
- >纭� 瀹�</el-button
- >
- </span>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import limsTable from "@/components/Table/lims-table.vue";
-import {
- getWorkingHoursByOrderId, updateWorkingHours,
-} from "@/api/business/inspectionTask.js";
-import {selectUserCondition} from "@/api/system/user";
-export default {
- name: "EditInspectionItem",
- // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { limsTable },
- data() {
- // 杩欓噷瀛樻斁鏁版嵁
- return {
- editInspectionDia: false,
- entity: {
- orderId: 0,
- inspectionItem: ''
- },
- insState: 0,
- tableData0: [],
- tableLoading: false,
- column0: [
- { label: "妫�娴嬩汉", prop: "name" },
- { label: "妫�娴嬮」鍒嗙被", prop: "inspectionItemClass" },
- { label: "妫�娴嬮」", prop: "inspectionItem", width: 110 },
- { label: "妫�娴嬪瓙椤�", prop: "inspectionItemSubclass", width: 110 },
- { label: "鏍峰搧缂栧彿", prop: "sample", width: 160 },
- { label: "濮旀墭鍗曞彿", prop: "orderNo", width: 160 },
- { label: "鐢电紗鏍囪瘑", prop: "cableTag" },
- { label: "浜ч噺宸ユ椂", prop: "outputWorkTime" },
- { label: "宸ユ椂鍒嗙粍", prop: "manHourGroup" },
- { label: "鍗曚环", prop: "price" },
- { label: "鏃ユ湡", prop: "dateTime" },
- { label: "鍛ㄦ", prop: "week" },
- { label: "鏄熸湡", prop: "weekDay" },
- {
- dataType: "action",
- width: "80px",
- label: "鎿嶄綔",
- fixed: "right",
- operation: [
- {
- name: "缂栬緫",
- type: "text",
- clickFun: (row) => {
- this.editIns(row);
- },
- disabled: (row) => {
- return this.insState == 3 || this.insState == 5 || this.insState == 99
- },
- },
- ],
- },
- ],
- page0: {
- total: 0,
- size: 10,
- current: 1,
- },
- editAskDia: false,
- editForm: {
- id: "",
- name: "",
- outputWorkTime: "",
- inspectionValueType: "",
- },
- handleEditLoading: false,
- inspectionValueType: [],
- responsibleOptions: []
- };
- },
- mounted() {
-
- },
- // 鏂规硶闆嗗悎
- methods: {
- showDialog(id, insState) {
- this.insState = insState
- this.editInspectionDia = true;
- this.entity.orderId = id;
- this.getList0();
- },
- getList0() {
- this.tableLoading = true;
- getWorkingHoursByOrderId({ ...this.entity, ...this.page0 })
- .then((res) => {
- this.tableLoading = false;
- if (res.code === 200) {
- this.tableData0 = res.data.records;
- this.page0.total = res.data.total;
- }
- })
- .catch((err) => {
- this.tableLoading = false;
- });
- },
- // 淇敼寮规
- editIns(row) {
- this.editAskDia = true;
- this.editForm = { ...row };
- this.getUserList()
- },
- // 鎻愪氦淇敼
- handleEdit() {
- this.handleEditLoading = true;
- updateWorkingHours({...this.editForm})
- .then((res) => {
- this.handleEditLoading = false;
- this.$message.success("淇敼鎴愬姛");
- this.editAskDia = false;
- this.getList0();
- })
- .catch(() => {
- this.handleEditLoading = false;
- });
- },
- // 纭宸ユ椂
- handleSubmit () {
- this.editInspectionDia = false;
- this.$emit("submit");
- },
- pagination0({ page, limit }) {
- this.page0.current = page;
- this.page0.size = limit;
- this.getList0();
- },
- // 鑾峰彇璐熻矗浜轰俊鎭帴鍙�
- getUserList() {
- selectUserCondition({ type: 1 }).then((res) => {
- this.responsibleOptions = res.data;
- })
- }
- },
-};
-</script>
-
-<style scoped>
-.pagination {
- display: flex;
- justify-content: space-between;
-}
-</style>
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 36e2b5a..0683654 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/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) {
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 5de1a13..84f0671 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/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;
diff --git a/src/views/business/inspectionView/index.vue b/src/views/business/inspectionView/index.vue
index c7f43c5..95ecd98 100644
--- a/src/views/business/inspectionView/index.vue
+++ b/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;
diff --git a/src/views/business/materialOrder/customsInspectionOrder.vue b/src/views/business/materialOrder/customsInspectionOrder.vue
index e8aee87..64d350e 100644
--- a/src/views/business/materialOrder/customsInspectionOrder.vue
+++ b/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) {
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 76591cd..a74830f 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/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>
diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index c829dac..da266f7 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/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>
diff --git a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
index bfbebb4..7cde875 100644
--- a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
+++ b/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>
diff --git a/src/views/business/outsourcingFinishProduct/index.vue b/src/views/business/outsourcingFinishProduct/index.vue
index b919741..9ddfc18 100644
--- a/src/views/business/outsourcingFinishProduct/index.vue
+++ b/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>
diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index 47d61ec..e391217 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/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()
diff --git a/src/views/business/productOrder/components/addView.vue b/src/views/business/productOrder/components/addView.vue
index 44a252a..033d2e7 100644
--- a/src/views/business/productOrder/components/addView.vue
+++ b/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">
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index b674f14..94005be 100644
--- a/src/views/business/productOrder/index.vue
+++ b/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>
diff --git a/src/views/business/productSamplingInfo/index.vue b/src/views/business/productSamplingInfo/index.vue
index 9cf3667..8575479 100644
--- a/src/views/business/productSamplingInfo/index.vue
+++ b/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="骞村害鎶芥牱"
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index dfe0014..c3d95ed 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/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'
}
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 80b16b4..d491a05 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/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>
diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index 76b32c0..6b08928 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/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>
diff --git a/src/views/business/unpass/index.vue b/src/views/business/unpass/index.vue
deleted file mode 100644
index 347357d..0000000
--- a/src/views/business/unpass/index.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
- <div class="capacity-scope">
- <div class="search">
- <div>
- <el-form :model="entity" ref="entity" size="small" :inline="true">
- <el-form-item label="瑙勬牸鍨嬪彿" prop="model">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.model"
- @keyup.enter.native="refreshTable()"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧鍚嶇О" prop="sample">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.sample"
- @keyup.enter.native="refreshTable()"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
- <el-button size="mini" @click="refresh">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- </div>
- </div>
- <div>
- <lims-table :tableData="tableData" :column="column"
- :height="'calc(100vh - 250px)'" @pagination="pagination"
- :page="page" :tableLoading="tableLoading"></lims-table>
- </div>
- </div>
-</template>
-
-<script>
-import limsTable from "@/components/Table/lims-table.vue";
-import {pageInsUnPass} from "@/api/business/unpass";
-
-export default {
- name: 'Unpass',
- components: {limsTable},
- data() {
- return {
- entity: {
- sample: null,
- model: null,
- },
- tableData: [],
- tableLoading: false,
- column: [
- { label: '缂栧彿', prop: 'no' },
- // {
- // label: "OA瀹℃牳鐘舵��",
- // prop: "oaState",
- // width: "100px",
- // dataType: "tag",
- // formatData: (params) => {
- // if (params == 0) {
- // return "鍚�";
- // } else {
- // return "鏄�";
- // }
- // },
- // formatType: (params) => {
- // if (params == 0) {
- // return "danger";
- // } else {
- // return "primary";
- // }
- // },
- // },
- {
- dataType: 'action',
- fixed: 'right',
- label: '鎿嶄綔',
- width: '180px',
- operation: [
- {
- name: '缂栬緫',
- type: 'text',
- clickFun: (row) => {
- this.openAdd('edit', row);
- },
- },
- {
- name: '鍒犻櫎',
- type: 'text',
- clickFun: (row) => {
- this.delete(row);
- },
- },
- {
- name: '鍗扮珷绠＄悊',
- type: 'text',
- clickFun: (row) => {
- this.fileManagement(row);
- },
- },
- ]
- }
- ],
- page: {
- total: 0,
- size: 20,
- current: 1
- },
- }
- },
- mounted() {
- this.refreshTable()
- },
- methods :{
- refreshTable() {
- this.tableLoading = true
- pageInsUnPass({ ...this.page, ...this.entity }).then(res => {
- this.tableLoading = false
- this.tableData = res.data.records
- this.page.total = res.data.total
- }).catch(err => {
- this.tableLoading = false
- })
- },
- // 閲嶇疆
- refresh() {
- this.resetForm('entity')
- this.refreshTable()
- },
- // 鍒嗛〉鍒囨崲
- pagination(page) {
- this.page.size = page.limit
- this.refreshTable()
- },
- }
-}
-</script>
-<style scoped>
-.search {
- height: 46px;
- display: flex;
- justify-content: space-between;
-}
-</style>
diff --git a/src/views/performance/competency/index.vue b/src/views/performance/competency/index.vue
index e5476d5..61307de 100644
--- a/src/views/performance/competency/index.vue
+++ b/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
diff --git a/src/views/performance/manHour/workTimeConfig.vue b/src/views/performance/manHour/workTimeConfig.vue
index d02ceba..74492d8 100644
--- a/src/views/performance/manHour/workTimeConfig.vue
+++ b/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>
<!-- 鏂板/缂栬緫 -->
diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue
index f709c4f..437c71f 100644
--- a/src/views/performance/manHour/workTimeManagement.vue
+++ b/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"
diff --git a/src/views/performance/manHour/workTimeStatistics.vue b/src/views/performance/manHour/workTimeStatistics.vue
index 2bd920d..c93d009 100644
--- a/src/views/performance/manHour/workTimeStatistics.vue
+++ b/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"
diff --git a/src/views/performance/rewardAndPunishment/index.vue b/src/views/performance/rewardAndPunishment/index.vue
index 2d61aaf..a1bfbf6 100644
--- a/src/views/performance/rewardAndPunishment/index.vue
+++ b/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;
diff --git a/src/views/standard/model/index.vue b/src/views/standard/model/index.vue
index 6d3ce8f..4454b6b 100644
--- a/src/views/standard/model/index.vue
+++ b/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">
diff --git a/src/views/statisticalCharts/inspectionItemWarning/index.vue b/src/views/statisticalCharts/inspectionItemWarning/index.vue
index 22585f5..f366b29 100644
--- a/src/views/statisticalCharts/inspectionItemWarning/index.vue
+++ b/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>
diff --git a/src/views/statisticalCharts/itemInspectionAnalysis/index.vue b/src/views/statisticalCharts/itemInspectionAnalysis/index.vue
index ff7e1e5..a1414e9 100644
--- a/src/views/statisticalCharts/itemInspectionAnalysis/index.vue
+++ b/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>
diff --git a/src/views/statisticalCharts/qualificationRateStatistics/index.vue b/src/views/statisticalCharts/qualificationRateStatistics/index.vue
index bc5ab84..e57131f 100644
--- a/src/views/statisticalCharts/qualificationRateStatistics/index.vue
+++ b/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>
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 19f9318..b64df31 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/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>
diff --git a/src/views/structural/capabilityAndLaboratory/laboratory/index.vue b/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
index 9a14304..196144f 100644
--- a/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
+++ b/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">
diff --git a/src/views/structural/premises/index.vue b/src/views/structural/premises/index.vue
index be8d4c2..bdf4e4b 100644
--- a/src/views/structural/premises/index.vue
+++ b/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"
--
Gitblit v1.9.3