diff --git a/package.json b/package.json index 96cdaa2..76d078d 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "ant-design-vue": "1.7.2", "axios": "^0.21.1", "core-js": "^3.8.3", "js-base64": "^3.6.0", diff --git a/src/api/api.js b/src/api/api.js index ae44625..b2e89c1 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -26,6 +26,9 @@ const checkRuleByCode = (params) => getAction('/sys/checkRule/checkByCode', para // 通过文件的id获取文件的相应信息 const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params) +// 获取部门列表数据 +const getDepartmentList = (params) => getAction('/sys/sysDepart/queryTreeList', params) + // 获取人员信息列表 const getPersonInfoList = (params) => getAction('/process/fb/processFbInfo/getNodeList', params) @@ -50,6 +53,14 @@ const rejectStandardECProcess = (params) => postAction('/process/fb/processFbEnt // 初始化数据 // 根据流程id获取流程信息 const getProcessDataById = (taskId, params) => getAction(`/process/es/initChange/handle/${taskId}`, params) +// 同意 +const enterprisePlanApprovalAgree = (params) => postAction('/process/es/initChange/agree', params) +// 驳回 +const enterprisePlanApprovalReject = (params) => postAction('/process/es/initChange/reject', params) +// 转办 +const enterprisePlanApprovalTurnTo = (params) => postAction('/process/es/initChange/transfer', params) +// 保存 +const enterprisePlanApprovalSave = (params) => postAction('/process/es/initChange/save', params) export { queryPermissionsByUser, @@ -58,6 +69,7 @@ export { duplicateCheck, checkRuleByCode, getFileInfo, + getDepartmentList, getSSOUserInfo, getPersonInfoList, @@ -70,5 +82,9 @@ export { agreeStandardECProcess, rejectStandardECProcess, - getProcessDataById + getProcessDataById, + enterprisePlanApprovalAgree, + enterprisePlanApprovalReject, + enterprisePlanApprovalTurnTo, + enterprisePlanApprovalSave } diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 85fe8d9..bebfeeb 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -93,4 +93,19 @@ -webkit-text-fill-color: #888888; } } +} + +/* 表格样式 */ +/deep/ .ant-table { + padding: 0.2rem 0.32rem; + color: @font-color; + th { + font-size: 0.26rem; + font-weight: 600; + padding: 0.44rem 0; + } + td { + font-size: 0.24rem; + font-weight: 400; + } } \ No newline at end of file diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 153bb08..4290851 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -22,12 +22,85 @@ module.exports = { turnTo: '转办', agree: '同意', reject: '驳回', + save: '保存', + submit: '提交', + determine: '确定', processApprovalInfo: '流程审批信息', remark: '备注', clickSelect: '点击选择', selectUser: '选择人员', + finishDate: '完成日期', + rangeOfApplication: '适用范围', + standardNumber: '标准编号', + standardName: '标准名称', + serialNumber: '序号', + pleaseEnterRemarks: '请填写备注', + // 标准法规入库/变更流程 standardEntryOrChange: { source: '来源', operationType: '操作类型' + }, + esInitChange: { + applicationType: '申请类型', + standardProjectEstablishment: '标准立项', + change: '变更', + itemCategory: '项目类别', + formulate: '制定', + revise: '修订', + completionTimeChange: '完成时间变更', + terminationOfWork: '工作终止', + dutyDepartChange: '责任部门变更', + merge: '合并', + 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: '上传附件', + originalDraftPlanFinishDate: '原草稿计划完成日期', + originalExposureDraftPlanFinishDate: '原征求意见稿计划完成日期', + originalPlanSubmissionDate: '原计划报批日期', + changeReason: '变更原因', + originPrincipalDrafter: '原主起草人', + originMainDraftUnit: '原主起草单位', + originHeadOfMainDraftingUnit: '原起草单位负责人', + newPrincipalDrafter: '新主起草人', + newMainDraftUnit: '新主起草单位', + newHeadOfMainDraftingUnit: '新起草单位负责人', + mergeStandardInformation: '合并标准信息', + typeOfRevision: '制修订类型', + superintendent: '所长', + relatedPersonnel: '相关人员' + }, + // 标准征求意见流程 + standardConsultation: { + standardText: '标准文本', + relevantDocument: '相关文件', + closingDateForComments: '征求意见结束日期' } } diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index f850169..31a813e 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -22,6 +22,9 @@ module.exports = { turnTo: '转办', agree: '同意', reject: '驳回', + save: '保存', + submit: '提交', + determine: '确定', processApprovalInfo: '流程审批信息', remark: '备注', clickSelect: '点击选择', @@ -30,6 +33,8 @@ module.exports = { rangeOfApplication: '适用范围', standardNumber: '标准编号', standardName: '标准名称', + serialNumber: '序号', + pleaseEnterRemarks: '请填写备注', // 标准法规入库/变更流程 standardEntryOrChange: { source: '来源', @@ -76,7 +81,21 @@ module.exports = { standardContrastiveAnalysis: '企业同类标准对比分析', leadershipAndNecessity: '立项标准的领先性与必要性', initiatedProject: '立项目的及预期效果等', - uploadAttachment: '上传附件' + uploadAttachment: '上传附件', + originalDraftPlanFinishDate: '原草稿计划完成日期', + originalExposureDraftPlanFinishDate: '原征求意见稿计划完成日期', + originalPlanSubmissionDate: '原计划报批日期', + changeReason: '变更原因', + originPrincipalDrafter: '原主起草人', + originMainDraftUnit: '原主起草单位', + originHeadOfMainDraftingUnit: '原起草单位负责人', + newPrincipalDrafter: '新主起草人', + newMainDraftUnit: '新主起草单位', + newHeadOfMainDraftingUnit: '新起草单位负责人', + mergeStandardInformation: '合并标准信息', + typeOfRevision: '制修订类型', + superintendent: '所长', + relatedPersonnel: '相关人员' }, // 标准征求意见流程 standardConsultation: { diff --git a/src/components/CalendarField.vue b/src/components/CalendarField.vue index bab9462..1a32a99 100644 --- a/src/components/CalendarField.vue +++ b/src/components/CalendarField.vue @@ -4,6 +4,7 @@ @@ -25,22 +24,6 @@ export default { name: 'CalendarField', props: { - // 可选择的最小日期--不知道为什么没有起作用 - minDate: { - // type: [Date, String], - required: false, - default: () => { - return new Date(2020, 0, 1) - } - }, - // 可选择的最大日期--不知道为什么没有起作用 - maxDate: { - type: [Date, String], - required: false, - default: () => { - return new Date(2030, 12, 31) - } - }, value: { type: [String, Number, Object], required: false diff --git a/src/components/SelectDepartment.vue b/src/components/SelectDepartment.vue new file mode 100644 index 0000000..13ba746 --- /dev/null +++ b/src/components/SelectDepartment.vue @@ -0,0 +1,268 @@ + + + + + diff --git a/src/components/SelectDepartmentField.vue b/src/components/SelectDepartmentField.vue new file mode 100644 index 0000000..bc47975 --- /dev/null +++ b/src/components/SelectDepartmentField.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/src/components/SelectUserField.vue b/src/components/SelectUserField.vue index 8133f29..9b724e9 100644 --- a/src/components/SelectUserField.vue +++ b/src/components/SelectUserField.vue @@ -7,10 +7,10 @@ readonly rows="1" autosize + :rules="rules" type="textarea" @click="handleSelect" > - [] }, diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 6fa373e..8c70383 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -88,3 +88,17 @@ export const ProjectType = { RESPONSIBLE_DEPT_CHANGE: { text: '责任部门变更', value: '5' }, MERGE: { text: '合并', value: '6' } } + +// 企标立项、变更流程 +export const EsInitChangeNodes = new EsEnums({ + mainDrafterStart: { text: '主起草人发起', value: 'sid-7120EF36-78C3-4DB0-8B49-91178F79C24B' }, + contactCheck: { text: '部所联络人校对', value: 'sid-BB1FF9A5-89DF-4356-AB16-9D68B8FABC04' }, + expertApproval: { text: '专家审批', value: 'sid-ABE29414-15C7-4798-B690-E53055F6CA75' }, + leaderApproval: { text: '主管级领导审批', value: 'sid-A58C400F-BA13-4125-9B00-45EB45F1A559' }, + leaderLeaderApproval: { text: '主管级上一级领导审批', value: 'sid-298A57B6-6658-47C0-94EB-76E3A5790258' }, + standardizationApproval: { text: '标准化审批', value: 'sid-06CB29CE-E39F-4CD2-A534-18546DC8C6FB' }, + newDraftUnitLeaderLeaderSend: { text: '新起草部门主管级上一级领导下发', value: 'sid-AB70F1CA-8311-4639-B3DA-204EF3332B29' }, + newDraftUnitLeaderConfirm: { text: '新起草部门主管级领导确认', value: 'sid-A26EC37C-7C93-4987-9833-363C4E25EC50' }, + relevantPersonnelWillSign: { text: '相关人员会签', value: 'sid-7BFD2753-B6CD-4637-8D4B-819903511925' }, + mainDrafterCopy: { text: '主起草人抄送', value: 'sid-08D0381A-5C20-4708-9D73-C7EB5C51DB02' } +}) diff --git a/src/main.js b/src/main.js index efc0884..6b66a19 100644 --- a/src/main.js +++ b/src/main.js @@ -15,11 +15,15 @@ import { ACCESS_TOKEN, USER_INFO } from '@/store/mutation-types' import './permission' import './assets/font/iconfont.css' +import { Table } from 'ant-design-vue' +import 'ant-design-vue/dist/antd.css' + Vue.config.productionTip = false Vue.use(Vant) Vue.use(VueI18n) Vue.prototype.$message = Toast +Vue.use(Table) const i18n = new VueI18n({ locale: 'zh-CN', diff --git a/src/router/workCenter/index.js b/src/router/workCenter/index.js index 88a9e82..cf82e4d 100644 --- a/src/router/workCenter/index.js +++ b/src/router/workCenter/index.js @@ -5,9 +5,8 @@ export default [ component: (resolve) => require(['@/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue'], resolve), meta: { title: '企标计划立项/变更流程', - hasTabbar: false, // 这个属性控制页面是否显示tabbar hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏 - leftArrow: true // 这个属性控制页面上面的导航栏 是否有返回按钮 + hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 } }, // 标准法规入库/变更流程 diff --git a/src/views/Home.vue b/src/views/Home.vue index 5c04ec0..e094bf4 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,11 +1,14 @@