From 8d4f05c2e0253f32351ab3567e84cb6d82d65ee7 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Thu, 25 Jul 2024 10:38:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BB=93=E9=A1=B9=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=202.=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=203.=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=89=93=E5=88=86=E5=9B=9E=E5=A4=8D=E5=B9=B3=E5=8F=B0=E6=89=93?=
 =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conclusion/ConclusionDetail.vue           | 32 +++++++++++++++----
 .../quarterlyAssessmentApply.vue              |  5 ---
 .../quarterlyEvaluationDetail.vue             |  2 +-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue b/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue
index 24fa594..381452f 100644
--- a/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/conclusion/ConclusionDetail.vue
@@ -176,7 +176,8 @@ export default {
       //获取当前用户角色
       roles: JSON.parse(getItem('roles')),
       formPeopleWeightData: [],
-      projectId: ''
+      projectId: '',
+      conclusionFile: []
     }
   },
   created () {
@@ -188,7 +189,7 @@ export default {
     this.initFormSchema()
     // this.getPersonStatus();
     this.getDocumentType()
-    this.gerProject()
+    this.getProject()
   },
   watch: {
     nuclearManData () {
@@ -210,7 +211,7 @@ export default {
     }
   },
   methods: {
-    gerProject () {
+    getProject () {
       let params = {
         pageUtil: {
           t: {
@@ -257,8 +258,17 @@ export default {
           for (let j = 1; j < permissionsPeopleList.length; j++) {
             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)
+          }
           this.formModel = project
+          this.logOperationData = JSON.parse(JSON.stringify(this.formModel))
         }
       })
     },
@@ -451,7 +461,7 @@ export default {
         {
           type: 'custom-textarea',
           title: '项目完成情况',
-          model: 'ext.execution',
+          model: 'execution',
           externalValue: {
             disable: true
           }
@@ -459,7 +469,7 @@ export default {
         {
           type: 'custom-upload-file',
           title: '附件',
-          model: 'ext.conclusionFile',
+          model: 'fileData',
           externalValue: {
             name: 'file',
             actionUrl: `${baseUrl}/api/common/file-upload`,
@@ -691,16 +701,24 @@ export default {
     },
     //表单提交
     formSubmit (data) {
+      this.$refs.childrenForm.letTextEditorSubmit()
+      console.log('this.formModel', this.formModel)
       let params = {
         map: {
           projectId: this.projectId,
-          execution: this.execution,
+          execution: this.formModel.execution,
           conclusionFile: this.formFileData
         }
       }
       Api.ProjectManagements.conclusionUpdate(params.map).then(result => {
         if (result.status === 0) {
-          console.log('result', result)
+          this.$message({
+            type: 'success',
+            message: '新增成功!'
+          })
+          this.$router.go(-1)
+        } else {
+          this.$message.error(result.data)
         }
       })
     },
diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentApply.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentApply.vue
index 4b1afbe..e8583c2 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentApply.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentApply.vue
@@ -220,11 +220,6 @@ export default {
           label: '执行部门',
           prop: 'draftDeptName',
           show: true
-        },
-        {
-          label: '状态',
-          prop: 'taskName',
-          show: true
         }
       ]
     },
diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
index 3dc3cfe..d729845 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
@@ -111,7 +111,7 @@
               <el-input
                 class="form-input"
                 placeholder="平台建设部部门主任才能打分"
-                v-model="formModel.c"
+                v-model="formModel.platformScoring"
                 :disabled="isPlatform"
               >
               </el-input>