#

src/views/projectManage/ProjectManagement.vue

@@ -145,15 +145,32 @@
             <beUpload @getFile="getFile" :navName="'上传文件'" :accept="accept"> </beUpload>
           </div>
       </div>
-      <!-- <div class="DelBtn" style="margin-left: 0;" v-if="endTable.file!=''&&endTable.file!=null">
-          <el-button type="primary" @click="endTable.file=''">删除文件</el-button>
-      </div> -->
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="ending" class="diaBtn">确认提交</el-button>
         <el-button @click="init" class="diaBtn">取消</el-button>
       </div>
     </el-dialog>
 
+
+<!-- 提示哪些活动没有完成开始 -->
+  <el-dialog
+      title="提示"
+      :visible.sync="NoReportActivity"
+      width="600px"
+      class="endDialog"
+      :before-close="init">
+      <div class="addDialogLogo">LOGO</div>
+      <div class="deleteContent">"{{ tit }}"项目,有以下活动未完结！</div>
+      <div class="download checkActivity">
+            <span v-for="(item,index) in checkActivityFinishData" :key="index">{{ item.title }}</span>
+        </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="init" class="diaBtn">确认</el-button>
+        <el-button @click="init" class="diaBtn">取消</el-button>
+      </div>
+    </el-dialog>
+<!-- 提示哪些活动没有完成结束 -->
+
     <!-- 分页 -->
     <el-pagination
       @current-change="handleCurrentChange"
@@ -181,6 +198,7 @@ import beUpload from '../../components/tool/beUpload'
           selectText:'',   //文字搜素框数据
           endDialog:false,
           DelFileDialog:false,
+          NoReportActivity:false,
           tit:'',    //完结框项目名称
           items:[],      //项目列表数据
           table:{         // 分页数据
@@ -223,10 +241,8 @@ import beUpload from '../../components/tool/beUpload'
             state:'',
             leader:'',
           },
-        
-            // Id:"",
-            // title:"",
-            file:[],
+          file:[],
+          checkActivityFinishData:[],
           
         }
       },
@@ -271,13 +287,28 @@ import beUpload from '../../components/tool/beUpload'
         },
         init(){       //对话框重置
           this.endDialog=false;
+          this.NoReportActivity = false;
         },
         finish(val,tit){     //结项对话框显示
-          this.iid=val;
-          this.tit=tit;
-          this.endDialog=true;
-          this.file=[];
-        },
+          this.checkActivityFinishData = [];
+          this.ajax.get(this.$store.state.api+"/GetActivityNoReportByPId",{
+            uid:this.$store.state.userInfo.userid,
+            pid:val
+          }).then(res=>{
+            if(res.data[0].length>0){
+              this.checkActivityFinishData = res.data[0];
+              this.tit = tit;
+              this.NoReportActivity = true;
+            }else{
+              this.iid=val;
+              this.tit=tit;
+              this.endDialog=true;
+              this.file=[];
+            }
+          }).catch(err=>{
+            console.log(err)
+          })
+        },  
         handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
           // console.log(`当前页: ${val}`);
           this.table.currentPage=val
@@ -482,7 +513,14 @@ import beUpload from '../../components/tool/beUpload'
         left: 20px; top: 15px; 
     }
   }
+  }
+  .checkActivity{
+    // float:left;
+    display: flex;
+    justify-content: flex-start !important;
+    span{
+      margin: 10px 20px;
+    }
 
-    
   }
 </style>