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

src/components/FinancialModule/BasicDocuments.vue

@@ -905,6 +905,9 @@
           <div v-if="GetDetail.OtherType==80" class="illustrate-right fygsbumen-box-right"
             @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">
             {{$t('objFill.chdd')+':'+GetDetail.TCNUM}}</div>
+            <div v-if="GetDetail.OtherType==83" class="illustrate-right fygsbumen-box-right"
+              @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">
+              {{'车行包月订单'+':'+GetDetail.ReFinanceId}}</div>
 
           <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
                         @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{$t('objFill.dxxstcxq')}}</div>
@@ -2661,7 +2664,27 @@ else if (Type==2) {
                 }
               });
             }
-          }else {
+          }
+          else if(this.GetDetail.OtherType == 83){
+            if (this.typeSystem == 1) {
+              let href = this.domainManager().CarUrl
+              window.parent.postMessage({
+                event_id: 'CarDealerOrder',
+                data: {
+                  MainId: this.GetDetail.ReFinanceId,
+                }
+              }, `${href}`)
+            } else {
+              this.$router.push({
+                path: path,
+                query: {
+                  MainId: this.GetDetail.ReFinanceId,
+                  blank: 'y'
+                }
+              });
+            }
+          }
+          else {
             this.$router.push({
             path: path,
             query: {

src/components/FinancialModule/DataAnalysis/components/corporation.vue

@@ -71,12 +71,28 @@
         </el-table-column>
         <el-table-column
           prop=""
-          label="最终利润"
+          label="营业利润"
           min-width="120" align="center">
           <template slot-scope="scope">
             {{scope.row.DetailList[i].FinalProfit.toFixed(2)}}
           </template>
         </el-table-column>
+        <el-table-column
+          prop=""
+          label="管销费用"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].GXFY.toFixed(2)}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          label="净利润"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].JLR.toFixed(2)}}
+          </template>
+        </el-table-column>
       </el-table-column>
     </el-table>
   </div>

src/components/FinancialModule/DataAnalysis/index.vue

@@ -13,7 +13,7 @@
               <el-select
                 filterable
                 v-model="msg.OutBranchId"
-                @change="getStatement"
+                @change="getChange"
                 clearable
               >
                 <el-option
@@ -29,6 +29,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item :label="$t('fnc.bweibi')">
+              <el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId" class  @change="getChange">
+                <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option
+                  v-for="item in coinGetList"
+                  :label="item.Name"
+                  :value="item.ID"
+                  :key="item.ID"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label="线路">
               <el-select filterable v-model="msg.LineId" @change="getStatement"
@@ -63,6 +76,26 @@
                 </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="4" v-if="msg.Type==2">
+            <el-form-item label="数据类别：">
+              <el-select v-model="msg.DataType" filterable class="w150" @change="getStatement">
+                <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option value="1" label="团队营收"></el-option>
+                <el-option value="3" label="单办签证"></el-option>
+                <el-option value="15" label="手配费收入"></el-option>
+                <el-option value="16" label="单项机票"></el-option>
+                <el-option value="17" label="单项酒店"></el-option>
+                <el-option value="18" label="单项包车"></el-option>
+                <el-option value="19" label="单项门票"></el-option>
+                <el-option value="20" label="开票收入"></el-option>
+                <el-option value="21" label="日本手配费收入"></el-option>
+                <el-option value="22" label="车行收入"></el-option>
+                <el-option value="23" label="欧洲单团分润收入"></el-option>
+                <el-option value="24" label="欧洲损失分摊"></el-option>
+                <el-option value="25" label="CRM直客部外丟團"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <ul class="clearfix">
@@ -98,8 +131,10 @@ export default {
         startDate: '',
         endDate: '',
         OutBranchId: -1,
+        StandardCurrencyId:0,
         LineId: 0,
-        Type: '1'
+        Type: '1',
+        DataType:'-1'
       },
       dateTime: [],
       CompanyList: [],
@@ -109,6 +144,7 @@ export default {
         Status: "0",
       },
       LineList: [],
+      coinGetList: [],
       pickerOptions: {
         shortcuts: [{
           text: '本月',
@@ -143,10 +179,37 @@ export default {
     this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
     this.msg.startDate = this.dateTime[0]
     this.msg.endDate = this.dateTime[1]
+    this.financeinfo_post_GetList()
     this.getQueryData()
     this.getStatement()
   },
   methods: {
+    getChange(val){
+      if(this.msg.OutBranchId == -1){
+        this.coinGetShow = false
+        this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
+      }else{
+        this.coinGetShow = true
+        this.msg.StandardCurrencyId = -1
+      }
+      this.getStatement();
+    },
+    financeinfo_post_GetList(){ // 获取币种
+      this.apipost('financeinfo_post_GetAllStandardCurrencyList',{}, res => {
+        if(res.data.resultCode == 1) {
+            this.coinGetList = res.data.data;
+            if(this.msg.OutBranchId == -1){
+              this.coinGetShow = false
+              this.msg.StandardCurrencyId = this.coinGetList[0].ID
+              this.msg.StandardCurrencyId=this.$route.query.StandardCurrencyId?Number(this.$route.query.StandardCurrencyId):this.msg.StandardCurrencyId;
+            }else{
+              this.coinGetShow = true
+              this.msg.StandardCurrencyId = -1
+            }
+            this.getPageList();
+        }
+      })
+    },
     getStatement(){
       this.loading = true
       this.apipost(

src/components/FinancialModule/FinancialDocuments.vue

@@ -729,7 +729,7 @@
           <button v-if="HandShow" class="hollowFixedBtn"
             @click="Handwithfee">{{$t('objFill.handdistributionfeeincome')}}</button>
           <button class="hollowFixedBtn" @click="ZhiDanChongDi"> {{$t('objFill.precharge')}}</button>
-          <button v-if="this.userId==2739 || this.userId==3038" class="hollowFixedBtn" @click="openMarkDialog">
+          <button v-if="this.userId==2739 || this.userId==3038 || this.userId==2604" class="hollowFixedBtn" @click="openMarkDialog">
             PIC优先付款记录</button>
           <!-- v-if="F_Advance_Match" -->
           <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -934,6 +934,9 @@
             <div v-if="GetDetail.OtherType==80" class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">
               {{$t('objFill.chdd')+':'+GetDetail.TCNUM}}</div>
+              <div v-if="GetDetail.OtherType==83" class="illustrate-right fygsbumen-box-right"
+              @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">
+              {{'车行包月订单'+':'+GetDetail.ReFinanceId}}</div>
             <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{$t('objFill.dxxstcxq')}}</div>
             <div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right"
@@ -1897,7 +1900,27 @@
                 }
               });
             }
+          } 
+          else if(this.GetDetail.OtherType == 83){
+            if (this.typeSystem == 1) {
+              let href = this.domainManager().CarUrl
+              window.parent.postMessage({
+                event_id: 'CarDealerOrder',
+                data: {
+                  MainId: this.GetDetail.ReFinanceId,
+                }
+              }, `${href}`)
             } else {
+              this.$router.push({
+                path: path,
+                query: {
+                  MainId: this.GetDetail.ReFinanceId,
+                  blank: 'y'
+                }
+              });
+            }
+          }
+          else {
             this.$router.push({
               path: path,
               query: {

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2389,18 +2389,18 @@ export default {
         {
           field: "TicketFee",
           formatter: this.moneyFormat,
-          title: "过路停车费",
-          width: 90,
+          title: "过路停车费收入",
+          width: 100,
           titleAlign: "left",
           columnAlign: "right",
           isResize: true,
           componentName: "TCIDJumpWang"
         },
         {
-          field: "YingFu",
+          field: "JiPiao",
           formatter: this.moneyFormat,
-          title: "应付金额",
-          width: 90,
+          title: "过路停车费支出",
+          width: 100,
           titleAlign: "left",
           columnAlign: "right",
           isResize: true,
@@ -2418,7 +2418,6 @@ export default {
         },
         {
           field: "MaoLiRate",
-          // formatter: this.moneyFormat,
           title: "毛利率",
           width: 90,
           titleAlign: "left",

src/components/LeaveGroupDownload/VisaInformation.vue

@@ -8,7 +8,7 @@
     <div class="expense" v-if="feature.importantTip != '' && vshowG">
       <div class="left">
         <div style="font-size:28px;margin-bottom:20px;">
-          签字须知
+          签证须知
         </div>
       </div>
       <div class="right">

src/components/confirmationOrderDownLoadNew.vue

@@ -111,25 +111,42 @@
       <el-col :span="14" class="row-aic">
         <a id="pdfDownLoad" style="display:none;" target="_blank" href="http://www.baidu.com" download="xx.pdf">页面跳转</a>
         <template v-if="orderId>0">
-          <el-button type="primary" size="medium" @click="toPDF_2023()">
+          <el-button type="primary" @click="toPDF_2023()">
             出团通知书下载</el-button>
-          <el-button type="primary" size="medium" @click="ToWord_2023()">
+          <template v-if="lineId==119||lineId==168">
+            <el-dropdown style="padding-left:20px;">
+              <el-button type="primary">
+                出团通知书<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item @click.native="ToWord_2023()">出团通知书WORD</el-dropdown-item>
+                <el-dropdown-item @click.native="OuZhouPdf2024()">出团通知书(欧洲PDF)</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+          <template v-else>
+            <el-button type="primary" @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>
         <template v-else>
-          <el-button type="primary" size="medium" @click="toPDF_2023(1)">
+          <el-button type="primary" @click="toPDF_2023(1)">
             行程下载</el-button>
-          <el-button v-if="isShowAllDownLoad" type="primary" size="medium" @click="toPDF_2023()"
-            style="margin-left:20px;">
-            行程下载(N)</el-button>
-          <el-button type="primary" size="medium" @click="ToWord_2023()" style="margin-left:20px;">
+          <template v-if="lineId==119||lineId==168">
+            <el-dropdown style="padding-left:20px;">
+              <el-button type="primary">
+                行程下载WORD<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item @click.native="ToWord_2023()">行程下载WORD</el-dropdown-item>
+                <el-dropdown-item @click.native="OuZhouPdf2024()">行程下载(欧洲PDF)</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+          <template v-else>
+            <el-button type="primary" @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>
         </template>
         <!-- 可以让销售修改基本信息-->
         <el-button v-if="orderId>0" type="primary" size="medium" value="修改信息" @click="editMsgShow=true">
@@ -355,14 +372,10 @@
         pdfLoading: false,
         loadingText: "", //加载文字
         download_timer: null,
-        isShowAllDownLoad: false, //是否显示实时下载行程按钮
       }
     },
     mounted() {
       this.orderId = this.$route.query.orderId;
-      if (this.$route.query.isda && this.$route.query.isda == 1) {
-        this.isShowAllDownLoad = true;
-      }
       this.getWxCode();
       this.getTripDetail();
       this.getAirlines();
@@ -672,36 +685,15 @@
           if (res.data.resultCode === 1) {
             this.loadingText = "正在下载pdf文件...";
             let path = res.data.data;
-            var ocrUrl = "";
+            that.downLoadUrl = path;
             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 = "";
+            this.download_timer = setInterval(function () {
+              that.checkFile(msg.configId, fileName)
+            }, 2000);
+
           } else {
             this.Error('WORD获取失败');
           }
-          this.pdfLoading = false
         }).catch(err => {
 
         })
@@ -737,7 +729,7 @@
           this.pdfDownLoad(fileName, msg);
         } else if (command && command == 1) {
           this.pdfLoading = true;
-          objFileKey += "/" + msg.configId + "_" + msg.tcid + "_B2B.pdf";
+          objFileKey += "/" + msg.configId + "_" + msg.tcid + "_B2B.pdf?d=" + Math.random();
           that.downloadChengDuFileRename(objFileKey, fileName, res => {
             this.pdfLoading = false;
             if (res.resultCode == 0) {