Fixed bug.

src/services/go/wrtrade/interface.ts

@@ -574,8 +574,8 @@ export interface WrMarketTradeConfig {
     marketid: number;//市场ID-仓单贸易、竞拍、预售
     minqty: number;//最小执行量[2:分步履约]
     modifierid: number;//修改人
-    performancetempid: number;//履约计划模板ID(有仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式： 立即执行(-1)
-    performancetempid2: number;//履约计划模板ID(无仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式： 立即执行
+    performancetempid: number;//履约计划模板ID(有仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约模板： 立即执行(-1)
+    performancetempid2: number;//履约计划模板ID(无仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约模板： 立即执行
     performanceway: number;//交货模式 - 1:履约计划 2:分步履约 3:分步提货[文昌]
     sellchargealgorithm: number;//卖方手续费收取方式 1：比率 2：固定
     sellchargealgorithm2: number;//回购卖方手续费收取方式 1：比率 2：固定 --77:现货商城
@@ -1138,7 +1138,7 @@ export interface QueryWrTradeBargainApplyQsp {
     orderqty: number;//挂牌数量
     refprice: string;//参考价格
     retcode: number;//委托返回代码
-    templatename: string;//履约方式(履约模板名称)
+    templatename: string;//履约模板(履约模板名称)
     tradedate: string;//交易日(yyyyMMdd)
     userid: number;//摘牌人用户ID(议价人ID)
     username: string;//议价人名字(已脱敏)

src/views/market/spot_trade/components/designate-post-buying/index.vue

@@ -88,7 +88,7 @@
             </a-col>
 
             <a-col :span="24">
-              <a-form-item label="履约方式"
+              <a-form-item label="履约模板"
                            class="inputIconBox">
                 <span :class="['clickBox', formState.permanceTempName ? 'white' : '']"
                       @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>

src/views/market/spot_trade/components/setup.ts

@@ -14,7 +14,7 @@ export function handleColumns() {
         { title: '整单', key: 'canpart', align: 'center', width: 80 },
         { title: '挂牌有效期', key: 'validtime', align: 'center', width: 120 },
         { title: '履约保证金', key: 'marginvalue', align: 'center', width: 120 },
-        { title: '履约方式', key: 'templatename', align: 'center', width: 140 },
+        { title: '履约模板', key: 'templatename', align: 'center', width: 140 },
         { title: '挂牌方', key: 'username', align: 'center', width: 100 },
     ];
     function getBuyOrSellColumns(type: BuyOrSell) {

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/post-buying/index.vue

@@ -97,7 +97,7 @@
             </a-col>
 
             <a-col :span="24">
-              <a-form-item label="履约方式"
+              <a-form-item label="履约模板"
                            class="inputIconBox">
                 <span :class="['clickBox', formState.permanceTempName ? 'white' : '']"
                       @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/setup.ts

@@ -15,7 +15,7 @@ export function handleColumns() {
         { title: '整单', key: 'canpart', align: 'center', width: 80 },
         { title: '挂牌有效期', key: 'validtime', align: 'center', width: 120 },
         { title: '履约保证金', key: 'marginvalue', align: 'center', width: 120 },
-        { title: '履约方式', key: 'templatename', align: 'center', width: 140 },
+        { title: '履约模板', key: 'templatename', align: 'center', width: 140 },
         { title: '挂牌方', key: 'username', align: 'center', width: 100 },
     ];
     function getBuyOrSellColumns(type: BuyOrSell) {

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_designate/components/post-buying/index.vue

@@ -97,7 +97,7 @@
             </a-col>
 
             <a-col :span="24">
-              <a-form-item label="履约方式"
+              <a-form-item label="履约模板"
                            class="inputIconBox">
                 <span :class="['clickBox', formState.permanceTempName ? 'white' : '']"
                       @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_designate/setup.ts

@@ -15,7 +15,7 @@ export function handleColumns() {
         { title: '整单', key: 'canpart', align: 'center', width: 80 },
         { title: '挂牌有效期', key: 'validtime', align: 'center', width: 120 },
         { title: '履约保证金', key: 'marginvalue', align: 'center', width: 120 },
-        { title: '履约方式', key: 'templatename', align: 'center', width: 140 },
+        { title: '履约模板', key: 'templatename', align: 'center', width: 140 },
         { title: '挂牌方', key: 'username', align: 'center', width: 100 },
     ];
     function getBuyOrSellColumns(type: BuyOrSell) {

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/index.vue

@@ -88,7 +88,7 @@
             </a-col>
 
             <a-col :span="24">
-              <a-form-item label="履约方式"
+              <a-form-item label="履约模板"
                            class="inputIconBox">
                 <span :class="['clickBox', formState.permanceTempName ? 'white' : '']"
                       @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/setup.ts

@@ -14,7 +14,7 @@ export function handleColumns() {
         { title: '整单', key: 'canpart', align: 'center', width: 80 },
         { title: '挂牌有效期', key: 'validtime', align: 'center', width: 120 },
         { title: '履约保证金', key: 'marginvalue', align: 'center', width: 120 },
-        { title: '履约方式', key: 'templatename', align: 'center', width: 140 },
+        { title: '履约模板', key: 'templatename', align: 'center', width: 140 },
         { title: '挂牌方', key: 'username', align: 'center', width: 100 },
     ];
     function getBuyOrSellColumns(type: BuyOrSell) {

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_designate/components/post-buying/index.vue

@@ -88,7 +88,7 @@
             </a-col>
 
             <a-col :span="24">
-              <a-form-item label="履约方式"
+              <a-form-item label="履约模板"
                            class="inputIconBox">
                 <span :class="['clickBox', formState.permanceTempName ? 'white' : '']"
                       @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_designate/setup.ts

@@ -14,7 +14,7 @@ export function handleColumns() {
         { title: '整单', key: 'canpart', align: 'center', width: 80 },
         { title: '挂牌有效期', key: 'validtime', align: 'center', width: 120 },
         { title: '履约保证金', key: 'marginvalue', align: 'center', width: 120 },
-        { title: '履约方式', key: 'templatename', align: 'center', width: 140 },
+        { title: '履约模板', key: 'templatename', align: 'center', width: 140 },
         { title: '挂牌方', key: 'username', align: 'center', width: 100 },
     ];
     function getBuyOrSellColumns(type: BuyOrSell) {

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/setup.ts

@@ -12,7 +12,7 @@ export function getSpotWarrantBargainColumns() {
         { title: '挂牌有效期', key: 'validtime', align: 'center', width: 120 },
         { title: '交收月', key: 'deliverymonth', align: 'center', width: 120 },
         { title: '履约保证金', key: 'marginvalue', align: 'center', width: 120 },
-        { title: '履约方式', key: 'templatename', align: 'center', width: 160 },
+        { title: '履约模板', key: 'templatename', align: 'center', width: 160 },
         { title: '最新议价价格', key: 'applyprice', align: 'center', width: 120 },
         { title: '最新议价数量', key: 'applyqty', align: 'center', width: 120 },
         { title: '最新议价时间', key: 'applytime', align: 'center', width: 160 },

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/index.vue

@@ -184,7 +184,7 @@
             </a-row>
             <a-row :gutter="24">
               <a-col :span="12">
-                <a-form-item label="履约方式"
+                <a-form-item label="履约模板"
                              class="inputIconBox">
                   <span :class="['clickBox', formState.permanceTempName ? 'white' : '']"
                         style="width: 140px"

src/views/order/spot_warran/components/spot_warrant_bargain/setup.ts

@@ -11,7 +11,7 @@ export function getSpotWarrantBargainColumns() {
         // { title: '整单', key: 'canpart', align: 'center', width: 80 },
         { title: '挂牌有效期', key: 'validtime', align: 'center', width: 120 },
         { title: '履约保证金', key: 'marginvalue', align: 'center', width: 120 },
-        { title: '履约方式', key: 'templatename', align: 'center', width: 160 },
+        { title: '履约模板', key: 'templatename', align: 'center', width: 160 },
         { title: '最新议价价格', key: 'applyprice', align: 'center', width: 120 },
         { title: '最新议价数量', key: 'applyqty', align: 'center', width: 120 },
         { title: '最新议价时间', key: 'applytime', align: 'center', width: 160 },

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/index.vue

@@ -80,7 +80,7 @@
             </a-col>
             <a-col :span="12">&nbsp;</a-col>
           </a-row>
-
+          <template v-if="isBlocs()">
           <a-row :gutter="24">
             <a-col :span="12">
               <a-form-item label="履约保证金" name="margin">
@@ -94,9 +94,10 @@
               </a-form-item>
             </a-col>
           </a-row>
+          </template>
           <a-row :gutter="24">
             <a-col :span="12">
-              <a-form-item label="履约方式" class="inputIconBox">
+              <a-form-item label="履约模板" class="inputIconBox">
                 <span :class="['clickBox', formState.permanceTempName ? 'white' : '']" style="width: 140px" @click="handlePermance">{{ formState.permanceTempName ? formState.permanceTempName : '选择履约模板' }}</span>
                 <svg class="icon svg-icon" aria-hidden="true" @click="handlePermance">
                   <use xlink:href="#icon-moban" />

src/views/order/spot_warran/index.vue

@@ -24,7 +24,7 @@ export default defineComponent({
     [enumOrderComponents.spot_warrant_inventory_summary]: defineAsyncComponent(() => import('./components/spot_warrant_inventory_summary/index.vue')),
     [enumOrderComponents.spot_warrant_pending_order]: defineAsyncComponent(() => import('./components/spot_warrant_pending_order/index.vue')),
     [enumOrderComponents.spot_warrant_spot_summary]: defineAsyncComponent(() => import('./components/spot_warrant_spot_summary/index.vue')),
-    [enumOrderComponents.spot_warrant_spot_details]: defineAsyncComponent(() => import('./components/spot_warrant_spot_details/index.vue')),
+    [enumOrderComponents.spot_warrant_spot_details]: defineAsyncComponent(() => import('./components/spot_warrant_spot_details/index.vue')), // 现货明细
     [enumOrderComponents.spot_warrant_bargain]: defineAsyncComponent(() => import('./components/spot_warrant_bargain/index.vue')),
   },
   setup() {