Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/information/spot-contract/components/detail/index.vue
yu.jie 4 years ago
parent
commit
9b0585f02a

+ 1 - 1
src/common/components/commonDes/commonDes.vue

@@ -5,7 +5,7 @@
     <a-descriptions-item v-for="(item, i) in list"
                          :key="i + 'des'"
                          :label="item.label">
-      {{item.value}}
+      <span class="white">{{item.value}}</span>
     </a-descriptions-item>
     <a-descriptions-item v-if="slotDesName"
                          :label="slotDesName">

+ 12 - 1
src/router/index.ts

@@ -509,10 +509,21 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: '/exposure_report',
                 name: 'exposure_report',
-                component: () => import('@/views/report/exposure-report/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
+                redirect: { name: 'exposure_report_exposure' },
+                children: [
+                    {
+                        path: '/exposure_report/exposure',
+                        name: 'exposure_report_exposure',
+                        component: () => import('@/views/report/exposure-report/list/exposure_report/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                ]
             },
             {
                 path: '/finance_report',

+ 23 - 3
src/views/information/account_info/compoments/detail-business/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 账号详情-->
-  <a-modal class="add-custom custom-detail"
+  <a-modal class="commonModal custom-detail"
            title="账户明细"
            v-model:visible="visible"
            centered
@@ -14,7 +14,7 @@
     </template>
     <a-form class="inlineForm"
             :model="formState">
-      <Des :list="desList"
+      <!-- <Des :list="desList"
            :slotDesName="'账户角色'">
         <a-checkbox-group class="commonCheckboxGroup"
                           v-model:value="formState.roleids">
@@ -27,8 +27,13 @@
             </a-col>
           </a-row>
         </a-checkbox-group>
+<<<<<<< HEAD
       </Des>
+      <!-- <a-row :gutter="24">
+=======
+      </Des> -->
       <a-row :gutter="24">
+>>>>>>> e29e164b2d8593fdcda06ef0111c8f6d22d2cec9
         <a-col :span="12">
           <a-form-item label="登录账号"
                        name="">
@@ -63,7 +68,7 @@
             </a-checkbox-group>
           </a-form-item>
         </a-col>
-      </a-row>
+      </a-row> -->
     </a-form>
   </a-modal>
 </template>
@@ -120,5 +125,20 @@ export default defineComponent({
     .ant-form.inlineForm {
         margin-top: 20px;
     }
+    .ant-descriptions.commom-des {
+      .ant-descriptions-item-label {
+            display: inline-block;
+            width: 130px;
+            line-height: 30px;
+            padding-left: 16px;
+            color: @m-grey1;
+            &::after{
+              content: ''
+            }
+      }
+      .ant-descriptions-item-content {
+
+      }
+    }
 }
 </style>;

+ 0 - 9
src/views/information/account_info/compoments/reset-business/index.vue

@@ -30,15 +30,6 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="原密码"
-                       name="oldPassword">
-            <a-input-password class="dialogInput"
-                              style="width: 200px"
-                              v-model:value="formState.oldPassword"
-                              placeholder="请输入原密码" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
           <a-form-item label="新密码"
                        name="password">
             <a-input-password class="dialogInput"

+ 0 - 9
src/views/information/account_info/compoments/reset-managers/index.vue

@@ -30,15 +30,6 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="原密码"
-                       name="oldPassword">
-            <a-input-password class="dialogInput"
-                              style="width: 200px"
-                              v-model:value="formState.oldPassword"
-                              placeholder="请输入原密码" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
           <a-form-item label="新密码"
                        name="password">
             <a-input-password class="dialogInput"

+ 226 - 219
src/views/information/spot-contract/components/detail/index.vue

@@ -1,257 +1,264 @@
 <template>
-    <!-- 现货合同详情-->
-    <a-modal class="add-custom custom-detail"
-             title="现货合同详情"
-             v-model:visible="visible"
-             centered
-             :maskClosable="maskClosableFlag"
-             @cancel="cancel"
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="cancel">关闭
-            </a-button>
+  <!-- 现货合同详情-->
+  <a-modal class="add-custom custom-detail"
+           title="现货合同详情"
+           v-model:visible="visible"
+           centered
+           :maskClosable="maskClosableFlag"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="cancel">关闭
+      </a-button>
+    </template>
+    <a-tabs v-model:activeKey="activeKey"
+            @change="tabClick">
+      <a-tab-pane v-for="item in tabList"
+                  :key="item.key"
+                  :tab="item.name">
+      </a-tab-pane>
+    </a-tabs>
+    <InfoDetail :selectedRow="selectedRow"
+                :businessManager="businessManager"
+                v-if="activeKey == 1" />
+    <div class="tableDatas"
+         v-else>
+      <a-table class="dialogTable"
+               :columns="columns"
+               :data-source="tableList"
+               :pagination="false">
+        <template #status="{ text }">
+          <span class="yellow">{{ text }}</span>
+          <!-- 审核通过'green' 审核拒绝 'orange' 待审核'yellow'   -->
         </template>
-        <a-tabs v-model:activeKey="activeKey"
-                @change="tabClick">
-            <a-tab-pane v-for="item in tabList"
-                        :key="item.key"
-                        :tab="item.name">
-            </a-tab-pane>
-        </a-tabs>
-        <InfoDetail :selectedRow="selectedRow"
-                    :businessManager="businessManager"
-                    v-if="activeKey == 1"/>
-        <div class="tableDatas"
-             v-else>
-            <a-table class="dialogTable"
-                     :columns="columns"
-                     :data-source="tableList"
-                     :pagination="false">
-                <template #status="{ text }">
-                    <span class="yellow">{{ text }}</span>
-                    <!-- 审核通过'green' 审核拒绝 'orange' 待审核'yellow'   -->
-                </template>
 
-                <template #applystatus="{ text }">
-                    <a>{{ getApplyStatusName(text) }}</a>
-                </template>
-
-                <!-- 发票金额-->
-                <template #invoicetype="{ text }">
-                    <a>{{ invoiceStatusName(text) }}</a>
-                </template>
+        <template #applystatus="{ text }">
+          <a>{{ getApplyStatusName(text) }}</a>
+        </template>
 
-                <!-- 发票类型-->
-                <template #contracttype="{ text }">
-                    <a>{{ getPlanContractType(text) }}</a>
-                </template>
+        <!-- 发票金额-->
+        <template #invoicetype="{ text }">
+          <a>{{ invoiceStatusName(text) }}</a>
+        </template>
 
-                <!-- 出入库类型 -->
-                <template #inouttype="{ text }">
-                    <a>{{ InOutTypeName(text) }}</a>
-                </template>
+        <!-- 发票类型-->
+        <template #contracttype="{ text }">
+          <a>{{ getPlanContractType(text) }}</a>
+        </template>
 
+        <!-- 出入库类型 -->
+        <template #inouttype="{ text }">
+          <a>{{ InOutTypeName(text) }}</a>
+        </template>
 
-            </a-table>
-        </div>
-    </a-modal>
+      </a-table>
+    </div>
+  </a-modal>
 </template>
 
 <script lang="ts">
-    import {defineComponent, PropType, ref} from 'vue';
-    import {closeModal} from '@/common/setup/modal/index';
-    import {Ermcp3ContractRsp} from '@/services/go/ermcp/spot-contract/interface';
-    import {queryResultLoadingAndInfo} from '@/common/methods/request/resultInfo';
-    import {QueryBusinessFp, QueryBusinessKx} from '@/services/go/ermcp/finance-review';
-    import {QueryBusinessDj, QueryBusinessJs} from '@/services/go/ermcp/business-review';
-    import {QueryAreaStockApply} from '@/services/go/ermcp/inventory-review';
-    import {QueryChangeLog} from '@/services/go/ermcp/spot-contract';
-    import {ErmcpLoginUserEx} from '@/services/go/ermcp/account/interface';
-    import InfoDetail from '../infoDetail/index.vue';
-    import {getApplyStatusName} from '@/views/manage/business-review/setup';
-    import {getTableColumns} from '@/common/setup/table';
-    import {invoiceStatusName} from "@/views/manage/finance-review/setup";
-    import {getPlanContractType} from "@/views/business/plan/setup";
-    import {InOutTypeName} from "@/views/manage/inventory-review/setup";
+import { defineComponent, PropType, ref, watchEffect } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
+import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
+import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { QueryBusinessFp, QueryBusinessKx } from '@/services/go/ermcp/finance-review';
+import { QueryBusinessDj, QueryBusinessJs } from '@/services/go/ermcp/business-review';
+import { QueryAreaStockApply } from '@/services/go/ermcp/inventory-review';
+import { QueryChangeLog } from '@/services/go/ermcp/spot-contract';
+import { ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
+import InfoDetail from '../infoDetail/index.vue';
+import { getApplyStatusName } from '@/views/manage/business-review/setup';
+import { getTableColumns } from '@/common/setup/table';
+import { invoiceStatusName } from '@/views/manage/finance-review/setup';
+import { getPlanContractType } from '@/views/business/plan/setup';
+import { InOutTypeName } from '@/views/manage/inventory-review/setup';
 
-    export default defineComponent({
-        name: 'spot-contract-detail',
-        components: {InfoDetail},
-        props: {
-            selectedRow: {
-                type: Object as PropType<Ermcp3ContractRsp>,
-                default: {},
-            },
-            businessManager: {
-                type: Array as PropType<ErmcpLoginUserEx[]>,
-                default: [],
-            },
+export default defineComponent({
+    name: 'spot-contract-detail',
+    components: { InfoDetail },
+    props: {
+        selectedRow: {
+            type: Object as PropType<Ermcp3ContractRsp>,
+            default: {},
+        },
+        businessManager: {
+            type: Array as PropType<ErmcpLoginUserEx[]>,
+            default: [],
         },
-        setup: function (props, context) {
-            const {visible, cancel} = closeModal('detail');
+    },
+    setup: function(props, context) {
+        const { visible, cancel } = closeModal('detail');
+        const tabList = ref<{ key: number; name: string }[]>([]);
 
-            let tabList = ref<any[]> ((props.selectedRow.contracctstatus === 4 || 0 ) ?  // 审核拒绝和未提交不显示后面的选项
-                [{key: 1, name: '合同详情'},]
-                : [
-                    {key: 1, name: '合同详情'},
-                    {key: 2, name: '点价记录'},
-                    {key: 3, name: '交收记录'},
-                    {key: 4, name: '款项记录'},
-                    {key: 5, name: '发票记录'},
-                    {key: 6, name: '入库记录'},
-                    {key: 7, name: '出库记录'},
-                    {key: 8, name: '变更记录'},
-                ]);
+        const activeKey = ref<number>(1);
 
-            const activeKey = ref<number>(1);
+        const loading = ref<boolean>(false);
+        const tableList = ref<any[]>([]);
+        // 表头数据
+        const { columns, registerColumn } = getTableColumns();
+        watchEffect(() => {
+            if (visible.value && props.selectedRow.contracctstatus) {
+                // 审核拒绝和未提交不显示后面的选项
 
-            const loading = ref<boolean>(false);
-            const tableList = ref<any[]>([]);
-            // 表头数据
-            const {columns, registerColumn} = getTableColumns();
+                console.log(props.selectedRow.contracctstatus);
 
-            function tabClick() {
-                const relatedid = props.selectedRow.spotcontractid;
-                switch (activeKey.value) {
-                    case 1:
-                        break;
-                    case 2: // 点价记录
-                        registerColumn('table_pcweb_someprice_detail_dj', []);
-                        queryResultLoadingAndInfo(QueryBusinessDj, loading, {relatedid}).then((res) => {
-                            tableList.value = res;
-                        });
-                        break;
-                    case 3: // 交收记录
-                        registerColumn('table_pcweb_someprice_detail_js', []);
-                        queryResultLoadingAndInfo(QueryBusinessJs, loading, {relatedid}).then((res) => {
-                            tableList.value = res;
-                        });
-                        break;
-                    case 4: //款项记录
-                        registerColumn('table_pcweb_someprice_detail_kx', []);
-                        queryResultLoadingAndInfo(QueryBusinessKx, loading, {relatedid}).then((res) => {
-                            tableList.value = res;
-                        });
-                        break;
-                    case 5: // 发票记录
-                        registerColumn('table_pcweb_someprice_detail_fp', []);
-                        queryResultLoadingAndInfo(QueryBusinessFp, loading, {relatedid}).then((res) => {
-                            tableList.value = res;
-                        });
-                        break;
-                    case 6: // 入库记录
-                        registerColumn('table_pcweb_someprice_detail_stock', []);
-                        queryResultLoadingAndInfo(QueryAreaStockApply, loading, {
-                            spotcontractid: relatedid,
-                            inouttype: '1,3',
-                        }).then((res) => {
-                            tableList.value = res;
-                        });
-                        break;
-                    case 7: // 出库记录
-                        registerColumn('table_pcweb_someprice_detail_stock_out', []);
-                        queryResultLoadingAndInfo(QueryAreaStockApply, loading, {
-                            spotcontractid: relatedid,
-                            inouttype: '2,4',
-                        }).then((res) => {
-                            tableList.value = res;
-                        });
-                        break;
-                    case 8: //// 变更记录
-                        registerColumn('table_pcweb_someprice_detail_change', []);
-                        queryResultLoadingAndInfo(QueryChangeLog, loading, {RelatedId: relatedid}).then((res) => {
-                            tableList.value = res;
-                        });
-                        break;
-                }
+                tabList.value = [0, 4, 6].includes(props.selectedRow.contracctstatus)
+                    ? [{ key: 1, name: '合同详情' }]
+                    : [
+                          { key: 1, name: '合同详情' },
+                          { key: 2, name: '点价记录' },
+                          { key: 3, name: '交收记录' },
+                          { key: 4, name: '款项记录' },
+                          { key: 5, name: '发票记录' },
+                          { key: 6, name: '入库记录' },
+                          { key: 7, name: '出库记录' },
+                          { key: 8, name: '变更记录' },
+                      ];
+                activeKey.value = 1;
+            }
+        });
+        function tabClick() {
+            const relatedid = props.selectedRow.spotcontractid;
+            switch (activeKey.value) {
+                case 1:
+                    break;
+                case 2: // 点价记录
+                    registerColumn('table_pcweb_someprice_detail_dj', []);
+                    queryResultLoadingAndInfo(QueryBusinessDj, loading, { relatedid }).then((res) => {
+                        tableList.value = res;
+                    });
+                    break;
+                case 3: // 交收记录
+                    registerColumn('table_pcweb_someprice_detail_js', []);
+                    queryResultLoadingAndInfo(QueryBusinessJs, loading, { relatedid }).then((res) => {
+                        tableList.value = res;
+                    });
+                    break;
+                case 4: //款项记录
+                    registerColumn('table_pcweb_someprice_detail_kx', []);
+                    queryResultLoadingAndInfo(QueryBusinessKx, loading, { relatedid }).then((res) => {
+                        tableList.value = res;
+                    });
+                    break;
+                case 5: // 发票记录
+                    registerColumn('table_pcweb_someprice_detail_fp', []);
+                    queryResultLoadingAndInfo(QueryBusinessFp, loading, { relatedid }).then((res) => {
+                        tableList.value = res;
+                    });
+                    break;
+                case 6: // 入库记录
+                    registerColumn('table_pcweb_someprice_detail_stock', []);
+                    queryResultLoadingAndInfo(QueryAreaStockApply, loading, {
+                        spotcontractid: relatedid,
+                        inouttype: '1,3',
+                    }).then((res) => {
+                        tableList.value = res;
+                    });
+                    break;
+                case 7: // 出库记录
+                    registerColumn('table_pcweb_someprice_detail_stock_out', []);
+                    queryResultLoadingAndInfo(QueryAreaStockApply, loading, {
+                        spotcontractid: relatedid,
+                        inouttype: '2,4',
+                    }).then((res) => {
+                        tableList.value = res;
+                    });
+                    break;
+                case 8: //// 变更记录
+                    registerColumn('table_pcweb_someprice_detail_change', []);
+                    queryResultLoadingAndInfo(QueryChangeLog, loading, { RelatedId: relatedid }).then((res) => {
+                        tableList.value = res;
+                    });
+                    break;
             }
+        }
 
-            return {
-                visible,
-                cancel,
-                loading,
-                maskClosableFlag: false,
-                activeKey,
-                columns,
-                tableList,
-                tabList,
-                tabClick,
-                getApplyStatusName,
-                invoiceStatusName,
-                getPlanContractType,
-                InOutTypeName,
-            };
-        },
-    });
+        return {
+            visible,
+            cancel,
+            loading,
+            maskClosableFlag: false,
+            activeKey,
+            columns,
+            tableList,
+            tabList,
+            tabClick,
+            getApplyStatusName,
+            invoiceStatusName,
+            getPlanContractType,
+            InOutTypeName,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .custom-detail {
-        .ant-modal-content {
-            .ant-modal-body {
-                padding-top: 0;
-                padding-left: 0;
-                padding-right: 0;
+.custom-detail {
+    .ant-modal-content {
+        .ant-modal-body {
+            padding-top: 0;
+            padding-left: 0;
+            padding-right: 0;
 
-                .ant-tabs {
-                    background: @m-black11;
-                    width: 100%;
-                    padding: 0 24px;
+            .ant-tabs {
+                background: @m-black11;
+                width: 100%;
+                padding: 0 24px;
 
-                    .ant-tabs-bar {
-                        margin-bottom: 0;
-                        border-bottom: 0;
-                    }
-                    .anticon {
-                        color: #88a0ae;
-                    }
-                    .ant-tabs-nav-container {
-                        .ant-tabs-nav-wrap {
-                            .ant-tabs-nav {
-                                .ant-tabs-tab {
-                                    width: 70px;
-                                    margin-right: 43px;
-                                    text-align: center;
-                                    font-size: 16px;
-                                    color: #88a0ae;
-                                    padding: 0;
-                                    line-height: 45px;
-                                }
+                .ant-tabs-bar {
+                    margin-bottom: 0;
+                    border-bottom: 0;
+                }
+                .anticon {
+                    color: #88a0ae;
+                }
+                .ant-tabs-nav-container {
+                    .ant-tabs-nav-wrap {
+                        .ant-tabs-nav {
+                            .ant-tabs-tab {
+                                width: 70px;
+                                margin-right: 43px;
+                                text-align: center;
+                                font-size: 16px;
+                                color: #88a0ae;
+                                padding: 0;
+                                line-height: 45px;
+                            }
 
-                                .ant-tabs-tab-active.ant-tabs-tab {
-                                    color: #3a87f7;
-                                }
+                            .ant-tabs-tab-active.ant-tabs-tab {
+                                color: #3a87f7;
+                            }
 
-                                .ant-tabs-ink-bar {
-                                    width: 70px !important;
-                                    background: #3a87f7;
-                                    .rounded-corners(1px);
-                                }
+                            .ant-tabs-ink-bar {
+                                width: 70px !important;
+                                background: #3a87f7;
+                                .rounded-corners(1px);
                             }
                         }
                     }
                 }
             }
         }
+    }
 
-        .tableDatas {
-            margin-top: 26px;
-            padding: 0 24px;
-            overflow: hidden;
+    .tableDatas {
+        margin-top: 26px;
+        padding: 0 24px;
+        overflow: hidden;
 
-            .dialogTable {
-                width: 100%;
-                overflow: overlay;
-            }
+        .dialogTable {
+            width: 100%;
+            overflow: overlay;
         }
+    }
 
-        .ant-form.inlineForm {
-            margin-top: 20px;
-            padding: 0 24px;
-        }
+    .ant-form.inlineForm {
+        margin-top: 20px;
+        padding: 0 24px;
     }
+}
 </style
 >;

+ 43 - 0
src/views/report/exposure-report/components/filterTable/index.vue

@@ -0,0 +1,43 @@
+<template>
+  <!-- 过滤客户资料表格 -->
+  <div class="filterTable">
+    <FilterOption :selectList="selectList"
+                  :inputList="inputList"
+                  :fixedBtnList="fixedBtnList" />
+    <slot></slot>
+  </div>
+</template>
+
+<script lang="ts">
+import FilterOption from '@/common/components/filter/index.vue';
+import { defineComponent } from 'vue';
+import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
+export default defineComponent({
+    name: 'business-review-filter-table',
+    components: { FilterOption },
+    setup(props, context) {
+        const select: SelectList[] = [
+            {
+                value: undefined,
+                key: 'contracttype',
+                placeholder: '全部合同类型',
+                list: [
+                    { value: 1, lable: '采购' },
+                    { value: -1, lable: '销售' },
+                ],
+            },
+        ];
+        const input: InputList[] = [
+            { value: '', placeholder: '模糊搜索对手方', key: 'buyusernameOrsellusername' },
+            { value: '', placeholder: '模糊搜索合同编号', key: 'contractno' },
+            { value: '', placeholder: '模糊搜索现货品种', key: 'deliverygoodsname' },
+        ];
+        return {
+            ...handleFilter(select, input, context),
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

+ 42 - 0
src/views/report/exposure-report/list/exposure_report/index.vue

@@ -0,0 +1,42 @@
+<template>
+  <!-- 敞口报表 -->
+  <div class="exposure_report"
+       :loading="loading">
+    <Filter @search="search"></Filter>
+    <contextMenu :contextMenuList="forDataBtn">
+      <!-- <a-table :columns="columns"
+               class="topTable hiddenFirstCol"
+               :pagination="false"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               rowKey="key"
+               :data-source="tableList"> -->
+      <!-- 额外的展开行 -->
+      <!-- <template #expandedRowRender="{ record }">
+                    <BtnList :btnList="record.btnList"/>
+                </template> -->
+      <!-- </a-table> -->
+    </contextMenu>
+  </div>
+</template>
+
+<script lang="ts">
+import Filter from '../../components/filterTable/index.vue';
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+export default defineComponent({
+    name: 'exposure-report',
+    components: {
+        Filter,
+        contextMenu,
+        BtnList,
+    },
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.exposure-report {
+}
+</style>;

+ 43 - 0
src/views/report/finance-report/components/filterTable/index.vue

@@ -0,0 +1,43 @@
+<template>
+  <!-- 过滤客户资料表格 -->
+  <div class="filterTable">
+    <FilterOption :selectList="selectList"
+                  :inputList="inputList"
+                  :fixedBtnList="fixedBtnList" />
+    <slot></slot>
+  </div>
+</template>
+
+<script lang="ts">
+import FilterOption from '@/common/components/filter/index.vue';
+import { defineComponent } from 'vue';
+import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
+export default defineComponent({
+    name: 'business-review-filter-table',
+    components: { FilterOption },
+    setup(props, context) {
+        const select: SelectList[] = [
+            {
+                value: undefined,
+                key: 'contracttype',
+                placeholder: '全部合同类型',
+                list: [
+                    { value: 1, lable: '采购' },
+                    { value: -1, lable: '销售' },
+                ],
+            },
+        ];
+        const input: InputList[] = [
+            { value: '', placeholder: '模糊搜索对手方', key: 'buyusernameOrsellusername' },
+            { value: '', placeholder: '模糊搜索合同编号', key: 'contractno' },
+            { value: '', placeholder: '模糊搜索现货品种', key: 'deliverygoodsname' },
+        ];
+        return {
+            ...handleFilter(select, input, context),
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

+ 5 - 5
src/views/report/exposure-report/index.vue → src/views/report/finance-report/list/finance_report_finance/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 敞口报表 -->
-  <div class="exposure-report">
-    敞口报表
+  <!-- 财务报表 -->
+  <div class="finance-report">
+    财务报表
   </div>
 </template>
 
@@ -9,7 +9,7 @@
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-    name: 'exposure-report',
+    name: 'finance-report',
     components: {},
     setup() {
         return {};
@@ -18,6 +18,6 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.exposure-report {
+.finance-report {
 }
 </style>;

+ 43 - 0
src/views/report/inventory-report/components/filterTable/index.vue

@@ -0,0 +1,43 @@
+<template>
+  <!-- 过滤客户资料表格 -->
+  <div class="filterTable">
+    <FilterOption :selectList="selectList"
+                  :inputList="inputList"
+                  :fixedBtnList="fixedBtnList" />
+    <slot></slot>
+  </div>
+</template>
+
+<script lang="ts">
+import FilterOption from '@/common/components/filter/index.vue';
+import { defineComponent } from 'vue';
+import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
+export default defineComponent({
+    name: 'business-review-filter-table',
+    components: { FilterOption },
+    setup(props, context) {
+        const select: SelectList[] = [
+            {
+                value: undefined,
+                key: 'contracttype',
+                placeholder: '全部合同类型',
+                list: [
+                    { value: 1, lable: '采购' },
+                    { value: -1, lable: '销售' },
+                ],
+            },
+        ];
+        const input: InputList[] = [
+            { value: '', placeholder: '模糊搜索对手方', key: 'buyusernameOrsellusername' },
+            { value: '', placeholder: '模糊搜索合同编号', key: 'contractno' },
+            { value: '', placeholder: '模糊搜索现货品种', key: 'deliverygoodsname' },
+        ];
+        return {
+            ...handleFilter(select, input, context),
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

+ 23 - 0
src/views/report/inventory-report/list/inventory_report_inventory/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <!-- 库存报表-->
+  <div class="inventory-report">
+    库存报表
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+    name: 'inventory-report',
+    components: {},
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.inventory-report {
+}
+</style>;

+ 43 - 0
src/views/report/spot-report/components/filterTable/index.vue

@@ -0,0 +1,43 @@
+<template>
+  <!-- 过滤客户资料表格 -->
+  <div class="filterTable">
+    <FilterOption :selectList="selectList"
+                  :inputList="inputList"
+                  :fixedBtnList="fixedBtnList" />
+    <slot></slot>
+  </div>
+</template>
+
+<script lang="ts">
+import FilterOption from '@/common/components/filter/index.vue';
+import { defineComponent } from 'vue';
+import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
+export default defineComponent({
+    name: 'business-review-filter-table',
+    components: { FilterOption },
+    setup(props, context) {
+        const select: SelectList[] = [
+            {
+                value: undefined,
+                key: 'contracttype',
+                placeholder: '全部合同类型',
+                list: [
+                    { value: 1, lable: '采购' },
+                    { value: -1, lable: '销售' },
+                ],
+            },
+        ];
+        const input: InputList[] = [
+            { value: '', placeholder: '模糊搜索对手方', key: 'buyusernameOrsellusername' },
+            { value: '', placeholder: '模糊搜索合同编号', key: 'contractno' },
+            { value: '', placeholder: '模糊搜索现货品种', key: 'deliverygoodsname' },
+        ];
+        return {
+            ...handleFilter(select, input, context),
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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