#

src/views/fundManage/makerfund.vue

@@ -433,11 +433,16 @@
         }
       },
       methods:{
-        Audit(val,num){          //显示审核对话框
-          // console.log(val);
+        Audit(val,num){          //显示审核对话框  num  0申请人提交对话框  1  管理员审核对话框
+          console.log(val);
           if(num==0){
-            if (val.actualuse==0){
-              this.$router.push(`/makerfundDetails?Id=${val.fid}&tit=${val.title}&aid=${val.acId}`)
+            if (val.actualuse==0){     //申请人对话框,但没有填写实际使用，直接跳转到查看详情页面
+                if (val.atit!=null){
+                  return this.$router.push(`/makerfundDetails?Id=${val.fid}&tit=${val.atit}&paid=${val.paid}`)
+                }else{
+                  this.$router.push(`/makerfundDetails?Id=${val.fid}&tit=${val.ptit}&paid=${val.paid}`)
+                }
+              // this.$router.push(`/makerfundDetails?Id=${val.fid}&tit=${val.title}&aid=${val.acId}`)
               return this.$message.error('请填写实际使用金额')
             } 
           }

src/views/projectApply/projectApplication.vue

@@ -782,7 +782,7 @@ export default {
     //跳转到此页面立刻获取数据
     this.getData(); //获取表格数据
     // this.getUser();
-    console.log(this.$store.state.userInfo.type);
+    // console.log(this.$store.state.userInfo.type);
 
   },
 };

src/views/projectManage/ProjectManagement.vue

@@ -198,7 +198,7 @@
               <div class="operations">
                 <el-button type="primary" @click="scheduleDetail(scope.row.courseId,scope.row.typeid)"   size="mini" >进度详细</el-button>
                 <el-button type="primary" @click="fundStatus(scope.row.courseId)"  size="mini" >资金情况</el-button>
-                <el-button type="primary" v-show="scope.row.isupload==2"  @click="finish(scope.row.courseId,scope.row.title)"   size="mini">提交结项</el-button>
+                <el-button type="primary" v-show="scope.row.isupload==2"  @click="finish(scope.row.courseId,scope.row.title,scope.row)"   size="mini">提交结项</el-button>
                 <el-button type="primary" v-show="scope.row.isupload==3"  @click="amendFinish(scope.row.courseId,scope.row.title)" size="mini">修改结项</el-button>
                 <el-button type="primary" v-show="scope.row.isupload==4" disabled class="disa" size="mini">已结项</el-button>
               </div>
@@ -256,7 +256,7 @@
       </div>
       <div class="download checkActivity" v-show="checkFundFinishData.length>0">
             <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> -->
+            <span style="cursor: pointer;" @click="fundDetail(item.id,item.title,item.pid)" v-for="(item,index) in checkFundFinishData" :key="index" >{{ item.title }}/{{ item.applyfund - item.actualuse }}（元）</span>
       </div>
       <div slot="footer" class="dialog-footer" style="display: flex;justify-content: center;">
         <!-- <el-button type="primary" @click="init" class="AllDialogBtn">确认</el-button> -->
@@ -348,10 +348,10 @@ import beUpload from '../../components/tool/beUpload'
         }
       },
       methods:{
-        fundDetail(val){
+        fundDetail(val,tit,pid){
           // console.log(val);
           // window.open(`/#/makerfundDetails?Id=${val}`)
-          this.$router.push(`/makerfundDetails?Id=${val}`);
+          this.$router.push(`/makerfundDetails?Id=${val}&tit=${tit}&paid=${pid}`);
         },
         ProgressFormat(value){        //进度条
           return value ==100?'100%':`${value}%`
@@ -418,7 +418,9 @@ import beUpload from '../../components/tool/beUpload'
           this.endDialog=false;
           this.NoReportActivity = false;
         },
-        finish(val,tit){     //结项对话框显示
+        finish(val,tit,a){     //结项对话框显示
+          // return console.log(a);
+          // return console.log(val,tit);
           this.checkActivityFinishData = [];
           this.checkFundFinishData=[];
           this.checkFundEndData=[];
@@ -426,16 +428,41 @@ import beUpload from '../../components/tool/beUpload'
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
+            console.log(res);
             if(res.data[0].length>0 || res.data[1].length>0){
+              // console.log(1111);
               this.checkActivityFinishData = res.data[0];
+              if (res.data[1].length>0) {
+                let acsum=0
+                let apsum=0
+                res.data[1].forEach(e=>{
+                  e.applyfund=JSON.parse(e.applyfund)
+                  for(let k in e.applyfund){
+                    acsum+=e.applyfund[k]*1
+                  }
+                  e.applyfund=acsum
+                })
+
+                res.data[1].forEach(e=>{
+                  if (e.actualuse!=null) {
+                    e.actualuse=JSON.parse(e.actualuse)
+                    for(let k in e.actualuse){
+                      apsum+=e.actualuse[k]*1
+                    }
+                    e.actualuse=apsum
+                  }
+                })
+              }
               this.checkFundFinishData = res.data[1];
               this.tit = tit;
               this.NoReportActivity = true;
             }else{
-              this.checkFundEndData=res.data[2].filter(i=>{
+              // console.log(995959);
+                this.checkFundEndData=res.data[2].filter(i=>{       //显示修改结项的时候的
                 return (i.fund !=i.usedFund)
               })
-              this.iid=val;
+              // console.log('还有？');
+              this.iid=val;          // 提交结项时候的
               this.tit=tit;
               this.endDialog=true;
               this.file=[];
@@ -468,7 +495,7 @@ import beUpload from '../../components/tool/beUpload'
             .get(this.$store.state.api+'/SelectAllProjectManagement',param)
               .then(res=>{
                 let data=res.data;
-                console.log(data)
+                // console.log(data)
                 if (data[0].length==0 && data[5][0]['total'] != 0&&this.table.currentPage!=1) {
                   this.table.currentPage=1
                   return this.getData()