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

src/views/projectApply/components/projectApplicationApply.vue

@@ -239,7 +239,7 @@
               <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>
+                <el-button @click="delTeacherMember=false" class="AllDialogBtn" >取消</el-button>
               </span>
             </el-dialog>
           <!-- 删除老师成员对话框结束 -->
@@ -348,7 +348,7 @@
               <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>
+                <el-button @click="delStudentMember=false" class="AllDialogBtn" >取消</el-button>
               </span>
             </el-dialog>
           <!-- 删除学生成员对话框结束 -->

src/views/projectApply/components/projectApplicationApply2.vue

@@ -21,10 +21,10 @@
           </div>
         </div>
         <div class="right">
-            <di class="vfpHeader">
+            <div class="vfpHeader">
               <div class="titleOne">项目立项申请</div>
               <el-button @click="backBtn1" type="primary" size="mini">返回</el-button>
-            </di>
+            </div>
             <hr>
             <div id="1">
               <p class="pTit">研发内容</p>

src/views/projectApply/components/projectApplicationDetails.vue

@@ -220,7 +220,7 @@
               <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>
+                <el-button @click="delTeacherMember=false" class="AllDialogBtn" >取消</el-button>
               </span>
             </el-dialog>
           <!-- 删除老师成员对话框结束 -->
@@ -341,7 +341,7 @@
               <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>
+                <el-button @click="delStudentMember=false" class="AllDialogBtn" >取消</el-button>
               </span>
             </el-dialog>
           <!-- 删除学生成员对话框结束 -->
@@ -756,7 +756,7 @@
                     if(cEmpty.test(param[i]))return this.$message.error("请选择项目封面图片")
                     break;
                   case 'cot':
-                    if(JSON.parse(param[i]).length<2 || JSON.parse(param[i]).length>4)return this.$message.error("需要教师团队3人以上，至少应包含1名教研室主任")
+                    if(JSON.parse(param[i]).length<2 || JSON.parse(param[i]).length>3)return this.$message.error("需要教师团队2-3人，至少应包含1名教研室主任")
                     break;
                   case 'cos':
                     if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")

src/views/projectApply/projectApplicationApplyMain.vue

@@ -25,14 +25,14 @@
         <!-- 特色创客空间建设项目 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'"/>
+        <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"/> 
 
         <!-- 特色创客空间建设项目 -->
         <projectApplicationApplyMakerSpace :data="MakerSpace" :next="next" :back="back" v-if="status==0 && pageType[0]=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
         <projectApplicationApplyMakerSpace2 :data="MakerSpace2" :next="next" :back="back" v-if="status==1 && pageType[0]=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
         <!-- <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/> -->
         <!-- <projectApplicationApplyMakerSpace :data="MakerSpace" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/> -->
-        <projectApplicationApply2 :data="projectApplicationApply2" :next="next" :back="back" v-if="status==1 && 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>
        <!--下方内容区结束-->
 
@@ -394,12 +394,13 @@
                     if(cEmpty.test(param[i]))return this.$message.error("请选择项目封面图片")
                     break;
                   case 'teacher':
-                    if(JSON.parse(param[i]).length<2 || JSON.parse(param[i]).length>4)return this.$message.error("需要教师团队3人以上，至少应包含1名教研室主任")
+                    if(JSON.parse(param[i]).length<2 || JSON.parse(param[i]).length>3)return this.$message.error("需要教师团队2-3人，至少应包含1名教研室主任")
                     break;
                   case 'student':
                     if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")
                     break;
                   case 'con':
+                    console.log(param[i].length);
                     if(param[i].length<200 || param[i].length>=300)return this.$message.error("项目简介需要200-300字")
                     break;
                 }

src/views/projectManage/components/ProjectManagement1.vue

@@ -220,7 +220,7 @@
               <div class="deleteContent">确定删除老师成员?</div>
               <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="commitDelTeacherMember" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="init" class="AllDialogBtn" >取消</el-button>
+                <el-button @click="delTeacherMember=false" class="AllDialogBtn" >取消</el-button>
               </span>
             </el-dialog>
           <!-- 删除老师成员对话框结束 -->
@@ -341,7 +341,7 @@
               <div class="deleteContent">确定删除学生成员?</div>
               <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="commitDelStudentMember" class="AllDialogBtn">确认删除</el-button>
-                <el-button @click="init" class="AllDialogBtn" >取消</el-button>
+                <el-button @click="delStudentMember=false" class="AllDialogBtn" >取消</el-button>
               </span>
             </el-dialog>
           <!-- 删除学生成员对话框结束 -->
@@ -758,7 +758,7 @@
                     if(cEmpty.test(param[i]))return this.$message.error("请选择项目封面图片")
                     break;
                   case 'cot':
-                    if(JSON.parse(param[i]).length<2 || JSON.parse(param[i]).length>4)return this.$message.error("需要教师团队3人以上，至少应包含1名教研室主任")
+                    if(JSON.parse(param[i]).length<2 || JSON.parse(param[i]).length>3)return this.$message.error("需要教师团队2-3人，至少应包含1名教研室主任")
                     break;
                   case 'cos':
                     if(JSON.parse(param[i]).length<5)return this.$message.error("需要学生团队5人以上")

src/views/projectManage/components/ProjectManagement3_1.vue

@@ -11,7 +11,7 @@
                   <div class="selectLeft">
                       <div class="inpBlock" style="position: relative;">
                           <div class="label">预算经费</div>
-                          <el-input v-model="selects.fund" placeholder="请输入内容"></el-input>
+                          <el-input v-model="selects.fund" disabled placeholder="请输入内容"></el-input>
                           <div style="position: absolute;top: 8px;right: -30px;">(万)</div>
                       </div>
                       <div class="inpBlock">

src/views/projectManage/components/ProjectManagement4.vue

@@ -4,11 +4,9 @@
 
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn"  size="mini">上传文件</el-button> -->
-
-          <beUpload @getFile="getFile" v-show="state==0" class="btn"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
-          <beUpload @getFile="getFile" class="btn" v-show="state==1" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
-          <el-button v-show="state==2"  class="btn" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
-
+          <beUpload @getFile="getFile" v-show="state==0"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <beUpload @getFile="getFile"  v-show="state==1" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <el-button v-show="state==2"  style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;height: 40px;">上传文件</el-button>
         </div>
         <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
 
@@ -356,11 +354,12 @@
       margin: 10px 0 10px 0;
       justify-content: flex-end;
 
-      .btn{
-        width: 120px;
-        font-size: 16px !important;
-        margin-left: 10px;
-      }
+      // .btn{
+      //   width: 120px !important;
+      //   height: 40px !important;
+      //   font-size: 16px !important;
+      //   margin-left: 10px;
+      // }
     }
     
   }

src/views/projectManage/components/ProjectManagement5.vue

@@ -4,9 +4,9 @@
 
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn" @click="addFile" size="mini">上传文件</el-button> -->
-          <beUpload class="btn" @getFile="getFile" v-show="state==0" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
-          <el-button class="btn" v-show="state==2" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
-          <el-button class="btn" v-show="state==1" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
+          <beUpload  @getFile="getFile" v-show="state==0" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <el-button  v-show="state==2" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
+          <el-button v-show="state==1" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
 
         </div>
         <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
@@ -376,13 +376,13 @@
       margin: 10px 0 10px 0;
       display: flex;  
       justify-content: flex-end;
-      .btn{
-        width: 120px;
-        font-size: 16px;
-        border: none;
+      // .btn{
+      //   width: 120px;
+      //   font-size: 16px;
+      //   border: none;
 
-        // margin-left: 10px;
-      }
+      //   // margin-left: 10px;
+      // }
     }
   }
     

src/views/resultShow/components/resultDetail_student.vue

@@ -630,7 +630,7 @@
                     pid:this.$route.query["pid"]
                 }).then(res=>{
                     let FormData = res.data;
-                    console.log(FormData)
+                //    return console.log(FormData)
                 //     //头部信息
                     this.TitleMessage = FormData[0][0]
                     // 教师表格
@@ -639,6 +639,7 @@
                     // 学生表格
                     this.TitleMessage['student'] = JSON.parse(this.TitleMessage['student'])
                     this.TitleMessage['multiSelectProject']=JSON.parse(this.TitleMessage['multiSelectProject'])
+                    console.log(this.TitleMessage['multiSelectProject']);
                     this.DetailMessage= JSON.parse(FormData[1][0]['chapters']);
                     this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
                     if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0]