#

src/views/messageNotification.vue

@@ -91,7 +91,7 @@
           <el-input v-model="addMess.tit" placeholder="请输入内容"></el-input>
         </div>
         <div class="addDialogTit addDialogCon">
-          <span>通知内容</span>
+          <span style="position: relative;top: -8px;">通知内容</span>
           <el-input
             type="textarea"
             :rows="10"
@@ -443,11 +443,12 @@
       }
       .addDialogMid{
         box-sizing: border-box;
-        padding:0 60px 0 10px;
+        padding:0 30px 0 10px;
         .addDialogTit{
           display: flex;
+          justify-content: center;
           span{
-            width: 80px;
+            width: 90px;
             font-size: 16px;
             line-height: 40px;
             text-align: left;

src/views/projectManage/ProjectManagement.vue

@@ -109,17 +109,12 @@
               <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" v-show="item.isupload==0"  class="bt1" @click="$message.error('请确定立项审核')" size="mini">结项</el-button>
+              <el-button type="primary" v-show="item.isupload==0"  class="bt1" @click="$message.error('请先进行项目立项审核')" size="mini">结项</el-button>
               
-              <el-button type="primary" v-show="item.isupload==1" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</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-show="item.isupload==1 && item.endFile==''" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
+              <el-button type="primary" v-show="item.isupload==1 && item.endFile!=''" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">修改结项</el-button>
               <el-button type="primary" v-show="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>
        
       </div>
@@ -278,7 +273,6 @@ import beUpload from '../../components/tool/beUpload'
           this.endDialog=false;
         },
         finish(val,tit){     //结项对话框显示
-          // console.log(val);
           this.iid=val;
           this.tit=tit;
           this.endDialog=true;
@@ -307,6 +301,7 @@ import beUpload from '../../components/tool/beUpload'
                 console.log(res.data);
                 let data=res.data;
                 let a=this.options;
+                console.log(data[0]);
                 this.items=data[0];
                 a.projectFilter=data[1];
                 a.department=data[2];