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

src/components/SalesModule/productQuery.vue

@@ -933,7 +933,7 @@
           CommissionShareMoney: '0',
           OrderForm: '1',
           SonControlID: '-1',
-          IsShowMessagesMoney: '1'
+          IsShowMessagesMoney: '2'
         },
         employeeMsg: {
           BranchId: '-1',
@@ -1704,7 +1704,7 @@
         this.ScenicRefundMoney = 0;
         this.addMsg.CommissionSharePeople = '-1'
         this.addMsg.CommissionShareMoney = '0'
-        this.addMsg.IsShowMessagesMoney = '1'
+        this.addMsg.IsShowMessagesMoney = '2'
         this.remarkMsg = {
           zc: '',
           bzc: '',

src/components/confirmationOrderDownLoad.vue

@@ -8,7 +8,7 @@
   <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" class="travelControlTripBtn" value="下载WORD" @click="ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
+    <input type="button" class="travelControlTripBtn" value="下载WORD" @click="gernalFeature()" /><!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
     <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
     <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
     <div id="pdfNode">
@@ -641,6 +641,40 @@
       }, 2000)
     },
     methods: {
+      gernalFeature(){
+        console.log(document.querySelector("#gernalCanvas").querySelectorAll('img'))
+        document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
+          if(x.src.indexOf('http')!=-1){
+            x.setAttribute('crossOrigin','anonymous')
+          }
+        });
+        let cName=''
+        if(showType==4){
+          cName='.feature-box'
+        }else if(showType==5){
+          cName='.travle_page'
+        }
+        if(cName!=''){
+          document.querySelectorAll(cName).forEach(x => {
+            html2Canvas(x,{
+              useCORS:true,
+              scale:0.7,
+              backgroundColor:'#FFFFFF'
+            }).then((canvas) => {
+              if(canvas){
+                var context = canvas.getContext('2d')
+                context.mozImageSmoothingEnabled = false
+                context.webkitImageSmoothingEnabled = false
+                context.msImageSmoothingEnabled = false
+                context.imageSmoothingEnabled = false
+                var image = new Image();
+                image.src = canvas.toDataURL("image/png");
+                document.body.appendChild(image)
+              }
+            });
+          });
+        }
+      },
       //保存基础数据
       submitForm: function () {
         this.editForm.travelOrderFlightList.forEach(x => {