From 33e32eaced8b4d8076ffbc81c662567b19dc10bc Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Wed, 10 Jul 2024 16:24:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=AA=E4=BA=BA=E5=91=A8=E6=8A=A5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=91=A8=E6=95=B0=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=202.=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B2=A1=E6=84=8F=E4=B9=89=E7=9A=84=E6=B3=A8=E9=87=8A=203.?=
 =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/ProjectManagement.vue   | 17 -----------
 .../quarterlyAssessmentApply.vue              | 29 +++++++++++++++----
 .../weekly/ExpenseClaimApplyDetail.vue        |  3 +-
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagement/ProjectManagement.vue b/kehui-oa-front/src/pages/projectManagement/ProjectManagement.vue
index ada4ce6..0005225 100644
--- a/kehui-oa-front/src/pages/projectManagement/ProjectManagement.vue
+++ b/kehui-oa-front/src/pages/projectManagement/ProjectManagement.vue
@@ -291,9 +291,6 @@ export default {
           for (let i = 0; i < result.data.ls.length; i++) {
             let project = {};
             $.extend(true, project, result.data.ls[i]);
-            // if(project.ext.hasOwnProperty("instruction")){
-            //   project["instruction"] = project.ext.instruction;
-            // }
             switch (project.ext.openRange) {
               case 1:
                 project.openRange = "成果转换类"
@@ -324,20 +321,6 @@ export default {
             }
             if (project.ext.hasOwnProperty("projectManagerData")) {
               let projectManager = project.ext.projectManagerData[1];
-              // if(self.projectStep == "execute"){
-              //   if(getItem("userInfoId") == projectManager || getItem("roles").indexOf("项目专员") != -1){
-              //     project["isShowEdit"] = project.isEdit;
-              //   }else{
-              //     project["isShowEdit"] = false;
-              //   }
-              // }
-              // if(self.projectStep == "check"){
-              //   if(getItem("userInfoId") == projectManager){
-              //     project["showAccept"] = project.isEdit;
-              //   }else{
-              //     project["showAccept"] = false;
-              //   }
-              // }
             }
             if (project.ext.hasOwnProperty("applyDate")) {
               let applyTime = moment(project.ext.applyDate).toDate();
diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentApply.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentApply.vue
index d219dd9..560309b 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentApply.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentApply.vue
@@ -59,8 +59,8 @@ export default {
       //table单选操作
       tableShowSingleOperation: {
         show: true,
-        showEdit: true,
-        showDelete: true,
+        showEdit: false,
+        showDelete: false,
         showCheck: true,
         showAnnotation: true,
         showStatus: true
@@ -109,11 +109,28 @@ export default {
       //     }
       //   }
       // })
-      let pageNoUtil = {
-        ProjectQuarterlyEvaluation: {}
+      let param = {
+        data: {
+          projectCategory: 'init',
+          activitiStatus: '-2',
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+        }
       }
-      Api.ProjectManagements.getQuarterExamine(pageNoUtil).then(result => {
+      Api.ProjectManagements.getProject(param).then(result => {
         console.log('result', result)
+        if (result.status === 0) {
+          this.tableRowsData.splice(0, this.tableRowsData.length)
+          for (let i = 0; i < result.data.ls.length; i++) {
+            let project = {}
+            $.extend(true, project, result.data.ls[i])
+            console.log('project', project)
+            project.difficultyFactor = project.ext.difficultyFactor
+            project.draftDeptName = project.ext.draftDeptName
+            this.tableRowsData.push(project)
+            this.tableTotalPage = result.data.total
+          }
+        }
       })
       // Api.ProjectManagements.getWeekly(projectWeeklyFindReq).then(result=>{
       //   this.tableRowsData = [];
@@ -185,7 +202,7 @@ export default {
         },
         {
           label: '执行部门',
-          prop: 'executeDepts',
+          prop: 'draftDeptName',
           show: true
         }
       ]
diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue
index 267187b..65077d0 100644
--- a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue
@@ -107,11 +107,12 @@
               >
               </el-input>
             </el-form-item>
-            <el-form-item label="周数" prop="week">
+            <el-form-item label="周数" prop="week" >
               <el-input
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formModel.week"
+                :disabled="true"
               >
               </el-input>
             </el-form-item>