团报-联运成本

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1598,7 +1598,7 @@ export default {
         return this.priceFormat(rowData.YongJinShouRu);
       if (field === "YingFu") return this.priceFormat(rowData.YingFu);
       if (field === "MaoLi") return this.priceFormat(rowData.MaoLi);
-      if (field === "MaoLiRate") return (rowData.MaoLiRate*100)+'%';
+      if (field === "MaoLiRate") return rowData.MaoLiRate+'%';
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -179,7 +179,19 @@
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_lirun">
                     <i class="iconfont icon-qian"></i>
-                  </span>提成
+                  </span>联运成本
+                </div>
+                <div class="Team_Incontent">
+                  <div>联运成本<span>￥{{DataList.LYCB}}</span></div>
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="4">
+              <div class="Team_DList">
+                <div class="Team_firstTitle">
+                  <span class="Team_comCoinType Team_lirun">
+                    <i class="iconfont icon-qian"></i>
+                  </span>提成（无单据）
                 </div>
                 <div class="Team_Incontent">
                   <div>预计提成<span>￥{{DataList.ExpectedCut}}</span></div>
@@ -209,7 +221,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FiniceReciveList">
-            <tr v-if="isExists(item.CostTypeList,'团费')">
+            <tr v-if="isExists(item.CostTypeList,'团费') || isExists(item.CostTypeList,'团款')">
               <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
               <td>
@@ -429,7 +441,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FiniceReciveList">
-            <tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入')&& NotExists(item.CostTypeList,'自费收入')&& NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
+            <tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'团款') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入') && NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
               <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
               <td>
@@ -1189,7 +1201,7 @@
         this.$router.push({
           name: path,
           query: {
-            id: id
+            id: id,blank: "y"
           }
         });
       },