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

src/App.vue

@@ -163,7 +163,6 @@
           }
         }
         [type='button']{
-          background: #0e72e6 !important;
           color: #fff !important;
           display: flex;
           position: absolute;

src/views/activityManage/makerActvityApplyMain.vue

@@ -84,7 +84,8 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
                     uid:this.$store.state.userInfo.userid,
                 }).then(res=>{
-                    this.makerActvityApplyData.project = res.data[0];
+                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload!='2');
+
                 }).catch(err=>{
                     this.$message.error(err.message)
                 })

src/views/activityManage/makerActvityDetails.vue

@@ -109,7 +109,8 @@
                 <div>
                   <p>活动指导老师</p>
                 </div>
-                <el-button type="primary" @click="addTeacher" size="mini">添加教师</el-button>
+                <el-button type="primary" v-if="tableData.state==0" @click="addTeacher" size="mini">添加教师</el-button>
+                <el-button type="info" v-show="tableData.state==1 || tableData.state==2" disabled  size='small'>添加教师</el-button>
               </div>
               <hr>
               <el-table
@@ -193,10 +194,11 @@
 
             <div class="baseBtn">
               <div class="BtnStyle">
-                <el-button type="primary" @click="submit" size='small'>保存</el-button>
+                <el-button type="primary" v-show="tableData.state==0" @click="submit" size='small'>保存</el-button>
+                <el-button  type="info" v-show="tableData.state==1 || tableData.state==2" disabled size='small'>保存</el-button>
                 <el-button type="primary"  @click="getData" size='small'>重置</el-button>
                 <el-button v-if="tableData.state==0" type="primary" @click="processDialog = true" size='small'>立即审核</el-button>
-                <el-button v-if="tableData.state==1" type="info" style="background-color: gray;" disabled size='small'>立即审核</el-button>
+                <el-button type="info" v-show="tableData.state==1 || tableData.state==2" disabled size='small'>立即审核</el-button>
               </div>
             </div>
 
@@ -573,7 +575,6 @@ export default {
         aId:this.$route.query["Id"]
       }).then(res=>{
         if(!res.data[0][0])return this.$message.error("错误")
-        console.log(res)
         let data = res.data[0][0];
         data.begin_at = JSON.parse(data.begin_at);
         data.course_teacher = JSON.parse(data.course_teacher);
@@ -581,6 +582,7 @@ export default {
         data.reportFile = data.reportFile==''||data.reportFile==null?[]:JSON.parse(data.reportFile)
         this.tableData = data;
         this.oldMoney += Number(this.tableData.money)
+        console.log(this.tableData)
       }).catch(err=>{
         this.$message.error(err.message)
       })