yuanyiming 2 năm trước cách đây
mục cha
commit
1b2b1e6b1b

+ 8 - 2
src/views/projectManage/ProjectManagement.vue

@@ -108,9 +108,15 @@
             <div class="classBlockBtn">
               <el-button type="primary" class="bt1" size="mini" @click="scheduleDetail(item.courseId)">进度详情</el-button>
               <el-button type="primary" class="bt1" size="mini" @click="fundStatus(item.courseId)">资金情况</el-button>
-              <el-button type="primary" class="bt1" size="mini" v-if="item.endProject==0" @click="finish(item.courseId,item.title)">结项</el-button>
 
-              <el-button type="info" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="item.endProject==1"  size="mini">已结项</el-button>
+              <el-button type="primary" v-if="item.isupload==0"  class="bt1" @click="$message.error('请确定立项审核')" size="mini">结项</el-button>
+              
+              <el-button type="primary" v-if="item.isupload==1" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
+
+              <el-button type="primary" v-if="item.isupload==2" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"   size="mini">已结项</el-button>
+              
+              <!-- <el-button type="primary" class="bt1" size="mini" v-if="item.endProject==0" @click="finish(item.courseId,item.title)">结项</el-button> -->
+              <!-- <el-button type="info" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="item.endProject==1"  size="mini">已结项</el-button> -->
               
             </div>
        

+ 2 - 2
src/views/projectSettlement/projectSettlement.vue

@@ -131,7 +131,7 @@
           min-width="8%">
           <template #default="scope">
             <div>
-              <span v-if="scope.row.isupload == 0">未结题</span>
+              <!-- <span v-if="scope.row.isupload == 0">未结题</span> -->
               <span v-if="scope.row.isupload == 1">进行中</span>
               <span v-if="scope.row.isupload == 2">已结题</span>
               <!-- <span v-if="scope.row.isupload == 0">未结题</span> -->
@@ -150,7 +150,7 @@
                         
                         <el-button type="primary"  v-if="scope.row.isupload==1" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button>
                         <el-button type="info"  disabled v-if="scope.row.isupload==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核</el-button>
-                        <el-button type="primary" disabled v-if="scope.row.isupload==0" style="width: 73.3px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button>
+                        <!-- <el-button type="primary" disabled v-if="scope.row.isupload==0" style="width: 73.3px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button> -->
 
                         <el-button v-show="scope.row.isupload==2" type="primary" size="mini" @click="edit(scope.row.courseId)">成果查看</el-button>
                         <el-button v-show="scope.row.isupload!=2" type="info" disabled="" size="mini">成果查看</el-button>

+ 9 - 0
src/views/resultShow/resultsShow.vue

@@ -189,6 +189,15 @@
         }
      
       },
+      watch:{
+          input:{
+              handler(){
+                immediate:true
+                deep:true
+                this.getData()
+              }
+          }
+      },
       mounted(){
         this.getData();
       }