增加税入税别

src/components/LeaderManagement/leaderReimbursement.vue

@@ -11,6 +11,7 @@
         <th width="">出团人数</th>
         <th width="">领队</th>
         <th width="">导游</th>
+        <th>酒店</th>
       </tr>
       <tr v-for='item in nav'>
         <td>{{item.StartCityNames}}</td>
@@ -24,6 +25,12 @@
         <td>{{item.TotalSeat}}人</td>
         <td>{{item.LeaderName}}</td>
         <td>{{item.GuideName}}</td>
+        <td>
+          <el-popover width="900" trigger="click" popper-class="DMC_HotelPop">
+            <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo>
+            <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
+          </el-popover>
+        </td>
       </tr>
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -448,6 +455,7 @@
 </template>
 
 <script>
+  import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
   export default {
     data() {
       return {
@@ -471,9 +479,21 @@
         NewCombinationNum: '',
         TotalNav: [],
         LeaderGetPrice: 0,
-        HangingList: []
+        HangingList: [],
+        showHotelObj: {
+          showPrice: true,
+          showPay: true,
+          showZhan: true,
+          showBtnList: false,
+          showCaozuoTime: true,
+          ShowTaxType:true, //显示税入税别
+          ShowRebateRatio:true, //显示返佣比列
+        },
       }
     },
+    components: {
+      commonHotelInfo
+    },
     methods: {
       getHangingAccountByTCIDList: function () {
         this.apipost(
@@ -733,9 +753,10 @@
                 x.LeaderGetPriceT = 0
               }
             })
-            this.nav = nav
+            this.nav = nav;
+            console.log(this.nav,'navvvvvvvv');
           } else {
-            this.$message.error(res.data.message)
+            this.Error(res.data.message)
           }
         }, err => {})
       },
@@ -747,7 +768,7 @@
             this.TotalNav = res.data.data;
             this.getNav();
           } else {
-            this.$message.error(res.data.message);
+            this.Error(res.data.message);
           }
         }, err => {})
       },

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -722,7 +722,7 @@
                   <el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary"
                     style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}}
                   </el-button>
-                  <el-dropdown trigger="click" style="margin-bottom:5px;">
+                  <el-dropdown trigger="click" style="margin-bottom:5px;" v-if="CurrentUserInfo.RB_Branch_id==0">
                     <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>

src/components/commonPage/commonHotelInfo.vue

@@ -18,6 +18,8 @@
           <th style="width:100px;">状态</th>
           <th style="width:150px;" v-if="showHotelObj.showPrice">使用数量/价格</th>
           <th style="width:100px;" v-if="showHotelObj.showPay">付款方式</th>
+          <th style="width:100px;" v-if="showHotelObj.ShowTaxType">税入/税别</th>
+          <th style="width:120px;" v-if="showHotelObj.ShowRebateRatio">返佣比例</th>
           <th style="width:120px" v-if="showHotelObj.showZhan">占房时间</th>
           <th style="width:100px" v-if="showHotelObj.showZhan">确认时间</th>
         </tr>
@@ -59,6 +61,13 @@
             <td v-if="showHotelObj.showPay">
               {{hotelSubItem.PayTypeStr}}
             </td>
+            <td v-if="showHotelObj.ShowTaxType">
+              <template v-if="hotelSubItem.TaxType==1">税入</template>
+              <template v-if="hotelSubItem.TaxType==2">税别</template>
+            </td>
+            <td v-if="showHotelObj.ShowRebateRatio">
+              {{hotelSubItem.RebateRatio}}
+            </td>
             <td v-if="showHotelObj.showZhan">
               <template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
                 {{hotelSubItem.CreateDateStr}}
@@ -145,6 +154,7 @@
       }
     },
     mounted() {
+      console.log(this.HotelObj,'HotelObj');
     }
   };
 

src/components/dmc/manager/dmcTotalTable.vue

@@ -290,7 +290,7 @@
                 </div>
                 <p
                   v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
-                  <el-popover width="750" trigger="click" popper-class="DMC_HotelPop">
+                  <el-popover width="900" trigger="click" popper-class="DMC_HotelPop">
                     <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
                       :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS" @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
                     <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
@@ -555,6 +555,8 @@
           showBtnList: true,
           showCaozuoTime: true,
           ShowShouPeiStatus:true,//显示手配置暂定确定按钮
+          ShowTaxType:true, //显示税入税别
+          ShowRebateRatio:true, //显示返佣比列
         },
         pickerBeginDateBefore: {
           disabledDate: time => {