Kaynağa Gözat

项目立项申请修改

yuanyiming 1 yıl önce
ebeveyn
işleme
153b0284dc

+ 18 - 0
src/App.vue

@@ -651,4 +651,22 @@
         // }
       }
   }
+
+  .pTit{        //项目详情大标题
+      color: #3994ff;
+      font-weight: 550;
+      font-size: 18px;
+      margin: 15px 0;
+    }
+    .pTit2{    //项目详情小标题
+      margin-top: 15px;
+      color: #3994ff;
+      font-weight: 550;
+      font-size: 16px;
+    }
+    .editor{    //显示栏
+      width: 100%;
+      box-sizing: border-box;
+      padding: 15px 0px 10px 0px;
+    }
 </style>

+ 129 - 72
src/views/projectApply/projectApplication2.vue

@@ -2,46 +2,95 @@
   <!-- 项目立项申请查看详细项目详细 -->
     <div class="projectApplication2">
 
-        <!-- <div class="vfpHeader">
-            <div class="titleOne">项目立项申请</div>
-            <div class="smallTitle">项目进展详情</div>
-            <el-button type="primary" @click="$router.back()">返回</el-button>
-        </div>
-
-        <hr>
-          <div class="AppBar">
-              <div @click="content">项目基本内容</div>
-              <div class="AppBarActive">项目详情</div>
-          </div> -->
-
-      <div class="PA2textArea">
+      <!-- <div class="PA2textArea">
         <div class="PA2textAreaTit">项目创新点</div>
         <vue-editor  :editorToolbar="customToolbar" v-model="data[0][0]"></vue-editor>
-      </div>
+      </div> -->
+      <div id="w">
+              <p class="pTit">研发内容</p>
+              <div>
+                <p class="pTit2">一、项目研发背景</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">二、项目创新点</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">三、技术研发路线</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">四、项目应用场景</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor>
+                </div>
+              </div>
+              <!-- <div class="editor">
+                <vue-editor  :editorToolbar="customToolbar" v-model="content.contentOne"></vue-editor>
+              </div> -->
+            </div>
+            <div>
+              <p class="pTit">商业模式及社会价值</p>
+              <div>
+                <p class="pTit2">一、项目商业模式/社会价值</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="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="content.team"></vue-editor>
+                </div>
+              </div>
+            </div>
 
-      <div class="PA2mid">
-        预期取得成果
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">一、项目预期成果、数量及形式</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][1]"></vue-editor>
-        
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">二、创客人才培养预期成果、数量</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][2]"></vue-editor>
-       
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">三、项目预期孵化、转化创业项目情况</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][3]"></vue-editor>
-        
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit">项目实施计划</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][4]"></vue-editor>
-        
-      </div>
+            <div>
+              <p class="pTit">研发成本</p>
+              <div>
+                <p class="pTit2">一、研发成本来源及构成</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor>
+                </div>
+              </div>
+            </div>
+            <div id="e">
+              <p class="pTit">预期成果</p>
+              <div>
+                <p class="pTit2">一、项目预期成果、数量及形式(产品原型/发明专利/双创竞赛/成果转化/社会效益)</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">二、学生创客人才培养预期成果、数量(教师填写)</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor>
+                </div>
+              </div>
+            </div>
+            <div>
+              <p class="pTit" style="margin-bottom: 0;">实施计划</p>
+              <div class="editor">
+                <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor>
+              </div>
+            </div>
       <div class="baseBtn">
         <div class="blockWidth">
           <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
@@ -85,16 +134,17 @@ import { VueEditor } from "vue2-editor";
               [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
               [{header:[false,1,2,3,4]}]
             ],
+            content:'',
           }
         },
         methods:{
-          content(){      //导航栏项目详情跳转
-            this.$router.push('/projectApplicationDetails')
-          },
+          // content(){      //导航栏项目详情跳转
+          //   this.$router.push('/projectApplicationDetails')
+          // },
          
-          backBtn(){
-            this.$router.push('/projectApplicationApply2')
-          },
+          // backBtn(){
+          //   this.$router.push('/projectApplicationApply2')
+          // },
           audit(){   //立即修改按钮
             this.submitHint=true
           },
@@ -102,10 +152,10 @@ import { VueEditor } from "vue2-editor";
             let param={
               uid:this.$store.state.userInfo.userid,
               pid:JSON.parse(localStorage.getItem('pid')),
-              message:JSON.stringify(this.data)
+              message:JSON.stringify(this.content)
             }
               this.ajax
-                  .post(this.$store.state.api+'/UpdateProjectDetail',param)
+                  .post(this.$store.state.api+'/updateProjectApplication2Student',param)
                   .then(res=>{
                     // console.log(res);
                     this.$message.success('修改成功')
@@ -117,33 +167,46 @@ import { VueEditor } from "vue2-editor";
           init(){
             this.submitHint=false
           },
-          getData(){   //初始化完成获取基本数据进行填充
-            let param={
-              uid:this.$store.state.userInfo.userid,
-              pid:JSON.parse(localStorage.getItem('pid'))
-            }
-              this.ajax
-                    .get(this.$store.state.api+'/GetProjectDetailMessage',param)
+          // getData(){   //初始化完成获取基本数据进行填充
+          //   let param={
+          //     uid:this.$store.state.userInfo.userid,
+          //     pid:JSON.parse(localStorage.getItem('pid'))
+          //   }
+          //     this.ajax
+          //           .get(this.$store.state.api+'/GetProjectDetailMessage',param)
+          //           .then(res=>{
+          //             this.isUpload=res.data[0][0].isupload;
+          //             let GetData=JSON.parse(res.data[0][0].chapters)
+          //             this.data=GetData;
+          //           },err=>{
+          //             console.log(err);
+          //           })
+          // },
+          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(res.data[0][0].isupload);
-                      this.isUpload=res.data[0][0].isupload;
-                      let GetData=JSON.parse(res.data[0][0].chapters)
-                      // console.log(GetData);
-                      this.data=GetData;
+                        let data=res.data[0][0]
+                        console.log(data.chapters);
+                        this.content=JSON.parse(data.chapters)
+                        console.log(this.content);
                     },err=>{
-                      console.log(err);
+                        console.log(err);
                     })
-          },
+            },
         },
         mounted(){
-          // this.getData();
+          this.getData();
         }
       }
   </script>
   
   <style lang="less">
-  .projectApplication2{
-
+  // .projectApplication2{
  .projectApplicationfundAddDialog{    //项目修改对话框开始
  
 
@@ -217,7 +280,7 @@ import { VueEditor } from "vue2-editor";
 //  }
 }
 }
-//项目修改对话框结束
+
     .PA2textArea{     //标题栏
         margin: 15px 0;
         .PA2textAreaTit{
@@ -239,13 +302,7 @@ import { VueEditor } from "vue2-editor";
         }
     }
     
-    .PA2mid{    //预期取得成果单独一栏
-        width: 100%;
-        text-align: left;
-        font-size: 18px;
-        font-weight: 550;
-        margin-bottom: 10px;
-        color: #2387ff;
-    }
-  }
+
+
+  // }
   </style>

+ 11 - 11
src/views/projectApply/projectApplicationApply.vue

@@ -413,43 +413,43 @@
           },
           MultiSelectProject:[   //优先支持项目下拉框数据
                     {
-                      value: '1',
+                      value: 1,
                       label: '大赛选拔项目'
                     }, {
-                      value: '2',
+                      value: 2,
                       label: '落地注册项目'
                     }, {
-                      value: '3',
+                      value: 3,
                       label: '社会征集项目'
                     }, {
-                      value: '4',
+                      value: 4,
                       label: '产业命题项目'
                     }
           ],
           schoolRemouldOptions:[   //美丽校园下拉框数据
                     {
-                      value: '1',
+                      value: 1,
                       label: '校园安全项目'
                     }, {
-                      value: '2',
+                      value: 2,
                       label: '环境治理项目'
                     }, {
-                      value: '3',
+                      value: 3,
                       label: '校园服务项目'
                     }, {
-                      value: '4',
+                      value: 4,
                       label: '文创装置项目'
                     }
           ],
           personType:[     //项目申请人下拉框数据
                     {
-                      value: '1',
+                      value: 1,
                       label: '在校学生'
                     }, {
-                      value: '2',
+                      value: 2,
                       label: '入驻学校孵化基地的初创企业法人'
                     }
-                ],
+          ],
 
         }
       },

+ 1 - 5
src/views/projectApply/projectApplicationApply2.vue

@@ -182,9 +182,5 @@
       font-weight: 550;
       font-size: 16px;
     }
-    .editor{
-      width: 100%;
-      box-sizing: border-box;
-      padding: 15px 0px 10px 0px;
-    }
+
   </style>

+ 1 - 2
src/views/projectApply/projectApplicationApplyMain.vue

@@ -34,7 +34,7 @@
         <projectApplicationApply2 :data="projectApplicationApply2" :next="next" :back="back" v-if="status==1 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
         <projectApplicationApply3 :data="projectApplicationApply3" :confirmSetFund="confirmSetFund" :data2="pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'?projectApplicationApply1:MakerSpace" :next="next" :back="back" :submitBtn="submitBtn" v-show="status==2"/> 
       </div>
-      <!--下方内容区结束-->
+       <!--下方内容区结束-->
 
       <!-- 提交对话框开始 -->
         <el-dialog
@@ -397,7 +397,6 @@
                 tName:typeName,
                 // message:JSON.stringify([d,[newData1,c.tableData2]]),
                 mon:JSON.stringify(this.projectApplicationApply3),//预算经费,
-
                 tel:a.select.tel,
                 MultiSelectProjectNameS:JSON.stringify(a.select.MultiSelectProjectNameS),
                 schoolRemould:a.select.schoolRemould,

+ 6 - 53
src/views/projectApply/projectApplicationDetailMain.vue

@@ -18,10 +18,10 @@
             </div>
         </div>
 
-        <!-- <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> -->
         <projectApplicationDetails v-if="$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf' && status==0"></projectApplicationDetails>
         <projectApplication2 v-if="$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf' && status==1"></projectApplication2>
+        <!-- <projectApplicationDetails v-if="$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf' && status==0"></projectApplicationDetails> -->
+        <!-- <projectApplication2 v-if="$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf' && status==1"></projectApplication2> -->
 
         <!-- 特色创客空间建设项目 -->
         <projectApplicationMakerSpaceDetails v-if="$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf' && status==0"/>
@@ -43,67 +43,20 @@ import projectApplicationMakerSpaceDetails2 from './projectApplicationMakerSpace
                     {addresses:'项目基本内容',cl:'pr1TitBass'},
                     {addresses:'项目详情',cl:'pr1TitBass'},
                 ],
-                content:{
-                    dialogImageUrl:"",  //封面!!!!!!!!
-                    tableStudentData:[],  //学生成员成员列表!!!!!!!!
-                    tableTeacherData:[],  //老师成员成员列表!!!!!!!
-                    textarea:'',   //项目简介!!!!!!!
-                    select:{    //要提交的数据!!!!!!!!!!!!!!!!!!!!!!!
-                        projectName:'',     //项目名称
-                        leader:'',          //项目负责人
-                        projectDate:[],   //开始结束日期
-                        department:"",   //部门
-                        fund:'',         //资金
-                        MultiSelectProjectNameS:[],   //优先支持项目
-                        schoolRemould:'',        //校园改造项目
-                        tel:'',  //电话
-                        projectApplyPerson:'',  //项目申请人
-                    },
-                  },
-                
-                detail:{},
             }
         },
         methods:{
+            back(){
+                this.$router.push('/projectApplication')
+            },
             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'])
-            this.getData()
+            // this.getData()
         }
     }
 </script>

+ 391 - 272
src/views/projectApply/projectApplicationDetails.vue

@@ -1,36 +1,22 @@
 <template>
   <!-- 项目立项申请查看详细项目基本内容 -->
   <div class="projectApplication1">
-    <!-- <div class="vfpHeader">
-        <div class="titleOne">项目立项申请</div>
-        <span class="smallTitle">项目进展详情</span>
-        <el-button @click="back()" type="primary" size="mini">返回</el-button>
-    </div> -->
-
-
-    <!-- <hr> -->
-    <!-- 跳转导航开始 -->
-    <!-- <div class="AppBar">
-      <div class="AppBarActive">项目基本内容</div>
-      <div @click="remark">项目详情</div>
-    </div> -->
-    <!-- 跳转导航结束 -->
 
      <!-- 活动申请填写信息区域开始 -->
      <div class="select">
         <div class="selectTop">
           <div class="label">项目名称</div>
-          <el-input v-model="data.select.projectName" placeholder="请输入内容"></el-input>
+          <el-input v-model="content.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>
+                  <el-input v-model="content.select.leader" placeholder="请输入内容"></el-input>
               </div>
               <div class="inpBlock">
                   <div class="label">所在部门</div>
-                  <el-select v-model="data.select.department" style="width: 100%;" placeholder="请选择">
+                  <el-select v-model="content.select.department" style="width: 100%;" placeholder="请选择">
                     <el-option
                       v-for="item in this.departmentOptions"
                       :key="item.id"
@@ -41,7 +27,7 @@
               </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-select style="width: 100%;" v-model="content.select.MultiSelectProjectNameS" multiple placeholder="请选择">
                     <el-option
                       v-for="item in this.MultiSelectProject"
                       :key="item.value"
@@ -52,7 +38,12 @@
               </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>
+                  <el-input type="number" v-model="content.select.tel"  @blur="getText(content.select.tel)" placeholder="请输入联系方式"></el-input>
+              </div>
+              <div class="inpBlock">
+                <div class="label">选择分类</div>
+                <!-- <el-cascader v-model="pageType" :options="projectApplicationApply1.sortOptions" clearable></el-cascader> -->
+                <el-cascader disabled :options="sortOptions" clearable></el-cascader>
               </div>
           </div>
 
@@ -60,8 +51,9 @@
             <div class="inpBlock">
                   <div class="label">项目开始时间</div>
                   <el-date-picker
-                    v-model="data.select.projectDate"
+                    v-model="content.select.projectDate"
                     type="daterange"
+                    disabled
                     value-format="yyyy-MM-dd HH:mm:ss"
                     range-separator="至"
                     start-placeholder="开始日期"
@@ -70,12 +62,12 @@
               </div>
               <div class="inpBlock" style="position: relative;">
                   <div class="label">预算总经费</div>
-                  <el-input type="number"  v-model="data.select.fund" placeholder="请输入内容"></el-input>
+                  <el-input type="number" disabled v-model="content.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-select v-model="content.select.schoolRemould" style="width: 100%;" placeholder="请选择">
                     <el-option
                       v-for="item in this.schoolRemouldOptions"
                       :key="item.value"
@@ -86,7 +78,7 @@
               </div>
               <div class="inpBlock">
                   <div class="label">项目申请人</div>
-                  <el-select v-model="data.select.projectApplyPerson" style="width: 100%;" placeholder="请选择">
+                  <el-select v-model="content.select.projectApplyPerson" style="width: 100%;" placeholder="请选择">
                     <el-option
                       v-for="item in this.personType"
                       :key="item.value"
@@ -106,8 +98,8 @@
         <!-- 活动申请填写信息区域结束 -->
 
 
-         <!-- 项目封面修改上传开始 -->
-         <div style="height: 260px;">
+        <!-- 项目封面修改上传开始 -->
+        <div style="height: 260px;">
               <div class="tabTit">
                 <div><p>封面上传</p></div>
               </div>
@@ -122,25 +114,21 @@
                 style="position: relative;"
                 :show-file-list="false"
                 >
-                <img v-if="data.dialogImageUrl" :src="data.dialogImageUrl" class="avatar">
+                <img v-if="content.dialogImageUrl" :src="content.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>
-            </div>
-
-          <!-- 项目封面修改上传开始结束 -->
-
-
-
+        </div>
+        <!-- 项目封面修改上传开始结束 -->
 
-  <!-- 老师项目成员表格开始 -->
-  <div id="two" class="tabTit">
+      <!-- 老师项目成员表格开始 -->
+      <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>
               <hr>
               <el-table
-                :data="data.tableTeacherData"
+                :data="content.tableTeacherData"
                 tooltip-effect="dark"
                 stripe
                 :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
@@ -167,6 +155,8 @@
                   >
                 </el-table-column>
 
+              
+                
                 <el-table-column
                   align="center"
                   prop="operation"
@@ -194,21 +184,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  v-model="data.Member.division" ></el-input>
+                      <el-input  v-model="Member.division" ></el-input>
                     </div>
                   </div>
                   <div slot="footer" class="footer">
@@ -235,103 +225,212 @@
           <!-- 删除老师成员对话框结束 -->
   <!-- 老师项目成员表格结束 -->
 
-      <!-- 项目简介开始 -->
-    <div class="tabTit">
-          <div><p>项目简介</p></div>
-    </div>
-    <hr>
-      <el-input
-        type="textarea"
-        :rows="6"
-        resize="none"
-        class="textArea"
-        placeholder="请输入内容"
-        v-model="textarea">
-      </el-input>
-    <!-- 项目简介结束 -->
+    <!-- 学生项目成员表格开始 -->
+    <div id="two" class="tabTit">
+                <div><p>项目组-学生成员<span>(至少2个学院以上学生构成,团队5人以上)</span> </p></div>
+                <el-button type="primary" @click="addStudentMember"  size="mini">添加成员</el-button>
+              </div>
+              <hr>
+              <el-table
+                :data="content.tableStudentData"
+                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="amendStudentDialogData(scope.$index)" size="mini">修改</el-button>
+                              <el-button type="primary" @click="DelStudent(scope.$index)" size="mini">删除</el-button>
+                          <!-- </el-button> -->
+                      </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+   <!-- 学生项目成员表格结束 -->
 
 
+          <!-- 项目简介开始 -->
+            <div class="tabTit">
+                  <div><p>项目简介</p></div>
+            </div>
+            <hr>
+            <el-input
+              type="textarea"
+              :rows="6"
+              resize="none"
+              class="textArea"
+              placeholder="请输入内容"
+              v-model="content.textarea">
+            </el-input>
+          <!-- 项目简介结束 -->
+
+          <!--添加修改学生成员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="Member.name"></el-input>
+                    </div>
+                  </div>
+
+                  <div class="littleBlock">
+                    <div class="dialogLabel">所在学院/部门/专业</div>
+                    <div>
+                      <el-input v-model="Member.class"></el-input>
+                    </div>
+                  </div>
+
+                  <div class="littleBlock">
+                    <div class="dialogLabel">项目组角色分工</div>
+                    <div>
+                      <el-input v-model="Member.division"></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 class="baseBtn">
       <div class="blockWidth">
         <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button>
-
-        <!-- <el-button v-show="isUpload==0" type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
-        <!-- <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;"  @click="this.$message.error('项目已结项,不可再修改')">立即修改</el-button> -->
-        <!-- <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;"  @click="this.$message.error('项目已结项,不可再修改')">立即修改</el-button> -->
-
       </div>
     </div>
 
+
+
+   <!-- 提交对话框开始 -->
+        <el-dialog
+          title="提示"
+          :visible.sync="submitHint"
+          width="600px"
+          class="pageSubmitData"
+          :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" 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:'',
-          // // 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,
+          isAddMember:1,  //判断是添加学生还是修改学生
           progress:{   //进度条
                 value:0,
                 show:false
             },  
-          // dialogImageUrl:'',  //图片地址
+
+          
           delMember:false,
           amendMemberDialog:false,
           addMemberDialog:false,
-          addTeacherMemberDialog:false,
-          submitHint:false,
-          
-          textarea:'周四福利大放送',   //项目简介
+          submitHint:false,          
+
+          delTeacherMember:false,  //删除老师对话框
+          addTeacherMemberDialog:false,   //添加修改对话框
 
+          addStudentMemberDialog:false,   //添加学生对话框
+          delStudentMember:false,      //删除学生对话框
+
+          textarea:'',   //项目简介
           tableData:[],   //成员列表数据
-          
+
+          content:{
+            dialogImageUrl:"",  //封面!!!!!!!!
+            tableStudentData:[],  //学生成员成员列表!!!!!!!!
+            tableTeacherData:[],  //老师成员成员列表!!!!!!!
+            textarea:'',   //项目简介!!!!!!!
+            select:{    //要提交的数据!!!!!!!!!!!!!!!!!!!!!!!
+                projectName:'',     //项目名称
+                leader:'',          //项目负责人
+                projectDate:[],   //开始结束日期
+                department:"",   //部门
+                fund:'',         //资金
+                MultiSelectProjectNameS:[],   //优先支持项目
+                schoolRemould:'',        //校园改造项目
+                tel:'',  //电话
+                projectApplyPerson:'',  //项目申请人
+            },
+          },
+
 
           departmentOptions: [],  //部门下拉框
-          Member:{    //添加、修改成员
+          Member:{    //添加、修改成员对话框数据
               name:'',
               class:'',
               division:'',
@@ -339,16 +438,16 @@
           },
           MultiSelectProject:[   //优先支持项目下拉框数据
                     {
-                      value: '1',
+                      value: 1,
                       label: '大赛选拔项目'
                     }, {
-                      value: '2',
+                      value: 2,
                       label: '落地注册项目'
                     }, {
-                      value: '3',
+                      value: 3,
                       label: '社会征集项目'
                     }, {
-                      value: '4',
+                      value: 4,
                       label: '产业命题项目'
                     }
           ],
@@ -400,6 +499,7 @@
                 label: '待建设',
               }]
             }],
+            
         }
       },
       methods:{
@@ -447,47 +547,98 @@
                     this.index=val
                   },
                   amendTeacherDialogData(val){   //修改项目成员信息对话框显示
-                    Object.assign(this.Member,this.data.tableTeacherData[val])
+                    Object.assign(this.Member,this.content.tableTeacherData[val])
                     this.isAddMember=2;
                     this.Member['index']=val    //为下面修改提供下标
                     // console.log(this.Member['index']);
                     this.addTeacherMemberDialog=true
                   },
                   commitAddTeacher(){   //确定添加成员  
-                        // console.log(this.Member.name);
+                        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.content.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)
+                        Object.assign(this.content.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.content.tableTeacherData.splice(a,1);
                     this.$message.success('删除成功');
                     this.delTeacherMember=false;
                   },
         // 项目组老师成员方法开始
 
+            // 项目组学生成员方法开始
+                addStudentMember(){   //添加项目成员对话框显示
+                    this.addStudentMemberDialog=true
+                    for(let i in this.Member){
+                      if(i=='score')this.Member[i] = "0"
+                      else this.Member[i] = "";
+                    }
+                    this.isAddMember=1;
+                  },
+                  DelStudent(val){    //删除对话框显示
+                    this.delStudentMember=true;
+                    this.index=val
+                  },
+                  amendStudentDialogData(val){   //修改项目成员信息对话框显示
+                    Object.assign(this.Member,this.content.tableStudentData[val])
+                    this.isAddMember=2;
+                    this.Member['index']=val    //为下面修改提供下标
+                    // console.log(this.Member['index']);
+                    this.addStudentMemberDialog=true
+                  },
+                  commitAddStudent(){   //确定添加成员  
+                        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('请输入项目组角色分工')
+                        let newData = {};
+                        for(let j in this.Member)newData[j] = this.Member[j];
+                        this.content.tableStudentData.push(newData);
+                        this.$message.success('添加成功')
+                        for(let i in this.Member){      
+                          if(i=='score')this.Member[i] = "0"
+                          else this.Member[i] = "";
+                        }
+                        this.addStudentMemberDialog=false;
+                  },
+
+                  commitAmendStudent(){   //确定修改成员
+                        Object.assign(this.content.tableStudentData[this.Member['index']],this.Member)
+                        for(let k in this.Member) this.Member[k]=''
+                        this.addStudentMemberDialog=false;
+                        this.$message.success('修改成功')
+
+                        console.log(this.content.tableData);
+                  },
+
+                  commitDelStudentMember(){   //对话框确定删除成员
+                    let a=this.index;
+                    this.content.tableStudentData.splice(a,1);
+                    this.$message.success('删除成功');
+                    this.delStudentMember=false;
+                  },
+        // 项目组学生成员方法开始
+
+
+
+
         getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
               let param={
                 uid:this.$store.state.userInfo.userid
@@ -495,40 +646,70 @@
                 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];
 
 
+            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);
+                        console.log(data.multiSelectProject);
+                        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.tableStudentData=JSON.parse(data.course_student)
+                        this.content.tableTeacherData=JSON.parse(data.course_teacher)                       
+                        this.content.textarea=data.brief
+                        this.content.dialogImageUrl=data.image
+
+                        
+                        // console.log(this.content);
+                    },err=>{
+                        console.log(err);
+                    })
+            },
+
+
+            audit(){   //提交对话框显示
+              this.submitHint=true
+            },
+
+        submitAll(){   //提交修改数据
           let param={
             uid:this.$store.state.userInfo.userid,
             pid:JSON.parse(localStorage.getItem('pid')),
-            tit:this.select.project,
-            leader:this.select.person,
-            beginTime:this.select.Date,
-            cid:this.select.departmentData,
-            mon:this.select.Fund,
-            phone:this.select.tel,
-            tid:tidId,
-            tidName:typeName,
-            student:JSON.stringify(this.tableData),
-            con:this.textarea,
-            imgsrc:this.dialogImageUrl
+            tit:this.content.select.projectName,
+            bri:this.content.textarea,
+            lea:this.content.select.leader,
+            pho:this.content.select.tel,
+            cos:JSON.stringify(this.content.tableStudentData),
+            cot:JSON.stringify(this.content.tableTeacherData),
+            img:this.content.dialogImageUrl,
+            cla:this.content.select.department,
+            mul:JSON.stringify(this.content.select.MultiSelectProjectNameS),
+            sch:this.content.select.schoolRemould,
           }
             this.ajax
-                  .post(this.$store.state.api+'/UpdateProjectBase',param)
+                  .post(this.$store.state.api+'/updateProjectApplyDetailStudent',param)
                   .then(res=>{
                     // console.log(res);
                     if (res.data==1) {
@@ -538,82 +719,20 @@
                       return
                     }
                     this.$message.error('修改失败')
-                   
-
                   },err=>{
                     console.log(err);
                   })
         },
         init(){
-          this.addMemberDialog=false;
-          this.amendMemberDialog=false;
-          this.delMember=false;
+          this.addStudentMemberDialog=false;
           this.submitHint=false;
+          this.addTeacherMemberDialog=false;
         },
-        // 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
-              }
-                this.ajax
-                      .get(this.$store.state.api+'/SelectAllDepartment',param)
-                      .then(res=>{
-                        // console.log(res.data);
-                        this.select.department=res.data[0]
-                      },err=>{
-                        console.log(err);
-                      })
-            },
-        getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
-          let param={
-            uid:this.$store.state.userInfo.userid
-          }
-            this.ajax
-                  .get(this.$store.state.api+'/SelectAllType',param)
-                  .then(res=>{
-                    // console.log(res.data);
-
-                    this.select.sortOptions[0].value=res.data[0][0].id
-                    this.select.sortOptions[0].label=res.data[0][0].name
 
-                    this.select.sortOptions[1].value=res.data[0][1].id
-                    this.select.sortOptions[1].label=res.data[0][1].name
-                  },err=>{
-                    console.log(err);
-                  })
-        },
       },
-      created(){    //数据加载完成后触发
-        // this.getData();
-        this.getProjectDepartmentData();
-        // this.getProjectTypeData();
+      mounted(){    //数据加载完成后触发
+        this.getProjectDepartmentData()
+        this.getData()
       },
     }
 </script>
@@ -683,74 +802,74 @@
 
 
   //项目修改对话框开始
-  .projectApplicationfundAddDialog{  
+  // .projectApplicationfundAddDialog{  
  
-        .el-dialog__header{
-            background: #32455b;
-
-        }
-        .el-dialog{
-          border-radius:5px ;
-          overflow: hidden;
-        }
+  //       .el-dialog__header{
+  //           background: #32455b;
+
+  //       }
+  //       .el-dialog{
+  //         border-radius:5px ;
+  //         overflow: hidden;
+  //       }
         
-        .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__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;
-
-        }
-    }
+  //       .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__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;
+
+  //       }
+  //   }
 }
 </style>