diff --git a/src/api/workCenter.js b/src/api/workCenter.js index df22f60..452ad6c 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -32,6 +32,26 @@ const newRegulationImportGetDataById = (taskId, params) => getAction(`/process/e // 草稿的办理回显数据 const newRegulationImportGetDataDraft = (params) => getAction('/process/es/archive/draftHandle', params) +// 法规符合性排查流程 +// 保存 +const regulatoryComplianceCheckSave = (params) => postAction('/process/es/archive/save', params) +// 发起 +const regulatoryComplianceCheckApproval = (params) => postAction('/process/es/archive/start', params) +// 转办 +const regulatoryComplianceCheckTurnTo = (params) => postAction('/process/es/archive/transfer', params) +// 同意 +const regulatoryComplianceCheckAgree = (params) => postAction('/process/es/archive/agree', params) +// 驳回 +const regulatoryComplianceCheckReject = (params) => postAction('/process/es/archive/reject', params) +// 根据id查询流程数据--办理 +const regulatoryComplianceCheckGetDataById = (taskId, params) => getAction(`/process/es/archive/handle/${taskId}`, params) +// 草稿的办理回显数据 +const regulatoryComplianceCheckGetDataDraft = (params) => getAction('/process/es/archive/draftHandle', params) +// 从拆分库选择标准 +const selectStandardFromSplit = (params) => getAction('', params) +// 法规工程师节点,获取条款表信息 +const getClauseListInfo = (params) => getAction('', params) + // 市场清单发布流程 // 保存 const marketListReleaseSave = (params) => postAction('/process/es/archive/save', params) @@ -82,6 +102,16 @@ export { newRegulationImportGetDataById, newRegulationImportGetDataDraft, + regulatoryComplianceCheckSave, + regulatoryComplianceCheckApproval, + regulatoryComplianceCheckTurnTo, + regulatoryComplianceCheckAgree, + regulatoryComplianceCheckReject, + regulatoryComplianceCheckGetDataById, + regulatoryComplianceCheckGetDataDraft, + selectStandardFromSplit, + getClauseListInfo, + marketListReleaseSave, marketListReleaseApproval, marketListReleaseTurnTo, diff --git a/src/assets/less/common.less b/src/assets/less/common.less index fc27a65..38f35ff 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -560,7 +560,7 @@ &-btn { width: 24px; height: 24px; - background: rgba(213, 44, 38, 0.08); + background: rgba(0, 100, 250, 0.08); border-radius: 2px 2px 2px 2px; border: none; margin-left: 4px; @@ -957,4 +957,9 @@ // 表格表头的必填标识 .table-header-required { color: #FF0000; +} + +// 解决表头错位问题 +/deep/ .ant-table-hide-scrollbar { + margin-right: -9px; } \ No newline at end of file diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 44998ef..8df6911 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -192,6 +192,13 @@ module.exports = { curBefore: 'Before this day', curAfter: 'After this day', pleaseSelectADate: 'Please select a date first', + applicableMarket: 'Applicable market', + responsibleDepartment: 'Responsible department', + standardState: 'Standard state', + newProductionVehicleImplementationDate: 'New production vehicle implementation date', + newCertifiedVehicleImplementationDate: 'New certified vehicle implementation date', + generate: '生成', + vehicleType: '车型', // 树右键 treeRight: { addFolder: 'Create New Folder', diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index f6fe4ed..80765c0 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -21,6 +21,19 @@ module.exports = { ccPerson: '抄送人员', briefDescription: '法规要求简要描述' }, + // 法规符合性排查流程 + regulatoryComplianceCheckProcess: { + addStandard: '添加标准', + manualAddition: '手动新增', + vehicleTypeItem: '车型项目', + applicableMarket: '适用市场', + isAlike: '是否与上一版相同', + resolutionAttachment: '分解单附件', + decompositionSingleSource: '分解单来源', + pleaseAddStandard: '请先新增一条标准', + modelStatus: '车型状态', + primaryInvestigator: '主排查人' + }, // 市场清单发布流程 marketListReleaseProcess: { englishName: '英文名称', diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index cc55e4e..cce9f80 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -21,6 +21,19 @@ module.exports = { ccPerson: '抄送人员', briefDescription: '法规要求简要描述' }, + // 法规符合性排查流程 + regulatoryComplianceCheckProcess: { + addStandard: '添加标准', + manualAddition: '手动新增', + vehicleTypeItem: '车型项目', + applicableMarket: '适用市场', + isAlike: '是否与上一版相同', + resolutionAttachment: '分解单附件', + decompositionSingleSource: '分解单来源', + pleaseAddStandard: '请先新增一条标准', + modelStatus: '车型状态', + primaryInvestigator: '主排查人' + }, // 市场清单发布流程 marketListReleaseProcess: { englishName: '英文名称', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index b1031b3..f2cf095 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -144,6 +144,7 @@ module.exports = { processInformation: '流程信息', basicServiceInformation: '业务基本信息', processApprovalInformation: '流程审批信息', + dispatchInformation: '业务分派信息', processName: '流程名称', expirationDate: '截止日期', processExplain: '流程说明', @@ -195,6 +196,7 @@ module.exports = { transfer: '调取', batchClose: '批量关闭', clauseNo: '条款号', + clauseTitle: '条款标题', clauseName: '条款名称', clauseContent: '条款内容', maximumSelectFive: '最多选择五条记录!', @@ -207,6 +209,13 @@ module.exports = { curBefore: '这天之前', curAfter: '这天之后', pleaseSelectADate: '请先选中一个日期', + applicableMarket: '适用市场', + responsibleDepartment: '责任部门', + standardState: '标准状态', + newProductionVehicleImplementationDate: '新生产车实施日期', + newCertifiedVehicleImplementationDate: '新认证车实施日期', + generate: '生成', + vehicleType: '车型', // 标准字段 standardField: { standardEnglishName: '标准英文名称', diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index a2d19b2..f052614 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -119,26 +119,6 @@ export const EnterpriseStandardStatus = { ARCHIVE: { text: '封存', value: '10' } } -// 流程key,获取人员信息前需要获取流程定义id,传这里的名字到WorkCenterMixin的getFlowDefinition方法中 -export const ProcessKey = { - // 新法规导入流程 - NEW_REGULATIONS_IMPORT: { text: '', value: '' }, - // 标准解读流程 - // 法规符合性排查流程 - // 市场清单发布流程 - MARKET_LIST_RELEASE: { text: '', value: '' } -} - -// 流程类型 -export const ProcessType = { - // 新法规导入流程 - NEW_REGULATIONS_IMPORT: { text: '新法规导入流程', value: '1' }, - // 标准解读流程 - // 法规符合性排查流程 - // 市场清单发布流程 - MARKET_LIST_RELEASE: { text: '市场清单发布流程', value: '4' } -} - // 标准化活动类型 export const StandardizedActivityType = new EsEnums({ rootNode: { text: '总标委', value: 'ROOT' }, @@ -160,6 +140,28 @@ export const IsReadOnlyEnums = { subConfigurable: { text: '字段固定,内部可配', value: 2 } } +// 流程key,获取人员信息前需要获取流程定义id,传这里的名字到WorkCenterMixin的getFlowDefinition方法中 +export const ProcessKey = { + // 新法规导入流程 + NEW_REGULATIONS_IMPORT: { text: '', value: '' }, + // 标准解读流程 + // 法规符合性排查流程 + REGULATORY_COMPLIANCE_CHECK: { text: '', value: '' }, + // 市场清单发布流程 + MARKET_LIST_RELEASE: { text: '', value: '' } +} + +// 流程类型 +export const ProcessType = { + // 新法规导入流程 + NEW_REGULATIONS_IMPORT: { text: '新法规导入流程', value: '1' }, + // 标准解读流程 + // 法规符合性排查流程 + REGULATORY_COMPLIANCE_CHECK: { text: '', value: '' }, + // 市场清单发布流程 + MARKET_LIST_RELEASE: { text: '市场清单发布流程', value: '4' } +} + // 新法规导入流程节点 export const NewRegulationsImportNodes = new EsEnums({ initiated: { text: '法规工程师发起', value: '' }, @@ -169,6 +171,19 @@ export const NewRegulationsImportNodes = new EsEnums({ responsibleLeaderApprovalTwo: { text: '公司标准法规责任领导批准', value: '' } }) +// 法规符合性排查流程 +export const RegulatoryComplianceCheckNodes = new EsEnums({ + initiated: { text: '法规工程师发起', value: '' }, + interfacesDistributed: { text: '各部门接口人分发', value: '' }, + mainFinderDistributes: { text: '主排查人分发', value: '' }, + designEngineerEvaluation: { text: '设计工程师评估', value: '' }, + mainFinderSingleLineAudit: { text: '主排查人单线审核', value: '' }, + mainFinderCollect: { text: '主排查人汇总', value: '' }, + countersign: { text: '会签', value: '' }, + designEngineerManagerReview: { text: '设计工程师科室经理审核', value: '' }, + seniorManagerApproved: { text: '高级经理/技术官批准', value: '' } +}) + // 市场清单发布流程节点 export const MarketListReleaseNodes = new EsEnums({ initiated: { text: '法规工程师发起', value: '' }, diff --git a/src/views/workCenter/newRegulationIntroductionProcess/modules/BaseInfoForm.vue b/src/views/workCenter/newRegulationIntroductionProcess/modules/BaseInfoForm.vue index e599b44..f773d6b 100644 --- a/src/views/workCenter/newRegulationIntroductionProcess/modules/BaseInfoForm.vue +++ b/src/views/workCenter/newRegulationIntroductionProcess/modules/BaseInfoForm.vue @@ -231,7 +231,7 @@ export default { }, // 外层要获取数据 getData () { - // 把数据抛出,在线编辑不知道要不要抛 + // 把数据抛出 const data = {} data.formInline = this.formInline return data @@ -259,13 +259,13 @@ export default { this.formInline = {} } else { this.loading = true - // 企标名称 + // 标准名称 this.formInline.standardName = value[0].standardName - // 根据返回的id查询企标数据 + // 根据返回的id查询标准数据 getForeignStandardDetail({ id: value[0].id, type: '2' }).then(async res => { if (res.success) { const result = res.result - // 代替企标编号 + // 代替标准编号 this.formInline.substituteStandardNumber = result.substitute_standard_number // 实施日期 this.formInline.implementationDate = result.implementation_date diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue new file mode 100644 index 0000000..7bf8d21 --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue @@ -0,0 +1,569 @@ + + + + + + {{ $t('basicInformation') }} + + {{ $t('personalInformation') }} + + + + + + + {{ $t('processInformation') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('processApprovalInformation') }} + + + + + + + + + + + + + + + + + + + + + + + {{ $t('preservation') }} + + {{ $t('submit') }} + + + + + {{ $t('turnTo') }} + + {{ $t('preservation') }} + + {{ $t('submit') }} + + + + + {{ $t('reject') }} + + {{ $t('turnTo') }} + + {{ $t('preservation') }} + + {{ $t('submit') }} + + + + {{ $t('turnTo') }} + + {{ $t('preservation') }} + + {{ $t('agree') }} + + {{ $t('reject') }} + + + + + + + + + + + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue new file mode 100644 index 0000000..b3df299 --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue @@ -0,0 +1,565 @@ + + + + + {{ $t('basicServiceInformation') }} + + + + + + {{ $t('workCenter.regulatoryComplianceCheckProcess.addStandard') }} + + + + {{ $t('workCenter.regulatoryComplianceCheckProcess.manualAddition') }} + + + + {{ $t('delete') }} + + + + + + + + + {{ $t('edit') }} + + + + + + + + + + + * + + {{ $t('workCenter.regulatoryComplianceCheckProcess.vehicleTypeItem') }} + + + + + + + + + + + * + + {{ $t('applicableMarket') }} + + + + + + + + + + + * + + {{ $t('workCenter.regulatoryComplianceCheckProcess.isAlike') }} + + + + + + + + + + + + + {{ $t('generate') }} + + + + + {{ $t('dispatchInformation') }} + + + + + + + + + + + + + + + {{ $t('query') }} + {{ $t('reset') }} + + + + + + + + + + + {{ $t('batchDelete') }} + + + + + + + + + + {{ text || text === 0 ? text : global.emptyLine }} + {{ text }} + + + + + + {{ $t('delete') }} + + + + + + + + + + + + + + + + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/InterfacePersonDeliveryBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/InterfacePersonDeliveryBaseInfo.vue new file mode 100644 index 0000000..24957fa --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/InterfacePersonDeliveryBaseInfo.vue @@ -0,0 +1,160 @@ + + + + {{ $t('dispatchInformation') }} + + + + + + + + * + + {{ $t('workCenter.regulatoryComplianceCheckProcess.primaryInvestigator') }} + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue new file mode 100644 index 0000000..bf94e4f --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/SelectStandardFromSplitModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/SelectStandardFromSplitModal.vue new file mode 100644 index 0000000..e61516e --- /dev/null +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/SelectStandardFromSplitModal.vue @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + + + + + {{ $t('query') }} + {{ $t('reset') }} + + + + + + + + {{ text || text === 0 ? text : global.emptyLine }} + {{ text || text === 0 ? text : global.emptyLine }} + + + + + + + {{ text || text === 0 ? text : global.emptyLine }} + {{ text }} + {{ global.emptyLine }} + + + + + + + {{ record.source === '3' ? (record.esStandardState_dictText || global.emptyLine) : (record.standardState_dictText || global.emptyLine) }} + {{ record.source === '3' ? (record.esStandardState_dictText || global.emptyLine) : (record.standardState_dictText || global.emptyLine) }} + + + + + + + + {{ $t('cancel') }} + {{ $t('submit') }} + + + + + + +