#

src/views/projectApply/projectApplication2.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目立项申请查看详细项目详细 -->
-    <div class="projectApplication2" v-loading="loading">
+    <div class="projectApplication2">
 
         <!-- <div class="vfpHeader">
             <div class="titleOne">项目立项申请</div>
@@ -78,7 +78,6 @@ import { VueEditor } from "vue2-editor";
         data() {
           return {
             isUpload:'',
-            loading:false,
             data:[["","","","",""],[]],
             submitHint:false,
             customToolbar: [
@@ -119,7 +118,6 @@ import { VueEditor } from "vue2-editor";
             this.submitHint=false
           },
           getData(){   //初始化完成获取基本数据进行填充
-            this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               pid:JSON.parse(localStorage.getItem('pid'))
@@ -132,14 +130,13 @@ import { VueEditor } from "vue2-editor";
                       let GetData=JSON.parse(res.data[0][0].chapters)
                       // console.log(GetData);
                       this.data=GetData;
-                      this.loading = false;
                     },err=>{
                       console.log(err);
                     })
           },
         },
         mounted(){
-          this.getData();
+          // this.getData();
         }
       }
   </script>

src/views/projectApply/projectApplicationApply.vue

@@ -52,7 +52,7 @@
                               <div class="label" style="width: 50px;font-size: 14px;position: relative;top: -8px;">优先支持项目(可多选)</div>
                               <el-select style="width: 100%;" v-model="data.select.MultiSelectProjectNameS" multiple placeholder="请选择">
                                 <el-option
-                                  v-for="item in data.MultiSelectProject"
+                                  v-for="item in MultiSelectProject"
                                   :key="item.value"
                                   :label="item.label"
                                   :value="item.value">
@@ -86,7 +86,7 @@
                               <div class="label" style="font-size: 14px;max-width: 50px;position: relative;top: -8px;">美丽校园改造项目(特色项目)</div>
                               <el-select v-model="data.select.schoolRemould" style="width: 100%;" placeholder="请选择">
                                 <el-option
-                                  v-for="item in data.schoolRemouldOptions"
+                                  v-for="item in schoolRemouldOptions"
                                   :key="item.value"
                                   :label="item.label"
                                   :value="item.value">
@@ -97,7 +97,7 @@
                               <div class="label">项目申请人</div>
                               <el-select v-model="data.select.projectApplyPerson" style="width: 100%;" placeholder="请选择">
                                 <el-option
-                                  v-for="item in data.personType"
+                                  v-for="item in personType"
                                   :key="item.value"
                                   :label="item.label"
                                   :value="item.value">
@@ -202,21 +202,21 @@
                   <div class="littleBlock">
                     <div class="dialogLabel">姓名</div>
                     <div>
-                      <el-input v-model="data.Member.name"></el-input>
+                      <el-input v-model="Member.name"></el-input>
                     </div>
                   </div>
 
                   <div class="littleBlock">
                     <div class="dialogLabel">所在学院/部门/专业</div>
                     <div>
-                      <el-input v-model="data.Member.class"></el-input>
+                      <el-input v-model="Member.class"></el-input>
                     </div>
                   </div>
 
                   <div class="littleBlock">
                     <div class="dialogLabel">项目组角色分工</div>
                     <div>
-                      <el-input type="number" class="inputNumber" v-model="data.Member.division" ></el-input>
+                      <el-input  v-model="Member.division" ></el-input>
                     </div>
                   </div>
                   <div slot="footer" class="footer">
@@ -311,21 +311,21 @@
                   <div class="littleBlock">
                     <div class="dialogLabel">姓名</div>
                     <div>
-                      <el-input v-model="data.Member.name"></el-input>
+                      <el-input v-model="Member.name"></el-input>
                     </div>
                   </div>
 
                   <div class="littleBlock">
                     <div class="dialogLabel">所在学院/部门/专业</div>
                     <div>
-                      <el-input v-model="data.Member.class"></el-input>
+                      <el-input v-model="Member.class"></el-input>
                     </div>
                   </div>
 
                   <div class="littleBlock">
                     <div class="dialogLabel">项目组角色分工</div>
                     <div>
-                      <el-input type="number" class="inputNumber" v-model="data.Member.division"></el-input>
+                      <el-input v-model="Member.division"></el-input>
                     </div>
                   </div>
                   <div slot="footer" class="footer">
@@ -393,7 +393,7 @@
         return {
           // dialogImageUrl: '',
           accept:"image/*",
-          isAddMember:1,
+          isAddMember:1,   //判断是添加成员还是修改成员
           progress:{   //进度条
                 value:0,
                 show:false
@@ -404,7 +404,53 @@
           addTeacherMemberDialog:false,   //添加修改老师对话框
           delStudentMember:false,         //删除学生对话框
           delTeacherMember:false,         //删除老师对话框
-          index:''
+          index:'',
+          Member:{    //添加、修改成员
+              name:'',
+              class:'',
+              division:'',
+              score:'0'
+          },
+          MultiSelectProject:[   //优先支持项目下拉框数据
+                    {
+                      value: '1',
+                      label: '大赛选拔项目'
+                    }, {
+                      value: '2',
+                      label: '落地注册项目'
+                    }, {
+                      value: '3',
+                      label: '社会征集项目'
+                    }, {
+                      value: '4',
+                      label: '产业命题项目'
+                    }
+          ],
+          schoolRemouldOptions:[   //美丽校园下拉框数据
+                    {
+                      value: '1',
+                      label: '校园安全项目'
+                    }, {
+                      value: '2',
+                      label: '环境治理项目'
+                    }, {
+                      value: '3',
+                      label: '校园服务项目'
+                    }, {
+                      value: '4',
+                      label: '文创装置项目'
+                    }
+          ],
+          personType:[     //项目申请人下拉框数据
+                    {
+                      value: '1',
+                      label: '在校学生'
+                    }, {
+                      value: '2',
+                      label: '入驻学校孵化基地的初创企业法人'
+                    }
+                ],
+
         }
       },
       
@@ -455,9 +501,9 @@
         // 项目组学生成员方法开始
                   addStudentMember(){   //添加项目成员对话框显示
                     this.addStudentMemberDialog=true
-                    for(let i in this.data.Member){
-                      if(i=='score')this.data.Member[i] = "0"
-                      else this.data.Member[i] = "";
+                    for(let i in this.Member){
+                      if(i=='score')this.Member[i] = "0"
+                      else this.Member[i] = "";
                     }
                     this.isAddMember=1;
                   },
@@ -466,34 +512,34 @@
                     this.index=val
                   },
                   amendStudentDialogData(val){   //修改项目成员信息对话框显示
-                    Object.assign(this.data.Member,this.data.tableStudentData[val])
+                    Object.assign(this.Member,this.data.tableStudentData[val])
                     this.isAddMember=2;
-                    this.data.Member['index']=val    //为下面修改提供下标
-                    // console.log(this.data.Member['index']);
+                    this.Member['index']=val    //为下面修改提供下标
+                    // console.log(this.Member['index']);
                     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.Member.class=="" ||this.data.Member.class==undefined) return this.$message.error('请输入项目组角色分工')
+                        // console.log(this.Member.name);
+                        if (this.Member.name =="" ||this.Member.name==undefined) return this.$message.error('请输入姓名')
+                        if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入所在学院/部门/专业')
+                        if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入项目组角色分工')
 
                         // this.addPerson();
                         let newData = {};
-                        for(let j in this.data.Member)newData[j] = this.data.Member[j];
+                        for(let j in this.Member)newData[j] = this.Member[j];
                         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] = "";
+                        for(let i in this.Member){      
+                          if(i=='score')this.Member[i] = "0"
+                          else this.Member[i] = "";
                         }
                         console.log(this.data.tableStudentData)
                         this.init()
                   },
 
                   commitAmendStudent(){   //确定修改成员
-                        Object.assign(this.data.tableStudentData[this.data.Member['index']],this.data.Member)
-                        for(let k in this.data.Member) this.data.Member[k]=''
+                        Object.assign(this.data.tableStudentData[this.Member['index']],this.Member)
+                        for(let k in this.Member) this.Member[k]=''
                         this.addStudentMemberDialog=false;
                         this.$message.success('修改成功')
 
@@ -512,9 +558,9 @@
         // 项目组老师成员方法开始
                 addTeacherMember(){   //添加项目成员对话框显示
                     this.addTeacherMemberDialog=true
-                    for(let i in this.data.Member){
-                      if(i=='score')this.data.Member[i] = "0"
-                      else this.data.Member[i] = "";
+                    for(let i in this.Member){
+                      if(i=='score')this.Member[i] = "0"
+                      else this.Member[i] = "";
                     }
                     this.isAddMember=1;
                   },
@@ -523,33 +569,33 @@
                     this.index=val
                   },
                   amendTeacherDialogData(val){   //修改项目成员信息对话框显示
-                    Object.assign(this.data.Member,this.data.tableTeacherData[val])
+                    Object.assign(this.Member,this.data.tableTeacherData[val])
                     this.isAddMember=2;
-                    this.data.Member['index']=val    //为下面修改提供下标
-                    // console.log(this.data.Member['index']);
+                    this.Member['index']=val    //为下面修改提供下标
+                    // console.log(this.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.Member.class=="" ||this.data.Member.class==undefined) return this.$message.error('请输入项目组角色分工')
+                        // console.log(this.Member.name);
+                        if (this.Member.name =="" ||this.Member.name==undefined) return this.$message.error('请输入姓名')
+                        if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入所在学院/部门/专业')
+                        if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入项目组角色分工')
                         // this.addPerson();
                         let newData = {};
-                        for(let j in this.data.Member)newData[j] = this.data.Member[j];
+                        for(let j in this.Member)newData[j] = this.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] = "";
+                        for(let i in this.Member){      
+                          if(i=='score')this.Member[i] = "0"
+                          else this.Member[i] = "";
                         }
                         console.log(this.data.tableTeacherData)
                         this.init()
                   },
 
                   commitAmendTeacher(){   //确定修改成员
-                        Object.assign(this.data.tableTeacherData[this.data.Member['index']],this.data.Member)
-                        for(let k in this.data.Member) this.data.Member[k]=''
+                        Object.assign(this.data.tableTeacherData[this.Member['index']],this.Member)
+                        for(let k in this.Member) this.Member[k]=''
                         this.addTeacherMemberDialog=false;
                         this.$message.success('修改成功')
 

src/views/projectApply/projectApplicationApplyMain.vue

@@ -151,53 +151,6 @@
                   tel:'',  //电话
                   projectApplyPerson:'',  //项目申请人
                 },
-
-
-                Member:{    //添加、修改成员
-                    name:'',
-                    class:'',
-                    division:'',
-                    score:'0'
-                },
-                MultiSelectProject:[   //优先支持项目下拉框数据
-                    {
-                      value: '1',
-                      label: '大赛选拔项目'
-                    }, {
-                      value: '2',
-                      label: '落地注册项目'
-                    }, {
-                      value: '3',
-                      label: '社会征集项目'
-                    }, {
-                      value: '4',
-                      label: '产业命题项目'
-                    }
-                ],
-                schoolRemouldOptions:[   //美丽校园下拉框数据
-                    {
-                      value: '1',
-                      label: '校园安全项目'
-                    }, {
-                      value: '2',
-                      label: '环境治理项目'
-                    }, {
-                      value: '3',
-                      label: '校园服务项目'
-                    }, {
-                      value: '4',
-                      label: '文创装置项目'
-                    }
-                ],
-                personType:[     //项目申请人下拉框数据
-                    {
-                      value: '1',
-                      label: '在校学生'
-                    }, {
-                      value: '2',
-                      label: '入驻学校孵化基地的初创企业法人'
-                    }
-                ],
                 departmentOptions: [],  //部门下拉框
                 sortOptions: [      //选择分类下拉框数据
                     {
@@ -410,11 +363,13 @@
               //   }
               // }
               // console.log(a.select.sort);
-              console.log(this.pageType);
+              // console.log(this.pageType);
               let typeId=this.pageType[0]
               let typeName=this.pageType[1]
               // return console.log(typeId,typeName);
 
+              // return console.log(JSON.stringify(a.select.projectDate));
+
               let param={
                 // title:a.select.projectName,
                 // brief:a.textarea,
@@ -428,7 +383,9 @@
                 uid:this.$store.state.userInfo.userid,
                 tit:a.select.projectName,
                 leader:a.select.leader,
-                proDate:JSON.stringify(a.select.projectDate),
+
+                begDate:a.select.projectDate[0],
+                endDate:a.select.projectDate[1],
                 department:a.select.department,
                 fund:a.select.fund,
                 imgsrc:a.dialogImageUrl,

src/views/projectApply/projectApplicationDetailMain.vue

@@ -18,8 +18,8 @@
             </div>
         </div>
 
-        <projectApplicationDetails v-show="$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf' && status==0"></projectApplicationDetails>
-        <projectApplication2 v-show="$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf' && status==1"></projectApplication2>
+        <projectApplicationDetails v-show="$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf' && status==0" :data="content"></projectApplicationDetails>
+        <projectApplication2 v-show="$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf' && status==1"></projectApplication2>
   </div>
 </template>
 
@@ -36,17 +36,67 @@ import projectApplication2 from './projectApplication2.vue'
                     {addresses:'项目基本内容',cl:'pr1TitBass'},
                     {addresses:'项目详情',cl:'pr1TitBass'},
                 ],
-                content:[],
+                content:{
+                    dialogImageUrl:"",  //封面!!!!!!!!
+                    tableStudentData:[],  //学生成员成员列表！！！！！！！！
+                    tableTeacherData:[],  //老师成员成员列表！！！！！！！
+                    textarea:'',   //项目简介！！！！！！！
+                    select:{    //要提交的数据!!!!!!!!!!!!!!!!!!!!!!!
+                        projectName:'',     //项目名称
+                        leader:'',          //项目负责人
+                        projectDate:[],   //开始结束日期
+                        department:"",   //部门
+                        fund:'',         //资金
+                        MultiSelectProjectNameS:[],   //优先支持项目
+                        schoolRemould:'',        //校园改造项目
+                        tel:'',  //电话
+                        projectApplyPerson:'',  //项目申请人
+                    },
+                  },
+                
                 detail:{},
             }
         },
         methods:{
             goto(val){
                 this.status=val
-            }
+            },
+            getData(){
+                let param={
+                    uid:this.$store.state.userInfo.userid,
+                    pid:JSON.parse(localStorage.getItem('pid'))
+                }
+                this.ajax
+                    .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
+                    .then(res=>{
+                      // console.log(data.);
+                        let data=res.data[0][0]
+                        // console.log(data);
+
+                        this.content.select.projectName=data.title
+                        this.content.select.leader=data.leader
+                        this.content.select.projectDate=[data.startTime,data.endTime]
+                        this.content.select.department=data.classid
+                        this.content.select.fund=data.fund
+                        this.content.select.MultiSelectProjectNameS=JSON.parse(data.multiSelectProject)
+                        this.content.select.schoolRemould=data.schoolRemould
+                        this.content.select.tel=data.phone
+                        this.content.select.projectApplyPerson=data.projectApplyperson
+                        this.content.select.dialogImageUrl=data.image
+                        this.content.select.tableStudentData=JSON.parse(data.course_student)
+                        this.content.select.tableTeacherData=JSON.parse(data.course_teacher)                       
+                        this.content.select.textarea=data.brief
+                        this.content.dialogImageUrl=data.image
+                        // console.log(this.content);
+                    },err=>{
+                        console.log(err);
+                    })
+            },
+            
         },
         mounted(){
-            console.log(this.$route.query['Id'])
+            // console.log(this.$route.query['Id'])
+            this.getData()
         }
     }
 </script>

src/views/projectApply/projectApplicationDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目立项申请查看详细项目基本内容 -->
-  <div class="projectApplication1" v-loading="loading">
+  <div class="projectApplication1">
     <!-- <div class="vfpHeader">
         <div class="titleOne">项目立项申请</div>
         <span class="smallTitle">项目进展详情</span>
@@ -18,66 +18,91 @@
 
      <!-- 活动申请填写信息区域开始 -->
      <div class="select">
-              <div class="selectTop">
-                <div class="label">项目名称</div>
-                <el-input v-model="select.project" placeholder="请输入内容"></el-input>
+        <div class="selectTop">
+          <div class="label">项目名称</div>
+          <el-input v-model="data.select.projectName" placeholder="请输入内容"></el-input>
+        </div>
+        <div class="selectMid">
+          <div class="selectLeft">
+              <div class="inpBlock">
+                  <div class="label">项目负责人</div>
+                  <el-input v-model="data.select.leader" placeholder="请输入内容"></el-input>
               </div>
-              <div class="selectMid">
-                <div class="selectLeft">
-                 
-                    <div class="inpBlock">
-                        <div class="label">负责人</div>
-                        <el-input v-model="select.person" placeholder="请输入内容"></el-input>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">所在部门</div>
-                        <el-select v-model="select.departmentData" style="width: 100%;" placeholder="请选择">
-                          <el-option
-                            v-for="item in select.department"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id">
-                          </el-option>
-                        </el-select>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">联系电话</div>
-                        <el-input v-model="select.tel" placeholder="请输入内容"></el-input>
-                    </div>
-                </div>
-
-                <div class="selectRight">
-                  <div class="inpBlock">
-                        <div class="label">项目开始时间</div>
-                        <el-date-picker
-                          v-model="select.Date"
-                          type="datetime"
-                          style="width: 100%;"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期">
-                        </el-date-picker>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">预算总经费</div>
-                        <el-input v-model="select.Fund" placeholder="请输入内容"></el-input>
-                    </div>
-                    <div class="inpBlock">
-                        <div class="label">选择分类</div>
-                        <!-- <el-select v-model="select.sort" style="width: 100%;" placeholder="请选择">
-                          <el-option
-                            v-for="item in select.sortOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id">
-                          </el-option>
-                        </el-select> -->
-                        <el-cascader v-model="select.sort" :options="select.sortOptions" clearable></el-cascader>
-
-                    </div>
-                </div>
+              <div class="inpBlock">
+                  <div class="label">所在部门</div>
+                  <el-select v-model="data.select.department" style="width: 100%;" placeholder="请选择">
+                    <el-option
+                      v-for="item in this.departmentOptions"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
               </div>
-              
+              <div class="inpBlock">
+                  <div class="label" style="width: 50px;font-size: 14px;position: relative;top: -8px;">优先支持项目(可多选)</div>
+                  <el-select style="width: 100%;" v-model="data.select.MultiSelectProjectNameS" multiple placeholder="请选择">
+                    <el-option
+                      v-for="item in this.MultiSelectProject"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+              </div>
+              <div class="inpBlock">
+                  <div class="label">联系电话</div>
+                  <el-input type="number" v-model="data.select.tel"  @blur="getText(data.select.tel)" placeholder="请输入联系方式"></el-input>
+              </div>
+          </div>
+
+          <div class="selectRight">
+            <div class="inpBlock">
+                  <div class="label">项目开始时间</div>
+                  <el-date-picker
+                    v-model="data.select.projectDate"
+                    type="daterange"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期">
+                  </el-date-picker>
+              </div>
+              <div class="inpBlock" style="position: relative;">
+                  <div class="label">预算总经费</div>
+                  <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="label" style="font-size: 14px;max-width: 50px;position: relative;top: -8px;">美丽校园改造项目(特色项目)</div>
+                  <el-select v-model="data.select.schoolRemould" style="width: 100%;" placeholder="请选择">
+                    <el-option
+                      v-for="item in this.schoolRemouldOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+              </div>
+              <div class="inpBlock">
+                  <div class="label">项目申请人</div>
+                  <el-select v-model="data.select.projectApplyPerson" style="width: 100%;" placeholder="请选择">
+                    <el-option
+                      v-for="item in this.personType"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+              </div>
+              <!-- <div class="inpBlock">
+                  <div class="label">选择分类</div>
+                  <el-cascader v-model="data.select.sort" :options="data.sortOptions" clearable></el-cascader>
+              </div> -->
+          </div>
         </div>
+        
+  </div>
         <!-- 活动申请填写信息区域结束 -->
 
 
@@ -97,7 +122,7 @@
                 style="position: relative;"
                 :show-file-list="false"
                 >
-                <img v-if="dialogImageUrl" :src="dialogImageUrl" class="avatar">
+                <img v-if="data.dialogImageUrl" :src="data.dialogImageUrl" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                 <BeUpload :progress="progress" style="position:absolute; width: 301px;height: 180px; opacity: 0;z-index:333;left: 0px;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
               </el-upload>
@@ -108,61 +133,107 @@
 
 
 
-      <!-- 项目成员开始 -->
-      <div class="tabTit">
-          <div><p>项目成员</p></div>
-          <el-button type="primary" @click="addMember"  size="mini">添加成员</el-button>
-      </div>
-      <hr>
-      <el-table
-        :data="tableData"
-        tooltip-effect="dark"
-        stripe
-        class="fontSize"
-        :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        >
-        <el-table-column
-          prop="name"
-          label="姓名"
-          align="center"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="class"
-          label="班级"
-          align="center"
-         >
-        </el-table-column>
-
-        <el-table-column
-          prop="phone"
-          label="电话"
-          align="center"
-         >
-        </el-table-column>
-
-        <el-table-column
-          prop="score"
-          label="学分"
-          align="center"
-          >
-        </el-table-column>
-        
-        <el-table-column
-          prop="operation"
-          align="center"
-          label="操作"
-          >
-          <template #default="scope">
-              <div class="operations">
-                      <!-- <el-button type="primary" @click="lookDetail(scope)" size="mini">查看详情</el-button> -->
-                      <el-button type="primary" @click="amendDialogData(scope.$index)" size="mini">修改</el-button>
-                      <el-button type="primary" @click="Del(scope.$index)" size="mini">删除</el-button>
+  <!-- 老师项目成员表格开始 -->
+  <div id="two" class="tabTit">
+                <div><p>项目组-老师成员<span>(2个学院以上,团队2-3人)</span> </p></div>
+                <el-button type="primary" @click="addTeacherMember"  size="mini">添加成员</el-button>
               </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 项目成员结束 -->
+              <hr>
+              <el-table
+                :data="data.tableTeacherData"
+                tooltip-effect="dark"
+                stripe
+                :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
+                class="fontSize"
+                >
+              
+                <el-table-column
+                  prop="name"
+                  label="姓名"
+                  align="center"
+                  >
+                </el-table-column>
+                <el-table-column
+                  prop="class"
+                  label="所在学院/部门/专业"
+                  align="center"
+                  >
+                </el-table-column>
+
+                <el-table-column
+                  prop="division"
+                  label="项目组角色分工"
+                  align="center"
+                  >
+                </el-table-column>
+
+                <el-table-column
+                  align="center"
+                  prop="operation"
+                  label="操作"
+                  >
+                  <template #default="scope">
+                      <div class="operations">
+                          <!-- <el-button type="primary" > -->
+                              <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  v-model="data.Member.division" ></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>
+          <!-- 删除老师成员对话框结束 -->
+  <!-- 老师项目成员表格结束 -->
 
       <!-- 项目简介开始 -->
     <div class="tabTit">
@@ -190,150 +261,145 @@
 
       </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="addTabMember.name"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">班级</div>
-              <div>
-                <el-input v-model="addTabMember.class"></el-input>
-              </div>
-            </div>
-
-            <div class="littleBlock">
-              <div class="dialogLabel">电话</div>
-              <div>
-                <el-input class="inputNumber" type="number" v-model="addTabMember.phone" @blur="getText(addTabMember.phone)" ></el-input>
-              </div>
-            </div>
-            <!-- <div class="littleBlock">
-              <div class="dialogLabel">学分</div>
-              <div>
-                <el-input type="number" v-model="addTabMember.score" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" ></el-input>
-              </div>
-            </div> -->
-            <div slot="footer" class="footer">
-              <el-button v-show="isAddMember" type="primary" @click="commit" class="AllDialogBtn" >确认提交</el-button>
-              <el-button v-show="!isAddMember" type="primary" @click="commit2" 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="commitDelMember" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="init" class="AllDialogBtn" >取消</el-button>
-              </span>
-        </el-dialog>
-      <!-- 删除成员对话框结束 -->
-
-       <!-- 修改对话框开始 -->
-       <el-dialog
-          title="提示"
-          :visible.sync="submitHint"
-          width="600px"
-          class="projectApplicationfundAddDialog"
-          :before-close="init">
-          <div class="addDialogLogo">LOGO</div>
-          <div class="deleteContent">确定修改项目基本信息?</div>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认提交</el-button>
-            <el-button @click="init" size="small" class="AllDialogBtn">取消</el-button>
-          </span>
-        </el-dialog>
-      <!-- 修改对话框结束 -->
   </div>
 </template>
 
 <script>
   import BeUpload from "../../components/tool/beUpload.vue";
     export default {
+      props:['data'],
       components: {
         BeUpload,
       },
       data() {
         return {
-          iid:'',
-          isUpload:'',
+          // iid:'',
+          // isUpload:'',
+          // // loading:false,
+          // select:{    //数据详情框数据
+          //   project:'',   
+          //   person:'',
+          //   departmentData:"",  //部门框值
+          //   sort:[],     //分类值
+          //   tel:'',
+          //   Date:'',
+          //   Fund:'',
+          //   // sortOptions: [], //分类下拉框
+          //   sortOptions: [
+          //           {
+          //             value:"",
+          //             label:'',
+          //             children: [{
+          //               value: 0,
+          //               label: '创意组',
+          //             },
+          //              {
+          //               value: 1,
+          //               label: '初创组',
+          //             }
+          //           ]}, 
+          //           {
+          //           value:"",
+          //           label:'',
+          //           children: [{
+          //             value: 0,
+          //             label: '已建设',
+          //           }, {
+          //             value: 1,
+          //             label: '待建设',
+          //           }]
+          //         }],
+          //   department:[],
+          // },
           accept:"image/*",
           isAddMember:1,
           progress:{   //进度条
                 value:0,
                 show:false
             },  
-          dialogImageUrl:'',  //图片地址
+          // dialogImageUrl:'',  //图片地址
           delMember:false,
           amendMemberDialog:false,
           addMemberDialog:false,
+          addTeacherMemberDialog:false,
           submitHint:false,
-          loading:false,
-          select:{    //数据详情框数据
-            project:'',   
-            person:'',
-            departmentData:"",  //部门框值
-            sort:[],     //分类值
-            tel:'',
-            Date:'',
-            Fund:'',
-            // sortOptions: [], //分类下拉框
-            sortOptions: [
-                    {
-                      value:"",
-                      label:'',
-                      children: [{
-                        value: 0,
-                        label: '创意组',
-                      },
-                       {
-                        value: 1,
-                        label: '初创组',
-                      }
-                    ]}, 
-                    {
-                    value:"",
-                    label:'',
-                    children: [{
-                      value: 0,
-                      label: '已建设',
-                    }, {
-                      value: 1,
-                      label: '待建设',
-                    }]
-                  }],
-            department:[],
-          },
+          
           textarea:'周四福利大放送',   //项目简介
 
           tableData:[],   //成员列表数据
           
-          addTabMember:{       //添加项目成员
-            // id:'',
-            name:'',
-            class:'',
-            phone:'',
-            score:0
-          }
+
+          departmentOptions: [],  //部门下拉框
+          Member:{    //添加、修改成员
+              name:'',
+              class:'',
+              division:'',
+              score:'0'
+          },
+          MultiSelectProject:[   //优先支持项目下拉框数据
+                    {
+                      value: '1',
+                      label: '大赛选拔项目'
+                    }, {
+                      value: '2',
+                      label: '落地注册项目'
+                    }, {
+                      value: '3',
+                      label: '社会征集项目'
+                    }, {
+                      value: '4',
+                      label: '产业命题项目'
+                    }
+          ],
+          schoolRemouldOptions:[   //美丽校园下拉框数据
+              {
+                value: '1',
+                label: '校园安全项目'
+              }, {
+                value: '2',
+                label: '环境治理项目'
+              }, {
+                value: '3',
+                label: '校园服务项目'
+              }, {
+                value: '4',
+                label: '文创装置项目'
+              }
+          ],
+          personType:[     //项目申请人下拉框数据
+              {
+                value: '1',
+                label: '在校学生'
+              }, {
+                value: '2',
+                label: '入驻学校孵化基地的初创企业法人'
+              }
+          ],
+          sortOptions: [      //选择分类下拉框数据
+              {
+                value:"",
+                label: '',
+                children: [{
+                  value: 0,
+                  label: '创意组',
+                },
+                  {
+                  value: 1,
+                  label: '初创组',
+                }
+              ]}, 
+              {
+              value:"",
+              label: '',
+              children: [{
+                value: 0,
+                label: '已建设',
+              }, {
+                value: 1,
+                label: '待建设',
+              }]
+            }],
         }
       },
       methods:{
@@ -364,65 +430,83 @@
             this.dialogImageUrl=val.url
 
         },
-        addMember(){       //添加成员按钮，显示对话框
-            for(let key in this.addTabMember){
-                if (key!='score') {
-                  this.addTabMember[key]=''
-                }
-            }
-            this.addMemberDialog=true;
-            this.isAddMember=1;
-        },
-        commit(){         //对话框确认添加成员按钮 
-          // console.log(this.addTabMember.name);
-            let newMember={name:'',class:'',phone:'',score:''};
-            if (this.addTabMember.name == undefined || this.addTabMember.name=='') return this.$message.error('请输入姓名')
-            if (this.addTabMember.class == undefined || this.addTabMember.name=='') return this.$message.error('请输入班级')
-            if (this.addTabMember.phone == undefined || this.addTabMember.name=='') return this.$message.error('请输入电话') 
-            if (!this.getText(this.addTabMember.phone))return;
-            Object.assign(newMember,this.addTabMember)
-            this.tableData.push(newMember)
-            this.$message.success('添加人员成功')
-            for(let k in this.addTabMember){
-              if (k !== 'score') {
-                  this.addTabMember[k]=''
-              }
-            }
-            
-            this.addMemberDialog=false;
-        },
-        amendDialogData(index){   //人员信息列表修改按钮
-          Object.assign(this.addTabMember,this.tableData[index])
-          this.addTabMember['index']=index
-          this.isAddMember=0
-          this.addMemberDialog=true
-        },
-        commit2(){       //人员信息对话框确定修改按钮
-          if (this.addTabMember.name == undefined || this.addTabMember.name=='') return this.$message.error('请输入姓名')
-          if (this.addTabMember.class == undefined || this.addTabMember.name=='') return this.$message.error('请输入班级')
-          if (this.addTabMember.phone == undefined || this.addTabMember.name=='') return this.$message.error('请输入电话')
-          if (!this.getText(this.addTabMember.phone)) return;
-          Object.assign(this.tableData[this.addTabMember['index']],this.addTabMember)
-          this.addMemberDialog=false;
-          this.$message.success('修改信息成功')
-          for(let k in this.addTabMember){
-              if (k!=='score') {
-                  this.addTabMember[k]=''
+
+
+
+        // 项目组老师成员方法开始
+                  addTeacherMember(){   //添加项目成员对话框显示
+                    this.addTeacherMemberDialog=true
+                    for(let i in this.Member){
+                      if(i=='score')this.Member[i] = "0"
+                      else this.Member[i] = "";
+                    }
+                    this.isAddMember=1;
+                  },
+                  DelTeacher(val){    //删除对话框显示
+                    this.delTeacherMember=true;
+                    this.index=val
+                  },
+                  amendTeacherDialogData(val){   //修改项目成员信息对话框显示
+                    Object.assign(this.Member,this.data.tableTeacherData[val])
+                    this.isAddMember=2;
+                    this.Member['index']=val    //为下面修改提供下标
+                    // console.log(this.Member['index']);
+                    this.addTeacherMemberDialog=true
+                  },
+                  commitAddTeacher(){   //确定添加成员  
+                        // console.log(this.Member.name);
+                        if (this.Member.name =="" ||this.Member.name==undefined) return this.$message.error('请输入姓名')
+                        if (this.Member.class=="" ||this.Member.class==undefined) return this.$message.error('请输入所在学院/部门/专业')
+                        if (this.Member.division=="" ||this.Member.division==undefined) return this.$message.error('请输入项目组角色分工')
+                        // this.addPerson();
+                        let newData = {};
+                        for(let j in this.Member)newData[j] = this.Member[j];
+                        this.data.tableTeacherData.push(newData);
+                        this.$message.success('添加成功')
+                        for(let i in this.Member){      
+                          if(i=='score')this.Member[i] = "0"
+                          else this.Member[i] = "";
+                        }
+                        console.log(this.data.tableTeacherData)
+                        this.init()
+                  },
+
+                  commitAmendTeacher(){   //确定修改成员
+                        Object.assign(this.data.tableTeacherData[this.Member['index']],this.Member)
+                        for(let k in this.Member) this.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;
+                  },
+        // 项目组老师成员方法开始
+
+        getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
+              let param={
+                uid:this.$store.state.userInfo.userid
               }
-            }
-        },
-        Del(val){
-          this.iid=val;             //列表删除按钮
-          this.delMember=true;
-        },
-        commitDelMember(){    //对话框确定删除按钮
-          this.tableData.splice(this.iid,1)
-          this.$message.success('删除成功')
-          this.delMember=false;
-        },
-        audit(){    //立即修改对话框显示
-          this.submitHint=true
-        },
+                this.ajax
+                      .get(this.$store.state.api+'/SelectAllDepartment',param)
+                      .then(res=>{
+                        // console.log(res.data[0]);
+                        // let p=res.data[0]
+                        // let a=this.projectApplicationApply1
+                        // a.options=p
+                        // this.MakerSpace.options = p;
+                        this.departmentOptions=res.data[0];
+                      },err=>{
+                        console.log(err);
+                      })
+            },
+
+      
         submitAll(){
           let tidId=this.select.sort[0];
           let typeName=this.select.sort[1];
@@ -466,42 +550,34 @@
           this.delMember=false;
           this.submitHint=false;
         },
-
-        remark(){    //导航栏项目详情按钮
-          this.$router.push('/projectApplication2')
-        },
-
-        back(){     //返回按钮
-          this.$router.push('/projectApplication')
-        },
-        getData(){   //初始化完成获取基本数据进行填充
-          this.loading = true;
-          let param={
-            uid:this.$store.state.userInfo.userid,
-            pid:JSON.parse(localStorage.getItem('pid'))
-          }
-            this.ajax
-                  .get(this.$store.state.api+'/GetProjectBase',param)
-                  .then(res=>{
-                    console.log(res.data);
-                    let data=res.data[0][0]
-                    this.select.project=data.title;
-                    this.select.Fund=data.money;
-                    this.select.person=data.pro_leader;
-                    this.select.Date=data.begintime;
-                    this.textarea=data.brief;
-                    this.tableData=JSON.parse(data.course_student) 
-                    this.select.tel=data.phone;
-                    this.dialogImageUrl=data.image
-                    this.select.departmentData = data['classid']
-                    this.select.sort = [data['typeid'],data['typeName']]
-                    // console.log(this.select.sort);
-                    this.isUpload=data['isupload']
-                    this.loading = false;
-                  },err=>{
-                    console.log(err);
-                  })
-        },
+        // getData(){   //初始化完成获取基本数据进行填充
+        //   // this.loading = true;
+        //   let param={
+        //     uid:this.$store.state.userInfo.userid,
+        //     pid:JSON.parse(localStorage.getItem('pid'))
+        //   }
+        //     this.ajax
+        //           .get(this.$store.state.api+'/GetProjectBase',param)
+        //           .then(res=>{
+        //             console.log(res.data);
+        //             let data=res.data[0][0]
+        //             this.select.project=data.title;
+        //             this.select.Fund=data.money;
+        //             this.select.person=data.pro_leader;
+        //             this.select.Date=data.begintime;
+        //             this.textarea=data.brief;
+        //             this.tableData=JSON.parse(data.course_student) 
+        //             this.select.tel=data.phone;
+        //             this.dialogImageUrl=data.image
+        //             this.select.departmentData = data['classid']
+        //             this.select.sort = [data['typeid'],data['typeName']]
+        //             // console.log(this.select.sort);
+        //             this.isUpload=data['isupload']
+        //             // this.loading = false;
+        //           },err=>{
+        //             console.log(err);
+        //           })
+        // },
         getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
               let param={
                 uid:this.$store.state.userInfo.userid
@@ -535,9 +611,9 @@
         },
       },
       created(){    //数据加载完成后触发
-        this.getData();
+        // this.getData();
         this.getProjectDepartmentData();
-        this.getProjectTypeData();
+        // this.getProjectTypeData();
       },
     }
 </script>