diff --git a/src/common/lang/enterpriseStandardLibrary/en.js b/src/common/lang/enterpriseStandardLibrary/en.js index 027ddeff..a9987a06 100644 --- a/src/common/lang/enterpriseStandardLibrary/en.js +++ b/src/common/lang/enterpriseStandardLibrary/en.js @@ -23,7 +23,8 @@ module.exports = { standardResolutionSheet: '标准分解单', nodeName: '节点名称', subjectToClause: '依据条款', - standardContentOrRequirements: '标准内容或要求' + standardContentOrRequirements: '标准内容或要求', + auditContent: '稽查内容' }, // 评审会记录 reviewMeeting: { diff --git a/src/common/lang/enterpriseStandardLibrary/zh.js b/src/common/lang/enterpriseStandardLibrary/zh.js index 25db2b7b..63160b66 100644 --- a/src/common/lang/enterpriseStandardLibrary/zh.js +++ b/src/common/lang/enterpriseStandardLibrary/zh.js @@ -23,7 +23,8 @@ module.exports = { standardResolutionSheet: '标准分解单', nodeName: '节点名称', subjectToClause: '依据条款', - standardContentOrRequirements: '标准内容或要求' + standardContentOrRequirements: '标准内容或要求', + auditContent: '稽查内容' }, // 评审会记录 reviewMeeting: { diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index 335a366e..9e231fdc 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -108,7 +108,21 @@ module.exports = { addEditDrafter: '新增/编辑起草人', draftingUnit: '起草单位', drafter: '起草人', - draftingScope: '起草范围' + draftingScope: '起草范围', + uploadStandard: '上传企标', + pleaseUploadStandard: '请上传企标', + lookUploadStandard: '查看已上传企标', + conferee: '参会人员', + meetingSummary: '会议纪要', + compilationIllustration: '编制说明', + isNeedAudit: '是否需要稽查', + enterpriseStandardText: '企标文本', + isCanAuditMeeting: '是否可以进行评审会', + assessor: '评审人', + scorer: '评分人', + reviewDate: '评审日期', + judgingVenue: '评审地点', + pleaseEnterAllMarkItem: '请填写所有评分项' }, // 流程配置 processConfig: { diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index e5991243..c422232f 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -108,7 +108,21 @@ module.exports = { addEditDrafter: '新增/编辑起草人', draftingUnit: '起草单位', drafter: '起草人', - draftingScope: '起草范围' + draftingScope: '起草范围', + uploadStandard: '上传企标', + pleaseUploadStandard: '请上传企标', + lookUploadStandard: '查看已上传企标', + conferee: '参会人员', + meetingSummary: '会议纪要', + compilationIllustration: '编制说明', + isNeedAudit: '是否需要稽查', + enterpriseStandardText: '企标文本', + isCanAuditMeeting: '是否可以进行评审会', + assessor: '评审人', + scorer: '评分人', + reviewDate: '评审日期', + judgingVenue: '评审地点', + pleaseEnterAllMarkItem: '请填写所有评分项' }, // 流程配置 processConfig: { diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index 7cc9b9cf..f2821e01 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -55,11 +55,15 @@
{{ $t('basicServiceInformation') }}
- + + + + + @@ -94,7 +98,7 @@
- +
@@ -126,9 +130,9 @@ {{ $t('preservation') }} - {{ $t('agree') }} + {{ $t('agree') }} - {{ $t('reject') }} + {{ $t('reject') }} @@ -138,11 +142,16 @@ @@ -126,4 +185,10 @@ export default { height: 100%; } } + +.base-info-inner-title { + color: #1D2129; + font-size: 16px; + font-weight: 500; +} diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue index a2d752c3..86f6f743 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue @@ -1,29 +1,466 @@ - diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterUploadStandardBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterUploadStandardBaseInfo.vue new file mode 100644 index 00000000..c08431df --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterUploadStandardBaseInfo.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue new file mode 100644 index 00000000..e307535f --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/StandardizationAuditBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/StandardizationAuditBaseInfo.vue new file mode 100644 index 00000000..a8409373 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRevision/modules/StandardizationAuditBaseInfo.vue @@ -0,0 +1,234 @@ + + + + +