commit 提交代码

src/common/constants/enumsName.ts

@@ -637,9 +637,10 @@ export function getWrOrderTypeName(buyOrSell: number, wrTradeType: number) {
 
 /**
  * 履约类型 - 0:通用 1:交割 2:仓单贸易 3:预售集采 4:竞拍-降价式 (无仓单) 5:挂牌期权 6:竞拍-降价式 7:竞拍-竞价式 8:竞拍-大宗式 9:荷兰式 10:法币C2C 11:报价系统 12:挂牌系统
+ * /-仓单预售 1-仓单贸易
  * @param type
  */
-export function getPerformanceTypeName(type: number) {
+export function getPerformanceTypeName(type: number, haswr: number) {
     let result = '--'
     switch (type) {
         case 0:
@@ -650,6 +651,11 @@ export function getPerformanceTypeName(type: number) {
             break
         case 2:
             result = '预售仓单'
+            if(haswr === 1){
+                result = '仓单贸易'
+            }else{
+                result = '仓单预售'
+            }
             break
         case 3:
             result = '预售采集'

src/views/order/performance_information/components/performance_information_buy_performance/index.vue

@@ -21,7 +21,7 @@
       </template>
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, record.haswr) }}</a>
       </template>
 
       <!-- 付款方式 -->

src/views/order/performance_information/components/performance_information_sell_performance/index.vue

@@ -22,7 +22,7 @@
       </template>
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, record.haswr)}}</a>
       </template>
 
       <!-- 付款方式 -->