lilei 1 gadu atpakaļ
vecāks
revīzija
cb8e4de4b2

+ 21 - 19
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -142,30 +142,32 @@
       </div>
     </a-card>
     <a-card size="small" :bordered="false" class="collectionDetail-wrap" style="margin-top:5px;">
-      <div class="gatherMessage">
-        订单总金额:<strong> {{ toThousands(countData&&countData.orderAmount||0) }}</strong>;
-        收款总金额:<strong>{{ toThousands(countData&&countData.receiptAmount||0) }}</strong>;
-        使用授信总金额:<strong>{{ toThousands(countData&&countData.useCreditAmount||0) }}</strong>;
-        授信还款总金额:<strong>{{ toThousands(countData&&countData.payCreditAmount||0) }}</strong>;
-        余款抵扣总金额:<strong>{{ toThousands(countData&&countData.balanceAmount||0) }}</strong>;
-        跨月打款总金额:<strong>{{ toThousands(countData&&countData.nextMonthAmount||0) }}</strong>;
-      </div>
-      <div class="gatherMessage">
-        <a-dropdown>
-          <a-menu slot="overlay" @click="handleMenuClick">
-            <a-menu-item key="1"> <a-icon type="printer" />批量允许打印 </a-menu-item>
-            <a-menu-item key="2"> <a-icon type="block" />批量设置开票 </a-menu-item>
-          </a-menu>
-          <a-button type="primary" ghost> 批量处理 <a-icon type="down" /></a-button>
-        </a-dropdown>
-        <span v-if="selNums" style="margin-left:10px;">已选{{ selNums }}项</span>
+      <div class="flex-center" style="margin-bottom: 10px;">
+        <div class="flex-center">
+          <a-dropdown>
+            <a-menu slot="overlay" @click="handleMenuClick">
+              <a-menu-item key="1"> <a-icon type="printer" />批量允许打印 </a-menu-item>
+              <a-menu-item key="2"> <a-icon type="block" />批量设置开票 </a-menu-item>
+            </a-menu>
+            <a-button type="primary" ghost> 批量处理 <a-icon type="down" /></a-button>
+          </a-dropdown>
+          <span v-if="selNums" style="margin-left:10px;">已选{{ selNums }}项</span>
+        </div>
+        <div class="flex-center" style="margin-left:10px;">
+          订单总金额:<strong> {{ toThousands(countData&&countData.orderAmount||0) }}</strong>;
+          收款总金额:<strong>{{ toThousands(countData&&countData.receiptAmount||0) }}</strong>;
+          使用授信总金额:<strong>{{ toThousands(countData&&countData.useCreditAmount||0) }}</strong>;
+          授信还款总金额:<strong>{{ toThousands(countData&&countData.payCreditAmount||0) }}</strong>;
+          余款抵扣总金额:<strong>{{ toThousands(countData&&countData.balanceAmount||0) }}</strong>;
+          跨月打款总金额:<strong>{{ toThousands(countData&&countData.nextMonthAmount||0) }}</strong>;
+        </div>
       </div>
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+60+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -537,7 +539,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 310
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     },
     // 开票操作
     handleInvoice (con) {

+ 2 - 3
src/views/financialManagement/financialCollection/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="financialCollectionAddwrap">
+  <div class="financialCollectionDetailwrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="financialCollectionAddcont" v-if="!bookSn" >
         <!-- 自定义的二级文字标题 -->
@@ -224,10 +224,9 @@ export default {
 </script>
 
 <style lang="less">
-  .financialCollectionAddwrap{
+  .financialCollectionDetailwrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
     box-sizing: border-box;
     .financialCollectionAddcont{
       margin-bottom: 6px;