From 841cd06113df81c7b69b8fbb0e84972e334794ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Mon, 15 Jan 2024 11:08:17 +0800 Subject: [PATCH] fix 80566 --- src/components/ZExpandTable.vue | 6 +++++ src/main.js | 4 +++ .../NoMatchTrackingProcess.vue | 25 ++++++++++++------- .../ProjectComplianceEvaluationProcess.vue | 13 +++++++--- .../StandardConsultationProcess.vue | 6 +++-- .../StandardProcurementProcess.vue | 13 +++++++--- 6 files changed, 49 insertions(+), 18 deletions(-) diff --git a/src/components/ZExpandTable.vue b/src/components/ZExpandTable.vue index efc2ea1..9623cf2 100644 --- a/src/components/ZExpandTable.vue +++ b/src/components/ZExpandTable.vue @@ -6,6 +6,12 @@ + + + +
diff --git a/src/main.js b/src/main.js index 56b2850..2748210 100644 --- a/src/main.js +++ b/src/main.js @@ -48,6 +48,10 @@ const i18n = new VueI18n({ } }) +Vue.prototype.global = { + emptyLine: '—' +} + Vue.use(Storage, { namespace: 'pro__', // key prefix name: 'ls', // name variable Vue.[ls] or this.[$ls], diff --git a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue index efdf304..d269504 100644 --- a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue +++ b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue @@ -130,35 +130,40 @@ export default { dataIndex: 'standardNumber', title: this.$t('standardNumber'), width: 150, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 标准名称 { dataIndex: 'standardName', title: this.$t('standardName'), width: 150, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 条款号 { dataIndex: 'termNum', title: this.$t('noMatchTracking.clauseNumber'), width: 150, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 条款名称 { title: this.$t('noMatchTracking.clauseName'), width: 150, dataIndex: 'termName', - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 问题类型 { dataIndex: 'assessResults_dictText', title: this.$t('noMatchTracking.problemTypes'), width: 150, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 相关项目 @@ -166,22 +171,24 @@ export default { title: this.$t('noMatchTracking.relevantProject'), width: 150, dataIndex: 'projectName', - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 设计工程师 { dataIndex: 'engineerId_dictText', title: this.$t('noMatchTracking.designEngineer'), width: 120, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 预计整改完成日期 { dataIndex: 'expectedTime', title: this.$t('noMatchTracking.estimatedDateOfCompletionOfRectification'), width: 180, - align: 'center' - + align: 'center', + scopedSlots: { customRender: 'text' } } ], dataSource: [], diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue index 21dfe11..18337c6 100644 --- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue +++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue @@ -83,6 +83,7 @@
{{ text && text !== 'null' ? text.replace(/<.*?>/ig, ' ') : '' }}
+
{{ global.emptyLine }}
@@ -194,14 +195,16 @@ export default { dataIndex: 'termNumber', title: this.$t('projectCompliance.standardNumberClauseNumber'), width: 150, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 标准名称/条款名称 { dataIndex: 'termName', title: this.$t('projectCompliance.standardNameClauseName'), width: 160, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 条款内容 { @@ -216,14 +219,16 @@ export default { title: this.$t('projectCompliance.evaluator'), dataIndex: 'previousNodeHandler', width: 150, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } }, // 评估结果 { title: this.$t('projectCompliance.evaluationResult'), dataIndex: 'evaluationFeedback_dictText', width: 150, - align: 'center' + align: 'center', + scopedSlots: { customRender: 'text' } } ], dataSource: [], diff --git a/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue index 2ac4d1c..a4e346b 100644 --- a/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue @@ -133,7 +133,8 @@ :extra-form="extraForm" :all-disabled="true"> @@ -677,12 +678,13 @@ export default { next({ path: '/noMobile' }) } next() - }, + } }