平仓

src/services/proto/warehousetrade/index.ts

@@ -1,8 +1,8 @@
 import {
     DeliveryOrderReq,
     HdWRDealOrderReq,
-    HdWROrderReq, PaymentArrearsReq, TradeHoldTransferApplyAuditReqType, TradeHoldTransferApplyReq, WarehouseRepurchaseReq, WrBargainApplyReq, WRListingCancelOrderReq, WROutApplyCancelReq,
-    WROutApplyReq, WROutCancelReq, WROutConfirmReq, WRTradeFinanceBuyCancelReq, HolderCloseReq
+    HdWROrderReq, HolderCloseReq, PaymentArrearsReq, TradeHoldTransferApplyAuditReqType, TradeHoldTransferApplyReq, WarehouseRepurchaseReq, WrBargainApplyReq, WRListingCancelOrderReq, WROutApplyCancelReq,
+    WROutApplyReq, WROutCancelReq, WROutConfirmReq, WRTradeFinanceBuyCancelReq
 } from "@/services/proto/warehousetrade/interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
 import { HeadEnum } from "@/services/socket/protobuf/protoHeader";
@@ -140,7 +140,7 @@ export const tradeHoldTransferApplyAuditReq = (param: TradeHoldTransferApplyAudi
  * @constructor
  */
 export const holderClose = (param: HolderCloseReq): Promise<any> => {
-    return protoMiddleware(param, 'HolderCloseReq', 'HolderCloseRsp', HeadEnum.tradeMode17)
+    return protoMiddleware(param, 'HolderCloseReq', 'HolderCloseRsp', HeadEnum.tradeMode46)
 }
 
 // /**

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_order_closed/index.vue

@@ -48,7 +48,8 @@
           </div>
         </div>
         <div class="fixedBtns">
-          <a-row :gutter="24">
+          <a-row :gutter="24"
+                 v-if="false">
             <a-col :span="24"
                    class="mt12">
               <a-form-item label="估算价"

src/views/order/commodity_contract/components/commodity_contract_summary/index.vue

@@ -230,8 +230,7 @@ export default defineComponent({
             // 挂牌点选
             const listing = ['commodity_contract_summary_transfer', 'commodity_contract_summary_settlement'];
             // 贸易圈
-            const diaoqi = ['commodity_contract_summary_deal_closed'];
-            // 'commodity_contract_summary_order_closed'
+            const diaoqi = ['commodity_contract_summary_deal_closed', 'commodity_contract_summary_order_closed'];
             const arr = findGoodsTradeModeById(record.goodsid) === TradeMode.DiaoQi ? diaoqi : listing;
             return btnList.filter((e) => arr.includes(e.code));
         }