@

src/views/projectApply/projectApplication.vue

@@ -494,6 +494,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.person,  //负责人
             st:this.selectInp.state,  //审核状态
+            endState:"",
             year:"",
             textInp:'',
             page:this.table.currentPage,  //当前页

src/views/projectManage/ProjectManagement.vue

@@ -101,9 +101,9 @@
       <div class="classBlock" v-for="(item,index) in items" :key="index">
         <div class="projectBlockPosition">
           <!-- {{ item.isupload }} -->
-          <span v-if="item.isupload==0">未结题</span>
-          <span v-if="item.isupload==1">进行中</span>
-          <span v-if="item.isupload==2">已结题</span>
+          <span v-if="item.endProject==0">进行中</span>
+          <span v-if="item.endProject==1">待结题</span>
+          <span v-if="item.endProject==2">已结题</span>
 
         </div>
         <img :src="item.image" alt="">
@@ -120,10 +120,10 @@
             <div class="classBlockBtn">
               <span @click="scheduleDetail(item.courseId,item.typeid)">进度详细</span>
               <span @click="fundStatus(item.courseId)">资金情况</span>
-              <span v-show="item.isupload==0"  @click="$message.error('请先进行项目立项审核')">结项</span>
-              <span v-show="item.isupload==1 && (item.endFile==null)"  @click="finish(item.courseId,item.title)">结项</span>
-              <span v-show="item.isupload==1 && (item.endFile!=null)"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
-              <span v-show="item.isupload==2" style="color: gray;cursor: no-drop;">已结项</span>
+              <!-- <span v-show="item.isupload==0"  @click="$message.error('请先进行项目立项审核')">结项</span> -->
+              <span v-show="item.endProject==0"  @click="finish(item.courseId,item.title)">结项</span>
+              <span v-show="item.endProject==1"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
+              <span v-show="item.endProject==2" style="color: gray;cursor: no-drop;">已结项</span>
         
                           
             </div>
@@ -245,15 +245,15 @@ import { getNowDate } from '@/components/tool/Date';
               },
               {
                 value:0,
-                label:'未审核'
+                label:'进行中'
               },
               {
                 value:1,
-                label:'正在审核'
+                label:'待结题'
               },
               {
                 value:2,
-                label:"已审核"
+                label:"已结题"
               },
             ],
             yearData:[],
@@ -295,7 +295,6 @@ import { getNowDate } from '@/components/tool/Date';
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
-            console.log(res.data);
             this.checkFundEndData = res.data[1].filter(i=>{
               return (i.fund !=i.usedFund)
             })
@@ -323,7 +322,6 @@ import { getNowDate } from '@/components/tool/Date';
             file:JSON.stringify(this.file),
             num:1
           }).then(res=>{
-            console.log(res);
             if(res.data==1){
               this.$message.success("结项成功");
               this.endDialog = false;
@@ -338,7 +336,6 @@ import { getNowDate } from '@/components/tool/Date';
           this.endDialog=false;
         },
         scheduleDetail(val,tid){           //进度详情
-          // localStorage.setItem('pid',JSON.stringify(val))
           this.$router.push(`/ProjectManagementMain?Id=${tid}&pid=${val}`)
         },
         fundStatus(Id){     //资金情况
@@ -373,7 +370,6 @@ import { getNowDate } from '@/components/tool/Date';
               this.checkFundEndData=res.data[2].filter(i=>{
                 return (i.fund !=i.usedFund)
               })
-              console.log(this.checkFundEndData);
               this.iid=val;
               this.tit=tit;
               this.endDialog=true;
@@ -396,8 +392,9 @@ import { getNowDate } from '@/components/tool/Date';
             did:this.selectInp.department,  //部门
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.leader,  //负责人
-            st:this.selectInp.state,  //审核状态
-            year:this.selectInp.year,
+            st:2,  //审核状态
+            endState:this.selectInp.state,
+            year:this.selectInp.year, //年份
             // year:'',
             textInp:this.selectText,
             page:this.table.currentPage,  //当前页

src/views/projectManage/components/ProjectManagement1.vue

@@ -353,7 +353,8 @@
     <div class="baseBtn">
       <div class="blockWidth">
         <el-button type="primary" v-show="apIsupload==0"  @click="audit">立即修改</el-button>
-          <el-button type="primary" v-show="apIsupload==1" class="disa">立即修改</el-button>
+        <el-button type="primary" v-show="apIsupload==1" class="disa">立即修改</el-button>
+        <el-button type="primary" v-show="apIsupload==2" class="disa">立即修改</el-button>
       </div>
     </div>
 
@@ -683,7 +684,7 @@
                         this.content.textarea=data.brief
                         this.content.dialogImageUrl=data.image
                         this.pageType=[data.typeid,data.typeName]
-                        this.isUpload=data.isupload
+                        this.isUpload=data.endProject
                         this.endProject=data.endProject
                         this.loading = false;
                         this.apIsupload=data.apIsupload

src/views/projectManage/components/ProjectManagement1_MakerSpace.vue

@@ -609,7 +609,7 @@
                     this.dialogImageUrl=data.image;
                     this.select.departmentData = data['classid']
                     this.select.sort = [data['typeid'],data['typeName']]
-                    this.isUpload=data['isupload']
+                    this.isUpload=data['endProject']
                     this.select.lead_leader = data['lead_leader']
                     this.teacherData = JSON.parse(data['course_teacher'])
                     this.studentData = JSON.parse(data['course_student'])