#

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>
     </div>
@@ -437,7 +437,7 @@
           this.ajax
               .post(this.$store.state.api+"/UpdateMakerFundState",param)
               .then(res=>{
-                console.log(res);
+                // console.log(res);
                   this.dialogVisible=false;
                   if (res.data) {
                       this.$message.success('审核成功')
@@ -452,7 +452,7 @@
         endDialogShow(val){      //完结对话框显示
             this.dialogVisible1=true
             this.projectFundState=val
-            console.log(val);
+            // console.log(val);
         },
         confirmEnd(){        //确定完结
           let param={
@@ -460,11 +460,11 @@
             fid:this.projectFundState,
             status:3
           }
-          console.log(param);
+          // console.log(param);
           this.ajax
               .post(this.$store.state.api+"/UpdateMakerFundState",param)
               .then(res=>{
-                console.log(res);
+                // console.log(res);
                   this.dialogVisible1=false
                   if (res.data) {
                       this.$message.success('完结成功')
@@ -483,7 +483,7 @@
           this.getData()
         },
         getData(){
-          // this.loading = true;
+          this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               filter:this.selectInp.filter,
@@ -500,7 +500,7 @@
                 .get(this.$store.state.api+'/selectAllFundApply',param)
                 .then(res=>{
                   let data=res.data;
-                  console.log(data);
+                  // console.log(data);
 
                   let AllFund=0
                   if (data[0].length==0 && data[4][0]['total'] != 0) {
@@ -528,12 +528,8 @@
                     AllFund=0
                   });
 
-
-
-
-                  console.log(data[0]);
-
-                  
+                  // console.log(data[0]);
+                
                   this.tableData=data[0];
                   this.filterSelects=data[1];
                   this.departmentSelect=data[2];

src/views/projectApply/projectApplication.vue

@@ -643,7 +643,7 @@ export default {
         .post(this.$store.state.api + "/updateIsupload", param)
         .then((res) => {
           this.dialogVisible = false;
-          this.$message.success("已驳回项目申请");
+          this.$message.success("已撤回项目申请");
           this.getData();
         });
     },

src/views/projectSettlement/projectSettlement.vue

@@ -163,7 +163,7 @@
               <div class="operations">
                         <el-button type="primary" size="mini" @click="details(scope.row)">查看详情</el-button>
                         
-                        <el-button type="primary"  v-if="scope.row.isupload==3" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">结项申请</el-button>
+                        <el-button type="primary"  v-if="scope.row.isupload==3" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">结项</el-button>
                         <el-button type="info"  disabled v-if="scope.row.isupload==4" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已完结</el-button>
                         <!-- <el-button type="primary" disabled v-if="scope.row.isupload==0" style="width: 73.3px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button> -->