diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 84d7ee97..aa0920ee 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -1,8 +1,20 @@ -import { getAction } from './manage.js' +import { getAction, postAction } from './manage.js' // 流程配置-部署 const deployWorkFlow = (params) => getAction('/activitiModel/deploy', params) +// 企标计划立项、变更流程相关 +// 转办 +const enterprisePlanApprovalTurnTo = (params) => postAction('', params) +// 同意 +const enterprisePlanApprovalAgree = (params) => postAction('', params) +// 驳回 +const enterprisePlanApprovalReject = (params) => postAction('', params) + export { - deployWorkFlow + deployWorkFlow, + + enterprisePlanApprovalTurnTo, + enterprisePlanApprovalAgree, + enterprisePlanApprovalReject } diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 351af8d6..a7a1ffe7 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -812,6 +812,15 @@ /*流程表单样式end*/ +/* 按钮中发那个自定义图标的样式 */ +/deep/ .ant-btn { + .iconfont { + margin-right: 8px; + font-size: 14px; + } +} +/* 按钮中发那个自定义图标的样式 end */ + .detail-page-bottom-operate-box { height: 52px; padding: 10px 32px; diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 72b5a3a5..879b6a92 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -137,6 +137,17 @@ module.exports = { standardName: 'Standard Name', standardNumOrName: 'Standard Number Or Standard Name', fileImportError: 'File import error', + flowCenter: 'Process Center——', + processInformation: 'Process Information', + basicServiceInformation: 'Basic Service Information', + processApprovalInformation: 'Process Approval Information', + processName: 'Process Name', + expirationDate: 'Deadline Date', + processExplain: 'Process Description', + entrust: 'Entrust', + turnTo: 'Turn To', + agree: 'agree', + reject: 'Reject', // 树右键 treeRight: { addFolder: 'Create New Folder', diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index e69de29b..bde541e4 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -0,0 +1,84 @@ +module.exports = { + // 新建流程页 + newProcess: { + externalStandardsManagementProcess: '外部标准管理流程', + standardRegulationEntryCorrectionProcess: '标准法规入库/更正流程', + annotateTheConsultationProcess: '标准征求意见流程', + projectComplianceAssessmentProcess: '项目合规评估流程', + noMatchTrackingProcess: '未符合项跟踪流程', + regulatoryComplianceAssessmentProcess: '法规合规评估流程', + regulatoryProcurementProcess: '法规采购流程', + enterpriseProjectChangePlan: '企标立项/变更计划', + annualRevisionPlanActivelyReport: '年度制修订计划审批流程(各部门主动上报)', + annualRevisionPlanStandardizationInit: '年度制修订计划审批流程(标准化发起)', + enterpriseStandardSystemRevisionProcess: '企标制修订流程', + bidChangeProcess: '企标更改流程', + processOfEnterpriseBidReview: '企标复审流程', + processOfEnterpriseBidAnnulment: '企标废止流程', + processOfSealingEnterpriseStandard: '企标封存流程', + theSealedEnterpriseBidHasBeenActivatedProcess: '已封存企标启用流程', + enterpriseStandardAuditPlan: '企标稽查计划', + processOfEnterpriseStandardAudit: '企标稽查流程', + auditExtensionApplicationProcess: '稽查延期申请流程', + enterpriseStandardInspectionAndRectification: '企标稽查整改', + permissionApplicationProcess: '权限申请流程', + standardPromotionProcess: '标准宣贯流程', + workgroupProcess: '工作组相关流程', + postMeetingManagementProcess: '会后管理流程' + }, + // 企标立项/变更计划 + enterpriseInitChangePlan: { + applicationType: '申请类型', + standardProjectEstablishment: '标准立项', + change: '变更', + itemCategory: '项目类别', + formulate: '制定', + revise: '修订', + enterpriseStandardNum: '企标编号', + enterpriseStandardName: '企标名称', + enterpriseStandardCode: '企业标准代号', + enterpriseNameCode: '企业名称代号', + standardCategoryCode: '标准类别代号', + yearNumber: '年代号', + newEnterpriseStandardNum: '新企标编号', + newEnterpriseStandardName: '新企标名称', + standardEnglishName: '标准英文名称', + standardSystem: '标准体系', + standardType: '标准类型', + standardGradeClassification: '标准等级分类', + compilationIllustration: '编制说明', + draftPlanFinishDate: '草稿计划完成日期', + exposureDraftPlanFinishDate: '征求意见稿计划完成日期', + planSubmissionDate: '计划报批日期', + partName: '零部件名称', + authorizationDepart: '授权部门', + principalDrafter: '主起草人', + mainDraftUnit: '主起草单位', + headOfMainDraftingUnit: '起草单位负责人', + standardPusher: '标准推进人', + suitUnit: '配合单位', + projectStatement: '立项说明', + projectApprovalChangeReason: '立项/变更原因', + projectBackground: '立项背景、立项依据', + homogeneousStandardAnalysis: '国际、国家及行业同类标准分析', + standardContrastiveAnalysis: '企业同类标准对比分析', + leadershipAndNecessity: '立项标准的领先性与必要性', + initiatedProject: '立项目的及预期效果等', + uploadAttachment: '上传附件', + completionTimeChange: '完成时间变更', + terminationOfWork: '工作终止', + masterDraftingDepartmentChanges: '主起草部门变更', + merge: '合并', + originalDraftPlanFinishDate: '原草稿计划完成日期', + originalExposureDraftPlanFinishDate: '原征求意见稿计划完成日期', + originalPlanSubmissionDate: '原计划报批日期', + changeReason: '变更原因' + }, + // 流程配置 + processConfig: { + processType: '流程类型', + editFlowchart: '编辑流程图', + editFlowNode: '编辑流程节点', + deploy: '部署' + } +} diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 322b0c20..bde541e4 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -64,7 +64,15 @@ module.exports = { standardContrastiveAnalysis: '企业同类标准对比分析', leadershipAndNecessity: '立项标准的领先性与必要性', initiatedProject: '立项目的及预期效果等', - uploadAttachment: '上传附件' + uploadAttachment: '上传附件', + completionTimeChange: '完成时间变更', + terminationOfWork: '工作终止', + masterDraftingDepartmentChanges: '主起草部门变更', + merge: '合并', + originalDraftPlanFinishDate: '原草稿计划完成日期', + originalExposureDraftPlanFinishDate: '原征求意见稿计划完成日期', + originalPlanSubmissionDate: '原计划报批日期', + changeReason: '变更原因' }, // 流程配置 processConfig: { diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index c17f529a..6426de1c 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -145,8 +145,9 @@ module.exports = { expirationDate: '截止日期', processExplain: '流程说明', entrust: '委托', - consent: '同意', - turnDown: '驳回', + turnTo: '转办', + agree: '同意', + reject: '驳回', // 树右键 treeRight: { addFolder: '新增文件夹', @@ -529,6 +530,7 @@ module.exports = { maxSize: '文件大小限制为500M', onlyUploadPic: '请上传图片', pleaseUpload: '请上传', + theFollowingDocuments: 'M以下文件', file: '文件' }, importWithTemplate: { diff --git a/src/components/UploadFile.vue b/src/components/UploadFile.vue index 62baf999..e2fb7b95 100644 --- a/src/components/UploadFile.vue +++ b/src/components/UploadFile.vue @@ -135,6 +135,11 @@ export default { disabledUpload: { type: Boolean, default: false + }, + fileMaxSize: { + type: Number, + required: false, + default: 500 } }, data () { @@ -342,6 +347,12 @@ export default { file.uploadGoOn = false return false } + if (this.fileMaxSize && fileSize > 1024 * 1024 * this.fileMaxSize) { + this.$message.error(this.$t('uploadFile.pleaseUpload') + this.fileMaxSize + this.$t('uploadFile.theFollowingDocuments')) + this.uploadGoOn = false + file.uploadGoOn = false + return false + } if (fileSize > 1024 * 1024 * 500) { this.$message.error(this.$t('uploadFile.maxSize')) this.uploadGoOn = false diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue index ff0e77c1..bf00231e 100644 --- a/src/components/selection/StandardSelection.vue +++ b/src/components/selection/StandardSelection.vue @@ -8,7 +8,7 @@ {{this.$t('standardSelect.standardSelection')}} - + @@ -46,6 +46,9 @@ export default { }, modalNameChange (value) { this.$emit('nameChange', value) + }, + modalListChange (value) { + this.$emit('listChange', value) } }, model: { diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index 4d1dcf50..5735380f 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -193,6 +193,7 @@ export default { }) this.$emit('change', serialNumber.join(',')) this.$emit('nameChange', serialNameArr.join(',')) + this.$emit('listChange', this.selectedRowList) this.visible = false } else { this.$message.warning(this.$t('selectLeastOne')) diff --git a/src/components/selection/UserSelection.vue b/src/components/selection/UserSelection.vue index de1e6f44..1455caaf 100644 --- a/src/components/selection/UserSelection.vue +++ b/src/components/selection/UserSelection.vue @@ -13,7 +13,7 @@ :title="checkedValue" > - + {{ $t('userSelect.select') }} diff --git a/src/views/enterpriseStandardLibrary/standard/detail/module/UpdateRecordModal.vue b/src/views/enterpriseStandardLibrary/standard/detail/module/UpdateRecordModal.vue index af9564e9..6cf337b7 100644 --- a/src/views/enterpriseStandardLibrary/standard/detail/module/UpdateRecordModal.vue +++ b/src/views/enterpriseStandardLibrary/standard/detail/module/UpdateRecordModal.vue @@ -5,6 +5,7 @@ :width="width" :visible="visible" :confirm-loading="confirmLoading" + switchFullscreen @cancel="handleCancel"> diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue index 05c8c0a7..31c2979f 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue @@ -1,6 +1,18 @@ @@ -804,12 +416,29 @@ export default { padding: 20px; } } +.collapsible-content-no-head { + border-top: 1px solid #E5E6EB; + border-radius: 8px 8px 8px 8px; +} .form-flex-item { width: calc(100% / 3); } -.title-text-long { - width: 210px; +.bottom-operate-box { + height: 52px; + padding: 10px 32px; + text-align: right; + + .ant-btn { + margin-left: 15px; + } +} + +.scroll-content { + height: calc(100% - 52px); + box-sizing: border-box; + overflow: auto; + padding: 32px; } diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ApprovalBaseInfo.vue new file mode 100644 index 00000000..5a396f75 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ApprovalBaseInfo.vue @@ -0,0 +1,939 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfo.vue new file mode 100644 index 00000000..dda439a1 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfo.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfoDrawer.vue b/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfoDrawer.vue new file mode 100644 index 00000000..5e5959ce --- /dev/null +++ b/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfoDrawer.vue @@ -0,0 +1,314 @@ + + + + +