修改

src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue

@@ -138,14 +138,16 @@
         <!--<th rowspan="2">数量</th>-->
         <!--<th rowspan="2">单 价</th>-->
         <th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
-        <th colspan="3">{{$t('fnc.jine')}}</th>
+        <th colspan="5">{{$t('fnc.jine')}}</th>
         <th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
         <th rowspan="2">{{$t('fnc.zhidanren')}}</th>
       </tr>
       <tr>
         <th width="88">{{$t('fnc.yuanbi')}}</th>
         <th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
-        <th width="88">{{$t('fnc.bweibi')}}</th>
+        <th width="68">{{$t('fnc.bweibi')}}</th>
+        <th width="68">到账</th>
+        <th width="48">手续费</th>
       </tr>
       <template v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length">
         <tr v-for="(item) in GetDetail.MergeDetailList" class="_color_b">
@@ -163,6 +165,8 @@
           <td height="34px">{{item.OriginalMoney}}</td>
           <td height="34px">{{item.Rate}}</td>
           <td height="34px">{{item.Money}}</td>
+          <td height="34px">{{item.PayMoney}}</td>
+          <td height="34px">{{item.Fee}}</td>
           <td height="34px" style="max-width: 120px;">{{item.Remark}}</td>
           <td height="34px">{{item.EmName}}</td>
         </tr>
@@ -212,7 +216,7 @@
       <!--v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0"-->
       <tr v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0">
         <td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
-        <td height="34px" colspan="9" class="_color_b">
+        <td height="34px" colspan="11" class="_color_b">
           <template v-for="(item,index) in GetDetail.MergeBankList">
             <p  class="_fex_cen clearfix"><span class="_bold">{{item.Alias}}-</span><span class="_bank_name">{{item.TypeName}}-</span><span class="_bank_type" :class="item.AccountType=='对私'?'':'_bank_type2'">{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span></p>
           </template>
@@ -220,23 +224,23 @@
       </tr>
       <tr v-if="GetDetail.Merge">
         <td  height="34px" class="">{{$t('fnc.wbzjine')}}<span class="_font_size12"></span></td>
-        <td  height="34px" colspan="3" class="_color_b">{{GetDetail.Merge.WBMoney==''?$t('fnc.ling'):GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
+        <td  height="34px" colspan="4" class="_color_b">{{GetDetail.Merge.WBMoney==''?$t('fnc.ling'):GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
         <td  height="34px" class="">{{$t('fnc.bwbzjine')}}<span class="_font_size12"></span></td>
-        <td  height="34px" colspan="5" class="_color_b">{{GetDetail.Merge.Money==''?$t('fnc.ling'):GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
+        <td  height="34px" colspan="6" class="_color_b">{{GetDetail.Merge.Money==''?$t('fnc.ling'):GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
       </tr>
       <tr class="_huik_info" v-if="GetDetail.Type==1&&GetDetail.Merge">
         <td height="34px" class="">{{$t('fnc.huikuanren')}}</td>
-        <td height="34px" colspan="3">
+        <td height="34px" colspan="4">
           <span class="_color_b _font_size12">{{GetDetail.Merge.RemitterNameV2}}</span>
         </td>
         <td height="34px" class="">{{$t('fnc.hkshijian')}}</td>
-        <td height="34px" colspan="5">
+        <td height="34px" colspan="6">
           <span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
         </td>
       </tr>
       <tr class="_huik_info" v-else-if="GetDetail.Type!=1&&GetDetail.Merge">
         <td height="34px" class="">{{$t('fnc.jiaoyiriqi')}}</td>
-        <td height="34px" colspan="9">
+        <td height="34px" colspan="11">
           <span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
         </td>
       </tr>

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -22,6 +22,9 @@
   top: 55px;
   right: 0;
 }
+.column-cell-class-name-test-lan-s .v-table-body-cell{
+  background-color: #9cf;
+}
 /* .My_table_tell .v-table-body-cell{
   display: block!important;
   line-height: 30px!important;
@@ -981,6 +984,66 @@ export default {
       if(rowData.ZongJi < 0 && columnName=="ZongJi"){
         return "column-cell-class-name-test-red"
       }
+      
+      if(rowData.ZhaiYao=='以下项均不计入计算'){
+          if(rowData.YiYue==0){
+             rowData.YiYue='';
+          }
+          if(rowData.ErYue==0){
+             rowData.ErYue='';
+          }
+          if(rowData.SanYue==0){
+             rowData.SanYue='';
+          }
+          if(rowData.DiYiJiDu==0){
+             rowData.DiYiJiDu='';
+          }
+          if(rowData.SiYue==0){
+             rowData.SiYue='';
+          }
+          if(rowData.WuYue==0){
+             rowData.WuYue='';
+          }
+          if(rowData.LiuYue==0){
+             rowData.LiuYue='';
+          }
+          if(rowData.DiErJiDu==0){
+             rowData.DiErJiDu='';
+          }
+          if(rowData.ShangBanNianBao==0){
+             rowData.ShangBanNianBao='';
+          }
+          if(rowData.QiYue==0){
+             rowData.QiYue='';
+          }
+          if(rowData.BaYue==0){
+             rowData.BaYue='';
+          }
+          if(rowData.JiuYue==0){
+             rowData.JiuYue='';
+          }
+          if(rowData.DiSanJiDu==0){
+             rowData.DiSanJiDu='';
+          }
+          if(rowData.ShiYue==0){
+             rowData.ShiYue='';
+          }
+          if(rowData.ShiYiYue==0){
+             rowData.ShiYiYue='';
+          }
+          if(rowData.ShiErYue==0){
+             rowData.ShiErYue='';
+          }
+          if(rowData.DiSiJiDu==0){
+             rowData.DiSiJiDu='';
+          }
+          if(rowData.XiaBanNianBao==0){
+             rowData.XiaBanNianBao='';
+          }
+          if(rowData.ZongJi==0){
+             rowData.ZongJi='';
+          }
+      }
 
       // 设置列class
       if (columnName === "ZongJi") {
@@ -1006,7 +1069,10 @@ export default {
       }
       if (rowData.ZhaiYao === '所得税费用') {
         return "column-cell-class-name-test-greed-s";
-      }      
+      }    
+      if(rowData.ZhaiYao=='以下项均不计入计算'){
+        return "column-cell-class-name-test-lan-s"  
+      }  
     },
     exportExcel: function () {
       let msg = {

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -501,7 +501,7 @@ tr._item_list td:last-child {
           </el-col>
           <el-col :span="4">
             <el-form-item label="数据类别：">
-              <el-select v-model="msg.DataType" filterable class="w150">
+              <el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150">
                 <el-option value="-1" label="不限"></el-option>
                 <el-option value="1" label="团队营收"></el-option>
                 <el-option value="3" label="单办签证"></el-option>
@@ -1397,6 +1397,7 @@ export default {
       pageIndex: 1,
       AALloading: false,
       BranchStatus:true,
+      shujuType:false,
     };
   },
   created() {
@@ -2082,6 +2083,17 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             let BranchStatus=res.data.data.IsBranchButton;
+            if(BranchStatus==-2){
+              BranchStatus = -1;
+              this.shujuType = true;
+              this.apipost("line_post_GetList", {}, res => {
+                if (res.data.resultCode == 1) {
+                  this.LineList = res.data.data;
+                } else {
+                  this.Error(res.data.message);
+                }
+              });
+            }
             if(BranchStatus==-1){
               this.BranchStatus=false;
             }else{

src/components/PrintPage.vue

@@ -6,7 +6,7 @@
         padding-top: 20px;
     }
     ._PrintPage_box{
-        width: 752px;
+        width: 1000px;
         /* margin-left: 160px; */
         margin: 0 auto;
         padding: 0 !important;