#

src/App.vue

@@ -145,7 +145,7 @@
         width: 100%;
         font-size: 18px;
         font-weight:bold;
-        margin-top: 20px;
+        margin-top: 40px;
         height: 29px;
         margin-bottom: 15px;
         display: flex;
@@ -176,9 +176,9 @@
           display: flex;
           position: absolute;
           right: 0;
-          top: -8px;
+          top: -4px;
           box-sizing: border-box;
-          padding: 9px 0;
+          padding: 7px 0;
           justify-content: center;
           font-size: 16px;
           width: 100px;
@@ -555,8 +555,11 @@
         .operations{   //所有表格按钮栏
           flex-shrink: 0;
           [type='button']{
+            width: 75px !important;
+            text-align: center !important;
             font-size: 14px;
             border-radius: 5px;
+            padding: 7px 11px;
           }
         }
       }
@@ -599,7 +602,7 @@
       padding: 15px 0px 10px 0px;
     }
 
-    .pageSubmitData{     //页面提交数据,删除成员，对话框样式
+    .pageSubmitData{     //页面提交数据,删除成员，审核对话框样式
         .el-dialog__header{
             display: flex;
             justify-content: center;
@@ -638,41 +641,81 @@
             position: relative;
             top: -2px;
         }
-        .addDialogMid{
-          box-sizing: border-box;
-          padding:0 60px 0 10px;
-          .addDialogTit{
+        .diaTit{     //项目名称、负责人
+            width: 100%;
             display: flex;
-            span{
-              width: 80px;
-              line-height: 40px;
-              text-align: left;
+            .spans{
+              width: auto;
+              font-size: 16px;
+              // margin-right: 10px;
+              display: inline-block;
+              text-align: justify;
+              color: #000;
+              font-size: 16px;
+              text-justify:distribute-all-lines;
+              text-align-last: justify;
+              transform: translate(0,22%);
+              margin-bottom: 10px;
             }
-          }
-          .addDialogTit1{
+            .spanCon{
+              font-size: 16px;
+              margin-top: 5px;
+              color: #a0a0a0;
+              width: 150px;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+            }
+        }
+  
+          .diaTit1{   //label和input框
             display: flex;
-            justify-content: space-between;
-            margin-bottom: 15px;
-          }
-          .addDialogTit2{
-            margin-top: 10px;
-            font-size: 18px;
-            color: #000;
-            text-indent: 2em;
-          }
-          .addDialogCon{
+            width: 80%;
             margin-top: 20px;
+            .inp{
+              width: 100%;
+            }
+            .spans1{      //label
+              min-width: 84px;
+              font-size: 16px;
+              color: #000;
+              margin-right: 10px;
+              display: inline-block;
+              text-align: justify;
+              text-justify:distribute-all-lines;
+              text-align-last: justify;
+              transform: translate(0,22%);
+            }
           }
-      }
+      //   .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;
-        // }
       }
     }
 

src/views/fundManage/makerfund.vue

@@ -120,7 +120,6 @@
         </el-table-column>
         <el-table-column
           prop="name"
-          width="150"
           align="center"
           label="所在部门"
           >

src/views/projectApply/projectApplication.vue

@@ -166,7 +166,7 @@
         </el-table-column>
         <el-table-column
           prop="operation"
-          width="350"
+          width="550"
           align="center"
           label="操作"
           >
@@ -175,10 +175,16 @@
                   <!-- <el-button type="primary" > -->
                     <!-- <el-link class="btt" type="primary" :underline="false"> -->
                         <el-button type="primary"  size="mini" @click="lookDetail(scope.row.courseId,scope.row.typeid)">查看详情</el-button>
+
+                        <el-button type="primary" v-show="scope.row.apIsupload==0" @click="audit(scope.row)" style="width: 73.3px;" size="mini" >审核0</el-button>
+                        <el-button type="primary" v-show="scope.row.apIsupload==1 && scope.row.isupload==0" style="width: 73.3px;" size="mini" >待审核0</el-button>
+                        <el-button type="primary" v-show="scope.row.apIsupload==1 && scope.row.isupload==1"  style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">审核中</el-button>
+                        <el-button type="primary" v-show="scope.row.apIsupload==1 && scope.row.isupload==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核0</el-button>
                         <!-- <el-button type="primary"  size="mini" @click="audit(scope.row)">{{(scope.row.data==1?"审核": scope.row.data==1?"正在审核":"审核")}}</el-button> -->
-                        <el-button v-show="scope.row.isupload==0" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row)">审核</el-button>
-                        <el-button type="info" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.isupload==1"  size="mini">审核中</el-button>
-                        <el-button type="info" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.isupload==2"  size="mini">已审核</el-button>
+
+                        <el-button  v-show="scope.row.isupload==0" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row)">审核1</el-button>
+                        <el-button  v-show="scope.row.isupload==1" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row)">审核中1</el-button>
+                        <el-button  v-show="scope.row.isupload==2" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row)">已审核1</el-button>
 
                         <el-button type="primary"  size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button>
                         <!-- <el-button type="primary"  size="mini"><a href="/file/附件 5 ：学校创客专项资金使用申请表.xlsx" download="创客活动.doc">申请表</a> </el-button> -->
@@ -205,7 +211,7 @@
         <!-- 分页结束 -->
 
 <!-- 立项撤回对话框开始 -->
-      <el-dialog
+      <!-- <el-dialog
         title="立项撤回提交"
         :visible.sync="dialogVisible1"
         width="700px"
@@ -255,14 +261,15 @@
             <el-button type="primary" @click="commit2" class="AllDialogBtn" >确认提交</el-button>
             <el-button @click="init" class="AllDialogBtn">取消</el-button>
           </div>
-      </el-dialog>
+      </el-dialog> -->
 <!-- 立项撤回对话框开始 -->
 
 <!-- 立项审核对话框开始 -->
       <el-dialog
           title="立项审核"
           :visible.sync="dialogVisible"
-          class="dialogWidth"
+          class="pageSubmitData"
+          width="700px"
           :before-close="init">
         
           <div class="diaTit">
@@ -275,26 +282,39 @@
 
             <div class="diaTit1">
               <div class="spans1">所在部门</div>
-              <div>
+              <div class="inp">
                 <el-input disabled v-model="auditDialog.department" placeholder="所在部门"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">预算总经费</div>
-              <div>
+              <div class="inp">
                 <el-input disabled v-model="auditDialog.fund" placeholder="预算总经费"></el-input>
               </div>
             </div>
 
             <div class="diaTit1">
               <div class="spans1">联系电话</div>
-              <div>
+              <div class="inp">
                 <el-input disabled v-model="auditDialog.tel" placeholder="联系电话"></el-input>
               </div>
             </div>
+            <div class="diaTit1">
+              <div class="spans1" style="position: relative;top:-24px">驳回意见</div>
+              <div class="inp">
+                <el-input
+                  type="textarea"
+                  :rows="5"
+                  resize="none"
+                  placeholder="请输入修改建议等..."
+                  v-model="rejectApplyText">
+                </el-input>
+              </div>
+            </div>
             <div slot="footer" class="dialog-footer">
               <el-button type="primary" @click="commit" class="AllDialogBtn" >确认提交</el-button>
+              <el-button type="primary" @click="rejectApply" class="AllDialogBtn" >驳回</el-button>
               <el-button @click="init" class="AllDialogBtn">取消</el-button>
             </div>
       </el-dialog>
@@ -348,6 +368,8 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
           WordPreview:false,//文档预览
           PreviewTid:"",//预览分类ID
           PreviewData:"",//预览数据
+          rejectApplyText:'',  //驳回-修改建议
+
           // 分页数据
           table:{
             total:0,
@@ -392,7 +414,7 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
                 person:'',
                 department:'',
                 fund:'',
-                tel:''
+                tel:'',
           }
         }
       },
@@ -408,17 +430,7 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
           this.dialogVisible2=false;
         },
         audit(val){      //审核按钮
-          // if(this.status==-1){
-          //   this.dialogVisible=true;
-          //   return
-          // }else if(this.status){
-          //   this.dialogVisible1=true;
-          //   return
-          // }else{
-          //   this.dialogVisible=true;
-          // }
-          // console.log(val);
-          // this.dialogVisible2=true
+
           this.iid=val   //将要删除的id进行存储供删除对话框使用
           if (val.isupload==0) {
             this.dialogVisible=true;
@@ -479,6 +491,9 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
                   console.log(err);
                 })
         },
+        rejectApply(){   //驳回申请
+
+        },
 
         commit2(val){   //立项撤回对话框里面的确定撤回按钮
           this.dialogVisible1=false;
@@ -519,6 +534,7 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
                 let data=res.data;
+                console.log(data);
                 if (data[0].length==0 && data[5][0]['total'] != 0) {
                   this.table.currentPage=1
                   return this.getData()
@@ -678,98 +694,102 @@ import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
   }
 }
 
-  .dialogWidth{    //立项审核对话框
-      .el-input__inner{
-        width: 300px;
-      }
-      .el-textarea__inner{
-        width: 430px;
-      }
-      .el-dialog{
-          width: 600px;
-          border-radius: 5px;
-          overflow: hidden;
-        }
-        .el-dialog__body{
-          padding:30px 0px 30px 70px ;
-        }
+  // .dialogWidth{    //立项审核对话框
+  //     .el-input__inner{
+  //       width: 300px;
+  //     }
+  //     .el-textarea__inner{
+  //       width: 430px;
+  //     }
+  //     .el-dialog{
+  //         width: 600px;
+  //         border-radius: 5px;
+  //         overflow: hidden;
+  //       }
+  //       .el-dialog__body{
+  //         // padding:30px 0px 30px 70px ;
+  //         display: flex;
+  //         align-items: center;
+  //         justify-content: center;
+  //         flex-wrap: wrap;
+  //       }
         
-        .el-dialog__header{
-          background: #32455b;
-        }
-        .el-dialog__title{
-          color: #fff;
-          position: relative;
-          top: -2px;
-          display: flex;
-          justify-content: center;
-          font-size: 18px;
-        }
-        .addDialogLogo{
-          width: 60px;
-        height: 30px;
-        display: flex;
-        justify-content: center;
-        line-height: 30px;
-        border-radius: 5px;
-        background: #f2f2f2;
-        position: absolute;
-        left: 20px; top: 15px; 
-        }
-        .diaTit{     //项目名称、负责人
-            width: 100%;
-            display: flex;
-            .spans{
-              width: auto;
-              font-size: 16px;
-              // margin-right: 10px;
-              display: inline-block;
-              text-align: justify;
-              color: #000;
-              font-size: 16px;
-              text-justify:distribute-all-lines;
-              text-align-last: justify;
-              transform: translate(0,22%);
-              margin-bottom: 10px;
-            }
+  //       .el-dialog__header{
+  //         background: #32455b;
+  //       }
+  //       .el-dialog__title{
+  //         color: #fff;
+  //         position: relative;
+  //         top: -2px;
+  //         display: flex;
+  //         justify-content: center;
+  //         font-size: 18px;
+  //       }
+  //       .addDialogLogo{
+  //         width: 60px;
+  //         height: 30px;
+  //         display: flex;
+  //         justify-content: center;
+  //         line-height: 30px;
+  //         border-radius: 5px;
+  //         background: #f2f2f2;
+  //         position: absolute;
+  //         left: 20px; top: 15px; 
+  //       }
+  //       .diaTit{     //项目名称、负责人
+  //           width: 100%;
+  //           display: flex;
+  //           .spans{
+  //             width: auto;
+  //             font-size: 16px;
+  //             // margin-right: 10px;
+  //             display: inline-block;
+  //             text-align: justify;
+  //             color: #000;
+  //             font-size: 16px;
+  //             text-justify:distribute-all-lines;
+  //             text-align-last: justify;
+  //             transform: translate(0,22%);
+  //             margin-bottom: 10px;
+  //           }
             
-        }
-        .spanCon{
-              font-size: 16px;
-              margin-top: 5px;
-              color: #a0a0a0;
-              width: 150px;
-              overflow: hidden;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-            }
-        .spans1{      //label
-              min-width: 84px;
-              font-size: 16px;
-              color: #000;
-              margin-right: 10px;
-              display: inline-block;
-              text-align: justify;
-              text-justify:distribute-all-lines;
-              text-align-last: justify;
-              transform: translate(0,22%);
-            }
+  //       }
+  //       .spanCon{
+  //             font-size: 16px;
+  //             margin-top: 5px;
+  //             color: #a0a0a0;
+  //             width: 150px;
+  //             overflow: hidden;
+  //             white-space: nowrap;
+  //             text-overflow: ellipsis;
+  //           }
+  //       .spans1{      //label
+  //             min-width: 84px;
+  //             font-size: 16px;
+  //             color: #000;
+  //             margin-right: 10px;
+  //             display: inline-block;
+  //             text-align: justify;
+  //             text-justify:distribute-all-lines;
+  //             text-align-last: justify;
+  //             transform: translate(0,22%);
+  //           }
           
-          .diaTit1{   //label和input框
-            display: flex;
-            width: 80%;
-            margin-top: 20px;
+  //         .diaTit1{   //label和input框
+  //           display: flex;
+  //           width: 80%;
+  //           margin-top: 20px;
             
-          }
+  //         }
           
-        .dialog-footer{
-            width: 100%;
-            display: flex;
-            justify-content: center;
-            margin-bottom: 10px;
+  //       .dialog-footer{
+  //           width: 100%;
+  //           display: flex;
+  //           justify-content: center;
+  //           margin-bottom: 10px;
            
-        }
-  }
+  //       }
+  // }
   
 }
 

src/views/projectManage/ProjectManagementFund1.vue

@@ -10,7 +10,10 @@
 
           <!-- 跳转导航开始 -->
           <div class="AppBar">
-              <div @click="content" class="AppBarActive">项目资金使用详情</div>
+              <div @click="content" class="AppBarActive">
+                项目资金使用详情
+                <div class='pr1TitBass'></div>
+              </div>
               <div @click="remark">资金申报明细</div>
           </div>
 

src/views/projectManage/ProjectManagementFund2.vue

@@ -9,7 +9,10 @@
          <!-- 跳转导航开始 -->
          <div class="AppBar">
               <div @click="content">项目资金使用详情</div>
-              <div @click="remark" class="AppBarActive">资金申报明细</div>
+              <div @click="remark" class="AppBarActive">
+                资金申报明细
+                <div class='pr1TitBass'></div>
+              </div>
           </div>
           <!-- 跳转导航结束 -->