diff --git a/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue b/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue index 2cdca8ba..6104bd2c 100644 --- a/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue +++ b/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue @@ -270,4 +270,7 @@ export default { diff --git a/src/views/enterpriseStandardLibrary/check/CheckList.vue b/src/views/enterpriseStandardLibrary/check/CheckList.vue index e234038b..054b1456 100644 --- a/src/views/enterpriseStandardLibrary/check/CheckList.vue +++ b/src/views/enterpriseStandardLibrary/check/CheckList.vue @@ -515,4 +515,7 @@ export default { diff --git a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue index 61f91a8d..bf912f17 100644 --- a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue +++ b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue @@ -277,4 +277,7 @@ export default { diff --git a/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue b/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue index 65f55014..211a1b93 100644 --- a/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue +++ b/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue @@ -237,4 +237,7 @@ export default { diff --git a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue index e940e382..2606d125 100644 --- a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue +++ b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue @@ -224,4 +224,7 @@ export default { diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue index 71fd988b..53c7f501 100644 --- a/src/views/system/internalWorkGroup/WorkingGroupList.vue +++ b/src/views/system/internalWorkGroup/WorkingGroupList.vue @@ -459,4 +459,8 @@ export default { /deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label { min-width: 60px; } + +/deep/ .ant-form-item-label{ + min-width: 40px !important; +} diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 7aaf88fe..b600c531 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -99,6 +99,7 @@ {{ $t('workCenter.enterpriseInitChangePlan.completionTimeChange') }} {{ $t('workCenter.enterpriseInitChangePlan.terminationOfWork') }} @@ -455,7 +456,6 @@ export default { // } }, mounted () { - console.log(this.$route.query.taskId) // 查询流程定义列表,通过查出的数据获取到流程定义id,如果已经发起过流程,用这个id和流程实例id去查人员信息数据 this.getPersonInfoStructure(ProcessKey.ES_INIT_CHANGE.value) if (this.$route.query.taskId) { @@ -556,7 +556,8 @@ export default { }, userForm: this.$form.createForm(this), // 部分节点需要选人的表单 approvalInfoForm: this.$form.createForm(this), // 审批信息表单 - personnelInfoData: [], + personnelInfoDataAll: [], // 整体人员信息 + personnelInfoData: [], // 传给人员信息组件的人员信息 url: { list: '' // 人员信息的右侧表格获取接口 } @@ -578,10 +579,31 @@ export default { // 处理人员信息数据 // 筛选出是立项、责任部门变更,其他变更 // 每个节点是否能选人 - this.personnelInfoData = res.result + this.personnelInfoDataAll = res.result.map(item => { + return { + ...item, + chooseType: item.variableType === 'string' ? 'radio' : 'checkbox' + } + }) + if (!this.$route.query.processInstanceId) { + // 说明是在新发起一个节点,初始化发起人员信息 + this.personnelInfoDataAll[0].linkUserIds = Vue.ls.get(USER_INFO).id + this.personnelInfoDataAll[0].userList = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' + // 筛选出立项的人员信息 + this.personnelInfoData = this.personnelInfoDataAll.filter(item => item.branchType.split(',').includes('1')) + } } }) }, + /** + * 切换立项、变更、责任部门变更修改人员信息结构数据 + * @param type: 1,立项;2,变更;3, 责任部门变更 + */ + resetPersonInfoStructure (type) { + // 筛选出人员信息 + this.personnelInfoData = this.personnelInfoDataAll.filter(item => item.branchType.split(',').includes(type)) + console.log(this.personnelInfoData) + }, // 根据流程id获取数据并回显 getProcessData (taskId) { getProcessDataById(taskId).then(res => { @@ -719,34 +741,6 @@ export default { } }) }, - // 获取人员信息数据 - getPersonInfoData () { - const param = {} - param.processDefinitionId = this.processDefinitionId - // 有流程实例id就需要传流程实例id - if (this.$route.query.processInstanceId) { - param.processInstanceId = this.$route.query.processInstanceId - } - getNodeList(param).then(res => { - if (res.success) { - console.log(res.result) - // 处理人员信息数据 - if (this.formInline.applicationCategory) { - // 有申请类型,根据申请类型返回不同的人员信息,区分【立项、普通变更、责任部门变更(责任部门变更时某些节点不可跳过)】 - if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) { - // 是立项,从result中拿出立项有的人员信息 - } else if (this.formInline.applicationCategory === ApplicationCategory.CHANGE.value) { - // 是变更 - if (this.formInline.projectType === ProjectType.RESPONSIBLE_DEPT_CHANGE.value) { - // 是责任部门变更,从result中拿出责任部门变更有的人员信息 - } else { - // 是别的变更,从result中拿出需要的人员信息 - } - } - } - } - }) - }, // 头部tab改变 switchChange (value) { this.switchValue = value @@ -755,15 +749,28 @@ export default { applicationCategoryChange (value) { if (value) { if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) { - this.personnelInfoData = approvalPersonalInfo + this.resetPersonInfoStructure('1') } else { - this.personnelInfoData = changePersonalInfo + this.resetPersonInfoStructure('2') } } if (this.formInline.projectType) { this.formInline.projectType = undefined } }, + // 项目类别改变 + projectTypeChange (value) { + console.log(value, this.formInline.applicationCategory) + if (value) { + if (value === ProjectType.RESPONSIBLE_DEPT_CHANGE.value) { + // 是责任部门变更 + this.resetPersonInfoStructure('3') + } else { + // 是其他类型变更 + this.resetPersonInfoStructure('3') + } + } + }, // 业务基本信息组件中获取到流程名称改变后的值 processNameChange (value) { const param = { prcName: value } @@ -883,21 +890,9 @@ export default { handleStart () { if (this.loading) return // 人员信息的数据, 处理成对象 - const personnelInfo = this.$refs.personnelInfo.stepsData - const personnelObj = {} - for (const item of personnelInfo) { - if (item.fieldName && item.canChoose) { - personnelObj[item.fieldName] = item.user - } - } - // 发起人设置为当前登录人 - personnelObj.createUser = Vue.ls.get(USER_INFO).id - // 后端需要单独传主起草人 - personnelObj.mainDraftUser = Vue.ls.get(USER_INFO).id - console.log(personnelObj) + const personnelObj = this.$refs.personnelInfo.getDataObjVerify() // 校验是否填了所有能填的人员信息 - if (!Object.values(personnelObj).every(v => !!v)) { - this.$message.warning(this.$t('pleaseEnterPersonnelInfo')) + if (!personnelObj) { return } // 专家审批至少需要选两个专家 todo: 后端选多人流程进行不下去,暂时不限制传多人 diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue index b1ad4e5b..06b24aa5 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue @@ -365,13 +365,14 @@ - + @@ -600,13 +601,14 @@ import { StandardSource, ProjectType } from '@/enums/commonEnums.js' import StandardSelection from '@/components/selection/StandardSelection' import UserSelection from '@/components/selection/UserSelection' import UploadFile from '@/components/UploadFile' +import TreeSelection from '@/components/selection/TreeSelection' import { getFormDictTreeList } from '@/api/api' import { getEnStandardNo } from '@/api/workCenter' import { getTreeList } from '../../../../api/enterpriseStandardLibraryApi' export default { name: 'ApprovalBaseInfo', - components: { StandardSelection, UserSelection, UploadFile }, + components: { StandardSelection, UserSelection, UploadFile, TreeSelection }, props: { projectType: { type: [Number, String], @@ -935,6 +937,10 @@ export default { nameChange (value) { this.formInline.originEnStandardName = value }, + // 零部件名称选择完成的回调 + treeSelectNameChange (value, fieldName) { + this.formInline[fieldName + '_dictText'] = value + }, // 点击文件上传 clickButtonToUpload (fieldName) { if (fieldName === 'uploadAttachment') { diff --git a/src/views/workCenter/processCenter/ProcessCenter.vue b/src/views/workCenter/processCenter/ProcessCenter.vue index 5f8a3f9f..d5a240ea 100644 --- a/src/views/workCenter/processCenter/ProcessCenter.vue +++ b/src/views/workCenter/processCenter/ProcessCenter.vue @@ -12,11 +12,13 @@
- - + + + +
diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue index 03b67d87..742ef12d 100644 --- a/src/views/workCenter/processCenter/table/TodoList.vue +++ b/src/views/workCenter/processCenter/table/TodoList.vue @@ -141,12 +141,15 @@ export default { let path = '' // 跳转到对应流程页面 switch (record.prcType + '') { + // 企标立项、变更计划 case '7': path = '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow' break + // 年度制修订计划(各部门主动上报) case '8': path = '/workCenter/annualRevisionPlanActivelyReport/revisionPlanActivelyReportFlow' break + // 年度制修订计划(标准化发起) case '9': path = '/workCenter/annualRevisionPlanStandardizationInit/revisionPlanStandardizationInitFlow' break