From a8173ac7be83d3e5d518b6f8b38da233d099d863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Thu, 11 Jan 2024 10:15:11 +0800 Subject: [PATCH] fix 80304 --- src/enums/commonEnums.js | 11 +++++++++ .../inconformityItem/InconformityItemList.vue | 24 ++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 84e336fa..329765b5 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -544,3 +544,14 @@ export const InspectStatus = { completed: { text: '已完成', value: '3' }, delay: { text: '拖期', value: '4' } } + +// 未符合项整改状态 +export const InconformityItemState = { + toBeRectified: { text: '待整改', value: '1' }, + rectifying: { text: '整改中', value: '2' }, + approving: { text: '审批中', value: '3' }, + done: { text: '已完成', value: '4' }, + closed: { text: '已关闭', value: '5' }, + caution: { text: '警示', value: '6' }, + exceedTheTimeLimit: { text: '超期', value: '7' } +} diff --git a/src/views/projectLibrary/inconformityItem/InconformityItemList.vue b/src/views/projectLibrary/inconformityItem/InconformityItemList.vue index cd26ddd4..d57f9173 100644 --- a/src/views/projectLibrary/inconformityItem/InconformityItemList.vue +++ b/src/views/projectLibrary/inconformityItem/InconformityItemList.vue @@ -115,6 +115,17 @@ + + + @@ -131,7 +142,7 @@ import JTable from '../../../components/jero/JTable' import InconformityItemModal from './modules/InconformityItemModal' import { batchCloseInconformityItem } from '../../../api/projectLibraryApi' import InconformityItemDetailModal from './modules/InconformityItemDetailModal' -import { StandardSource } from '../../../enums/commonEnums' +import { StandardSource, InconformityItemState } from '../../../enums/commonEnums' import { mapGetters } from 'vuex' import { filterObj } from '../../../utils/util' @@ -150,6 +161,7 @@ export default { }, data () { return { + InconformityItemState, columns: [ // 工作令编号 { @@ -214,7 +226,8 @@ export default { { dataIndex: 'state_dictText', title: this.$t('workCenter.esInspectionProcess.rectificationStatus'), - width: 120 + width: 120, + scopedSlots: { customRender: 'state' } }, // 操作 { @@ -332,5 +345,10 @@ export default {