1

src/views/fundManage/makerfund.vue

@@ -14,9 +14,10 @@
           <el-option label="所有活动" value=""></el-option>
           <el-option
             v-for="item in filterSelects"
-            :key="item.id"
-            :label="item.title"
-            :value="item.id">
+            :key='item.aid==null?item.pid:item.aid'
+            :label='item.atit==null?item.ptit:item.atit'
+            :value='item.aid==null?item.pid:item.aid'
+            >
           </el-option>
         </el-select>
         </div>
@@ -54,8 +55,8 @@
             <el-option
               v-for="(item,index) in leaderSelects"
               :key="index"
-              :label="item.pro_leader"
-              :value="item.pro_leader">
+              :label="item.ppl==null?item.apl:item.ppl"
+              :value="item.ppl==null?item.apl:item.ppl">
             </el-option>
           </el-select>
         </div>
@@ -524,9 +525,11 @@
             this.ajax
                 .get(this.$store.state.api+'/selectAllFundApply',param)
                 .then(res=>{
+                  console.log(res);
                   let data=res.data;
                   console.log(data);
 
+                  // return this.loading = false;
                   let AllFund=0
                   if (data[0].length==0 && data[4][0]['total'] != 0) {
                     this.table.currentPage=1

src/views/fundManage/makerfundDetails.vue

@@ -31,8 +31,8 @@
             <th colspan="2">经济支出类别</th>
             <th>预算</th>
             <th>已支付</th>
-            <th style="position: relative;">本次申请<br><div style="position: absolute;left: 50%;transform: translate(-50%);bottom: 1px;">{{ create_at }}</div></th>
-            <th style="position: relative;">实际使用<br><div style="position: absolute;left: 50%;transform: translate(-50%);bottom: 1px;">{{ endTime }}</div></th>
+            <th style="position: relative;">本次申请<br><div style="width: 100px;position: absolute;left: 50%;transform: translate(-50%);bottom: 1px;">{{ create_at }}</div></th>
+            <th style="position: relative;">实际使用<br><div style="width: 100px;position: absolute;left: 50%;transform: translate(-50%);bottom: 1px;">{{ endTime }}</div></th>
             <th>余额</th>
             <th colspan="3">备注</th>
         </tr>