审核逻辑完成

src/views/projectManage/ProjectManagement.vue

@@ -320,14 +320,15 @@ import { getNowDate } from '@/components/tool/Date';
             uid:this.$store.state.userInfo.userid,
             cid:this.iid,
             file:JSON.stringify(this.file),
-            num:1
+            ep:1,//管理员的待结项
+            isp:3,//教师看到的待结项
           }).then(res=>{
             if(res.data==1){
-              this.$message.success("结项成功");
+              this.$message.success("待结项成功");
               this.endDialog = false;
               this.progress.show = false;
             }else{
-              this.$message.error("结项失败")
+              this.$message.error("待结项失败")
             }
             this.getData();
           },err=>{
@@ -350,23 +351,16 @@ import { getNowDate } from '@/components/tool/Date';
           this.checkActivityFinishData = [];
           this.checkFundFinishData=[];
           this.checkFundEndData=[];
-
           this.ajax.get(this.$store.state.api+"/GetActivityNoReportByPId",{
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
-            // console.log(res.data);
-
             if(res.data[0].length>0 || res.data[1].length>0){
               this.checkActivityFinishData = res.data[0];
-              // console.log(this.checkActivityFinishData.length);
               this.checkFundFinishData = res.data[1];
-
               this.tit = tit;
               this.NoReportActivity = true;
             }else{
-              console.log(res.data);
-              // this.checkFundEndData=res.data[2]
               this.checkFundEndData=res.data[2].filter(i=>{
                 return (i.fund !=i.usedFund)
               })
@@ -414,6 +408,9 @@ import { getNowDate } from '@/components/tool/Date';
                 a.sort=data[3];
                 a.person=data[4];
                 a.yearData = data[6]
+                if(a.yearData.filter(item=>item['time']==new Date().getFullYear().toString()).length==0){
+                  a.yearData.push({time:new Date().getFullYear().toString()})
+                }
                 this.table.total=data[5][0].total
                 this.loading = false;
               },err=>{

src/views/projectManage/components/ProjectManagement1_MakerSpace.vue

@@ -237,8 +237,8 @@
       <div class="blockWidth">
         <!-- <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
 
-        <el-button v-show="isUpload==0" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
-        <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
+        <el-button v-show="isUpload==0 || isUpload ==1" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
+        <!-- <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
         <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
 
       </div>

src/views/projectManage/components/ProjectManagement2_MakerSpace.vue

@@ -43,8 +43,8 @@
   
         <div class="baseBtn">
           <div class="blockWidth">
-            <el-button type="primary" v-show="isUpload==0"  @click="submitHint=true">立即修改</el-button>
-            <el-button type="primary" disabled v-show="isUpload==1 || isUpload ==2" style="background: #ccc !important;border: none;">立即修改</el-button>
+            <el-button type="primary" v-show="isUpload==0 || isUpload==1"  @click="submitHint=true">立即修改</el-button>
+            <el-button type="primary" disabled v-show="isUpload ==2" style="background: #ccc !important;border: none;">立即修改</el-button>
             <!-- <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button> -->
   
           </div>

src/views/projectSettlement/projectSettlement.vue

@@ -256,7 +256,6 @@
           this.ajax
                 .post(this.$store.state.api+'/UpdateSettlementEndProject',param)
                 .then(res=>{
-                  console.log(res['data'])
                   this.$message.success("结项成功")
                   this.submitHint=false;
                   this.getData();
@@ -265,7 +264,6 @@
                 })
         },
         handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
-          // console.log(`当前页: ${val}`);
           this.table.currentPage=val
           this.getData()
         },

src/views/resultShow/resultsShow.vue

@@ -190,6 +190,9 @@
                 this.options2 = data[3];
                 this.options3 = data[4];
                 this.options4 = data[6];
+                if(this.options4.filter(item=>item['time']==new Date().getFullYear().toString()).length==0){
+                  this.options4.push({time:new Date().getFullYear().toString()})
+                }
                 this.Page.total = data[5][0]['total']
 
                 this.loading = false;