Merge branch 'master' into carOrder

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -160,12 +160,12 @@
             </el-select>
           </span>
         </li>
-        <li>
+        <!-- <li>
           <span><em>主{{ $t('OrderList.search.orderId') }}</em>
             <el-input clearable type="Number" v-model="msg.MainId" :placeholder="$t('objFill.orderid')"
             @keyup.native="handleCurrentChange(1)"/>
           </span>
-        </li>
+        </li> -->
         <li>
           <span><em>{{ $t('OrderList.search.orderId') }}</em>
             <el-input clearable type="Number" v-model="msg.OrderId" :placeholder="$t('objFill.orderid')"

src/components/FinancialModule/BasicDocuments.vue

@@ -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 {

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], {