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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -397,6 +397,7 @@
                         <span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState" @click="GoOPurl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
                         <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
                         <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
+                        <span v-if="OtherType!=''" @click="GourlHotelZr" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">酒店折让</span>
                     </p>
                     <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                         <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
@@ -926,6 +927,7 @@ export default {
           showModel: false,
           CostTypeState:false,
           huijiShow:false,
+          OtherType:'',
         }
     },components:{
         'my-FlowChartModule': myFlowChartModule,
@@ -952,7 +954,19 @@ export default {
         if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
             this.huijiShow=true;
         }
+        this.OtherType=this.$route.query.OtherType?this.$route.query.OtherType:'';
     },methods:{
+        GourlHotelZr(){
+            this.$router.push({
+                name: 'HotelDiscount',
+                query: { 
+                    FinanceId:this.ID,
+                    blank: "y", 
+                    tab: "酒店折让" 
+                }
+            });
+
+            },
         GourlCostType(path,num){
             this.$router.push({
                 name: path,

src/components/Hotel/HotelProductManage2.vue

@@ -110,6 +110,7 @@
       <div class="hotelProductManage2_edit2_header">
         <div>{{$t('restaurant.res_bidManage')}}</div>
         <div>
+          <input type="button" value="酒店折让" @click="goHotelDiscount('HotelDiscount')" class="hollowbtn" />
           <input type="button" :value="$t('ground.piliangshanchu')" @click="delete2Reset()" class="hollowbtn" />
           <input type="button" :value="$t('ground.chongzhi')" @click="edit2Reset()" class="hollowFixedBtn" />
           <input type="button" :value="$t('pub.saveBtn')" @click="edit2Save()" class="normalBtn" />
@@ -890,6 +891,16 @@
       }
     },
     methods: {
+      goHotelDiscount(path) {
+        this.$router.push({
+          name: path,
+          query: {
+            blank: "y",
+            NewHotelID:this.hotelId,
+            
+          }
+        });
+      },
       //库存类型
       stockColor: function (item, item2, childItem) {
         if (item.date === item2.month && item2.hasOwnProperty('data')) {

src/router/config.js

@@ -818,6 +818,14 @@ export default {
                                 title: '酒店产品管理2'
                             },
                         },
+                        {
+                            path: '/HotelDiscount', //酒店折让
+                            name: 'HotelDiscount',
+                            component: resolve => require(['@/components/Hotel/HotelDiscount'], resolve),
+                            meta: {
+                                title: '酒店折让'
+                            },
+                        },
                         {
                             path: '/HotelProductEdit', //酒店产品编辑
                             name: 'HotelProductEdit',