页面修改

src/components/confirmationOrderDownLoadNew.vue

@@ -14,22 +14,7 @@
     top: 55px;
   }
 
-  .travelControlTrip .el-dropdown {
-    height: 30px;
-    line-height: 30px;
-    background-color: #E95252;
-    color: #fff;
-    font-size: 12px;
-    width: 80px;
-    text-align: center;
-    border-radius: 4px;
-    cursor: pointer;
-    margin-left: 20px;
-  }
 
-  .travelControlDropDown .el-dropdown-menu__item {
-    width: 156px;
-  }
 
   .guoneiLine tbody td {
     font-size: 17px;
@@ -43,30 +28,24 @@
     <el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;">
       <el-col :span="14" class="row-aic">
         <a id="pdfDownLoad" style="display:none;" target="_blank" href="http://www.baidu.com" download="xx.pdf">页面跳转</a>
-        <div class="el-dropdown-link" style="    height: 30px;
-        line-height: 30px;
-        background-color: #E95252;
-        color: #fff;
-        font-size: 12px;
-        width: 90px;
-        text-align: center;
-        border-radius: 4px;
-        cursor: pointer;
-        margin-left: 20px;" @click="toPDF_2023()">
-          {{orderId>0?"出团通知书下载":"行程下载"}}
-        </div>
-        <div class="el-dropdown-link" style="height: 30px;
-        line-height: 30px;
-        background-color: #E95252;
-        color: #fff;
-        font-size: 12px;
-        width: 90px;
-        text-align: center;
-        border-radius: 4px;
-        cursor: pointer;
-        margin-left: 20px;" @click="gernalFeature(1)">
-          {{orderId>0?"出团通知书下载WROD":"行程下载WORD"}}
-        </div>
+        <template v-if="orderId>0">
+          <el-button type="primary" size="medium" @click="toPDF_2023()">
+            出团通知书下载</el-button>
+          <el-button type="primary" size="medium" @click="gernalFeature(1)">
+            出团通知书下载WROD</el-button>
+        </template>
+        <template v-else>
+          <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="gernalFeature(1)" style="margin-left:20px;">
+            行程下载WORD</el-button>
+        </template>
+
         <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
         <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
         <el-checkbox class="marginL11" style="display:none;" v-model="isShowTime">显示行程日期</el-checkbox>
@@ -311,6 +290,14 @@
       }, 2000)
     },
     methods: {
+      //每次自动生成行程
+      handleClick() {
+        this.toPDF_2023();
+      },
+      //阿里云
+      tripDownLoadClick(command) {
+        this.toPDF_2023(command);
+      },
       //获取微信二维码
       getWxCode: function () {
         this.apipost('survey_post_GetSurveyWeiXinShare', {
@@ -536,7 +523,7 @@
         })
       },
       // 生成pdf
-      toPDF_2023: function () {
+      toPDF_2023: function (command) {
         this.pdfLoading = true;
         var that = this;
         let urlObj = this.domainManager();
@@ -560,26 +547,40 @@
           title += this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
         }
         var fileName = title + ".pdf";
-        that.pdfDownLoad(fileName, msg);
-        // if (this.orderId && this.orderId > 0) {
-        //   //出团通知书下载
-        //   this.pdfDownLoad(fileName, msg);
-        // } else if (urlObj.IsOnline == 0) {
-        //   //本地行程下载
-        //   this.pdfDownLoad(fileName, msg);
-        // } else {
-        //   //阿里云行程下载
-        //   var objFileKey = "TripDownLoad"
-        //   objFileKey += "/" + msg.configId + "_" + msg.tcid;
-        //   objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
-        //   that.downloadChengDuFileRename(objFileKey, fileName, res => {
-        //     if (res.resultCode == 0) {
-
-        //     } else {
-        //       that.pdfLoading = false;
-        //     }
-        //   })
-        // }
+        //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;
+            }
+          })
+        }
       },
       pdfDownLoad: function (fileName, msg) {
         let urlObj = this.domainManager();

src/plug/index.js

@@ -120,10 +120,10 @@ export default {
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
-        let ocrUrl = "http://192.168.10.214:8140";
+        let ocrUrl = "http://192.168.10.68:8888";
         // domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
          domainUrl = "http://192.168.10.226"; //春姐
-        domainUrl = "http://192.168.10.214"; //奎哥
+        domainUrl = "http://192.168.10.68"; //奎哥
 
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";