挂单 详情

src/services/go/wrtrade/interface.ts

@@ -263,7 +263,8 @@ export interface WrTradeDetail {
 export interface QueryWrGoodsInfoReq {
     marketid?: number//          仓单贸易市场id
     haswr: number//            0:仓单预售 1:仓单贸易
-    wrfactortypeid?: number//   仓单要素id
+    wrfactortypeid?: string | number//   仓单要素id
+    tmplateid?: number; // 履约模板id(如果指定了履约模板id,履约信息将按模板id查, 否则去市场配置表中找模板)
 }
 
 /**

src/views/market/spot_trade/components/detail/index.vue

@@ -1,33 +1,36 @@
 <template>
-    <!-- 买卖大厅详情 -->
-    <Drawer
-        :title="'详情'"
-        :placement="'right'"
-        :visible="visible"
-        class="top top486"
-        @cancel="cancel"
-    >
-        <div class="detailCont">
-            <div class="rows">
-                <div class="row" v-for="item in lstitem" :key="item.name">
-                    <div class="left">{{item.name}}</div>
-                    <div class="right">{{item.value}}</div>
-                </div>
-            </div>
-            <div class="ruleTitle">履约规则：</div>
-            <div class="rulesCont">
-                <a-row>
-                    <a-col :span="24" class="ruleCol">
-                        <div class="line" v-for="item in lststep" :key="item.autoid">
-                            <!-- <div class="no">{{index + 1}}</div> -->
-                            <div class="name">{{item.steptypename}}</div>
-                            <div class="time">{{item.stepdate}}</div>
-                        </div>
-                    </a-col>
-                </a-row>
-            </div>
+  <!-- 买卖大厅详情 -->
+  <Drawer :title="'详情'"
+          :placement="'right'"
+          :visible="visible"
+          class="top top486"
+          @cancel="cancel">
+    <div class="detailCont">
+      <div class="rows">
+        <div class="row"
+             v-for="item in lstitem"
+             :key="item.name">
+          <div class="left">{{item.name}}</div>
+          <div class="right">{{item.value}}</div>
         </div>
-    </Drawer>
+      </div>
+      <div class="ruleTitle">履约规则：</div>
+      <div class="rulesCont">
+        <a-row>
+          <a-col :span="24"
+                 class="ruleCol">
+            <div class="line"
+                 v-for="item in lststep"
+                 :key="item.autoid">
+              <!-- <div class="no">{{index + 1}}</div> -->
+              <div class="name">{{item.steptypename}}</div>
+              <div class="time">{{item.stepdate}}</div>
+            </div>
+          </a-col>
+        </a-row>
+      </div>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
@@ -65,6 +68,7 @@ export default defineComponent({
         const param: QueryWrGoodsInfoReq = {
             haswr: isSale() ? 0 : 1,
             wrfactortypeid: props.selectedRow.wrfactortypeid,
+            // tmplateid: props.selectedRow.performancetemplateid ? props.selectedRow.performancetemplateid : 0,
         };
         queryResultLoadingAndInfo(queryWrGoodsInfo, loading, param).then((res) => {
             if (res.length) {

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_swap/components/detail/index.vue

@@ -1,33 +1,36 @@
 <template>
-    <!-- 买卖大厅详情 -->
-    <Drawer
-        :title="'详情'"
-        :placement="'right'"
-        :visible="visible"
-        class="top top486"
-        @cancel="cancel"
-    >
-        <div class="detailCont">
-            <div class="rows">
-                <div class="row" v-for="item in lstitem" :key="item.name">
-                    <div class="left">{{item.name}}</div>
-                    <div class="right">{{item.value}}</div>
-                </div>
-            </div>
-            <div class="ruleTitle">履约规则：</div>
-            <div class="rulesCont">
-                <a-row>
-                    <a-col :span="24" class="ruleCol">
-                        <div class="line" v-for="item in lststep" :key="item.autoid">
-                            <!-- <div class="no">{{index + 1}}</div> -->
-                            <div class="name">{{item.steptypename}}</div>
-                            <div class="time">{{item.stepdate}}</div>
-                        </div>
-                    </a-col>
-                </a-row>
-            </div>
+  <!-- 买卖大厅详情 -->
+  <Drawer :title="'详情'"
+          :placement="'right'"
+          :visible="visible"
+          class="top top486"
+          @cancel="cancel">
+    <div class="detailCont">
+      <div class="rows">
+        <div class="row"
+             v-for="item in lstitem"
+             :key="item.name">
+          <div class="left">{{item.name}}</div>
+          <div class="right">{{item.value}}</div>
         </div>
-    </Drawer>
+      </div>
+      <div class="ruleTitle">履约规则：</div>
+      <div class="rulesCont">
+        <a-row>
+          <a-col :span="24"
+                 class="ruleCol">
+            <div class="line"
+                 v-for="item in lststep"
+                 :key="item.autoid">
+              <!-- <div class="no">{{index + 1}}</div> -->
+              <div class="name">{{item.steptypename}}</div>
+              <div class="time">{{item.stepdate}}</div>
+            </div>
+          </a-col>
+        </a-row>
+      </div>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
@@ -65,6 +68,7 @@ export default defineComponent({
         const param: QueryWrGoodsInfoReq = {
             haswr: isSale() ? 0 : 1,
             wrfactortypeid: props.selectedRow.wrfactortypeid,
+            // tmplateid: props.selectedRow.performancetemplateid,
         };
         queryResultLoadingAndInfo(queryWrGoodsInfo, loading, param).then((res) => {
             if (res.length) {

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/components/detail/index.vue

@@ -61,7 +61,8 @@ export default defineComponent({
         const lststep = ref<WrGoodsPerformanceStep[]>();
         const param: QueryWrGoodsInfoReq = {
             haswr: 0,
-            wrfactortypeid: Long.fromString(props.selectedRow.wrfactortypeid),
+            wrfactortypeid: props.selectedRow.wrfactortypeid,
+            tmplateid: props.selectedRow.performancetemplateid,
         };
         queryResultLoadingAndInfo(queryWrGoodsInfo, loading, param).then((res) => {
             if (res.length) {

src/views/order/spot_warran/components/spot_warrant_pending_order/components/detail/index.vue

@@ -61,7 +61,8 @@ export default defineComponent({
         const lststep = ref<WrGoodsPerformanceStep[]>();
         const param: QueryWrGoodsInfoReq = {
             haswr: 1,
-            wrfactortypeid: Long.fromString(props.selectedRow.wrfactortypeid),
+            wrfactortypeid: props.selectedRow.wrfactortypeid,
+            tmplateid: props.selectedRow.performancetemplateid,
         };
         queryResultLoadingAndInfo(queryWrGoodsInfo, loading, param).then((res) => {
             if (res.length) {