Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -486,6 +486,16 @@ tr._item_list td:last-child {
               ></el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="状态：">
+             <el-select  v-model="msg.QueryCondition" filterable class="w150">
+                    <el-option key="-1" value="-1" label="不限"></el-option>
+                    <el-option key="0" value="0" label="待收"></el-option>
+                    <el-option key="1" value="1" label="退款"></el-option>
+                    <el-option key="2" value="2" label="在途"></el-option>
+                  </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <ul class="clearfix">
@@ -651,6 +661,7 @@ export default {
         startDate: "",
         endDate: "",
         Type: 1,
+        QueryCondition:"-1",
       },
       getCompanyMsg: {
         // 公司

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -94,7 +94,7 @@
 }
 .Team_Incontent span {
   margin-left: 20px;
-  font-size: 16px;
+  font-size: 14px;
   font-family: PingFangSC-Fine;
 }
 .Team_zhichu {
@@ -216,9 +216,9 @@
                     </div>
                 </td>
                 <td style="font-size:14px;">
-                    应收：{{item.Money}}
+                    应收：{{item.Money}}<br/>
                     <!-- <span class="TB_PayMoney">实收：{{item.PayMoney}}</span> -->
-                    <span class="TB_PayMoney">实收：{{item.Money}}</span>
+                    实收：{{item.Money}}
                 </td>
                 <td>{{item.TradeDate}}</td>
                 <td>
@@ -265,9 +265,9 @@
                     </div>
                 </td>
                 <td style="font-size:14px;">
-                    应付：{{item.Money}}
+                    应付：{{item.Money}}<br/>
                     <!-- <span class="TB_PayMoney">实付：{{item.PayMoney}}</span> -->
-                    <span class="TB_PayMoney">实付：{{item.Money}}</span>
+                    实付：{{item.Money}}
                 </td>
                 <td>{{item.TradeDate}}</td>
                 <td>