From 71759ed739a02dbf24f61bf1e57662f674129d9f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 24 三月 2025 14:59:19 +0800
Subject: [PATCH] 质量监控计划,质量监督计划明细表格-添加流程展示状态
---
src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue | 4
src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue | 60 +++++++++++++++++++
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue | 83 +++++++++++++++++++++++++++
3 files changed, 143 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
index d503422..e1cbdb1 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
@@ -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">
@@ -375,6 +375,64 @@
label: '鐩戞帶鏂瑰紡',
prop: 'monitorWay',
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',
label: '鎿嶄綔',
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
index 7672cfe..4a5424e 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
@@ -10,12 +10,12 @@
<el-date-picker
v-model="form.superviseTime"
clearable
- format="yyyy-MM"
+ format="yyyy.M"
placeholder="閫夋嫨鏃ユ湡"
size="small"
style="width: 100%"
type="month"
- value-format="yyyy-MM">
+ value-format="yyyy.M">
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
index 80bc235..719c8be 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
@@ -58,7 +58,7 @@
@closeProcessingDia="closeProcessingDia"></processing-sheet>
<!--绾犳澶勭悊娴佺▼寮规-->
<rectify-dialog-new v-if="rectifyDia" ref="rectifyDia" :superviseId="superviseId"
- @closeProcessingDia="closeRectifyDia"></rectify-dialog-new>
+ @closeRectifyDia="closeRectifyDia"></rectify-dialog-new>
<el-dialog :visible.sync="ratifyDialog" title="鎵瑰噯" width="30%" @close="closeRatifyDia">
<span>
鎵瑰噯澶囨敞锛�
@@ -271,6 +271,87 @@
label: '鐩戠潱鍘熷洜',
prop: 'superviseReason',
width: '150px'
+ },{
+ dataType: 'tag',
+ label: '璁板綍鐘舵��',
+ prop: 'recordStatus',
+ 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: 'accordingStatus',
+ 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: 'correctStatus',
+ 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;
+ }
+ }
}, {
label: '澶囨敞',
prop: 'remark',
--
Gitblit v1.9.3