#

src/App.vue

@@ -654,6 +654,8 @@
         .diaTit{     //项目名称、负责人
             width: 100%;
             display: flex;
+            box-sizing: border-box;
+            padding: 0 50px;
             .spans{
               width: auto;
               font-size: 16px;

src/components/MakerSpaceWordPreview.vue

@@ -325,6 +325,7 @@ export default {
   methods:{
     handleData(){
       //处理项目数据
+      console.log(this.data);
       let data = {},fund = [];
       Object.assign(data,this.data[0])
       Object.assign(fund,this.data[1])
@@ -446,7 +447,7 @@ export default {
                     //创客交流活动费：activities    activitiesRemarks
                     //知识产权事务费：Transaction   TransactionRemarks
             }
-            console.log(this.wordData)
+            // console.log(this.wordData)
     },
   },
   created(){

src/views/projectApply/components/projectApplicationDetails.vue

@@ -841,41 +841,5 @@
     display: block;
   }
 
-
-  // .delMemberDialog{      //删除对话框
-  //     .el-dialog{
-  //       border-radius: 5px;
-  //       overflow: hidden;
-  //     }
-  //     .deleteContent{
-  //       margin: 30px 0;
-  //       font-size: 22px;
-  //       color: #000;
-  //     }
-  //     .el-dialog__header{
-  //       background: #32455b;
-  //       display: flex;
-  //       justify-content: center;
-  //     }
-  //     .el-dialog__title{
-  //       color:#fff;
-  //       display: flex;
-  //       justify-content: center;
-  //       font-size: 18px;
-  //       position: relative;
-  //       top: -2px;
-  //     }
-  //     .el-dialog__body{
-  //       display: flex;
-  //       justify-content: center;
-  //     }
-  //     .dialog-footer{
-  //       display: flex;
-  //       justify-content: center;
-  //       box-sizing: border-box;
-
-  //     }
-  //   }
-
 }
 </style>

src/views/projectApply/projectApplication.vue

@@ -166,16 +166,23 @@
           >
           <template #default="scope">
               <div class="operations">
+                {{ scope.row.isupload }}
                         <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,0)"  size="mini" >审核0</el-button> <!--0申请人审核 -->
-                        <el-button type="primary" v-show="scope.row.apIsupload==1 && scope.row.isupload==0" class="disa" size="mini" >待审核0</el-button>
-                        <el-button type="primary" v-show="scope.row.apIsupload==1 && scope.row.isupload==1"  class="disa"  size="mini">审核中0</el-button>
-                        <el-button type="primary" v-show="scope.row.apIsupload==1 && scope.row.isupload==2" class="disa" size="mini">已审核0</el-button>
+                        <el-button type="primary" v-show="scope.row.isupload==0" @click="audit(scope.row,0)"  size="mini" >审核0</el-button> <!--0申请人审核 -->
+                        <el-button type="primary" v-show="scope.row.isupload==1 " class="disa" size="mini" >审核中</el-button>
+                        <el-button type="primary" v-show="scope.row.isupload==2"  class="disa"  size="mini">已审核</el-button>
+                        <el-button type="primary" v-show="scope.row.isupload==3" class="disa" size="mini">待结项</el-button>
+                        <el-button type="primary" v-show="scope.row.isupload==4" class="disa" size="mini">已结项</el-button>
+
                         
-                        <el-button  v-show="scope.row.isupload==0" type="primary" size="mini" @click="audit(scope.row,1)">审核1</el-button>   <!--1管理员审核 -->
-                        <el-button  v-show="scope.row.isupload==1" type="primary" class="disa" size="mini">审核中1</el-button>
+                        <el-button  v-show="scope.row.isupload==0" type="primary" class="disa" size="mini">审核1</el-button>   <!--1管理员审核 -->
+                        <el-button  v-show="scope.row.isupload==1" type="primary" size="mini" @click="audit(scope.row,1)">审核1</el-button>
                         <el-button  v-show="scope.row.isupload==2" type="primary" class="disa" size="mini">已审核1</el-button>
+                        <el-button  v-show="scope.row.isupload==3" type="primary" class="disa" size="mini">待结项</el-button>
+                        <el-button  v-show="scope.row.isupload==4" type="primary" class="disa" size="mini">已结项</el-button>
+
+
 
                         <el-button type="primary"  size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button>
 
@@ -203,7 +210,7 @@
           title="立项审核"
           :visible.sync="dialogVisible"
           class="pageSubmitData"
-          width="600px"
+          width="700px"
           :before-close="init">
         
           <div class="diaTit">
@@ -273,7 +280,7 @@
         title="文档预览"
         :visible.sync="WordPreview"
         width="60%"
-        class="addDialog">
+        class="pageSubmitData">
         <div class="addDialogLogo">LOGO</div>
         <MakerSpaceWordPreview v-if="PreviewTid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'" :data="PreviewData"/>
         <studentMakerProjectPreview v-if="PreviewTid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'" :data="PreviewData"/>
@@ -282,11 +289,12 @@
           <el-button @click="WordPreview = false" class="AllDialogBtn" >取消</el-button>
         </span>
         </el-dialog>
+        
       <el-dialog
       title="文档预览"
       :visible.sync="WordPreview"
       width="60%"
-      class="addDialog">
+      class="pageSubmitData">
       <div class="addDialogLogo">LOGO</div>
       <MakerSpaceWordPreview v-if="PreviewTid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf' && WordPreview" :data="PreviewData"/>
       <studentMakerProjectPreview v-if="PreviewTid == '2f4c6e78-f2e7-11ed-a3f6-509a4c5b67cf' && WordPreview" :data="PreviewData"/>
@@ -383,9 +391,9 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
           this.dialogVisible2=false;
         },
         audit(val,num){      //审核按钮
-          this.isManager=num;
-          this.iid=val   //将要删除的id进行存储供删除对话框使用
-          if (val.isupload==0) {
+            this.isManager=num;
+            this.iid=val   //储存id给对话框
+          // if (val.isupload==0) {
             this.dialogVisible=true;
             // console.log(val);
             this.auditDialog.projectName=val.title;
@@ -394,7 +402,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             this.auditDialog.fund=val.fund;
             this.auditDialog.tel=val.phone || '-';
             // this.auditDialog.cid=courseId
-          }
+          // }
             
             
         },
@@ -406,8 +414,8 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
               pid:pid
             }).then(res=>{
               // console.log(res['data']);
-              // MakerStudentWord(res['data'][0][0],res['data'][1]);
               this.PreviewData = [res['data'][0][0],res['data'][1]];
+              
               // return console.log(this.PreviewData);
               this.WordPreview = true;
               this.PreviewTid = tid;
@@ -436,10 +444,12 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
           // console.log(this.iid);
             let param={
               uid:this.$store.state.userInfo.userid,
-              pid:this.iid.courseId
+              pid:this.iid.courseId,
+              num:2
             }
             this.ajax
-                .post(this.$store.state.api+"/ApproveProject",param)
+                // .post(this.$store.state.api+"/ApproveProject",param)
+                .post(this.$store.state.api+"/updateIsupload",param)
                 .then(res=>{
                     // console.log(res);
                     this.dialogVisible=false;
@@ -449,14 +459,14 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
                   console.log(err);
                 })
         },
-        ApplyPersonCommit(){  //立项审核对话框里面的申请人审核按钮
+        ApplyPersonCommit(){  //申请人审核按钮
           let param={
               uid:this.$store.state.userInfo.userid,
               pid:this.iid.courseId,
               num:1
             }
           this.ajax
-              .post(this.$store.state.api+"/updateRejectProjectApply",param)
+              .post(this.$store.state.api+"/updateIsupload",param)    //updateIsupload
               .then(res=>{
                 this.dialogVisible=false
                 this.$message.success('已提交')
@@ -470,7 +480,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
               num:0
             }
           this.ajax
-              .post(this.$store.state.api+"/updateRejectProjectApply",param)
+              .post(this.$store.state.api+"/updateIsupload",param)
               .then(res=>{
                 this.dialogVisible=false
                 this.$message.success('已驳回项目申请')
@@ -482,7 +492,6 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
         commit2(val){   //立项撤回对话框里面的确定撤回按钮
           this.dialogVisible1=false;
           this.status--
-          // console.log(this.status);
         },
 
         handleSelectionChange(val) {   //批量选择功能后续可能用到 
@@ -519,7 +528,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
                 let data=res.data;
-                // console.log(data);
+                console.log(data);
                 if (data[0].length==0 && data[5][0]['total'] != 0) {
                   this.table.currentPage=1
                   return this.getData()
@@ -605,79 +614,79 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
     height: 0;
   }
 
-  .addDialog{          //删除对话框
-  font-size: 18px;
-  .el-dialog{
-    border-radius: 5px;
-    overflow: hidden;
-  }
-  .el-dialog__body{
-    display: flex;
-    justify-content: center;
-  }
-  .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;
-     position: relative;
-     top: -2px;
-  }
-  .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;
+//   .addDialog{          //文档预览
+//   font-size: 18px;
+//   .el-dialog{
+//     border-radius: 5px;
+//     overflow: hidden;
+//   }
+//   .el-dialog__body{
+//     display: flex;
+//     justify-content: center;
+//   }
+//   .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;
+//      position: relative;
+//      top: -2px;
+//   }
+//   .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;
-    }
-    .addDialogCon{
-      margin-top: 20px;
-    }
-  }
-  .dialog-footer{
-    display: flex;
-    justify-content: center;
-    box-sizing: border-box;
-  }
-}
+//       }
+//     }
+//     .addDialogTit1{
+//       display: flex;
+//       justify-content: space-between;
+//       margin-bottom: 15px;
+//     }
+//     .addDialogTit2{
+//       margin-top: 10px;
+//       font-size: 16px;
+//       color: #000;
+//       text-indent: 2em;
+//     }
+//     .addDialogCon{
+//       margin-top: 20px;
+//     }
+//   }
+//   .dialog-footer{
+//     display: flex;
+//     justify-content: center;
+//     box-sizing: border-box;
+//   }
+// }
 
  
 }

src/views/projectApply/projectApplicationApplyMain.vue

@@ -269,6 +269,7 @@
                 this.ajax
                       .get(this.$store.state.api+'/SelectAllType',param)
                       .then(res=>{
+                        console.log(res.data);
                         //获取主分类
                         let master = res.data[0].filter(item=>item['pid']=='');
                         //获取子分类
@@ -279,6 +280,7 @@
                             label:item['name'],
                             children:[],
                           }
+                        // console.log(master);
                           minion.forEach(min=>{
                             if(min['pid']==item['id']){
                               let minType = {
@@ -290,7 +292,9 @@
                           })
                           TypeList.push(type);
                         })
+                        // console.log(TypeList);
                         this.projectApplicationApply1.sortOptions = TypeList;
+                        
                       },err=>{
                         console.log(err);
                       })
@@ -340,7 +344,7 @@
                 this.InsertProjectMakerSpace();
               }
             },
-            submitData(){  //提交页面所有数据
+            submitData(){  //提交学生创业项目
 
               let a=this.projectApplicationApply1;
               let b=this.projectApplicationApply2;
@@ -384,7 +388,6 @@
                     if(cEmpty.test(param[i]))return this.$message.error("请输入预算经费")
                     break;
                   case 'Mul':
-                    console.log(111);
                     if(!JSON.parse(param[i]).length) return this.$message.error("请选择优先支持项目")
                     break;
                   case 'schoolRemould':
@@ -411,21 +414,6 @@
                     break;
                 }
               }
-              // return console.log(a.textarea.length);
-
-              // if(a.select.projectName=='') return this.$message.error('请输入项目名称')
-              // if(a.select.leader=='') return this.$message.error('请输入项目负责人')
-              // if(a.select.department=='') return this.$message.error('请选择所在部门')
-              // if(!a.select.MultiSelectProjectNameS[0]) return this.$message.error('请选择优先支持项目')
-              // if(a.select.tel=='') return this.$message.error('请输入联系电话')
-              // if(a.select.projectDate=='') return this.$message.error('请选择项目开始时间')
-              // if(a.select.fund=='') return this.$message.error('请输入预算总经费')
-              // if(a.select.fund=='') return this.$message.error('请选择美丽校园改造计划')
-              // if(a.select.person=='') return this.$message.error('请选择项目申请人')
-              // if(!a.telVerify) return this.$message.error('请输入正确联系电话格式')
-              // if(a.tableTeacherData.length<2 || a.tableTeacherData.length>3) return this.$message.error('老师成员2-3人')
-              // if(a.tableStudentData.length<5) return this.$message.error('学生成员5人以上')
-
               // return console.log(param);
                 this.ajax
                       .post(this.$store.state.api+'/InsertProjectStudent',param)
@@ -457,7 +445,7 @@
                 course_student:JSON.stringify(this.MakerSpace.studentData),//学生团队
                 brief:this.MakerSpace.textarea,//项目简介
                 chapters:JSON.stringify(this.MakerSpace2),//项目内容
-                typeid:this.pageType[0],//分类一级ID，
+                typeid:this.pageType[0],//分类一级ID
                 typeName:this.pageType[1],//分类二级
                 mon:JSON.stringify(this.projectApplicationApply3),//预算经费,
               }