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

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -2,7 +2,7 @@
   .RegistrationStatistic .Rs_LtName{
     text-align:left;
     padding-left:20px;
-  } 
+  }
   .RegistrationStatistic .RS_Nameover{
     overflow: hidden;
     text-overflow: ellipsis;
@@ -194,9 +194,9 @@ export default {
     },
     //获取系列列表
     getLineTeamList() {
-      this.queryMsg.LineteamId = 0;
+      this.queryMsg.ltID = 0;
       let msg = {
-        lineID: this.queryMsg.LineId,
+        lineID: this.queryMsg.LineID,
         isTOOP: 1
       };
       this.apipost("team_post_GetList", msg, res => {
@@ -214,7 +214,7 @@ export default {
           this.queryCommonData.loading = false;
           if (res.data.resultCode == 1) {
             this.DataList = res.data.data;
-            
+
             this.DataList.forEach(item=>{
               switch(item.StartCityName){
                  case '成都':

src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue

@@ -2,7 +2,7 @@
   .RegistrationStatistic .Rs_LtName{
     text-align:left;
     padding-left:20px;
-  } 
+  }
   .RegistrationStatistic .RS_Nameover{
     overflow: hidden;
     text-overflow: ellipsis;
@@ -194,9 +194,9 @@ export default {
     },
     //获取系列列表
     getLineTeamList() {
-      this.queryMsg.LineteamId = 0;
+      this.queryMsg.ltID = 0;
       let msg = {
-        lineID: this.queryMsg.LineId,
+        lineID: this.queryMsg.LineID,
         isTOOP: 1
       };
       this.apipost("team_post_GetList", msg, res => {
@@ -214,7 +214,7 @@ export default {
           this.queryCommonData.loading = false;
           if (res.data.resultCode == 1) {
             this.DataList = res.data.data;
-            
+
             this.DataList.forEach(item=>{
               switch(item.StartCityName){
                  case '成都':

src/components/confirmationOrderDownLoad.vue

@@ -7,7 +7,7 @@
 <template>
   <div class="travelControlTrip detail-box">
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
-    <input type="button" class="travelControlTripBtn" value="下载PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
+    <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
     <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature()" />
     <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
     <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
@@ -687,7 +687,6 @@
                         context.imageSmoothingEnabled = false
                         var image = new Image();
                         image.src = canvas.toDataURL("image/png");
-                        // document.body.appendChild(image) upload.oytour.com
                         $.ajax({
                           url: UploadUrl + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
                             type: "POST",
@@ -697,10 +696,10 @@
                             },
                             datatype:"jsonP",
                             success: function (data) {
-                              // console.log("上传成功",data);
+                              //console.log("上传成功",data);
                             },
                             error: function () {
-                                // console.log("上传失败");
+                                //console.log("上传失败");
                             }
                         });
                         if (allNum!==document.querySelectorAll(cName).length) {
@@ -922,7 +921,7 @@
           //是否显示同行备注
           isShowB2B:this.vshowI?1:0,
           //是否显示行程
-          isShowTrip:this.vshowK?1:0,
+          isShowTrip:this.vshowD?1:0,
           //是否显示标题
           isShowTitle:this.vshowL?1:0,
           //是否显示旅客名单
@@ -930,7 +929,9 @@
           //是否显示紧急联系人
           isShowMan:this.vshowLLR?1:0,
           //是否显示团号
-          isShowTCNUM:this.vshowTCNUM?1:0
+          isShowTCNUM:this.vshowTCNUM?1:0,
+          //是否显示行程图片
+          isShowTripImage:this.vshowK?1:0,
         };
         this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
            this.pdfLoading = false

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -378,22 +378,7 @@
                 if (SaveType == 1) {
                   let path = flagWangYue ? 'TravelManager3' : 'TravelManager2';
                   this.Success("保存成功");
-                  let tcid = this.$route.query.tcid;
-                  let UploadUrl = this.domainManager().UploadUrl
-                  // 每次保存  删除对应文件夹  word 行程特色图片
-                  $.ajax({
-                    url: UploadUrl + '/Upload/RemoveImage?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
-                    type: "POST",
-                    datatype:"jsonP",
-                    success: function (data) {
-                      // console.log("上传成功",data);
-                    },
-                    error: function () {
-                        // console.log("上传失败");
-                    }
-                  });
                   if (flagWangYue||this.isNewConfig) {
-                    console.log(66666)
                     this.$router.push({
                       path: path,
                       query: {

src/components/systemManagement/LessPriceManagement.vue

@@ -241,18 +241,18 @@
       //点击添加
       addLessPrice(item){
         var obj = {
-          DeptLessMoney:0,
-          DeptLessPercent:0,
+          DeptLessMoney:"",
+          DeptLessPercent:"",
           DetailExtList:'',
-          FilialeLessMoney:0,
-          FilialeLessPercent:0,
+          FilialeLessMoney:"",
+          FilialeLessPercent:"",
           Id:0,
-          LessMoney:0,
-          LessPercent:0,
+          LessMoney:"",
+          LessPercent:"",
           LineId:0,
           LineTeamId:0,
-          OPLessMoney:0,
-          OPLessPercent:0,
+          OPLessMoney:"",
+          OPLessPercent:"",
           RB_Branch_Id:item.Id,
           RB_Group_Id:0,
           LineTeamList:[],

src/plug/index.js

@@ -149,7 +149,9 @@ export default {
           GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN",
           //google地图图片地址
           GoogleMapImageUrl: "http://super.oytour.com",
-          UploadUrl: "http://upload.oytour.com"
+          // "http://upload.oytour.com"
+          UploadUrl: locationName.indexOf('oytour')!==-1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120"
+          // UploadUrl: "http://upload.oytour.com"
         };
         return obj;
       },