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

src/views/activityManage/makerActvity.vue

@@ -1,6 +1,6 @@
 <template>
   <!--创客活动 -->
-  <div class="makerActvity">
+  <div class="makerActvity" v-loading="loading">
     <div class="pAHeader">
       <div class="pAHeader1">创客活动</div>
       <el-button @click="makerActvityApply">创客活动申请</el-button>
@@ -134,7 +134,7 @@
                         <el-button type="primary" v-if="scope.row.state==0"  @click="audi(scope.row)" size="mini">审核</el-button>
                         <el-button type="info" disabled v-show="scope.row.state==1 || scope.row.state==2" size="mini">审核</el-button>
                         
-                        <el-button type="primary"  size="mini" @click="edit(scope)">申请表</el-button>
+                        <el-button type="primary"  size="mini" @click="edit()">申请表</el-button>
                         <el-button type="primary" v-show="scope.row.state==1" size="mini" @click="end(scope.row)" >完结</el-button>
                         <el-button type="info" v-show="scope.row.state==2||scope.row.state==0" size="mini" disabled>完结</el-button>
 
@@ -288,11 +288,13 @@
 </template>
 
 <script>
-import beUpload from '../../components/tool/beUpload'
+import beUpload from '../../components/tool/beUpload';
+import downloadFile from '@/components/tool/downloadFile.js';
     export default {
       components:{beUpload},
       data() {
         return {
+          loading:false,
           accept:"*",
           status:1,
           textarea:'',
@@ -427,7 +429,7 @@ import beUpload from '../../components/tool/beUpload'
         },
         
         edit(){ // 申请表按钮
-
+          downloadFile('../../assets/file/附件 2：创客专项资金项目申请表（创客活动）.doc',"创客专项资金项目申请表（创客活动）.doc",(_b)=>this.loading = _b);
         },
              
         audi(row){  // 审核按钮

src/views/fundManage/makerfund.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 创客资金管理 -->
-  <div class="makerfund">
+  <div class="makerfund" v-loading="loading">
     <div class="pAHeader">
       <div class="pAHeader1">创客资金管理</div>
       <el-button type="primary" style="font-size: 16px;" @click="apply">创客资金申请</el-button>
@@ -159,7 +159,7 @@
                 <el-button type="primary" disabled v-show="scope.row.state==1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" class="bt1" size="mini">已审核</el-button>
                 <el-button type="primary" disabled v-show="scope.row.state==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" class="bt1" size="mini">已审核</el-button>
 
-                <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row.id,scope.row.status)">申请表</el-button>
+                <el-button type="primary" class="bt1" size="mini" @click="edit()">申请表</el-button>
 
                 <el-button disabled v-show="scope.row.state==0"  style="width: 74px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" @click="endDialogShow(scope.row.fid)" type="primary" class="bt1" size="mini">完结</el-button>
                 <el-button  v-show="scope.row.state==1"  style="width: 74px;" @click="endDialogShow(scope.row.fid)" type="primary" class="bt1" size="mini">完结</el-button>
@@ -419,9 +419,11 @@
 </template>
 
 <script>
+import downloadFile from '@/components/tool/downloadFile.js';
     export default {
       data() {
         return {
+          loading:false,
           ProjectFundData:{},
           projectFundState:'',
           dialogVisible1:false,
@@ -558,7 +560,7 @@
                 })
         },
         edit(){
-
+          downloadFile('../../assets/file/附件 5 ：学校创客专项资金使用申请表.xlsx',"学校创客专项资金使用申请表.xlsx",(_b)=>this.loading = _b);
         },
         handleSelectionChange(val) {     //批量选择
           this.multipleSelection = val;