Explorar el Código

学生创客样式

yuanyiming hace 2 años
padre
commit
c23975ce56

+ 1 - 1
src/App.vue

@@ -560,7 +560,7 @@
     justify-content: center;
   }
 
-  .pageSubmitData{
+  .pageSubmitData{     //页面提交数据,数据库样式
         .el-dialog__header{
             display: flex;
             justify-content: center;

+ 133 - 72
src/views/projectApply/projectApplicationApply.vue

@@ -34,7 +34,7 @@
                     <div class="selectMid">
                       <div class="selectLeft">
                           <div class="inpBlock">
-                              <div class="label">项目负责人</div>
+                              <div class="label">项目申请人</div>
                               <el-input v-model="data.select.leader" placeholder="请输入内容"></el-input>
                           </div>
                           <div class="inpBlock">
@@ -63,8 +63,6 @@
                               <div class="label">联系电话</div>
                               <el-input type="number" v-model="data.select.tel"  @blur="getText(data.select.tel)" placeholder="请输入联系方式"></el-input>
                           </div>
-                          <!-- <div v-if="!isPhoneValid" class="error-message">电话号码格式不正确</div> -->
-
                       </div>
 
                       <div class="selectRight">
@@ -148,16 +146,72 @@
           <!-- 项目封面上传开始结束 -->
 
 
+  <!-- 老师项目成员表格开始 -->
+              <div id="two" class="tabTit">
+                <div><p>项目组-老师成员</p></div>
+                <el-button type="primary" @click="addStudentMember"  size="mini">添加成员</el-button>
+              </div>
+              <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="phone"
+                  label="电话"
+                  align="center"
+                  >
+                </el-table-column>
 
-            <!-- <div> -->
-  <!-- 项目成员表格开始 -->
+              
+                
+                <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 id="two" class="tabTit">
-                <div><p>项目成员</p></div>
-                <el-button type="primary" @click="addMember"  size="mini">添加成员</el-button>
+                <div><p>项目组-学生成员</p></div>
+                <el-button type="primary" @click="addStudentMember"  size="mini">添加成员</el-button>
               </div>
               <hr>
               <el-table
-                :data="data.tableData"
+                :data="data.tableStudentData"
                 tooltip-effect="dark"
                 stripe
                 :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
@@ -194,14 +248,14 @@
                   <template #default="scope">
                       <div class="operations">
                           <!-- <el-button type="primary" > -->
-                              <el-button type="primary" @click="amendDialogData(scope.$index)" size="mini">修改</el-button>
-                              <el-button type="primary" @click="Del(scope.$index)" size="mini">删除</el-button>
+                              <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>
-  <!-- 项目成员表格结束 -->
+  <!-- 学生项目成员表格结束 -->
 
 
   <!-- 项目简介开始 -->
@@ -261,8 +315,8 @@
               </div>
             </div>
             <div slot="footer" class="footer">
-              <el-button v-show="isAddMember==1" type="primary" @click="commit" class="AllDialogBtn" >确认提交</el-button>
-              <el-button v-show="isAddMember==2" type="primary" @click="commit2" class="AllDialogBtn" >确认修改</el-button>
+              <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>
@@ -277,7 +331,7 @@
               class="delMemberDialog">
               <span class="deleteContent">确定删除成员?</span>
               <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="commitDelMember" class="AllDialogBtn">确认删除</el-button>
+                <el-button type="primary" @click="commitDelStudentMember" class="AllDialogBtn">确认删除</el-button>
                 <el-button @click="init" class="AllDialogBtn" >取消</el-button>
               </span>
             </el-dialog>
@@ -324,13 +378,13 @@
         // submitUpload() {
         //   this.$refs.upload.submit();
         // },
-        handleRemove(file, fileList) {
-          console.log(file, fileList);
-        },
-        handlePictureCardPreview(file) {
-            this.dialogImageUrl = file.url;
-            this.dialogVisible = true;
-        },
+        // handleRemove(file, fileList) {
+        //   console.log(file, fileList);
+        // },
+        // handlePictureCardPreview(file) {
+        //     this.dialogImageUrl = file.url;
+        //     this.dialogVisible = true;
+        // },
         getText(value) {     //电话验证
           let verify = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
           let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
@@ -360,41 +414,63 @@
           this.delMember=false
 
         },
-        addMember(){   //添加项目成员
-          this.addMemberDialog=true
-          for(let i in this.data.Member){
-            if(i=='score')this.data.Member[i] = "0"
-            else this.data.Member[i] = "";
-          }
-          this.isAddMember=1;
-        },
-        amendDialogData(val){   //修改项目成员信息对话框显示
-          Object.assign(this.data.Member,this.data.tableData[val])
-          this.isAddMember=2;
-          this.data.Member['index']=val
-          // console.log(this.data.Member['index']);
-          this.addMemberDialog=true
-        },
-        commit2(){   //确定修改成员
-              if (!this.data.telVerify2) return this.$message.error('请输入正确联系号码格式')
-              Object.assign(this.data.tableData[this.data.Member['index']],this.data.Member)
-              for(let k in this.data.Member) this.data.Member[k]=''
-              this.addMemberDialog=false;
-              this.$message.success('修改成功')
-
-              console.log(this.data.tableData);
-        },
-        Del(val){    //删除对话框显示
-          this.delMember=true;
-          this.index=val
-        },
-        commitDelMember(){   //对话框确定删除成员
-          let a=this.index;
-          this.data.tableData.splice(a,1);
-          this.$message.success('删除成功');
-          this.delMember=false;
-        
-        },
+
+        // 项目组学生成员方法开始
+                  addStudentMember(){   //添加项目成员对话框显示
+                    this.addMemberDialog=true
+                    for(let i in this.data.Member){
+                      if(i=='score')this.data.Member[i] = "0"
+                      else this.data.Member[i] = "";
+                    }
+                    this.isAddMember=1;
+                  },
+                  DelStudent(val){    //删除对话框显示
+                    this.delMember=true;
+                    this.index=val
+                  },
+                  amendStudentDialogData(val){   //修改项目成员信息对话框显示
+                    Object.assign(this.data.Member,this.data.tableData[val])
+                    this.isAddMember=2;
+                    this.data.Member['index']=val
+                    // console.log(this.data.Member['index']);
+                    this.addMemberDialog=true
+                  },
+                  commitAddStudent(){   //确定添加成员  
+                        if (this.data.Member.name =="" ||this.data.Member.name==undefined) return this.$message.error('请输入姓名')
+                        if (this.data.Member.class=="" ||this.data.Member.class==undefined) return this.$message.error('请输入班级')
+                        if (!this.data.telVerify2) return this.$message.error('请输入正确联系电话格式')
+                        // this.addPerson();
+                        let newData = {};
+                        for(let j in this.data.Member)newData[j] = this.data.Member[j];
+                        this.data.tableData.push(newData);
+                        this.$message.success('添加成功')
+                        for(let i in this.data.Member){      
+                          if(i=='score')this.data.Member[i] = "0"
+                          else this.data.Member[i] = "";
+                        }
+                        console.log(this.data.tableData)
+                        this.init()
+                  },
+
+                  commitAmendStudent(){   //确定修改成员
+                        if (!this.data.telVerify2) return this.$message.error('请输入正确联系号码格式')
+                        Object.assign(this.data.tableData[this.data.Member['index']],this.data.Member)
+                        for(let k in this.data.Member) this.data.Member[k]=''
+                        this.addMemberDialog=false;
+                        this.$message.success('修改成功')
+
+                        console.log(this.data.tableData);
+                  },
+
+                  commitDelStudentMember(){   //对话框确定删除成员
+                    let a=this.index;
+                    this.data.tableData.splice(a,1);
+                    this.$message.success('删除成功');
+                    this.delMember=false;
+                  },
+        // 项目组学生成员方法开始
+
+
         backBtn1(){  // 上一步
           this.$router.push('/projectApplication')
         },
@@ -402,22 +478,7 @@
         backBtn(){   // 下一步
             this.next();
         },
-        commit(){   //确定添加成员  
-              if (this.data.Member.name =="" ||this.data.Member.name==undefined) return this.$message.error('请输入姓名')
-              if (this.data.Member.class=="" ||this.data.Member.class==undefined) return this.$message.error('请输入班级')
-              if (!this.data.telVerify2) return this.$message.error('请输入正确联系电话格式')
-              // this.addPerson();
-              let newData = {};
-              for(let j in this.data.Member)newData[j] = this.data.Member[j];
-              this.data.tableData.push(newData);
-              this.$message.success('添加成功')
-              for(let i in this.data.Member){      
-                if(i=='score')this.data.Member[i] = "0"
-                else this.data.Member[i] = "";
-              }
-              console.log(this.data.tableData)
-              this.init()
-        },
+
        
         toPage(val){
             if (val==1) {

+ 9 - 7
src/views/projectApply/projectApplicationApplyMain.vue

@@ -167,10 +167,13 @@
             },
 
             projectApplicationApply1:{   //立项基础信息页面
-              amendMemberDialog:false,  //修改人员对话框显示判断
+                amendMemberDialog:false,  //修改人员对话框显示判断
                 dialogImageUrl:"",  //封面
                 telVerify:true,    //判断基础信息里联系电话
                 telVerify2:true,  //添加修改成员电话判断
+                tableStudentData:[],  //学生成员成员列表
+                tableTeacherData:[],  //老师成员成员列表
+
                 MultiSelectProject:[   //优先支持项目下拉框数据
                     {
                       value: '1',
@@ -186,6 +189,8 @@
                       label: '产业命题项目'
                     }
                 ],
+                textarea:'',   //项目简介
+
                 schoolRemouldOptions:[   //美丽校园下拉框数据
                     {
                       value: '1',
@@ -201,7 +206,7 @@
                       label: '文创装置项目'
                     }
                 ],
-                personType:[
+                personType:[     //项目申请人下拉框数据
                     {
                       value: '1',
                       label: '在校学生'
@@ -224,8 +229,7 @@
                   sort:[] //["dawjiawdjaw",0]   
                 },
                 departmentOptions: [],  //部门下拉框
-                // sortOptions: [], //分类下拉框
-                sortOptions: [
+                sortOptions: [      //选择分类下拉框数据
                     {
                       value:"",
                       label: '',
@@ -249,16 +253,14 @@
                       label: '待建设',
                     }]
                   }],
-                textarea:'',   //项目简介
                 Member:{    //添加成员
                     name:'',
                     class:'',
                     phone:'',
                     score:'0'
                 },
-                tableData:[],  //成员列表
-
             },
+
             projectApplicationApply2:{  //项目内容页面
                   contentOne:'',
                   contentTwo:'',