li.shaoyi 3 роки тому
батько
коміт
a0572a2c02

+ 1 - 1
src/views/hedgeditem/futures/in/components/add/index.vue

@@ -9,7 +9,7 @@
                     <a-col :span="12">
                         <a-form-item label="期货合约" name="GoodsID">
                             <a-select class="inlineFormSelect" placeholder="请选择合约" :filterOption="filterOption"
-                                v-model:value="formData.GoodsID" show-search style="width:200px">
+                                v-model:value="formData.GoodsID" @change="changeGoods" show-search style="width:200px">
                                 <a-select-option v-for="item in goodsList" :value="item.goodsid" :key="item.goodsid">{{
                                         item.goodsname
                                 }}</a-select-option>

+ 4 - 0
src/views/hedgeditem/spot/contract/components/bind/index.vue

@@ -59,6 +59,10 @@
                         <template #hedgedtype="{ text }">
                             <span>{{ getHedgedTypeName(text) }}</span>
                         </template>
+                        <!-- 现货商品 -->
+                        <template #wrstandardname="{ text }">
+                            <span>{{ formatValue(text) }}</span>
+                        </template>
                         <template #relatedqty="{ record, index }">
                             <a-input-number class="dialogInput" size="small"
                                 :disabled="!selectedRowKeys.includes(index)" :precision="0"

+ 4 - 0
src/views/hedgeditem/spot/plan/components/bind/index.vue

@@ -52,6 +52,10 @@
                         <template #hedgedtype="{ text }">
                             <span>{{ getHedgedTypeName(text) }}</span>
                         </template>
+                        <!-- 现货商品 -->
+                        <template #wrstandardname="{ text }">
+                            <span>{{ formatValue(text) }}</span>
+                        </template>
                     </a-table>
                 </div>
             </fieldset>

+ 13 - 2
src/views/hedgeditem/trade/finish/index.vue

@@ -19,13 +19,14 @@
             </a-table>
         </template>
     </mtp-table-scroll>
-    <mtp-tab-component class="table-detail" :options="{ selectedRow }" />
+    <mtp-tab-component class="table-detail" :options="{ selectedRow }" :filters="tabFilters" />
 </template>
 
 <script lang="ts">
+import { computed } from 'vue'
 import { queryTableList, MtpTableButton, defineComponent, handleComposeTable } from '@/common/export/commonTable'
 import { HedgedItemStatus } from '@/@next/constants/enum/hedgedItemStatus'
-import { getHedgedTypeName } from '@/@next/constants/enum/hedgedType'
+import { getHedgedTypeName, HedgedType } from '@/@next/constants/enum/hedgedType'
 import { getHedgedItemStatusName } from '@/@next/constants/enum/hedgedItemStatus'
 import { Ermcp2HedgedItemReq, Ermcp2HedgedItemRsp } from '@/services/go/ermcp/hedgedItem/interface'
 import { queryErmcp2HedgedItem } from '@/services/go/ermcp/hedgedItem'
@@ -62,10 +63,20 @@ export default defineComponent({
             tableName: 'table_pcweb_hedgeditem_trade_finish',
         })
 
+        // 过滤标签
+        const tabFilters = computed(() => {
+            const row = composeTable.selectedRow.value
+            if (row && row.hedgedtype === HedgedType.Spot) {
+                return ['hedgeditem_trade_running_plan'];
+            }
+            return [];
+        })
+
         return {
             ...composeTable,
             loading,
             tableList,
+            tabFilters,
             getHedgedTypeName,
             getHedgedItemStatusName,
         }