From 13a49b21bccea71de643f9a376d5111a7ec769be Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Thu, 1 Aug 2024 16:03:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=93=E9=A1=B9=E8=AF=A6=E6=83=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AE=A1=E6=A0=B8/=E9=A9=B3=E5=9B=9E=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=88=E5=8A=9F=E8=83=BD=E6=9C=AA=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=EF=BC=89,=E9=99=84=E4=BB=B6=E5=9B=9E=E6=98=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202.=E6=B5=81=E7=A8=8B=E8=AE=BE=E7=BD=AE=EF=BC=88?= =?UTF-8?q?=E8=81=8C=E5=8A=A1=EF=BC=89=E4=B8=8B=E6=8B=89=E6=89=8B=E5=86=99?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E8=81=8C=E5=8A=A1=203.=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E8=87=AA=E4=B8=BB=E7=A0=94=E5=8F=91=E7=B1=BB=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BC=A9=E5=86=99(ZY)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/AddProjectApply.vue | 50 ++++--------- .../conclusion/ConclusionDetail.vue | 73 ++++++++++--------- .../src/pages/systemSetting/FlowSetting.vue | 5 +- 3 files changed, 60 insertions(+), 68 deletions(-) diff --git a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue index 18a1d3c..67235e8 100644 --- a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue +++ b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue @@ -4,27 +4,8 @@

新增项目

- - - - - - - - -
- - - - - - - - - -
+
+ 审核 + 驳回 +
{ + if (this.formValidate()) { + this.formSubmit() + } + } + }, + { + title: '取消', + type: 'default', + callback: () => { + this.$router.go(-1) + } + } + ] + } switch (project.ext.openRange) { case 1: project.openRange = '成果转换类' @@ -259,14 +288,15 @@ export default { permissionsPeople = permissionsPeople + ',' + permissionsPeopleList[j].label } project.execution = project.ext.execution - // project.conclusionFile = project.ext.conclusionFile project.permissionsPeople = permissionsPeople - if (project.ext.hasOwnProperty('fileData')) { - this.formFileData = project.ext.fileData; - this.formModel.fileData = project.ext.fileData; - console.log("this.formFileData",this.formFileData) - console.log("this.formModel.fileData",this.formModel.fileData) + 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)) } @@ -396,24 +426,6 @@ export default { documentType: 2, year: moment().format('YYYY'), } - this.formBtnData = [ - { - title: this.formBtnTitle, - type: 'primary', - callback: () => { - if (this.formValidate()) { - this.formSubmit() - } - } - }, - { - title: '取消', - type: 'default', - callback: () => { - this.$router.go(-1) - } - } - ] }, initFormSchema () { this.formSchema = [ @@ -469,32 +481,27 @@ export default { { type: 'custom-upload-file', title: '附件', - model: 'fileData', + model: 'conclusionFile', externalValue: { name: 'file', actionUrl: `${baseUrl}/api/common/file-upload`, requestHeader: {}, requestData: {}, uploadFileSuccess: (response, file, fileList) => { - console.log('回调成功') - console.log(response) if (response.status === 0) { this.formFileData.push({ id: file.uid, name: file.name + '-' + getItem('userName') + '-' + getItem('orgNameStr'), url: baseUrl + response.data.url }) - for (let i = 0; i < this.formFileData.length; i++) { - this.formModel.fileData = this.formFileData[i].url - } -// this.personBaseFormModel.fileUrl = (this.formFileData); + this.fileData = this.formFileData } else { this.$message.error(response.msg) } }, uploadFilePreview: (file) => { - console.log('预览:') - console.log(file) + // console.log('预览:') + // console.log(file) window.open(file.url, '_blank') }, uploadFileRemove: (file, fileList) => { diff --git a/kehui-oa-front/src/pages/systemSetting/FlowSetting.vue b/kehui-oa-front/src/pages/systemSetting/FlowSetting.vue index f76dd22..b1ec54b 100644 --- a/kehui-oa-front/src/pages/systemSetting/FlowSetting.vue +++ b/kehui-oa-front/src/pages/systemSetting/FlowSetting.vue @@ -234,8 +234,11 @@ { label: '评价审核员', model: 'pjAuditor' + }, + { + label: '项目管理员', + model: 'projectAdmin' } - ], //职位数据源 formPeopleData: [], //人数据源 formOrgData: [], //组织部门数据源