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

src/App.vue

@@ -243,4 +243,18 @@
       Noto Color Emoji, MicrosoftJhengHeiBoldFix, "\5FAE\8EDF\6B63\9ED1\9AD4",
       Microsoft JhengHei;
   }
+  .groupTourOrderByTuan_ico {
+    margin: 0 10px 0 0;
+  }
+  .groupTourOrderByTuan_ico i {
+    display: inline-block;
+    margin: 0 2px 0 0;
+    width: 8px;
+    height: 8px;
+    border-radius: 2px;
+    vertical-align: middle;
+  }
+  .groupTourOrderByTuan_ico>span {
+    vertical-align: middle;
+  }
 </style>
\ No newline at end of file

src/components/FinancialModule/BasicDocuments.vue

@@ -1730,6 +1730,23 @@ export default {
                         tab: "台湾销售提成详情" 
                     }
                 });
+            }else if(GetDetail.OtherType==70){//跳转台湾提成的三级详情
+                let urlName
+                if(GetDetail.ReFinanceId2==1){
+                    urlName = 'domesticCommissiondetailsTW'
+                }
+                if(GetDetail.ReFinanceId2==2){
+                    urlName = 'domesticCommissionUserTW'
+                }
+                this.$router.push({
+                    name: urlName,
+                    query: { 
+                        PeriodId:GetDetail.ReFinanceId,
+                        OutBranchId: GetDetail.RB_Branch_Id, 
+                        blank: "y", 
+                        tab: "台湾销售提成详情" 
+                    }
+                });
             }else{
                 this.$router.push({
                     name: 'CommissionDetail',

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -103,7 +103,7 @@
         tradeWay:'',
         platformAccount:'',
         Handmsg:{},
-        czmsg:{},
+        czmsg:null,
         crmOrderObj: null,
         commissionObj: null,
         tradeObj: null,

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1192,6 +1192,23 @@ export default {
                         tab: "台湾销售提成详情" 
                     }
                 });
+            }else if(GetDetail.OtherType==70){//跳转台湾提成的三级详情
+                let urlName
+                if(GetDetail.ReFinanceId2==1){
+                    urlName = 'domesticCommissiondetailsTW'
+                }
+                if(GetDetail.ReFinanceId2==2){
+                    urlName = 'domesticCommissionUserTW'
+                }
+                this.$router.push({
+                    name: urlName,
+                    query: { 
+                        PeriodId:GetDetail.ReFinanceId,
+                        OutBranchId: GetDetail.RB_Branch_Id, 
+                        blank: "y", 
+                        tab: "台湾销售提成详情" 
+                    }
+                });
             }else{
                 this.$router.push({
                     name: 'CommissionDetail',

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -806,7 +806,7 @@
         tradeWay: '',
         platformAccount: '',
         Handmsg: {},
-        crmOrderObj:{},
+        crmOrderObj:null,
         tradeObj:{},
         StandardCurrencyId: 0,
         StandardCurrencyName: '',

src/components/FinancialModule/domesticCommissionUserTW2.vue

@@ -69,7 +69,7 @@
           </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
             <tr>
-                <th>公司</th>
+                <th>出团公司</th>
                 <th>部门</th>
                 <th>销售</th>
                 <!-- <th>团的数量</th> -->
@@ -80,7 +80,7 @@
                 <th>年终奖金</th>
                 <th>当月业绩</th>
                 <th>提成比例</th>
-                <!-- <th>期数</th> -->
+                <th>币种</th>
 
                 <th>操作</th>
             </tr>
@@ -95,7 +95,7 @@
                 <td>{{item.YearBonus?item.YearBonus:'-'}}</td>
                 <td>{{item.OrderProfit?item.OrderProfit:'-'}}</td>
                 <td>{{item.CommissionRate?item.CommissionRate+'%':'-'}}</td>
-                <!-- <td>{{item.Periods}}</td> -->
+                <td>{{item.CurrencyName}}</td>
 
                 <td>
 
@@ -108,7 +108,7 @@
                 </td>
             </tr>
             <tr v-if="dataList.length==0">
-                <td style="text-align:center" colspan="9">暂无数据</td>
+                <td style="text-align:center" colspan="10">暂无数据</td>
             </tr>
         </table>
         <!-- 分页 -->
@@ -157,6 +157,15 @@
             if (this.$route.query && this.$route.query.PeriodId) {
                 this.msg.PeriodId = this.$route.query.PeriodId
             }
+            if (this.$route.query && this.$route.query.OutBranchId) {
+                this.msg.OutBranchId = this.$route.query.OutBranchId
+            }
+            if (this.$route.query && this.$route.query.RB_Branch_Id) {
+                this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id
+            }
+            if (this.$route.query && this.$route.query.RB_Department_Id) {
+                this.msg.RB_Department_Id = this.$route.query.RB_Department_Id
+            }
             this.getList();
             // this.getqishilist()
             this.getCompanyList()//获取公司

src/components/FinancialModule/domesticCommissiondetailsTW2.vue

@@ -107,19 +107,23 @@
       style="margin-top: 10px;">
       <tr>
 
-        <th>用户</th>
-        <th>出团公司</th>
         
-        <th>团信息</th>
+        <th>出团公司</th>
+        <th>姓名</th>
+        <th>类型</th>
+        <th>订单类型</th>
+        <th>订单号(团号)</th>
         <th>线路</th>
-        <th>订单号</th>
-        <th>人数</th>
-        <th>提成</th>
-        <th>原币利润</th>
-        <th>参与业绩利润</th>
-        <th>利润扣除比例</th>
-        <th>提成比例</th>
+        <th>订单利润</th>
         <th>币种</th>
+        <th>台币利润</th>
+        <th>业绩核算比例</th>
+        <th>业绩利润</th>
+        <th>提成金额</th>
+        
+        
+        <th>提成比例</th>
+        
         <th>期数</th>
         <th width='400'>备注</th>
 
@@ -127,29 +131,28 @@
       </tr>
       <tr v-for="item in dataList">
         
-        <td>{{item.UserName}}</td>
-        <td>{{item.OutBranchName}}</td>
-        <td>
-          <div>{{item.OutBranchName}}</div>
-          <span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
-            {{item.TCNUM}}({{item.TCID}})
-          </span>
         
-        </td>
+        <td>{{item.OutBranchName}}</td>
+        <td>{{item.UserName}}</td>
+        <td>销售</td>
+        <td>{{item.OrderType==1?'团队':item.OrderType==2?'酒店':item.OrderType==3?'门票':item.OrderType==4?'车辆':''}}</td>
+        <td>{{item.OrderId?item.OrderId:'-'}} {{item.OrderType==1?'('+item.TCNUM+')':''}}</td>
         <td>{{item.LineName}}</td>
-        <td>{{item.OrderId?item.OrderId:'-'}} {{item.OrderType==1?item.TCNUM:''}}</td>
-        <td>{{item.GuestCount}}</td>
-        <td>{{item.CommissionMoney}}</td>
         <td>{{item.OriginalProfit?item.OriginalProfit:'-'}}</td>
+        <td>{{item.CurrencyName}}</td>
         <td>{{item.StandardProfit?item.StandardProfit:'-'}}</td>
-        <td>{{item.ProfitRate?item.ProfitRate+'%':'-'}}</td>
+        <td>{{item.ProfitRate?item.ProfitRate:'-'}}</td>
+        <td>{{item.ProfitRate2}}</td>
+        <td>{{item.CommissionMoney}}</td>
+        
+        
         <td>{{item.CommissionRate?item.CommissionRate+'%':'-'}}</td>
-        <td>{{item.CurrencyName}}</td>
+        
         <td>{{item.Periods}}</td>
         <td>{{item.Description}}</td>
       </tr>
       <tr v-if="dataList.length==0">
-        <td style="text-align:center" colspan="14">暂无数据</td>
+        <td style="text-align:center" colspan="15">暂无数据</td>
       </tr>
     </table>
     <!-- 分页 -->
@@ -280,7 +283,7 @@
       },
       getqishilist() {
         this.apipost(
-          "sellcommission_GetTWCommissionPeriodsList", {},
+          "sellcommission_GetTWSellCommissionPeriodsList", {},
           res => {
             if (res.data.resultCode == 1) {
               this.PeriodsList = res.data.data;
@@ -326,6 +329,10 @@
             if (res.data.resultCode == 1) {
               this.TotalMoney = res.data.data.TotalMoney ? res.data.data.TotalMoney : 0
               this.TotalProfit = res.data.data.TotalProfit ? res.data.data.TotalProfit : 0
+              res.data.data.pmodel.pageData.forEach(item => {
+                item.ProfitRate = item.ProfitRate/100
+                item.ProfitRate2 = (item.StandardProfit*item.ProfitRate).toFixed(2)
+              });
               this.dataList = res.data.data.pmodel.pageData;
               this.total = res.data.data.pmodel.count;
             } else {

src/components/SalesVisa/salesOrderToday.vue

@@ -350,13 +350,15 @@
       <tr>
         <th width="7%">单号/团号</th>
         <th width="7%">签证类型</th>
-        <th width="10%">业务员</th>
+        <th width="5%">公司</th>
+        <th width="7%">签证产品</th>
+        <th width="5%">业务员</th>
         <th width="5%">人数</th>
         <th width="10%">出发日期</th>
         <th width="9%">报名日期</th>
-        <th width="15%">备注</th>
+        <th width="10%">备注</th>
         <th width="8%">应收金额</th>
-        <th width="7%">订单状态</th>
+        <th width="5%">订单状态</th>
         <th width="10%">操作</th>
       </tr>
       <tr v-for='(item,index) in dataList' :key="index">
@@ -367,6 +369,8 @@
         <td>
           <span class="fz14">{{item.VisaType===1?'个体签证':'团队签证'}}</span>
         </td>
+        <td>{{item.BranchName}}</td>
+        <td>{{item.VisaName}}</td>
         <td>
           <img v-if='!item.CreatePhoto' src="../../assets/img/litheader.png" />
           <img v-if='item.CreatePhoto' :onerror="defaultImg" :src='item.CreatePhoto' />

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -404,7 +404,9 @@
               this.noData = !this.total > 0;
               var tempData = res.data.data.pageData;
               tempData.forEach(x => {
+                if (x.AuditDate && x.AuditDate != '') {
                   x.hours = this.$commonUtils.formatMsgTime(x.AuditDate);
+                }
               });
               this.dataList = tempData;
             }

src/components/TravelManager/TravelList/DistributionTransport.vue

@@ -79,9 +79,13 @@
             <td width="120">选择团期</td>
             <td align="left">
               <ul>
-                <li v-for="item in PriceDataList" class="Distri_TeamDayList"><span @click="clickedDay(item)"
-                    class="_Checked"
-                    :class="{NoChecked:item.checkState===ShowStatusList.NoChecked,YesChecked:item.checkState===ShowStatusList.Checked}">{{item.StartDate}}</span>
+                <li v-for="(item,index) in PriceDataList" class="Distri_TeamDayList" :key="index+100">
+                  <el-tooltip class="item" effect="dark" content="点击选中团期" placement="top">
+                    <span @click="clickedDay(item)" class="_Checked"
+                      :class="{NoChecked:item.checkState===ShowStatusList.NoChecked,YesChecked:item.checkState===ShowStatusList.Checked}">
+                      {{item.StartDate}}
+                    </span>
+                  </el-tooltip>
                 </li>
               </ul>
             </td>
@@ -204,8 +208,8 @@
                       <th>订单号</th>
                       <th>销售</th>
                     </tr>
-                    <tbody v-for="item in  OrderDataList.OtherOrderList">
-                      <tr v-for="subItem in item.List">
+                    <tbody v-for="(item,index) in  OrderDataList.OtherOrderList" :key="index">
+                      <tr v-for="(subItem,subIndex) in item.List" :key="subIndex+10000">
                         <td>
                           <label>
                             <input :value="subItem.OrderId" style="vertical-align: middle;" v-model="ArrList"

src/components/TravelManager/TravelList/TravelControlList.vue

 <style>
   @import "../../../assets/css/newTravelManager.css";
+
   .flex {
     display: flex;
   }
+
   .TC_companyList span,
   .TC_OtherCompany span {
     display: inline-block;
@@ -484,8 +486,6 @@
                     style="font-size: 11px;font-weight:bold;color:red">
                     <span v-if="item.CustomerName">客户名称：{{item.CustomerName}}
                     </span>
-                    <span v-if="item.OfferPayTypeStr">({{item.OfferPayTypeStr}})
-                    </span>
                   </div>
                 </div>
               </div>
@@ -585,11 +585,10 @@
                     <span>{{$t('Airticket.Air_StartTime')}}</span>
                     <span class="go_date">{{item.StartDate}}</span>
                   </p>
-                  <p class="travelnowrap flex" v-if="item.PriceOfferUrl">
+                  <p class="travelnowrap flex" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
                     <span>报价单</span>
                     <span class="go_date">
                       <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
-                        
                         <a :key="subIndex" style="margin-left:20px;color:blue;cursor:pointer;" :href="subItem.Url"
                           v-if="subItem.Url" target="_blank" :download="subItem.Name">{{subItem.Name}}</a>
                         <template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
@@ -598,6 +597,31 @@
                       </template>
                     </span>
                   </p>
+                  <p class="travelnowrap flex" v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
+                    <span>报价单</span>
+                    <span class="go_date">
+                      <a style="margin-left:20px;color:blue;cursor:pointer;" :href="item.PriceOfferUrl"
+                        v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
+                    </span>
+                  </p>
+                  <p class="travelnowrap flex" v-if="item.OfferShouPeiFee>0">
+                    <span>手配费</span>
+                    <span class="go_date">
+                      {{item.OfferShouPeiFee}} ({{item.OfferPayTypeStr}})
+                    </span>
+                  </p>
+                  <p class="travelnowrap flex" v-if="item.OfferJPYSalePrice>0">
+                    <span>售价</span>
+                    <span class="go_date">
+                      {{item.OfferJPYSalePrice}} ({{item.SaleOfferPayTypeStr}})
+                    </span>
+                  </p>
+                  <p class="travelnowrap flex" v-if="item.OfferRebatePrice>0">
+                    <span>回佣</span>
+                    <span class="go_date">
+                      {{item.OfferRebatePrice}}
+                    </span>
+                  </p>
                   <p class="travelnowrap">
                     <span>{{$t('Operation.Op_teamNotice')}}</span>
                     {{item.OutNotice==1?'OK':'暂定'}}

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -856,7 +856,7 @@
           <tr>
             <td colspan="14" class="CP_ComTitle2">领队分摊部分
               <span style="color:red;padding-left:5px;">
-                领队导游分摊，请直接输入人民币
+                领队导游分摊，请直接输入日元
               </span>
             </td>
           </tr>
@@ -926,7 +926,7 @@
           <tr>
             <td colspan="14" class="CP_ComTitle2">成本回扣
               <span style="color:red;padding-left:5px;">
-                成本回扣，请直接输入人民币
+                成本回扣，请直接输入日元
               </span>
             </td>
           </tr>
@@ -961,8 +961,10 @@
             <td class="CP_ComTitle2">成本价(人民币)</td>
             <td class="CP_ComTitle2">成本价(日元)</td>
             <td class="CP_ComTitle2" colspan="2">销售价格(人民币)</td>
-            <td class="CP_ComTitle2" colspan="2">销售价格(日元)</td>
-            <td class="CP_ComTitle2" colspan="2">手配费</td>
+            <td class="CP_ComTitle2">销售价格(日元)</td>
+            <td class="CP_ComTitle2">销售付款方式</td>
+            <td class="CP_ComTitle2">手配费</td>
+            <td class="CP_ComTitle2">手配费付款方式</td>
             <td colspan="5" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
@@ -973,14 +975,30 @@
               <el-input type='text' class="w70" v-model="item.SalePrice"
                 @keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input>
             </td>
-            <td colspan="2">
+            <td>
               <el-input type='text' class="w70" v-model="item.JPYSalePrice"
                 @keyup.native="checkPrice(item,'JPYSalePrice',true)" maxlength="8"></el-input>
             </td>
-            <td colspan="2">
+            <td>
+              <el-select style="width:100%" v-model="postConfig.SaleOfferPayType" :placeholder="$t('pub.pleaseSel')"
+                filterable>
+                <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                <el-option v-for="item in payTypeList" :label='item.label' :value='item.value' :key='item.value'>
+                </el-option>
+              </el-select>
+            </td>
+            <td>
               <el-input type='text' class="w70" v-model="item.ShouPeiFee"
                 @keyup.native="checkPrice(item,'ShouPeiFee',true)" maxlength="8"></el-input>
             </td>
+            <td>
+              <el-select style="width:100%" v-model="postConfig.OfferPayType" :placeholder="$t('pub.pleaseSel')"
+                filterable>
+                <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                <el-option v-for="item in payTypeList" :label='item.label' :value='item.value' :key='item.value'>
+                </el-option>
+              </el-select>
+            </td>
             <td colspan="5">
               <el-input type="textarea" v-model="item.CostRemark"></el-input>
             </td>
@@ -1058,18 +1076,9 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">备注</td>
-            <td colspan="7">
+            <td colspan="13">
               <el-input type="textarea" v-model="OtherPrice.OtherRemark"></el-input>
             </td>
-            <td class="CP_ComTitle2">付款方式</td>
-            <td colspan="5">
-              <el-select style="width:100%" v-model="postConfig.OfferPayType" :placeholder="$t('pub.pleaseSel')"
-                filterable>
-                <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
-                <el-option v-for="item in payTypeList" :label='item.label' :value='item.value' :key='item.value'>
-                </el-option>
-              </el-select>
-            </td>
           </tr>
           <tr>
             <td class="CP_ComTitle2">附件</td>
@@ -1080,8 +1089,11 @@
               </el-upload>
               <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
                 <template v-for="(subItem,subIndex) in teamPrice.ContractArray">
-                  <a style="margin-left:20px;color:blue;cursor:pointer;" :key="subIndex"
+                  <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
                     @click="downloadFile(subItem.Url,subItem.Name)">{{subItem.Name}}</a>
+
+                  <a :key="subIndex+1000" style="margin-left:20px;color:blue;cursor:pointer;"
+                    @click="DeleteFile(subIndex)">删除</a>
                 </template>
               </template>
             </td>
@@ -1126,6 +1138,10 @@
       }
     },
     methods: {
+      //删除文件
+      DeleteFile(subIndex) {
+        this.teamPrice.ContractArray.splice(subIndex, 1);
+      },
       //下载文件
       downloadFile(fileUrl, fileName) {
         const link = document.createElement('a');

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -691,8 +691,10 @@
             <td class="CP_ComTitle2">成本价(人民币)</td>
             <td class="CP_ComTitle2">成本价(日元)</td>
             <td class="CP_ComTitle2" colspan="2">销售价格(人民币)</td>
-            <td class="CP_ComTitle2" colspan="2">销售价格(日元)</td>
-            <td class="CP_ComTitle2" colspan="2">手配费</td>
+            <td class="CP_ComTitle2">销售价格(日元)</td>
+            <td class="CP_ComTitle2">销售付款方式</td>
+            <td class="CP_ComTitle2">手配费</td>
+            <td class="CP_ComTitle2">手配费付款方式</td>
             <td colspan="5" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
@@ -702,12 +704,34 @@
             <td colspan="2">
               {{item.SalePrice}}
             </td>
-            <td colspan="2">
+            <td>
               {{item.JPYSalePrice}}
             </td>
-            <td colspan="2">
+            <td>
+              <template v-if="postConfig.SaleOfferPayType==1">
+                现金
+              </template>
+              <template v-if="postConfig.SaleOfferPayType==2">
+                汇款
+              </template>
+              <template v-if="postConfig.SaleOfferPayType==3">
+                外站自理
+              </template>
+            </td>
+            <td>
               {{item.ShouPeiFee}}
             </td>
+            <td>
+              <template v-if="postConfig.OfferPayType==1">
+                现金
+              </template>
+              <template v-if="postConfig.OfferPayType==2">
+                汇款
+              </template>
+              <template v-if="postConfig.OfferPayType==3">
+                外站自理
+              </template>
+            </td>
             <td colspan="5">
               {{item.CostRemark}}
             </td>
@@ -786,21 +810,9 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">审核备注</td>
-            <td colspan="7">
+            <td colspan="13">
               <el-input type="textarea" v-model="postConfig.AuditContent"></el-input>
             </td>
-            <td class="CP_ComTitle2">付款方式</td>
-            <td colspan="5">
-              <template v-if="postConfig.OfferPayType==1">
-                现金
-              </template>
-              <template v-if="postConfig.OfferPayType==2">
-                汇款
-              </template>
-              <template v-if="postConfig.OfferPayType==3">
-                外站自理
-              </template>
-            </td>
           </tr>
           <tr v-if="IsEdit==2">
             <td colspan="14" style="text-align:center;">

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -62,6 +62,7 @@
           OutBranchName: "", //出团公司名称
           OutDateTime: "", //出发时间
           OfferPayType: 0, //报价单付款方式()
+          SaleOfferPayType:0,//售价付款方式
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -228,6 +229,7 @@
               this.postData.OutDateTime = tempData.OutDateTime;
               this.postData.OutBranchName = tempData.OutBranchName;
               this.postData.OfferPayType = tempData.OfferPayType;
+              this.postData.SaleOfferPayType=tempData.SaleOfferPayType;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -56,7 +56,8 @@
           TravelState: 1, //团控状态(1-草稿，2-待审核,3-审核通过,4-审核拒绝,5已撤销)
           OutBranchId: -1, //出团公司
           OutDateTime: "", //出发时间
-          OfferPayType: 0, //报价单付款方式()
+          OfferPayType: 0, //报价单付款方式
+          SaleOfferPayType:0,//售价付款方式
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -238,6 +239,7 @@
               this.postData.OutBranchId = tempData.OutBranchId;
               this.postData.OutDateTime = tempData.OutDateTime;
               this.postData.OfferPayType = tempData.OfferPayType;
+              this.postData.SaleOfferPayType=tempData.SaleOfferPayType;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {

src/components/leaderPay2.vue

@@ -1554,11 +1554,17 @@
           TCIDList: TCArr
         }
         that.Handmsg.ReFinanceId=this.checkList[0].FrID;
-        that.Handmsg.Rate=this.checkList[0].Rate;
+        // that.Handmsg.Rate=this.checkList[0].Rate;
         var msg=JSON.stringify(that.Handmsg);
         let routeData = this.$router.resolve({
           name: 'ChoiceAddFinancialDocuments',
-          query: {czmsg:msg,'orderObj': JSON.stringify(orderObj),companyID: this.OutBranchId,Type: 2,searchTitle:'分摊'}
+          query: {
+            czmsg: msg,
+            'orderObj': JSON.stringify(orderObj),
+            companyID: this.OutBranchId,
+            Type: 2,
+            searchTitle:'分摊'
+          }
         })
         window.open(routeData.href, '_blank')
       },