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

src/views/fundManage/makerfund.vue

@@ -449,7 +449,15 @@ import downloadFile from '@/components/tool/downloadFile.js';
             {
               value:1,
               label:'活动创客'
-            }
+            },
+            {
+              value:2,
+              label:'创客空间'
+            },
+            {
+              value:3,
+              label:'创客实践室'
+            },
           ],
           leaderSelects:[],
           statusSelects:[

src/views/fundManage/makerfundApply.vue

@@ -986,7 +986,7 @@ export default {
             this.progress.show = false;
             // this.imageUrl=require("../../assets/img/jj.jpg")
         },
-        getData(){         //获取还未申请过活动经费的项目名称
+        getData(){         //获取活动经费的项目名称
             let param={
                 uid:this.$store.state.userInfo.userid,
                 fid:''
@@ -994,9 +994,9 @@ export default {
             this.ajax
                 .get(this.$store.state.api+'/SelectMakerFundSelects',param)
                 .then(res=>{
-                    // console.log(res.data);
+                    console.log(res.data);
                     this.projectFilter=res.data[1]
-                    console.log(this.projectFilter);
+                    // console.log(this.projectFilter);
                 },err=>{
                     console.log(err);
                 })

src/views/projectManage/ProjectManagement.vue

@@ -141,8 +141,11 @@
       :before-close="init">
       <div class="addDialogLogo">LOGO</div>
       <div class="deleteContent">"{{ tit }}"项目，是否确定完结？</div>
+      <div class="download checkActivity">
+            <span style="color: black;">剩余资金:</span><span style="cursor: pointer;" @click="fundDetail(item.id)" v-for="(item,index) in checkFundEndData" :key="index" >{{ item.type }}/{{ item.fund - item.usedFund }}
+              （元）</span>
+      </div>
       <div class="deleteContent1">活动完结报告</div>
-
         <div class="download" v-for="item in file" :key="item.fid">
             <span>{{ item.fileName }}</span>
             <div class="downloadBtn">
@@ -172,11 +175,12 @@
       :before-close="init">
       <div class="addDialogLogo">LOGO</div>
       <div class="deleteContent">"{{ tit }}"项目</div>
-      <div class="download checkActivity">
+      <div class="download checkActivity" v-show="checkActivityFinishData.length>0">
             <span style="color: black;">未完结活动:</span><span v-for="(item,index) in checkActivityFinishData" :key="index">{{ item.title }}</span>
       </div>
       <div class="download checkActivity">
-            <span style="color: black;">还有未报销资金-剩余:</span><span>{{ checkFundFinishData.fund - checkFundFinishData.usedFund }}</span>
+            <span style="color: black;">未完结资金:</span><span style="cursor: pointer;" @click="fundDetail(item.id)" v-for="(item,index) in checkFundFinishData" :key="index" >{{ item.type }}/{{ item.fund - item.usedFund }}
+              （元）</span>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="init" class="AllDialogBtn">确认</el-button>
@@ -264,11 +268,16 @@ import beUpload from '../../components/tool/beUpload'
           },
           file:[],
           checkActivityFinishData:[],
-          checkFundFinishData:{}
+          checkFundFinishData:[],
+          checkFundEndData:[]
         }
       },
       methods:{
-        
+        fundDetail(val){
+          // console.log(val);
+          // window.open(`/#/makerfundDetails?Id=${val}`)
+          this.$router.push(`/makerfundDetails?Id=${val}`);
+        },
         ProgressFormat(value){        //进度条
           return value ==100?'100%':`${value}%`
         },
@@ -285,7 +294,7 @@ import beUpload from '../../components/tool/beUpload'
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
-            // console.log(res.data[0][0].endFile);
+            console.log(res);
             let data=JSON.parse(res.data[0][0].endFile)
             this.file=data;
             this.tit=tit;
@@ -333,19 +342,25 @@ import beUpload from '../../components/tool/beUpload'
         },
         finish(val,tit){     //结项对话框显示
           this.checkActivityFinishData = [];
-          this.checkFundFinishData={};
+          this.checkFundFinishData=[];
+          this.checkFundEndData=[];
+
           this.ajax.get(this.$store.state.api+"/GetActivityNoReportByPId",{
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
             console.log(res.data);
+
             if(res.data[0].length>0 || res.data[1].length>0){
               this.checkActivityFinishData = res.data[0];
-              this.checkFundFinishData = res.data[1][0];
+              // console.log(this.checkActivityFinishData.length);
+              this.checkFundFinishData = res.data[1];
 
               this.tit = tit;
               this.NoReportActivity = true;
             }else{
+              this.checkFundEndData=res.data[2]
+
               this.iid=val;
               this.tit=tit;
               this.endDialog=true;
@@ -377,6 +392,7 @@ import beUpload from '../../components/tool/beUpload'
           this.ajax    
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
+                console.log(res.data);
                 let data=res.data;
                 let a=this.options;
                 this.items=data[0];
@@ -566,6 +582,7 @@ import beUpload from '../../components/tool/beUpload'
       color: #5391fd;
       display: flex;
       justify-content: space-between;
+      flex-wrap: wrap;
       // background: #ccc;
     }