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

src/views/activityManage/makerActvityApplyMain.vue

@@ -84,7 +84,7 @@ 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].filter(item=>item.isupload!='2');
+                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload=="0");
 
                 }).catch(err=>{
                     this.$message.error(err.message)

src/views/activityManage/makerActvityDetails.vue

@@ -545,9 +545,6 @@ export default {
     handleClose(){
       this.addMemberDialog=false;
     },
-    // backBtn(){
-    //   this.$router.push('/makerActvity')
-    // },
     addTeacher(){
       this.isAddTeacher = true;
       this.addMemberDialog=true;
@@ -562,10 +559,16 @@ export default {
         })
     },
     getProject(){
+      this.loading = true;
         this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
             uid:this.$store.state.userInfo.userid,
         }).then(res=>{
-            this.selectInput.project = res.data[0];
+          this.loading = false
+          this.selectInput.project = res.data[0].filter(item=>{
+            if(item.courseId==this.tableData.pid)return true;
+            if(item.isupload=="0")return true;
+            return false
+          });
         }).catch(err=>{
             this.$message.error(err.message)
         })
@@ -584,6 +587,7 @@ export default {
         data.reportFile = data.reportFile==''||data.reportFile==null?[]:JSON.parse(data.reportFile)
         this.tableData = data;
         this.oldMoney += Number(this.tableData.money)
+        this.getProject();
         this.loading = false;
       }).catch(err=>{
         this.$message.error(err.message)
@@ -638,7 +642,7 @@ export default {
   },
   mounted(){
     this.getAllClass();
-    this.getProject();
+
     this.getData();
   }
 }

src/views/projectApply/projectApplication.vue

@@ -159,7 +159,7 @@
                         <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>
 
-                        <el-button type="primary"  size="mini" @click="appTable()" >申请表</el-button>
+                        <el-button type="primary"  size="mini" @click="appTable(scope.row.typeName)" >申请表</el-button>
                         <!-- <el-button type="primary"  size="mini"><a href="/file/附件 5 ：学校创客专项资金使用申请表.xlsx" download="创客活动.doc">申请表</a> </el-button> -->
 
                         <el-button type="primary"  size="mini" @click="del(scope.row)">删除</el-button>
@@ -388,10 +388,16 @@ import downloadFile from '@/components/tool/downloadFile.js';
             
             
         },
-        appTable(){   //查看申请表
-
+        appTable(name){   //查看申请表
+          if(name=="学生创客项目"){
+            downloadFile('/file/附件2：2023年学生创客项目申报书模板(2).docx',"2023年学生创客项目申报书模板.docx",(_b)=>this.loading = _b);
+          }else if(name=="特色创客空间建设项目"){
+            downloadFile('/file/附件3：2023年二级学院特色创客空间建设项目申报书模板(2).docx',"2023年二级学院特色创客空间建设项目申报书模板.docx",(_b)=>this.loading = _b);
+          }else{
+            this.$message.error("分类错误")
+          }
           // window.open("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E9%99%84%E4%BB%B6%202%EF%BC%9A%E5%88%9B%E5%AE%A2%E4%B8%93%E9%A1%B9%E8%B5%84%E9%87%91%E9%A1%B9%E7%9B%AE%E7%94%B3%E8%AF%B7%E8%A1%A8%EF%BC%88%E5%88%9B%E5%AE%A2%E6%B4%BB%E5%8A%A8%EF%BC%891681086540732.doc")
-          downloadFile('/file/附件 1：创客专项资金项目申请表（个人创客）20180511.doc',"创客专项资金项目申请表(个人创客).doc",(_b)=>this.loading = _b);
+          // downloadFile('/file/附件 1：创客专项资金项目申请表（个人创客）20180511.doc',"创客专项资金项目申请表(个人创客).doc",(_b)=>this.loading = _b);
           
           // let data=require('../../assets/file/附件 5 ：学校创客专项资金使用申请表.xlsx')
           // var blob = new Blob(['../../assets/file/附件 5 ：学校创客专项资金使用申请表.xlsx']);
@@ -479,6 +485,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
                 a.person=data[4];
                 this.table.total=data[5][0].total
                 this.loading = false;
+                console.log(this.tableData)
               },err=>{
                 console.log(err);
               })