信息-客户资料-样式修改

public/proto/mtp.proto

@@ -743,3 +743,41 @@ message WRSConvertDetailEx {
 		optional uint64 unitid = 2; // uint64 单位ID
 		optional double convertratio = 3; // double 套保系数
 }
+
+// 仓库申请请求 0 29 141
+message WarehouseApplyReq {
+	optional MessageHead Header = 1; // MessageHead
+		optional uint64 userid = 2; // uint64 用户ID
+		optional int32 type = 3; // int32 类型 1 新增 2 修改
+		optional uint64 warehouseid = 4; // uint64 仓库ID
+		optional string warehousecode = 5; // string 仓库代码
+		optional string warehousename = 6; // string 仓库名称
+		optional int32 warehousetype = 7; // int32 仓库类型 - 1 厂库  2 自有库  3 合作库
+		optional uint64 provinceid = 8; // uint64 省
+		optional uint64 cityid = 9; // uint64 市
+		optional int32 districtid = 10; // int32 区
+		optional string address = 11; // string 详细地址
+		optional string contactname = 12; // string 联系人
+		optional string contactnum = 13; // string 联系电话
+}
+// 仓库申请请求 0 29 142
+message WarehouseApplyRsp {
+	optional MessageHead Header = 1; // MessageHead 消息头
+	optional int32 RetCode = 2; // int32 返回码
+	optional string RetDesc = 3; // string 描述信息
+	optional uint64 warehouseid = 4; // uint64 仓库ID
+}
+
+// 仓库状态修改请求 0 29 143
+message WarehouseStateChangeReq {
+	optional MessageHead Header = 1; // MessageHead
+	optional uint64 warehouseid = 2; // uint64 仓库ID
+	optional int32 warehousestatus = 3; // int32 仓库状态 - 1:正常 2:注销 3:待审核 4:审核拒绝
+}
+// 仓库状态修改请求 0 29 144
+message WarehouseStateChangeRsp {
+	optional MessageHead Header = 1; // MessageHead 消息头
+	optional int32 RetCode = 2; // int32 返回码
+	optional string RetDesc = 3; // string 描述信息
+	optional uint64 warehouseid = 4; // uint64 仓库ID
+}

src/components/drawer/index.vue

@@ -3,15 +3,16 @@
     <a-drawer :placement="placement"
               :closable="false"
               :visible="visible"
-              class="tradeDialog">  <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
+              class="tradeDialog">
+      <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
       <div class="collapse"
            @click="cancel"></div>
       <div class="collapseCont">
         <!-- <div class="title">{{ title }}</div> -->
         <div class="content highContent">
-            <!-- <Listed></Listed> -->
-            <!-- <Delisting></Delisting> -->
-            <Trade></Trade>
+          <!-- <Listed></Listed> -->
+          <!-- <Delisting></Delisting> -->
+          <Trade></Trade>
         </div>
       </div>
     </a-drawer>
@@ -49,10 +50,10 @@ export default defineComponent({
     components: {
         Listed,
         Delisting,
-        Trade
+        Trade,
     },
     setup(props, context) {
-        const { visible, cancel, handleOk } = closeModal(props.modalName);
+        const { visible, cancel } = closeModal(props.modalName);
         return {
             visible,
             cancel,

src/funcode/index.ts

@@ -67,4 +67,12 @@ export const funCode: Code = {
     DeliveryGoodsApplyRsp: 1900672, //  现货品种申请响应
     DeliveryGoodsCancelReq: 1900673, // 现货品种停用请求
     DeliveryGoodsCancelRsp: 1900674, // 现货品种停用响应
+
+    // 仓库信息
+    WareHouseApplyReq: 1900685,     /// 仓库申请请求
+    WareHouseApplyRsp: 1900686,    /// 仓库申请响应
+    WareHouseStateChangeReq: 1900687,    /// 仓库状态修改请求
+    WareHouseStateChangeRsp: 1900688,    /// 仓库状态修改响应
+
+
 };

src/goServiceAPI/ermcp/exposure/index.ts

@@ -1,55 +1,106 @@
 import APP from "@/services";
 import {commonSearch_go} from "@/goServiceAPI";
 import {
-    Ermcp3AreaSpot, Ermcp3AreaSpotDetail,
+    Ermcp3AreaSpot,
+    Ermcp3AreaSpotDetail,
+    Ermcp3AreaSpotDetailReq,
     Ermcp3ExposureDetail,
     Ermcp3ExposureReq,
+    ErmcpExposurePostion,
+    ErmcpExposurePostionReq,
+    ErmcpHedgePosition,
+    ErmcpHedgePositionDetail,
+    ErmcpHedgePositionDetailReq,
     ErmcpRealExposureModel
 } from "@/goServiceAPI/ermcp/exposure/interface";
 
 /** ================================= 敞口 ================================**/
 
 /**
- * 请求实时敞口 /Ermcp/QueryRealtimeExposure
+ * 请求实时敞口 (敞口 -> 实时敞口) /Ermcp/QueryRealtimeExposure
  * @constructor
  */
 export function QueryActualExposure() : Promise<ErmcpRealExposureModel[]>{
     const AreaUserID = APP.get('userAccount').memberuserid; // 所属机构id
     return commonSearch_go('/Ermcp/QueryRealtimeExposure', {AreaUserID})
         .catch(err => {
-            throw new Error(`查询实时敞口: ${err.message}`);
+            throw new Error(`查询敞口 -> 实时敞口: ${err.message}`);
         })
 }
 
 /**
- * 请求实时敞口现货明细信息 /Ermcp3/QueryExposureDetail
- * @param req
+ * 请求实时敞口现货明细信息 (敞口 ->实时敞口 -> 现货明细) /Ermcp3/QueryExposureDetail
+ * @param req.middlegoodsid 套保商品
  * @constructor
  */
 export function QueryActualExposureDetail(req: Ermcp3ExposureReq) : Promise<Ermcp3ExposureDetail[]>{
     const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
     return commonSearch_go('/Ermcp3/QueryExposureDetail', {areauserid, ...req})
         .catch(err => {
-            throw new Error(`查询实时敞口现货明细: ${err.message}`);
+            throw new Error(`查询敞口 ->实时敞口 -> 现货明细: ${err.message}`);
         })
 }
 
 /**
- * 请求敞口现货头寸 /Ermcp3/QueryExposureSpot
+ * 查询实时敞口期货头寸明细 (敞口 ->实时敞口 -> 期货明细) /Ermcp/QueryRealtimeExposurePosition
+ * @param req.middleGoodsId 套保商品ID
+ * @constructor
+ */
+export function QueryAutualExposurePosition(req: ErmcpExposurePostionReq): Promise<ErmcpExposurePostion[]>{
+    const areaUserId = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp3/QueryExposureDetail', {areaUserId, ...req})
+        .catch(err => {
+            throw new Error(`查询敞口 ->实时敞口 -> 期货明细: ${err.message}`);
+        })
+}
+
+/**
+ * 请求敞口现货头寸 (敞口 -> 现货头寸) /Ermcp3/QueryExposureSpot
  * @constructor
  */
 export function QuerySpotPosition() : Promise<Ermcp3AreaSpot[]>{
     const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp/QueryExposureSpot', {areauserid})
+    return commonSearch_go('/Ermcp3/QueryExposureSpot', {areauserid})
         .catch(err => {
-            throw new Error(`查询敞口现货头寸: ${err.message}`);
+            throw new Error(`查询敞口 -> 现货头寸: ${err.message}`);
         })
 }
 
-export function QuerySpotPositionDetail() : Promise<Ermcp3AreaSpotDetail[]>{
+/**
+ * 查询敞口现货头寸明细(敞口 -> 现货头寸 -> 现货明细) /Ermcp3/QueryExposureSpotDetail
+ * req.deliverygoodsid  现货品种ID
+ * @constructor
+ */
+export function QuerySpotPositionDetail(req: Ermcp3AreaSpotDetailReq) : Promise<Ermcp3AreaSpotDetail[]>{
     const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp/QueryExposureSpot', {areauserid})
+    return commonSearch_go('/Ermcp3/QueryExposureSpotDetail', {areauserid, ...req})
+        .catch(err => {
+            throw new Error(`查询敞口 -> 现货头寸 -> 现货明细: ${err.message}`);
+        })
+}
+
+/**
+ * 查询敞口期货头寸(菜单:敞口-> 期货头寸) /Ermcp/QueryExposureHedgePosition
+ * @constructor
+ */
+export function QueryExposureHedgePosition() : Promise<ErmcpHedgePosition>{
+    const areaUserId = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp/QueryExposureHedgePosition', {areaUserId})
         .catch(err => {
-            throw new Error(`查询敞口现货头寸: ${err.message}`);
+            throw new Error(`查询敞口 -> 期货头寸: ${err.message}`);
         })
-}
+}
+
+/**
+ * 查询敞口期货头寸期货明细(菜单:敞口 -> 期货头寸 -> 期货明细) /Ermcp/QueryExposureHedgePositionDetail
+ * @param req.goodsId  商品id
+ * @constructor
+ */
+export function QueryExposureHedgePositionDetail(req : ErmcpHedgePositionDetailReq) :Promise<ErmcpHedgePositionDetail[]>{
+    const areaUserId = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp/QueryExposureHedgePositionDetail', {areaUserId, ...req})
+        .catch(err => {
+            throw new Error(`查询敞口->期货头寸->期货明细: ${err.message}`);
+        })
+}
+

src/goServiceAPI/ermcp/exposure/interface.ts

@@ -63,6 +63,31 @@ export interface Ermcp3ExposureDetail{
 }
 
 /**
+ * 实时敞口期货明细请求
+ */
+export interface ErmcpExposurePostionReq{
+    middleGoodsId: number //套保商品ID
+}
+
+/**
+ * 实时敞口期货明细返回
+ */
+export interface ErmcpExposurePostion{
+    agreeunit	:string;//合约单位
+    areauserid	:number;//所属机构id
+    convertratio	:number;//期货品种系数(折算系数)
+    curqty	:number;//当前持仓
+    diffhedgeqty	:number;//套保品种变动量=持仓变动量期货合约单位期货品种系数
+    diffqty	:number;//持仓变动量=当前持仓-昨日持仓
+    goodscode	:string;//商品代码
+    goodsid	:number;//商品id
+    goodsname	:string;//商品名称
+    middlegoodsid	:number;//套保商品id
+    ydqty	:number;//昨日持仓
+}
+
+
+/**
  * 敞口现货头寸返回
  */
 export interface Ermcp3AreaSpot{
@@ -79,8 +104,11 @@ export interface Ermcp3AreaSpot{
     updatetime	:string;//更新时间
 }
 
+/**
+ * 敞口现货头寸明细请求
+ */
 export interface Ermcp3AreaSpotDetailReq{
-
+    deliverygoodsid: number  // 现货品种ID
 }
 
 /**
@@ -101,4 +129,57 @@ export interface Ermcp3AreaSpotDetail{
     strtime	:string;//时间
 }
 
+/**
+ * 敞口 -> 期货头寸 敞口期货头寸返回
+ */
+export interface ErmcpHedgePosition{
+    accountid	:number;//资金账号[外部母账户]
+    curbuyposition	:number;//期末买头寸
+    cursellposition	:number;//期末卖头寸
+    curtdbuyposition	:number;//期末今日买头寸
+    curtdsellposition	:number;//期末今日卖头寸
+    curydbuyposition	:number;//期末上日买头寸
+    curydsellposition	:number;//期末上日卖头寸
+    decreaseqty	:number;//减少数量 = (期末卖头寸 - 期初卖头寸)-1
+    fretdbuyposition	:number;//冻结今日买头寸
+    fretdsellposition	:number;//冻结今日卖头寸
+    freydbuyposition	:number;//冻结上日买头寸
+    freydsellposition	:number;//冻结上日卖头寸
+    goodscode	:string;//商品代码
+    goodsid	:number;//商品id
+    goodsname	:string;//商品名称
+    hedgeaccountcode	:string;//对冲账号
+    hedgegoodsid	:number;//对冲合约ID
+    increaseqty	:number;//增加数量 = 期末买头寸 - 期初买头寸
+    marketid	:number;//市场ID
+    relateduserid	:number;//关联用户id
+    totalcurqty	:number;//当前数量(净头寸) = 期末买头寸 - 期末卖头寸
+    totalydqty	:number;//昨日数量(净头寸) = 期初买头寸 - 期初卖头寸
+    tradedate	:string;//交易日(yyyyMMdd)
+    ydbuyposition	:number;//期初买头寸
+    ydsellposition	:number;//期初卖头寸
+}
+
+/**
+ * 查询敞口期货头寸期货明细 请求
+ */
+export interface ErmcpHedgePositionDetailReq{
+    goodsId: number // 商品id
+}
+
+/**
+ * 查询敞口期货头寸期货明细  敞口 -> 期货头寸 -> 期货明细
+ */
+export interface ErmcpHedgePositionDetail{
+    buyorsell	:number;//买卖方向 number;
+//-买 1-卖
+    channelbuildtype	:number;//开平方向 1-建仓 2-平仓
+    goodscode	:string;//商品代码
+    goodsname	:string;//商品名称
+    hedgegoodsid	:number;//商品id
+    tradeqty	:number;//数量(成交数量)
+    tradetime	:string;//时间(成交时间)
+}
+
+
 

src/protoService/warehouse/index.ts

@@ -0,0 +1,71 @@
+import {buildProtoReq50, parseProtoRsp50} from "@/services/socket/protobuf/buildReq";
+import APP from "@/services";
+import {Callback} from "@/utils/websocket";
+import {WarehouseApplyReq, WarehouseStateChangeReq} from "@/protoService/warehouse/interface";
+
+/**
+ * 新增 / 修改 仓库信息请求  修改需要传仓库id
+ * @param param.type (必填)   类型 1 新增 2 修改
+ * @param param.warehousecode (必填)   仓库代码
+ * @param param.warehousename (必填)   仓库名称
+ * @param param.warehousetype (必填)   仓库类型
+ */
+export const addWarehouseApply = (param: WarehouseApplyReq): Promise<any> => {
+    return new Promise((resolve, reject) => {
+        const params = {
+            protobufName: 'WareHouseApplyReq',
+            funCodeName: 'WareHouseApplyReq',
+            reqParams: param,
+            msgHeadParams: {
+                AccountID: param.accountid,
+                MarketID: 18,
+                GoodsID: 0,
+            }
+        };
+        const package50 = buildProtoReq50(params);
+        APP.sendTradingServer(package50, undefined, {
+            onSuccess: (res) => {
+                const { isSuccess, result } = parseProtoRsp50(res, 'WareHouseApplyRsp');
+                if (isSuccess) {
+                    resolve(result);
+                } else {
+                    reject(result);
+                }
+            },
+            onFail: (err) => reject(err.message),
+        } as Callback);
+    });
+}
+
+/**
+ * 仓库状态修改请求
+ * @param param.warehouseid  仓库ID
+ * @param param.warehousestatus 仓库状态 - 1:正常 2:注销 3:待审核 4:审核拒绝
+ */
+export const warehouseStateChangeReq = (param: WarehouseStateChangeReq): Promise<any> => {
+    return new Promise((resolve, reject) => {
+        const params = {
+            protobufName: 'WareHouseStateChangeReq',
+            funCodeName: 'WareHouseStateChangeReq',
+            reqParams: param,
+            msgHeadParams: {
+                AccountID: param.accountid,
+                MarketID: 18,
+                GoodsID: 0,
+            }
+        };
+        const package50 = buildProtoReq50(params);
+        APP.sendTradingServer(package50, undefined, {
+            onSuccess: (res) => {
+                const { isSuccess, result } = parseProtoRsp50(res, 'WareHouseStateChangeRsp');
+                if (isSuccess) {
+                    resolve(result);
+                } else {
+                    reject(result);
+                }
+            },
+            onFail: (err) => reject(err.message),
+        } as Callback);
+    });
+}
+

src/protoService/warehouse/interface.ts

@@ -0,0 +1,23 @@
+// 仓库申请请求 0 29 141
+export interface WarehouseApplyReq {
+    accountid: number
+    userid: number// uint64 用户ID
+    type: number // int32 类型 1 新增 2 修改
+    warehouseid?: number // uint64 仓库ID
+    warehousecode: string // string 仓库代码
+    warehousename: string // string 仓库名称
+    warehousetype: number  // int32 仓库类型 - 1 厂库  2 自有库  3 合作库
+    provinceid?: number  // uint64 省
+    cityid?: number  // uint64 市
+    districtid?: number  // int32 区
+    address?: string // string 详细地址
+    contactname?: string // string 联系人
+    contactnum?: string // string 联系电话
+}
+
+// 仓库状态修改请求 0 29 143
+export interface WarehouseStateChangeReq {
+    accountid: number
+    warehouseid: number // uint64 仓库ID
+    warehousestatus: number // int32 仓库状态 - 1:正常 2:注销 3:待审核 4:审核拒绝
+}

src/setup/controlModal/controlModal.ts

@@ -23,15 +23,7 @@ export function closeModal(modelName: keyof ModalName) {
         visible.value = false;
         show.value = false
     }
-    /**
-     * 带有回调函数关闭弹窗
-     * @param callback 
-     */
-    function handleOk(callback: Function) {
-        cancel();
-        callback && callback()
-    }
-    return { visible, cancel, handleOk }
+    return { visible, cancel }
 }
 
 /**

src/setup/controlModal/interface.ts

@@ -3,4 +3,5 @@ export interface ModalName {
     notice: string; // 消息
     logout: string; // 退出登录
     drawer: string; // 下单通用界面
+    addCustomInfo: string; // 新增客户资料
 }

src/utils/request/serviceURL.ts

@@ -75,7 +75,10 @@ export const setServiceURL = (config: URL): void => {
     serviceURL = config;
 
     // 外网环境（175），外包同事使用
-    serviceURL.goCommonSearchUrl = "http://218.17.158.45:21001/api"
-    serviceURL.quoteUrl = "ws://218.17.158.45:21004"
-    serviceURL.tradeUrl = "ws://218.17.158.45:21005"
+    if (process.env.NODE_ENV === 'development') {
+        serviceURL.goCommonSearchUrl = "http://218.17.158.45:21001/api"
+        serviceURL.quoteUrl = "ws://218.17.158.45:21004"
+        serviceURL.tradeUrl = "ws://218.17.158.45:21005"
+    }
+
 };

src/views/business/purchase/index.vue

@@ -2,7 +2,7 @@
   <!-- 采购 -->
   <div class="purchase">
     <firstMenu :list="list"
-               :value="'value'"
+               :value="'title'"
                @selectMenu="selectMenu" />
     <router-view />
   </div>
@@ -11,23 +11,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import firstMenu from '@/components/firstMenu/index.vue';
-import { useRouter } from 'vue-router';
-import { Purchase } from '@/enums/routerName';
-
-// 处理菜单
-function handleMenu() {
-    const router = useRouter();
-    const list = [
-        { key: Purchase.realTime, value: '实时敞口' },
-        { key: Purchase.spot, value: '现货头寸' },
-        { key: Purchase.forward, value: '期货头寸' },
-        { key: Purchase.history, value: '历史敞口' },
-    ];
-    function selectMenu(item: any) {
-        router.push({ name: item.key });
-    }
-    return { list, selectMenu };
-}
+import { handleRouterMenu } from '@/setup/router/index';
+import { initData } from '@/setup/methods/index';
 
 export default defineComponent({
     name: 'purchase',
@@ -35,7 +20,11 @@ export default defineComponent({
         firstMenu,
     },
     setup() {
-        const { list, selectMenu } = handleMenu();
+        const { list, selectMenu, getMenuList } = handleRouterMenu();
+        initData(() => {
+            getMenuList();
+            console.log('list', list);
+        });
         return { list, selectMenu };
     },
 });

src/views/information/custom/compoments/addCustom/index.vue

@@ -1,11 +1,16 @@
 <template>
   <!-- 新增客户资料 -->
   <a-modal class="add-custom"
+           title="新增客户资料"
            v-model:visible="visible"
            @cancel="cancel"
-           width="890px"
-           :footer="null"
-           @ok="handleOk">
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">完成</a-button>
+    </template>
     新增客户资料
   </a-modal>
 </template>
@@ -13,24 +18,27 @@
 <script lang="ts">
 import { defineComponent, ref } from 'vue';
 import { closeModal } from '@/setup/controlModal/index';
-import NoticeContent from './components/noticeContent.vue';
 import { initData } from '@/setup/methods/index';
-import { queryNotice } from '@/goServiceAPI/commonService/index';
-import { queryNoticeRsp } from '@/goServiceAPI/commonService/interface';
 
 export default defineComponent({
     name: 'add-custom',
-    components: {
-        NoticeContent,
-    },
+    components: {},
     setup() {
-        const { visible, cancel, handleOk } = closeModal('notice');
-
+        const { visible, cancel } = closeModal('addCustomInfo');
+        const loading = ref<boolean>(false);
+        function submit() {
+            loading.value = true;
+            setTimeout(() => {
+                loading.value = false;
+                cancel();
+            }, 2000);
+        }
         initData(() => {});
         return {
             visible,
             cancel,
-            handleOk,
+            submit,
+            loading,
         };
     },
 });

src/views/information/custom/compoments/filterTable/index.vue

@@ -23,11 +23,15 @@
     <a-button class="selectBtn"  @click="search">查询</a-button>
     <a-button class="selectBtn"  @click="reset">重置</a-button>
     <a-button class="operBtn" @click="add">新增</a-button>
+    <!-- 新增弹窗 -->
+    <AddCustom />
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, SetupContext, unref } from 'vue';
+import { defineComponent, ref, SetupContext } from 'vue';
+import AddCustom from '../addCustom/index.vue';
+import { openModal } from '@/setup/controlModal/index';
 
 // 搜索
 function handleSearch(context: SetupContext) {
@@ -62,9 +66,13 @@ function handleSearch(context: SetupContext) {
 
 export default defineComponent({
     name: 'filter-custom-table',
-    components: {},
+    components: {
+        AddCustom,
+    },
     setup(props, context) {
+        const { openAction } = openModal('addCustomInfo');
         function add() {
+            openAction();
             context.emit('add');
         }
         return {

src/views/information/custom/list/normal-use/index.vue

@@ -23,7 +23,6 @@ import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
 import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
 import filterCustomTable from '@/views/information/custom/compoments/filterTable/index.vue';
 import { getTableHead, ColumnType } from '@/services/bus/table';
-import { TableState, TableStateFilters } from 'ant-design-vue/es/table/interface';
 import { message } from 'ant-design-vue';
 import { useRouter } from 'vue-router';
 
@@ -64,13 +63,8 @@ function getCustomList() {
                 item.filteredValue = filtered.nickname || null;
             }
             if (e.columntitle === '客户名称') {
-                // 注意：这里绑定值 待确认
-                item.onFilter = (value: string, record: QueryCustomInfoType) => {
-                    // 用户信息类型 - 1:个人 2:企业
-                    const name = String(record.userinfotype) === '1' ? record.contactname : record.customername;
-                    name.includes(value);
-                    item.filteredValue = filtered.contactname || null;
-                };
+                item.onFilter = (value: string, record: QueryCustomInfoType) => record.contactname.includes(value);
+                item.filteredValue = filtered.contactname || null;
             }
             if (e.columntitle === '手机号码') {
                 item.onFilter = (value: string, record: QueryCustomInfoType) => record.mobile.includes(value);
@@ -105,6 +99,8 @@ function getCustomList() {
     return { customList, actionQuery, columns, filteredInfo, getColumns, search, loading };
 }
 
+// 处理新增资料
+
 function add() {
     console.log('add');
 }
@@ -121,7 +117,7 @@ export default defineComponent({
             getColumns();
             // 加载数据在这里
         });
-        return { customList, add, columns, search, loading };
+        return { customList, columns, search, loading, add };
     },
 });
 </script>

src/views/information/warehouse-info/index.vue

@@ -23,7 +23,6 @@ export default defineComponent({
         const { list, selectMenu, getMenuList } = handleRouterMenu();
         initData(() => {
             getMenuList();
-            console.log('list', list);
         });
         return { list, selectMenu };
     },

src/views/setting/logout/index.vue

@@ -3,8 +3,7 @@
            v-model:visible="visible"
            @cancel="cancel"
            width="890px"
-           :footer="null"
-           @ok="handleOk">
+           :footer="null">
     <div>logout</div>
     <div>logout</div>
     <div>logout</div>
@@ -25,13 +24,12 @@ export default defineComponent({
     name: 'logout',
 
     setup() {
-        const { visible, cancel, handleOk } = closeModal('logout');
+        const { visible, cancel } = closeModal('logout');
 
         initData(() => {});
         return {
             visible,
             cancel,
-            handleOk,
         };
     },
 });

src/views/setting/notice/index.vue

@@ -3,8 +3,7 @@
            v-model:visible="visible"
            @cancel="cancel"
            width="890px"
-           :footer="null"
-           @ok="handleOk">
+           :footer="null">
     <a-tabs v-model:activeKey="activeKey">
       <a-tab-pane key="1">
         <template #tab>
@@ -44,7 +43,7 @@ export default defineComponent({
         NoticeContent,
     },
     setup() {
-        const { visible, cancel, handleOk } = closeModal('notice');
+        const { visible, cancel } = closeModal('notice');
         // 公告消息
         const noticeList = ref<QueryNoticeRsp[]>([]);
 
@@ -57,7 +56,6 @@ export default defineComponent({
         return {
             visible,
             cancel,
-            handleOk,
             noticeList,
             activeKey: ref('1'),
         };