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

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -417,7 +417,7 @@ export default {
                 TypeId:this.accType,
                 BranchId:-1,
                 Alias:'',
-                RB_Branch_Id:this.RB_Branch_Id,
+               // RB_Branch_Id:this.RB_Branch_Id,
             }
             this.apipost('BankAccount_post_GetPlatformList',msg, res => {
                 if(res.data.resultCode == 1) {

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -453,7 +453,7 @@ export default {
                     BranchId:-1,
                     Alias:'',
             }
-            this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
+            this.apipost('BankAccount_post_GetCashPoolList',msg, res => {
                 if(res.data.resultCode == 1) {
                     let data = res.data.data;
                     this.accountList = data;
@@ -651,7 +651,7 @@ export default {
         BranchId:-1,
         Alias:''
       };
-      this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
+      this.apipost('BankAccount_post_GetCashPoolList',msg, res => {
         if(res.data.resultCode === 1) {
           let data = res.data.data;
           data.forEach(x=>{
@@ -674,7 +674,7 @@ export default {
       }, err => {})
     },
     BankAccount_post_GetCashPoolList(query){ // 获取资金池账
-      this.apipost('BankAccount_post_GetCashPoolList',{TypeId:2,BranchId:-1,Alias:''}, res => {
+      this.apipost('BankAccount_post_GetCashPoolList',{TypeId:4,BranchId:-1,Alias:''}, res => {
         if(res.data.resultCode === 1) {
           let data = res.data.data;
           data.forEach(x=>{

src/components/confirmationOrderDownLoad.vue

@@ -10,7 +10,7 @@
     <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(0)" />
     <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
-    <a class="travelControlTripBtn" v-if="priceList!=null&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
+    <a class="travelControlTripBtn" v-if="priceList!=null&& priceList[0]!=null && priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
       width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;" :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
     <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
     <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
@@ -659,7 +659,7 @@
               let msg = JSON.parse(data)
               if (msg.ResultCode) {   // 已经存在文件 直接调用下载
                 _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
-              } else { // 不存在图片保存图片后下载
+              } else if (document.querySelector("#gernalCanvas")){ // 不存在图片保存图片后下载
                 if (document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) {
                   _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
                   return
@@ -718,6 +718,8 @@
                     });
                   });
                 }
+              } else {
+                 _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
               }
             },
             error: function () {