1.项目结项保存按钮修改为结项填报节点才能修改

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

@@ -72,6 +72,7 @@ export default {
   },
   data() {
     return {
+      executionEdit:'',
       tableLoading: true,
       recordsData: [],
       tableColumnsData: [],
@@ -313,7 +314,9 @@ export default {
             if (project.ext.endExecutor.includes(getItem('userId'))) {
               this.isEdit = true
             }
-            if (this.isEdit) {
+            if (this.isEdit&& project.ext.taskName=='结项填报') {
+              this.executionEdit=false//只有审核填报才能编辑项目完成情况
+              this.initFormSchema()
               this.formBtnData = [
                 {
                   title: this.formBtnTitle,
@@ -336,7 +339,7 @@ export default {
                   }
                 },
                 {
-                  title: '取消',
+                  title: '返回',
                   type: 'default',
                   callback: () => {
                     this.$router.go(-1)
@@ -346,7 +349,7 @@ export default {
             } else {
               this.formBtnData = [
                 {
-                  title: '取消',
+                  title: '返回',
                   type: 'default',
                   callback: () => {
                     this.$router.go(-1)
@@ -398,13 +401,15 @@ export default {
             }
             project.conclusionFile = project.ext.conclusionFile
             this.formModel = project
-            for (let i = 0; i < project.ext.endRecord.ls.length; i++) {
+            if(project.ext.endRecord!=null){
-              let record = project.ext.endRecord.ls[i].taskItems;
+              for (let i = 0; i < project.ext.endRecord.ls.length; i++) {
-              for (let j = 0; j < record.length; j++) {
+                let record = project.ext.endRecord.ls[i].taskItems;
-                record[j].dueDate = record[j].dueDate ? moment(record[j].dueDate).format('YYYY-MM-DD HH:mm:ss') : '';
+                for (let j = 0; j < record.length; j++) {
+                  record[j].dueDate = record[j].dueDate ? moment(record[j].dueDate).format('YYYY-MM-DD HH:mm:ss') : '';
+                }
               }
+              this.recordsData=project.ext.endRecord.ls
             }
-            this.recordsData=project.ext.endRecord.ls
             this.logOperationData = JSON.parse(JSON.stringify(this.formModel))
           }
         }
@@ -588,7 +593,7 @@ export default {
           title: '项目完成情况',
           model: 'execution',
           externalValue: {
-            disable: true
+            disabled: this.executionEdit
           }
         },
         {