From 280bf825862fa6adf7c12e3d887d4fd2ed0b85cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Wed, 24 Jan 2024 17:12:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E3=80=90=E5=8F=98=E6=9B=B4=E3=80=91?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE=E5=BA=93=EF=BC=9A=201?= =?UTF-8?q?=E3=80=81=E5=88=97=E8=A1=A8=E9=A1=B9=E7=9B=AE=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=EF=BC=8C=E6=93=8D=E4=BD=9C=E5=88=97=E5=8E=BB?= =?UTF-8?q?=E6=8E=89pms=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE=202=E3=80=81?= =?UTF-8?q?=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BA=A7=E5=88=AB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=203=E3=80=81=E9=A1=B9=E7=9B=AE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=A5=E6=BA=90=E5=8E=BB=E6=8E=89pms=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=90=8C=E6=AD=A5=204=E3=80=81pms=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8C=89=E9=92=AE=E5=88=A0=E9=99=A4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/projectLibrary/en.js | 1 + src/common/lang/projectLibrary/zh.js | 1 + .../vehicleItemLibrary/VehicleItemLibrary.vue | 54 ++++++++++--------- .../VehicleItemLibraryDetail.vue | 7 ++- .../modules/VehicleItemLibraryModal.vue | 12 +++++ 5 files changed, 49 insertions(+), 26 deletions(-) diff --git a/src/common/lang/projectLibrary/en.js b/src/common/lang/projectLibrary/en.js index ac83e644..aebcf23b 100644 --- a/src/common/lang/projectLibrary/en.js +++ b/src/common/lang/projectLibrary/en.js @@ -3,6 +3,7 @@ module.exports = { workOrderNumber: 'Work order number', // 工作令编号 projectHealthStatus: 'Project health', // 项目健康度 selectProject: 'Select Project', // 选择项目 + projectLevel: 'Project level', // 项目级别 // 车型项目库 vehicleItemLibrary: { diff --git a/src/common/lang/projectLibrary/zh.js b/src/common/lang/projectLibrary/zh.js index 81d50ff8..f5a2935d 100644 --- a/src/common/lang/projectLibrary/zh.js +++ b/src/common/lang/projectLibrary/zh.js @@ -3,6 +3,7 @@ module.exports = { workOrderNumber: '工作令编号', projectHealthStatus: '项目健康度', selectProject: '选择项目', + projectLevel: '项目级别', // 车型项目库 vehicleItemLibrary: { diff --git a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue index fbdaf52f..ecfa2c76 100644 --- a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue +++ b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibrary.vue @@ -16,16 +16,16 @@ - + - + + dictCode="project_level" /> @@ -56,13 +56,13 @@ }} - - {{ $t('projectLibrary.vehicleItemLibrary.PMSInfoSynchronization') }} - + + + + + + +
@@ -136,10 +136,10 @@ export default { title: this.$t('projectLibrary.vehicleItemLibrary.projectLeader'), width: 250 }, - // 项目健康状态 + // 项目级别 { - dataIndex: 'projectHealth_dictText', - title: this.$t('projectLibrary.projectHealthStatus'), + dataIndex: 'projectLevel_dictText', + title: this.$t('projectLibrary.projectLevel'), sorter: true, width: 250 }, @@ -158,20 +158,24 @@ export default { clickEvent: 'handleDetail', has: 'vehicleItemLibrary:detail' }, - // PMS详情 - { - text: this.$t('projectLibrary.vehicleItemLibrary.PMSDetails'), - clickEvent: 'handlePMSDetail', - has: 'vehicleItemLibrary:pmsDetail', - show: (record) => { - return record.projectSource === ProjectSource.PMS.value - } - }, + // // PMS详情 + // { + // text: this.$t('projectLibrary.vehicleItemLibrary.PMSDetails'), + // clickEvent: 'handlePMSDetail', + // has: 'vehicleItemLibrary:pmsDetail', + // show: (record) => { + // return record.projectSource === ProjectSource.PMS.value + // } + // }, // 编辑 { text: this.$t('edit'), clickEvent: 'handleEdit', - has: 'vehicleItemLibrary:edit' + has: 'vehicleItemLibrary:edit', + show: (record) => { + console.log(record) + return true + } }, // 删除 { diff --git a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue index dbe5c239..79355eed 100644 --- a/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue +++ b/src/views/projectLibrary/vehicleItemLibrary/VehicleItemLibraryDetail.vue @@ -31,7 +31,12 @@
- {{ detailData.projectHealth_dictText }} + {{ detailData.projectHealth_dictText || global.emptyLine }} +
+ +
+ + {{ detailData.projectLevel_dictText || global.emptyLine }}
diff --git a/src/views/projectLibrary/vehicleItemLibrary/modules/VehicleItemLibraryModal.vue b/src/views/projectLibrary/vehicleItemLibrary/modules/VehicleItemLibraryModal.vue index ca1bbb87..bc52098b 100644 --- a/src/views/projectLibrary/vehicleItemLibrary/modules/VehicleItemLibraryModal.vue +++ b/src/views/projectLibrary/vehicleItemLibrary/modules/VehicleItemLibraryModal.vue @@ -56,6 +56,13 @@ :placeholder="$t('pleaseSelect') + $t('projectLibrary.projectHealthStatus')" /> + + + + + + @@ -112,6 +119,11 @@ export default { projectHealth: { rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('projectLibrary.projectHealthStatus') }], validateTrigger: 'change' + }, + // 项目级别 + projectLevel: { + rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('projectLibrary.projectLevel') }], + validateTrigger: 'change' } } }