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

src/components/FinancialModule/BasicDocuments.vue

@@ -282,7 +282,7 @@
                 </table>
                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
                     <tr class="_fujiashuoming_tr">
-                        <td>签证产品编号：<span @click="jumpPage('VisaProduct',GetDetail,8)" class="_jump_page _font_bold">{{GetDetail.SourceID}}</span></td>
+                        <td>签证产品编号：<span @click="jumpPage('VisaProductOrder',GetDetail,8)" class="_jump_page _font_bold">{{GetDetail.SourceID}}</span></td>
                         <td @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
                     </tr>
                 </table>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2057,6 +2057,7 @@ export default {
       isShowHouse: false,
       isShowLayerRemarks: false,
       loading: true,
+      isChecked: true,
       comSelect: -1,
       remarksMsg: {
         OrderId: "0",
@@ -2313,6 +2314,13 @@ export default {
     }
   },
   methods: {
+     //是否可以修改成交单价
+      canEditUnitPrice() {
+        let userInfo = this.getLocalStorage();
+        if (userInfo != null && userInfo.EmployeeId == 1) {
+          this.isChecked = false;
+        }
+      },
     maxCommissionMinusRate: function () {
       this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
       this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
@@ -3780,6 +3788,7 @@ export default {
     this.getJyfs();
     this.getFylx();
     this.getTuanInfo();
+     this.canEditUnitPrice();
   }
 };
 </script>

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" style="width: auto !important;display:none" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature()" />
+    <input type="button" style="width: auto !important;" 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" />
@@ -646,18 +646,17 @@
         this.pdfLoading = true;
         let tcid = this.$route.query.tcid;
         let UploadUrl = this.domainManager().UploadUrl
-        $.ajax({
-          url: UploadUrl + '/Upload/RemoveImage?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
+        let _this = this
+        if (this.showType===4 || this.showType===5) { //  判断是否为行程特色
+          $.ajax({  //调用是否已经存在文件夹接口判断是否进行上传图片操作
+            url: UploadUrl + '/Upload/GetImage?filePath=Feature/' + tcid,
             type: "POST",
             datatype:"jsonP",
             success: function (data) {
-            // console.log("上传成功",data);
-          },
-          error: function () {
-              // console.log("上传失败");
-          }
-        });
-        if (this.showType===4 || this.showType===5) {
+              let msg = JSON.parse(data)
+              if (msg.ResultCode) {   // 已经存在文件 直接调用下载
+                _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游')
+              } else { // 不存在图片保存图片后下载
                 document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
                   let src = x.src
                   src = src.replace('https:','http:')
@@ -667,9 +666,9 @@
                   x.src = src
                 });
                 let cName=''
-          if(this.showType==4){
+                if(_this.showType==4){
                   cName='.feature-box'
-          }else if(this.showType==5){
+                }else if(_this.showType==5){
                   cName='.travle_page'
                 }
                 if(cName!=''){
@@ -704,21 +703,22 @@
                                 // console.log("上传失败");
                             }
                         });
-                  // this.uploadImg(tcid,{'myfile': image.src}, res=>{
-                  //   console.log(res)
-                  // }, err=>{
-                  //   console.log("GHJK",err);
-                  // })
                         if (allNum!==document.querySelectorAll(cName).length) {
                           allNum += 1
                         } else {
-                    this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游')
+                          _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游')
                         }
                       }
                     });
                   });
                 }
-        }else {
+              }
+            },
+            error: function () {
+                // console.log("上传失败");
+            }
+          });
+        } else {
           this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游')
         }
       },

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -378,6 +378,20 @@
                 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({