From be5105b8092cb8b93b7cc07dff1478dea1a48e57 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Fri, 26 Jul 2024 14:27:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=E6=97=B6?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE=E7=BC=96=E7=A0=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=202.=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=AD=97=E6=AE=B5=203.=E9=A1=B9=E7=9B=AE=E7=AB=8B?=
 =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/AddProjectApply.vue     | 22 +++++++++---------
 .../pages/projectManagement/ProjectDetail.vue | 23 ++++++++++---------
 .../projectManagement/ProjectManagement.vue   | 15 ++++++++----
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
index 3139838..2d21c05 100644
--- a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
+++ b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
@@ -139,7 +139,7 @@ export default {
           value: 6
         },
         {
-          label: '自主研发类',
+          label: '自主研发类(ZY)',
           value: 7
         },
       ],
@@ -389,14 +389,14 @@ export default {
 
           }
         },
-        {
-          type: 'custom-input',
-          title: '项目编码',
-          model: 'projectNo',
-          externalValue: {
-            disabled: false
-          }
-        },
+        // {
+        //   type: 'custom-input',
+        //   title: '项目编码',
+        //   model: 'projectNo',
+        //   externalValue: {
+        //     disabled: false
+        //   }
+        // },
         {
           type: 'custom-input',
           title: '项目名称',
@@ -958,7 +958,7 @@ export default {
             projectCategory: 'init',
             projectStep: 'init',
             projectName: this.formModel.projectName,
-            projectNo: this.formModel.projectNo,
+            // projectNo: this.formModel.projectNo,
             projectParentId: projectParentId,
             description: this.formModel.description,
             ext: ext,
@@ -978,7 +978,7 @@ export default {
       console.log('param', param)
       param.membersList = membersList
       param['ext'] = {
-        formProjectNo: param.formProjectNo,
+        // formProjectNo: param.formProjectNo,
         membersList: param.membersList,
         // projectManagerData: this.formModel.projectManagerData,
         draftMan: param.draftMan,
diff --git a/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue b/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue
index 17c5ff0..c505ad2 100644
--- a/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue
@@ -716,14 +716,14 @@ export default {
             disabled: !this.judgeFormEditable('apply')
           }
         },
-        {
-          type: 'custom-input',
-          title: '项目编码',
-          model: 'projectNo',
-          externalValue: {
-            disabled: !this.judgeFormEditable('apply'),
-          }
-        },
+        // {
+        //   type: 'custom-input',
+        //   title: '项目编码',
+        //   model: 'projectNo',
+        //   externalValue: {
+        //     disabled: !this.judgeFormEditable('apply'),
+        //   }
+        // },
         {
           type: 'custom-input',
           title: '项目名称',
@@ -1518,7 +1518,8 @@ export default {
           if (project.hasOwnProperty('fileData')) {
             this.formFileData = project.fileData;
             this.formModel.fileData = project.fileData;
-            // this.logOperationData.fileData = JSON.parse(JSON.stringify(ext.fileData));
+            console.log("this.formFileData",this.formFileData)
+            console.log("this.formModel.fileData",this.formModel.fileData)
           }
           let getNameParams = {
             list: this.OrgIds
@@ -1763,7 +1764,7 @@ export default {
             projectCategory: 'init',
             projectStep: 'init',
             projectName: this.formModel.projectName,
-            projectNo: this.formModel.projectNo,
+            // projectNo: this.formModel.projectNo,
             description: this.formModel.description,
             ext: ext
           },
@@ -1852,7 +1853,7 @@ export default {
           projectCategory: projectCategory,
           projectStep: projectStep,
           projectName: this.formModel.projectName,
-          projectNo: this.formModel.projectNo,
+          // projectNo: this.formModel.projectNo,
           projectParentId: this.formModel.projectParentId,
           description: this.formModel.description,
           ext: ext
diff --git a/kehui-oa-front/src/pages/projectManagement/ProjectManagement.vue b/kehui-oa-front/src/pages/projectManagement/ProjectManagement.vue
index 5b34860..5ebeae8 100644
--- a/kehui-oa-front/src/pages/projectManagement/ProjectManagement.vue
+++ b/kehui-oa-front/src/pages/projectManagement/ProjectManagement.vue
@@ -190,21 +190,26 @@ export default {
     //初始化table column
     initTableColumn () {
       this.tableColumnsData = [
-        // {
-        //   label: '项目编号',
-        //   prop: 'projectNo',
-        //   show: true
-        // },
         {
           label: '所属年份',
           prop: 'applyDate',
           show: true
         },
+        {
+          label: '项目编号',
+          prop: 'projectNo',
+          show: true
+        },
         {
           label: '项目名称',
           prop: 'projectName',
           show: true
         },
+        {
+          label: '立项人',
+          prop: 'ext.draftMan',
+          show: true
+        },
         {
           label: '项目负责人',
           prop: 'projectManagerData',