#

src/App.vue

@@ -218,7 +218,7 @@
 //   background-color: #2c5ab3;
 //   }
 
-  .select{ //活动申请填写信息区域
+  .select{      //活动申请填写信息区域
           width: 100%;
           box-sizing: border-box;
           margin-top: 30px;
@@ -343,6 +343,8 @@
           opacity: 0;
         }
       }
+
+
   .baseBtn{     //所有页面底部按钮框
     width:100%;
     display: flex;
@@ -546,7 +548,7 @@
           right: 30px;
           bottom: 0;
       }
-      .AllDialogBtn{          //对话框按钮
+      .AllDialogBtn{          //所有对话框按钮
         width: 120px;
         font-size: 16px !important;
       }
@@ -557,4 +559,81 @@
     display: flex;
     justify-content: center;
   }
+
+  .pageSubmitData{
+        .el-dialog__header{
+            display: flex;
+            justify-content: center;
+        }
+        .el-dialog{
+          border-radius: 5px;
+          overflow: hidden;
+          top: 10%;
+        }
+        
+        .deleteContent{
+          width: 100%;
+          text-align: center;
+          font-size: 22px;
+          color: #000;
+        }
+        .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;
+              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;
+        // }
+      }
+  }
 </style>

src/views/projectApply/projectApplication.vue

@@ -491,7 +491,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
-                // console.log(res);
+                console.log(res);
                 let data=res.data;
                 if (data[0].length==0 && data[5][0]['total'] != 0) {
                   this.table.currentPage=1

src/views/projectApply/projectApplicationApply.vue

@@ -74,18 +74,10 @@
                               <el-input type="number"  v-model="data.select.fund" placeholder="请输入内容"></el-input>
                               <div style="position: absolute;right: -30px;top: 10px;">(万)</div>
                           </div>
-                          <div class="inpBlock">
+                          <!-- <div class="inpBlock">
                               <div class="label">选择分类</div>
-                              <!-- <el-select v-model="data.select.sort" style="width: 100%;" placeholder="请选择">
-                                <el-option
-                                  v-for="item in data.sortOptions"
-                                  :key="item.id"
-                                  :label="item.name"
-                                  :value="item.id">
-                                </el-option>
-                              </el-select> -->
                               <el-cascader v-model="data.select.sort" :options="data.sortOptions" clearable></el-cascader>
-                          </div>
+                          </div> -->
                       </div>
                     </div>
                    

src/views/projectApply/projectApplicationApplyMain.vue

@@ -21,8 +21,12 @@
 
       <!--下方内容区开始-->
       <div class="Main_area">
-        <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-show="status==0"/>
-        <projectApplicationApply2 :data="projectApplicationApply2" :next="next" :back="back" v-show="status==1"/>
+        <!-- 学生创客项目 5e21b204-c206-11ed-a4cd-509a4c5b67cf -->
+        <!-- 特色创客空间建设项目 5f7a66d5-c206-11ed-a4cd-509a4c5b67cf -->
+        <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
+
+        <projectApplicationApply2 :data="projectApplicationApply2" :next="next" :back="back" v-if="status==1"/>
         <projectApplicationApply3 :data="projectApplicationApply3" :confirmSetFund="confirmSetFund" :data2="projectApplicationApply1" :next="next" :back="back" :submitBtn="submitBtn" v-show="status==2"/> 
       </div>
       <!--下方内容区结束-->
@@ -32,7 +36,7 @@
           title="提示"
           :visible.sync="submitHint"
           width="600px"
-          class="projectApplicationfundAddDialog"
+          class="pageSubmitData"
           :before-close="init">
           <div class="addDialogLogo">LOGO</div>
           <div class="deleteContent">确定提交“{{projectApplicationApply1.select.projectName}}”项目立项？</div>
@@ -42,6 +46,26 @@
           </span>
         </el-dialog>
       <!-- 提交对话框结束 -->
+
+      <!-- 选择分类开始 -->
+      <el-dialog
+          title="提示"
+          :visible.sync="selectType"
+          width="600px"
+          class="pageSubmitData"
+          :before-close="init">
+          <!-- <div class="addDialogLogo">LOGO</div> -->
+          <div class="" style="display: flex;align-items: center;justify-content: center;">
+              <div style="margin-right: 10px;">选择分类</div>
+              <el-cascader v-model="pageType" :options="projectApplicationApply1.sortOptions" clearable></el-cascader>
+          </div>
+
+          <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="selectTypeButton" class="AllDialogBtn">确认提交</el-button>
+            <el-button @click="selectType=false" class="AllDialogBtn">取消</el-button>
+          </span>
+        </el-dialog>
+      <!-- 选择分类结束 -->
   </div>
   </template>
   
@@ -56,8 +80,13 @@
         components:{projectApplicationApply,projectApplicationApply2,projectApplicationApply3},
         data() {
           return {
+            selectType:true,     //选择分类对话框
+            pageType:[],         //判断页面显示分类   学生创客项目    学院特色创客空间   
             status:0,   //判断顶部导航跳转
             submitHint:false,   //提交按钮
+
+
+
             projectApplicationApply1:{   //立项基础信息页面
               amendMemberDialog:false,  //修改人员对话框显示判断
                 dialogImageUrl:"",  //封面
@@ -165,6 +194,9 @@
           }
         },
         methods:{ 
+          selectTypeButton(){
+            console.log(this.pageType);
+          },
           next(){   //顶部导航栏页面下一条跳转
                 if(this.status>=2)return;
                 this.status++;
@@ -290,13 +322,19 @@
                         console.log(err);
                       })
             },
-            
+            // 提示选择分类
+
            
         },
         created(){      //实例初始化完成后调用
             this.getProjectDepartmentData()   //获取项目立项申请基础信息页面所在部门数据
             this.getProjectTypeData()   //获取项目立项申请基础信息页面分类数据
             // this.submitData()
+            // if(this.$route.query["id"]){
+            //   //弹窗
+            // }else{
+            //   // this.$route.push(`/projectApplicationApplyMain?id=`)
+            // }
         }
       }
   </script>
@@ -308,136 +346,125 @@
       display: flex;
       flex-direction: column;
       align-items: center;
-    .pAHeader3{   //返回键
-        position: absolute;
-        right: 0px;
-        top: 5px;
-        cursor: pointer;
-    }
-
-
-    // 顶部导航区
-    .vector{  //矢量图大小
-      height: 50%;
-      margin-top: 5px;
-    }
-    .Main_area{  //宽度
-      width: 75%;
-      min-height: 80%;
-      margin-bottom: 20px;
-    }
-    // 顶部导航区
-
 
   // 顶部导航区开始
-  .PAheader{
-    width: 71.4%;
-    height: 70px;
-    position: relative;
-    top: 15px;
-    border-radius: 5px;
-    background: #ffffff;
-    display: flex;
-    justify-content: center;
-    align-items: center;
- 
-      .PAheaderBlock{
-        background: #4a83d0;
-        width: 13%;
-        height: 70%;
-        border-radius: 10px;
+      .PAheader{
+        width: 71.4%;
+        height: 70px;
+        position: relative;
+        top: 15px;
+        border-radius: 5px;
+        background: #ffffff;
         display: flex;
         justify-content: center;
         align-items: center;
-        color: #fff;
-        font-size: 16px;
-        cursor: pointer;
-      }
-      .PAheaderBlock:nth-of-type(2){
-        margin: 10%;
-      }
-  }  
+    
+          .PAheaderBlock{
+            background: #4a83d0;
+            width: 13%;
+            height: 70%;
+            border-radius: 10px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: #fff;
+            font-size: 16px;
+            cursor: pointer;
+          }
+          .PAheaderBlock:nth-of-type(2){
+            margin: 10%;
+          }
+      }  
+      .vector{  //矢量图大小
+          height: 50%;
+          margin-top: 5px;
+        }
+        .Main_area{  //宽度
+          width: 75%;
+          min-height: 80%;
+          margin-bottom: 20px;
+        }
   // 顶部导航区结束
 
-   //提交对话框开始
-  .projectApplicationfundAddDialog{  
+   //提交对话框开始     选择分类
+  // .projectApplicationfundAddDialog{  
  
-    .el-dialog__header{
-        display: flex;
-        justify-content: center;
-    }
-    .el-dialog{
-      border-radius: 5px;
-      overflow: hidden;
+  //   .el-dialog__header{
+  //       display: flex;
+  //       justify-content: center;
+  //   }
+  //   .el-dialog{
+  //     border-radius: 5px;
+  //     overflow: hidden;
 
-      top: 10%;
-    }
+  //     top: 10%;
+  //   }
     
-    .deleteContent{
-      width: 100%;
-      text-align: center;
-      font-size: 22px;
-      color: #000;
-    }
-    .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;
-          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;
-    // }
-  }
-  }
+  //   .deleteContent{
+  //     width: 100%;
+  //     text-align: center;
+  //     font-size: 22px;
+  //     color: #000;
+  //   }
+  //   .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;
+  //         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;
+  //   // }
+  // }
+  // }
    //提交对话框结束
 
 
@@ -451,9 +478,6 @@
         border-radius: 5px;
    }
 
-
-
-
   // 左边栏开始
   .left{
       width: 10%;