From 18b90120eefc880d2d18cdefbbcaa916d232960c Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 27 Jun 2024 17:22:10 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/less/common.less | 6 +- src/common/lang/en-us.js | 4 + src/common/lang/workCenter/en.js | 16 +- src/common/lang/workCenter/zh.js | 16 +- src/common/lang/zh-cn.js | 4 + src/enums/commonEnums.js | 8 + src/views/system/modules/SelectUserModal.vue | 1 + .../RegulatoryComplianceCheckProcess.vue | 23 +- .../modules/DesignEngineerEvaluation.vue | 275 +++++++ .../modules/FinishAuditBaseInfo.vue | 191 +++++ .../modules/MainFinderCollectBaseInfo.vue | 365 +++++++++ .../modules/MainFinderCollectEditModal.vue | 194 +++++ .../modules/MainFinderDistributesBaseInfo.vue | 721 ++++++++++++++++++ .../modules/MainFinderSingleAuditBaseInfo.vue | 251 ++++++ .../modules/ManualAddModal.vue | 43 +- 15 files changed, 2101 insertions(+), 17 deletions(-) create mode 100644 src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue create mode 100644 src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue create mode 100644 src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue create mode 100644 src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue create mode 100644 src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue create mode 100644 src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 6393463..aa4c669 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -964,6 +964,10 @@ } // 解决表头错位问题 +/deep/ .ant-table-fixed-header .ant-table-scroll .ant-table-header { + margin-bottom: -8px !important; +} + /deep/ .ant-table-hide-scrollbar { - margin-right: -9px; + scrollbar-color: unset; } \ No newline at end of file diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 3d764c5..181526c 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -199,7 +199,11 @@ module.exports = { newCertifiedVehicleImplementationDate: 'New certified vehicle implementation date', generate: 'Generate', vehicleType: 'Vehicle type', + modelStatus: 'Model status', clickToUpload: 'Click to upload', + designEngineer: 'Design engineer', + pleaseUpload: 'Please upload', + supportingMaterial: 'Supporting material', // 树右键 treeRight: { addFolder: 'Create New Folder', diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index c694982..ae703fe 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -32,7 +32,21 @@ module.exports = { decompositionSingleSource: 'Decomposition single source', pleaseAddStandard: 'Please add a new criterion first', modelStatus: 'Model status', - primaryInvestigator: 'Primary investigator' + primaryInvestigator: 'Primary investigator', + checkWhetherTheTaskIsDelivered: 'Check whether the task is delivered', + batchSelector: 'Batch selector', + mainFinderImportTemplate: 'Compliance check process Import template', + countersigningOfficer: 'Countersigning officer', + auditor: 'Auditor', + approvingOfficer: 'Approving officer', + evaluationResult: 'Evaluation result', + theStatusNotMeetRequirements: 'The status quo that does not meet the requirements', + rectificationPlan: 'Rectification plan', + rectificationCycle: 'Rectification cycle', + rectificationCost: 'Rectification cost', + sharedWithOtherProjects: 'Shared with other projects', + costOfThisItemAfterSharing: 'Cost of this item after sharing', + appraiser: 'Appraiser' }, // 市场清单发布流程 marketListReleaseProcess: { diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index cce9f80..0b9c904 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -32,7 +32,21 @@ module.exports = { decompositionSingleSource: '分解单来源', pleaseAddStandard: '请先新增一条标准', modelStatus: '车型状态', - primaryInvestigator: '主排查人' + primaryInvestigator: '主排查人', + checkWhetherTheTaskIsDelivered: '排查任务是否下发', + batchSelector: '批量选择人员', + mainFinderImportTemplate: '法规符合性排查流程导入模板', + countersigningOfficer: '会签人员', + auditor: '审核人员', + approvingOfficer: '批准人员', + evaluationResult: '评估结果', + theStatusNotMeetRequirements: '不满足要求的现状', + rectificationPlan: '整改方案', + rectificationCycle: '整改周期', + rectificationCost: '整改费用', + sharedWithOtherProjects: '与其他项目共用性', + costOfThisItemAfterSharing: '共用后本项目所需费用', + appraiser: '评估人' }, // 市场清单发布流程 marketListReleaseProcess: { diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index c593fda..c24bca4 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -216,7 +216,11 @@ module.exports = { newCertifiedVehicleImplementationDate: '新认证车实施日期', generate: '生成', vehicleType: '车型', + modelStatus: '车型状态', clickToUpload: '点击上传', + designEngineer: '设计工程师', + pleaseUpload: '请上传', + supportingMaterial: '佐证材料', // 标准字段 standardField: { standardEnglishName: '标准英文名称', diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index f052614..8cba411 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -216,3 +216,11 @@ export const RectificationState = { TO_BE_RECTIFIED: { text: '待整改', value: '1' }, TARGET_IS_CLOSED: { text: '已关闭', value: '2' } } + +// 法规符合性排查流程-评估结果 +export const EvaluationResult = { + CONFORM_TO: { text: '符合', value: '1' }, + INCONFORMITY: { text: '不符合', value: '2' }, + NOT_INVOLVE: { text: '不涉及', value: '3' }, + TO_BE_VERIFIED: { text: '待验证', value: '4' } +} diff --git a/src/views/system/modules/SelectUserModal.vue b/src/views/system/modules/SelectUserModal.vue index 3d196a7..476daaf 100644 --- a/src/views/system/modules/SelectUserModal.vue +++ b/src/views/system/modules/SelectUserModal.vue @@ -262,6 +262,7 @@ export default { } diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue new file mode 100644 index 0000000..4acee14 --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue new file mode 100644 index 0000000..1140981 --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue new file mode 100644 index 0000000..d5d1edc --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue @@ -0,0 +1,194 @@ + + + + + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue new file mode 100644 index 0000000..22e6c74 --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue @@ -0,0 +1,721 @@ + + + + + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue new file mode 100644 index 0000000..8c68d38 --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue @@ -0,0 +1,251 @@ + + + + + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue index bf94e4f..607f52c 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue @@ -11,35 +11,49 @@ - + - + - - + - + - + - + @@ -50,12 +64,13 @@