update

src/views/business/search/list/purchase/index.vue → src/views/business/search/spot/index.vue

@@ -16,9 +16,8 @@ import { queryTableList, MtpTableButton, defineComponent, handleComposeTable, Co
 import filterCustomTable from './components/filter/index.vue';
 import { formatTime, formatValue } from '@/common/methods';
 import { columns } from './setup';
-import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
-import { QueryPurchase } from '@/services/go/ermcp/purchase';
-import { QueryWareHouse } from '@/services/go/ermcp/sell';
+import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
+import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { useRoute } from 'vue-router';
 
@@ -31,16 +30,16 @@ export default defineComponent({
     setup() {
         const { name: routeName } = useRoute();
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>();
+        const { loading, tableList, queryTable } = queryTableList<Ermcp3ContractRsp>();
 
         // 获取列表数据
         const queryTableAction = () => {
             switch (routeName) {
                 case 'search_purchase':
-                    queryTable(QueryPurchase, { querytype: 1 });
+                    queryTable(QuerySpotContract, { contracttype: 1, querytype: '3,4' });
                     break;
                 case 'search_sell':
-                    queryTable(QueryWareHouse, { querytype: 1 });
+                    queryTable(QuerySpotContract, { contracttype: -1, querytype: '3,4' });
                     break;
             }
         };
@@ -55,7 +54,7 @@ export default defineComponent({
         };
 
         return {
-            ...handleComposeTable<Ermcp3SellBuyContract>(param),
+            ...handleComposeTable<Ermcp3ContractRsp>(param),
             loading,
             tableList,
             queryTable,

src/views/business/search/list/purchase/setup.ts → src/views/business/search/spot/setup.ts

@@ -1,6 +1,7 @@
-import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
+import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { ColumnType } from '@/common/methods/table';
 import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
+import { formatTime, formatValue } from '@/common/methods';
 
 /**
  * 表头对应字段
@@ -45,12 +46,15 @@ export const columns: ColumnType[] = [
     },
     {
         title: '对手方',
-        dataIndex: '--',
-        key: '--',
+        key: 'username',
         align: 'center',
         width: 120,
-        customRender: ({ text, record }: { text: number, record: Ermcp3SellBuyContract }) => {
-            return text;
+        customRender: ({ record }: { text: number, record: Ermcp3ContractRsp }) => {
+            // 根据合同类型显示对手方
+            if (record.contracttype === 1) {
+                return record.sellusername;
+            }
+            return record.buyusername;
         }
     },
     {
@@ -96,8 +100,8 @@ export const columns: ColumnType[] = [
     },
     {
         title: '点价合约',
-        dataIndex: '--',
-        key: '--',
+        dataIndex: 'goodscode',
+        key: 'goodscode',
         align: 'center',
         width: 120,
     },
@@ -117,8 +121,8 @@ export const columns: ColumnType[] = [
     },
     {
         title: '金额',
-        dataIndex: '--',
-        key: '--',
+        dataIndex: 'amount',
+        key: 'amount',
         align: 'center',
         width: 120,
     },
@@ -131,17 +135,22 @@ export const columns: ColumnType[] = [
     },
     {
         title: '点价期',
-        dataIndex: '--',
-        key: 'contractno',
+        key: 'startdate',
         align: 'center',
         width: 120,
+        customRender: ({ record }: { record: Ermcp3ContractRsp }) => {
+            return formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd'));
+        }
     },
     {
         title: '交收期',
-        dataIndex: '--',
-        key: 'contractno',
+        dataIndex: 'deliverystartdate',
+        key: 'deliverystartdate',
         align: 'center',
         width: 120,
+        customRender: ({ record }: { record: Ermcp3ContractRsp }) => {
+            return formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd'));
+        }
     },
     {
         title: '业务员',

src/views/iframe/setup.ts

@@ -16,6 +16,26 @@ const iframeCode: { code: string, tabIndex: number }[] = [
         tabIndex: 2,
     },
     {
+        code: 'company_normal', // 基础设置-主体设置-正常
+        tabIndex: 1,
+    },
+    {
+        code: 'company_disabled', // 基础设置-主体设置-停用
+        tabIndex: 2,
+    },
+    {
+        code: 'futures_spot_finish', // 现货套保-期现关联-外部成交单关联
+        tabIndex: 1,
+    },
+    {
+        code: 'futures_spot_order', // 现货套保-期现关联-期现单据关联
+        tabIndex: 2,
+    },
+    {
+        code: 'futures_spot_record', // 现货套保-期现关联-关联记录
+        tabIndex: 3,
+    },
+    {
         code: 'hedge_ratio_checkpending', // 风管审核-套保比例审核-待审核
         tabIndex: 1,
     },
@@ -30,6 +50,10 @@ const iframeCode: { code: string, tabIndex: number }[] = [
     {
         code: 'spot_params_performance', // 风管审核-现货参数审核-已审核
         tabIndex: 2,
+    },
+    {
+        code: 'price_report', // 统计报表-定价报表
+        tabIndex: 1,
     }
 ]