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

src/components/FinancialModule/CostSharing.vue

@@ -96,7 +96,7 @@
     </div>
     <div class="_fnDm_content" v-loading='loading'>
       <el-table ref="multipleTable" :data="DataList" tooltip-effect="dark" style="width: 100%"
-      row-key="BaseFinanceId">
+      row-key="Id">
         <el-table-column prop="address" :label="$t('fnc.danhao')" width="70">
           <template slot-scope="scope">
             <span 

src/components/FinancialModule/JumpReport.vue

@@ -324,15 +324,21 @@
                 </li>
             </ul>
             <div style="width:100%;display:flex;">
-            <div style="width:25%;display:inline-block;border:1px solid #E5e5e5;margin-right:20px;padding:5px 0px;">
+            <div style="width:25%;display:inline-block;border-right:1px solid #E5e5e5;padding:5px 0px;">
                 <div  class="JumpDivTitleOne" style="margin-bottom:15px;">常规单据</div>
                 <div class="JumpDivTitleOne">{{$t('fnc.ysjine')}}：{{SumYingShou}} <span class="JumpSpan">{{$t('objFill.shishoujine')}}：{{SumShiShou}}</span> {{$t('Operation.Op_daishou')}}：{{SumDaiShou}}</div>
                 <div class="JumpDivTitleTwo">{{$t('objFill.yingfujine')}}：{{SumYingFu}} <span class="JumpSpan">{{$t('fnc.sfjine')}}：{{SumShiFu}}</span> {{$t('objFill.v101.FinancialModule.daifuje')}}：{{SumDaiFu}}</div>
             </div>
-           <div style="border:1px solid #E5e5e5; width:15%;padding:5px 0px;">
+           <div style="border-right:1px solid #E5e5e5; width:15%;padding:5px 0px;">
             <div  class="JumpDivTitleOne" style="margin-bottom:15px;">{{$t('fnc.tanxiaoinfo')}}</div>
             <div class="JumpDivTitleOne">{{$t('fnc.tanxiaomoney')}}：{{TotalAmortization}}  </div>
            </div>
+           <div style="border-right:1px solid #E5e5e5; width:15%;padding:5px 0px;">
+            <div  class="JumpDivTitleOne" style="margin-bottom:15px;">{{$t('fnc.a_heji')}}</div>
+            <div class="JumpDivTitleOne">{{$t('fnc.jine')}}：{{SumYingFu-SumYingShou+TotalAmortization}}  </div>
+           </div>
+
+           
         </div>
         </div>
         <div class="_fnDm_content" v-loading='loading' >
@@ -357,7 +363,7 @@
 
   <div class="_fnDm_content _fnDm_contenteltable" v-loading='loading' style="margin-top:10px;">
     <p style="margin-bottom:5px;">摊账单据</p>
-      <el-table ref="multipleTable" :data="AmortizationDataList" tooltip-effect="dark" style="width: 100%"  row-key="BaseFinanceId">
+      <el-table ref="multipleTable" :data="AmortizationDataList" tooltip-effect="dark" style="width: 100%"  row-key="Id">
         <el-table-column prop="address" :label="$t('fnc.danhao')" width="70">
           <template slot-scope="scope">
             <span 
@@ -369,7 +375,7 @@
             <span>{{scope.row.BranchName}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="" :label="$t('fnc.feiyongleixing')" >
+        <el-table-column prop="" :label="$t('fnc.feiyongleixing')" width="120">
           <template slot-scope="scope">
             <div>
               <template v-for="(s,si) in scope.row.CostTypeList">
@@ -411,10 +417,7 @@
         </el-table-column>
         <el-table-column prop="" :label="$t('fnc.fkduixiang')">
           <template slot-scope="scope">
-            <span>
-              <span
-                style="color: gray">{{scope.row.Type==2?scope.row.ClientTypeName+'：':$t('fnc.huikuanren')+'：'}}</span><span>{{scope.row.RemitterName}}</span>
-            </span>
+            <span>{{scope.row.RemitterName}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="" :label="$t('fnc.qishimonth')" width="100">