#3565

src/views/market/spot_trade/warehouse_pre_sale/index.vue

@@ -1,11 +1,11 @@
 <template>
   <!-- 仓单预售 -->
   <router-view></router-view>
-  <ThridMenu :list="tabList" :selectedKey="index" @selectMenu="changeTab" />
+  <ThridMenu :list="tabs" :selectedKey="index" @selectMenu="changeTab" />
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, computed } from 'vue';
 import ThridMenu from '@/common/components/thirdMenu/index.vue';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { handleMartketThirdRouter } from '@/common/setup/matket/router';
@@ -16,9 +16,22 @@ export default defineComponent({
     ThridMenu,
   },
   setup() {
-    return { ...handleMartketThirdRouter(EnumRouterName.warehouse_pre_sale) };
-  },
-});
-</script>
-<style lang="less">
-</style>
+    const { tabList, index, changeTab } = handleMartketThirdRouter(EnumRouterName.warehouse_pre_sale);
+
+    const tabs = computed(() => {
+      return tabList.map((e) => {
+        if (e.code === 'warehouse_pre_sale_price') {
+          e.lable = '远期贸易';
+        }
+        return e;
+      })
+    })
+
+    return {
+      tabs,
+      index,
+      changeTab
+    }
+  }
+})
+</script>

src/views/order/swap_the_order/components/swap_commodity_contract_summary/components/detail/index.vue

@@ -2,8 +2,8 @@
   <!-- 商品订单-合约汇总-详情 -->
   <a-modal class="commonModal custom-finish" title="商品掉期交易确认书" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
     <template #footer>
-      <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="cancel">取消</a-button>
-      <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="cancel">确认</a-button>
+      <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="cancel(false)">取消</a-button>
+      <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="cancel(false)">确认</a-button>
     </template>
     <a-form class="inlineForm">
       <fieldset class="formFieldSet">

src/views/order/swap_the_order/components/swap_commodity_contract_summary/setup.ts

@@ -89,7 +89,7 @@ export const useDetail = () => {
             { key: 'holderamount', title: '建仓金额' },
             // { key: 'marketamount', title: '市值' },
             { key: 'profitloss', title: '浮动盈亏' },
-            { key: 'operate', title: '操作', width: 160 },
+            { key: 'operate', title: '操作', width: 200 },
         ]
         return useSetColumns(list)
     }