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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1004,6 +1004,7 @@
           CurrencyId: leadr.CurrencyId,
         }
         let id = [];
+        console.log("nowLineId:"+obj.LineId+"old:"+ this.LineId);
         if (obj.LineId == this.LineId) {
           id = [98, 99]
         } else {
@@ -1215,6 +1216,7 @@
         }, res => {
           if (res.data.resultCode == 1) {
             let nav = res.data.data.list;
+            this.LineId = res.data.data.EntryId
             if (nav[0].OutBranchId == 1216) {
               this.IsShowRMB = true;
             }
@@ -1324,7 +1326,7 @@
       this.isUpdate = this.$route.query.isUpdate;
       this.msg.TCIDs = this.$route.query.id;
       this.NewCombinationNum = this.$route.query.NewCombinationNum;
-      this.LineId = this.$route.query.lineId ? this.$route.query.lineId : 0
+     
       if (this.$route.query.OutBranchId == 1216) {
         this.IsShowRMB = true;
       }

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -212,7 +212,7 @@
         </div>
         <div class="TC-warmTips TC-Comtitlediv" v-if="!dayObj.isRead" :class="{'showOther':TeamType==3}">
           <div class="TC-SpecialInstruction clearfix">
-            <div class="TC-leftTitle">温馨提醒111</div>
+            <div class="TC-leftTitle">温馨提醒</div>
             <div class="TC-rightContent">
               <!--<el-input type="textarea" v-model="dayObj.WarmTipObj.Description"></el-input>-->
               <my-edit v-on:edit-value="dayObj.WarmTipObj.Description = arguments[0]"
@@ -224,7 +224,7 @@
         </div>
         <div class="TC-warmTips TC-Comtitlediv TC-warmText" v-if="dayObj.isRead" :class="{'showOther':TeamType==3}">
           <div class="TC-SpecialInstruction clearfix">
-            <div class="TC-leftTitle">温馨提醒222</div>
+            <div class="TC-leftTitle">温馨提醒</div>
             <div class="TC-rightContent" v-html="dayObj.WarmTipObj.Description"></div>
           </div>
         </div>