Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/App.vue

@@ -381,7 +381,7 @@
     justify-content: flex-end;
   }
 
-  .AddMember{      //添加对话框只包括三个input框的
+  .AddMember{      //添加成员对话框
       .el-input__inner{
           width: 300px;
       }
@@ -409,15 +409,19 @@
         }
         .littleBlock{   //添加对话框 label和input框
             display: flex;
-            width: 70%;
+            // width: 70%;
+            justify-content: center;
+            width: 100%;
             margin: 10px;
             .dialogLabel{      //label
-              max-width: 60px;
-              min-width: 65px;
+              width: 26%;
+              // min-width: 60px;
+              // min-width: 65px;
               font-size: 16px;
               margin-right: 10px;
               display: inline-block;
               text-align: justify;
+              // text-align: right;
               text-justify:distribute-all-lines;
               text-align-last: justify;
               transform: translate(0,22%);

src/views/projectApply/projectApplicationApply.vue

@@ -161,14 +161,14 @@
                 </el-table-column>
                 <el-table-column
                   prop="class"
-                  label="班级"
+                  label="所在学院/部门/专业"
                   align="center"
                   >
                 </el-table-column>
 
                 <el-table-column
-                  prop="phone"
-                  label="电话"
+                  prop="division"
+                  label="项目组角色分工"
                   align="center"
                   >
                 </el-table-column>
@@ -216,7 +216,7 @@
                   <div class="littleBlock">
                     <div class="dialogLabel">项目组角色分工</div>
                     <div>
-                      <el-input type="number" class="inputNumber" v-model="data.Member.phone" @blur="getText(data.Member.phone)" ></el-input>
+                      <el-input type="number" class="inputNumber" v-model="data.Member.division" ></el-input>
                     </div>
                   </div>
                   <div slot="footer" class="footer">
@@ -270,14 +270,14 @@
                 </el-table-column>
                 <el-table-column
                   prop="class"
-                  label="班级"
+                  label="所在学院/部门/专业"
                   align="center"
                   >
                 </el-table-column>
 
                 <el-table-column
-                  prop="phone"
-                  label="电话"
+                  prop="division"
+                  label="项目组角色分工"
                   align="center"
                   >
                 </el-table-column>
@@ -325,7 +325,7 @@
                   <div class="littleBlock">
                     <div class="dialogLabel">项目组角色分工</div>
                     <div>
-                      <el-input type="number" class="inputNumber" v-model="data.Member.phone" @blur="getText(data.Member.phone)" ></el-input>
+                      <el-input type="number" class="inputNumber" v-model="data.Member.division"></el-input>
                     </div>
                   </div>
                   <div slot="footer" class="footer">
@@ -438,16 +438,10 @@
                 this.$message.error('请输入正确联系号码格式')
                 return  this.data.telVerify=false;
             }
-            if (value == this.data.Member.phone) {
-                return  this.data.telVerify2=false;
-            }
           }else{
             if (value == this.data.select.tel) {
                  this.data.telVerify=true;
             }
-            if (value == this.data.Member.phone) {
-              return  this.data.telVerify2=true;
-            }
           }
         },
         
@@ -481,8 +475,9 @@
                   commitAddStudent(){   //确定添加成员  
                         // console.log(this.data.Member.name);
                         if (this.data.Member.name =="" ||this.data.Member.name==undefined) return this.$message.error('请输入姓名')
-                        if (this.data.Member.class=="" ||this.data.Member.class==undefined) return this.$message.error('请输入班级')
-                        if (!this.data.telVerify2) return this.$message.error('请输入正确联系电话格式')
+                        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('请输入项目组角色分工')
+
                         // this.addPerson();
                         let newData = {};
                         for(let j in this.data.Member)newData[j] = this.data.Member[j];
@@ -497,7 +492,6 @@
                   },
 
                   commitAmendStudent(){   //确定修改成员
-                        if (!this.data.telVerify2) return this.$message.error('请输入正确联系号码格式')
                         Object.assign(this.data.tableStudentData[this.data.Member['index']],this.data.Member)
                         for(let k in this.data.Member) this.data.Member[k]=''
                         this.addStudentMemberDialog=false;
@@ -538,8 +532,8 @@
                   commitAddTeacher(){   //确定添加成员  
                         // console.log(this.data.Member.name);
                         if (this.data.Member.name =="" ||this.data.Member.name==undefined) return this.$message.error('请输入姓名')
-                        if (this.data.Member.class=="" ||this.data.Member.class==undefined) return this.$message.error('请输入班级')
-                        if (!this.data.telVerify2) return this.$message.error('请输入正确联系电话格式')
+                        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('请输入项目组角色分工')
                         // this.addPerson();
                         let newData = {};
                         for(let j in this.data.Member)newData[j] = this.data.Member[j];
@@ -554,7 +548,6 @@
                   },
 
                   commitAmendTeacher(){   //确定修改成员
-                        if (!this.data.telVerify2) return this.$message.error('请输入正确联系号码格式')
                         Object.assign(this.data.tableTeacherData[this.data.Member['index']],this.data.Member)
                         for(let k in this.data.Member) this.data.Member[k]=''
                         this.addTeacherMemberDialog=false;

src/views/projectApply/projectApplicationApplyMain.vue

@@ -23,6 +23,7 @@
       <div class="Main_area">
         <!-- 学生创客项目 5e21b204-c206-11ed-a4cd-509a4c5b67cf -->
         <!-- 特色创客空间建设项目 5f7a66d5-c206-11ed-a4cd-509a4c5b67cf -->
+        <!-- <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back"/> -->
         <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
 
         <!-- 特色创客空间建设项目 -->
@@ -96,6 +97,7 @@
         },
         data() {
           return {
+            // selectType:true,     //选择分类对话框
             selectType:true,     //选择分类对话框
             pageType:[],         //判断页面显示分类   学生创客项目    学院特色创客空间   
             status:0,   //判断顶部导航跳转
@@ -133,7 +135,6 @@
             projectApplicationApply1:{   //立项基础信息页面
                 amendMemberDialog:false,  //修改人员对话框显示判断
                 telVerify:true,    //判断基础信息里联系电话
-                telVerify2:true,  //添加修改成员电话判断
 
                 dialogImageUrl:"",  //封面!!!!!!!!
                 tableStudentData:[],  //学生成员成员列表！！！！！！！！
@@ -155,7 +156,7 @@
                 Member:{    //添加、修改成员
                     name:'',
                     class:'',
-                    phone:'',
+                    division:'',
                     score:'0'
                 },
                 MultiSelectProject:[   //优先支持项目下拉框数据
@@ -290,7 +291,7 @@
           
           selectTypeButton(){            //分类选项 学生 学校
             // this.$message.error('请选择分类')
-            console.log(this.pageType[0]==false);
+            // console.log(this.pageType[0]==false);
             if (!this.pageType[0]) return this.$message.error('请选择分类')
             this.selectType=false
           },
@@ -326,7 +327,7 @@
                 this.ajax
                       .get(this.$store.state.api+'/SelectAllType',param)
                       .then(res=>{
-                        console.log(res.data[0]);
+                        // console.log(res.data[0]);
                         let p=res.data[0]
                         let a=this.projectApplicationApply1
                         a.sortOptions[0].value=p[0].id
@@ -393,6 +394,9 @@
               if(a.select.fund=='') return this.$message.error('请选择美丽校园改造计划')
               if(a.select.person=='') return this.$message.error('请选择项目申请人')
               if(!a.telVerify) return this.$message.error('请输入正确联系电话格式')
+              if(a.tableTeacherData.length<1 || a.tableTeacherData.length>4) return this.$message.error('老师成员2-3人')
+              if(a.tableStudentData.length<5) return this.$message.error('学生成员5人以上')
+
               
               // let d=[]   //按照后端格式传递数据，项目内容，要将经费支出，与项目明细放在一起，
               // for(let key in b){