撤单

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

@@ -0,0 +1,70 @@
+<template>
+  <!-- 预售仓单 现货明细 撤单 -->
+  <div></div>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref } from 'vue';
+import Drawer from '@/common/components/drawer/index.vue';
+import { WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { getInTaAccount, getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { wRListingCancelOrder } from '@/services/proto/warehousetrade';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { _closeModal } from '@/common/setup/modal/modal';
+import { WRListingCancelOrderReq } from '@/services/proto/warehousetrade/interface';
+import * as Long from 'long';
+import { getLongTypeLoginID } from '@/services/bus/login';
+import { Modal } from 'ant-design-vue';
+
+export default defineComponent({
+    name: ModalEnum.pre_sale_warehouse_receipt_pending_order_cancel_order,
+    components: { Drawer },
+    emits: ['cancel'],
+    props: {
+        selectedRow: {
+            type: Object as PropType<WrOrderDetail>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+        const loading = ref<boolean>(false);
+
+        function submit() {
+            // const param: WRListingCancelOrderReq = {
+            //     UserID: getUserId(), // uint32 用户ID
+            //     AccountID: getInTaAccount(), // uint64 资金账号
+            //     OldWRTradeOrderID: Long.fromString(props.selectedRow.wrtradeorderid), // uint64 目标仓单贸易委托单ID
+            //     OrderSrc: 1, // uint32 委托来源
+            //     ClientSerialNo: uuidv4(), // string 客户端流水号
+            //     ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
+            //     ClientType: 4, // uint32 终端类型
+            //     OperatorID: Number(getLongTypeLoginID()), // uint64 操作员账号ID
+            //     BuyOrSell: props.selectedRow.buyorsell, // uint32 买卖方向
+            //     WRID: props.selectedRow.wrfactortypeid, // uint64 仓单ID,卖的时候填写
+            // };
+            // requestResultLoadingAndInfo(wRListingCancelOrder, param, loading, ['撤单成功', '撤单失败:']).then(() => {
+            //     cancel(true);
+            // });
+        }
+
+        Modal.confirm({
+            title: '撤单',
+            content: '是否确认撤单！',
+            onOk: submit,
+            onCancel: cancel,
+        });
+
+        return {
+            visible,
+            cancel,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+</style>;

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

@@ -1,78 +1,78 @@
 <template>
-    <!-- 仓单预售 挂单 -->
-    <section>
-        <a-table :columns="columns"
-                 class="srcollYTable"
-                 :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-                 :pagination="false"
-                 :loading="loading"
-                 :expandedRowKeys="expandedRowKeys"
-                 :customRow="Rowclick"
-                 rowKey="key"
-                 :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <BtnList :btnList="btnList"
-                         :record="record"
-                         @click="openComponent"
-                />
-            </template>
-            <!--  委托状态-->
-            <template #wrtradeorderstatus="{ record }">
-                <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
-            </template>
-            <!-- 挂牌类型 -->
-            <template #wrtradetype="{ record }">
-                <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-            </template>
-        </a-table>
-        <component :is="componentId"
-                   v-if="componentId"
-                   :selectedRow="selectedRow"
-                   @cancel="closeComponent"></component>
-    </section>
+  <!-- 仓单预售 挂单 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <BtnList :btnList="btnList"
+                 :record="record"
+                 @click="openComponent" />
+      </template>
+      <!--  委托状态-->
+      <template #wrtradeorderstatus="{ record }">
+        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+      </template>
+      <!-- 挂牌类型 -->
+      <template #wrtradetype="{ record }">
+        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+      </template>
+    </a-table>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </section>
 </template>
 
 <script lang="ts">
-    import {enumOrderComponents} from '@/common/constants/enumOrderComponents';
-    import {queryTableList, BtnList, defineAsyncComponent, defineComponent} from '@/common/export/commonTable';
-    import {queryWrOrderDetail} from '@/services/go/wrtrade';
-    import {QueryWrOrderDetailReq, WrOrderDetail} from '@/services/go/wrtrade/interface';
-    import {getRecordItemTab} from '@/common/setup/order/orderData';
-    import {handleComposeOrderTable} from '@/common/setup/table/compose';
-    import {ComposeOrderTableParam} from '@/common/setup/table/interface';
-    import {getWrOrderTypeName, getWrTradeOrderStatusName} from "@/common/constants/enumsName";
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { queryWrOrderDetail } from '@/services/go/wrtrade';
+import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
 
-    export default defineComponent({
-        name: enumOrderComponents.pre_sale_warehouse_receipt_pending_order,
-        components: {
-            BtnList,
-        },
-        setup() {
-            // 表格列表数据
-            const {loading, tableList, queryTable} = queryTableList<WrOrderDetail>();
-            // 获取列表数据
-            const queryTableAction = () => {
-                const param: QueryWrOrderDetailReq = {
-                    haswr: 0,
-                };
-                queryTable(queryWrOrderDetail, param);
+export default defineComponent({
+    name: enumOrderComponents.pre_sale_warehouse_receipt_pending_order,
+    components: {
+        BtnList,
+        [ModalEnum.pre_sale_warehouse_receipt_pending_order_cancel_order]: defineAsyncComponent(() => import('./components/cancle/index.vue')),
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryWrOrderDetailReq = {
+                haswr: 0,
             };
-            // 表格通用逻辑
-            const param: ComposeOrderTableParam = {
-                queryFn: queryTableAction,
-                tableName: 'table_pcweb_spot_trade_bottom_pre_sale_pending_order',
-                recordList: getRecordItemTab(),
-            };
-            return {
-                ...handleComposeOrderTable<WrOrderDetail>(param),
-                loading,
-                tableList,
-                getWrTradeOrderStatusName,
-                getWrOrderTypeName,
-            };
-        },
-    });
+            queryTable(queryWrOrderDetail, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_pre_sale_pending_order',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrOrderDetail>(param),
+            loading,
+            tableList,
+            getWrTradeOrderStatusName,
+            getWrOrderTypeName,
+        };
+    },
+});
 </script>
 
 <style lang="less">

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

@@ -1,33 +1,23 @@
 <template>
-  <!-- 现货仓单 现货明细 挂牌 -->
-  <Drawer :title="'撤单'"
-          :placement="'bottom'"
-          :visible="visible"
-          @cancel="cancel">
-    撤单
-  </Drawer>
+  <!-- 现货仓单 现货明细 撤单 -->
+  <div></div>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
-import {QueryWrPositionReq, WrHoldLB, WrOrderDetail, WrPosition} from '@/services/go/wrtrade/interface';
+import { WrOrderDetail } from '@/services/go/wrtrade/interface';
 import { getInTaAccount, getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import {hdWROrder, wRListingCancelOrder} from '@/services/proto/warehousetrade';
+import { wRListingCancelOrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';
 import moment from 'moment';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
-import { validateAction } from '@/common/setup/form';
-import { getMarketRunByTradeMode } from '@/services/bus/market';
-import { message } from 'ant-design-vue';
-import { getGoodsGroupsByTradeMode } from '@/services/bus/goods';
-import { TradeMode } from '@/common/constants/enumCommon';
-import {WRGoodsInfo, WRListingCancelOrderReq} from '@/services/proto/warehousetrade/interface';
-import * as Long from "long";
-import {getLongTypeLoginID} from "@/services/bus/login";
+import { WRListingCancelOrderReq } from '@/services/proto/warehousetrade/interface';
+import * as Long from 'long';
+import { getLongTypeLoginID } from '@/services/bus/login';
+import { Modal } from 'ant-design-vue';
 
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_listed,
@@ -41,14 +31,13 @@ export default defineComponent({
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
-        console.log('selectedRow', props.selectedRow);
         const loading = ref<boolean>(false);
 
         function submit() {
             const param: WRListingCancelOrderReq = {
-                UserID: getUserId(),// uint32 用户ID
+                UserID: getUserId(), // uint32 用户ID
                 AccountID: getInTaAccount(), // uint64 资金账号
-                OldWRTradeOrderID: Long.fromString(props.selectedRow.wrtradeorderid),  // uint64 目标仓单贸易委托单ID
+                OldWRTradeOrderID: Long.fromString(props.selectedRow.wrtradeorderid), // uint64 目标仓单贸易委托单ID
                 OrderSrc: 1, // uint32 委托来源
                 ClientSerialNo: uuidv4(), // string 客户端流水号
                 ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
@@ -56,14 +45,18 @@ export default defineComponent({
                 OperatorID: Number(getLongTypeLoginID()), // uint64 操作员账号ID
                 BuyOrSell: props.selectedRow.buyorsell, // uint32 买卖方向
                 WRID: props.selectedRow.wrfactortypeid, // uint64 仓单ID,卖的时候填写
-            }
-            debugger
+            };
             requestResultLoadingAndInfo(wRListingCancelOrder, param, loading, ['撤单成功', '撤单失败:']).then(() => {
-                cancel();
+                cancel(true);
             });
         }
 
-        submit()
+        Modal.confirm({
+            title: '撤单',
+            content: '是否确认撤单！',
+            onOk: submit,
+            onCancel: cancel,
+        });
 
         return {
             visible,