update

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/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/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

@@ -15,8 +15,9 @@
             <template #userinfotype="{ text }">
                 <a>{{ getUserInfoTypeName(text) }}</a>
             </template>
-            <template #attachment1="{ text,record }">
-                <a>{{ text }}</a><a>{{ record.attachment2 }}</a>
+            <template #attachment1="{ text, record }">
+                <a>{{ text }}</a
+                ><a>{{ record.attachment2 }}</a>
             </template>
             <template #cardtype="{ text }">
                 <a>{{ getCardTypeEnumItemName(text) }}</a>
@@ -35,7 +36,7 @@ import { ComposeTableParam, contextMenu, defineAsyncComponent, defineComponent,
 import { getTableButton } from '@/common/setup/table/button';
 import { QueryCustomInfo } from '@/services/go/ermcp/customInfo';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { getUserInfoTypeName, getStatusName ,getCardTypeEnumItemName} from '@/common/constants/enumsName';
+import { getUserInfoTypeName, getStatusName, getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Filter from './compoments/filterTable/index.vue';
 import { pingan_custom_column } from './setup';
 
@@ -96,7 +97,7 @@ export default defineComponent({
             pingan_custom_column,
             isPingAnOem,
             getUserInfoTypeName,
-            getCardTypeEnumItemName
+            getCardTypeEnumItemName,
         };
     },
 });

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;
             }
         }