1.结项详情增加审核/驳回按钮（功能未实现）,附件回显修改

2.流程设置（职务）下拉手写增加项目管理员职务
3.项目类别自主研发类增加缩写(ZY)

kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue

@@ -4,27 +4,8 @@
     <!--Page Title-->
     <div id="page-title">
       <h1 class="page-header text-overflow">新增项目</h1>
-      <!--Searchbox-->
-      <!--<div class="searchbox">-->
-      <!--<div class="input-group custom-search-form">-->
-      <!--<input type="text" class="form-control" placeholder="Search..">-->
-      <!--<span class="input-group-btn">-->
-      <!--<button class="text-muted" type="button"><i class="demo-pli-magnifi-glass"></i></button>-->
-      <!--</span>-->
-      <!--</div>-->
-      <!--</div>-->
     </div>
-    <!--End page title-->
 
-    <!--Breadcrumb-->
-    <!--<ol class="breadcrumb">-->
-    <!--<li><a href="#">Home</a></li>-->
-    <!--<li><a href="#">Layouts</a></li>-->
-    <!--<li class="active">Demo</li>-->
-    <!--</ol>-->
-    <!--End breadcrumb-->
-
-    <!--Page content-->
     <div class="page-content">
       <data-form
         element-loading-text="拼命加载中"
@@ -62,6 +43,7 @@ export default {
   },
   data () {
     return {
+      formBtnData:[],
       expandRight: false,
       isSuperAdmin: false,
       draftDeptId: '',
@@ -141,7 +123,7 @@ export default {
         {
           label: '自主研发类(ZY)',
           value: 7
-        },
+        }
       ],
       formQuarterData: [ //季度分类数据源
         {
@@ -456,19 +438,19 @@ export default {
             options: this.formProjectManagerData
           }
         },
-        {
+        // {
-          type: 'custom-cascader',
+        //   type: 'custom-cascader',
-          title: '项目管理员',
+        //   title: '项目管理员',
-          model: 'projectAdmin',
+        //   model: 'projectAdmin',
-          rules: [
+        //   rules: [
-            {required: true, message: '项目管理员不能为空'}
+        //     {required: true, message: '项目管理员不能为空'}
-          ],
+        //   ],
-          externalValue: {
+        //   externalValue: {
-            // disabled: !this.judgeFormEditable('apply'),
+        //     // disabled: !this.judgeFormEditable('apply'),
-            disable: true,
+        //     disable: true,
-            options: this.formProjectAdmin
+        //     options: this.formProjectAdmin
-          }
+        //   }
-        },
+        // },
         // {
         //   type: 'custom-cascader',
         //   title: '分管领导',
@@ -685,7 +667,7 @@ export default {
                 for (let i = 0; i < this.formFileData.length; i++) {
                   this.formModel.fileData = this.formFileData[i].url
                 }
-//                  this.personBaseFormModel.fileUrl = (this.formFileData);
+//
               } else {
                 this.$message.error(response.msg)
               }

kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue

@@ -26,6 +26,10 @@
 
     <!--Page content-->
     <div class="page-content">
+      <div style="text-align: right">
+        <el-button type="primary" @click="addExpApply(0)">审核</el-button>
+        <el-button type="warning" @click="addExpApply(1)">驳回</el-button>
+      </div>
       <data-form
         element-loading-text="拼命加载中"
         :title="formTitle"
@@ -62,6 +66,8 @@ export default {
   },
   data () {
     return {
+      isEdit: false,
+      formBtnData: [],
       expandRight: false,
       isSuperAdmin: false,
       draftDeptId: '',
@@ -225,6 +231,29 @@ export default {
         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()
+                  }
+                }
+              },
+              {
+                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')) {
+          if (project.ext.hasOwnProperty('conclusionFile')) {
-            this.formFileData = project.ext.fileData;
+            this.formFileData = project.ext.conclusionFile
-            this.formModel.fileData = project.ext.fileData;
+            this.formModel.conclusionFile = project.ext.conclusionFile
-            console.log("this.formFileData",this.formFileData)
+            console.log('this.formFileData', this.formFileData)
-            console.log("this.formModel.fileData",this.formModel.fileData)
+            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.fileData = this.formFileData
-                  this.formModel.fileData = this.formFileData[i].url
-                }
-//                  this.personBaseFormModel.fileUrl = (this.formFileData);
               } else {
                 this.$message.error(response.msg)
               }
             },
             uploadFilePreview: (file) => {
-              console.log('预览:')
+              // console.log('预览:')
-              console.log(file)
+              // console.log(file)
               window.open(file.url, '_blank')
             },
             uploadFileRemove: (file, fileList) => {

kehui-oa-front/src/pages/systemSetting/FlowSetting.vue

@@ -234,8 +234,11 @@
           {
             label: '评价审核员',
             model: 'pjAuditor'
+          },
+          {
+            label: '项目管理员',
+            model: 'projectAdmin'
           }
-
         ], //职位数据源
         formPeopleData: [], //人数据源
         formOrgData: [], //组织部门数据源