Browse Source

class="srcollYTable" 替换为 class="srcollYTable"

huangbin 4 years ago
parent
commit
0d91cc0c5a

+ 70 - 40
src/views/business/exposure/list/realTime/index.vue

@@ -1,45 +1,75 @@
 <template>
-    <!-- 实时敞口-->
-    <div class="exposure-real-time table-height" :loading="loading">
-        <div class="real-time-header" v-if="isPingAnOem()">
-            <span class="dialogSpan">每隔</span>
-            <a-select class="typeSelect real-time-select" style="width: 100px" v-model:value="timer" @change="timerChange" placeholder="请选择间隔时间">
-                <a-select-option :value="item.id" v-for="item in diffTimes" :key="item.id">
-                    {{ item.name }}
-                </a-select-option>
-            </a-select>
-            <span class="dialogSpan">刷新一次,倒计时 </span> <span class="red">{{ num }}</span>
-            <a-button type="button" class="operBtn ant-btn" @click="setTimerAction">{{ isStart ? '停止监控' : '开始监控' }}</a-button>
-        </div>
-        <filterCustomTable @search="updateColumn" v-else> </filterCustomTable>
-        <a-table :columns="columns" class="topOrderTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-            <template v-if="isPingAnOem()" #index="{ index }">
-                <span>{{ index + 1 }}</span>
-            </template>
-            <template #MiddleGoodsName="{ record }">
-                    <span>{{`${record.MiddleGoodsName}/${record.MiddleGoodsCode}`}}</span>
-                </template>
-        </a-table>
-        <!-- 明细 -->
-        <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
-            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-                <!-- 套保品种/代码 -->
-                <template #middlegoodsname="{ record }" v-if="!isPingAnOem()">
-                    <span>{{ record.middlegoodsname + '/' + record.middlegoodscode }}</span>
-                </template>
-                <template #goodsname="{ record }" v-if="!isPingAnOem()">
-                    <span>{{ record.goodsname + '/' + record.goodscode }}</span>
-                </template>
-                <template v-if="isPingAnOem()" #index="{ index }">
-                    <span>{{ index + 1 }}</span>
-                </template>
-                <!-- 类型 -->
-                <template #contracttype="{ record }">
-                    <span>{{ getPlanContractType(record.contracttype) }}</span>
-                </template>
-            </a-table>
-        </Description>
+  <!-- 实时敞口-->
+  <div class="exposure-real-time table-height"
+       :loading="loading">
+    <div class="real-time-header"
+         v-if="isPingAnOem()">
+      <span class="dialogSpan">每隔</span>
+      <a-select class="typeSelect real-time-select"
+                style="width: 100px"
+                v-model:value="timer"
+                @change="timerChange"
+                placeholder="请选择间隔时间">
+        <a-select-option :value="item.id"
+                         v-for="item in diffTimes"
+                         :key="item.id">
+          {{ item.name }}
+        </a-select-option>
+      </a-select>
+      <span class="dialogSpan">刷新一次,倒计时 </span> <span class="red">{{ num }}</span>
+      <a-button type="button"
+                class="operBtn ant-btn"
+                @click="setTimerAction">{{ isStart ? '停止监控' : '开始监控' }}</a-button>
     </div>
+    <filterCustomTable @search="updateColumn"
+                       v-else> </filterCustomTable>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+      <template v-if="isPingAnOem()"
+                #index="{ index }">
+        <span>{{ index + 1 }}</span>
+      </template>
+      <template #MiddleGoodsName="{ record }">
+        <span>{{`${record.MiddleGoodsName}/${record.MiddleGoodsCode}`}}</span>
+      </template>
+    </a-table>
+    <!-- 明细 -->
+    <Description v-if="visible"
+                 @close="closeDrawer"
+                 @changeTab="changeTab"
+                 :tabList="tabList">
+      <a-table :columns="columnsDetail"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="detailTableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+        <!-- 套保品种/代码 -->
+        <template #middlegoodsname="{ record }"
+                  v-if="!isPingAnOem()">
+          <span>{{ record.middlegoodsname + '/' + record.middlegoodscode }}</span>
+        </template>
+        <template #goodsname="{ record }"
+                  v-if="!isPingAnOem()">
+          <span>{{ record.goodsname + '/' + record.goodscode }}</span>
+        </template>
+        <template v-if="isPingAnOem()"
+                  #index="{ index }">
+          <span>{{ index + 1 }}</span>
+        </template>
+        <!-- 类型 -->
+        <template #contracttype="{ record }">
+          <span>{{ getPlanContractType(record.contracttype) }}</span>
+        </template>
+      </a-table>
+    </Description>
+  </div>
 </template>
 
 <script lang="ts">

+ 21 - 21
src/views/platinum/platinum_document_query/list/success/index.vue

@@ -1,25 +1,25 @@
 <template>
-    <!-- 单据查询 成交单-->
-    <div class="platinum_document_query_success">
-        <Filter @search="search" />
-        <contextMenu :contextMenuList="firstBtn">
-            <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{ record }">
-                    <BtnList :btnList="firstBtn" class="btn-list-sticky" @onClick="btnClick(record)" />
-                </template>
-                <!-- 账户类型 -->
-                <template #userinfotype="{ record }">
-                    <a>{{ record.userinfotype === 1 ? '个人' : '企业' }}</a>
-                </template>
-                <!-- 成交类型 -->
-                <template #buyorsell="{ record }">
-                    <a>{{ record.buyorsell === 1 ? '卖' : '买' }}</a>
-                </template>
-            </a-table>
-        </contextMenu>
-        <!-- <ControlModal :selectedRow="selectedRow" /> -->
-    </div>
+  <!-- 单据查询 成交单-->
+  <div class="platinum_document_query_success">
+    <Filter @search="search" />
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 账户类型 -->
+      <template #userinfotype="{ record }">
+        <a>{{ record.userinfotype === 1 ? '个人' : '企业' }}</a>
+      </template>
+      <!-- 成交类型 -->
+      <template #buyorsell="{ record }">
+        <a>{{ record.buyorsell === 1 ? '卖' : '买' }}</a>
+      </template>
+    </a-table>
+  </div>
 </template>
 
 <script lang="ts">

+ 39 - 43
src/views/platinum/platinum_document_query/list/waiting/index.vue

@@ -1,47 +1,55 @@
 <template>
-    <!-- 单据查询 待付单-->
-    <div class="platinum_document_query_waiting">
-        <Filter @search="search" />
-        <contextMenu :contextMenuList="firstBtn">
-            <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{ record }">
-                    <BtnList :btnList="firstBtn" class="btn-list-sticky" @onClick="btnClick(record)" />
-                </template>
-                <!-- 账户类型 -->
-                <template #userinfotype="{ record }">
-                    <a>{{ record.userinfotype === 1 ? '个人' : '企业' }}</a>
-                </template>
-                <template #paylimitedtime="{ record }">
-                    <a>{{ isOverTime(record.paylimitedtime) }}</a>
-                </template>
-            </a-table>
-        </contextMenu>
-        <!-- <ControlModal :selectedRow="selectedRow" /> -->
-    </div>
+  <!-- 单据查询 待付单-->
+  <div class="platinum_fixed_investment_price_query_tab">
+    <Filter @search="search" />
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 账户类型 -->
+      <template #userinfotype="{ record }">
+        <a>{{ record.userinfotype === 1 ? '个人' : '企业' }}</a>
+      </template>
+      <template #paylimitedtime="{ record }">
+        <a>{{ isOverTime(record.paylimitedtime) }}</a>
+      </template>
+    </a-table>
+  </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, queryTableList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
+import { ComposeTableParam, defineComponent, handleComposeTable, queryTableList } from '@/common/export/commonTable';
 import { getUserId } from '@/services/bus/user';
 import { queryTradePayOrder } from '@/services/go/ermcp/qhj';
 import { QhjPayOrder, QueryTradePayOrderReq } from '@/services/go/ermcp/qhj/interface';
 import Filter from './compoments/filter/index.vue';
 import moment from 'moment';
-// import ControlModal from './compoments/controlModal/index.vue';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
     name: 'platinum_document_query_waiting',
-    components: { Filter, contextMenu, BtnList },
+    components: { Filter },
     setup() {
-        // 表头数据
-        const { columns, registerColumn } = getTableColumns();
-        // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjPayOrder>({});
-        // 表格操作按钮列表
-        const [firstBtn] = _getBtnList('platinum_document_query_waiting', false).value;
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList();
+        const { loading, tableList, queryTable } = queryTableList<QhjPayOrder>();
+        const queryTableAction = () => {
+            // 获取列表数据
+            queryTable(queryTradePayOrder, { userid: getUserId(), payflag: '1,3,5' });
+        };
+
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.plan_audit,
+            tableName: 'table_pcweb_qhj_pay_bill',
+            tableFilterKey: [],
+            isDetail: true,
+        };
+
         function search(value: any) {
             const { includesub, goodsid, filtername, userid, ordertime, userinfotype, isOverTime } = value;
             const len = ordertime.length;
@@ -58,25 +66,13 @@ export default defineComponent({
             queryTable(queryTradePayOrder, param);
         }
         const isOverTime = (value: string) => (moment().isAfter(moment(value)) ? '付款超时' : value);
-        initData(() => {
-            // 获取列表数据
-            queryTable(queryTradePayOrder, { userid: getUserId(), payflag: '1,3,5' });
-            // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_pay_bill', []);
-        });
 
         return {
+            ...handleComposeTable<QhjPayOrder>(param),
             search,
             isOverTime,
-            columns,
-            expandedRowKeys,
-            selectedRow,
-            Rowclick,
-            firstBtn,
             loading,
             tableList,
-            queryTable,
-            btnClick,
         };
     },
 });

+ 37 - 20
src/views/report/exposure-report/list/exposure_report/index.vue

@@ -1,24 +1,41 @@
 <template>
-    <!-- 敞口报表 -->
-    <div class="table-detail-container table-height" :loading="loading">
-        <Filter @update="search" @filter="updateColumn"></Filter>
-        <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList"> </a-table>
-        <!-- 明细 -->
-        <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
-            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-                <!-- 合同类型 -->
-                <template #contracttype="{ text }">
-                    <a>{{ getContractTypeName(text) }}</a>
-                </template>
-                <template #biztype="{ text }">
-                    <a>{{ getBizTypeName(text) }}</a>
-                </template>
-                <template #buyorsell="{ text }">
-                    <a>{{ getBuyOrSellName(text) }}</a>
-                </template>
-            </a-table>
-        </Description>
-    </div>
+  <!-- 敞口报表 -->
+  <div class="table-detail-container table-height"
+       :loading="loading">
+    <Filter @update="search"
+            @filter="updateColumn"></Filter>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"> </a-table>
+    <!-- 明细 -->
+    <Description v-if="visible"
+                 @close="closeDrawer"
+                 @changeTab="changeTab"
+                 :tabList="tabList">
+      <a-table :columns="columnsDetail"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="detailTableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+        <!-- 合同类型 -->
+        <template #contracttype="{ text }">
+          <a>{{ getContractTypeName(text) }}</a>
+        </template>
+        <template #biztype="{ text }">
+          <a>{{ getBizTypeName(text) }}</a>
+        </template>
+        <template #buyorsell="{ text }">
+          <a>{{ getBuyOrSellName(text) }}</a>
+        </template>
+      </a-table>
+    </Description>
+  </div>
 </template>
 
 <script lang="ts">

+ 25 - 9
src/views/report/finance-report/list/finance_report_finance/index.vue

@@ -1,13 +1,29 @@
 <template>
-    <!-- 财务报表 -->
-    <div class="table-detail-container table-height" :loading="loading">
-        <Filter @update="search"></Filter>
-        <a-table :columns="columns" class="topOrderTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"> </a-table>
-        <!-- 明细 -->
-        <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
-            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"> </a-table>
-        </Description>
-    </div>
+  <!-- 财务报表 -->
+  <div class="table-detail-container table-height"
+       :loading="loading">
+    <Filter @update="search"></Filter>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"> </a-table>
+    <!-- 明细 -->
+    <Description v-if="visible"
+                 @close="closeDrawer"
+                 @changeTab="changeTab"
+                 :tabList="tabList">
+      <a-table :columns="columnsDetail"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="detailTableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"> </a-table>
+    </Description>
+  </div>
 </template>
 
 <script lang="ts">

+ 35 - 19
src/views/report/future_report/list/future_report/index.vue

@@ -1,23 +1,39 @@
 <template>
-    <!-- 期货报表 -->
-    <div class="table-detail-container table-height" :loading="loading">
-        <Filter @update="search"></Filter>
-        <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 持仓方向 -->
-            <template #buyorsell="{ record }">
-                <a>{{ record.buyorsell === 1 ? '卖出' : '买入' }}</a>
-            </template>
-        </a-table>
-        <!-- 明细 -->
-        <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
-            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-                <!-- 持仓方向 -->
-                <template #buyorsell="{ record }">
-                    <a>{{ record.buyorsell === 1 ? '卖出' : '买入' }}</a>
-                </template>
-            </a-table>
-        </Description>
-    </div>
+  <!-- 期货报表 -->
+  <div class="table-detail-container table-height"
+       :loading="loading">
+    <Filter @update="search"></Filter>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 持仓方向 -->
+      <template #buyorsell="{ record }">
+        <a>{{ record.buyorsell === 1 ? '卖出' : '买入' }}</a>
+      </template>
+    </a-table>
+    <!-- 明细 -->
+    <Description v-if="visible"
+                 @close="closeDrawer"
+                 @changeTab="changeTab"
+                 :tabList="tabList">
+      <a-table :columns="columnsDetail"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="detailTableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+        <!-- 持仓方向 -->
+        <template #buyorsell="{ record }">
+          <a>{{ record.buyorsell === 1 ? '卖出' : '买入' }}</a>
+        </template>
+      </a-table>
+    </Description>
+  </div>
 </template>
 
 <script lang="ts">

+ 26 - 9
src/views/report/inventory-report/list/category/index.vue

@@ -1,13 +1,30 @@
 <template>
-    <!-- 库存报表(品类) -->
-    <div class="table-detail-container table-height" :loading="loading">
-        <Filter @update="search" @filter="updateColumn"></Filter>
-        <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList"> </a-table>
-        <!-- 明细 -->
-        <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
-            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"> </a-table>
-        </Description>
-    </div>
+  <!-- 库存报表(品类) -->
+  <div class="table-detail-container table-height"
+       :loading="loading">
+    <Filter @update="search"
+            @filter="updateColumn"></Filter>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"> </a-table>
+    <!-- 明细 -->
+    <Description v-if="visible"
+                 @close="closeDrawer"
+                 @changeTab="changeTab"
+                 :tabList="tabList">
+      <a-table :columns="columnsDetail"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="detailTableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"> </a-table>
+    </Description>
+  </div>
 </template>
 
 <script lang="ts">

+ 26 - 9
src/views/report/inventory-report/list/warehouse/index.vue

@@ -1,13 +1,30 @@
 <template>
-    <!-- 库存报表(仓库) -->
-    <div class="table-detail-container table-height" :loading="loading">
-        <Filter @update="search" @filter="updateColumn"></Filter>
-        <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList"> </a-table>
-        <!-- 明细 -->
-        <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
-            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"> </a-table>
-        </Description>
-    </div>
+  <!-- 库存报表(仓库) -->
+  <div class="table-detail-container table-height"
+       :loading="loading">
+    <Filter @update="search"
+            @filter="updateColumn"></Filter>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"> </a-table>
+    <!-- 明细 -->
+    <Description v-if="visible"
+                 @close="closeDrawer"
+                 @changeTab="changeTab"
+                 :tabList="tabList">
+      <a-table :columns="columnsDetail"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="detailTableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"> </a-table>
+    </Description>
+  </div>
 </template>
 
 <script lang="ts">

+ 88 - 71
src/views/report/spot-report/list/spot_report/index.vue

@@ -1,75 +1,92 @@
 <template>
-    <!-- 现货报表 -->
-    <div class="table-detail-container table-height" :loading="loading">
-        <Filter @update="search" @filter="updateColumn"></Filter>
-        <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <template #curaverageprice="{ record }">
-                <span>{{ record.curaverageprice.toFixed(2) }}</span>
-            </template>
-            <template #oriaverageprice="{ record }">
-                <span>{{ record.oriaverageprice.toFixed(2) }}</span>
-            </template>
-            <template #oriamount="{ record }">
-                <span>{{ record.oriamount.toFixed(2) }}</span>
-            </template>
-            <template #todaybuyamount="{ record }">
-                <span>{{ record.todaybuyamount.toFixed(2) }}</span>
-            </template>
-            <template #todaybuyaverageprice="{ record }">
-                <span>{{ record.todaybuyaverageprice.toFixed(2) }}</span>
-            </template>
-            <template #todaysellaverageprice="{ record }">
-                <span>{{ record.todaysellaverageprice.toFixed(2) }}</span>
-            </template>
-            <template #actualpl="{ record }">
-                <span>{{ record.actualpl.toFixed(2) }}</span>
-            </template>
-            <template #curspotprice="{ record }">
-                <span>{{ record.curspotprice.toFixed(2) }}</span>
-            </template>
-            <template #floatpl="{ record }">
-                <span>{{ record.floatpl.toFixed(2) }}</span>
-            </template>
-            <template #curmarketvalue="{ record }">
-                <span>{{ record.curmarketvalue.toFixed(2) }}</span>
-            </template>
-        </a-table>
-        <!-- 明细 -->
-        <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
-            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-                <template #curaverageprice="{ record }">
-                    <span>{{ record.curaverageprice.toFixed(2) }}</span>
-                </template>
-                <template #oriaverageprice="{ record }">
-                    <span>{{ record.oriaverageprice.toFixed(2) }}</span>
-                </template>
-                <template #oriamount="{ record }">
-                    <span>{{ record.oriamount.toFixed(2) }}</span>
-                </template>
-                <template #todaybuyamount="{ record }">
-                    <span>{{ record.todaybuyamount.toFixed(2) }}</span>
-                </template>
-                <template #todaybuyaverageprice="{ record }">
-                    <span>{{ record.todaybuyaverageprice.toFixed(2) }}</span>
-                </template>
-                <template #todaysellaverageprice="{ record }">
-                    <span>{{ record.todaysellaverageprice.toFixed(2) }}</span>
-                </template>
-                <template #actualpl="{ record }">
-                    <span>{{ record.actualpl.toFixed(2) }}</span>
-                </template>
-                <template #curspotprice="{ record }">
-                    <span>{{ record.curspotprice.toFixed(2) }}</span>
-                </template>
-                <template #floatpl="{ record }">
-                    <span>{{ record.floatpl.toFixed(2) }}</span>
-                </template>
-                <template #curmarketvalue="{ record }">
-                    <span>{{ record.curmarketvalue.toFixed(2) }}</span>
-                </template>
-            </a-table>
-        </Description>
-    </div>
+  <!-- 现货报表 -->
+  <div class="table-detail-container table-height"
+       :loading="loading">
+    <Filter @update="search"
+            @filter="updateColumn"></Filter>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+      <template #curaverageprice="{ record }">
+        <span>{{ record.curaverageprice.toFixed(2) }}</span>
+      </template>
+      <template #oriaverageprice="{ record }">
+        <span>{{ record.oriaverageprice.toFixed(2) }}</span>
+      </template>
+      <template #oriamount="{ record }">
+        <span>{{ record.oriamount.toFixed(2) }}</span>
+      </template>
+      <template #todaybuyamount="{ record }">
+        <span>{{ record.todaybuyamount.toFixed(2) }}</span>
+      </template>
+      <template #todaybuyaverageprice="{ record }">
+        <span>{{ record.todaybuyaverageprice.toFixed(2) }}</span>
+      </template>
+      <template #todaysellaverageprice="{ record }">
+        <span>{{ record.todaysellaverageprice.toFixed(2) }}</span>
+      </template>
+      <template #actualpl="{ record }">
+        <span>{{ record.actualpl.toFixed(2) }}</span>
+      </template>
+      <template #curspotprice="{ record }">
+        <span>{{ record.curspotprice.toFixed(2) }}</span>
+      </template>
+      <template #floatpl="{ record }">
+        <span>{{ record.floatpl.toFixed(2) }}</span>
+      </template>
+      <template #curmarketvalue="{ record }">
+        <span>{{ record.curmarketvalue.toFixed(2) }}</span>
+      </template>
+    </a-table>
+    <!-- 明细 -->
+    <Description v-if="visible"
+                 @close="closeDrawer"
+                 @changeTab="changeTab"
+                 :tabList="tabList">
+      <a-table :columns="columnsDetail"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="detailTableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+        <template #curaverageprice="{ record }">
+          <span>{{ record.curaverageprice.toFixed(2) }}</span>
+        </template>
+        <template #oriaverageprice="{ record }">
+          <span>{{ record.oriaverageprice.toFixed(2) }}</span>
+        </template>
+        <template #oriamount="{ record }">
+          <span>{{ record.oriamount.toFixed(2) }}</span>
+        </template>
+        <template #todaybuyamount="{ record }">
+          <span>{{ record.todaybuyamount.toFixed(2) }}</span>
+        </template>
+        <template #todaybuyaverageprice="{ record }">
+          <span>{{ record.todaybuyaverageprice.toFixed(2) }}</span>
+        </template>
+        <template #todaysellaverageprice="{ record }">
+          <span>{{ record.todaysellaverageprice.toFixed(2) }}</span>
+        </template>
+        <template #actualpl="{ record }">
+          <span>{{ record.actualpl.toFixed(2) }}</span>
+        </template>
+        <template #curspotprice="{ record }">
+          <span>{{ record.curspotprice.toFixed(2) }}</span>
+        </template>
+        <template #floatpl="{ record }">
+          <span>{{ record.floatpl.toFixed(2) }}</span>
+        </template>
+        <template #curmarketvalue="{ record }">
+          <span>{{ record.curmarketvalue.toFixed(2) }}</span>
+        </template>
+      </a-table>
+    </Description>
+  </div>
 </template>
 
 <script lang="ts">

+ 59 - 43
src/views/report/sum_pl_report/list/sum_pl_report/index.vue

@@ -1,47 +1,63 @@
 <template>
-    <!-- 汇总损益报表 -->
-    <div class="table-detail-container table-height" :loading="loading">
-        <Filter @update="search"></Filter>
-        <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="customRow" rowKey="key" :data-source="tableList">
-            <!-- 出现浮点失真  强行处理-->
-            <template #spotactualpl="{ record }">
-                <span>{{ record.spotactualpl.toFixed(2) }}</span>
-            </template>
-            <template #spotfloatpl="{ record }">
-                <span>{{ record.spotfloatpl.toFixed(2) }}</span>
-            </template>
-            <template #futureactualpl="{ record }">
-                <span>{{ record.futureactualpl.toFixed(2) }}</span>
-            </template>
-            <template #sumactualpl="{ record }">
-                <span>{{ record.sumactualpl.toFixed(2) }}</span>
-            </template>
-            <template #sumpl="{ record }">
-                <span>{{ record.sumpl.toFixed(2) }}</span>
-            </template>
-        </a-table>
-        <!-- 明细 -->
-        <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
-            <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-                <!-- 出现浮点失真  强行处理 * 2-->
-                <template #spotactualpl="{ record }">
-                    <span>{{ record.spotactualpl.toFixed(2) }}</span>
-                </template>
-                <template #spotfloatpl="{ record }">
-                    <span>{{ record.spotfloatpl.toFixed(2) }}</span>
-                </template>
-                <template #futureactualpl="{ record }">
-                    <span>{{ record.futureactualpl.toFixed(2) }}</span>
-                </template>
-                <template #sumactualpl="{ record }">
-                    <span>{{ record.sumactualpl.toFixed(2) }}</span>
-                </template>
-                <template #sumpl="{ record }">
-                    <span>{{ record.sumpl.toFixed(2) }}</span>
-                </template>
-            </a-table>
-        </Description>
-    </div>
+  <!-- 汇总损益报表 -->
+  <div class="table-detail-container table-height"
+       :loading="loading">
+    <Filter @update="search"></Filter>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="customRow"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 出现浮点失真  强行处理-->
+      <template #spotactualpl="{ record }">
+        <span>{{ record.spotactualpl.toFixed(2) }}</span>
+      </template>
+      <template #spotfloatpl="{ record }">
+        <span>{{ record.spotfloatpl.toFixed(2) }}</span>
+      </template>
+      <template #futureactualpl="{ record }">
+        <span>{{ record.futureactualpl.toFixed(2) }}</span>
+      </template>
+      <template #sumactualpl="{ record }">
+        <span>{{ record.sumactualpl.toFixed(2) }}</span>
+      </template>
+      <template #sumpl="{ record }">
+        <span>{{ record.sumpl.toFixed(2) }}</span>
+      </template>
+    </a-table>
+    <!-- 明细 -->
+    <Description v-if="visible"
+                 @close="closeDrawer"
+                 @changeTab="changeTab"
+                 :tabList="tabList">
+      <a-table :columns="columnsDetail"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="detailTableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+        <!-- 出现浮点失真  强行处理 * 2-->
+        <template #spotactualpl="{ record }">
+          <span>{{ record.spotactualpl.toFixed(2) }}</span>
+        </template>
+        <template #spotfloatpl="{ record }">
+          <span>{{ record.spotfloatpl.toFixed(2) }}</span>
+        </template>
+        <template #futureactualpl="{ record }">
+          <span>{{ record.futureactualpl.toFixed(2) }}</span>
+        </template>
+        <template #sumactualpl="{ record }">
+          <span>{{ record.sumactualpl.toFixed(2) }}</span>
+        </template>
+        <template #sumpl="{ record }">
+          <span>{{ record.sumpl.toFixed(2) }}</span>
+        </template>
+      </a-table>
+    </Description>
+  </div>
 </template>
 
 <script lang="ts">