From 161ea3de25cee5f7abe793ea97b7dd8bf3fdb635 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Wed, 18 Sep 2024 18:18:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E7=BB=93=E9=A1=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=BB=93?=
 =?UTF-8?q?=E9=A1=B9=E5=A1=AB=E6=8A=A5=E8=8A=82=E7=82=B9=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conclusion/ConclusionDetail.vue           | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue b/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue
index 43e53b4..87f4590 100644
--- a/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue
+++ b/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++) {
-              let record = project.ext.endRecord.ls[i].taskItems;
-              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') : '';
+            if(project.ext.endRecord!=null){
+              for (let i = 0; i < project.ext.endRecord.ls.length; i++) {
+                let record = project.ext.endRecord.ls[i].taskItems;
+                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
           }
         },
         {