活动管理和资金使用情况逻辑完成

src/views/activityManage/makerActvityApplyMain.vue

@@ -84,9 +84,7 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
                     uid:this.$store.state.userInfo.userid,
                 }).then(res=>{
-                    console.log(res.data[0])
-                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.endProject==0);
-
+                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload==2);
                 }).catch(err=>{
                     this.$message.error(err.message)
                 })

src/views/activityManage/makerActvityDetails.vue

@@ -21,7 +21,7 @@
                       <div class="selectLeft">
                           <div class="inpBlock" style="position: relative;">
                               <div class="label">所属项目</div>
-                              <el-select v-model="tableData.pid" @change="checkProjectMoney(tableData.pid,tableData.money)" style="width: 100%;" placeholder="请选择">
+                              <el-select v-model="tableData.pid" disabled style="width: 100%;" placeholder="请选择">
                                 <el-option
                                   v-for="item in selectInput.project"
                                   :key="item.courseId"
@@ -29,6 +29,14 @@
                                   :value="item.courseId">
                                 </el-option>
                               </el-select>
+                              <!-- <el-select v-model="tableData.pid" @change="checkProjectMoney(tableData.pid,tableData.money)" style="width: 100%;" placeholder="请选择">
+                                <el-option
+                                  v-for="item in selectInput.project"
+                                  :key="item.courseId"
+                                  :label="item.title"
+                                  :value="item.courseId">
+                                </el-option>
+                              </el-select> -->
                           </div>
                           <div class="inpBlock">
                               <div class="label">预算经费</div>
@@ -564,7 +572,7 @@ export default {
             uid:this.$store.state.userInfo.userid,
         }).then(res=>{
           console.log(res)
-          this.selectInput.project = res.data[0].filter(item=>(item.courseId==this.tableData.pid||item.endProject==0));
+          this.selectInput.project = res.data[0].filter(item=>(item.courseId==this.tableData.pid||item.isupload==2));
           this.loading = false
         }).catch(err=>{
             this.$message.error(err.message)

src/views/fundManage/makerfundApply.vue

@@ -957,8 +957,6 @@ export default {
             // return console.log(usedAllSum);
 
             if (usedAllSum>allSum) return this.$message.error('使用金额大于预算')
-
-            console.log(this.AllFund);
             let param={
                 uid:this.$store.state.userInfo.userid,            //用户id
                 cid:this.selects.projectName,                    //项目id
@@ -998,9 +996,8 @@ export default {
             this.ajax
                 .get(this.$store.state.api+'/SelectMakerFundSelects',param)
                 .then(res=>{
-                    console.log(res.data);
                     this.projectFilter=res.data[1]
-                    // console.log(this.projectFilter);
+                    console.log(this.projectFilter);
                 },err=>{
                     console.log(err);
                 })