commit 接口修改

src/services/proto/spotcontract/index.ts

@@ -30,4 +30,4 @@ export const spotContractStatus = (param: SpotContractOperateReq): Promise<any>
         ...param, OperateSrc, ClientTicket, OperatorID
     }
     return protoMiddleware<SpotContractOperateReq>(reqParams, 'SpotContractOperateReq', 'SpotContractOperateRsp', 2)
-}
+}

src/services/proto/spotcontract/interface.ts

@@ -73,43 +73,43 @@ export interface SpotContractOperateReq {
 }
 
 export interface SpotContractInfo {
-    ContractNo: string; // string 现货合同编号
-    ContractType: number; // int32 现货合同类型-1:采购-1:销售
-    UserID: number; // uint32 机构ID
-    BuyUserID: number; // uint32 采购方ID
-    SellUserID: number; // uint32 客户ID
+    ContractNo?: string; // string 现货合同编号
+    ContractType?: number; // int32 现货合同类型-1:采购-1:销售
+    UserID?: number; // uint32 机构ID
+    BuyUserID?: number; // uint32 采购方ID
+    SellUserID?: number; // uint32 客户ID
     SignDate?: string; // string 签订日期
-    ContractAttachment: Uint8Array; // bytes 合同附件
-    ContractMargin: number; // double 合同保证金
-    DeliveryGoodsID: number; // uint32 现货品种ID
-    WrStandardID: number; // uint32 现货商品ID
-    ProductType: number; // uint32 产品类型-1:标准仓单2:等标3:非标
-    ConvertFactor: number; // double 标仓系数
-    SpotGoodsDesc: string; // string 商品型号
-    PriceType: number; // uint32 定价类型-1:一口价2:点价3:暂定价
-    Qty: number; // double 数量
-    Price: number; // double 价格暂定价[1:一口价、3:暂定价]
-    Amount: number; // double 金额[1:一口价、3:暂定价]
+    ContractAttachment?: Uint8Array; // bytes 合同附件
+    ContractMargin?: number; // double 合同保证金
+    DeliveryGoodsID?: number; // uint32 现货品种ID
+    WrStandardID?: number; // uint32 现货商品ID
+    ProductType?: number; // uint32 产品类型-1:标准仓单2:等标3:非标
+    ConvertFactor?: number; // double 标仓系数
+    SpotGoodsDesc?: string; // string 商品型号
+    PriceType?: number; // uint32 定价类型-1:一口价2:点价3:暂定价
+    Qty?: number; // double 数量
+    Price?: number; // double 价格暂定价[1:一口价、3:暂定价]
+    Amount?: number; // double 金额[1:一口价、3:暂定价]
     DeliveryStartDate?: string; // string 交收期(开始)
     DeliveryEndDate?: string; // string 交收期(结束)
-    GoodsID: number; // uint32 点价合约ID-0:为现货，其它为期货商品合约ID[2:点价3:暂定价]
-    PriceMove: number; // double 升贴水[2:点价3:暂定价]
-    StartDate: string; // string 点价开始日期[2:点价3:暂定价]
-    EndDate: string; // string 点价结束日期[2:点价3:暂定价]
-    PointDesc: string; // string 点价备注[2:点价3:暂定价]
-    DeliveryDesc: string; // string 交收方式
-    MerUserID: number; // uint32 跟单员ID
-    TradeUserID: number; // uint32 交易员ID
-    PricedQty: number; // double 已定价量
-    PricedAmount: number; // double 已定价金额
-    SpotGoodsBrandID: number; // uint32 现货品牌ID
-    Remark: string; // string 合同备注
-    SaleUserID: number; // uint32 业务员ID
-    AccountID: number; // uint64 期货账户ID
-    BizType: number; // uint32 业务类型 - 1:套保 2:套利
-    WrFactorTypeID: number; // uint64 仓单要素类型ID(212+Unix秒时间戳(10位)+xxxxxx)
-    CustomerUserID: number; // uint32 客户ID
-    RelatedUserID: number; // uint32 关联用户ID
+    GoodsID?: number; // uint32 点价合约ID-0:为现货，其它为期货商品合约ID[2:点价3:暂定价]
+    PriceMove?: number; // double 升贴水[2:点价3:暂定价]
+    StartDate?: string; // string 点价开始日期[2:点价3:暂定价]
+    EndDate?: string; // string 点价结束日期[2:点价3:暂定价]
+    PointDesc?: string; // string 点价备注[2:点价3:暂定价]
+    DeliveryDesc?: string; // string 交收方式
+    MerUserID?: number; // uint32 跟单员ID
+    TradeUserID?: number; // uint32 交易员ID
+    PricedQty?: number; // double 已定价量
+    PricedAmount?: number; // double 已定价金额
+    SpotGoodsBrandID?: number; // uint32 现货品牌ID
+    Remark?: string; // string 合同备注
+    SaleUserID?: number; // uint32 业务员ID
+    AccountID?: number; // uint64 期货账户ID
+    BizType?: number; // uint32 业务类型 - 1:套保 2:套利
+    WrFactorTypeID?: number; // uint64 仓单要素类型ID(212+Unix秒时间戳(10位)+xxxxxx)
+    CustomerUserID?: number; // uint32 客户ID
+    RelatedUserID?: number; // uint32 关联用户ID
 }
 
 // 现货合同操作响应 0 18 6

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

@@ -28,6 +28,8 @@ import { Modal } from 'ant-design-vue';
 import { orderContractOperateControl } from '@/views/information/spot-contract/components/setup';
 import { SpotContractOperateReq } from '@/services/proto/spotcontract/interface';
 import InfoDetail from '../infoDetail/index.vue';
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {orderContract} from "@/services/proto/spotcontract";
 
 export default defineComponent({
     name: 'spot-contract-detail',
@@ -48,19 +50,17 @@ export default defineComponent({
                 okText: '确认撤销',
                 cancelText: '取消',
                 onOk() {
-                    const params: SpotContractOperateReq = {
+                    const reqParam: SpotContractOperateReq = {
                         SpotContractID: props.selectedRow.spotcontractid,
-                        OperateType: 5,
+                        OperateType: 6,
                         Remark: '',
                     };
-                    // 撤销合同
-                    orderContractOperateControl(params, loading)
-                        .then((res) => {
-                            // 通知上层  刷新数据
+                    // Fixme 6/4 代码修改
+                    // 撤销  操作类型-1:保存草稿2:提交申请3:删除4:审核通过5:审核拒绝6:撤销
+                    requestResultLoadingAndInfo(orderContract, reqParam, loading, ['撤销成功', '撤销失败:']).then(() => {
                             context.emit('refresh');
                             cancel();
-                        })
-                        .catch((err) => {});
+                    });
                 },
                 onCancel() {
                     console.log('Cancel');

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

@@ -237,6 +237,10 @@ import { validateAction } from '@/common/setup/form';
 import { FormState } from './interface';
 import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
 import { handlerManagerList } from '@/common/setup/user';
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {hedgePlanReq} from "@/services/proto/hedgeplan";
+import {orderContract, spotContractStatus} from "@/services/proto/spotcontract";
+import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'spot-contract-detail',
@@ -266,16 +270,23 @@ export default defineComponent({
                     okText: '审核通过',
                     cancelText: '取消',
                     onOk() {
-                        const reqs: GldErmcpSpotContractOperateReq = {
+                        const reqParam: SpotContractOperateReq = {
                             SpotContractID: props.selectedRow.spotcontractid,
-                            OperateType: 4,
+                            OperateType: 3,
                             Remark: param.Remark,
-                            Info: { BizType: props.selectedRow.biztype, CurrencyID: props.selectedRow.currencyid, ...param },
+                            Info: { BizType: props.selectedRow.biztype,
+                                MerUserID: param.MerUserID as number,  //    跟单员ID
+                                SaleUserID: param.SaleUserID as number, //   业务员ID
+                                TradeUserID: param.TradeUserID as number,//  交易员ID
+                                Remark: param.Remark,
+                                UserID: getUserId()
+                            },
                         };
-                        // 审核通过
-                        orderContractControl(reqs, loading).then(() => {
-                            cancel();
+                        // Fixme 6/4 代码修改
+                        // 审核通过 SpotContractOperateReq operateType 操作类型-1:保存草稿(作废)2:提交申请(作废)3:审核通过4:审核拒绝(作废)5:撤回(作废)6:正常完结7:异常终止
+                        requestResultLoadingAndInfo(spotContractStatus, reqParam, loading, ['审核通过成功', '审核失败:']).then(() => {
                             context.emit('refresh');
+                            cancel();
                         });
                     },
                     onCancel() {
@@ -291,15 +302,16 @@ export default defineComponent({
                 cancelText: '取消',
                 onOk() {
                     const param = toRaw(formState);
-                    const reqs: SpotContractOperateReq = {
+                    const reqParam: GldErmcpSpotContractOperateReq = {
                         SpotContractID: props.selectedRow.spotcontractid,
-                        OperateType: 4,
+                        OperateType: 5,
                         Remark: param.Remark,
                     };
-                    // 审核拒绝
-                    orderContractOperateControl(reqs, loading).then(() => {
-                        cancel();
+                    // Fixme 6/4 代码修改
+                    // 审核拒绝  操作类型-1:保存草稿2:提交申请3:删除4:审核通过5:审核拒绝6:撤销
+                    requestResultLoadingAndInfo(orderContract, reqParam, loading, ['审核拒绝成功', '审核失败:']).then(() => {
                         context.emit('refresh');
+                        cancel();
                     });
                 },
                 onCancel() {

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

@@ -1,199 +1,220 @@
 <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>
-    </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'   -->
+    <!-- 现货合同详情-->
+    <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-table>
-    </div>
-  </a-modal>
+        <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>
+
+
+            </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 { columnsPointPrice, columnsFund, columnsSettlement, columnsInvoice, columnsInWarehouse } from './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: [],
+    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 {columnsPointPrice, columnsFund, columnsSettlement, columnsInvoice, columnsInWarehouse} from './setup';
+    import {getApplyStatusName} from "@/views/manage/business-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: [],
+            },
         },
-    },
-    setup: function(props, context) {
-        const { visible, cancel } = closeModal('detail');
-
-        const tabList = [
-            { key: 1, name: '合同详情' },
-            { key: 2, name: '点价记录' },
-            { key: 3, name: '交收记录' },
-            { key: 4, name: '款项记录' },
-            { key: 5, name: '发票记录' },
-            { key: 6, name: '入库记录' },
-            { key: 7, name: '变更记录' },
-        ];
-        const activeKey = ref<number>(1);
-
-        const loading = ref<boolean>(false);
-        const columns = ref<any[]>([]);
-        const tableList = ref<any[]>([]);
-
-        function tabClick() {
-            const relatedid = props.selectedRow.spotcontractid;
-            switch (activeKey.value) {
-                case 1:
-                    break;
-                case 2: // 点价记录
-                    queryResultLoadingAndInfo(QueryBusinessDj, loading, { relatedid }).then((res) => {
-                        columns.value = columnsPointPrice;
-                        tableList.value = res;
-                    });
-                    break;
-                case 3: // 交收记录
-                    queryResultLoadingAndInfo(QueryBusinessJs, loading, { relatedid }).then((res) => {
-                        columns.value = columnsSettlement;
-                        tableList.value = res;
-                    });
-                    break;
-                case 4: //款项记录
-                    queryResultLoadingAndInfo(QueryBusinessKx, loading, { relatedid }).then((res) => {
-                        columns.value = columnsFund;
-                        tableList.value = res;
-                    });
-                    break;
-                case 5: // 发票记录
-                    queryResultLoadingAndInfo(QueryBusinessFp, loading, { relatedid }).then((res) => {
-                        columns.value = columnsInvoice;
-                        tableList.value = res;
-                    });
-                    break;
-                case 6: // 入库记录
-                    queryResultLoadingAndInfo(QueryAreaStockApply, loading, { spotcontractid: relatedid, inouttype: '1,3' }).then((res) => {
-                        columns.value = columnsInWarehouse;
-                        tableList.value = res;
-                    });
-                    break;
-                case 7: // 变更记录
-                    queryResultLoadingAndInfo(QueryChangeLog, loading, { RelatedId: relatedid }).then((res) => {
-                        columns.value = columnsInWarehouse;
-                        tableList.value = res;
-                    });
-                    break;
+        setup: function (props, context) {
+            const {visible, cancel} = closeModal('detail');
+
+            const tabList = [
+                {key: 1, name: '合同详情'},
+                {key: 2, name: '点价记录'},
+                {key: 3, name: '交收记录'},
+                {key: 4, name: '款项记录'},
+                {key: 5, name: '发票记录'},
+                {key: 6, name: '入库记录'},
+                {key: 7, name: '变更记录'},
+            ];
+            const activeKey = ref<number>(1);
+
+            const loading = ref<boolean>(false);
+            const columns = ref<any[]>([]);
+            const tableList = ref<any[]>([]);
+
+            function tabClick() {
+                const relatedid = props.selectedRow.spotcontractid;
+                switch (activeKey.value) {
+                    case 1:
+                        break;
+                    case 2: // 点价记录
+                        queryResultLoadingAndInfo(QueryBusinessDj, loading, {relatedid}).then((res) => {
+                            columns.value = columnsPointPrice;
+                            tableList.value = res;
+                        });
+                        break;
+                    case 3: // 交收记录
+                        queryResultLoadingAndInfo(QueryBusinessJs, loading, {relatedid}).then((res) => {
+                            columns.value = columnsSettlement;
+                            tableList.value = res;
+                        });
+                        break;
+                    case 4: //款项记录
+                        queryResultLoadingAndInfo(QueryBusinessKx, loading, {relatedid}).then((res) => {
+                            columns.value = columnsFund;
+                            tableList.value = res;
+                        });
+                        break;
+                    case 5: // 发票记录
+                        queryResultLoadingAndInfo(QueryBusinessFp, loading, {relatedid}).then((res) => {
+                            columns.value = columnsInvoice;
+                            tableList.value = res;
+                        });
+                        break;
+                    case 6: // 入库记录
+                        queryResultLoadingAndInfo(QueryAreaStockApply, loading, {
+                            spotcontractid: relatedid,
+                            inouttype: '1,3'
+                        }).then((res) => {
+                            columns.value = columnsInWarehouse;
+                            tableList.value = res;
+                        });
+                        break;
+                    case 7: // 变更记录
+                        queryResultLoadingAndInfo(QueryChangeLog, loading, {RelatedId: relatedid}).then((res) => {
+                            columns.value = columnsInWarehouse;
+                            tableList.value = res;
+                        });
+                        break;
+                }
             }
-        }
-        return {
-            visible,
-            cancel,
-            loading,
-            maskClosableFlag: false,
-            activeKey,
-            columns,
-            tableList,
-            tabList,
-            tabClick,
-        };
-    },
-});
+
+            return {
+                visible,
+                cancel,
+                loading,
+                maskClosableFlag: false,
+                activeKey,
+                columns,
+                tableList,
+                tabList,
+                tabClick,
+                getApplyStatusName,
+            };
+        },
+    });
 </script>
 
 <style lang="less">
-.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-bar {
-                    margin-bottom: 0;
-                    border-bottom: 0;
-                }
-                .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-ink-bar {
-                                width: 70px !important;
-                                background: #3a87f7;
-                                .rounded-corners(1px);
+    .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-bar {
+                        margin-bottom: 0;
+                        border-bottom: 0;
+                    }
+
+                    .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-ink-bar {
+                                    width: 70px !important;
+                                    background: #3a87f7;
+                                    .rounded-corners(1px);
+                                }
                             }
                         }
                     }
                 }
             }
         }
-    }
-    .tableDatas {
-        margin-top: 26px;
-        padding: 0 24px;
-        overflow: hidden;
-        .dialogTable {
-            width: 100%;
-            overflow: overlay;
+
+        .tableDatas {
+            margin-top: 26px;
+            padding: 0 24px;
+            overflow: hidden;
+
+            .dialogTable {
+                width: 100%;
+                overflow: overlay;
+            }
+        }
+
+        .ant-form.inlineForm {
+            margin-top: 20px;
+            padding: 0 24px;
         }
     }
-    .ant-form.inlineForm {
-        margin-top: 20px;
-        padding: 0 24px;
-    }
-}
 </style
 >;

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

@@ -28,6 +28,8 @@ import { orderContractOperateControl } from '@/views/information/spot-contract/c
 import { Modal } from 'ant-design-vue';
 import { SpotContractOperateReq } from '@/services/proto/spotcontract/interface';
 import InfoDetail from '../infoDetail/index.vue';
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {orderContract, spotContractStatus} from "@/services/proto/spotcontract";
 
 export default defineComponent({
     name: 'spot-contract-finish',
@@ -49,19 +51,17 @@ export default defineComponent({
                 okText: '确认完结',
                 cancelText: '取消',
                 onOk() {
-                    const params: SpotContractOperateReq = {
+                    const reqParam: SpotContractOperateReq = {
                         SpotContractID: props.selectedRow.spotcontractid,
                         OperateType: 6,
                         Remark: '',
                     };
-                    // 完结合同
-                    orderContractOperateControl(params, loading)
-                        .then((res) => {
-                            // 通知上层  刷新数据
-                            context.emit('refresh');
-                            cancel();
-                        })
-                        .catch((err) => {});
+                    // Fixme 6/4 代码修改
+                    // 合同完结 SpotContractOperateReq operateType 操作类型-1:保存草稿(作废)2:提交申请(作废)3:审核通过4:审核拒绝(作废)5:撤回(作废)6:正常完结7:异常终止
+                    requestResultLoadingAndInfo(spotContractStatus, reqParam, loading, ['合同正常完结', '合同完结失败:']).then(() => {
+                        context.emit('refresh');
+                        cancel();
+                    });
                 },
                 onCancel() {
                     console.log('Cancel');

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

@@ -140,11 +140,11 @@
             <span class="white">{{ formatValue(findManagerName(selectedRow.meruserid, businessManager) ) }}</span>
           </a-form-item>
         </a-col>
-        <!-- <a-col :span="12">
-          <a-form-item label="期货账户">
-            <span class="white">{{ formatValue(selectedRow.accountid) }}</span>
+        <a-col :span="12">
+          <a-form-item label="交易用户">
+            <span class="white">{{ formatValue(selectedRow.tradeusername) }}</span>
           </a-form-item>
-        </a-col> -->
+        </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">