合并

src/App.vue

@@ -237,6 +237,7 @@
 
   .addMoneyBtn{     //自定义写的的添加框
       width: 120px;
+      cursor: pointer;
       height: 40px;
       border: #000 1px dashed;
       border-radius: 5px;

src/views/ProjectManagementFund1.vue

@@ -136,6 +136,7 @@
               tooltip-effect="dark"
               stripe
               class="fontSize"
+              style="height: 320px;"
               :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
               >
               <el-table-column
@@ -171,6 +172,7 @@
               </el-table-column>
               <el-table-column
                 prop="operation"
+                align="center"
                 label="操作"
                 >
                 <template #default="scope">

src/views/ProjectManagementFund2.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="ProjectManagementFund2">
       <div class="right">
-          <div class="pAHeader">
+          <div class="pA1Header">
               <div class="pAHeader1">预算经费</div>
               <div @click="$router.back()" style="margin-top: 10px;cursor: pointer;">返回</div>
           </div>
@@ -24,6 +24,7 @@
         tooltip-effect="dark"
         stripe
         class="fontSize"
+        style="height: 550px;"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         @selection-change="handleSelectionChange">
         
@@ -321,92 +322,16 @@
   <style lang="less">
   .ProjectManagementFund2{
  
-  .pAHeader{
-      width: 90%;
-      display: flex;
-      justify-content:space-between;
-      .pAHeader1STit{
-        font-size: 14px;
-        line-height: 40px;
-      }
-      .pAHeader1{
-        width: 150px;
-        font-weight: 600;
-        font-size: 22px;
-        flex-shrink: 0;
-      }
-      .pAHeader2{
-        height: 35px;
-        line-height: 5px;
-        color: #fff;
-        background: #477edd;
-      }
-    }
      .right{
       width: 100%;
      }
-    .pmFund1Footer{
+    .pmFund1Footer{   //分页
         width: 400px;
         float: right;
         margin-top: 30px;
     }
-    .textArea{
-      display: flex;
-      justify-content: flex-start;
-        resize: none;outline: none;
-        background: #f2f2f2;
-        box-sizing: border-box;
-        padding: 10px;
-    }
-    
-    .table{
-      border: #ccc 1px solid;
-    }
-    .projectApplicationfundAddDialog{
-    position: relative;
-    .deleteContent{
-      // margin: 30px 0;
-      width: 100%;
-      text-align: center;
-      font-size: 25px;
-      color: #000;
-    }
-
-
-    /deep/ .select-popper { // 参照网上其他资料
-      z-index: 8888 !important;
-    }
-    .el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
-      background: none !important;
-    }
-    .el-select-dropdown__item{
-      text-align: left;
-    }
-
 
-    .addDialogLogo{
-      width: 60px;
-      height: 30px;
-      line-height: 30px;
-      background: #f2f2f2;
-      position: absolute;
-      left: 10px;
-      top: 10px;
-      text-align: center;
-    }
-    .el-dialog__header{
-      background: #32455b;
-    }
-    .el-dialog__title{
-      margin-left:250px;
-      color:rgb(246, 247, 246);
-    }
 
-    .dialog-footer{
-      display: flex;
-      justify-content: center;
-    }
-  }
   .projectApplicationfundAddDialog2{
 
     .el-header {
@@ -416,21 +341,10 @@
       display: flex;
       justify-content: space-between;
       align-items: center;
-      .homeExitContent{
-        color: #fff;
-        display: flex;
-        justify-content: space-between;
-        width: 150px;
-        // height: 30px;
-        .homeName{
-          float: left;
-        }
-        
-      }
     }
-
-
-
+    .el-dialog__title{
+      font-size: 22px;
+    }
     font-size: 16px !important;
     .el-dialog__header{
       display: flex;

src/views/makerActvity.vue

@@ -60,7 +60,6 @@
 <!-- 搜索框结束 -->
 
 <!-- 表格开始 -->
-    <div>
       <el-table
         ref="multipleTable"
         :data="tableData"
@@ -111,11 +110,10 @@
           label="状态"
           align="center"
           min-width="7%">
-          <!-- <template #default="scope"> -->
+          <template #default="scope">
                 <!-- {{scope.row.name + (scope.row.status==0?"":"(已屏蔽)")}} -->
                 {{status?"未报销":"已报销"}}
-        <!-- </template> -->
-
+          </template>
         </el-table-column>
         <el-table-column
           prop="date"
@@ -141,7 +139,6 @@
           </template>
         </el-table-column>
       </el-table>
-    </div>
 <!-- 表格结束 -->
 
 
@@ -316,33 +313,45 @@
         }
       },
       methods:{
-        // 活动审核对话框确定
-        commit(){
+
+
+        init(){//重置
+          this.auditDialog=false;
+          this.endDialog=false;
+          this.rejectDialog=false;
+        },
+        
+        commit(){  // 活动审核对话框确定
           this.auditDialog=false;
           this.status--
+          console.log(this.status);
         },
 
         // 驳回对话框确定
         commit2(){
           this.rejectDialog=false;
           this.status++
+          console.log(this.status);
         },
 
         end(){//完结按钮
           this.endDialog=true;
         },
-        init(){
-          //重置
-          this.auditDialog=false;
+        ending(){   //完结提交
           this.endDialog=false;
-          this.rejectDialog=false;
         },
-        // 申请表按钮
-        edit(){
+        
+        edit(){ // 申请表按钮
 
         },
-        ending(){   //完结
-          this.endDialog=false;
+             
+        audi(){  // 审核按钮
+          if(this.status){
+            this.auditDialog=true;
+            return
+          }else{
+            this.rejectDialog=true;
+          }
         },
         
         makerActvityApply(){  // 创客活动申请按钮
@@ -352,17 +361,9 @@
         MADetails(){   // 查看详情
           this.$router.push('/makerActvityDetails')
         },
-        // 审核按钮
-        audi(){
-          if(this.status){
-            this.auditDialog=true;
-            return
-          }else{
-            this.rejectDialog=true;
-          }
-          // this.rejectDialog=true;
-        }
+ 
       }
+
     }
 </script>
 

src/views/makerActvityDetails.vue

@@ -293,12 +293,13 @@ export default {
     
   .download{   //pdf下载
     margin: 20px 15px;
-    width: 230px;
+    width: 250px;
     line-height: 35px;
     text-align: left;
-    font-size: 14px;
+    font-size: 16px;
     font-weight: bold;
     color: #5391fd;
+    cursor: pointer;
   }
 
     

src/views/projectApplication.vue

@@ -87,36 +87,43 @@
         <el-table-column
           prop="projectName"
           label="项目名称"
+          align="center"
           min-width="8%">
         </el-table-column>
         <el-table-column
           prop="projectPerson"
+          align="center"
           label="项目负责人"
           min-width="9%">
         </el-table-column>
         <el-table-column
           prop="dept"
+          align="center"
           label="所在部门"
           min-width="6%">
         </el-table-column>
         <el-table-column
           prop="budget"
           label="预算"
+          align="center"
           min-width="6%">
         </el-table-column>
         <el-table-column
           prop="date"
+          align="center"
           label="开始时间"
           min-width="10%">
         </el-table-column>
         <el-table-column
           prop="tel"
+          align="center"
           label="联系电话"
           min-width="10%">
         </el-table-column>
         <el-table-column
           prop="state"
           label="状态"
+          align="center"
           min-width="6%">
           <!-- <template #default="scope"> -->
                 <div>
@@ -158,10 +165,10 @@
         class="dialogWidth"
         :before-close="init">
         <div class="diaTit">
-              <div class="spans">项目名称:</div>
-              <div class="spanCon">人工智能分链机器</div>
-              <div class="spans" style="margin-left: 50px;">项目负责人:</div>
-              <div class="spanCon">徐晓霞</div>
+              <div class="spans">项目名称</div>
+              <div class="spanCon">:人工智能分链机器</div>
+              <div class="spans" style="margin-left: 50px;">项目负责人</div>
+              <div class="spanCon">:徐晓霞</div>
         </div>
 
           <div class="diaTit1">
@@ -199,7 +206,7 @@
           </div>
           <div slot="footer" class="dialog-footer">
             <el-button @click="commit2" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
-            <el-button @click="cancel2" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+            <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
           </div>
       </el-dialog>
 <!-- 立项撤回对话框开始 -->
@@ -242,7 +249,7 @@
             </div>
             <div slot="footer" class="dialog-footer">
               <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
-              <el-button @click="cancel" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+              <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
             </div>
       </el-dialog>
 <!-- 立项审核对话框结束 -->
@@ -311,17 +318,13 @@
           this.status=1
           console.log(this.status);
         },
-        cancel(){
-          this.dialogVisible=false;
-        },
+
         commit2(){
           this.dialogVisible1=false;
           this.status--
           console.log(this.status);
         },
-        cancel2(){
-          this.dialogVisible1=false;
-        },
+
         handleSelectionChange(val) {
           console.log(val);
           this.multipleSelection = val;