|
@@ -141,7 +141,7 @@
|
|
|
:before-close="init">
|
|
|
<div class="addDialogLogo">LOGO</div>
|
|
|
<div class="deleteContent">"{{ tit }}"项目,是否确定完结?</div>
|
|
|
- <div class="download checkActivity">
|
|
|
+ <div class="download checkActivity" v-show="checkFundEndData.length>0">
|
|
|
<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>
|
|
@@ -178,7 +178,7 @@
|
|
|
<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">
|
|
|
+ <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>
|
|
|
</div>
|
|
@@ -291,13 +291,23 @@ import beUpload from '../../components/tool/beUpload'
|
|
|
},
|
|
|
amendFinish(val,tit){ //修改结项
|
|
|
this.checkFundEndData=[];
|
|
|
-
|
|
|
this.ajax.post(this.$store.state.api+"/UpdateAmendFinish",{
|
|
|
uid:this.$store.state.userInfo.userid,
|
|
|
pid:val
|
|
|
}).then(res=>{
|
|
|
console.log(res.data[1]);
|
|
|
- this.checkFundEndData=res.data[1]
|
|
|
+ // let data=res.data[1]
|
|
|
+ this.checkFundEndData = res.data[1].filter(i=>{
|
|
|
+ // console.log(i);
|
|
|
+ return (i.fund !=i.usedFund)
|
|
|
+ // return i.fund !=i.usedFund
|
|
|
+
|
|
|
+ })
|
|
|
+ console.log(this.checkFundEndData);
|
|
|
+
|
|
|
+ this.checkFundEndData=res.data[1].filter(i=>{
|
|
|
+ return (i.fund != i.usedFund)
|
|
|
+ })
|
|
|
|
|
|
let data=JSON.parse(res.data[0][0].endFile)
|
|
|
this.file=data;
|
|
@@ -353,7 +363,7 @@ import beUpload from '../../components/tool/beUpload'
|
|
|
uid:this.$store.state.userInfo.userid,
|
|
|
pid:val
|
|
|
}).then(res=>{
|
|
|
- console.log(res.data);
|
|
|
+ // console.log(res.data);
|
|
|
|
|
|
if(res.data[0].length>0 || res.data[1].length>0){
|
|
|
this.checkActivityFinishData = res.data[0];
|
|
@@ -363,8 +373,12 @@ import beUpload from '../../components/tool/beUpload'
|
|
|
this.tit = tit;
|
|
|
this.NoReportActivity = true;
|
|
|
}else{
|
|
|
- this.checkFundEndData=res.data[2]
|
|
|
-
|
|
|
+ console.log(res.data);
|
|
|
+ // this.checkFundEndData=res.data[2]
|
|
|
+ this.checkFundEndData=res.data[2].filter(i=>{
|
|
|
+ return (i.fund !=i.usedFund)
|
|
|
+ })
|
|
|
+ console.log(this.checkFundEndData);
|
|
|
this.iid=val;
|
|
|
this.tit=tit;
|
|
|
this.endDialog=true;
|