Merge remote-tracking branch 'origin/master'

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://218.17.158.45:21001/cfg?key=test_176"
+    "apiUrl": "http://103.40.249.127:28280/cfg?key=mtp_20"
 }

src/views/report/exposure-report/list/exposure_report/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topOrderTable"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/finance-report/list/finance_report_finance/index.vue

@@ -5,13 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topOrderTable"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
                :data-source="tableList"
-               >
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/future_report/list/future_report/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topOrderTable"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/inventory-report/list/category/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topOrderTable"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/inventory-report/list/warehouse/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topOrderTable"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/spot-report/list/spot_report/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topOrderTable"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/sum_pl_report/list/sum_pl_report/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topOrderTable"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>