合并

src/views/fundManage/makerfundApply.vue

@@ -954,6 +954,8 @@ export default {
             let usedAllSum=usedDirSum+usedIndirSum+usedApplyDirSum+usedApplyIndirSum;
             // return console.log(usedAllSum);
 
+            if (usedAllSum>allSum) return this.$message.error('使用')
+
             console.log(this.AllFund);
             let param={
                 uid:this.$store.state.userInfo.userid,            //用户id

src/views/projectManage/ProjectManagement.vue

@@ -295,15 +295,10 @@ import beUpload from '../../components/tool/beUpload'
             uid:this.$store.state.userInfo.userid,
             pid:val
           }).then(res=>{
-            console.log(res.data[1]);
-            // let data=res.data[1]
+            console.log(res.data);
             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)