update

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

@@ -284,6 +284,7 @@ export interface InternalUncorrelatedTradeDetailRsp {
     linkdetailid: string; // 期货明细ID(614+Unix秒时间戳(10位)+xxxxxx)
     linkstatus: number; // 关联状态 - 1:成功 2:失败 3:解绑
     middlegoodsid: number; // 套保品种ID
+    middlegoodsqty: number; // 套保品种数量 = TradeQty * AgreeUnit * ConvertRatio
     relatedlot: number; // [数量]关联手数
     relatedmode: number; // 关联方式 - 1:自动关联 2:手动关联 3:解绑关联
     relatedqty: number; // [套期商品数量]关联数量 = RelatedLot * AgreeUnit * ConvertRatio

src/views/hedgeditem/futures/in/components/bind/form.ts

@@ -11,7 +11,7 @@ import { innerTradeLink } from '@/services/proto/hedgedItem'
 import { getAreaUserId } from '@/services/bus/user'
 
 export function useForm(selectedRow: InternalUncorrelatedTradeDetailRsp) {
-    const { tradeid, goodsid, tradelot } = selectedRow;
+    const { tradeid, goodsid, tradelot, relatedlot } = selectedRow;
     const { tableList, queryTable } = queryTableList<InternalEnableTradeDetailRsp>(true, 2); // 表格列表数据
     const loading = ref<boolean>(false);
     const selectedRowKeys = ref<number[]>([]); // 表格选中的 rowKey 数据 :rowKey="(record,index)=>index"
@@ -93,8 +93,8 @@ export function useForm(selectedRow: InternalUncorrelatedTradeDetailRsp) {
 
         if (seledtedRows.length) {
             if (seledtedRows.every((e) => e.relatedlot && e.relatedlot > 0)) {
-                if (currentQty.value > tradelot) {
-                    message.error('关联数量不能大于成交手数');
+                if (currentQty.value + relatedlot > tradelot) {
+                    message.error('当前关联手数不能大于可关联手数');
                 } else {
                     loading.value = true;
                     const result: Promise<InnerTradeLinkRsp>[] = [];

src/views/hedgeditem/futures/in/components/bind/index.vue

@@ -30,9 +30,7 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="成交手数">
-                            <span class="white">{{ selectedRow.tradelot }}手({{ selectedRow.enableqty
-                                    + selectedRow.enumdicname
-                            }})</span>
+                            <span class="white">{{ selectedRow.tradelot }} 手</span>
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
@@ -40,14 +38,20 @@
                             <span class="white">{{ formatValue(selectedRow.tradetime) }}</span>
                         </a-form-item>
                     </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="套保数量">
+                            <span class="white">{{ selectedRow.middlegoodsqty }} {{ selectedRow.enumdicname }}</span>
+                        </a-form-item>
+                    </a-col>
                 </a-row>
             </fieldset>
             <fieldset class="formFieldSet">
                 <legend>关联信息</legend>
                 <a-row :gutter="24">
                     <a-col :span="12">
-                        <a-form-item label="当前关联数量">
-                            <span class="up-quote-color">{{ currentQty }}手</span>
+                        <a-form-item label="当前关联手数">
+                            <span class="up-quote-color">{{ currentQty }} 手 (可关联手数
+                                {{ selectedRow.tradelot - selectedRow.relatedlot }} 手)</span>
                         </a-form-item>
                     </a-col>
                 </a-row>