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

src/components/FinancialModule/BasicDocuments.vue

@@ -1699,14 +1699,14 @@ class="w135 _border_b_1">
                     <el-input type="text" v-model="AuditOrRefundMsg.PayReceiptNo" style="width: 364px;" clearable></el-input>
                   </div>
                 </div>
-                
+
               </div>
 
               <div style="display: flex;align-items: center;margin-top:15px;"  v-if="is_financeShow && GetDetail.Type==2 && item.AuditDescription.indexOf('会计')!=-1">
                 <div style="display: flex;align-items: center;flex-grow: 1;">
                   <span style="font-size: 14px;">{{$t('objFill.xiugaidianfudx')}}：</span>
                   <div style="display: flex;flex-grow: 1;">
-                    <el-select 
+                    <el-select
     v-model="AuditOrRefundMsg.KingdeeClientID"  class="w135 _border_b_1"
     filterable
     remote
@@ -2654,6 +2654,7 @@ else if (Type==2) {
               event_id: 'CarDealerOrder',
               data: {
                 OrderId: this.GetDetail.ReFinanceId,
+                type: 1
               }}, `${href}`)
             }else{
               this.$router.push({
@@ -2671,7 +2672,8 @@ else if (Type==2) {
               window.parent.postMessage({
                 event_id: 'CarDealerOrder',
                 data: {
-                  MainId: this.GetDetail.ReFinanceId,
+                  OrderId: this.GetDetail.ReFinanceId,
+                  type: 2
                 }
               }, `${href}`)
             } else {
@@ -3445,7 +3447,7 @@ else if (Type==2) {
               this.payMsgList[index].balance = x.Initialbalance;
               this.Calculation(1, index);
             } else {
-             
+
               this.payMsg.Account = x.allName;
               this.payMsg.CurrenName = x.CurrencyName;
               if(this.GetDetail.DetailList[0].CurrencyId==x.CurrencyId){
@@ -3454,7 +3456,7 @@ else if (Type==2) {
               else{
                 this.payMsg.Rate = x.PayRate;
               }
-              
+
               this.payMsg.CurrencyId = x.CurrencyId;
               this.payMsg.balance = x.Initialbalance;
               this.Calculation();
@@ -4280,7 +4282,7 @@ else if (Type==2) {
             path: "/dmcTotalTable",
             query
           });
-        
+
       },
       goGuideAccount(path, ClientID) {
         if (ClientID == 0) {

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1908,7 +1908,7 @@
               window.parent.postMessage({
                 event_id: 'CarDealerOrder',
                 data: {
-                  MainId: this.GetDetail.ReFinanceId,
+                  OrderId: this.GetDetail.ReFinanceId,
                   type:1
                 }
               }, `${href}`)

src/components/confirmationOrderDownLoadNew.vue

@@ -149,7 +149,7 @@
           </template>
         </template>
         <!-- 可以让销售修改基本信息-->
-        <el-button v-if="orderId>0" type="primary" size="medium" value="修改信息" @click="editMsgShow=true">
+        <el-button v-if="orderId>0" type="primary" value="修改信息" @click="editMsgShow=true" style="margin-left:20px;">
           修改信息</el-button>
       </el-col>
       <el-col v-if="orderId<=0">
@@ -532,7 +532,13 @@
               method: 'get',
               url: ocrUrl,
               data: {},
-              responseType: 'arraybuffer'
+              responseType: 'arraybuffer',
+              onDownloadProgress: (progressEvent) => {
+                const progress = Math.round((progressEvent.loaded / progressEvent.total) * 100);
+                that.loadingText = `正在下载` + (that.orderId > 0 ? "出团通知书" : "行程") + `文件` + progress +
+                  `%,请勿关闭或刷新页面...`;
+                // 在这里处理下载进度, 如更新界面上的进度条
+              }
             }).then(res => {
               that.pdfLoading = false;
               let blob = new Blob([res.data], {