commit 一些枚举以及撤单

src/common/constants/enumsName.ts

@@ -549,4 +549,79 @@ export function getChangeLogType(changelogtype: number) {
             break
     }
     return result
+}
+
+//仓单委托状态
+// 委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 10:挂牌部分成交 11:仓单生成失败 12:首付扣款失败 13:履约失败 14:撤单解冻贷款失败 15:部成部撤
+export function getWrTradeOrderStatusName(type: number){
+    let result = '--'
+    switch (type) {
+        case 1:
+            result = '委托请求'
+            break
+        case 2:
+            result = '待冻结'
+            break
+        case 3:
+            result = '委托成功'
+            break
+        case 4:
+            result = '委托失败'
+            break
+        case 5:
+            result = '配对成功'
+            break
+        case 6:
+            result = '已撤'
+            break
+        case 7:
+            result = '已成'
+            break
+        case 8:
+            result = '成交失败'
+            break
+        case 9:
+            result = '委托拒绝'
+            break
+        case 10:
+            result = '挂牌部分成交'
+            break
+        case 11:
+            result = '仓单生成失败'
+            break
+        case 12:
+            result = '首付扣款失败'
+            break
+        case 13:
+            result = '履约失败'
+            break
+        case 14:
+            result = '撤单解冻贷款失败'
+            break
+        case 15:
+            result = '部成部撤'
+            break
+    }
+    return result
+}
+
+/**
+ * 挂牌类型  卖入 买入 卖出
+ * @param buyOrSell 买卖 - 0:买 1:卖(挂牌类型 买为采购 卖为销售)
+ * @param wrTradeType 1:挂牌 2:摘牌
+ */
+export function getWrOrderTypeName(buyOrSell: number, wrTradeType: number){
+    let result = '--'
+    if(buyOrSell === 0 && wrTradeType === 1){
+        result = "买入"
+    }else if(buyOrSell === 1 && wrTradeType === 1){
+        result = "卖出"
+    }else if(buyOrSell === 0 && wrTradeType === 2){
+        result = "买出"
+    }else if(buyOrSell === 1 && wrTradeType === 2){
+        result = "卖入"
+    }
+    return result
+
+
 }

src/services/proto/warehousetrade/index.ts

@@ -31,7 +31,7 @@ export const HdWRDealOrder = (param: HdWRDealOrderReq): Promise<any> => {
  * @param param
  */
 export const wROutApply = (param: WROutApplyReq): Promise<any> => {
-    return protoMiddleware<WROutApplyReq>(param, 'WROutApplyReq', 'WROutApplyRsp', 2)
+    return protoMiddleware<WROutApplyReq>(param, 'WROutApplyReq', 'WROutApplyRsp', HeadEnum.tradeMode17)
 }
 
 /**

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

@@ -1,65 +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>
-    </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';
-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,
+    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";
+
+    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);
+            };
+            // 表格通用逻辑
+            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,
-        };
-    },
-});
+        },
+    });
 </script>
 
 <style lang="less">

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

@@ -27,6 +27,7 @@ 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";
 
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_listed,
@@ -52,7 +53,7 @@ export default defineComponent({
                 ClientSerialNo: uuidv4(), // string 客户端流水号
                 ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
                 ClientType: 4, // uint32 终端类型
-                OperatorID:  getUserId(), // uint64 操作员账号ID
+                OperatorID: Number(getLongTypeLoginID()), // uint64 操作员账号ID
                 BuyOrSell: props.selectedRow.buyorsell, // uint32 买卖方向
                 WRID: props.selectedRow.wrfactortypeid, // uint64 仓单ID,卖的时候填写
             }

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 挂单 -->
+  <!-- 现货仓单 挂单 -->
   <section>
     <a-table :columns="columns"
              class="srcollYTable"
@@ -16,6 +16,14 @@
                  :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"
@@ -32,6 +40,7 @@ import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/inte
 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.spot_warrant_pending_order,
     components: {
@@ -58,6 +67,8 @@ export default defineComponent({
             ...handleComposeOrderTable<WrOrderDetail>(param),
             loading,
             tableList,
+            getWrTradeOrderStatusName,
+            getWrOrderTypeName,
         };
     },
 });

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

@@ -88,14 +88,18 @@
 import { defineComponent, PropType, ref } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
-import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
-import { getUserId } from '@/services/bus/account';
+import {QueryWrPositionReq, WrHoldLB, WrPosition, WrTradeDetail} from '@/services/go/wrtrade/interface';
+import {getSelectedAccountId, getUserId} from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { hdWROrder } from '@/services/proto/warehousetrade';
+import {hdWROrder, wROutApply} 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 {WROutInDetail} from "@/services/proto/warehousetrade/interface";
+import {getUUID} from "@/utils/qt/common";
+import {getLongTypeLoginID} from "@/services/bus/login";
+import * as Long from "long";
 
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_pick_up,
@@ -103,7 +107,7 @@ export default defineComponent({
     emits: ['cancel'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrPosition>,
+            type: Object as PropType<WrHoldLB>,
             default: {},
         },
     },
@@ -112,9 +116,30 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const { visible, cancel } = _closeModal(context);
         // console.log(param);
-        // requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
-        //     // cancel(true);
-        // });
+
+       const param = {
+            ClientSerialID: getUUID(),  // uint64 客户端唯一ID
+            WRStandardID: props.selectedRow.wrstandardid, // uint64 仓单标准ID
+            WarehouseID: props.selectedRow.warehouseid, // uint64 仓库ID
+            UserID: getUserId(), // uint64 申请人ID
+            AccountID: getSelectedAccountId()?.toString(), // uint64 申请人账户ID
+            AppointmentDate: "20200730", // string 预约出库时间（格式：20200101）
+            AppointmentModel: 3, // uint32 预约方式:1-物流,2-自送，3-自提
+            ContactName: "111", // string 收货人提货人
+            ContactNum: "131", // string 收货人提货人手机
+            AppointmentRemark: "", // string 预约备注
+            CreatorID: Number(getLongTypeLoginID()), // uint64 创建人ID
+            WROutInDetails: {
+                LadingBillID: props.selectedRow.ladingbillid, // string 提单ID
+                SubNum: props.selectedRow.subnum, // uint64 提单子单号
+                Qty: 1, // uint64 子提单总数量
+                OutQty: 1, // uint64 预约数量
+            } as WROutInDetail// WROutInDetail 仓单出库提单明细数据
+        }
+
+        requestResultLoadingAndInfo(wROutApply, param, loading, ['提货成功', '提货失败:']).then(() => {
+            // cancel(true);
+        });
         return {
             visible,
             cancel,