样式修改

src/App.vue

@@ -177,17 +177,7 @@
         }
     }
 
-  .fontSize{   //所有表格字体大小
-    margin-top: 15px;
-    font-size: 16px !important;
-    .operations{   //所有表格按钮栏
-      flex-shrink: 0;
-      [type='button']{
-        font-size: 14px;
-        border-radius: 5px;
-      }
-    }
-  }
+  
   // 滚动条样式
   .core_dialogue {
       height: 100%;
@@ -381,8 +371,8 @@
         .el-dialog__title{
           color: #fff;
           position: relative;
-          top: -5px;
-          font-size: 22px;
+          top: -2px;
+          font-size: 18px;
         }
         .littleBlock{   //添加对话框 label和input框
             display: flex;
@@ -495,7 +485,6 @@
                 background: #2268bc;
             }
           }
-
         }
       }
       
@@ -509,11 +498,31 @@
         -moz-appearance:textfield;
         }
       }
+
+
+      .fontSize{   //所有表格字体大小
+        margin-top: 15px;
+        // margin-bottom: 60px;
+        font-size: 16px !important;
+        .operations{   //所有表格按钮栏
+          flex-shrink: 0;
+          [type='button']{
+            font-size: 14px;
+            border-radius: 5px;
+          }
+        }
+      }
       .paginations{
-          position: absolute;
-          right: 6%;
-          bottom: 6%;
+          position: relative;
+          display: flex;
+          justify-content: flex-end;
+          margin: 20px 50px 0 0;
+          right: 30px;
+          bottom: 0;
       }
 
 
+      // 对话框顶部样式
+      
+
 </style>

src/views/activityManage/makerActvity.vue

@@ -66,8 +66,7 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
-        class="fontSize core_dialogue"
-        style="height:65%;overflow: auto;"
+        class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
         
@@ -121,7 +120,7 @@
           prop="begin_at"
           align="center"
           label="活动时间"
-          min-width="10%">
+          min-width="12%">
           <template #default="scope">
             {{ GetTime(scope.row.begin_at)}}
           </template>
@@ -136,8 +135,10 @@
               <div class="operations">
                   <!-- <el-button type="primary" > -->
                         <el-button type="primary"  @click="MADetails(scope.row.acId)" size="mini">查看详情</el-button>
+
                         <el-button type="primary" v-if="scope.row.state==0"  @click="audi(scope.row)" size="mini">审核</el-button>
-                        <el-button type="info" disabled v-if="scope.row.state==1"  @click="audi(scope.row)" size="mini">审核</el-button>
+                        <el-button type="info" disabled style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.state==1"  @click="audi(scope.row)" size="mini">审核</el-button>
+                        
                         <el-button type="primary"  size="mini" @click="edit(scope)">申请表</el-button>
                         <el-button type="primary" v-if="scope.row.reportFile==''||scope.row.reportFile==null" size="mini" @click="end(scope.row)" >完结</el-button>
                         <el-button type="info" v-show="scope.row.reportFile!=''&&scope.row.reportFile!=null" size="mini" disabled>完结</el-button>
@@ -158,6 +159,7 @@
           :visible.sync="auditDialog"
           class="dialogWidth"
           :before-close="init">
+          <div class="addDialogLogo">LOGO</div>
         
           <div class="diaTit">
               <div class="spans">项目名称:</div>
@@ -200,6 +202,7 @@
           class="dialogWidth"
           width="700px"
           :before-close="init">
+          <div class="addDialogLogo">LOGO</div>
         
           <div class="diaTit">
               <div class="spans">项目名称:</div>
@@ -261,7 +264,7 @@
       <div class="addDialogLogo">LOGO</div>
       <div class="deleteContent">"{{ endTable.title }}"项目活动，是否确定完结？</div>
       <div class="deleteContent1">活动完结报告</div>
-      <div class="download" v-for="item in endTable.file">
+      <div class="download" v-for="(item,index) in endTable.file" :key="index">
         <div>{{ item.fileName }}</div>
         <el-button type="primary" @click="delEndTableFile(item.url)" size="mini">删除文件</el-button>
       </div>
@@ -280,12 +283,13 @@
       </div>
     </el-dialog>
     <!-- 完结对话框结束 -->
+    <!-- 分页 -->
     <el-pagination
         @current-change="CurrentChange"
         :page-size="Page.lim"
         layout=" prev, pager, next"
         background
-        class="pagination"
+        class="paginations"
         :total="Page.total">
       </el-pagination>
 
@@ -321,7 +325,7 @@ import beUpload from '../../components/tool/beUpload'
           Page:{
             nowPage:1,
             total:10,
-            lim:10
+            lim:8
           },
           processTable:{
             Id:"",
@@ -505,14 +509,26 @@ import beUpload from '../../components/tool/beUpload'
         .el-dialog__body{
           padding:30px 0px 30px 90px ;
         }
-        
+        .addDialogLogo{
+          width: 60px;
+        height: 30px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        border-radius: 5px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
+        }
         .el-dialog__header{
+          display: flex;
+          justify-content: center;
           background: #32455b;
         }
         .el-dialog__title{
           color: #fff;
           position: relative;
-          top: -5px;
+          top: -2px;
           font-size: 18px;
         }
 
@@ -581,6 +597,9 @@ import beUpload from '../../components/tool/beUpload'
       color:rgb(246, 247, 246);
       display: flex;
       justify-content: center;
+      position: relative;
+      top: -2px;
+      font-size: 18px;
     }
     .el-dialog{
           width: 600px;
@@ -617,13 +636,14 @@ import beUpload from '../../components/tool/beUpload'
 
     .addDialogLogo{
       width: 60px;
-      height: 30px;
-      line-height: 30px;
-      background: #f2f2f2;
-      position: absolute;
-      left: 10px;
-      top: 15px;
-      text-align: center;
+        height: 30px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        border-radius: 5px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
     }
   }
 }

src/views/activityManage/makerActvityApply2.vue

@@ -131,6 +131,7 @@
       position: relative;
 
       .el-dialog__header{
+        font-size: 18px;
         background: #32455b;
         justify-content: center;
       }
@@ -154,6 +155,11 @@
 
 
 .MAputIn{   //提交对话框样式
+  .el-dialog__title{
+    font-size: 24px;
+    display: flex;
+    color:rgb(246, 247, 246);
+  }
   .deleteContent{
     width: 100%;
     text-align: center;
@@ -163,6 +169,7 @@
   .addDialogLogo{
     width: 60px;
     height: 30px;
+    border-radius: 5px;
     line-height: 30px;
     background: #f2f2f2;
     position: absolute;
@@ -171,10 +178,7 @@
     text-align: center;
   }
  
-  .el-dialog__title{
-    margin-left:250px;
-    color:rgb(246, 247, 246);
-  }
+  
   
   .dialog-footer{
     display: flex;

src/views/credit/credit.vue

@@ -67,8 +67,7 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
-        class="fontSize core_dialogue"
-        style="height:65%;overflow: auto;"
+        class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
         <!-- <el-table-column
@@ -171,7 +170,7 @@
         :page-size="Page.lim"
         layout=" prev, pager, next"
         background
-        class="pagination"
+        class="paginations"
         :total="Page.total">
       </el-pagination>
     </div>
@@ -224,12 +223,14 @@
             lim:this.Page.lim,
           }).then(res=>{
             let data = res.data[0];
+            console.log(res);
             data.forEach(item=>item["course_student"] = JSON.parse(item['course_student']));
             this.options = res.data[1]
             this.options1 = res.data[2]
             this.options2 = res.data[3]
             this.options3 = res.data[4]
             this.Page.total = res.data[5][0]['total']
+            console.log(this.Page.total);
             this.tableData = data;
           }).catch(err=>{
             console.log(err)
@@ -272,20 +273,23 @@
   }
   .addDialogLogo{
     width: 60px;
-    height: 30px;
-    line-height: 30px;
-    background: #f2f2f2;
-    position: absolute;
-    left: 10px;
-    top: 10px;
-    text-align: center;
+        height: 30px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        border-radius: 5px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
   }
  
   .el-dialog__title{
-    // margin-left:250px;
     display: flex;
     justify-content: center;
     color:rgb(246, 247, 246);
+    font-size: 18px;
+    position: relative;
+    top: -2px;
   }
   
   .dialog-footer{

src/views/firm.vue

@@ -15,7 +15,7 @@
             @change="getData"
             placeholder="请输入"
           ></el-input>
-          <!-- <el-button type="primary" class="btn2" @click="getData()">查询</el-button> -->
+          <el-button type="primary" class="btn2" @click="getData">查询</el-button>
         </div>
       </div>
       <div class="upFile">
@@ -82,16 +82,17 @@
           </template>
         </el-table-column>
       </el-table>
-      <div id="footerPage">
+
+      <!-- 分页 -->
         <el-pagination
           background
           @current-change="changePage"
           layout="prev, pager, next"
           :page-size="Page.lim"
           :total="Page.total"
+          class="paginations"
         >
         </el-pagination>
-      </div>
     </div>
 
     <!-- 删除通知开始 -->
@@ -104,9 +105,7 @@
       <div class="addDialogLogo">LOGO</div>
       <span class="deleteContent">确定删除文件?</span>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="commitDel" class="btn5"
-          >确认删除</el-button
-        >
+        <el-button type="primary" @click="commitDel" class="btn5">确认删除</el-button>
         <el-button @click="dialogVisible1 = false" class="btn5">取消</el-button>
       </span>
     </el-dialog>
@@ -130,10 +129,11 @@
   </div>
 </template>
   
-  <script>
+<script>
 import beUpload from "@/components/tool/beUpload.vue";
 import vpdf from "@/components/vpdf.vue";
 import vword from "@/components/vword.vue";
+// import { Header } from 'element-ui';
 export default {
   components: { beUpload, vpdf, vword },
   data() {
@@ -142,8 +142,8 @@ export default {
       showFile: false,
       showFileType: 0,
       dialogVisible1: false,
-      delId: "",
-      input: "",
+      delId:"",
+      input:"",
       tableData: [],
       showFileUrl: "",
       Page: {
@@ -233,6 +233,15 @@ export default {
         });
     },
   },
+  watch:{
+    input:{
+      handler(){
+        immediate:true
+        deep:true
+        this.getData()
+      }
+    }                                                                       
+  },
   mounted() {
     this.getData();
   },
@@ -262,11 +271,13 @@ export default {
   }
 
   .addDialog {
-    font-size: 18px;
     .el-dialog {
       border-radius: 5px;
       overflow: hidden;
     }
+    .el-dialog__body{
+      text-align: center;
+    }
     .deleteContent {
       width: 100%;
       margin: 30px 0;
@@ -276,6 +287,9 @@ export default {
     .addDialogLogo {
       width: 60px;
       height: 30px;
+      display: flex;
+      justify-content: center;
+      border-radius: 5px;
       line-height: 30px;
       background: #f2f2f2;
       position: absolute;
@@ -289,7 +303,7 @@ export default {
     }
     .el-dialog__title {
       color: #fff;
-      font-size: 22px;
+      font-size: 18px;
     }
     .addDialogMid {
       box-sizing: border-box;
@@ -339,13 +353,13 @@ export default {
 .upFile {
   height: 40px !important;
 }
-#footerPage {
-  width: 100%;
-  position: absolute;
-  bottom: 0;
-  display: flex;
-  justify-content: flex-end;
-}
+// #footerPage {
+//   width: 100%;
+//   position: absolute;
+//   bottom: 0;
+//   display: flex;
+//   justify-content: flex-end;
+// }
 .showFileArea {
   width: 100%;
   height: 65vh;

src/views/messageNotification.vue

@@ -23,7 +23,6 @@
       :data="tableData"
       tooltip-effect="dark"
       stripe
-      style="height: 535px;"
       class="fontSize"
       :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
       >
@@ -74,8 +73,7 @@
             :page-size="table.packageSize"
             layout=" prev, pager, next"
             background
-
-            class="pagination"
+            class="paginations"
             :total="table.total">
           </el-pagination>
         <!-- 分页结束 -->
@@ -116,7 +114,7 @@
       title="删除通知"
       :visible.sync="dialogVisible1"
       width="600px"
-      class="addDialog">
+      class="delDialog">
       <div class="addDialogLogo">LOGO</div>
       <span class="deleteContent">确定删除通知?</span>
       <span slot="footer" class="dialog-footer">
@@ -341,72 +339,147 @@
     font-size: 16px;
   }
 
-
-.addDialog{
-  font-size: 18px;
-  .el-dialog{
-    border-radius: 5px;
-    overflow: hidden;
-  }
-  .deleteContent{
-    margin: 30px 0;
-    font-size: 22px;
-    color: #000;
-  }
-  .addDialogLogo{
-    width: 60px;
-    height: 30px;
-    line-height: 30px;
-    background: #f2f2f2;
-    position: absolute;
-    left: 20px; top: 15px; 
-  }
-  .el-dialog__header{
-  background: #32455b;
-  }
-  .el-dialog__title{
-    color:#fff;
-    font-size: 22px;
-  }
-  .addDialogMid{
-    box-sizing: border-box;
-    padding:0 60px 0 10px;
-    .addDialogTit{
-      display: flex;
-      span{
-        width: 80px;
-        font-size: 16px;
-        line-height: 40px;
-        text-align: left;
-        
+  .delDialog{
+      font-size: 18px;
+      .el-dialog{
+        border-radius: 5px;
+        overflow: hidden;
+      }
+      .deleteContent{
+        margin: 30px 0;
+        font-size: 22px;
+        color: #000;
+      }
+      .el-dialog__body{
+          display: flex;
+          justify-content: center;
+        }
+      .addDialogLogo{
+        width: 60px;
+        height: 30px;
+        border-radius: 5px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
+      }
+      .el-dialog__header{
+      background: #32455b;
+      }
+      .el-dialog__title{
+        color:#fff;
+        display: flex;
+        justify-content: center;
+        font-size: 18px;
+        position: relative;
+        top: -2px;
+      }
+      .addDialogMid{
+        box-sizing: border-box;
+        padding:0 60px 0 10px;
+        .addDialogTit{
+          display: flex;
+          span{
+            width: 80px;
+            font-size: 16px;
+            line-height: 40px;
+            text-align: left;
+            
+          }
+        }
+        .addDialogTit1{
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 15px;
+        }
+        .addDialogTit2{
+          margin-top: 10px;
+          font-size: 16px;
+          color: #000;
+          text-indent: 2em;
+          text-align: left;
+          line-height: 1.7em;
+        }
+        .addDialogCon{
+          margin-top: 20px;
+        }
       }
     }
-    .addDialogTit1{
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 15px;
-    }
-    .addDialogTit2{
-      margin-top: 10px;
-      font-size: 16px;
-      color: #000;
-      text-indent: 2em;
-      text-align: left;
-      line-height: 1.7em;
-    }
-    .addDialogCon{
-      margin-top: 20px;
-    }
-  }
-  .dialog-footer{
-    display: flex;
-    justify-content: center;
-    box-sizing: border-box;
-    .btn5{
-      width: 300px;
-      font-size: 16px;
+    .addDialog{
+      font-size: 18px;
+      .el-dialog{
+        border-radius: 5px;
+        overflow: hidden;
+      }
+      .deleteContent{
+        margin: 30px 0;
+        font-size: 22px;
+        color: #000;
+      }
+
+      .addDialogLogo{
+        width: 60px;
+        height: 30px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        border-radius: 5px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
+      }
+      .el-dialog__header{
+        background: #32455b;
+      }
+      .el-dialog__title{
+        color:#fff;
+        display: flex;
+        justify-content: center;
+        font-size: 18px;
+        position: relative;
+        top: -2px;
+      }
+      .addDialogMid{
+        box-sizing: border-box;
+        padding:0 60px 0 10px;
+        .addDialogTit{
+          display: flex;
+          span{
+            width: 80px;
+            font-size: 16px;
+            line-height: 40px;
+            text-align: left;
+            
+          }
+        }
+        .addDialogTit1{
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 15px;
+        }
+        .addDialogTit2{
+          margin-top: 10px;
+          font-size: 16px;
+          color: #000;
+          text-indent: 2em;
+          text-align: left;
+          line-height: 1.7em;
+        }
+        .addDialogCon{
+          margin-top: 20px;
+        }
+      }
     }
-  }
-}
+    .dialog-footer{       //对话框按钮
+        display: flex;
+        justify-content: center;
+        box-sizing: border-box;
+        .btn5{
+          width: 300px;
+          font-size: 16px;
+        }
+      }
 }
 </style>

src/views/projectApply/projectApplication.vue

@@ -532,22 +532,23 @@
   }
   .addDialogLogo{
     width: 60px;
-    height: 30px;
-    line-height: 30px;
-    background: #f2f2f2;
-    position: absolute;
-    left: 20px; top: 15px; 
-    display: flex;
-    justify-content: center;
+        height: 30px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        border-radius: 5px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
   }
   .el-dialog__header{
       background: #32455b;
      position: relative;
-     top: -5px;
+     top: -2px;
   }
   .el-dialog__title{
     color:#fff;
-    font-size: 22px;
+    font-size: 18px;
     display: flex;
     justify-content: center;
   }
@@ -611,19 +612,21 @@
         .el-dialog__title{
           color: #fff;
           position: relative;
-          top: -5px;
+          top: -2px;
           display: flex;
           justify-content: center;
           font-size: 18px;
         }
         .addDialogLogo{
           width: 60px;
-          height: 30px;
-          line-height: 30px;
-          background: #f2f2f2;
-          position: absolute;
-          left: 20px; top: 15px; 
-          text-align:center;
+        height: 30px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        border-radius: 5px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
         }
         .diaTit{     //项目名称、负责人
             width: 100%;

src/views/projectApply/projectApplication2.vue

@@ -169,7 +169,7 @@ import { VueEditor } from "vue2-editor";
  background: #32455b;
  }
  .el-dialog__title{
-   font-size: 22px;
+   font-size: 18px;
    color:rgb(246, 247, 246);
    display: flex;
    justify-content: center;

src/views/projectApply/projectApplicationApply.vue

@@ -543,7 +543,7 @@
             }
             .el-dialog__title{
               color:#fff;
-              font-size: 22px;
+              font-size: 18px;
             }
             .el-dialog__body{
               display: flex;

src/views/projectApply/projectApplicationApply3.vue

@@ -491,7 +491,7 @@ import { VueEditor } from "vue2-editor";
     }
     .fundDetail{ //经费明细添加对话框，防止冲突
         .el-dialog__title{    
-          font-size: 22px;
+          font-size: 18px;
           font-weight: 600;
         }
         .el-dialog__body{
@@ -556,7 +556,7 @@ import { VueEditor } from "vue2-editor";
         .el-dialog__title{
           color: #fff;
           position: relative;
-          top: -5px;
+          top: -2px;
           font-size: 18px;
         }
         .littleBlock{   //添加对话框 label和input框
@@ -615,7 +615,7 @@ import { VueEditor } from "vue2-editor";
             }
             .el-dialog__title{
               color:#fff;
-              font-size: 22px;
+              font-size: 18px;
             }
             .el-dialog__body{
               display: flex;

src/views/projectApply/projectApplicationApplyMain.vue

@@ -388,10 +388,12 @@
   .projectApplicationfundAddDialog{  
  
     .el-dialog__header{
-      border-radius: 10px 10px 0 0;
+
     }
     .el-dialog{
-      border-radius:10px ;
+      border-radius: 5px;
+      overflow: hidden;
+
       top: 10%;
     }
     
@@ -403,13 +405,14 @@
     }
     .addDialogLogo{
       width: 60px;
-      height: 30px;
-      line-height: 30px;
-      background: #f2f2f2;
-      position: absolute;
-      left: 10px;
-      top: 10px;
-      text-align: center;
+        height: 30px;
+        border-radius: 5px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
     }
     .el-dialog__header{
     background: #32455b;
@@ -417,7 +420,8 @@
     .el-dialog__title{
       // text-align: center;
       margin-left:250px;
-      font-size: 22px;
+      font-size: 18px;
+
       color:rgb(246, 247, 246);
     }
     .addDialogMid{

src/views/projectManage/ProjectManagement.vue

@@ -128,16 +128,11 @@
       <div class="addDialogLogo">LOGO</div>
       <div class="deleteContent">"{{ tit }}"项目，是否确定完结？</div>
       <div class="deleteContent1">活动完结报告</div>
-      <!-- <div class="download" v-if="endTable.file!=''">
-        <div>{{ endTable.file!=''&&endTable.file!=null?endTable.file.fileName:"" }}</div>
-      </div> -->
-      <!-- <div class="addMoneyBtn" style="margin-left: 0;" v-if="endTable.file==''||endTable.file==null"> -->
 
         <div class="download" v-for="item in file" :key="item.fid">
             <span>{{ item.fileName }}</span>
             <div class="downloadBtn">
-              <el-button type="primary" size="mini"  @click="download(item)">下载文件</el-button>
-              <el-button type="primary" @click="checkDelFile(item.fid)" size="mini">删除文件</el-button>
+              <el-button type="primary" @click="checkDelFile(item.url)" size="mini">删除文件</el-button>
             </div>
         </div>
 
@@ -155,19 +150,18 @@
         <el-button @click="init" class="diaBtn">取消</el-button>
       </div>
     </el-dialog>
-    <!-- 完结对话框结束 -->
 
-          <!-- 分页 -->
-          <el-pagination
-            @current-change="handleCurrentChange"
-            :current-page="table.currentPage"
-            :page-size="table.packageSize"
-            layout=" prev, pager, next"
-            background
-            class="paginations"
-            :total="table.total">
-          </el-pagination>
-        <!-- 分页结束 -->
+    <!-- 分页 -->
+    <el-pagination
+      @current-change="handleCurrentChange"
+      :current-page="table.currentPage"
+      :page-size="table.packageSize"
+      layout=" prev, pager, next"
+      background
+      class="paginations"
+      :total="table.total">
+    </el-pagination>
+  <!-- 分页结束 -->
     
   </div>
 </template>
@@ -183,6 +177,7 @@ import beUpload from '../../components/tool/beUpload'
           iid:'',
           selectText:'',   //文字搜素框数据
           endDialog:false,
+          DelFileDialog:false,
           tit:'',    //完结框项目名称
           items:[],      //项目列表数据
           table:{         // 分页数据
@@ -190,6 +185,10 @@ import beUpload from '../../components/tool/beUpload'
             packageSize:8,
             currentPage:1
           },   
+          DelFileData:{
+            fid:"",
+            fileName:"",
+          },
           options:{    //头部搜索框下拉框数据
             projectFilter:[],//项目筛选
             department:[],//部门
@@ -229,7 +228,12 @@ import beUpload from '../../components/tool/beUpload'
         }
       },
       methods:{
+
+        checkDelFile(url){   //删除文件
+          this.file = this.file.filter(item=>item.url!=url);
+        },
         getFile(val) {//上传文件
+          console.log(val);
           this.file.push(val);
           console.log(this.file);
         },
@@ -422,9 +426,9 @@ import beUpload from '../../components/tool/beUpload'
     .el-dialog__title{
       color:rgb(246, 247, 246);
       display: flex;
-      font-size: 22px;
+      font-size: 18px;
       position: relative;
-      top: -5px;
+      top: -2px;
       justify-content: center;
     }
     .el-dialog{
@@ -467,14 +471,14 @@ import beUpload from '../../components/tool/beUpload'
 
     .addDialogLogo{
       width: 60px;
-      height: 30px;
-      line-height: 30px;
-      background: #f2f2f2;
-      position: absolute;
-      left: 10px;
-      top: 15px;
-      text-align: center;
-      // border-radius: 5px;
+        height: 30px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        border-radius: 5px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
     }
   }
 

src/views/projectManage/ProjectManagement4.vue

@@ -141,8 +141,13 @@
           getFile(val) {    //上传文件
             this.file = val;
             let oldData = [];
-            this.tableData.forEach(item=>oldData.push(item))
-            oldData.push(val)
+            // console.log(this.tableData);
+            if (this.tableData!=null) {
+              this.tableData.forEach(item=>oldData.push(item))
+              oldData.push(val)
+            }else{
+                oldData.push(val)
+            }
           
             let param={
                 uid:this.$store.state.userInfo.userid,

src/views/projectManage/ProjectManagement5.vue

@@ -145,8 +145,14 @@
           getFile(val) {    //上传文件
             this.file = val;
             let oldData = [];
-            this.tableData.forEach(item=>oldData.push(item))
-            oldData.push(val)
+            if (this.tableData!=null) {
+              this.tableData.forEach(item=>oldData.push(item))
+              oldData.push(val)
+            }else{
+                oldData.push(val)
+            }
+            // this.tableData.forEach(item=>oldData.push(item))
+            // oldData.push(val)
             // console.log(oldData)
             // oldData.push(val)
             // Object.assign(oldData,this.tableData)

src/views/projectSettlement/projectSettlement.vue

@@ -132,7 +132,8 @@
           <template #default="scope">
             <div>
               <span v-if="scope.row.isupload == 0">未结题</span>
-              <span v-if="scope.row.isupload == 1">已结题</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> -->
            </div>
           </template>
@@ -145,9 +146,13 @@
           >
           <template #default="scope">
               <div class="operations">
-                        <el-button type="primary" class="bt1" size="mini" @click="details(scope.row.courseId)">查看详情</el-button>
-                        <el-button type="primary" class="bt1" size="mini">审核</el-button>
-                        <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row.id,scope.row.status)">成果查看</el-button>
+                        <el-button type="primary" size="mini" @click="details(scope.row.courseId)">查看详情</el-button>
+                        
+                        <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" size="mini" @click="edit(scope.row.id,scope.row.status)">成果查看</el-button>
               </div>
           </template>
         </el-table-column>
@@ -165,13 +170,34 @@
       :total="table.total">
     </el-pagination>
   <!-- 分页结束 -->
+
+      <!-- 提交对话框开始 -->
+      <el-dialog
+          title="提示"
+          :visible.sync="submitHint"
+          width="600px"
+          class="projectApplicationfundAddDialog"
+          :before-close="init">
+          <div class="addDialogLogo">LOGO</div>
+          <div class="deleteContent">确定“{{tit}}”完结？</div>
+          <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitAll" class="btn5">确认提交</el-button>
+            <el-button @click="init" class="btn5" style="background:#cccccc" size="small">取消</el-button>
+          </span>
+        </el-dialog>
+      <!-- 提交对话框结束 -->
   </div>
 </template>
 
 <script>
+// import { threadId } from 'worker_threads'
+
     export default {
       data() {
         return {
+          submitHint:false,
+          iid:'',
+          tit:'',
           options:{    //头部搜索框下拉框数据
             projectFilter:[],//项目筛选
             department:[],//部门
@@ -186,6 +212,10 @@
                 value:0,
                 label:'未审核'
               },
+              {
+                value:1,
+                label:'进行中'
+              },
               {
                 value:2,
                 label:"已审核"
@@ -209,6 +239,30 @@
         }
       },
       methods:{
+        init(){
+          this.submitHint=false
+        },
+        audit(cid,tit){
+            this.iid=cid;
+            this.tit=tit;
+            this.submitHint=true;
+        },
+        submitAll(){  //提交结项审核
+          let param={
+            uid:this.$store.state.userInfo.userid,
+            cid:this.iid
+          }
+          console.log(param);
+          this.ajax
+                .post(this.$store.state.api+'/UpdateSettlementIsUpload',param)
+                .then(res=>{
+                  console.log(res);
+                  this.submitHint=false;
+                  this.getData();
+                },err=>{
+                  console.log(err);
+                })
+        },
         handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
           // console.log(`当前页: ${val}`);
           this.table.currentPage=val
@@ -263,11 +317,91 @@
 <style lang="less">
 .projectSettlement{
 
+
   .pagination{   //分页
     float: right;
     margin: 20px 35px 10px;
   }
 
+
+   //提交对话框开始
+   .projectApplicationfundAddDialog{  
+ 
+      .el-dialog__header{
+        border-radius: 10px 10px 0 0;
+      }
+      .el-dialog{
+        border-radius:10px ;
+        top: 10%;
+      }
+      
+      .deleteContent{
+        width: 100%;
+        text-align: center;
+        font-size: 22px;
+        color: #000;
+      }
+      .addDialogLogo{
+        width: 60px;
+        height: 30px;
+        line-height: 30px;
+        border-radius: 5px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 10px;
+        top: 10px;
+        text-align: center;
+      }
+      .el-dialog__header{
+      background: #32455b;
+      }
+      .el-dialog__title{
+        position: relative;
+        top: -2px;
+        font-size: 18px;
+        margin-left:250px;
+        font-size: 18px;
+        color:rgb(246, 247, 246);
+      }
+      .addDialogMid{
+        box-sizing: border-box;
+        padding:0 60px 0 10px;
+        .addDialogTit{
+          display: flex;
+          span{
+            width: 80px;
+            line-height: 40px;
+            text-align: left;
+          }
+        }
+      .addDialogTit1{
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 15px;
+      }
+      .addDialogTit2{
+        margin-top: 10px;
+        font-size: 18px;
+        color: #000;
+        text-indent: 2em;
+      }
+      .addDialogCon{
+        margin-top: 20px;
+      }
+      }
+      .dialog-footer{
+      display: flex;
+      justify-content: center;
+      .btn5{
+        height: 40px;
+        font-size: 16px;
+        background: #0e72e6;
+        width: 200px;
+      }
+      }
+      }
+      //提交对话框结束
+
   .selects{
     width: 100%;
     margin-top: 20px;