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

src/components/LeaderManagement/leaderManagement.vue

@@ -1113,7 +1113,6 @@
             ID: ID
           },
           res => {
-            console.log("leaderData",res.data.data);
             let LanguageIdArr = [];
             this.addMsg = res.data.data;
             this.addMsg.LeaderGuidClass = this.addMsg.LeaderGuidClass ? this.addMsg.LeaderGuidClass : 0;

src/components/SalesModule/passengerListSale.vue

@@ -596,7 +596,6 @@ export default {
 
     },
     mounted(){
-		console.log(this.$route.query)
      this.getList()
      if(this.$route.query.tcnum) this.TNumber=  this.$route.query.tcnum
 	 if(this.$route.query.tcmun)this.TNumber=  this.$route.query.tcmun

src/components/SalesModule/travelGLDOrder.vue

@@ -231,15 +231,6 @@
       },
       goTuanDetails(row) {
         let name = "RegistrationList";
-        // if (row.IsOneDay == 1) {
-        //   name = "groupTourOrderByTuanOne";
-        // } else {
-        //   name = "groupTourOrderByTuan";
-        // }
-        // console.log("this.CurrentUserInfo",this.CurrentUserInfo);
-        // if (this.CurrentUserInfo.EmployeeId == 1 || this.CurrentUserInfo.RB_Department_Id == 2) {
-        //   name = "RegistrationList";
-        // }
         this.$router.push({
           name: name,
           query: {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -670,7 +670,7 @@
                   </p>
                   <p class="travelnowrap">
                     <span>{{ $t("Airticket.Air_StartTime") }}</span>
-                    <span class="go_date">{{ item.StartDate }}(<font style="color:red;">{{item.StartDateWeekStr}}</font>)</span>
+                    <span class="go_date">{{ item.StartDate }}(<font style="color:red;font-weight:bold;">{{item.StartDateWeekStr}}</font>)</span>
                     <template v-if="item.RelationPriceList && item.RelationPriceList.length > 0">
                       <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
                         <el-popover width="350" trigger="click" popper-class="TC_HotelPop">

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -506,7 +506,7 @@
                   </p>
                   <p class="travelnowrap">
                     <span>{{$t('Airticket.Air_StartTime')}}</span>
-                    {{item.StartDate}}
+                    {{item.StartDate}}(<font style="color:red;font-weight:bold;">{{item.StartDateWeekStr}}</font>)
                     <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
                       <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
                         <el-popover width="350" trigger="click" popper-class="TC_HotelPop">

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -454,7 +454,7 @@
                   </p>
                   <p class="travelnowrap">
                     <span>{{$t('Airticket.Air_StartTime')}}</span>
-                    <span class="go_date">{{item.StartDate}}</span>
+                    <span class="go_date">{{item.StartDate}}(<font style="color:red;font-weight:bold;">{{item.StartDateWeekStr}}</font>)</span>
                     <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
                       <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
                         <el-popover width="350" trigger="click" popper-class="TC_HotelPop">

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -266,46 +266,53 @@
                 </template>
               </td>
               <td style="white-space:nowrap;">
-                <template v-if="subItem.IsBreakfastChange">
+                <template v-if="subItem.BreakfastCostPrice>0||subItem.IsBreakfastChange">
                   {{$t('objFill.v101.zaocanmc')}}:
                   {{subItem.BreakfastCostPrice}}
-                  <el-tooltip class="item" effect="dark" :content="subItem.BreakfastChangeRemark" placement="top-start">
-                    <font style="color:red;">
-                      <template v-if="subItem.BreakfastChangeValue>0">
-                        +
-                      </template>
-                      {{subItem.BreakfastChangeValue}}
-                    </font>
-                  </el-tooltip>
-                  =<font style="color:red;">{{subItem.BreakfastChangePrice}}</font>
+                  <template v-if="subItem.IsBreakfastChange">
+                    <el-tooltip class="item" effect="dark" :content="subItem.BreakfastChangeRemark"
+                      placement="top-start">
+                      <font style="color:red;">
+                        <template v-if="subItem.BreakfastChangeValue>0">
+                          +
+                        </template>
+                        {{subItem.BreakfastChangeValue}}
+                      </font>
+                    </el-tooltip>
+                    =<font style="color:red;">{{subItem.BreakfastChangePrice}}</font>
+                  </template>
                 </template>
-                <template v-if="subItem.IsLunchChange">
+                <template v-if="subItem.LunchCostPrice>0||subItem.IsLunchChange">
                   <br />
                   {{$t('objFill.v101.wucanmc')}}:
                   {{subItem.LunchCostPrice}}
-                  <el-tooltip class="item" effect="dark" :content="subItem.LunchChangeRemark" placement="top-start">
-                    <font style="color:red;">
-                      <template v-if="subItem.LunchChangeValue>0">
-                        +
-                      </template>
-                      {{subItem.LunchChangeValue}}
-                    </font>
-                  </el-tooltip>
-                  =<font style="color:red;">{{subItem.LunchChangePrice}}</font>
+                  <template v-if="subItem.IsLunchChange">
+                    <el-tooltip class="item" effect="dark" :content="subItem.LunchChangeRemark" placement="top-start">
+                      <font style="color:red;">
+                        <template v-if="subItem.LunchChangeValue>0">
+                          +
+                        </template>
+                        {{subItem.LunchChangeValue}}
+                      </font>
+                    </el-tooltip>
+                    =<font style="color:red;">{{subItem.LunchChangePrice}}</font>
+                  </template>
                 </template>
-                <template v-if="subItem.IsDinnerChange">
+                <template v-if="subItem.DinnerCostPrice>0||subItem.IsDinnerChange">
                   <br />
                   {{$t('objFill.v101.wancaimc')}}:
                   {{subItem.DinnerCostPrice}}
-                  <el-tooltip class="item" effect="dark" :content="subItem.DinnerChangeRemark" placement="top-start">
-                    <font style="color:red;">
-                      <template v-if="subItem.DinnerChangeValue>0">
-                        +
-                      </template>
-                      {{subItem.DinnerChangeValue}}
-                    </font>
-                  </el-tooltip>
-                  =<font style="color:red;">{{subItem.DinnerChangePrice}}</font>
+                  <template v-if="subItem.IsDinnerChange">
+                    <el-tooltip class="item" effect="dark" :content="subItem.DinnerChangeRemark" placement="top-start">
+                      <font style="color:red;">
+                        <template v-if="subItem.DinnerChangeValue>0">
+                          +
+                        </template>
+                        {{subItem.DinnerChangeValue}}
+                      </font>
+                    </el-tooltip>
+                    =<font style="color:red;">{{subItem.DinnerChangePrice}}</font>
+                  </template>
                 </template>
               </td>
               <td>
@@ -1229,7 +1236,6 @@
         var otherPrice = Number(this.getDayChangeXiaoJi(9, 2)) / PeopleNumber; //其它费用
         var busFee = Number(this.getDayChangeXiaoJi(2, 2)) / PeopleNumber; //车费
         totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
-        console.log("getLocalChangeTotalMoney", totalMoney);
         return totalMoney.toFixed(2);
       },
       //获取地接项目报价(日元)

src/components/TravelManager/TravelNewQuotation/priceDialog.vue

@@ -95,7 +95,6 @@
           msg,
           res => {
             this.loading = false;
-            console.log("priceDialog", res.data);
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
               if (tempData.ID && tempData.ID > 0) {

src/components/WebSet/home/indexNav.vue

@@ -549,7 +549,7 @@
         this.isShowMenuDialog = false;
         if (chooseMenuObj) {
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
-          this.clickItem.MenuName = chooseMenuObj.MenuName;
+          //this.clickItem.MenuName = chooseMenuObj.MenuName;
           this.clickItem.LinkTitle = chooseMenuObj.MenuName;
         }
         this.$refs.chooseMenu.initMenuCheck();

src/components/WebSet/home/indexSlider1.vue

@@ -291,7 +291,6 @@
       },
       //上传图片
       UploadAttachment(file, FileType) {
-        console.log()
         let newArr = [];
         newArr.push(file.file);
         var path = "/Upload/WebSite/";
@@ -337,7 +336,9 @@
         var chooseMenuObj = this.$refs.chooseMenu.getChooseMenu();
         this.isShowMenuDialog = false;
         if (chooseMenuObj) {
-          this.clickItem.SubName = chooseMenuObj.MenuName;
+          if (chooseMenuObj.LtName && chooseMenuObj.LtName != '') {
+            this.clickItem.SubName = chooseMenuObj.LtName;
+          }
           if (chooseMenuObj.MenuSubName) {
             this.clickItem.SubDescribe = chooseMenuObj.MenuSubName;
           }

src/components/WebSet/plug-in/choose_menu.vue

@@ -332,6 +332,7 @@
           MenuUrl: "",
           ImgUrl: "",
           MenuSubName: "",
+          LtName: "",
         };
         var domainUrl = this.getLocalStorage().B2BDomain;
         //自定义页面
@@ -355,7 +356,9 @@
           this.dataList.forEach((item) => {
             if (item.Checked) {
               obj.MenuName = item.Title;
-              console.log("item.ProductRecommend",item.ProductRecommend)
+              if (item.LtName && item.LtName != '') {
+                obj.LtName = item.LtName;
+              }
               if (item.ProductRecommend && item.ProductRecommend != '') {
                 obj.MenuSubName = item.ProductRecommend;
               }
@@ -371,7 +374,6 @@
             obj.MenuUrl = domainUrl + obj.MenuUrl;
           }
         }
-        console.log("chooseObj",obj);
         return obj;
       },
       //选中切换

src/components/public/StartDateLimit.vue

@@ -60,7 +60,6 @@
       clearable:{
         handler(n,o){
           if(n)console.log(n,'--------')
-
         },
         deep:false,
         immediate: true,