diff --git a/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue b/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue index b91bb37..632f1e2 100644 --- a/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue +++ b/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue @@ -93,7 +93,7 @@ export default { formOpenRangeData: [ //公开范围 { label: '成果转化类(TT)', - value: 1, + value: 1 }, { label: '市场创收类(SC)', @@ -116,9 +116,9 @@ export default { value: 6 }, { - label: '自主研发类', + label: '自主研发类(ZY)', value: 7 - }, + } ], expandRight: false, title: '', @@ -776,15 +776,15 @@ export default { options: this.formProjectManagerData } }, - { - type: 'custom-cascader', - title: '项目管理员', - model: 'projectAdmin', - externalValue: { - disabled: true, - options: this.formProjectAdmin - } - }, + // { + // type: 'custom-cascader', + // title: '项目管理员', + // model: 'projectAdmin', + // externalValue: { + // disabled: true, + // options: this.formProjectAdmin + // } + // }, // { // type: 'custom-cascader', // title: '分管领导', diff --git a/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue b/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue index 6fe5111..46a708a 100644 --- a/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue +++ b/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue @@ -4,31 +4,27 @@

结项详情

- - - - - - - - - + +
+
+ + + + + + + +
+ 取消 + 确定 +
+
- - - - - - - - - - -
- 审核 - 驳回 + 审核 + 驳回
{ + console.log(result) + if (result.status === 0) { + this.$message.success(result.data) + this.$router.push({ + name: 'ConclusionManagement' + }) + } else { + this.$message.error(result.data) + } + }) + }, + close () { + this.isSubmit = false + this.formData.spyj = '' + }, + //审核 + addExpApply (a) { + this.isSubmit = true + this.isExamine = a + }, getProject () { let params = { pageUtil: { - t: { + map: { id: this.projectId }, pageNo: 1, @@ -228,84 +257,96 @@ export default { } } Api.ProjectManagements.getConclusionList(params.pageUtil).then((result) => { - if (result.status === 0) { - let project = {} - $.extend(true, project, result.data.ls[0]) - if (project.ext.taskName == '结项填报') { - this.isEdit = true - } - if (this.isEdit) { - this.formBtnData = [ - { - title: this.formBtnTitle, - type: 'primary', - callback: () => { - if (this.formValidate()) { - this.formSubmit() + if (result.status === 0) { + let project = {} + $.extend(true, project, result.data.ls[0]) + if (project.ext.endExecutor.includes(getItem('userId'))) { + this.isEdit = true + } + if (this.isEdit) { + this.formBtnData = [ + { + title: this.formBtnTitle, + type: 'primary', + callback: () => { + if (this.formValidate()) { + this.formSubmit() + } + } + }, + { + title: '取消', + type: 'default', + callback: () => { + this.$router.go(-1) } } - }, - { - title: '取消', - type: 'default', - callback: () => { - this.$router.go(-1) + ] + } else { + this.formBtnData = [ + { + title: '取消', + type: 'default', + callback: () => { + this.$router.go(-1) + } } - } - ] + ] + } + switch (project.ext.openRange) { + case 1: + project.openRange = '成果转换类' + break + case 2: + project.openRange = '市场创收类' + break + case 3: + project.openRange = '研究开发类' + break + case 4: + project.openRange = '窗口服务类' + break + case 5: + project.openRange = '平台专项类' + break + case 6: + project.openRange = '目标责任类' + break + case 7: + project.openRange = '自主研发类' + break + case 8: + project.openRange = '临时任务类' + break + default: + project.openRange = '其他类' + } + let permissionsPeopleList = project.ext.permissionsPeople + let permissionsPeople = permissionsPeopleList[0].label + for (let j = 1; j < permissionsPeopleList.length; j++) { + permissionsPeople = permissionsPeople + ',' + permissionsPeopleList[j].label + } + project.execution = project.ext.execution + project.permissionsPeople = permissionsPeople + if (project.ext.hasOwnProperty('conclusionFile')) { + this.formFileData = project.ext.conclusionFile + this.formModel.conclusionFile = project.ext.conclusionFile + console.log('this.formFileData', this.formFileData) + console.log('this.formModel.conclusionFile', this.formModel.conclusionFile) + this.initFormSchema() + } + project.conclusionFile = project.ext.conclusionFile + this.formModel = project + this.logOperationData = JSON.parse(JSON.stringify(this.formModel)) } - switch (project.ext.openRange) { - case 1: - project.openRange = '成果转换类' - break - case 2: - project.openRange = '市场创收类' - break - case 3: - project.openRange = '研究开发类' - break - case 4: - project.openRange = '窗口服务类' - break - case 5: - project.openRange = '平台专项类' - break - case 6: - project.openRange = '目标责任类' - break - case 7: - project.openRange = '自主研发类' - break - case 8: - project.openRange = '临时任务类' - break - default: - project.openRange = '其他类' - } - let permissionsPeopleList = project.ext.permissionsPeople - let permissionsPeople = permissionsPeopleList[0].label - for (let j = 1; j < permissionsPeopleList.length; j++) { - permissionsPeople = permissionsPeople + ',' + permissionsPeopleList[j].label - } - project.execution = project.ext.execution - project.permissionsPeople = permissionsPeople - if (project.ext.hasOwnProperty('conclusionFile')) { - this.formFileData = project.ext.conclusionFile - this.formModel.conclusionFile = project.ext.conclusionFile - console.log('this.formFileData', this.formFileData) - console.log('this.formModel.conclusionFile', this.formModel.conclusionFile) - this.initFormSchema() - } - project.conclusionFile = project.ext.conclusionFile - this.formModel = project - this.logOperationData = JSON.parse(JSON.stringify(this.formModel)) } - }) + ) }, // 判断form字段是否可以编辑 judgeFormEditable (step) { return (this.canEdit && this.projectStep === step) - }, + } + , getAllPeople () { let params = { path: { @@ -325,7 +366,8 @@ export default { this.$message.error(result.msg) } }) - }, + } + , init () { let orgIdArray = JSON.parse(getItem('orgIdData')) let userInfoId = getItem('userInfoId') @@ -373,11 +415,13 @@ export default { this.$message.error(result.msg) } }) - }, + } + , //判断是否是超级管理员 judgeSuperAdmin () { this.isSuperAdmin = (getItem('userId') == 0) - }, + } + , /* * form相关 */ @@ -426,7 +470,8 @@ export default { documentType: 2, year: moment().format('YYYY'), } - }, + } + , initFormSchema () { this.formSchema = [ { @@ -520,7 +565,8 @@ export default { type: 'submit' } ] - }, + } + , getPersonStatus () { /*根据账号ID,查询人员信息*/ let id = this.formModel.draftManId @@ -533,7 +579,8 @@ export default { this.$message.info(result.msg) } }) - }, + } + , //获取文种 getDocumentType () { @@ -620,7 +667,8 @@ export default { this.$message.error(result.msg) } }) - }, + } + , //获取文本编号 getDocumentCode () { let param = { @@ -643,7 +691,8 @@ export default { } }) - }, + } + , //根据会签部门自动获取会签人（部门主任） getSignedMember () { if ($.inArray(this.draftDeptId, this.formModel.signedDepts) < 0) { @@ -663,11 +712,13 @@ export default { // this.initFormSchema(); } }) - }, + } + , //选择是否带任务后刷新界面 radioValueChanged () { this.initFormSchema() - }, + } + , //选择自有发文后显示发文类型 selectorValueChanged (model) { if (model === 'contentClass') { @@ -685,27 +736,32 @@ export default { if (model === 'signedDepts') { this.getSignedMember() } - }, + } + , //多选级联下拉框值传值 cascaderMultipleValueChanged (model) { this.formCustomizePeopleData = model - }, + } + , //表单验证 formValidate () { return this.$refs.childrenForm.validate() - }, + } + , //清空表单 formResetFields () { this.formFileData = [] this.$refs.childrenForm.resetFields() this.initFormSchema() this.formPeopleWeightData = [] - }, + } + , //取消提交 formCancel () { this.formResetFields() - }, + } + , //表单提交 formSubmit (data) { this.$refs.childrenForm.letTextEditorSubmit() @@ -728,7 +784,8 @@ export default { this.$message.error(result.data) } }) - }, + } + , //递归组装级联选择器数据源 assembleOrgData (source) { let dest = [] @@ -743,7 +800,8 @@ export default { dest.push(org) } return dest - }, + } + , setCascaderMultipleValue (value) { // this.formCustomizePeopleData = []; //清空级联选择器选中值 @@ -754,7 +812,8 @@ export default { this.formModel.permissionsPeople.push(checkV) this.formCustomizePeopleData.push(value[value.length - 1]) } - }, + } + , handleClose (model) { this.formModel.permissionsPeople.find((item, index) => { @@ -765,7 +824,8 @@ export default { return true } }) - }, + } + , } , diff --git a/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionManagement.vue b/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionManagement.vue index 097712b..80a7c91 100644 --- a/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionManagement.vue +++ b/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionManagement.vue @@ -18,7 +18,16 @@
- + + + + + 搜索
Ax('post', '/api/project/inits/conclusion/list', param), conclusionUpdate: (param) => Ax('post', '/api/project/inits/conclusion/update', param), + endExamine: (param) => Ax('post', '/api/project/inits/conclusion/examine', param), /** * 部门周报填报管理 * */