fix: #1061

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

@@ -7,14 +7,14 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
-import { WrFinanceBuyApply } from '@/services/go/wrtrade/interface';
+import { WrFinanceBuyApply, WrOutInApply } from '@/services/go/wrtrade/interface';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { Modal } from 'ant-design-vue';
-import { WRTradeFinanceBuyCancel } from '@/services/proto/warehousetrade';
+import { WROutCancel } from '@/services/proto/warehousetrade';
+import { WROutCancelReq } from '@/services/proto/warehousetrade/interface';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { WRTradeFinanceBuyCancelReq } from '@/services/proto/warehousetrade/interface';
-import { getSelectedAccountId } from '@/services/bus/account';
+import { getSelectedAccountId, getUserId } from '@/services/bus/account';
 import { v4 as uuidv4 } from 'uuid';
 import Long from 'long';
 
@@ -24,7 +24,7 @@ export default defineComponent({
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrFinanceBuyApply>,
+            type: Object as PropType<WrOutInApply>,
             default: {},
         },
     },
@@ -39,14 +39,14 @@ export default defineComponent({
         });
         function submit() {
             // 挂牌撤单请求
-            // const paramReq: WRTradeFinanceBuyCancelReq = {
-            //     AccountID: getSelectedAccountId(), // uint64 资金账号
-            //     FinanceApplyID : Long.fromString(props.selectedRow.financeapplyid), // uint64 融资申请单ID
-            //     ClientSerialNo: uuidv4(), // 客户端流水号 // string 客户端流水号
-            // };
-            // requestResultLoadingAndInfo(WRTradeFinanceBuyCancel, paramReq, loading, ['撤销成功', '撤销失败:']).then(() => {
-            //     cancel(true);
-            // });
+            const paramReq: WROutCancelReq = {
+                applyid: Long.fromString(props.selectedRow.applyid),
+                operatesrc: 2,
+                ooperateid: getUserId(),
+            };
+            requestResultLoadingAndInfo(WROutCancel, paramReq, loading, ['撤销成功', '撤销失败:']).then(() => {
+                cancel(true);
+            });
         }
         return {
             visible,

src/views/order/spot_warran/components/spot_warrant_in_and_out_warehouse/components/pick_up/index.vue

@@ -7,16 +7,16 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
-import { WrFinanceBuyApply } from '@/services/go/wrtrade/interface';
+import { WrFinanceBuyApply, WrOutInApply } from '@/services/go/wrtrade/interface';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { Modal } from 'ant-design-vue';
-import { WRTradeFinanceBuyCancel } from '@/services/proto/warehousetrade';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { WRTradeFinanceBuyCancelReq } from '@/services/proto/warehousetrade/interface';
-import { getSelectedAccountId } from '@/services/bus/account';
+import { WROutConfirmReq, WRTradeFinanceBuyCancelReq } from '@/services/proto/warehousetrade/interface';
+import { getUserId } from '@/services/bus/account';
 import { v4 as uuidv4 } from 'uuid';
 import Long from 'long';
+import { WROutConfirm } from '@/services/proto/warehousetrade';
 
 export default defineComponent({
     name: ModalEnum.financing_manager_apply_cancel,
@@ -24,7 +24,7 @@ export default defineComponent({
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrFinanceBuyApply>,
+            type: Object as PropType<WrOutInApply>,
             default: {},
         },
     },
@@ -39,14 +39,14 @@ export default defineComponent({
         });
         function submit() {
             // 挂牌撤单请求
-            // const paramReq: WRTradeFinanceBuyCancelReq = {
-            //     AccountID: getSelectedAccountId(), // uint64 资金账号
-            //     FinanceApplyID : Long.fromString(props.selectedRow.financeapplyid), // uint64 融资申请单ID
-            //     ClientSerialNo: uuidv4(), // 客户端流水号 // string 客户端流水号
-            // };
-            // requestResultLoadingAndInfo(WRTradeFinanceBuyCancel, paramReq, loading, ['撤销成功', '撤销失败:']).then(() => {
-            //     cancel(true);
-            // });
+            const paramReq: WROutConfirmReq = {
+                applyid: Long.fromString(props.selectedRow.applyid),
+                operatesrc: 2,
+                operateid: getUserId(),
+            };
+            requestResultLoadingAndInfo(WROutConfirm, paramReq, loading, ['提货成功', '提货失败:']).then(() => {
+                cancel(true);
+            });
         }
         return {
             visible,