#

src/views/projectApply/projectApplication.vue

@@ -81,8 +81,8 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
-        class="fontSize"
-        style="height: 500px;"
+        class="fontSize core_dialogue"
+        style="height: 480px;overflow: auto;"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         @selection-change="handleSelectionChange">
         <!-- selection-change批量选择功能后续可能用到 -->
@@ -157,9 +157,9 @@
                         <el-button type="primary"  size="mini" @click="lookDetail(scope.row.courseId)">查看详情</el-button>
                         <!-- <el-button type="primary"  size="mini" @click="audit(scope.row)">{{(status==-1?"审核": status?"撤回":"审核")}}</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-if="scope.row.isupload==0" type="primary" size="mini" @click="audit(scope.row)">审核</el-button>
-                        <el-button v-if="scope.row.isupload==1" type="info" disabled size="mini">审核中</el-button>
-                        <el-button v-if="scope.row.isupload==2" type="info" disabled size="mini">已审核</el-button>
+                        <el-button v-if="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 type="primary"  size="mini" @click="appTable(scope)" >申请表</el-button>
                         <el-button type="primary"  size="mini" @click="del(scope.row)">删除</el-button>
@@ -309,7 +309,7 @@
           // 分页数据
           table:{
             total:0,
-            packageSize:10,
+            packageSize:8,
             currentPage:1
           },   
           tableData:[],    //列表数据
@@ -373,7 +373,7 @@
           // }
           // console.log(val);
           // this.dialogVisible2=true
-          // this.iid=val   //将要删除的id进行存储供删除对话框使用
+          this.iid=val   //将要删除的id进行存储供删除对话框使用
           if (val.isupload==0) {
             this.dialogVisible=true;
             console.log(val);
@@ -382,8 +382,6 @@
             this.auditDialog.department=val.name;
             this.auditDialog.fund=val.money;
             this.auditDialog.tel=val.phone;
-          }else if(val.isupload==2){
-
           }
             
             
@@ -392,6 +390,7 @@
           
         },
         commit(){    //立项审核对话框里面的确定提交按钮
+          console.log(this.iid);
             let param={
               uid:this.$store.state.userInfo.userid,
               pid:this.iid.courseId
@@ -401,8 +400,8 @@
                 .then(res=>{
                     console.log(res);
                     this.dialogVisible=false;
-                    this.$message.success('审核成功')
-                    
+                    this.$message.success('提交成功')
+                    this.getData()
                 },err=>{
                   console.log(err);
                 })
@@ -450,10 +449,11 @@
             lim:this.table.packageSize  //限制获取几页
           }
           // return console.log(param);
+          console.log(param)
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                // console.log(res.data);
+                console.log(res.data);
                 let data=res.data;
                 let a=this.options;
                 this.tableData=data[0];
@@ -461,6 +461,7 @@
                 a.department=data[2];
                 a.sort=data[3];
                 a.person=data[4];
+                this.table.total=data[5][0].total
               },err=>{
                 console.log(err);
               })  
@@ -498,7 +499,7 @@
         handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
           // console.log(`当前页: ${val}`);
           this.table.currentPage=val
-          this.getCourseManagement()
+          this.getData()
         },
       },
       watch:{    //监视选择框的变化，实施刷新表格数据

src/views/projectApply/projectApplicationApplyMain.vue

@@ -73,12 +73,12 @@
                 },
                 options: [],  //部门下拉框
                 sortOptions: [], //分类下拉框
-                textarea:'',   //项目简介
+                textarea:'ertbh n',   //项目简介
                 Member:{    //添加成员
                     id:'',
-                    name:'',
-                    class:'',
-                    phone:''
+                    name:'23',
+                    class:'23',
+                    phone:'23'
                 },
                 Member2:{    //修改成员
                     id:'',
@@ -90,11 +90,11 @@
                     
             },
             projectApplicationApply2:{  //项目内容页面
-                  contentOne:'',
-                  contentTwo:'',
-                  contentThree:'',
-                  contentFour:'',
-                  contentFive:'',
+                  contentOne:'12',
+                  contentTwo:'12',
+                  contentThree:'12',
+                  contentFour:'12',
+                  contentFive:'12',
             },
             projectApplicationApply3:{  //预算经费页面
                 tableData:  // 经费月支出计划列表数据默认显示数据
@@ -279,6 +279,7 @@
                         console.log(res)
                         if(res.data==1){
                           this.$message.success("创建成功")
+                          this.$router.push('projectApplication')
                         }
                       },err=>{
                         console.log(err);

src/views/projectApply/projectApplicationDetails.vue

@@ -194,6 +194,24 @@
             </div>
       </el-dialog>
       <!--添加成员查看详情dialog对话框结束 -->
+
+       <!-- 修改对话框开始 -->
+       <el-dialog
+          title="提示"
+          :visible.sync="submitHint"
+          width="600px"
+          class="projectApplicationfundAddDialog"
+          style="top: 120px;"
+          :before-close="init">
+          <div class="addDialogLogo">LOGO</div>
+          <div class="deleteContent">确定提交“×××”项目立项？</div>
+          <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="init" class="btn5">确认提交</el-button>
+            <el-button @click="init" class="btn5" style="background:#cccccc" size="small">取消</el-button>
+          </span>
+        </el-dialog>
+      <!-- 修改对话框结束 -->
+      
   </div>
 </template>
 
@@ -201,7 +219,7 @@
     export default {
       data() {
         return {
-
+          submitHint:false,
           addMemberDialog:false,
           select:{    //数据详情框数据
             project:'',   
@@ -243,7 +261,7 @@
           this.$router.push('/projectApplication2')
         },
         audit(){    //立即审核按钮
-          this.$message.success('审核成功')
+          this.$message.success('修改成功')
         },
         back(){     //返回按钮
           this.$router.push('/projectApplication')
@@ -309,7 +327,79 @@
 <style lang="less">
 .projectApplication1{
 
-
+   //提交对话框开始
+   .projectApplicationfundAddDialog{  
+ 
+ .el-dialog__header{
+   border-radius: 10px 10px 0 0;
+ }
+ .el-dialog{
+   border-radius:10px ;
+ }
+ 
+ .deleteContent{
+   width: 100%;
+   text-align: center;
+   font-size: 22px;
+   color: #000;
+ }
+ .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{
+   // text-align: center;
+   margin-left:250px;
+   font-size: 22px;
+   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;
+ }
+}
+}
+//提交对话框结束
 
   .projectApplicationDetailsAddMember{     //查看详情对话框样式
     .el-input__inner{