fix: #1871

src/common/constants/enumsName.ts

@@ -1398,10 +1398,10 @@ export function getAccountInOutApplyStatus(applystatus: number) {
             result = '待复审 '
             break
         case 3:
-            result = '签约中'
+            result = '初审拒绝'
             break
         case 4:
-            result = '已签约'
+            result = '交易冻结中'
             break
         case 5:
             result = '交易解冻中'

src/services/bus/holdPosition.ts

@@ -7,9 +7,12 @@ import { getQuoteDayInfoByCodeFindPrice } from "./goods";
 // 浮动盈亏	持仓单：
 // 收益权=(最新价-持仓价)*持仓数量*合约单位*方向(买[1]:卖[-1])(*汇率)
 // 所有权=(最新价*持仓数量*合约单位(*汇率) - 持仓金额)
-export const useProfitloss = (record: QueryTradePositionRsp) => {
+export const useProfitloss = (record: QueryTradePositionRsp, goodscode?: string) => {
     // 最新价
-    const lastPrice = getQuoteDayInfoByCodeFindPrice(record.goodscode);
+    if (!goodscode) {
+        goodscode = record.goodscode
+    }
+    const lastPrice = getQuoteDayInfoByCodeFindPrice(goodscode);
     if (lastPrice !== '--') {
         const { averageprice, decimalplace, agreeunit, curpositionqty, buyorsell } = record;
         const temp = buyorsell === BuyOrSell.buy ? 1 : -1

src/views/order/commodity_contract/components/commodity_contract_summary/index.vue

@@ -37,11 +37,14 @@
       </template> -->
       <!-- 持仓盈亏 -->
       <template #profitloss="{ record }">
-        <span>{{ record.averageprice ? useProfitloss(record) : '--' }}</span>
+        <span>{{ record.averageprice ? useProfitloss(record, findGoodsCode(record.goodsid, record.goodscode, swapList)) : '--' }}</span>
       </template>
       <template #buyorsell="{ record }">
         <span>{{ getBuyOrSellName(record.buyorsell) }}</span>
       </template>
+      <template #marketamount="{ record, text }">
+        <span>{{ isDiaoQi(record) ? text : '--' }}</span>
+      </template>
     </a-table>
     <component :is="componentId"
                v-if="componentId"
@@ -243,13 +246,16 @@ export default defineComponent({
             }
             return result;
         }
+        function isDiaoQi(record: QueryTradePositionRsp) {
+            return findGoodsTradeModeById(record.goodsid) === TradeMode.DiaoQi;
+        }
         function handleBtnList(record: QueryTradePositionRsp, btnList: BtnListType[]) {
             // 挂牌点选
             const listing = ['commodity_contract_summary_transfer', 'commodity_contract_summary_settlement'];
             // 贸易圈
             // 只有机构 才有平仓
             const diaoqi = isInvestment() ? ['commodity_contract_summary_deal_closed', 'commodity_contract_summary_order_closed'] : ['commodity_contract_summary_deal_closed'];
-            const arr = findGoodsTradeModeById(record.goodsid) === TradeMode.DiaoQi ? diaoqi : listing;
+            const arr = isDiaoQi(record) ? diaoqi : listing;
             return btnList.filter((e) => arr.includes(e.code));
         }
         return {
@@ -265,6 +271,8 @@ export default defineComponent({
             tabColumns,
             getBuyOrSellName,
             swapList,
+            findGoodsCode,
+            isDiaoQi,
         };
     },
 });