解决冲突

src/components/FinancialModule/DataAnalysis/index.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="msg.Type" @tab-click="handleClick">
       <el-tab-pane label="线路经营情况" name="1"></el-tab-pane>
       <el-tab-pane label="公司经营情况" name="2"></el-tab-pane>
-      <el-tab-pane label="日本小包OR散客" name="3"></el-tab-pane>
+      <el-tab-pane label="日本小包OR常规" name="3"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="110px">

src/components/FinancialModule/OpCommission/OPcommissionPeriods.vue

@@ -85,6 +85,7 @@
                           </span>
                           {{item.FinanceIdList.length == y+1 ?'':'、'}}
                       </span>
+                      <span style="float: right;">已制单金额：{{item.FinanceMoney}}</span>
                   </template>
               </td>
               <td>
@@ -95,6 +96,7 @@
                         </span>
                         {{item.FinanceIdList.length == y+1 ?'':'、'}}
                     </span>
+                    <span style="float: right;">已制单金额：{{item.WageFinanceMoney}}</span>
                 </template>
             </td>
               <td>

src/components/FinancialModule/TradeCommission/TicketCommission.vue

@@ -89,6 +89,7 @@
                             </span>
                             {{item.FinanceIdList.length == y+1 ?'':'、'}}
                         </span>
+                        <span style="float: right;">已制单金额：{{item.FinanceMoney}}</span>
                     </template>
                 </td>
                 <td>
@@ -99,6 +100,7 @@
                           </span>
                           {{item.FinanceIdList.length == y+1 ?'':'、'}}
                       </span>
+                      <span style="float: right;">已制单金额：{{item.WageFinanceMoney}}</span>
                   </template>
               </td>
                 <td>

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -2301,6 +2301,7 @@
           Sort: '2',
           EmployeeId: '',
           OrderID: 0,
+          IsSellOrderForm:1
         }
         this.apipost('Financial_post_GetALLPageList', msg, res => {
           if (res.data.resultCode == 1) {

src/components/confirmationOrderDownLoadNew.vue

@@ -115,6 +115,9 @@
             出团通知书下载</el-button>
           <el-button type="primary" size="medium" @click="ToWord_2023()">
             出团通知书下载WROD</el-button>
+
+          <el-button type="primary" size="medium" @click="OuZhouPdf2024()" v-if="lineId==119||lineId==168" style="display:none;">
+            欧洲出团通知书PDF</el-button>
         </template>
         <template v-else>
           <el-button type="primary" size="medium" @click="toPDF_2023(1)">
@@ -124,6 +127,9 @@
             行程下载(N)</el-button>
           <el-button type="primary" size="medium" @click="ToWord_2023()" style="margin-left:20px;">
             行程下载WORD</el-button>
+          <el-button type="primary" size="medium" @click="OuZhouPdf2024()" style="margin-left:20px; display:none;"
+            v-if="lineId==119||lineId==168">
+            欧洲行程PDF</el-button>
         </template>
         <!-- 可以让销售修改基本信息-->
         <el-button v-if="orderId>0" type="primary" size="medium" value="修改信息" @click="editMsgShow=true">
@@ -628,6 +634,78 @@
 
         })
       },
+      OuZhouPdf2024: function () {
+        var title = "";
+        if (this.priceList && this.priceList.length > 0 && this.priceList[0].priceFlight && this.priceList[0]
+          .priceFlight.length > 0) {
+          if (this.priceList[0].priceFlight[0].alName && this.priceList[0].priceFlight[0].alName != '') {
+            title += this.priceList[0].priceFlight[0].alName;
+          }
+        }
+        title += this.orderMsg.startDate;
+        //欧洲
+        if (this.dataAll.lineId == 168 || this.dataAll.lineId == 119) {
+          if (this.dataAll.title.length > 60) {
+            title += this.dataAll.title.substring(0, 60);
+          } else {
+            title += this.dataAll.title;
+          }
+        } else {
+          title += this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
+        }
+        this.pdfLoading = true;
+        this.loadingText = "正在生成PDF文件...";
+        let msg = this.getPostMsg();
+        let urlObj = this.domainManager();
+        var that = this;
+        var fileName = title + ".pdf";
+        this.$http({
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          method: 'post',
+          url: urlObj.DomainUrl + '/api/file/OuZhouPdf2024',
+          data: {
+            "msg": msg
+          }
+        }).then(res => {
+          if (res.data.resultCode === 1) {
+            this.loadingText = "正在下载pdf文件...";
+            let path = res.data.data;
+            var ocrUrl = "";
+            that.pdfLoading = true;
+            ocrUrl = urlObj.ocrUrl + "/Home/CreateTYPdf?url=" + encodeURIComponent(path);
+            that.$http({
+              headers: {
+                'Content-Type': 'application/json'
+              },
+              method: 'get',
+              url: ocrUrl,
+              data: {},
+              responseType: 'arraybuffer'
+            }).then(res => {
+              that.pdfLoading = false;
+              let blob = new Blob([res.data], {
+                type: "application/pdf"
+              })
+              let fileUrl = URL.createObjectURL(blob);
+              let link = document.getElementById('pdfDownLoad');
+              link.href = fileUrl;
+              link.setAttribute("download", fileName);
+              link.click();
+              that.loadingText = "";
+            }).catch(err => {
+              that.pdfLoading = false
+            })
+            this.loadingText = "";
+          } else {
+            this.Error('WORD获取失败');
+          }
+          this.pdfLoading = false
+        }).catch(err => {
+
+        })
+      },
       // 生成pdf
       toPDF_2023: function (command) {
         var that = this;