Merge branch 'mtp_v6' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB into mtp_v6

src/assets/styles/mixin.less

@@ -319,6 +319,7 @@
         border-color    : @m-grey17;
         background-color: transparent;
         color           : @m-grey17;
+        pointer-events  : none;
     }
 
     .operBtn.ant-btn {

src/common/setup/table/list.ts

@@ -38,7 +38,7 @@ export function queryTableList<T>(ishandleFloatErr = false, num?: number) {
                         for (const item in e) {
                             const decimal = (e as any).decimalplace
                             const count = decimal ? decimal : num
-                            e[item] = getDecimalsNum(e[item], count, decimal)
+                            e[item] = getDecimalsNum(e[item], count, count)
                         }
                     });
                 }

src/router/index.ts

@@ -48,51 +48,6 @@ const routes: Array<RouteRecordRaw> = [
                 component: () => import('@/views/market/warehouseTrade/index.vue'),
             },
             {
-                path: 'custom_info',
-                name: 'custom_info',
-                component: Main,
-                meta: {
-                    requireAuth: true,
-                },
-                redirect: (to) => {
-                    return { name: 'custom_info_unsubmit' };
-                },
-                children: [
-                    {
-                        path: '/custom_info/custom_info_normal',
-                        name: 'custom_info_normal',
-                        component: () => import('@/views/information/custom/list/normal-use/index.vue'),
-                        meta: {
-                            requireAuth: true,
-                        },
-                    },
-                    {
-                        path: '/custom_info/custom_info_disabled',
-                        name: 'custom_info_disabled',
-                        component: () => import('@/views/information/custom/list/stop-use/index.vue'),
-                        meta: {
-                            requireAuth: true,
-                        },
-                    },
-                    {
-                        path: '/custom_info/custom_info_checkpending',
-                        name: 'custom_info_checkpending',
-                        component: () => import('@/views/information/custom/list/checkpending/index.vue'),
-                        meta: {
-                            requireAuth: true,
-                        },
-                    },
-                    {
-                        path: '/custom_info/custom_info_unsubmit',
-                        name: 'custom_info_unsubmit',
-                        component: () => import('@/views/information/custom/list/unsubmit/index.vue'),
-                        meta: {
-                            requireAuth: true,
-                        },
-                    },
-                ],
-            },
-            {
                 path: 'goods_info',
                 name: 'goods_info',
                 component: Main,

src/services/go/ermcp/exposure/interface.ts

@@ -73,10 +73,16 @@ export interface Ermcp3ExposureDetail {
     enumdicname: string;//现货商品单位名称
     logtype: number;//类型 - 1:套保计划 2:现货合同
     middlegoodsId: number;//套保商品id
+    mgunitidname:string;//套保品种单位名称
+    mgunitid:number;//套保品种单位id
     middlegoodscode: string;//套保商品代码
     middlegoodsname: string;//套保商品名称
     qty: number;//数量
     relateNo: string;//现货合同/套保计划编号
+    unitid:number;//现货商品单位id
+    wrstandardcode:string;//现货商品代码
+    wrstandardid:number;//现货商品ID(SEQ_WRSTANDARD)
+    wrstandardname:string;//现货商品名称
 }
 
 /**

src/services/go/ermcp/goodsInfo/index.ts

@@ -6,7 +6,7 @@ import { getUserAccountType } from "@/services/bus/user";
 import { commonSearch_go } from '@/services/go/index';
 import { QueryQuoteDay } from '../../quote';
 import {
-    Ermcp3Brand, Ermcp3GoodsGroup, Ermcp3MiddleGoodsDetailEx,
+    Ermcp3Brand, Ermcp3GoodsGroup,
     Ermcp3Wrstandard,
     ErmcpDeliveryGoodsDetailEx,
     ErmcpDeliveryGoodsReq,
@@ -14,6 +14,7 @@ import {
     Goods,
     Ermcp3MiddleGoodsDetail2
 } from './interface';
+import {Ermcp3MiddleGoodsDetail} from './interface/deliverygoodsdetail'
 
 /**
  * 查询现货商品 /Ermcp3/QueryDeliveryGoods
@@ -212,7 +213,7 @@ export function QueryMiddleGoods(status: number): Promise<ErmcpMiddleGoodsModel[
  * @param middlegoodsid 套保品种id
  * @constructor
  */
-export function QueryMiddleGoodsDetail(middlegoodsid?: number): Promise<Ermcp3MiddleGoodsDetailEx[]> {
+export function QueryMiddleGoodsDetail(middlegoodsid?: number): Promise<Ermcp3MiddleGoodsDetail[]> {
     const userid = getUserId(); // 用户id
     const usertype = getUserAccountType()  // 用户类型 2-机构 7-企业成员
     const param = middlegoodsid ? { userid, usertype, middlegoodsid } : { userid, usertype }

src/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail.ts

@@ -0,0 +1,82 @@
+/**
+ * 查询套保品种详情
+ */
+ export interface Ermcp3MiddleGoodsDetail {
+    areauserid:number //机构用户ID
+    enumdicname:string//单位名称
+    goodsunitid:number//套保品种单位id
+    gplst:TBGoodsGroup[]//期货品种列表
+    middlegoodscode:string//套保品种代码
+    middlegoodsid:number//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    middlegoodsnam:string//套保品种名称
+    needarbitrageratio:number//套利比率
+    needhedgeratio:number//套保比率
+    wdlst:TBWrstandard[]//商品信息列表(现货品类)
+    mg:ErmcpMiddleGoodsModel//套保品种
+}
+
+
+
+/**
+ * 套保品种
+ */
+ export interface ErmcpMiddleGoodsModel {
+    areauserid: number;//机构用户ID
+    createtime: string;//修改时间
+    enumdicname: string;//单位名称
+    evaluateratio: number;//估价系数
+    goodsgroupid: number;//关联期货品种ID
+    goodsunitid: number;//单位ID
+    isvalid: number;//状态 number;
+    //-无效(停用) 1-有效(正常)
+    middlegoodscode: string;//套保品种代码
+    middlegoodsid: number;//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    middlegoodsname: string;//套保品种名称
+    modifytime: string;//修改时间
+    needhedgeratio: number;//套保比率
+    qtydecimalplace: number;//数量小数位
+    relatedgoodsid: number;//关联交易商品ID
+    relatedgoodstype: number;//关联商品类型 - 1:期货合约 2:现货品种
+    remark: string;//备注
+}
+
+
+
+/**
+ * 商品信息列表(现货品类)
+ */
+ interface TBWrstandard{
+    convertratio:number//折算系数
+    deliverygoodsname:string//品种名称
+    enumdicname:string//单位名称
+    vatrate:number//增值税率
+    wrstandardcode:string//现货商品代码
+    wrstandardid:number//现货商品ID(SEQ_WRSTANDARD)
+    wrstandardname:string//现货商品名称
+}
+
+/**
+ * 期货品种列表
+ */
+ interface TBGoodsGroup{
+    convertratio:number//折算系数
+    enumdicname:string//单位名称
+    exexchangecode:string//交易所代码
+    exexchangename:string//交易所名称
+    gdlst:TBGoods[]//商品列表
+    goodsgroupid:Number//商品组ID(自增ID)
+    goodsgroupname:string//商品组名称
+    goodunitid:number//报价单位ID
+}
+
+/**
+ * 商品列表
+ */
+ interface TBGoods{
+    agreeunit:number//合约乘数
+    enumdicname:string//单位名称
+    goodscode:string//商品代码(内部)
+    goodsid:number//商品ID(自增ID SEQ_GOODS)
+    goodsname:string//商品名称
+
+}

src/services/go/ermcp/patrade-link/index.ts

@@ -0,0 +1,18 @@
+/** ================================= 期现关联 ================================**/
+import { getUserId } from "@/services/bus/user";
+import { commonSearch_go } from '@/services/go';
+import { Ermcp3PaTradeLinkDetailReq, Ermcp3PaTradeLinkDetailReqRsp } from './interface';
+
+/**
+ * 查询期现关联记录 /Ermcp3/QueryPaTradeLinkDetail
+ */
+export function QueryPaTradeLinkDetail(req: Ermcp3PaTradeLinkDetailReq): Promise<Ermcp3PaTradeLinkDetailReqRsp[]> {
+    const param = {
+        userid: getUserId(),
+    }
+    Object.assign(param, req)
+    return commonSearch_go('/Ermcp3/QueryPaTradeLinkDetail', param).catch((err) => {
+        throw new Error(`查询期现关联记录: ${err}`);
+    });
+}
+

src/services/go/ermcp/patrade-link/interface.ts

@@ -0,0 +1,52 @@
+/**
+ * 期现关联请求
+ */
+export interface Ermcp3PaTradeLinkDetailReq {
+    userid: number    //  用户ID(填登录用户的userid)
+    linkstatus?: number    //  关联状态 1:成功 2:失败 3:解绑
+    tradeid?: string  //  期货订单号(模糊匹配)
+    contractno?: string  // 现货编号(模糊匹配)
+    taname?: string // 期货账户(模糊匹配)
+}
+
+/**
+ * 期现关联返回
+ */
+export interface Ermcp3PaTradeLinkDetailReqRsp {
+    accountid: number //资金账号
+    agreeunit: number //合约乘数
+    areauserid: string //所属机构
+    bizsubjectid: string //归属业务部门ID - SubjectID
+    buyorsell: number //方向 - 0:买 1: 卖
+    channelbuildtype: number //委托单据类型 0:无 1:建仓 2: 平仓
+    contractno: string //现货编号(合同编号)
+    convertratio: number //折算系数
+    createtime: string //关联时间 | 创建时间
+    creatorid: string //创建人ID
+    creatorsrc: number //创建人来源 - 1:管理端 2:终端 3: 交易
+    enumdicname: string //单位名称
+    goodscode: string //合约代码
+    goodsgroupid: number //对冲品种ID[期货合约商品组ID]
+    goodsid: number //商品ID
+    goodsname: string //合约名称
+    hedgeflag: number //业务类型 | 投机套保标志 - 0:无 1:投机 2:套保 3:套利 4: 套期保值(平安\合同) 5: 单边(平安) 6: 移仓(平安) 7: 错单处理(平安) 8: 跨期套利(平安) 9: 套期保值(计划) 10: 套利(合同) 11: 换月(合同) 12: 交割(金瑞)
+    linkdetailid: string //关联ID(614 + Unix秒时间戳(10位) + xxxxxx)
+    linkstatus: number //关联状态 - 1:成功 2:失败 3: 解绑
+    middlegoodscode: string //套保品种代码
+    middlegoodsid: number //套保品种ID
+    middlegoodsname: string //套保品种名称
+    relatedlot: number //关联手数
+    relatedmode: number //关联方式 - 1:自动关联 2:手动关联 3: 解绑关联
+    relatedqty: number //关联数量 = RelatedLot * AgreeUnit * ConvertRatio
+    retcode: number //返回码
+    saleuserid: string //业务员ID
+    spotcontractid: string //现货合同\套保计划ID[4, 10, 11 - 现货合同ID][9: 套期保值(计划) - 套保计划ID]
+    taname: string //期货账户
+    tradedate: string //关联交易日(yyyyMMdd)
+    tradeid: string //期货订单号 | 内部成交单ID
+    tradelot: number //成交数量 | 成交手数
+    tradeprice: number //成交价格
+    tradetime: string //期货成交时间
+    tradetradedate: string //成交交易日(yyyyMMdd)
+    username: string //用户名称
+}

src/views/business/exposure/list/realTime/index.vue

@@ -27,6 +27,9 @@
                 <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>

src/views/business/plan/components/add/index.vue

@@ -78,16 +78,6 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="标仓系数"
-                       name="">
-            <a-input class="dialogInput"
-                     v-model:value="formState.ConvertFactor"
-                     readonly
-                     style="width: 200px"
-                     placeholder="请输入标仓系数" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
           <a-form-item label="计划量"
                        class="relative"
                        name="PlanQty">

src/views/information/account_info/compoments/add-managers-permission/index.vue

@@ -16,8 +16,8 @@
                     <a-form-item label="权限功能" name></a-form-item>
                 </a-col>
                 <a-col :span="24">
-                    <a-tree v-if="isPingAnOem()" checkable :tree-data="tableList" v-model:checkedKeys="checkedKeys" :replace-fields="replaceFields"> </a-tree>
-                    <div class="powerTable" v-else>
+                    <a-tree checkable :tree-data="tableList" v-model:checkedKeys="checkedKeys" :replace-fields="replaceFields"> </a-tree>
+                    <!-- <div class="powerTable" v-else>
                         <div class="powerRow" v-for="(item, i) in tableList" :key="i + '0'">
                             <div class="powerLeft">
                                 <a-checkbox @change="firstChaneg(item)" v-model:checked="item.Menu.ishadrole">{{ item.Menu.resourcename }} </a-checkbox>
@@ -33,7 +33,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
+                    </div> -->
                 </a-col>
             </a-row>
         </a-form>

src/views/information/custom/index.vue

@@ -1,50 +1,32 @@
 <template>
-  <!-- 客户资料 -->
-  <div class="plan_uncommitted"
-       :loading="loading">
-    <Filter @search="updateColumn">
-      <mtp-table-button class="btn-list-sticky"
-                        :buttons="addButton"
-                        @click="openComponent" />
-    </Filter>
-    <a-table :columns="getColumns(columns)"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <mtp-table-button class="btn-list-sticky"
-                          :buttons="buttons"
-                          :record="record"
-                          @click="openComponent" />
-      </template>
-      <template #status="{ text }">
-        <a>{{ getStatusName(text) }}</a>
-      </template>
-      <template #userinfotype="{ text }">
-        <a>{{ getUserInfoTypeName(text) }}</a>
-      </template>
-      <template #attachment1="{ text,record }">
-        <a>{{ text }}</a><a>{{ record.attachment2 }}</a>
-      </template>
-      <template #cardtype="{ text }">
-        <a>{{ getCardTypeEnumItemName(text) }}</a>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="buttons"> </contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"> </component>
-  </div>
+    <!-- 客户资料 -->
+    <div class="plan_uncommitted" :loading="loading">
+        <Filter @search="updateColumn">
+            <mtp-table-button class="btn-list-sticky" :buttons="addButton" @click="openComponent" />
+        </Filter>
+        <a-table :columns="getColumns(columns)" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+            </template>
+            <template #status="{ text }">
+                <a>{{ getStatusName(text) }}</a>
+            </template>
+            <template #userinfotype="{ text }">
+                <a>{{ getUserInfoTypeName(text) }}</a>
+            </template>
+            <template #attachment1="{ text, record }">
+                <a>{{ text }}</a
+                ><a>{{ record.attachment2 }}</a>
+            </template>
+            <template #cardtype="{ text }">
+                <a>{{ getCardTypeEnumItemName(text) }}</a>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"> </component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/information/goods/list/hedging-variety/setup.ts

@@ -1,32 +1,42 @@
 import { QueryMiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo';
-import { Ermcp3MiddleGoodsDetailEx } from '@/services/go/ermcp/goodsInfo/interface';
+import { Ermcp3MiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail';
 import { mergeObj } from '@/utils/objHandle';
 import { message } from 'ant-design-vue';
 import { reactive, ref } from 'vue';
 import { getInitMenuData } from '../../setup';
 
-export function initMG(): Ermcp3MiddleGoodsDetailEx {
+
+export function initMG(): Ermcp3MiddleGoodsDetail {
     return {
-        dglist: [],  // 关联的现货品种列表
-        gplist: [],  // 关联商品组列表
-        mg: {
-            areauserid: 0,
-            evaluateratio: 0,
-            goodsgroupid: 0,
-            isvalid: 0,
-            middlegoodsid: 0,
-            needhedgeratio: 0,
-            qtydecimalplace: 0,
-            relatedgoodsid: 0,
-            relatedgoodstype: 0,
-            goodsunitid: 0,
-            createtime: '',
-            enumdicname: '',
-            middlegoodscode: '',
-            middlegoodsname: '',
-            modifytime: '',
-            remark: '',
-        }
+        areauserid:0, //机构用户ID
+        enumdicname:'',//单位名称
+        goodsunitid:0,//套保品种单位id
+        gplst:[],//期货品种列表
+        middlegoodscode:'',//套保品种代码
+        middlegoodsid:0,//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+        middlegoodsnam:'',//套保品种名称
+        needarbitrageratio:0,//套利比率
+        needhedgeratio:0,//套保比率
+        wdlst:[],//商品信息列表(现货品类)
+        mg:{
+            areauserid: 0,//机构用户ID
+            createtime: '',//修改时间
+            enumdicname: '',//单位名称
+            evaluateratio: 0,//估价系数
+            goodsgroupid: 0,//关联期货品种ID
+            goodsunitid: 0,//单位ID
+            isvalid: 0,//状态 number;
+            //-无效(停用) 1-有效(正常)
+            middlegoodscode: '',//套保品种代码
+            middlegoodsid: 0,//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+            middlegoodsname: '',//套保品种名称
+            modifytime: '',//修改时间
+            needhedgeratio: 0,//套保比率
+            qtydecimalplace: 0,//数量小数位
+            relatedgoodsid: 0,//关联交易商品ID
+            relatedgoodstype: 0,//关联商品类型 - 1:期货合约 2:现货品种
+            remark: ''//备注
+            }
     }
 }
 
@@ -38,9 +48,9 @@ export function handleMG() {
     const { menuList, menuMap } = getInitMenuData('goods_info_hedge')
     const loading = ref<boolean>(false);
     // 套保品种列表
-    const MGList = ref<Ermcp3MiddleGoodsDetailEx[]>([])
+    const MGList = ref<Ermcp3MiddleGoodsDetail[]>([])
     // 选中的具体某一天套保品种数据
-    const selctedMG = reactive<Ermcp3MiddleGoodsDetailEx>(initMG())
+    const selctedMG = reactive<Ermcp3MiddleGoodsDetail>(initMG())
     const isNormal = ref<boolean>(true) // true => 正常； false => 停用
     function getMG(param?: number) {
         loading.value = true;

src/views/information/spot-contract/components/add/index.vue

@@ -71,6 +71,11 @@
                             <UploadImg :visible="visible" @upload="uploadImgAction" />
                         </a-form-item>
                     </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="交易主体" name="subjecttype">
+                            <a-input class="subjecttype" style="width: 200px" v-model:value="formState.ContractNo" placeholder="请输入交易主体" />
+                        </a-form-item>
+                    </a-col>
                 </a-row>
             </fieldset>
             <fieldset class="formFieldSet">
@@ -104,11 +109,6 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="标仓系数" name="ConvertFactor">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.ConvertFactor" readonly placeholder="选择商品后自动填入" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
                         <a-form-item label="商品规格" name="SpotGoodsDesc">
                             <a-input class="dialogInput" style="width: 200px" v-model:value="formState.SpotGoodsDesc" placeholder="请输入商品规格" />
                         </a-form-item>

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

@@ -78,7 +78,7 @@ import { QueryBusinessFp, QueryBusinessKx } from '@/services/go/ermcp/finance-re
 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 { QueryPaTradeLinkDetail } from '@/services/go/ermcp/patrade-link';
 import InfoDetail from '../infoDetail/index.vue';
 import { getApplyStatusName, getReceiptName } from '@/common/constants/enumsName';
 import { getTableColumns } from '@/common/setup/table';
@@ -113,24 +113,15 @@ export default defineComponent({
         // 审核拒绝和未提交不显示后面的选项
         tabList.value = [0, 4, 6].includes(props.selectedRow.contracctstatus)
             ? [{ key: 1, name: '合同详情' }]
-            : props.selectedRow.contracttype === 1
-            ? [
-                  { key: 1, name: '合同详情' },
-                  { key: 2, name: '点价记录' },
-                  { key: 3, name: '交收记录' },
-                  { key: 4, name: '款项记录' },
-                  { key: 5, name: '发票记录' },
-                  { key: 6, name: '入库记录' },
-                  { key: 8, name: '变更记录' },
-              ]
             : [
                   { key: 1, name: '合同详情' },
                   { key: 2, name: '点价记录' },
                   { key: 3, name: '交收记录' },
                   { key: 4, name: '款项记录' },
                   { key: 5, name: '发票记录' },
-                  { key: 7, name: '出库记录' },
+                  { key: 6, name: props.selectedRow.contracttype === 1 ? '入库记录' : '出库记录' },
                   { key: 8, name: '变更记录' },
+                  { key: 9, name: '关联记录' },
               ];
         activeKey.value = 1;
         function tabClick() {
@@ -186,6 +177,79 @@ export default defineComponent({
                         tableList.value = res;
                     });
                     break;
+                case 9: //// 关联记录
+                    columns.value = [
+                        {
+                            title: '关联时间',
+                            dataIndex: 'spotgoodsprice',
+                            key: 'spotgoodsprice',
+                            align: 'center',
+                            width: 120,
+                            // customRender: ({ text, record }: { text: Number; record: Ermcp3SpotGoodsPrice }) => {
+                            //     return `${text + record.currencyname}/${record.gbenumdicname}`;
+                            // },
+                        },
+                        {
+                            title: '成交时间',
+                            dataIndex: 'spotgoodsprice',
+                            key: 'spotgoodsprice',
+                            align: 'center',
+                            width: 120,
+                        },
+                        {
+                            title: '业务类型',
+                            dataIndex: 'spotgoodsprice',
+                            key: 'spotgoodsprice',
+                            align: 'center',
+                            width: 120,
+                        },
+                        {
+                            title: '订单类型',
+                            dataIndex: 'spotgoodsprice',
+                            key: 'spotgoodsprice',
+                            align: 'center',
+                            width: 120,
+                        },
+                        {
+                            title: '套保品种',
+                            dataIndex: 'spotgoodsprice',
+                            key: 'spotgoodsprice',
+                            align: 'center',
+                            width: 120,
+                        },
+                        {
+                            title: '现货关联数量',
+                            dataIndex: 'spotgoodsprice',
+                            key: 'spotgoodsprice',
+                            align: 'center',
+                            width: 120,
+                        },
+                        {
+                            title: '关联方式',
+                            dataIndex: 'spotgoodsprice',
+                            key: 'spotgoodsprice',
+                            align: 'center',
+                            width: 120,
+                        },
+                        {
+                            title: '关联状态',
+                            dataIndex: 'spotgoodsprice',
+                            key: 'spotgoodsprice',
+                            align: 'center',
+                            width: 120,
+                        },
+                        {
+                            title: '期货单号',
+                            dataIndex: 'spotgoodsprice',
+                            key: 'spotgoodsprice',
+                            align: 'center',
+                            width: 120,
+                        },
+                    ];
+                    queryResultLoadingAndInfo(QueryPaTradeLinkDetail, loading).then((res) => {
+                        tableList.value = res;
+                    });
+                    break;
             }
         }