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

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1117,6 +1117,15 @@ export default {
           columnAlign: "left",
           isResize: true
         },
+        {
+          field: "UnionExtraMoney",
+          formatter: this.moneyFormat,
+          title: "额外返佣",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true
+        },
         {
           field: "UnionTiCheng",
           formatter: this.moneyFormat,
@@ -1547,6 +1556,9 @@ export default {
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);
+      if(field === "UnionExtraMoney"){
+        return this.priceFormat(rowData.UnionExtraMoney);
+      }
       if (field === "UnionTiCheng")
         return this.priceFormat(rowData.UnionTiCheng);
       if (field === "YingYeE") return this.priceFormat(rowData.YingYeE);

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1457,6 +1457,15 @@ export default {
           columnAlign: "right",
           isResize: true
         },
+        {
+          field: "UnionExtraMoney",
+          formatter: this.moneyFormat,
+          title: "额外返佣",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
         {
           field: "UnionTiCheng",
           formatter: this.moneyFormat,
@@ -1999,6 +2008,8 @@ export default {
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);
+      if(field === "UnionExtraMoney")
+      return this.priceFormat(rowData.UnionExtraMoney);
         if (field === "UnionTiCheng")
         return this.priceFormat(rowData.UnionTiCheng);
       if (field === "YingYeE") return this.priceFormat(rowData.YingYeE);
@@ -2158,6 +2169,9 @@ export default {
       }
        if(rowData.TransportCost < 0 && columnName=="TransportCost"){
         return "column-cell-class-name-test-red"
+      }
+      if(rowData.UnionExtraMoney<0 && columnName=="UnionExtraMoney"){
+        return "column-cell-class-name-test-red"
       }
        if(rowData.UnionTiCheng < 0 && columnName=="UnionTiCheng"){
         return "column-cell-class-name-test-red"

src/components/Hotel/detailsInventory.vue

@@ -232,7 +232,7 @@ export default {
                 this.msg.Date = this.$route.query.sDate;
                 this.msg.CheckOutDate = this.$route.query.eData;
             }
-            this.apipost('hotel_post_GetAll',{hotelID:this.msg.Hotel},res=>{
+            this.apipost('hotel_post_GetAll',{ID:this.msg.Hotel},res=>{
                 if(res.data.resultCode==1){
                     this.HotelName = res.data.data.Name
                 }

src/components/Hotel/roomReservationsDetails.vue

@@ -27,7 +27,8 @@
         </li>
       </ul>
       税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br/>
-      税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
+      税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100) <br/>
+      司导间【月结】不计入总金额
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
       class="ownScrollbarStyle" ref="ownScrollbarStyle">
@@ -325,7 +326,7 @@
                   <tr>
                     <td width="70" style="text-align:right;color:red">付款方式：</td>
                     <td>
-                      <el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')"
+                      <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"
                         :disabled="IsEditHotel==0?true:false">
                         <el-option label='请选择' :value='0'></el-option>
                         <el-option label='现付' :value='1'></el-option>
@@ -336,20 +337,21 @@
                       </el-select>
                     </td>
                   </tr>
-                  <tr style="display:none;">
+                  <tr>
                     <td colspan="2" style="height:5px;"></td>
                   </tr>
-                  <tr style="display:none;">
-                    <td width="70" style="text-align:right;">报账付款方式：</td>
+                  <tr>
+                    <td width="70" style="text-align:right;">司导房付款方式：</td>
                     <td>
-                      <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"
-                        :disabled="IsEditHotel==0?true:false">
+                      <el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')"
+                        :disabled="IsEditHotel==0?true:false"  @change="calculationPrice(subItem)">
                         <el-option label='请选择' :value='0'></el-option>
-                        <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
-                        <el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
-                        <el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
-                        <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
-                        <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
+                        <el-option label='月结' :value='9' ></el-option>
+                        <el-option label='现付' :value='1' ></el-option>
+                        <el-option label='签单' :value='2'></el-option>
+                        <el-option label='实物抵扣' :value='3' ></el-option>
+                        <el-option label='预付' :value='4'></el-option>
+                        <el-option label='预付款抵扣' :value='5' ></el-option>
                         <el-option label='公司合团支付' :value='6'></el-option>
                       </el-select>
                     </td>
@@ -717,11 +719,19 @@
         let totalPrice = 0;
         obj.OrderDetailsList.forEach((item, index) => {
           var tempPrice=0;
-          //税别 && item.RebateRatio>0
-          if (obj.TaxType == 2 ) {
-            tempPrice= item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / 100);
-          } else {
-            tempPrice= item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
+          var coefficient=1;
+           //税别
+          if(obj.TaxType == 2)
+          {
+            coefficient=1+0.08;
+          } 
+          if(index==4 && obj.DMCPayType==9)
+          {
+             tempPrice=0;
+          }
+          else
+          {
+             tempPrice= item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio / 100);
           }
           totalPrice+=tempPrice;
         })

src/components/LeaderManagement/leaderReimbursement.vue

@@ -27,7 +27,7 @@
         <td>{{item.LeaderName}}</td>
         <td>{{item.GuideName}}</td>
         <td>
-          <el-popover width="900" trigger="click" popper-class="DMC_HotelPop">
+          <el-popover width="1000" trigger="click" popper-class="DMC_HotelPop">
             <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
               :TCID="item.TCIDS" :DMCNum="NewCombinationNum" :TCNUM="item.TCNUMS"></commonHotelInfo>
             <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
@@ -132,17 +132,19 @@
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
-        <th colspan="22" class="bgwhite">酒店使用 </th>
+        <th colspan="24" class="bgwhite">酒店使用 </th>
       </tr>
       <tr>
-        <th colspan="22" class="bgwhite">
+        <th colspan="24" class="bgwhite">
           税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
-          税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
+          税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br />
+          司导间【月结】不计入总金额
         </th>
       </tr>
       <tr class="title">
         <th width="90">使用时间</th>
         <th width="150">酒店名称</th>
+        <th width="150">更换酒店</th>
         <th width="70">占床<br />不占床</th>
         <th width="70">实际<br />用房数</th>
         <th width="70">房间<br />类型</th>
@@ -160,6 +162,7 @@
         <th width="60">税入<br />税别</th>
         <th width="60">总金额</th>
         <th width="60">付款<br />方式</th>
+        <th width="60">司导间<br />付款方式</th>
         <th width="100">供应商</th>
         <th width="100">状态</th>
         <th width="100">备注</th>
@@ -170,10 +173,16 @@
             <td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length"
               style="white-space:nowrap; ">{{outItem.UseTimeStr}}
             </td>
-            <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">{{subItem.HotelName}}
-              <p class="cursorpointer" style="margin-top:5px;color: blue;">
-                <a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
-              </p>
+            <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
+             <template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
+                <span style="text-decoration:line-through"> {{subItem.HotelName}}</span>
+              </template>
+              <template v-else>
+                {{subItem.HotelName}}
+              </template>
+            </td>
+           <td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; ">
+               {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
@@ -281,6 +290,16 @@
               <span v-else></span>
               </br>
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
+            </td>
+                <td v-if="childIndex==0" :rowspan="6">
+              <span v-if="subItem.DMCPayType === 1">现付</span>
+              <span v-else-if="subItem.DMCPayType === 2">签单</span>
+              <span v-else-if="subItem.DMCPayType === 4">预付</span>
+              <span v-else-if="subItem.DMCPayType === 5">实物抵扣</span>
+              <span v-else-if="subItem.DMCPayType === 6">公司合团支付</span>
+              <span v-else-if="subItem.DMCPayType === 9">月结</span>
+              </br>
+              <span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               <span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0"
@@ -305,14 +324,14 @@
       </template>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="21">
+        <td colspan="23">
           {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
         </td>
       </tr>
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
-        <th colspan="11" class="bgwhite">餐食使用</th>
+        <th colspan="12" class="bgwhite">餐食使用</th>
       </tr>
       <tr class="title">
         <th width="100">使用时间</th>
@@ -560,13 +579,15 @@
         LeaderGetPrice: 0,
         HangingList: [],
         showHotelObj: {
-          showPrice: true,
-          showPay: true,
-          showZhan: true,
-          showBtnList: false,
-          showCaozuoTime: true,
+          showPrice: true,//是否显示价格
+          showPay: true,//是否显示支付方式
+          showZhan: true,//占房时间
+          showBtnList: false,//是否下载、确认按钮
           ShowTaxType: true, //显示税入税别
           ShowRebateRatio: true, //显示返佣比列
+          ShowSupplier:true,//是否显示供应商
+          showCaozuoTime:true,//操作时间
+          colspanLength:6//跨行
         },
       }
     },
@@ -733,16 +754,22 @@
       hotelTotalPrice(obj) {
         let totalPrice = 0;
         obj.OrderDetailsList.forEach((item, index) => {
-          if (obj.PayStyle === 1) {
-            //税别 && item.RebateRatio>0
+          var coefficient = 1;
+          //税别
           if (obj.TaxType == 2) {
-               totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / 100);
-              //税入
-            } else {
-              totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
+            coefficient = 1 + 0.08;
+          }
+          if (obj.PayStyle === 1) {
+            if (index == 4 && obj.DMCPayType == 9) {
+              totalPrice += 0;
+            } 
+            else 
+            {
+              totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
+                100);
             }
           } else {
-            totalPrice += 0
+            totalPrice += 0;
           }
         })
         totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;

src/components/SalesModule/customerTransfer.vue

@@ -35,6 +35,20 @@
           </span>
           <el-input v-model="msg.CustomerName" placeholder="请输入门店名称或电话"></el-input>
         </li>
+        <li>
+          <span>
+            <em>所属品牌</em>
+          </span>
+          <el-select filterable  class='multiple_input'  v-model='msg.Brand' :placeholder="$t('pub.pleaseSel')">
+                <el-option label="不限" :value="-1"></el-option>
+								<el-option v-for='item in CustomerBrandList'
+									:label='item.name'
+									:value='item.id'
+									:key='item.id'>
+								</el-option>
+							  </el-select>
+        </li>
+        <li style="float:right;padding-top:10px;color:#111111">交易额总计：{{datainfo.sumMoney}}</li>
         <li>
           <input
             type="button"
@@ -93,17 +107,18 @@
           <th width="15%">门店名称
             <!--<label><input type="checkbox"  v-model="isCkedAll"  @click='checkedAll()'  style="vertical-align: middle;"/>门店名称</label>-->
           </th>
-          <th width="10%">联系人</th>
+          <th width="7%">联系人</th>
           <th width="10%">联系电话</th>
           <th width="20%">地址</th>
           <th width="8%">所属销售</th>
           <th width="8%">客户状态</th>
+          <th width="5%">交易额</th>
           <th width="5%">幸福存折</th>
           <th width="10%">备注</th>
-          <th width="12%">操作</th>
+          <th width="14%">操作</th>
         </tr>
         <tr>
-          <td colspan="8" align="center" v-show="list.length==0">暂无数据</td>
+          <td colspan="10" align="center" v-show="list.length==0">暂无数据</td>
         </tr>
         <tr v-for="(item,index) in list">
           <td>
@@ -127,6 +142,7 @@
           <td>{{item.Address}}</td>
           <td>{{item.EmName}}</td>
           <td>{{valueToWord(item.CustomerStatus)}}</td>
+          <td>{{item.TotalPrice}}</td>
           <td>{{item.CL_Balance}}</td>
           <td>{{item.Remark}}</td>
           
@@ -453,6 +469,8 @@ export default {
           children: node.ChildList
         };
       },
+      datainfo:{},
+      CustomerBrandList:[],
       DepartmentId: null,
       isSelLayer: false,
       layerShow: false,
@@ -461,7 +479,8 @@ export default {
         pageSize: 15,
         CustomerName: "",
         CreateBy: "-1",
-        DepartmentId: "-1"
+        DepartmentId: "-1",
+        Brand:-1,
       },
       RecipientMsg: {
         CustomerIdArr: [],
@@ -522,7 +541,6 @@ export default {
       HousePhotos: "",
       Images: "",
       isOldPerson: false,
-      CustomerBrandList: [],
       provinceList: [],
       cityList: [],
       regionList: [],
@@ -572,6 +590,15 @@ export default {
     };
   },
   methods: {
+     getCustomerBrandList(){  // 获取品牌
+            this.apipost('app_get_customer_brand',{},res=>{
+                if(res.data.resultCode==1){
+                    this.CustomerBrandList = res.data.data;
+                }else{
+                    this.$message.error(res.data.message)
+                }
+            },err=>{})
+        },
     getUrl(item){
       this.$router.push({ name:"CustomerAnalysis",query:{"customerId":item.CustomerIdS,blank: 'y'} })
     },
@@ -959,9 +986,9 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             this.loading = false;
-            this.allLength = res.data.data.pageData.length;
+            this.allLength = res.data.data.pages.pageData.length;
             this.customerListAll = [];
-            res.data.data.pageData.forEach(item => {
+            res.data.data.pages.pageData.forEach(item => {
               this.customerListAll.push(item.CustomerId);
               item.CustomerIdS = item.CustomerId;
               item.CustomerId =
@@ -973,8 +1000,9 @@ export default {
               item["disabled"] = false;
               item.Address = item.Address.split(",").join("");
             });
-            this.list = res.data.data.pageData;
-            this.total = res.data.data.count;
+            this.datainfo=res.data.data;
+            this.list = res.data.data.pages.pageData;
+            this.total = res.data.data.pages.count;
           } else {
             this.$message.error(res.data.message);
             this.loading = false;
@@ -1055,7 +1083,7 @@ export default {
         ContactNumber: "",
         Address: "",
         remark: "",
-        brandIds: []
+        Brand: []
       };
       (this.BusinessCardPhotos = ""),
         (this.HousePhotos = ""),
@@ -1149,6 +1177,7 @@ export default {
     this.getJycs();
     this.getZw();
     this.getKhly();
+    this.getCustomerBrandList();
   }
 };
 </script>

src/components/SalesModule/enrollTotal.vue

@@ -168,7 +168,7 @@
     <div style="clear: both; width: 100%;height: 20px;"></div>
     <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
       <tr>
-        <th width="130">单号&团号</th>
+        <th width="160">单号&团号</th>
         <th width="60">客户信息</th>
         <th width="70">类型</th>
         <th width="180">系列&线路</th>
@@ -218,6 +218,9 @@
                     <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
                   <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
                 </div>
+                <div style="color:red">
+                  <p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
+                </div>
             </div>
         </td>
         <td>

src/components/SalesModule/groupTourOrder.vue

@@ -1541,6 +1541,9 @@
                       <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
                     <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
                   </div>
+                  <div style="color:red">
+                    <p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
+                  </div>
               </div>
             </td>
             <td>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1680,6 +1680,9 @@
                     <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
                   <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
                 </div>
+                <div style="color:red">
+                  <p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
+                </div>
             </div>
               </td>
               <td>

src/components/SalesModule/salesHotelOrder.vue

@@ -88,11 +88,11 @@
       <tbody v-for="(item,index) in dataList">
         <tr>
             <td style="border-bottom:2px solid #333" rowspan="2">{{item.ThirdOrderNo}}</td>
-            <td>{{item.Number}}</td>
             <td>
                 <div>{{item.CustomerName}}</div>
                 <div>{{item.CustomerPhone}}</div>
             </td>
+            <td>{{item.Number}}</td>
             <td>{{item.TotalPrice}}</td>
             <td>{{item.Income}}</td>
             <td>{{item.RedEnvelopeMoney}}</td>
@@ -190,7 +190,6 @@ export default {
         res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-              console.log(res,'resssss');
              this.dataList = res.data.data.pageData;
              this.total = res.data.data.count;
           } else {

src/components/TravelManager/TravelList/OpHotelOrder.vue

@@ -88,11 +88,11 @@
       <tbody v-for="(item,index) in dataList">
         <tr>
             <td style="border-bottom:2px solid #333" rowspan="2">{{item.ThirdOrderNo}}</td>
-            <td>{{item.Number}}</td>
             <td>
                 <div>{{item.CustomerName}}</div>
                 <div>{{item.CustomerPhone}}</div>
             </td>
+            <td>{{item.Number}}</td>
             <td>{{item.TotalPrice}}</td>
             <td>{{item.Income}}</td>
             <td>{{item.RedEnvelopeMoney}}</td>
@@ -190,7 +190,6 @@ export default {
         res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-              console.log(res,'resssss');
              this.dataList = res.data.data.pageData;
              this.total = res.data.data.count;
           } else {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1814,6 +1814,9 @@
                      <p v-if="childItem.ExtraRewardMoney>0">额外奖励金额：{{childItem.ExtraRewardMoney}}</p>
                     <p v-if="childItem.ExtraDeductMoney>0">额外扣除金额：{{childItem.ExtraDeductMoney}}</p>
                   </div>
+                  <div style="color:red">
+                    <p v-if="childItem.UnionExtraMoney!=0">联运额外返佣：{{childItem.UnionExtraMoney}}</p>
+                  </div>
                 </div>
                 
               </td>
@@ -2560,7 +2563,10 @@
       <!--zhaunMsg.TCNUM-->
       <el-form label-width="110px">
         <el-form-item label="是否返佣：" class="w280">
-          <el-switch v-model="IsBackStatus" :active-value="0" :inactive-value="1"></el-switch>
+          <el-switch v-model="fanyongMsg.IsBackStatus" :active-value="0" :inactive-value="1"></el-switch>
+        </el-form-item>
+        <el-form-item label="额外返佣金额：" class="w280">
+          <el-input :rows="2" v-model="fanyongMsg.UnionExtraMoney" @keyup.native="checkPrice(fanyongMsg,'UnionExtraMoney',true)"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -2760,6 +2766,13 @@
           PeopleNum: 0,
           LossMoney: 0,
         },
+        //联运返佣msg
+        fanyongMsg:{
+          IsBackStatus:'',
+          UnionExtraMoney:'',
+          OrderId:0
+        },
+        FyongLoading: false,
         pickerOptions0: {
           disabledDate: time => {
             let starTime = new Date(this.starTime);
@@ -2882,7 +2895,6 @@
           CreateBy: 0,
           RefuseVisaNum: 0, //拒签人数
         },
-        lianyunFYId: 0,
         //行程下载使用
         travelControlTripLayerShow: false,
         tripObj: {
@@ -2955,7 +2967,6 @@
             message: "请选择客户门店",
             trigger: "change"
           }],
-          FyongLoading: false,
           // DepartureCityId: [
           //   { required: true, message: "请选择出发城市", trigger: "change" }
           // ],
@@ -3146,7 +3157,6 @@
           OrderUnitPrice: 0
         },
         SuperiorPeople: [],
-        IsBackStatus: 1,
         Unit_Price: 0
       };
     },
@@ -3195,11 +3205,11 @@
         })
       },
       FyongLossOk: function () {
-        let msg = {
-          OrderId: this.lianyunFYId,
-          IsBackStatus: this.IsBackStatus
+        if(this.fanyongMsg.UnionExtraMoney==""){
+          this.Error('请输入额外返佣金额');
+          return;
         }
-        this.apipost('sellorder_post_SetOrderUnionBackMoney', msg, res => {
+        this.apipost('sellorder_post_SetOrderUnionBackMoney', this.fanyongMsg, res => {
           if (res.data.resultCode === 1) {
             this.$message.success(res.data.message)
             this.getList()
@@ -3211,8 +3221,9 @@
       },
       lianyunFY: function (item) {
         this.FyongLoading = true
-        this.IsBackStatus = item.IsBackUnionMoney
-        this.lianyunFYId = item.OrderId
+        this.fanyongMsg.IsBackStatus = item.IsBackUnionMoney;
+        this.fanyongMsg.UnionExtraMoney = item.UnionExtraMoney;
+        this.fanyongMsg.OrderId = item.OrderId;
       },
       goIisDetail: function (id) { // 跳转发票详情页面
         this.$router.push({

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -251,6 +251,7 @@
                     </div>
                   </div>
                   <div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
+                  <div>额外返佣：<span>￥{{DataList.EWFY}}</span></div>
               </div>
             </el-col>
             <el-col :span="4">

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1068,12 +1068,15 @@
         //当前登录用户信息
         CurrentUserInfo: {},
         showHotelObj: {
-          showPrice: true,
-          showPay: true,
-          showZhan: true,
-          showBtnList: true,
-          showCaozuoTime: true,
-          isFromTCList: true
+          showPrice: true,//是否显示价格
+          showPay: false,//是否显示支付方式
+          showZhan: true,//占房时间
+          showBtnList: false,//是否下载、确认按钮
+          ShowTaxType: false, //显示税入税别
+          ShowRebateRatio: false, //显示返佣比列
+          ShowSupplier:false,//是否显示供应商
+          showCaozuoTime:true,//操作时间
+          colspanLength:4//跨行
         },
         IsModifyTravelControl: 0, //分公司是否有修改团控权限
         pickerBeginDateBefore: {

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -234,6 +234,9 @@
                     <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
                   <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
                 </div>
+                <div style="color:red">
+                  <p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
+                </div>
             </div>
           </td>
           <td>

src/components/commonPage/commonHotelInfo.vue

@@ -30,13 +30,13 @@
           <td>
             公司团号
           </td>
-          <td :colspan="5" style="text-align:left;">
+          <td colspan="4" style="text-align:left;">
             <span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
           </td>
           <td>
             地接团号
           </td>
-          <td :colspan="showHotelObj.ShowTaxType?6:4" style="text-align:left;">
+          <td :colspan="showHotelObj.colspanLength" style="text-align:left;">
             <span style="padding-left:5px;">{{DMCNum}}</span>
           </td>
         </tr>
@@ -51,7 +51,7 @@
           <th width="120" v-if="showHotelObj.showPay">付款方式<br/>返佣比例</th>
           <th width="130" v-if="showHotelObj.showZhan">占房时间</th>
           <th width="100" v-if="showHotelObj.showZhan">确认时间</th>
-          <th width="100" v-if="showHotelObj.showZhan">供应商</th>
+          <th width="100" v-if="showHotelObj.ShowSupplier">供应商</th>
           <th width="70" v-if="showHotelObj.showPrice">
             日志
           </th>
@@ -121,7 +121,7 @@
             <td v-if="showHotelObj.showZhan">
               {{hotelSubItem.SureTimeStr}}
             </td>
-            <td v-if="showHotelObj.showZhan">
+            <td v-if="showHotelObj.ShowSupplier">
               {{hotelSubItem.SupplierName}}
             </td>
             <td v-if="showHotelObj.showPrice">
@@ -136,8 +136,8 @@
       </table>
     </div>
     <div>
-      <table width="100%" class="comHotelOperation">
-        <template v-if="HotelObj&&HotelObj.length>0&&showHotelObj.showCaozuoTime">
+      <table width="100%" class="comHotelOperation" v-if="showHotelObj.showCaozuoTime">
+        <template v-if="HotelObj&&HotelObj.length>0">
           <tr>
             <td class="tdRight">
               开团时间：
@@ -174,15 +174,8 @@
         <template v-if="showHotelObj.showBtnList">
           <tr>
             <td colspan="4" style="padding:10px 0;text-align:center;">
-              <input type="button" class="normalBtn" :value="HotelObj[0].ShouPeiStatus==0?'手配书(确定)':'手配书(暂定)'"
-                v-if="showHotelObj.ShowShouPeiStatus" @click="subSetShouPeiShu(HotelObj[0].ShouPeiStatus)" />
-              <template v-if="showHotelObj.isFromTCList">
-                <input type="button" v-if="HotelObj[0].ShouPeiStatus==1" class="normalBtn" value="下载"
-                  @click="DownLoadShouPeiShu()" />
-              </template>
-              <template v-else>
+              <input type="button" class="normalBtn" :value="HotelObj[0].ShouPeiStatus==0?'手配书(确定)':'手配书(暂定)'" @click="subSetShouPeiShu(HotelObj[0].ShouPeiStatus)" />
                <input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
-              </template>
             </td>
           </tr>
         </template>

src/components/dmc/manager/dmcTotalTable.vue

@@ -565,14 +565,15 @@
         },
         LeaderList: [],
         showHotelObj: {
-          showPrice: true,
-          showPay: true,
-          showZhan: true,
-          showBtnList: true,
-          showCaozuoTime: true,
-          ShowShouPeiStatus: true, //显示手配置暂定确定按钮
+          showPrice: true,//是否显示价格
+          showPay: true,//是否显示支付方式
+          showZhan: true,//占房时间
+          showBtnList: true,//是否下载、确认按钮
           ShowTaxType: true, //显示税入税别
           ShowRebateRatio: true, //显示返佣比列
+          ShowSupplier:true,//是否显示供应商
+          showCaozuoTime:true,//操作时间
+          colspanLength:6//跨行
         },
         pickerBeginDateBefore: {
           disabledDate: time => {

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -369,9 +369,13 @@
         if (TripFeature.FeatureType >= 4) {
           var htmlObj = document.getElementById("newFeatureBox");
           if (htmlObj && htmlObj.innerHTML != null && htmlObj.innerHTML != "") {} else {
+             //更新行程特色
+             if(this.journeyList.IsUpdateTrip==1)
+             {
                  this.MsgBus.$emit('comUpTravel');
              }
           }
+        }
 
         TripFeature.FeeInclude = this.PostNotice.FeeInclude;
         TripFeature.FeeNonInclude = this.PostNotice.FeeNonInclude;
@@ -399,6 +403,7 @@
         }
         basicData.TeamType = this.TeamType;
         basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel;
+  
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,
@@ -625,6 +630,7 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
+           
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -664,6 +664,13 @@
                       <template slot="prepend">集合标识</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item>
+                    <span class="TP_Sendprepend" style="margin-left:0;width:120px;">可退景点</span>
+                    <el-select class="w180" v-model="priceData.ChooseBackScenicArr" multiple >
+                      <el-option v-for="item in priceData.scenicBackList" :key="item.ID" :label="item.Name" :value="item.ID">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
                   <el-form-item>
                     <el-input placeholder="请输入" class="w460 ComSeat" v-model="priceData.AirportService">
                       <template slot="prepend">机场服务</template>
@@ -1053,7 +1060,6 @@
             var objItem = "";
             if (this.returnPriceList.length > 0) {
               objItem = JSON.parse(JSON.stringify(this.returnPriceList[0]));
-              console.log("objItem",objItem);
               objItem.OPRemark = "";
               objItem.AirTicketId = 0;
               objItem.AirticketBindList = [];
@@ -1136,6 +1142,10 @@
                 ChooseHotelArray: [],
                 //销售清位时间
                 SaleClearOrderHour: 0,
+                //可退景点选择列表
+                chooseBackScenicArr:[],
+                //可退景点下拉列表
+                scenicBackList:[],
               };
             }
             this.returnPriceList.push(objItem);
@@ -1282,14 +1292,6 @@
           err => {}
         );
       },
-      compareDay(day) {
-        var _string = this.getDayStr(day);
-        if (_string == this.chooseDay) {
-          return true;
-        } else {
-          return false;
-        }
-      },
       validateForm() {
         //表单验证
         let flag = true;
@@ -1602,7 +1604,6 @@
             this.priceData.IsNew = true;
           }
         }
-
       },
       //保存酒店使用情况
       saveHoteluseDetail(type) {
@@ -1765,5 +1766,4 @@
       commonPHInfo: commonPHlInfo
     }
   };
-
 </script>
\ No newline at end of file

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue

@@ -97,8 +97,8 @@
               </el-select>
             </el-form-item>
           </span>
-          <span class="TDTextspan" style="display:none;">是否更新行程特色</span>
-          <span style="display:none;">
+          <span class="TDTextspan" >是否更新行程特色</span>
+          <span>
             <el-form-item prop="ReturnArriveCityId">
               <el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
                 <el-option label="不更新" :value="0"></el-option>

src/components/personalCenter/sell.vue

@@ -26,7 +26,7 @@
         </div>
       </div>
       <div class="remark">
-        徐数学在本期的排名中取得了{{champion.weekTotalIncome}}的业绩，领先第二名{{champion.differencePrice.toFixed(2)}}，这是他第{{champion.rankTopCount}}次获得销售周冠的称号，想看他的成功秘笈？戳下面的按钮查看吧！
+        {{champion.employeeName}}在本期的排名中取得了{{champion.weekTotalIncome}}的业绩，领先第二名{{champion.differencePrice.toFixed(2)}}，这是他第{{champion.rankTopCount}}次获得销售周冠的称号，想看他的成功秘笈？戳下面的按钮查看吧！
       </div>
       <div class="more-btn" @click="openRank">立即查看</div>
     </div>

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -3,9 +3,14 @@
     <div class="query-box" style="border-bottom: none;">
       <ul>
         <li>
-          <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <template v-if="IsOperation !=1">
+            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
+          </template>
+          <template v-else>
+            <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
+          </template>
           <input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
         </li>
       </ul>
     </div>
@@ -86,7 +91,12 @@
                 <span class="spanlink" v-if='childItem.PeoplePrice==0'
                   @click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
                 <span v-else>
+                  <template v-if="CurrentUserInfo.EmployeeId==615">
+                     <el-input class='w135' v-model='childItem.PeoplePrice' @keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
+                  </template>
+                  <template v-else>
                      {{childItem.PeoplePrice}}
+                  </template>
                 </span>
               </td>
               <td>
@@ -127,7 +137,7 @@
                   </tr>
                 </table>
               </td>
-              <td v-if="childIndex==0" :rowspan="3" >
+              <td v-if="childIndex==0" :rowspan="3">
                 <el-input type='textarea' rows="4" class='w170' v-model='subItem.Remarks'></el-input>
               </td>
             </tr>
@@ -148,7 +158,9 @@
         flightTotal: 0,
         GuestNum: 0,
         loading: false,
-        IsOperation:'',
+        IsOperation: '',
+        //当前登录人信息
+        CurrentUserInfo:{},
       }
     },
     methods: {
@@ -209,9 +221,8 @@
                 if (!subItem.Discount) {
                   subItem.Discount = 0;
                 }
-                 if(!subItem.UsePeopleNum)
-                {
-                  subItem.UsePeopleNum=0;
+                if (!subItem.UsePeopleNum) {
+                  subItem.UsePeopleNum = 0;
                 }
               });
             })
@@ -225,9 +236,8 @@
                 if (!subItem.Discount) {
                   subItem.Discount = 0;
                 }
-                if(!subItem.UsePeopleNum)
-                {
-                  subItem.UsePeopleNum=0;
+                if (!subItem.UsePeopleNum) {
+                  subItem.UsePeopleNum = 0;
                 }
               });
             })
@@ -244,6 +254,8 @@
       },
     },
     mounted() {
+      let userInfo = this.getLocalStorage();
+      this.CurrentUserInfo = userInfo;
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;