From 1946fb936d68fafa616310d4a7e453b6b7381cf8 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 24 三月 2025 15:29:27 +0800
Subject: [PATCH] 合并装备修改
---
src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue | 101 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 79 insertions(+), 22 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
index 6cdd361..e1cbdb1 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
@@ -18,7 +18,7 @@
</div>
</div>
<lims-table :tableData="yearTableData" :column="yearColumnData" :page="yearPage" :tableLoading="yearLoading"
- height="40vh" @pagination="pagination" :rowClick="rowClick" key="yearTableData"></lims-table>
+ :height="'calc(100vh - 34em)'" @pagination="pagination" :rowClick="rowClick" key="yearTableData"></lims-table>
</div>
<div style="margin-top: 20px">
<div style="display: flex;justify-content: space-between;">
@@ -39,7 +39,7 @@
</div>
</div>
<lims-table :tableData="yearDetailTableData" :column="yearDetailColumnData" :page="yearDetailPage"
- :tableLoading="yearDetailLoading" height="40vh" @pagination="pagination1"
+ :tableLoading="yearDetailLoading" :height="'calc(100vh - 34em)'" @pagination="pagination1" ref="yearDetailTableData"
key="yearDetailTableData"></lims-table>
</div>
<!--鏂板淇敼寮规-->
@@ -47,7 +47,7 @@
@closeDia="closeDia"></detail-form-dialog>
<!--瀹炴柦娴佺▼寮规-->
<carry-out-dialog v-if="carryOutDia" ref="carryOutDia" :qualityMonitorId="qualityMonitorId"
- @closeDia="closeCarryOutDia"></carry-out-dialog>
+ @closeCarryOutDia="closeCarryOutDia"></carry-out-dialog>
<!--璇勪环娴佺▼寮规-->
<evaluate-dialog v-if="evaluateDialog" ref="evaluateDialog" @closeEvaDia="closeEvaDia"></evaluate-dialog>
<el-dialog :visible.sync="examineDialog" title="瀹℃牳" width="30%" @close="closeExamineDia">
@@ -196,20 +196,20 @@
{
label: '璁″垝鍚嶇О',
prop: 'monitorName',
- minWidth: '150px'
+ width: '150px'
}, {
label: '缂栧埗浜�',
prop: 'writeName',
- minWidth: '100'
+ width: '100'
}, {
label: '缂栧埗鏃ユ湡',
prop: 'writeTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'tag',
label: '瀹℃牳鐘舵��',
prop: 'examineStatus',
- minWidth: '100',
+ width: '100',
formatData: (params) => {
if (params === 0) {
return '涓嶉�氳繃';
@@ -231,20 +231,20 @@
}, {
label: '瀹℃牳鍐呭',
prop: 'examineRemark',
- minWidth: '100'
+ width: '100'
}, {
label: '瀹℃牳浜�',
prop: 'examineName',
- minWidth: '100'
+ width: '100'
}, {
label: '瀹℃牳鏃ユ湡',
prop: 'examineTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'tag',
label: '鎵瑰噯鐘舵��',
prop: 'ratifyStatus',
- minWidth: '100',
+ width: '100',
formatData: (params) => {
if (params === 0) {
return '涓嶆壒鍑�';
@@ -266,18 +266,17 @@
}, {
label: '鎵瑰噯鍐呭',
prop: 'ratifyRemark',
- minWidth: '100'
+ width: '100'
}, {
label: '鎵瑰噯浜�',
prop: 'ratifyName',
- minWidth: '100'
+ width: '100'
}, {
label: '鎵瑰噯鏃ユ湡',
prop: 'ratifyTime',
- minWidth: '160'
+ width: '160'
}, {
dataType: 'action',
- minWidth: '190',
label: '鎿嶄綔',
fixed: 'right',
operation: [
@@ -355,30 +354,87 @@
}, {
label: '璁″垝寮�灞曟椂闂�',
prop: 'plannedTime',
- minWidth: '150px'
+ width: '150px'
}, {
label: '鐩戞帶椤圭洰',
prop: 'monitorProject',
- minWidth: '150px'
+ width: '150px'
}, {
label: '鍙傚姞鍗曚綅锛堜汉鍛橈級',
prop: 'participant',
- minWidth: '150px'
+ width: '190px'
}, {
label: '棰勭畻锛堝厓锛�',
prop: 'budget',
- minWidth: '150px'
+ width: '150px'
}, {
label: '缁勭粐浜哄憳',
prop: 'organization',
- minWidth: '150px'
+ width: '150px'
}, {
label: '鐩戞帶鏂瑰紡',
prop: 'monitorWay',
- minWidth: '150px'
+ width: '150px'
+ },{
+ dataType: 'tag',
+ label: '瀹炴柦鐘舵��',
+ prop: 'detailsRatifyStatus',
+ width: '100',
+ formatData: (params) => {
+ if (params === 0) {
+ return '鏈紑濮�';
+ } else if (params === 1) {
+ return '寰呮壒鍑�';
+ } else if (params === 2) {
+ return '宸叉壒鍑�';
+ } else {
+ return null;
+ }
+ },
+ formatType: (params) => {
+ if (params === 0) {
+ return '';
+ } else if (params === 1) {
+ return 'warning';
+ } else if (params === 2) {
+ return 'success';
+ } else {
+ return null;
+ }
+ }
+ },{
+ dataType: 'tag',
+ label: '璇勪环鐘舵��',
+ prop: 'evaluateStatus',
+ width: '100',
+ formatData: (params) => {
+ if (params === 0) {
+ return '鏈紑濮�';
+ } else if (params === 1) {
+ return '寰呰瘎浠�';
+ } else if (params === 2) {
+ return '寰呮壒鍑�';
+ } else if (params === 3) {
+ return '宸叉壒鍑�';
+ } else {
+ return null;
+ }
+ },
+ formatType: (params) => {
+ if (params === 0) {
+ return '';
+ } else if (params === 1) {
+ return 'warning';
+ } else if (params === 2) {
+ return 'info';
+ } else if (params === 3) {
+ return 'success';
+ } else {
+ return null;
+ }
+ }
}, {
dataType: 'action',
- width: '280',
label: '鎿嶄綔',
fixed: 'right',
operation: [
@@ -661,6 +717,7 @@
this.yearDetailLoading = false
this.yearDetailTableData = res.data.records
this.yearDetailPage.total = res.data.total
+ this.$refs.yearDetailTableData.$refs.multipleTable.doLayout()
}).catch(err => {
console.log('err---', err);
this.yearDetailLoading = false
--
Gitblit v1.9.3