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

src/components/FinancialModule/JumpReport.vue

@@ -300,7 +300,7 @@
                           </el-date-picker>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="6">
+                      <!-- <el-col :span="6">
                         <el-form-item :label="$t('scen.sc_ftTime')">
                           <el-date-picker class="h34"
                                           v-model="missionDate"
@@ -309,7 +309,7 @@
                                           value-format="yyyy-MM-dd">
                           </el-date-picker>
                         </el-form-item>
-                      </el-col>
+                      </el-col> -->
                     </template>
                 </el-row>
             </el-form>
@@ -324,17 +324,17 @@
                 </li>
             </ul>
             <div style="width:100%;display:flex;">
-            <div style="width:25%;display:inline-block;border-right:1px solid #E5e5e5;padding:5px 0px;">
-                <div  class="JumpDivTitleOne" style="margin-bottom:15px;">常规单据</div>
+            <div style="width:25%;display:inline-block;border-right:1px solid #E5e5e5;border-bottom:1px dashed #E5e5e5;padding:5px 0px;">
+                <div  class="JumpDivTitleOne" style="margin-bottom:15px; font-size: 17px">常规单据</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-right:1px solid #E5e5e5; width:15%;padding:5px 0px;">
-            <div  class="JumpDivTitleOne" style="margin-bottom:15px;">{{$t('fnc.tanxiaoinfo')}}</div>
+           <div style="border-right:1px solid #E5e5e5; border-bottom:1px dashed #E5e5e5; width:15%;padding:5px 0px;">
+            <div  class="JumpDivTitleOne" style="margin-bottom:15px;font-size: 17px">{{$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 style="border-bottom:1px dashed #E5e5e5; width:15%;padding:5px 0px;">
+            <div  class="JumpDivTitleOne" style="margin-bottom:15px;font-size: 17px">{{$t('fnc.a_heji')}}</div>
             <div class="JumpDivTitleOne">{{$t('fnc.jine')}}：{{SumYingFu-SumYingShou+TotalAmortization}}  </div>
            </div>
 
@@ -347,6 +347,7 @@
                 is-horizontal-resize
                 column-width-drag
                 style="width:100%;max-height:600px;"
+                :style="total<=0?'height:200px':''"
                 :columns="columns"
                 :table-data="DataList"
                 :filter-method="filterMethod"
@@ -364,7 +365,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="Id">
-        <el-table-column prop="address" :label="$t('fnc.danhao')" width="70">
+        <el-table-column prop="address" :label="$t('fnc.danhao')" width="90">
           <template slot-scope="scope">
             <span 
                 style="text-decoration: underline;cursor: pointer;font-weight: bold"  @click="goUrlDetail('FinancialDocumentsDetail',scope.row)">{{scope.row.BaseFinanceId}}</span>
@@ -453,9 +454,8 @@
         </el-table-column>
         <el-table-column prop="" :label="$t('fnc.zhidanInfo')" >
           <template slot-scope="scope">
-          
-                <p style="line-height:20px">{{$t('fnc.zhidanren')}}：<span>{{scope.row.FCreateByName}}</span></p>
-              <p style="line-height:20px">{{$t('fnc.zhidanDate')}}：<span>{{scope.row.FCreateDate}}</span></p>
+                <p style="line-height:20px"><span>{{scope.row.FCreateByName}}</span></p>
+              <p style="line-height:20px"><span>{{scope.row.FCreateDate}}</span></p>
              
           </template>
         </el-table-column>