项目申请学生

src/App.vue

@@ -165,6 +165,7 @@
           }
           span{
             font-size: 14px;
+            margin-left: 10px;
             color: gray;
           }
         }
@@ -567,7 +568,7 @@
     justify-content: center;
   }
 
-  .pageSubmitData{     //页面提交数据，数据库样式
+  .pageSubmitData{     //页面提交数据，数据框样式
         .el-dialog__header{
             display: flex;
             justify-content: center;

src/views/projectApply/projectApplicationApply.vue

@@ -34,7 +34,7 @@
                     <div class="selectMid">
                       <div class="selectLeft">
                           <div class="inpBlock">
-                              <div class="label">项目申请人</div>
+                              <div class="label">项目负责人</div>
                               <el-input v-model="data.select.leader" placeholder="请输入内容"></el-input>
                           </div>
                           <div class="inpBlock">
@@ -148,8 +148,8 @@
 
   <!-- 老师项目成员表格开始 -->
               <div id="two" class="tabTit">
-                <div><p>项目组-老师成员</p></div>
-                <el-button type="primary" @click="addStudentMember"  size="mini">添加成员</el-button>
+                <div><p>项目组-老师成员<span>(2个学院以上,团队2-3人)</span> </p></div>
+                <el-button type="primary" @click="addTeacherMember"  size="mini">添加成员</el-button>
               </div>
               <hr>
               <el-table
@@ -190,13 +190,64 @@
                   <template #default="scope">
                       <div class="operations">
                           <!-- <el-button type="primary" > -->
-                              <el-button type="primary" @click="amendStudentDialogData(scope.$index)" size="mini">修改</el-button>
-                              <el-button type="primary" @click="DelStudent(scope.$index)" size="mini">删除</el-button>
+                              <el-button type="primary" @click="amendTeacherDialogData(scope.$index)" size="mini">修改</el-button>
+                              <el-button type="primary" @click="DelTeacher(scope.$index)" size="mini">删除</el-button>
                           <!-- </el-button> -->
                       </div>
                   </template>
                 </el-table-column>
               </el-table>
+
+          <!--添加修改老师成员dialog对话框开始 -->
+            <el-dialog
+                :title= "isAddMember==1?'添加老师成员':'修改老师成员'"
+                :visible.sync="addTeacherMemberDialog"
+                :modal="true"
+                :close-on-click-modal="true"
+                class="AddMember"
+                :before-close="init">
+                  <div class="littleBlock">
+                    <div class="dialogLabel">姓名</div>
+                    <div>
+                      <el-input v-model="data.Member.name"></el-input>
+                    </div>
+                  </div>
+
+                  <div class="littleBlock">
+                    <div class="dialogLabel">班级</div>
+                    <div>
+                      <el-input v-model="data.Member.class"></el-input>
+                    </div>
+                  </div>
+
+                  <div class="littleBlock">
+                    <div class="dialogLabel">电话</div>
+                    <div>
+                      <el-input type="number" class="inputNumber" v-model="data.Member.phone" @blur="getText(data.Member.phone)" ></el-input>
+                    </div>
+                  </div>
+                  <div slot="footer" class="footer">
+                    <el-button v-show="isAddMember==1" type="primary" @click="commitAddTeacher" class="AllDialogBtn" >确认提交</el-button>
+                    <el-button v-show="isAddMember==2" type="primary" @click="commitAmendTeacher" class="AllDialogBtn" >确认修改</el-button>
+
+                    <el-button @click="init" class="AllDialogBtn">取消</el-button>
+                  </div>
+            </el-dialog>
+          <!--添加修改老师成员dialog对话框结束 -->
+
+          <!-- 删除老师成员对话框开始 -->
+          <el-dialog
+              title="删除成员"
+              :visible.sync="delTeacherMember"
+              width="600px"
+              class="delMemberDialog">
+              <span class="deleteContent">确定删除老师成员?</span>
+              <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="commitDelTeacherMember" class="AllDialogBtn">确认删除</el-button>
+                <el-button @click="init" class="AllDialogBtn" >取消</el-button>
+              </span>
+            </el-dialog>
+          <!-- 删除老师成员对话框结束 -->
   <!-- 老师项目成员表格结束 -->
 
 
@@ -206,7 +257,7 @@
 
   <!-- 学生项目成员表格开始 -->
               <div id="two" class="tabTit">
-                <div><p>项目组-学生成员</p></div>
+                <div><p>项目组-学生成员<span>(至少2个学院以上学生构成,团队5人以上)</span> </p></div>
                 <el-button type="primary" @click="addStudentMember"  size="mini">添加成员</el-button>
               </div>
               <hr>
@@ -255,12 +306,63 @@
                   </template>
                 </el-table-column>
               </el-table>
+
+          <!--添加修改学生成员dialog对话框开始 -->
+            <el-dialog
+                :title= "isAddMember==1?'添加学生成员':'修改学生成员'"
+                :visible.sync="addStudentMemberDialog"
+                :modal="true"
+                :close-on-click-modal="true"
+                class="AddMember"
+                :before-close="init">
+                  <div class="littleBlock">
+                    <div class="dialogLabel">姓名</div>
+                    <div>
+                      <el-input v-model="data.Member.name"></el-input>
+                    </div>
+                  </div>
+
+                  <div class="littleBlock">
+                    <div class="dialogLabel">班级</div>
+                    <div>
+                      <el-input v-model="data.Member.class"></el-input>
+                    </div>
+                  </div>
+
+                  <div class="littleBlock">
+                    <div class="dialogLabel">电话</div>
+                    <div>
+                      <el-input type="number" class="inputNumber" v-model="data.Member.phone" @blur="getText(data.Member.phone)" ></el-input>
+                    </div>
+                  </div>
+                  <div slot="footer" class="footer">
+                    <el-button v-show="isAddMember==1" type="primary" @click="commitAddStudent" class="AllDialogBtn" >确认提交</el-button>
+                    <el-button v-show="isAddMember==2" type="primary" @click="commitAmendStudent" class="AllDialogBtn" >确认修改</el-button>
+
+                    <el-button @click="init" class="AllDialogBtn">取消</el-button>
+                  </div>
+            </el-dialog>
+          <!--添加修改学生成员dialog对话框结束 -->
+
+          <!-- 删除学生成员对话框开始 -->
+          <el-dialog
+              title="删除成员"
+              :visible.sync="delStudentMember"
+              width="600px"
+              class="delMemberDialog">
+              <span class="deleteContent">确定删除学生成员?</span>
+              <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="commitDelStudentMember" class="AllDialogBtn">确认删除</el-button>
+                <el-button @click="init" class="AllDialogBtn" >取消</el-button>
+              </span>
+            </el-dialog>
+          <!-- 删除学生成员对话框结束 -->
   <!-- 学生项目成员表格结束 -->
 
 
   <!-- 项目简介开始 -->
             <div id="three" class="tabTit">
-                <div><p>项目简介</p></div>
+                <div><p>项目简介<span>(200-300字)</span></p></div>
             </div>
             <hr>
               <el-input
@@ -281,61 +383,8 @@
             </div>
   <!-- 结束按钮结束 -->
 
-
- 
         </div>
   <!-- 右边填写信息区域结束 -->
-
-      <!--添加成员dialog对话框开始 -->
-      <el-dialog
-          :title= "isAddMember==1?'添加成员':'修改成员'"
-          :visible.sync="addMemberDialog"
-          :modal="true"
-          :close-on-click-modal="true"
-          class="AddMember"
-          :before-close="init">
-            <div class="littleBlock">
-              <div class="dialogLabel">姓名</div>
-              <div>
-                <el-input v-model="data.Member.name"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">班级</div>
-              <div>
-                <el-input v-model="data.Member.class"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">电话</div>
-              <div>
-                <el-input type="number" class="inputNumber" v-model="data.Member.phone" @blur="getText(data.Member.phone)" ></el-input>
-              </div>
-            </div>
-            <div slot="footer" class="footer">
-              <el-button v-show="isAddMember==1" type="primary" @click="commitAddStudent" class="AllDialogBtn" >确认提交</el-button>
-              <el-button v-show="isAddMember==2" type="primary" @click="commitAmendStudent" class="AllDialogBtn" >确认修改</el-button>
-
-              <el-button @click="init" class="AllDialogBtn">取消</el-button>
-            </div>
-      </el-dialog>
-      <!--添加成员dialog对话框结束 -->
-
-      <!-- 删除成员对话框开始 -->
-            <el-dialog
-              title="删除成员"
-              :visible.sync="delMember"
-              width="600px"
-              class="delMemberDialog">
-              <span class="deleteContent">确定删除成员?</span>
-              <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="commitDelStudentMember" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="init" class="AllDialogBtn" >取消</el-button>
-              </span>
-            </el-dialog>
-      <!-- 删除成员对话框结束 -->
     </div>
   
 </template>
@@ -357,10 +406,11 @@
                 show:false
             },  
           // fileList: [],
-          dialogVisible: false,
-          addMemberDialog:false,
-          // amendMemberDialog:false,
-          delMember:false,
+          // dialogVisible: false,
+          addStudentMemberDialog:false,   //添加修改学生对话框
+          addTeacherMemberDialog:false,   //添加修改老师对话框
+          delStudentMember:false,         //删除学生对话框
+          delTeacherMember:false,         //删除老师对话框
           index:''
         }
       },
@@ -409,15 +459,15 @@
         },
         
         init(){
-          this.addMemberDialog=false;
+          this.addStudentMemberDialog=false;
           // this.data.amendMemberDialog=false
-          this.delMember=false
-
+          this.delStudentMember=false
+          this.addTeacherMemberDialog=false
         },
 
         // 项目组学生成员方法开始
                   addStudentMember(){   //添加项目成员对话框显示
-                    this.addMemberDialog=true
+                    this.addStudentMemberDialog=true
                     for(let i in this.data.Member){
                       if(i=='score')this.data.Member[i] = "0"
                       else this.data.Member[i] = "";
@@ -425,38 +475,39 @@
                     this.isAddMember=1;
                   },
                   DelStudent(val){    //删除对话框显示
-                    this.delMember=true;
+                    this.delStudentMember=true;
                     this.index=val
                   },
                   amendStudentDialogData(val){   //修改项目成员信息对话框显示
-                    Object.assign(this.data.Member,this.data.tableData[val])
+                    Object.assign(this.data.Member,this.data.tableStudentData[val])
                     this.isAddMember=2;
-                    this.data.Member['index']=val
+                    this.data.Member['index']=val    //为下面修改提供下标
                     // console.log(this.data.Member['index']);
-                    this.addMemberDialog=true
+                    this.addStudentMemberDialog=true
                   },
                   commitAddStudent(){   //确定添加成员  
+                        // console.log(this.data.Member.name);
                         if (this.data.Member.name =="" ||this.data.Member.name==undefined) return this.$message.error('请输入姓名')
                         if (this.data.Member.class=="" ||this.data.Member.class==undefined) return this.$message.error('请输入班级')
                         if (!this.data.telVerify2) return this.$message.error('请输入正确联系电话格式')
                         // this.addPerson();
                         let newData = {};
                         for(let j in this.data.Member)newData[j] = this.data.Member[j];
-                        this.data.tableData.push(newData);
+                        this.data.tableStudentData.push(newData);
                         this.$message.success('添加成功')
                         for(let i in this.data.Member){      
                           if(i=='score')this.data.Member[i] = "0"
                           else this.data.Member[i] = "";
                         }
-                        console.log(this.data.tableData)
+                        console.log(this.data.tableStudentData)
                         this.init()
                   },
 
                   commitAmendStudent(){   //确定修改成员
                         if (!this.data.telVerify2) return this.$message.error('请输入正确联系号码格式')
-                        Object.assign(this.data.tableData[this.data.Member['index']],this.data.Member)
+                        Object.assign(this.data.tableStudentData[this.data.Member['index']],this.data.Member)
                         for(let k in this.data.Member) this.data.Member[k]=''
-                        this.addMemberDialog=false;
+                        this.addStudentMemberDialog=false;
                         this.$message.success('修改成功')
 
                         console.log(this.data.tableData);
@@ -464,13 +515,69 @@
 
                   commitDelStudentMember(){   //对话框确定删除成员
                     let a=this.index;
-                    this.data.tableData.splice(a,1);
+                    this.data.tableStudentData.splice(a,1);
                     this.$message.success('删除成功');
-                    this.delMember=false;
+                    this.delStudentMember=false;
                   },
         // 项目组学生成员方法开始
 
 
+        // 项目组老师成员方法开始
+                addTeacherMember(){   //添加项目成员对话框显示
+                    this.addTeacherMemberDialog=true
+                    for(let i in this.data.Member){
+                      if(i=='score')this.data.Member[i] = "0"
+                      else this.data.Member[i] = "";
+                    }
+                    this.isAddMember=1;
+                  },
+                  DelTeacher(val){    //删除对话框显示
+                    this.delTeacherMember=true;
+                    this.index=val
+                  },
+                  amendTeacherDialogData(val){   //修改项目成员信息对话框显示
+                    Object.assign(this.data.Member,this.data.tableTeacherData[val])
+                    this.isAddMember=2;
+                    this.data.Member['index']=val    //为下面修改提供下标
+                    // console.log(this.data.Member['index']);
+                    this.addTeacherMemberDialog=true
+                  },
+                  commitAddTeacher(){   //确定添加成员  
+                        // console.log(this.data.Member.name);
+                        if (this.data.Member.name =="" ||this.data.Member.name==undefined) return this.$message.error('请输入姓名')
+                        if (this.data.Member.class=="" ||this.data.Member.class==undefined) return this.$message.error('请输入班级')
+                        if (!this.data.telVerify2) return this.$message.error('请输入正确联系电话格式')
+                        // this.addPerson();
+                        let newData = {};
+                        for(let j in this.data.Member)newData[j] = this.data.Member[j];
+                        this.data.tableTeacherData.push(newData);
+                        this.$message.success('添加成功')
+                        for(let i in this.data.Member){      
+                          if(i=='score')this.data.Member[i] = "0"
+                          else this.data.Member[i] = "";
+                        }
+                        console.log(this.data.tableTeacherData)
+                        this.init()
+                  },
+
+                  commitAmendTeacher(){   //确定修改成员
+                        if (!this.data.telVerify2) return this.$message.error('请输入正确联系号码格式')
+                        Object.assign(this.data.tableTeacherData[this.data.Member['index']],this.data.Member)
+                        for(let k in this.data.Member) this.data.Member[k]=''
+                        this.addTeacherMemberDialog=false;
+                        this.$message.success('修改成功')
+
+                        console.log(this.data.tableTeacherData);
+                  },
+
+                  commitDelTeacherMember(){   //对话框确定删除成员
+                    let a=this.index;
+                    this.data.tableTeacherData.splice(a,1);
+                    this.$message.success('删除成功');
+                    this.delTeacherMember=false;
+                  },
+        // 项目组老师成员方法开始
+
         backBtn1(){  // 上一步
           this.$router.push('/projectApplication')
         },

src/views/projectApply/projectApplicationApply2.vue

@@ -23,36 +23,88 @@
             </div>
             <hr>
             <div id="w">
-              <p class="pTit">项目创新点</p>
-              <div class="editor">
+              <p class="pTit">研发内容</p>
+              <div>
+                <p class="pTit2">一、项目研发背景</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.back"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">二、项目创新点</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.innovate"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">三、技术研发路线</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.path"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">四、项目应用场景</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.scene"></vue-editor>
+                </div>
+              </div>
+              <!-- <div class="editor">
                 <vue-editor  :editorToolbar="customToolbar" v-model="data.contentOne"></vue-editor>
+              </div> -->
+            </div>
+            <div>
+              <p class="pTit">商业模式及社会价值</p>
+              <div>
+                <p class="pTit2">一、项目商业模式/社会价值</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.worth"></vue-editor>
+                </div>
+              </div>
+            </div>
+            <div>
+              <p class="pTit">团队优势</p>
+              <div>
+                <p class="pTit2">一、团队构成及优势</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.team"></vue-editor>
+                </div>
               </div>
             </div>
+
             <div>
-              <p class="pTit">预期取得的成果</p>
+              <p class="pTit">研发成本</p>
               <div>
-                <p class="pTit2">一、项目预期成果、数量及形式</p>
+                <p class="pTit2">一、研发成本来源及构成</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.contentTwo"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.cost"></vue-editor>
                 </div>
               </div>
+            </div>
+            <div id="e">
+              <p class="pTit">预期成果</p>
               <div>
-                <p class="pTit2">二、创客人才培养预期成果、数量</p>
+                <p class="pTit2">一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
                 <div class="editor">
-                  <vue-editor  v-model="data.contentThree" :editorToolbar="customToolbar"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.expectResults"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.expectResultsTeacher"></vue-editor>
                 </div>
               </div>
               <div>
                 <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
                 <div class="editor">
-                  <vue-editor :editorToolbar="customToolbar" v-model="data.contentFour"></vue-editor>
+                  <vue-editor  :editorToolbar="customToolbar" v-model="data.content.expectConversion"></vue-editor>
                 </div>
               </div>
             </div>
-            <div id="e">
-              <p class="pTit">项目实施计划</p>
+            <div>
+              <p class="pTit">实施计划</p>
               <div class="editor">
-                <vue-editor v-model="data.contentFive" :editorToolbar="customToolbar"></vue-editor>
+                <vue-editor  :editorToolbar="customToolbar" v-model="data.content.plan"></vue-editor>
               </div>
             </div>
             <div id="r" class="baseBtn">

src/views/projectApply/projectApplicationApplyMain.vue

@@ -23,10 +23,10 @@
       <div class="Main_area">
         <!-- 学生创客项目 5e21b204-c206-11ed-a4cd-509a4c5b67cf -->
         <!-- 特色创客空间建设项目 5f7a66d5-c206-11ed-a4cd-509a4c5b67cf -->
-        <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0"/>
+        <!-- <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0"/> -->
 
-        <!-- <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/> -->
-        <!-- <projectApplicationApplyMakerSpace :data="MakerSpace" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
+        <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <projectApplicationApplyMakerSpace :data="MakerSpace" :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"/> 
@@ -91,7 +91,7 @@
         },
         data() {
           return {
-            selectType:false,     //选择分类对话框
+            selectType:true,     //选择分类对话框
             pageType:[],         //判断页面显示分类   学生创客项目    学院特色创客空间   
             status:0,   //判断顶部导航跳转
             submitHint:false,   //提交按钮
@@ -166,6 +166,28 @@
                 telVerify2:true,  //添加修改成员电话判断
                 tableStudentData:[],  //学生成员成员列表
                 tableTeacherData:[],  //老师成员成员列表
+                textarea:'',   //项目简介
+                select:{    //提交后端的基本信息数据框
+                  projectName:'',     //项目名称
+                  leader:'', 
+                  projectDate:'',   //开始结束日期
+                  department:"",   //部门
+                  fund:'',         //资金
+                  MultiSelectProjectNameS:[],   //优先支持项目
+                  schoolRemould:'',        //校园改造项目
+                  tel:'',  //电话
+                  value1:"",
+                  projectApplyPerson:'',  //项目申请人
+                  sort:[] //["dawjiawdjaw",0]   
+                },
+
+
+                Member:{    //添加、修改成员
+                    name:'',
+                    class:'',
+                    phone:'',
+                    score:'0'
+                },
 
                 MultiSelectProject:[   //优先支持项目下拉框数据
                     {
@@ -182,7 +204,6 @@
                       label: '产业命题项目'
                     }
                 ],
-                textarea:'',   //项目简介
 
                 schoolRemouldOptions:[   //美丽校园下拉框数据
                     {
@@ -208,19 +229,7 @@
                       label: '入驻学校孵化基地的初创企业法人'
                     }
                 ],
-                select:{    //提交后端的基本信息数据框
-                  projectName:'',     //项目名称
-                  leader:'', 
-                  projectDate:'',   //开始结束日期
-                  department:"",   //部门
-                  fund:'',         //资金
-                  MultiSelectProjectNameS:[],   //优先支持项目
-                  schoolRemould:'',        //校园改造项目
-                  tel:'',  //电话
-                  value1:"",
-                  projectApplyPerson:'',  //项目申请人
-                  sort:[] //["dawjiawdjaw",0]   
-                },
+
                 departmentOptions: [],  //部门下拉框
                 sortOptions: [      //选择分类下拉框数据
                     {
@@ -246,20 +255,23 @@
                       label: '待建设',
                     }]
                   }],
-                Member:{    //添加成员
-                    name:'',
-                    class:'',
-                    phone:'',
-                    score:'0'
-                },
+
             },
 
             projectApplicationApply2:{  //项目内容页面
-                  contentOne:'',
-                  contentTwo:'',
-                  contentThree:'',
-                  contentFour:'',
-                  contentFive:'',
+                content:{
+                  back:'',
+                  innovate:'',
+                  path:'',
+                  scene:'',
+                  worth:'',
+                  team:'',
+                  cost:'',
+                  expectResults:'',
+                  expectResultsTeacher:'',
+                  expectConversion:'',
+                  plan:''
+                }
             },
             projectApplicationApply3:{  //预算经费页面
                 tableData:  // 经费月支出计划列表数据默认显示数据