‘财务单据详情界面上传凭证，预览不了；在各个账户合并单据的时候请加上正在处理’

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1085,17 +1085,13 @@ export default {
             }
         },
         showImg(obj, type){
-            if (type) {
-                let isExsit=false
-                this.images.forEach(x=>{
-                    if(x==obj)
-                    isExsit=true
-                })
-                if(!isExsit) {
-                    this.images.push(obj)
-                } else {
-                    this.$viewer.view(this.images.indexOf(obj))
-                }
+            let isExsit=false
+            this.images.forEach(x=>{
+                if(x==obj)
+                isExsit=true
+            })
+            if(!isExsit) {
+                this.images.push(obj)
             } else {
                 this.$viewer.view(this.images.indexOf(obj))
             }

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -198,10 +198,10 @@
                 </tr>
             </table>
         </div>
-        <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa">
+        <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
           <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
           <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;    width: 100%;">
-            <<!--template v-if="BillType===2">
+            <!--template v-if="BillType===2">
               <tr >
                 <th height="34px">账户分类</th>
                 <th height="34px">付款方式</th>
@@ -387,6 +387,7 @@ export default {
           allMoney:0,
           TypeName:'',
           addChuNa:false,
+          allLoading: false,
           payMsgList:[],
           payMsg: {
               ID:0,
@@ -529,6 +530,7 @@ export default {
             this.addMsg.FrIDs = str.substring(0,str.length-1);
             this.addMsg.BankList = this.payMsgList;
             this.addMsg.Money = this.listAllMoney;
+            this.allLoading = true
             this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{
                 if(r.data.resultCode === 1) {
                     console.log(r)
@@ -537,6 +539,7 @@ export default {
                 }else{
                     this.$message.error(r.data.message)
                 }
+                this.allLoading = false
             },null)
         },
         initAddChuNa(){

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -155,7 +155,7 @@
                 </tr>
             </table>
         </div>
-        <el-dialog custom-class='w750 height="34px"' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa">
+        <el-dialog custom-class='w750 height="34px"' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
           <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
           <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;    width: 100%;">
               <template v-if="BillType===2">
@@ -341,6 +341,7 @@ export default {
             InMoney:0,
             BillType:1, //1 收 2 支  ,
             addChuNa:false,
+            allLoading: false,
             payMsgList:[],
             payMsg: {
               ID:0,
@@ -687,6 +688,7 @@ export default {
           this.addMsg.FrIDs = str.substring(0,str.length-1);
           this.addMsg.BankList = this.payMsgList;
           this.addMsg.Money = this.listAllMoney;
+          this.allLoading = true
           this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{
             if(r.data.resultCode === 1) {
               console.log(r)
@@ -695,6 +697,7 @@ export default {
             }else{
               this.$message.error(r.data.message)
             }
+            this.allLoading = false
           },null)
         },
         addCheckbox(obj,index){

src/components/FinancialModule/accDetail/PayAccDetail.vue

@@ -176,7 +176,7 @@
         </tr>
       </table>
     </div>
-    <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa">
+    <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
       <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
       <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;">
 
@@ -365,6 +365,7 @@
         allMoney:0,
         TypeName:'',
         addChuNa:false,
+        allLoading: false,
         payMsgList:[],
         payMsg: {
           ID:0,
@@ -505,6 +506,7 @@
         this.addMsg.FrIDs = str.substring(0,str.length-1);
         this.addMsg.BankList = this.payMsgList;
         this.addMsg.Money = this.listAllMoney;
+        this.allLoading = true
         this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{
           if(r.data.resultCode === 1) {
             console.log(r)
@@ -513,6 +515,7 @@
           }else{
             this.$message.error(r.data.message)
           }
+          this.allLoading = false
         },null)
       },
       initAddChuNa(){

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -153,7 +153,7 @@
                 </tr>
             </table>
         </div>
-      <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa">
+      <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
         <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
         <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;">
           <template v-if="BillType == 1">
@@ -334,6 +334,7 @@ export default {
             InMoney:0,
           BillType:1, //1 收 2 支  ,
           addChuNa:false,
+          allLoading:false,
           payMsgList:[],
           payMsg: {
             ID:0,
@@ -686,6 +687,7 @@ export default {
       this.addMsg.FrIDs = str.substring(0,str.length-1);
       this.addMsg.BankList = this.payMsgList;
       this.addMsg.Money = this.listAllMoney;
+      this.allLoading = true
       this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{
         if(r.data.resultCode === 1) {
           console.log(r)
@@ -694,6 +696,7 @@ export default {
         }else{
           this.$message.error(r.data.message)
         }
+        this.allLoading = false
       },null)
     },
     addCheckbox(obj,index){

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -177,7 +177,7 @@
                 </tr>
             </table>
         </div>
-        <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa">
+        <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
           <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
           <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;    width: 100%;">
             <!--<template v-if="BillType===1">-->
@@ -365,6 +365,7 @@ export default {
             TypeName:'',
           BillType:1, //1 收 2 支  ,
           addChuNa:false,
+          allLoading: false,
           payMsgList:[],
           payMsg: {
             ID:0,
@@ -703,6 +704,7 @@ export default {
       this.addMsg.FrIDs = str.substring(0,str.length-1);
       this.addMsg.BankList = this.payMsgList;
       this.addMsg.Money = this.listAllMoney;
+      this.allLoading = true
       this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{
         if(r.data.resultCode === 1) {
           console.log(r)
@@ -711,6 +713,7 @@ export default {
         }else{
           this.$message.error(r.data.message)
         }
+        this.allLoading = false
       },null)
     },
     addCheckbox(obj,index){

src/components/confirmationOrderDownLoad.vue

@@ -8,6 +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+'日游')" /> -->
     <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
     <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
     <div id="pdfNode">
@@ -566,6 +567,8 @@
   import threeday from './commonPage/threeday'
   import fourday from './commonPage/fourday'
   import fiveday from './commonPage/fiveday'
+  import saveAs from 'file-saver'
+  import '../utils/jqueryWordexport.js'
   import {
     setTimeout
   } from 'timers';
@@ -783,6 +786,9 @@
           });
         }
       },
+      toWord: function (title) {
+        $('#pdfNode').wordExport(title)
+      },
       // 生成pdf
       toPDF: function (title) {
         this.pdfLoading = true