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

src/components/confirmationOrderDownLoadNew.vue

@@ -35,23 +35,16 @@
             出团通知书下载WROD</el-button>
         </template>
         <template v-else>
-             <el-button type="primary" size="medium" @click="toPDF_2023()" style="margin-left:20px;">
+          <el-button type="primary" size="medium" @click="toPDF_2023()">
             行程下载</el-button>
-          <!-- <el-dropdown size="medium" @command="tripDownLoadClick" split-button type="primary" @click="handleClick">
-            行程下载
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="1" style="display:none;">行程(同行备注)</el-dropdown-item>
-              <el-dropdown-item command="2" style="display:none;">行程(无同行备注)</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
+          <el-button type="primary" size="medium" @click="toPDF_2023(1)" style="margin-left:20px;display:none;">
+            行程下载(云盘)</el-button>
           <el-button type="primary" size="medium" @click="gernalFeature(1)" style="margin-left:20px;">
             行程下载WORD</el-button>
         </template>
         <!-- 可以让销售修改基本信息-->
         <el-button v-if="orderId>0" type="primary" size="medium" value="修改信息" @click="editMsgShow=true">
           修改信息</el-button>
-
-
         <el-checkbox class="marginL11" style="display:none;" v-model="isShowTime">显示行程日期</el-checkbox>
       </el-col>
     </el-row>
@@ -294,14 +287,6 @@
       }, 2000)
     },
     methods: {
-      //每次自动生成行程
-      handleClick() {
-        this.toPDF_2023();
-      },
-      //阿里云
-      tripDownLoadClick(command) {
-        this.toPDF_2023(command);
-      },
       //获取微信二维码
       getWxCode: function () {
         this.apipost('survey_post_GetSurveyWeiXinShare', {
@@ -551,40 +536,41 @@
           title += this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
         }
         var fileName = title + ".pdf";
+        if (this.orderId && this.orderId > 0) {
+          //出团通知书下载
+          this.pdfDownLoad(fileName, msg);
+        } else if (urlObj.IsOnline == 0) {
+          //本地行程下载
+          this.pdfDownLoad(fileName, msg);
+        } else if (command && command == 1) {
+          //阿里云行程下载
+          var objFileKey = "TripDownLoad"
+          objFileKey += "/" + msg.configId + "_" + msg.tcid;
+          objFileKey += "/" + msg.configId + "_" + msg.tcid + "_B2B.pdf";
+          that.downloadChengDuFileRename(objFileKey, fileName, res => {
+            if (res.resultCode == 0) {
+              msg.isShowB2B = 1;
               that.pdfDownLoad(fileName, msg);
-        // if (this.orderId && this.orderId > 0) {
-        //   //出团通知书下载
-        //   this.pdfDownLoad(fileName, msg);
-        // } else if (urlObj.IsOnline == 0) {
-        //   //本地行程下载
-        //   this.pdfDownLoad(fileName, msg);
-        // } else if (command && command == "1") {
-        //   //阿里云行程下载
-        //   var objFileKey = "TripDownLoad"
-        //   objFileKey += "/" + msg.configId + "_" + msg.tcid;
-        //   objFileKey += "/" + msg.configId + "_" + msg.tcid + "_B2B.pdf";
-        //   that.downloadChengDuFileRename(objFileKey, fileName, res => {
-        //     if (res.resultCode == 0) {
-        //       msg.isShowB2B = 1;
-        //       that.pdfDownLoad(fileName, msg);
-        //     } else {
-        //       that.pdfLoading = false;
-        //     }
-        //   })
-        // } else if (command && command == 2) {
-        //   //阿里云行程下载
-        //   var objFileKey = "TripDownLoad"
-        //   objFileKey += "/" + msg.configId + "_" + msg.tcid;
-        //   objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
-        //   that.downloadChengDuFileRename(objFileKey, fileName, res => {
-        //     if (res.resultCode == 0) {
-        //       msg.isShowB2B = 0;
-        //       that.pdfDownLoad(fileName, msg);
-        //     } else {
-        //       that.pdfLoading = false;
-        //     }
-        //   })
-        // }
+            } else {
+              that.pdfLoading = false;
+            }
+          })
+        } else if (command && command == 2) {
+          //阿里云行程下载
+          var objFileKey = "TripDownLoad"
+          objFileKey += "/" + msg.configId + "_" + msg.tcid;
+          objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
+          that.downloadChengDuFileRename(objFileKey, fileName, res => {
+            if (res.resultCode == 0) {
+              msg.isShowB2B = 0;
+              that.pdfDownLoad(fileName, msg);
+            } else {
+              that.pdfLoading = false;
+            }
+          })
+        } else {
+          that.pdfDownLoad(fileName, msg);
+        }
       },
       pdfDownLoad: function (fileName, msg) {
         let urlObj = this.domainManager();

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -222,7 +222,7 @@
           TripCityList: [], //行程城市
           TripMapList: [],
           NotQueryCityList:[],//使用系统中的经纬度城市
-          FeaturePageType:0,//1横版 2竖版
+          FeaturePageType:2,//1横版 2竖版
         },
         //行程
         FeatureData: {

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue

@@ -93,7 +93,7 @@
               </el-select>
             </el-form-item>
           </span>
-          <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
+          <!-- <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
           <span :class="{'showOther':TeamType==3}">
             <el-form-item prop="ReturnArriveCityId">
               <el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
@@ -101,7 +101,7 @@
                 <el-option :label="$t('op.Update')" :value="1"></el-option>
               </el-select>
             </el-form-item>
-          </span>
+          </span> -->
         </div>
         <div class="newTravelDayContent clearfix">
           <div class="vertical-line"></div>

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -170,7 +170,7 @@
               </el-select>
             </el-form-item>
           </span>
-          <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
+          <!-- <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
           <span :class="{'showOther':TeamType==3}">
             <el-form-item prop="ReturnArriveCityId">
               <el-select class="w90" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
@@ -178,7 +178,7 @@
                 <el-option :label="$t('op.Update')" :value="1"></el-option>
               </el-select>
             </el-form-item>
-          </span>
+          </span> -->
           <template v-if="true">
             <span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span>
             <span :class="{'showOther':TeamType==3}">