Merge remote-tracking branch 'origin/qian' into qian

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();

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
         }
       ]

kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue

@@ -112,6 +112,7 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formModel.week"
+                :disabled="true"
               >
               </el-input>
             </el-form-item>