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

src/views/activityManage/makerActvity.vue

@@ -135,10 +135,15 @@
               <div class="operations">
                   <!-- <el-button type="primary" > -->
                         <el-button type="primary"  @click="MADetails(scope.row.acId)" size="mini">查看详情</el-button>
+<<<<<<< HEAD
+                        <el-button type="primary" v-show="scope.row.state==0"  @click="audi(scope.row)" size="mini">审核</el-button>
+                        <el-button type="info" disabled v-show="scope.row.state==1"  @click="audi(scope.row)" size="mini">审核</el-button>
+=======
 
                         <el-button type="primary" v-if="scope.row.state==0"  @click="audi(scope.row)" size="mini">审核</el-button>
                         <el-button type="info" disabled style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.state==1"  @click="audi(scope.row)" size="mini">审核</el-button>
                         
+>>>>>>> 1a40f4474359a33ad35933277aac9e657fbc7bd2
                         <el-button type="primary"  size="mini" @click="edit(scope)">申请表</el-button>
                         <el-button type="primary" v-if="scope.row.reportFile==''||scope.row.reportFile==null" size="mini" @click="end(scope.row)" >完结</el-button>
                         <el-button type="info" v-show="scope.row.reportFile!=''&&scope.row.reportFile!=null" size="mini" disabled>完结</el-button>

src/views/credit/credit.vue

@@ -230,6 +230,7 @@
             this.options2 = res.data[3]
             this.options3 = res.data[4]
             this.Page.total = res.data[5][0]['total']
+            console.log(res.data)
             console.log(this.Page.total);
             this.tableData = data;
           }).catch(err=>{

src/views/projectApply/projectApplication.vue

@@ -156,7 +156,7 @@
                         <el-button type="primary"  size="mini" @click="lookDetail(scope.row.courseId)">查看详情</el-button>
                         <!-- <el-button type="primary"  size="mini" @click="audit(scope.row)">{{(status==-1?"审核": status?"撤回":"审核")}}</el-button> -->
                         <!-- <el-button type="primary"  size="mini" @click="audit(scope.row)">{{(scope.row.data==1?"审核": scope.row.data==1?"正在审核":"审核")}}</el-button> -->
-                        <el-button v-if="scope.row.isupload==0" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row)">审核</el-button>
+                        <el-button v-show="scope.row.isupload==0" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row)">审核</el-button>
                         <el-button type="info" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.isupload==1"  size="mini">审核中</el-button>
                         <el-button type="info" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.isupload==2"  size="mini">已审核</el-button>