修改撤单问题

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204"
+    "apiUrl": "http://192.168.31.203:8080/cfg?key=test_203"
 }

src/common/setup/table/button.ts

@@ -20,8 +20,8 @@ export function getClassName(val: string): BtnClassName {
     const operBtn = ['add', 'close', 'modify', 'recover', 'check', 'reset', 'resubmit', 'credit', 'payment', 'confirm_withdrawal', 'complete_stocking', 'upload_logistics', 'buy', 'listed', 'delisting',
         'receipt', 'confirm_pickup']
     const map = new Map<BtnClassName, string[]>([
-        ['btnDanger', btnDanger],
         ['operBtn', operBtn],
+        ['btnDanger', btnDanger],
     ])
     for (const [key, value] of map) {
         for (const item of value) {

src/services/proto/warehousetrade/index.ts

@@ -15,15 +15,11 @@ import { getInTaAccount } from '@/services/bus/account';
  * @param param
  */
 export const hdWROrder = (param: HdWROrderReq): Promise<any> => {
-    if (param.MarketID) {
-        const header: IMessageHead = {
-            MarketID: param.MarketID,
-            AccountID: getInTaAccount(),
-        }
-        return protoMiddleware<HdWROrderReq>(param, 'HdWROrderReq', 'HdWROrderRsp', header)
-    } else {
-        return protoMiddleware<HdWROrderReq>(param, 'HdWROrderReq', 'HdWROrderRsp', HeadEnum.tradeMode17)
+    const header: IMessageHead = {
+        MarketID: param.MarketID,
+        AccountID: getInTaAccount(),
     }
+    return protoMiddleware<HdWROrderReq>(param, 'HdWROrderReq', 'HdWROrderRsp', header)
 }
 
 /**
@@ -33,14 +29,11 @@ export const hdWROrder = (param: HdWROrderReq): Promise<any> => {
  * @constructor
  */
 export const HdWRDealOrder = (param: HdWRDealOrderReq): Promise<any> => {
-    if (param.MarketID) {
-        const header: IMessageHead = {
-            MarketID: param.MarketID,
-            AccountID: getInTaAccount(),
-        }
-        return protoMiddleware<HdWRDealOrderReq>(param, 'HdWRDealOrderReq', 'HdWRDealOrderRsp', header)
+    const header: IMessageHead = {
+        MarketID: param.MarketID,
+        AccountID: getInTaAccount(),
     }
-    return protoMiddleware<HdWRDealOrderReq>(param, 'HdWRDealOrderReq', 'HdWRDealOrderRsp', HeadEnum.tradeMode17)
+    return protoMiddleware<HdWRDealOrderReq>(param, 'HdWRDealOrderReq', 'HdWRDealOrderRsp', header)
 }
 /**
  * 议价摘牌请求
@@ -65,7 +58,11 @@ export const wROutApply = (param: WROutApplyReq): Promise<any> => {
  * @param param
  */
 export const wRListingCancelOrder = (param: WRListingCancelOrderReq): Promise<any> => {
-    return protoMiddleware<WRListingCancelOrderReq>(param, 'WRListingCancelOrderReq', 'WRListingCancelOrderRsp', HeadEnum.tradeMode17)
+    const header: IMessageHead = {
+        MarketID: param.MarketID,
+        AccountID: getInTaAccount(),
+    }
+    return protoMiddleware<WRListingCancelOrderReq>(param, 'WRListingCancelOrderReq', 'WRListingCancelOrderRsp', header)
 }
 
 

src/services/proto/warehousetrade/interface.ts

@@ -167,6 +167,7 @@ export interface WRListingCancelOrderReq {
     OperatorID: number; // uint64 操作员账号ID
     BuyOrSell: number; // uint32 买卖方向
     WRID: number; // uint64 仓单ID,卖的时候填写
+    MarketID?: number; // 市场ID
 }
 
 // 挂牌撤单应答 0 22 5

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

@@ -47,8 +47,10 @@ export default defineComponent({
         OperatorID: Number(geLoginID_number()), // uint64 操作员账号ID
         BuyOrSell: props.selectedRow.buyorsell, // uint32 买卖方向
         WRID: Long.fromString(props.selectedRow.wrfactortypeid), // uint64 仓单ID,卖的时候填写
+        MarketID: props.selectedRow.marketid,
       };
-      requestResultLoadingAndInfo(wRListingCancelOrder, param, loading, ['撤单成功', '撤单失败:']).then(() => {
+
+      return requestResultLoadingAndInfo(wRListingCancelOrder, param, loading, ['撤单成功', '撤单失败:']).then(() => {
         Bus.$emit('spotTrade', true);
         Bus.$emit('blocsTrade', true);
         cancel(true);
@@ -58,8 +60,15 @@ export default defineComponent({
     Modal.confirm({
       title: '撤单',
       content: '是否确认撤单！',
-      onOk: submit,
-      onCancel: cancel,
+      maskClosable: false,
+      onOk: async () => {
+        return submit();
+      },
+      onCancel: () => {
+        if (!loading.value) {
+          cancel()
+        }
+      },
     });
 
     return {

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

@@ -46,8 +46,10 @@ export default defineComponent({
         OperatorID: Number(geLoginID_number()), // uint64 操作员账号ID
         BuyOrSell: props.selectedRow.buyorsell, // uint32 买卖方向
         WRID: Long.fromString(props.selectedRow.wrfactortypeid), // uint64 仓单ID,卖的时候填写
+        MarketID: props.selectedRow.marketid,
       };
-      requestResultLoadingAndInfo(wRListingCancelOrder, param, loading, ['撤单成功', '撤单失败:']).then(() => {
+
+      return requestResultLoadingAndInfo(wRListingCancelOrder, param, loading, ['撤单成功', '撤单失败:']).then(() => {
         Bus.$emit('spotTrade', true);
         Bus.$emit('blocsTrade', true);
         cancel(true);
@@ -56,9 +58,16 @@ export default defineComponent({
 
     Modal.confirm({
       title: '撤单',
-      content: '是否确认撤单?',
-      onOk: submit,
-      onCancel: cancel,
+      content: '是否确认撤单！',
+      maskClosable: false,
+      onOk: async () => {
+        return submit();
+      },
+      onCancel: () => {
+        if (!loading.value) {
+          cancel()
+        }
+      },
     });
 
     return {