Explorar o código

修改履约查询

huangbin %!s(int64=4) %!d(string=hai) anos
pai
achega
da94c69e41

+ 36 - 0
src/router/index.ts

@@ -2117,6 +2117,24 @@ const routes: Array<RouteRecordRaw> = [
                         meta: {
                             requireAuth: true,
                         },
+                        children: [
+                            {
+                                path: '/search_performance_query_buy_performance_done',
+                                name: 'search_performance_query_buy_performance_done',
+                                component: () => import('@/views/search/search_performance_query/search_performance_query_buy_performance/search_performance_query_buy_performance_done/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_performance_query_buy_performance_unsuccess',
+                                name: 'search_performance_query_buy_performance_unsuccess',
+                                component: () => import('@/views/search/search_performance_query/search_performance_query_buy_performance/search_performance_query_buy_performance_unsuccess/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                        ]
                     },
                     {
                         path: '/search_performance_query/search_performance_query_sell_performance',
@@ -2125,6 +2143,24 @@ const routes: Array<RouteRecordRaw> = [
                         meta: {
                             requireAuth: true,
                         },
+                        children: [
+                            {
+                                path: '/search_performance_query_sell_performance_done',
+                                name: 'search_performance_query_sell_performance_done',
+                                component: () => import('@/views/search/search_performance_query/search_performance_query_sell_performance/search_performance_query_sell_performance_done/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                            {
+                                path: '/search_performance_query_sell_performance_unsuccess',
+                                name: 'search_performance_query_sell_performance_unsuccess',
+                                component: () => import('@/views/search/search_performance_query/search_performance_query_sell_performance/search_performance_query_sell_performance_unsuccess/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
+                        ]
                     }
                 ]
             },

+ 1 - 1
src/views/search/search_capital_flow/search_capital_flow_tab/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <!-- 委托记录 - 商品合约 - 历史记录-->
+    <!-- 资金流水-->
     <div class="topTableHeight40">
         <router-view></router-view>
         <ThridMenu :list="tabList" :selectedKey="index" @selectMenu="changeTab" />

+ 17 - 76
src/views/search/search_performance_query/search_performance_query_buy_performance/index.vue

@@ -1,85 +1,26 @@
 <template>
-  <!-- 履约查询 买履约 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable expandLeftTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)'}"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             :expandIcon="expandIcon"
-             :expandIconAsCell="false"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 履约类型 -->
-      <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
-      </template>
-
-      <!-- 付款方式 -->
-      <template #paymenttype="{ record }">
-        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
-      </template>
-
-      <!-- 履约状态 -->
-      <template #performancestatus="{ record }">
-        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
-      </template>
-
-      <!-- 当前步骤 -->
-      <template #curstepname="{ record }">
-        <a>{{ record.curstepname }}</a>
-      </template>
-    </a-table>
-  </section>
+  <!-- 买履约-->
+  <div class="topTableHeight40">
+    <router-view></router-view>
+    <ThridMenu :list="tabList" :selectedKey="index" @selectMenu="changeTab" />
+  </div>
 </template>
 
 <script lang="ts">
-import { queryTableList, defineComponent, ModalEnum } from '@/common/export/commonTable';
-import { QueryPerformancePlan } from '@/services/go/wrtrade';
-import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
-import { handleComposeOrderTable } from '@/common/setup/table/compose';
-import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { expandIcon } from '@/common/setup/table/clolumn';
-import { BtnListType } from '@/common/components/btnList/interface';
-import { BuyOrSell } from '@/common/constants/enumCommon';
-import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import ThridMenu from '@/common/components/thirdMenu/index.vue';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-export default defineComponent({
-    name: EnumRouterName.search_performance_query_buy_performance,
-    setup() {
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
-        // 获取列表数据
-        const queryTableAction = () => {
-            const param: QueryPerformancePlanReq = {
-                buyorsell: 0,
-            };
-            queryTable(QueryPerformancePlan, param);
-        };
-        // 表格通用逻辑
-        const param: ComposeOrderTableParam = {
-            queryFn: queryTableAction,
-            tableName: 'table_pcweb_spot_trade_bottom_performance_info_buy',
-            recordList: getRecordItemTab(),
-        };
+import { handleMartketThirdRouter } from '@/common/setup/matket/router';
+import { defineComponent } from 'vue';
 
-        return {
-            ...handleComposeOrderTable<WrPerformancePlan>(param),
-            loading,
-            tableList,
-            getPerformanceTypeName,
-            getPerformanceStatusName,
-            getPaymentTypeName,
-            expandIcon,
-            BuyOrSell,
-        };
-    },
+export default defineComponent({
+  name: EnumRouterName.search_performance_query_buy_performance,
+  components: {
+    ThridMenu,
+  },
+  setup() {
+    return { ...handleMartketThirdRouter(EnumRouterName.search_performance_query_buy_performance) };
+  },
 });
 </script>
-
 <style lang="less">
-</style>;
-
+</style>

+ 86 - 0
src/views/search/search_performance_query/search_performance_query_buy_performance/search_performance_query_buy_performance_done/index.vue

@@ -0,0 +1,86 @@
+<template>
+  <!-- 履约查询 买履约 -->
+  <section class="topTableHeight">
+    <a-table
+      :columns="columns"
+      class="srcollYTable expandLeftTable"
+      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      :pagination="false"
+      :loading="loading"
+      :expandedRowKeys="expandedRowKeys"
+      :customRow="Rowclick"
+      :expandIcon="expandIcon"
+      :expandIconAsCell="false"
+      rowKey="key"
+      :data-source="tableList"
+    >
+      <!-- 履约类型 -->
+      <template #performancetype="{ record }">
+        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+      </template>
+
+      <!-- 付款方式 -->
+      <template #paymenttype="{ record }">
+        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+      </template>
+
+      <!-- 履约状态 -->
+      <template #performancestatus="{ record }">
+        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+      </template>
+
+      <!-- 当前步骤 -->
+      <template #curstepname="{ record }">
+        <a>{{ record.curstepname }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { defineComponent, queryTableList } from '@/common/export/commonTable';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+export default defineComponent({
+  name: EnumRouterName.search_performance_query_buy_performance,
+  setup() {
+    // 表格列表数据
+    const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+    // 获取列表数据
+    const queryTableAction = () => {
+      const param: QueryPerformancePlanReq = {
+        buyorsell: 0,
+      };
+      queryTable(QueryPerformancePlan, param);
+    };
+    // 表格通用逻辑
+    const param: ComposeOrderTableParam = {
+      queryFn: queryTableAction,
+      tableName: 'table_pcweb_spot_trade_bottom_performance_info_buy',
+      recordList: getRecordItemTab(),
+    };
+
+    return {
+      ...handleComposeOrderTable<WrPerformancePlan>(param),
+      loading,
+      tableList,
+      getPerformanceTypeName,
+      getPerformanceStatusName,
+      getPaymentTypeName,
+      expandIcon,
+      BuyOrSell,
+    };
+  },
+});
+</script>
+
+<style lang="less">
+</style>;
+

+ 86 - 0
src/views/search/search_performance_query/search_performance_query_buy_performance/search_performance_query_buy_performance_unsuccess/index.vue

@@ -0,0 +1,86 @@
+<template>
+  <!-- 履约查询 买履约 -->
+  <section class="topTableHeight">
+    <a-table
+      :columns="columns"
+      class="srcollYTable expandLeftTable"
+      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      :pagination="false"
+      :loading="loading"
+      :expandedRowKeys="expandedRowKeys"
+      :customRow="Rowclick"
+      :expandIcon="expandIcon"
+      :expandIconAsCell="false"
+      rowKey="key"
+      :data-source="tableList"
+    >
+      <!-- 履约类型 -->
+      <template #performancetype="{ record }">
+        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+      </template>
+
+      <!-- 付款方式 -->
+      <template #paymenttype="{ record }">
+        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+      </template>
+
+      <!-- 履约状态 -->
+      <template #performancestatus="{ record }">
+        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+      </template>
+
+      <!-- 当前步骤 -->
+      <template #curstepname="{ record }">
+        <a>{{ record.curstepname }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { defineComponent, queryTableList } from '@/common/export/commonTable';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+export default defineComponent({
+  name: EnumRouterName.search_performance_query_buy_performance,
+  setup() {
+    // 表格列表数据
+    const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+    // 获取列表数据
+    const queryTableAction = () => {
+      const param: QueryPerformancePlanReq = {
+        buyorsell: 0,
+      };
+      queryTable(QueryPerformancePlan, param);
+    };
+    // 表格通用逻辑
+    const param: ComposeOrderTableParam = {
+      queryFn: queryTableAction,
+      tableName: 'table_pcweb_spot_trade_bottom_performance_info_buy',
+      recordList: getRecordItemTab(),
+    };
+
+    return {
+      ...handleComposeOrderTable<WrPerformancePlan>(param),
+      loading,
+      tableList,
+      getPerformanceTypeName,
+      getPerformanceStatusName,
+      getPaymentTypeName,
+      expandIcon,
+      BuyOrSell,
+    };
+  },
+});
+</script>
+
+<style lang="less">
+</style>;
+

+ 16 - 73
src/views/search/search_performance_query/search_performance_query_sell_performance/index.vue

@@ -1,83 +1,26 @@
 <template>
-  <!-- 履约查询 卖履约 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable expandLeftTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)'}"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             :expandIcon="expandIcon"
-             :expandIconAsCell="false"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 履约类型 -->
-      <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
-      </template>
-
-      <!-- 付款方式 -->
-      <template #paymenttype="{ record }">
-        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
-      </template>
-
-      <!-- 履约状态 -->
-      <template #performancestatus="{ record }">
-        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
-      </template>
-
-      <!-- 当前步骤 -->
-      <template #curstepname="{ record }">
-        <a>{{ record.curstepname }}</a>
-      </template>
-    </a-table>
-  </section>
+  <!-- 卖履约-->
+  <div class="topTableHeight40">
+    <router-view></router-view>
+    <ThridMenu :list="tabList" :selectedKey="index" @selectMenu="changeTab" />
+  </div>
 </template>
 
 <script lang="ts">
-import { queryTableList, defineComponent } from '@/common/export/commonTable';
-import { QueryPerformancePlan } from '@/services/go/wrtrade';
-import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
-import { handleComposeOrderTable } from '@/common/setup/table/compose';
-import { expandIcon } from '@/common/setup/table/clolumn';
-import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { BuyOrSell } from '@/common/constants/enumCommon';
-import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import ThridMenu from '@/common/components/thirdMenu/index.vue';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { handleMartketThirdRouter } from '@/common/setup/matket/router';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
-    name: EnumRouterName.search_performance_query_sell_performance,
-    setup() {
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
-        // 获取列表数据
-        const queryTableAction = () => {
-            const param: QueryPerformancePlanReq = {
-                buyorsell: 1,
-            };
-            queryTable(QueryPerformancePlan, param);
-        };
-        // 表格通用逻辑
-        const param: ComposeOrderTableParam = {
-            queryFn: queryTableAction,
-            tableName: 'table_pcweb_spot_trade_bottom_performance_info_sale',
-            recordList: getRecordItemTab(),
-        };
-        return {
-            ...handleComposeOrderTable<WrPerformancePlan>(param),
-            loading,
-            tableList,
-            getPerformanceTypeName,
-            getPaymentTypeName,
-            getPerformanceStatusName,
-            expandIcon,
-            BuyOrSell,
-        };
-    },
+  name: EnumRouterName.search_performance_query_sell_performance,
+  components: {
+    ThridMenu,
+  },
+  setup() {
+    return { ...handleMartketThirdRouter(EnumRouterName.search_performance_query_sell_performance) };
+  },
 });
 </script>
-
 <style lang="less">
-</style>;
+</style>

+ 85 - 0
src/views/search/search_performance_query/search_performance_query_sell_performance/search_performance_query_sell_performance_done/index.vue

@@ -0,0 +1,85 @@
+<template>
+  <!-- 履约查询 卖履约 -->
+  <section class="topTableHeight">
+    <a-table
+      :columns="columns"
+      class="srcollYTable expandLeftTable"
+      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      :pagination="false"
+      :loading="loading"
+      :expandedRowKeys="expandedRowKeys"
+      :customRow="Rowclick"
+      :expandIcon="expandIcon"
+      :expandIconAsCell="false"
+      rowKey="key"
+      :data-source="tableList"
+    >
+      <!-- 履约类型 -->
+      <template #performancetype="{ record }">
+        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+      </template>
+
+      <!-- 付款方式 -->
+      <template #paymenttype="{ record }">
+        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+      </template>
+
+      <!-- 履约状态 -->
+      <template #performancestatus="{ record }">
+        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+      </template>
+
+      <!-- 当前步骤 -->
+      <template #curstepname="{ record }">
+        <a>{{ record.curstepname }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { defineComponent, queryTableList } from '@/common/export/commonTable';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+
+export default defineComponent({
+  name: EnumRouterName.search_performance_query_sell_performance,
+  setup() {
+    // 表格列表数据
+    const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+    // 获取列表数据
+    const queryTableAction = () => {
+      const param: QueryPerformancePlanReq = {
+        buyorsell: 1,
+      };
+      queryTable(QueryPerformancePlan, param);
+    };
+    // 表格通用逻辑
+    const param: ComposeOrderTableParam = {
+      queryFn: queryTableAction,
+      tableName: 'table_pcweb_spot_trade_bottom_performance_info_sale',
+      recordList: getRecordItemTab(),
+    };
+    return {
+      ...handleComposeOrderTable<WrPerformancePlan>(param),
+      loading,
+      tableList,
+      getPerformanceTypeName,
+      getPaymentTypeName,
+      getPerformanceStatusName,
+      expandIcon,
+      BuyOrSell,
+    };
+  },
+});
+</script>
+
+<style lang="less">
+</style>;

+ 85 - 0
src/views/search/search_performance_query/search_performance_query_sell_performance/search_performance_query_sell_performance_unsuccess/index.vue

@@ -0,0 +1,85 @@
+<template>
+  <!-- 履约查询 卖履约 -->
+  <section class="topTableHeight">
+    <a-table
+      :columns="columns"
+      class="srcollYTable expandLeftTable"
+      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      :pagination="false"
+      :loading="loading"
+      :expandedRowKeys="expandedRowKeys"
+      :customRow="Rowclick"
+      :expandIcon="expandIcon"
+      :expandIconAsCell="false"
+      rowKey="key"
+      :data-source="tableList"
+    >
+      <!-- 履约类型 -->
+      <template #performancetype="{ record }">
+        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+      </template>
+
+      <!-- 付款方式 -->
+      <template #paymenttype="{ record }">
+        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+      </template>
+
+      <!-- 履约状态 -->
+      <template #performancestatus="{ record }">
+        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+      </template>
+
+      <!-- 当前步骤 -->
+      <template #curstepname="{ record }">
+        <a>{{ record.curstepname }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { defineComponent, queryTableList } from '@/common/export/commonTable';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+
+export default defineComponent({
+  name: EnumRouterName.search_performance_query_sell_performance,
+  setup() {
+    // 表格列表数据
+    const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+    // 获取列表数据
+    const queryTableAction = () => {
+      const param: QueryPerformancePlanReq = {
+        buyorsell: 1,
+      };
+      queryTable(QueryPerformancePlan, param);
+    };
+    // 表格通用逻辑
+    const param: ComposeOrderTableParam = {
+      queryFn: queryTableAction,
+      tableName: 'table_pcweb_spot_trade_bottom_performance_info_sale',
+      recordList: getRecordItemTab(),
+    };
+    return {
+      ...handleComposeOrderTable<WrPerformancePlan>(param),
+      loading,
+      tableList,
+      getPerformanceTypeName,
+      getPaymentTypeName,
+      getPerformanceStatusName,
+      expandIcon,
+      BuyOrSell,
+    };
+  },
+});
+</script>
+
+<style lang="less">
+</style>;