修改 获取loginid 方法

src/services/bus/login.ts

@@ -7,13 +7,12 @@ import { getAllEnums, GetPCMenus, getServerTime, queryErrorInfos, QueryTableDefi
 import { GetErmcpGoods, QueryDeliveryGoodsDetail } from '@/services/go/ermcp/goodsInfo';
 import { GetLoginID, LoginQuery } from '@/services/go/useInfo/index';
 import { sessionStorageUtil } from '@/utils/storage/index';
-import Long from 'long';
 import { queryMarketRun } from '../go/commonMarket';
 import { getTaAccount } from '../go/TaAccount';
 import { queryWrMarketTradeConfig } from '../go/wrtrade';
 import { logoutResponse } from '../socket/login';
 import { loginAction } from '../socket/login/index';
-import { LoginResponse, LongType } from '../socket/login/interface/index';
+import { LoginResponse } from '../socket/login/interface/index';
 import { getMarketByTradeMode } from './market';
 
 export const logout = (): void => {
@@ -66,7 +65,8 @@ export const login = async (logidCode: string, password: string, byteArr: Uint8A
  */
 export function setLoginData(loginData: LoginResponse) {
     console.log('loginData', loginData);
-
+    loginData.id = loginData.LoginID.toNumber()
+    debugger
     sessionStorageUtil.setItem('loginData', loginData);
 }
 
@@ -96,11 +96,14 @@ export const isLogin = (): boolean => {
 /**
  * 获取当前登录id的方法
  */
-export const getLongTypeLoginID = (): LongType | null => {
+export const geLoginID_number = (): number | null => {
     if (isLogin()) {
-        const loginData = getLoginData().LoginID;
-        const { low, high, unsigned } = loginData;
-        return new Long(low, high, unsigned);
+        // const id = getLoginData().LoginID;
+        // debugger
+        // const loginData = getLoginData().LoginID;
+        // const { low, high, unsigned } = loginData;
+        // return new Long(low, high, unsigned);
+        return getLoginData()!.id
     } else {
         return null;
     }

src/services/go/TaAccount/index.ts

@@ -1,6 +1,6 @@
 import APP from '@/services';
 import { setSelectedAccount } from '@/services/bus/account';
-import { getLongTypeLoginID } from "@/services/bus/login";
+import { geLoginID_number } from "@/services/bus/login";
 import { GetTaAccountsReq, QueryAmountLogReq, QueryAmountLogRsp, Taaccount } from "@/services/go/TaAccount/interface";
 import { commonSearch_go } from "..";
 
@@ -8,7 +8,7 @@ import { commonSearch_go } from "..";
  *  获取资金账户信息
  */
 export function getTaAccount() {
-    const loginID = getLongTypeLoginID()?.toNumber()
+    const loginID = geLoginID_number()
     return commonSearch_go('/TaAccount/GetTaAccounts', { loginID }).then(res => {
         APP.set('accountList', res);
         if (res.length) {

src/services/go/commonService/index.ts

@@ -1,7 +1,7 @@
 import { getOem, isOemByEnum, OemType } from '@/common/config/projectName';
 import APP from '@/services';
 import { setAllEnum } from '@/services/bus/allEnum';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { localStorageUtil } from '@/utils/storage';
 import moment from 'moment';
 import { commonSearch_go } from '../index';
@@ -71,7 +71,7 @@ export function queryErrorInfos(rowNumber?: string): Promise<string> {
  * @param noticeID 通知公告ID
  */
 export function queryNoticeReaded(noticeID: number): Promise<string> {
-    const param = { noticeID, loginID: Number(getLongTypeLoginID()) };
+    const param = { noticeID, loginID: geLoginID_number() };
     return commonSearch_go('/Common/NoticeReaded', param, 'post')
         .then(() => 'ok')
         .catch((err: Error) => {
@@ -83,7 +83,7 @@ export function queryNoticeReaded(noticeID: number): Promise<string> {
  * 通知公告系统消息查询
  */
 export function queryNotice(): Promise<type.QueryNoticeRsp[]> {
-    const param = { loginID: Number(getLongTypeLoginID()) };
+    const param = { loginID: geLoginID_number() };
     return commonSearch_go('/Common/QueryNotice', param).catch((err: Error) => {
         throw new Error(`通知公告系统消息查询失败:${err}`);
     });
@@ -95,9 +95,10 @@ export function GetPCMenus(): Promise<string> {
     // 目前只有平安期货需要 oem 这个参数 请求菜单数据，如后续添加需要根据name获取菜单，此处需要修改
     const obj = isOemByEnum(OemType.pingan) ? { name: getOem() } : {}
     const param = {
-        loginID: Number(getLongTypeLoginID()),
+        loginID: geLoginID_number(),
         clientType: 0, // 终端类型，0：PC 1：Mobile
     };
+    debugger
     Object.assign(param, obj)
     return commonSearch_go('/Common/GetClientMenus', param)
         .then((res) => {

src/services/go/ermcp/outaccount-status/index.ts

@@ -1,4 +1,4 @@
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { commonSearch_go } from '../../index';
 import * as type from './interface';
 
@@ -7,6 +7,6 @@ import * as type from './interface';
  * @returns GetErmcpOutAccountStatus[]
  */
 export function GetErmcpOutAccountStatus(): Promise<type.GetErmcpOutAccountStatus[]> {
-    const id = getLongTypeLoginID();
+    const id = geLoginID_number();
     return commonSearch_go('/Ermcp/GetErmcpOutAccountStatus', { loginID: Number(id) })
 }

src/services/go/useInfo/index.ts

@@ -1,5 +1,5 @@
 import APP from '@/services';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { getUsrId } from '@/services/bus/user';
 import { commonSearch_go } from '../index';
 import * as type from './interface';
@@ -28,7 +28,7 @@ export function GetUserAccount(userID: number): Promise<type.GetUserAccount> {
  * @returns
  */
 export function LoginQuery(): Promise<type.LoginQueryRsp> {
-    const id = getLongTypeLoginID();
+    const id = geLoginID_number();
     return commonSearch_go('/User/LoginQuery', { loginID: Number(id) }).then(res => {
         const {
             areaRoles,

src/services/proto/accountinfo/index.ts

@@ -1,5 +1,5 @@
 import { getUserId } from "@/services/bus/account";
-import { getLongTypeLoginID } from "@/services/bus/login";
+import { geLoginID_number } from "@/services/bus/login";
 import {
     AuditWskhUserInfoReq, AuditWskhUserInfoRsp,
     CustomerInfoOperateReq, CustomerInfoOperateRsp,
@@ -43,7 +43,7 @@ export const roleOperate = (param: ManagerRoleOperateReq): Promise<ManagerRoleOp
  */
 export const loginAccountOperate = (param: LoginaccountOperateReq): Promise<LoginaccountOperateRsp> => {
     const obj = {
-        modifierid: Number(getLongTypeLoginID()),
+        modifierid: geLoginID_number(),
         areauserid: getUserId(),
     }
     Object.assign(param, obj)

src/services/proto/contract/index.ts

@@ -1,9 +1,8 @@
-import { getLongTypeLoginID } from "@/services/bus/login";
+import { geLoginID_number } from "@/services/bus/login";
 import { ContractOperateApplyReq, ErmcpContractOperateApplyReq } from "@/services/proto/contract/interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
 import { getUUID } from "@/utils/qt/common";
 import { getTimeValue } from "@/utils/time";
-import {getUserId} from "@/services/bus/account";
 
 /**
  * 合同
@@ -14,7 +13,7 @@ export const operationContractReq = (param: ErmcpContractOperateApplyReq): Promi
         OperateSrc: 2,
         ClientTicket: getUUID(),
         OperateApplyID: getTimeValue(),
-        UserID: getLongTypeLoginID()?.toNumber()
+        UserID: geLoginID_number()
     }
     Object.assign(param, obj)
     return protoMiddleware<ErmcpContractOperateApplyReq>(param, 'ErmcpContractOperateApplyReq', 'ErmcpContractOperateApplyRsp', 2)
@@ -27,7 +26,7 @@ export const operationContractReq = (param: ErmcpContractOperateApplyReq): Promi
 export const contractOperateApply = (param: ContractOperateApplyReq): Promise<any> => {
     const obj = {
         OperateSrc: 2,
-        OperatorID: Number(getLongTypeLoginID()),
+        OperatorID: geLoginID_number(),
     }
     Object.assign(param, obj)
     return protoMiddleware<ContractOperateApplyReq>(param, 'ContractOperateApplyReq', 'ContractOperateApplyRsp', 2)

src/services/proto/delivery/index.ts

@@ -1,5 +1,5 @@
 import { getUserId } from '@/services/bus/account';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { getAreaUserId } from "@/services/bus/user";
 import {
     DeliveryGoodsApplyReq,
@@ -14,8 +14,8 @@ import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
  */
 export const addDeliveryGoodsApply = (param: DeliveryGoodsApplyReq): Promise<any> => {
     param.version = '3.2'
-    param.userid = getUserId()
-    param.loginid = Number(getLongTypeLoginID())
+    param.userid = getUserId(),
+        param.loginid = geLoginID_number()!
     return protoMiddleware<DeliveryGoodsApplyReq>(param, 'DeliveryGoodsApplyReq', 'DeliveryGoodsApplyRsp', 2)
 }
 
@@ -38,6 +38,6 @@ export const deliveryGoodsCancel = (param: DeliveryGoodsCancelReq): Promise<any>
  * 修改现货市价
  * @param param
  */
-export const ermcpSpotGoodsPrice = (param: ErmcpSpotGoodsPriceReq):Promise<any> => {
+export const ermcpSpotGoodsPrice = (param: ErmcpSpotGoodsPriceReq): Promise<any> => {
     return protoMiddleware<ErmcpSpotGoodsPriceReq>(param, 'ErmcpSpotGoodsPriceReq', 'ErmcpSpotGoodsPriceReq', 2)
 }

src/services/proto/spotcontract/index.ts

@@ -1,8 +1,8 @@
-import {getUserId} from "@/services/bus/account";
-import {GldErmcpSpotContractOperateReq, SpotContractOperateReq} from "@/services/proto/spotcontract/interface";
-import {protoMiddleware} from "@/services/socket/protobuf/buildReq";
-import {v4 as uuidv4} from 'uuid';
-import {getLongTypeLoginID} from "@/services/bus/login";
+import { getUserId } from "@/services/bus/account";
+import { geLoginID_number } from "@/services/bus/login";
+import { GldErmcpSpotContractOperateReq, SpotContractOperateReq } from "@/services/proto/spotcontract/interface";
+import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
+import { v4 as uuidv4 } from 'uuid';
 
 /**（重点提醒 这里属于管理端接口，仅用于新增）以上来自android代码  回头需要确认
  * 新增 / 修改采购合同报文 (很多修改合同操作也在这)
@@ -25,7 +25,7 @@ export const orderContract = (param: GldErmcpSpotContractOperateReq): Promise<an
 export const spotContractStatus = (param: SpotContractOperateReq): Promise<any> => {
     const OperateSrc = 2; // uint32 操作来源-1:管理端2:终端
     const ClientTicket: string = uuidv4();  // 客户端流水号
-    const OperatorID: number = Number(getLongTypeLoginID()); // 用户id
+    const OperatorID: number = geLoginID_number()!; // 用户id
     const reqParams = {
         ...param, OperateSrc, ClientTicket, OperatorID
     }

src/services/proto/warehouse/index.ts

@@ -1,5 +1,5 @@
 import { getUserId } from "@/services/bus/account";
-import { getLongTypeLoginID } from "@/services/bus/login";
+import { geLoginID_number } from "@/services/bus/login";
 import {
     AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq, ERMCPAreaInOutStockApplyReq,
     WarehouseApplyReq,
@@ -55,6 +55,6 @@ export const refuseStockApplyReq = (param: AuditERMCPAreaInOutStockApplyReq): Pr
 export const ermcpInOutStockApplyReq = (param: ERMCPAreaInOutStockApplyReq): Promise<any> => {
     param.UserID = getUserId()
     param.ApplySrc = 2
-    param.ApplyId = Number(getLongTypeLoginID())
+    param.ApplyId = geLoginID_number()!
     return protoMiddleware<ERMCPAreaInOutStockApplyReq>(param, 'ERMCPAreaInOutStockApplyReq', 'ERMCPAreaInOutStockApplyRsp', 2)
 }

src/services/socket/account/index.ts

@@ -1,5 +1,5 @@
 import APP from '@/services';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { buildProtoReq50, parseProtoRsp50 } from '@/services/socket/protobuf/buildReq';
 import { Callback } from '@/utils/websocket/index';
 import { sha256 } from 'js-sha256';
@@ -51,9 +51,9 @@ export const modifyPwdRequest = (param: accountType.ModifyPwdReq): Promise<any>
             funCodeName: 'ModifyPwdReq',
             reqParams: {
                 ModifyPwdType: param.ModifyPwdType,
-                OldPwd: sha256.hex(`${String(getLongTypeLoginID())}${param.OldPwd}`),
-                NewPwd: sha256.hex(`${String(getLongTypeLoginID())}${param.NewPwd}`),
-                ModifyPwdID: Number(getLongTypeLoginID()), // 被修改的ID
+                OldPwd: sha256.hex(`${String(geLoginID_number())}${param.OldPwd}`),
+                NewPwd: sha256.hex(`${String(geLoginID_number())}${param.NewPwd}`),
+                ModifyPwdID: Number(geLoginID_number()), // 被修改的ID
             },
         };
         const package50 = buildProtoReq50(params);

src/services/socket/login/index.ts

@@ -1,8 +1,7 @@
 // 用户相关请求模块
 import APP from '@/services';
-import { getLongTypeLoginID, isLogin } from '@/services/bus/login';
+import { geLoginID_number, isLogin } from '@/services/bus/login';
 import { getToken } from '@/services/bus/token';
-import { LongType } from '@/services/socket/login/interface/index';
 import { buildProtoReq50, parseProtoRsp50, protoMiddleware } from '@/services/socket/protobuf/buildReq';
 import { Callback } from '@/utils/websocket/index';
 import { sha256 } from 'js-sha256';
@@ -35,7 +34,7 @@ export const loginAction = (logidCode: string, password: string, ClientSystemInf
 export const logoutResponse = (): Promise<void> => {
     return new Promise((resolve, reject) => {
         if (isLogin()) {
-            const loginId = getLongTypeLoginID() as LongType;
+            const loginId = geLoginID_number()!;
             const token = getToken();
             const params = {
                 protobufName: 'LogoutReq',
@@ -63,7 +62,7 @@ export const logoutResponse = (): Promise<void> => {
 export const tokenCheck = (): Promise<string> => {
     return new Promise((resolve, reject) => {
         if (isLogin()) {
-            const loginId = getLongTypeLoginID() as LongType;
+            const loginId = geLoginID_number();
             const token = getToken();
             console.log('token::::::', token)
             const systemDate = APP.get('systemDate');

src/services/socket/login/interface/loginQuery.ts

@@ -21,6 +21,7 @@ export interface LoginResponse extends checkTokenRes {
     AccountStatus: number;
     HasUpdatedPwd: number;
     LoginCode: string;
+    id: number;
     LoginLockHourNum: number;
     PwdWrongCnt: any;
     PwdWrongLockCnt: any;

src/services/socket/order/index.ts

@@ -2,15 +2,13 @@
 import { DelistingType, OperateType, OptionType, PriceType } from '@/common/constants/enumCommon';
 import APP from '@/services';
 import { getUserId } from '@/services/bus/account';
-import { getLongTypeLoginID } from '@/services/bus/login';
-import {buildProtoReq50, parseProtoRsp50, protoMiddleware} from '@/services/socket/protobuf/buildReq';
+import { geLoginID_number } from '@/services/bus/login';
+import { OrderReq } from "@/services/socket/order/interface";
+import { buildProtoReq50, parseProtoRsp50, protoMiddleware } from '@/services/socket/protobuf/buildReq';
 import { Callback } from '@/utils/websocket/index';
 import moment from 'moment';
 import { v4 as uuidv4 } from 'uuid';
 import * as orderType from './interface/index';
-import {OrderReq} from "@/services/socket/order/interface";
-import * as Long from "long";
-import {LongType} from "@/services/socket/login/interface";
 
 /**
  * 下单接口
@@ -33,7 +31,7 @@ export const orderReq = (param: orderType.OrderReqType): Promise<string> => {
                 ClientSerialNo: uuidv4(), // 客户端流水号
                 ClientType: 4, // 终端类型
                 ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
-                LoginID: getLongTypeLoginID(), // 登陆账号
+                LoginID: geLoginID_number(), // 登陆账号
                 OperatorID: getUserId(), // 操作员账号ID
                 OrderSrc: 1, // 客户端下单
                 TriggerType: 1, // 终端默认为1
@@ -85,7 +83,7 @@ export const cancelOrderReq = (param: orderType.CancelOrderReq): Promise<string>
                 ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
                 OperateType: 1, // 操作类型
                 OrderSrc: 1, // 客户端下单
-                OperatorID: getLongTypeLoginID(), // 操作员账号ID
+                OperatorID: geLoginID_number(), // 操作员账号ID
                 OldOrderId: param.OldOrderId, // 原委托单号
                 AccountID: param.AccountID, // 交易账号
             },

src/services/socket/quota/adapter/index.ts

@@ -1,6 +1,6 @@
 import APP from '@/services';
 import { getGoodsByCode } from '@/services/bus/goods';
-import { getLongTypeLoginID, isLogin } from '@/services/bus/login';
+import { geLoginID_number, isLogin } from '@/services/bus/login';
 import { getToken } from '@/services/bus/token';
 import { funCode } from '@/services/funcode/index';
 import { QueryQuoteDayRsp } from '@/services/go/quote/interface';
@@ -15,7 +15,7 @@ import { byteArrayToUInt, subscribeInfosToByteArrary } from './byteUtils';
  */
 export function buildSubscribePeq(subscribeInfos: SubscribeInfoType[]): Package40 {
     // 如果是登录状态,就走正常行情链路. 否则走游客
-    const loginId = isLogin() ? getLongTypeLoginID() : Long.fromNumber(2);
+    const loginId = isLogin() ? geLoginID_number() : Long.fromNumber(2);
     const token = isLogin() ? getToken() : '2_TOKEN_NEKOT_';
     const content = subscribeInfosToByteArrary(subscribeInfos, token, loginId);
     const reqPackage = new Package40([funCode.MainClassNumber_Quota_SubscriptReq, content], undefined);

src/views/business/plan/components/add/index.vue

@@ -151,7 +151,7 @@ import { getPayCurrencyTypeEnumList, getSpotContractTypeEnumList } from '@/commo
 import { AllEnums } from '@/services/go/commonService/interface';
 import { getMiddleGoodsD, handleForm } from '../setup';
 import { ErmcpHedgePlanReq } from '@/services/proto/hedgeplan/interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import { hedgePlanReq } from '@/services/proto/hedgeplan';
 import { getAreaUserId } from '@/services/bus/user';
@@ -179,7 +179,7 @@ export default defineComponent({
 
         function submit(OperateType: 1 | 2) {
             validateAction<FormState>(formRef, formState).then((param) => {
-                const loginId = getLongTypeLoginID() as LongType;
+                const loginId = geLoginID_number();
                 const userid = getAreaUserId();
                 const reqParam: ErmcpHedgePlanReq = {
                     HedgePlanNo: param.HedgePlanNo, // 计划类型

src/views/business/plan/components/audit/index.vue

@@ -105,7 +105,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { hedgePlanReq } from '@/services/proto/hedgeplan';
 import { getPayCurrencyTypeEnumList } from '@/common/constants/enumsList';
 import { getUserId } from '@/services/bus/account';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'plan_audit_audit',
@@ -132,7 +132,7 @@ export default defineComponent({
                         auditremark: '通过',
                         Currencyid: props.selectedRow.currencyid, // 结算币种id
                         Tradeuserid: props.selectedRow.tradeuserid, // 交易用户id
-                        auditid: Number(getLongTypeLoginID()),
+                        auditid: Number(geLoginID_number()),
                     };
                     requestResultLoadingAndInfo(hedgePlanReq, params, loading, ['审核通过', '审核失败:']).then(() => {
                         cancel(true);

src/views/business/plan/components/modify/index.vue

@@ -1,147 +1,138 @@
 <template>
-    <!-- 修改计划 -->
-    <a-modal
-        class="commonModal modify-custom"
-        title="修改计划"
-        v-if="visible"
-        centered
-        v-model:visible="visible"
-        @cancel="cancel"
-        width="890px"
-    >
-        <template #footer>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit(2)">完成</a-button>
-            <a-button key="cancel" type="primary" :loading="loading" @click="cancel">取消</a-button>
-        </template>
-        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="计划类型" name="ContractType">
-                        <a-select
-                            class="inlineFormSelect"
-                            style="width: 200px"
-                            v-model:value="formState.ContractType"
-                            placeholder="请选择计划类型"
-                        >
-                            <a-select-option
-                                v-for="item in planTye"
-                                :value="item.enumitemname"
-                                :key="item.autoid"
-                            >{{item.enumdicname}}</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="计划名称" name="HedgePlanNo">
-                        <a-input
-                            class="dialogInput"
-                            v-model:value="formState.HedgePlanNo"
-                            style="width: 200px"
-                            placeholder="请输入计划名称"
-                        />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="现货品种" name="DeliveryGoodsID">
-                        <a-select
-                            class="inlineFormSelect"
-                            style="width: 200px"
-                            v-model:value="formState.DeliveryGoodsID"
-                            @change="chooseMG"
-                            placeholder="请选择现货品种"
-                        >
-                            <a-select-option
-                                v-for="item in DGList"
-                                :value="item.data.deliverygoodsid"
-                                :key="item.data.deliverygoodsid"
-                            >{{item.data.deliverygoodsname}}</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="商品" name="WRStandardID">
-                        <a-select
-                            class="inlineFormSelect"
-                            style="width: 200px"
-                            @change="chooseWR"
-                            v-model:value="formState.WRStandardID"
-                            placeholder="请选择商品"
-                        >
-                            <a-select-option
-                                v-for="item in gmlist"
-                                :value="item.wrstandardid"
-                                :key="item.wrstandardid"
-                            >{{item.wrstandardname}}</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="标仓系数" name>
-                        <a-input
-                            class="dialogInput ConvertFactor"
-                            v-model:value="formState.ConvertFactor"
-                            readonly
-                            style="width: 200px"
-                            placeholder="请输入标仓系数"
-                        />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="计划量" class="relative" name="PlanQty">
-                        <a-input-number
-                            class="dialogInput"
+  <!-- 修改计划 -->
+  <a-modal class="commonModal modify-custom"
+           title="修改计划"
+           v-if="visible"
+           centered
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit(2)">完成</a-button>
+      <a-button key="cancel"
+                type="primary"
+                :loading="loading"
+                @click="cancel">取消</a-button>
+    </template>
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="计划类型"
+                       name="ContractType">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      v-model:value="formState.ContractType"
+                      placeholder="请选择计划类型">
+              <a-select-option v-for="item in planTye"
+                               :value="item.enumitemname"
+                               :key="item.autoid">{{item.enumdicname}}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="计划名称"
+                       name="HedgePlanNo">
+            <a-input class="dialogInput"
+                     v-model:value="formState.HedgePlanNo"
+                     style="width: 200px"
+                     placeholder="请输入计划名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="现货品种"
+                       name="DeliveryGoodsID">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      v-model:value="formState.DeliveryGoodsID"
+                      @change="chooseMG"
+                      placeholder="请选择现货品种">
+              <a-select-option v-for="item in DGList"
+                               :value="item.data.deliverygoodsid"
+                               :key="item.data.deliverygoodsid">{{item.data.deliverygoodsname}}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="商品"
+                       name="WRStandardID">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      @change="chooseWR"
+                      v-model:value="formState.WRStandardID"
+                      placeholder="请选择商品">
+              <a-select-option v-for="item in gmlist"
+                               :value="item.wrstandardid"
+                               :key="item.wrstandardid">{{item.wrstandardname}}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="标仓系数"
+                       name>
+            <a-input class="dialogInput ConvertFactor"
+                     v-model:value="formState.ConvertFactor"
+                     readonly
+                     style="width: 200px"
+                     placeholder="请输入标仓系数" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="计划量"
+                       class="relative"
+                       name="PlanQty">
+            <a-input-number class="dialogInput"
                             style="width: 200px"
                             :min="0"
                             v-model:value="formState.PlanQty"
-                            placeholder="请输入计划量"
-                        ></a-input-number>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="交易用户" name="Tradeuserid">
-                        <a-select
-                            class="inlineFormSelect"
-                            style="width: 200px"
-                            v-model:value="formState.Tradeuserid"
-                            placeholder="请选择交易用户"
-                        >
-                            <a-select-option
-                                v-for="item in tableList"
-                                :value="item.roleid"
-                                :key="item.roleid"
-                            >{{item.rolename}}</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="结算币种" name="Currencyid">
-                        <a-select
-                            class="inlineFormSelect"
-                            style="width: 200px"
-                            v-model:value="formState.Currencyid"
-                            placeholder="请选择结算币种"
-                        >
-                            <a-select-option
-                                v-for="item in priceTyep"
-                                :key="item.enumitemname"
-                                :value="item.enumitemname"
-                            >{{item.enumdicname}}</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <a-form-item label="备注" class="relative" name="Remark">
-                        <a-input
-                            class="dialogInput"
-                            v-model:value="formState.Remark"
-                            style="width: 636px"
-                            placeholder="请输入备注"
-                        />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+                            placeholder="请输入计划量"></a-input-number>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="交易用户"
+                       name="Tradeuserid">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      v-model:value="formState.Tradeuserid"
+                      placeholder="请选择交易用户">
+              <a-select-option v-for="item in tableList"
+                               :value="item.roleid"
+                               :key="item.roleid">{{item.rolename}}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="结算币种"
+                       name="Currencyid">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      v-model:value="formState.Currencyid"
+                      placeholder="请选择结算币种">
+              <a-select-option v-for="item in priceTyep"
+                               :key="item.enumitemname"
+                               :value="item.enumitemname">{{item.enumdicname}}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="备注"
+                       class="relative"
+                       name="Remark">
+            <a-input class="dialogInput"
+                     v-model:value="formState.Remark"
+                     style="width: 636px"
+                     placeholder="请输入备注" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -152,7 +143,7 @@ import { AllEnums } from '@/services/go/commonService/interface';
 import { getMiddleGoodsD, handleForm } from '../setup';
 import { FormState } from '../interface';
 import { ErmcpHedgePlanReq } from '@/services/proto/hedgeplan/interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import { mergeTwoObj } from '@/utils/objHandle';
 import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
@@ -199,7 +190,7 @@ export default defineComponent({
 
         function submit(OperateType: 1 | 2) {
             validateAction<FormState>(formRef, formState).then((param) => {
-                const loginId = getLongTypeLoginID() as LongType;
+                const loginId = geLoginID_number();
                 const userid = getAreaUserId();
                 const reqParam: ErmcpHedgePlanReq = {
                     HedgePlanID: Number(props.selectedRow.hedgeplanid),

src/views/business/plan/components/recommit/index.vue

@@ -147,7 +147,7 @@ import { AllEnums } from '@/services/go/commonService/interface';
 import { getMiddleGoodsD, handleForm } from '../setup';
 import { FormState } from '../interface';
 import { ErmcpHedgePlanReq } from '@/services/proto/hedgeplan/interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import { mergeTwoObj } from '@/utils/objHandle';
 import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
@@ -195,7 +195,7 @@ export default defineComponent({
         });
         function submit() {
             validateAction<FormState>(formRef, formState).then((param) => {
-                const loginId = getLongTypeLoginID() as LongType;
+                const loginId = geLoginID_number();
                 const userid = getAreaUserId();
                 const reqParam: ErmcpHedgePlanReq = {
                     HedgePlanNo: param.HedgePlanNo, // 计划类型

src/views/business/purchase/components/setup.ts

@@ -19,12 +19,6 @@ import { objectToUint8Array } from "@/utils/objHandle";
 import { purchaseStateSign } from "@/views/business/purchase/setup";
 import Long from "long";
 import { Ref } from "vue";
-import {getUserId} from "@/services/bus/account";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import * as long from "long";
-import {LongType} from "@/services/socket/login/interface";
-import {getTimeValue} from "@/utils/time";
-import {v4 as uuidv4} from "uuid";
 
 /**
  * 这里负责 点价登记, 交收登记, 款项登记, 发票登记, 入库登记
@@ -64,7 +58,7 @@ export function fundsReq(spotcontractid: string, req: FundsReq, loading: Ref<boo
  */
 export function invoiceReq(spotcontractid: string, req: InvoiceReq, loading: Ref<boolean>, attachUrl?: String): Promise<string> {
     return operationContractRsp(4,
-        operationContractReqBuilder(req, spotcontractid, 4, "" ,attachUrl),
+        operationContractReqBuilder(req, spotcontractid, 4, "", attachUrl),
         loading)
 }
 

src/views/information/account_info/compoments/add-child-futures/index.vue

@@ -105,7 +105,7 @@ import { handleBusinessForm, handleTradeTemplate } from './setup';
 import { hedgeOutMainReq } from '@/services/proto/accountinfo';
 import { ErmcpLoginUserEx, ErmcpTaAccountEx } from '@/services/go/ermcp/account/interface';
 import { handlerManagerList } from '@/common/setup/user';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { getUserId } from '@/services/bus/account';
 import AddTrader from '../add-traders/index.vue';
 import { ErmcpTradeConfigTMP } from '@/services/go/ermcp/business-review/interface';
@@ -161,8 +161,8 @@ export default defineComponent({
                     trademargintmpid: res.trademargintmpid, // uint64 保证金模板id（TAACCOUNTCONFIG）
                     tradefeetmpid: res.tradefeetmpid, // uint64 手续费模板ID（TAACCOUNTCONFIG）
                     maxsubaccouts: 0, // uint64 最大子账户数[最大99999][外部母账户用 默认0（TAACCOUNTCONFIG）
-                    creatorid: Number(getLongTypeLoginID()), // uint64 创建人
-                    modifierid: Number(getLongTypeLoginID()), // uint64 修改人
+                    creatorid: Number(geLoginID_number()), // uint64 创建人
+                    modifierid: Number(geLoginID_number()), // uint64 修改人
                     areauserid: getUserId(), // uint64 机构用户ID
                 };
 

src/views/information/account_info/compoments/add-futures/index.vue

@@ -90,7 +90,7 @@ import { getUserName } from '@/services/bus/user';
 import { validateAction } from '@/common/setup/form';
 import { handleAddOrModifyFuturesForm } from '../setup';
 import { AddFuturesFormState } from '../interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import { getUserId } from '@/services/bus/account';
 import { isPingAnOem } from '@/common/config/projectName';
@@ -129,8 +129,8 @@ export default defineComponent({
                     relateduserid: getUserId(), // uint64 关联用户（Taaccount）
                     maxsubaccouts: 0, // uint64 最大子账户数[最大99999][外部母账户用 默认0（TAACCOUNTCONFIG）
                     fcid: res.fcid as number, // uint64 期货公司
-                    creatorid: Number(getLongTypeLoginID()), // uint64 创建人
-                    modifierid: Number(getLongTypeLoginID()), // uint64 修改人
+                    creatorid: Number(geLoginID_number()), // uint64 创建人
+                    modifierid: Number(geLoginID_number()), // uint64 修改人
                     areauserid: getUserId(), // uint64 机构用户ID
                 };
                 // 期货账户主账户

src/views/information/account_info/compoments/add-managers-permission/index.vue

@@ -88,7 +88,7 @@ import { roleOperate } from '@/services/proto/accountinfo';
 import { ManagerRoleOperateReq, MemberFuncMenu } from '@/services/proto/accountinfo/interface';
 import { getUserId } from '@/services/bus/account';
 import { getAoletype_string, getAreaUserId, getUserAccountType } from '@/services/bus/user';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 
 export default defineComponent({
     name: 'account_info_manager_btn_add',
@@ -138,7 +138,7 @@ export default defineComponent({
                 autoid: getUserId(), // uint64 角色ID
                 operatetype: 1, // uint32 操作类型-1:新增 2:修改
                 areauserid: getAreaUserId(), // uint64 所属机构
-                modifierid: Number(getLongTypeLoginID()), // uint64 修改人ID
+                modifierid: Number(geLoginID_number()), // uint64 修改人ID
                 rolename: name.value, // string 角色名称
                 memberfuncmenus: result.map((item) => {
                     return {

src/views/information/account_info/compoments/cancel-futures/index.vue

@@ -33,7 +33,7 @@ import { TaaccountOperateReq } from '@/services/proto/accountinfo/interface';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { taAccountOperateReq } from '@/services/proto/accountinfo';
 import { ErmcpLoginUserEx, ErmcpTaAccount, ErmcpTaAccountEx } from '@/services/go/ermcp/account/interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import Detail from '../detail-commom-futures/index.vue';
 export default defineComponent({
     name: 'account_info_futures_btn_child_cancel',
@@ -66,7 +66,7 @@ export default defineComponent({
                     let reqParam: TaaccountOperateReq = {
                         accountid: props.secondeData.accountid, // uint64 期货账户ID
                         tradestatus: 7, // uint32 7注销
-                        modifierid: Number(getLongTypeLoginID()), // uint64 修改人
+                        modifierid: Number(geLoginID_number()), // uint64 修改人
                         areauserid: Number(props.secondeData.relateduserid), // uint64 机构用户ID
                     };
                     requestResultLoadingAndInfo(taAccountOperateReq, reqParam, loading, ['账户注销成功', '账户注销失败:']).then(() => {

src/views/information/account_info/compoments/credit-futures/index.vue

@@ -69,7 +69,7 @@ import { message, Modal } from 'ant-design-vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { LoginaccountOperateReq, TaaccountTransfersxmoneyReq } from '@/services/proto/accountinfo/interface';
 import { loginAccountOperate, taAccountTransfersXMoneyReq } from '@/services/proto/accountinfo';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { QueryAccMgrTaAccountInfo } from '@/services/go/ermcp/account';
 import { getUserId } from '@/services/bus/account';
 
@@ -121,7 +121,7 @@ export default defineComponent({
                         let reqParam: TaaccountTransfersxmoneyReq = {
                             accountid: props.secondeData.accountid, // uint64 期货账户ID
                             sxmoney: Number(param.value as number), // double 授信金额正为加负为减
-                            modifierid: Number(getLongTypeLoginID()), // uint64 修改人
+                            modifierid: Number(geLoginID_number()), // uint64 修改人
                             areauserid: Number(props.secondeData.relateduserid), // uint64 机构用户ID
                         };
                         requestResultLoadingAndInfo(taAccountTransfersXMoneyReq, reqParam, loading, ['账户授信成功', '账户授信失败:']).then(() => {

src/views/information/account_info/compoments/managers-permission-delete/index.vue

@@ -1,70 +1,74 @@
 <template>
-    <!-- 删除角色 -->
-    <a-modal
-        class="commonModal add-roles"
-        title="删除角色"
-        v-model:visible="visible"
-        @cancel="cancel"
-        centered
-        :maskClosable="false"
-        width="100%"
-    >
-        <template #footer>
-            <a-button key="cancel" type="primary" :loading="loading" @click="cancel">取消</a-button>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">删除</a-button>
-        </template>
-        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="角色名称">
-                        <a-input
-                            class="dialogInput"
-                            style="width: 200px"
-                            v-model:value="name"
-                            placeholder="请输入模板名称"
-                        />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <a-form-item label="权限功能" name></a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <div class="powerTable">
-                        <div class="powerRow" v-for="(item, i) in tableList" :key="i + '0'">
-                            <div class="powerLeft">
-                                <a-checkbox
-                                    v-model:checked="item.Menu.ishadrole"
-                                    disabled
-                                >{{item.Menu.resourcename}}</a-checkbox>
-                            </div>
-                            <div class="powerRight">
-                                <div class="line" v-for="(sub, j) in item.SubMenu" :key="j + '1'">
-                                    <div class="left">
-                                        <a-checkbox
-                                            v-model:checked="sub.Menu.ishadrole"
-                                            @change="secondChange(item, sub)"
-                                            :value="sub.Menu.resourcecode"
-                                            disabled
-                                        >{{sub.Menu.resourcename}}</a-checkbox>
-                                    </div>
-                                    <div class="right">
-                                        <a-checkbox
-                                            v-for="(subNext, l) in sub.SubMenu"
-                                            :key="l + '3'"
-                                            v-model:checked="subNext.Menu.ishadrole"
-                                            @change="thirdChange(item, sub, subNext)"
-                                            :value="subNext.Menu.resourcecode"
-                                            disabled
-                                        >{{subNext.Menu.resourcename}}</a-checkbox>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 删除角色 -->
+  <a-modal class="commonModal add-roles"
+           title="删除角色"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :maskClosable="false"
+           width="100%">
+    <template #footer>
+      <a-button key="cancel"
+                type="primary"
+                :loading="loading"
+                @click="cancel">取消</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">删除</a-button>
+    </template>
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="角色名称">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     v-model:value="name"
+                     placeholder="请输入模板名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="权限功能"
+                       name></a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <div class="powerTable">
+            <div class="powerRow"
+                 v-for="(item, i) in tableList"
+                 :key="i + '0'">
+              <div class="powerLeft">
+                <a-checkbox v-model:checked="item.Menu.ishadrole"
+                            disabled>{{item.Menu.resourcename}}</a-checkbox>
+              </div>
+              <div class="powerRight">
+                <div class="line"
+                     v-for="(sub, j) in item.SubMenu"
+                     :key="j + '1'">
+                  <div class="left">
+                    <a-checkbox v-model:checked="sub.Menu.ishadrole"
+                                @change="secondChange(item, sub)"
+                                :value="sub.Menu.resourcecode"
+                                disabled>{{sub.Menu.resourcename}}</a-checkbox>
+                  </div>
+                  <div class="right">
+                    <a-checkbox v-for="(subNext, l) in sub.SubMenu"
+                                :key="l + '3'"
+                                v-model:checked="subNext.Menu.ishadrole"
+                                @change="thirdChange(item, sub, subNext)"
+                                :value="subNext.Menu.resourcecode"
+                                disabled>{{subNext.Menu.resourcename}}</a-checkbox>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -79,7 +83,7 @@ import { roleOperate } from '@/services/proto/accountinfo';
 import { ManagerRoleOperateReq, MemberFuncMenu } from '@/services/proto/accountinfo/interface';
 import { getUserId } from '@/services/bus/account';
 import { getAreaUserId } from '@/services/bus/user';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 
 export default defineComponent({
     name: 'account_info_manager_btn_setting_delete',
@@ -137,7 +141,7 @@ export default defineComponent({
                 autoid: props.selectedData.autoid, // uint64 角色ID
                 operatetype: 3, // uint32 操作类型-1:新增 2:修改
                 areauserid: getAreaUserId(), // uint64 所属机构
-                modifierid: Number(getLongTypeLoginID()), // uint64 修改人ID
+                modifierid: Number(geLoginID_number()), // uint64 修改人ID
                 rolename: name.value, // string 角色名称
                 memberfuncmenus: result.map((item) => {
                     return {

src/views/information/account_info/compoments/managers-permission-detail/index.vue

@@ -1,69 +1,70 @@
 <template>
-    <!-- 角色详情 -->
-    <a-modal
-        class="commonModal add-roles"
-        title="角色详情"
-        v-model:visible="visible"
-        @cancel="cancel"
-        centered
-        :maskClosable="false"
-        width="100%"
-    >
-        <template #footer>
-            <a-button key="cancel" type="primary" :loading="loading" @click="cancel">完成</a-button>
-        </template>
-        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="角色名称">
-                        <a-input
-                            class="dialogInput"
-                            style="width: 200px"
-                            v-model:value="name"
-                            placeholder="请输入模板名称"
-                        />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <a-form-item label="权限功能" name></a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <div class="powerTable">
-                        <div class="powerRow" v-for="(item, i) in tableList" :key="i + '0'">
-                            <div class="powerLeft">
-                                <a-checkbox
-                                    v-model:checked="item.Menu.ishadrole"
-                                    disabled
-                                >{{item.Menu.resourcename}}</a-checkbox>
-                            </div>
-                            <div class="powerRight">
-                                <div class="line" v-for="(sub, j) in item.SubMenu" :key="j + '1'">
-                                    <div class="left">
-                                        <a-checkbox
-                                            v-model:checked="sub.Menu.ishadrole"
-                                            @change="secondChange(item, sub)"
-                                            :value="sub.Menu.resourcecode"
-                                            disabled
-                                        >{{sub.Menu.resourcename}}</a-checkbox>
-                                    </div>
-                                    <div class="right">
-                                        <a-checkbox
-                                            v-for="(subNext, l) in sub.SubMenu"
-                                            :key="l + '3'"
-                                            v-model:checked="subNext.Menu.ishadrole"
-                                            @change="thirdChange(item, sub, subNext)"
-                                            :value="subNext.Menu.resourcecode"
-                                            disabled
-                                        >{{subNext.Menu.resourcename}}</a-checkbox>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 角色详情 -->
+  <a-modal class="commonModal add-roles"
+           title="角色详情"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :maskClosable="false"
+           width="100%">
+    <template #footer>
+      <a-button key="cancel"
+                type="primary"
+                :loading="loading"
+                @click="cancel">完成</a-button>
+    </template>
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="角色名称">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     v-model:value="name"
+                     placeholder="请输入模板名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="权限功能"
+                       name></a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <div class="powerTable">
+            <div class="powerRow"
+                 v-for="(item, i) in tableList"
+                 :key="i + '0'">
+              <div class="powerLeft">
+                <a-checkbox v-model:checked="item.Menu.ishadrole"
+                            disabled>{{item.Menu.resourcename}}</a-checkbox>
+              </div>
+              <div class="powerRight">
+                <div class="line"
+                     v-for="(sub, j) in item.SubMenu"
+                     :key="j + '1'">
+                  <div class="left">
+                    <a-checkbox v-model:checked="sub.Menu.ishadrole"
+                                @change="secondChange(item, sub)"
+                                :value="sub.Menu.resourcecode"
+                                disabled>{{sub.Menu.resourcename}}</a-checkbox>
+                  </div>
+                  <div class="right">
+                    <a-checkbox v-for="(subNext, l) in sub.SubMenu"
+                                :key="l + '3'"
+                                v-model:checked="subNext.Menu.ishadrole"
+                                @change="thirdChange(item, sub, subNext)"
+                                :value="subNext.Menu.resourcecode"
+                                disabled>{{subNext.Menu.resourcename}}</a-checkbox>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -78,7 +79,7 @@ import { roleOperate } from '@/services/proto/accountinfo';
 import { ManagerRoleOperateReq, MemberFuncMenu } from '@/services/proto/accountinfo/interface';
 import { getUserId } from '@/services/bus/account';
 import { getAreaUserId } from '@/services/bus/user';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 
 export default defineComponent({
     name: 'account_info_manager_btn_setting_detail',
@@ -136,7 +137,7 @@ export default defineComponent({
                 autoid: getUserId(), // uint64 角色ID
                 operatetype: 1, // uint32 操作类型-1:新增 2:修改
                 areauserid: getAreaUserId(), // uint64 所属机构
-                modifierid: Number(getLongTypeLoginID()), // uint64 修改人ID
+                modifierid: Number(geLoginID_number()), // uint64 修改人ID
                 rolename: name.value, // string 角色名称
                 memberfuncmenus: result.map((item) => {
                     return {

src/views/information/account_info/compoments/managers-permission-modify/index.vue

@@ -1,68 +1,75 @@
 <template>
-    <!-- 修改角色 -->
-    <a-modal
-        class="commonModal add-roles"
-        title="修改角色"
-        v-model:visible="visible"
-        @cancel="cancel"
-        centered
-        :loading="loading"
-        :maskClosable="false"
-        width="100%"
-    >
-        <template #footer>
-            <a-button key="cancel" type="primary" :loading="loading" @click="cancel">取消</a-button>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">修改</a-button>
-        </template>
-        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="角色名称">
-                        <a-input
-                            class="dialogInput"
-                            style="width: 200px"
-                            v-model:value="name"
-                            placeholder="请输入模板名称"
-                        />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <a-form-item label="权限功能" name></a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <div class="powerTable">
-                        <div class="powerRow" v-for="(item, i) in tableList" :key="i + '0'">
-                            <div class="powerLeft">
-                                <a-checkbox
-                                    v-model:checked="item.Menu.ishadrole"
-                                >{{item.Menu.resourcename}}</a-checkbox>
-                            </div>
-                            <div class="powerRight">
-                                <div class="line" v-for="(sub, j) in item.SubMenu" :key="j + '1'">
-                                    <div class="left">
-                                        <a-checkbox
-                                            v-model:checked="sub.Menu.ishadrole"
-                                            @change="secondChange(item, sub)"
-                                            :value="sub.Menu.resourcecode"
-                                        >{{sub.Menu.resourcename}}</a-checkbox>
-                                    </div>
-                                    <div class="right">
-                                        <a-checkbox
-                                            v-for="(subNext, l) in sub.SubMenu"
-                                            :key="l + '3'"
-                                            v-model:checked="subNext.Menu.ishadrole"
-                                            @change="thirdChange(item, sub, subNext)"
-                                            :value="subNext.Menu.resourcecode"
-                                        >{{subNext.Menu.resourcename}}</a-checkbox>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 修改角色 -->
+  <a-modal class="commonModal add-roles"
+           title="修改角色"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :loading="loading"
+           :maskClosable="false"
+           width="100%">
+    <template #footer>
+      <a-button key="cancel"
+                type="primary"
+                :loading="loading"
+                @click="cancel">取消</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">修改</a-button>
+    </template>
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="角色名称">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     v-model:value="name"
+                     placeholder="请输入模板名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="权限功能"
+                       name></a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <div class="powerTable">
+            <div class="powerRow"
+                 v-for="(item, i) in tableList"
+                 :key="i + '0'">
+              <div class="powerLeft">
+                <a-checkbox v-model:checked="item.Menu.ishadrole">{{item.Menu.resourcename}}
+                </a-checkbox>
+              </div>
+              <div class="powerRight">
+                <div class="line"
+                     v-for="(sub, j) in item.SubMenu"
+                     :key="j + '1'">
+                  <div class="left">
+                    <a-checkbox v-model:checked="sub.Menu.ishadrole"
+                                @change="secondChange(item, sub)"
+                                :value="sub.Menu.resourcecode">{{sub.Menu.resourcename}}
+                    </a-checkbox>
+                  </div>
+                  <div class="right">
+                    <a-checkbox v-for="(subNext, l) in sub.SubMenu"
+                                :key="l + '3'"
+                                v-model:checked="subNext.Menu.ishadrole"
+                                @change="thirdChange(item, sub, subNext)"
+                                :value="subNext.Menu.resourcecode">{{subNext.Menu.resourcename}}
+                    </a-checkbox>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -77,7 +84,7 @@ import { roleOperate } from '@/services/proto/accountinfo';
 import { ManagerRoleOperateReq, MemberFuncMenu } from '@/services/proto/accountinfo/interface';
 import { getUserId } from '@/services/bus/account';
 import { getAreaUserId } from '@/services/bus/user';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 
 export default defineComponent({
     name: 'account_info_manager_btn_setting_modify',
@@ -135,7 +142,7 @@ export default defineComponent({
                 autoid: props.selectedData.autoid, // uint64 角色ID
                 operatetype: 2, // uint32 操作类型-1:新增 2:修改
                 areauserid: getAreaUserId(), // uint64 所属机构
-                modifierid: Number(getLongTypeLoginID()), // uint64 修改人ID
+                modifierid: Number(geLoginID_number()), // uint64 修改人ID
                 rolename: name.value, // string 角色名称
                 memberfuncmenus: result.map((item) => {
                     return {

src/views/information/account_info/compoments/modify-futures-son/index.vue

@@ -86,7 +86,7 @@ import { defineComponent, ref, watchEffect, PropType } from 'vue';
 import { validateAction } from '@/common/setup/form';
 import { FormState } from '@/views/information/account_info/compoments/add-child-futures/interface';
 import { HedgeOutMainConfigReq } from '@/services/proto/accountinfo/interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hedgeOutMainReq } from '@/services/proto/accountinfo';
@@ -158,8 +158,8 @@ export default defineComponent({
                     trademargintmpid: res.trademargintmpid, // uint64 保证金模板id（TAACCOUNTCONFIG）
                     tradefeetmpid: res.tradefeetmpid, // uint64 手续费模板ID（TAACCOUNTCONFIG）
                     maxsubaccouts: 0, // uint64 最大子账户数[最大99999][外部母账户用 默认0（TAACCOUNTCONFIG）
-                    creatorid: Number(getLongTypeLoginID()), // uint64 创建人
-                    modifierid: Number(getLongTypeLoginID()), // uint64 修改人
+                    creatorid: Number(geLoginID_number()), // uint64 创建人
+                    modifierid: Number(geLoginID_number()), // uint64 修改人
                     areauserid: getUserId(), // uint64 机构用户ID
                 };
 

src/views/information/account_info/compoments/modify-futures/index.vue

@@ -89,7 +89,7 @@ import { AddFuturesFormState } from '../interface';
 import { hedgeOutMainReq } from '@/services/proto/accountinfo';
 import { mergeTwoObj } from '@/utils/objHandle';
 import { getUserId } from '@/services/bus/account';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { HedgeOutMainConfigReq } from '@/services/proto/accountinfo/interface';
 import { isPingAnOem } from '@/common/config/projectName';
 
@@ -138,7 +138,7 @@ export default defineComponent({
                     relateduserid: getUserId(), // uint64 关联用户（Taaccount）
                     maxsubaccouts: 0, // uint64 最大子账户数[最大99999][外部母账户用 默认0（TAACCOUNTCONFIG）
                     fcid: res.fcid as number, // uint64 期货公司
-                    modifierid: Number(getLongTypeLoginID()), // uint64 修改人
+                    modifierid: Number(geLoginID_number()), // uint64 修改人
                     areauserid: getUserId(), // uint64 机构用户ID
                 };
 

src/views/manage/inventory-review/components/checkinAudit/index.vue

@@ -163,7 +163,7 @@ import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { Modal } from 'ant-design-vue';
 import { AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
 import Long from 'long';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import { passStockControl, refuseStockControl } from '@/views/manage/inventory-review/components/setup';
 import moment from 'moment';
@@ -192,7 +192,7 @@ export default defineComponent({
                 onOk() {
                     const param: AreaInOutApplyAuditPassReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid),
-                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()),
+                        AuditID: geLoginID_number()!,
                         Remark: '',
                     };
                     passStockControl(param, loading)
@@ -213,7 +213,7 @@ export default defineComponent({
                 onOk() {
                     const param: AuditERMCPAreaInOutStockApplyReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
-                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()), // uint64 审核人
+                        AuditID: geLoginID_number()!, // uint64 审核人
                         AuditRemark: '', // string 审核备注
                         AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
                         ApplyStatus: 3, // int32 审核状态:3-审核拒绝 5-已撤回

src/views/manage/inventory-review/components/checkinCancel/index.vue

@@ -157,7 +157,7 @@ import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { Modal } from 'ant-design-vue';
 import { AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
 import Long from 'long';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import moment from 'moment';
 import { refuseStockControl } from '@/views/manage/inventory-review/components/setup';
@@ -184,7 +184,7 @@ export default defineComponent({
                 onOk() {
                     const param: AuditERMCPAreaInOutStockApplyReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
-                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()), // uint64 审核人
+                        AuditID: geLoginID_number()!, // uint64 审核人
                         AuditRemark: '', // string 审核备注
                         AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
                         ApplyStatus: 5, // int32 审核状态:3-审核拒绝 5-已撤回

src/views/manage/inventory-review/components/checkoutAudit/index.vue

@@ -160,7 +160,7 @@ import { Modal } from 'ant-design-vue';
 import Long from 'long';
 import { passStockControl, refuseStockControl } from '@/views/manage/inventory-review/components/setup';
 import { AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import moment from 'moment';
 import { LongType } from '@/services/socket/login/interface';
 import { _closeModal } from '@/common/setup/modal/modal';
@@ -188,7 +188,7 @@ export default defineComponent({
                 onOk() {
                     const param: AreaInOutApplyAuditPassReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid),
-                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()),
+                        AuditID: geLoginID_number()!,
                         Remark: '',
                     };
                     passStockControl(param, loading)
@@ -209,7 +209,7 @@ export default defineComponent({
                 onOk() {
                     const param: AuditERMCPAreaInOutStockApplyReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
-                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()), // uint64 审核人
+                        AuditID: geLoginID_number()!, // uint64 审核人
                         AuditRemark: '', // string 审核备注
                         AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
                         ApplyStatus: 3, // int32 审核状态:3-审核拒绝 5-已撤回

src/views/manage/inventory-review/components/checkoutCancel/index.vue

@@ -153,7 +153,7 @@ import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/inter
 import { Modal } from 'ant-design-vue';
 import Long from 'long';
 import { AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import moment from 'moment';
 import { refuseStockControl } from '@/views/manage/inventory-review/components/setup';
@@ -184,7 +184,7 @@ export default defineComponent({
                 onOk() {
                     const param: AuditERMCPAreaInOutStockApplyReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
-                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()), // uint64 审核人
+                        AuditID: geLoginID_number()!, // uint64 审核人
                         AuditRemark: '', // string 审核备注
                         AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
                         ApplyStatus: 5, // int32 审核状态:3-审核拒绝 5-已撤回

src/views/market/spot_trade/spot_trade_order_transaction/components/delisting/index.vue

@@ -133,7 +133,7 @@ import { getCanUseMoney } from '@/services/bus/account';
 import { QueryDeliveryRelationRsp } from '@/services/go/delivery/interface';
 import { Order } from '@/services/socket/order';
 import { OrderReq } from '@/services/socket/order/interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import * as Long from 'long';
 export default defineComponent({
@@ -181,7 +181,7 @@ export default defineComponent({
                     ClientSerialNo: uuidv4(), // 客户端流水号
                     ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // 客户端委托时间
                     ClientType: 4, // 终端类型
-                    LoginID: Number(getLongTypeLoginID() as LongType), // 登陆账号
+                    LoginID: geLoginID_number()!, // 登陆账号
                     AccountID: getSelectedAccountId(), // 交易账号
                     GoodsID: props.parantSelectedRow.goodsid, // 商品ID
                     MarketID: props.parantSelectedRow.marketid, // 市场ID
@@ -190,7 +190,7 @@ export default defineComponent({
                     OrderSrc: 1, // 单据来源: 客户端下单
                     RelatedID: Long.fromString(props.selectedRow.orderid), // 操作员账号ID
                     OrderPrice: props.selectedRow.orderprice, // 委托价格
-                    OperatorID: Number(getLongTypeLoginID()),
+                    OperatorID: Number(geLoginID_number()),
                     // MarketMaxSub: number // 市价允许最大偏差(做市)
                     OrderQty: res.num, // 委托数量
                     BuyOrSell: props.selectedRow.buyorsell === 1 ? 0 : 1, // 买卖方向  0 买 1 卖

src/views/market/spot_trade/spot_trade_order_transaction/components/listing/index.vue

@@ -123,7 +123,7 @@ import { QueryDeliveryRelationRsp } from '@/services/go/delivery/interface';
 import { OrderReq } from '@/services/socket/order/interface';
 import { Order } from '@/services/socket/order';
 import { DelistingType, PriceType } from '@/common/constants/enumCommon';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import { v4 as uuidv4 } from 'uuid';
 import moment from 'moment';
@@ -162,7 +162,7 @@ export default defineComponent({
                     ClientSerialNo: uuidv4(), // 客户端流水号
                     ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // 客户端委托时间
                     ClientType: 4, // 终端类型
-                    LoginID: Number(getLongTypeLoginID() as LongType), // 登陆账号
+                    LoginID: geLoginID_number()!, // 登陆账号
                     AccountID: getSelectedAccountId(), // 交易账号
                     GoodsID: props.parantSelectedRow.goodsid, // 商品ID
                     MarketID: props.parantSelectedRow.marketid, // 市场ID
@@ -170,7 +170,7 @@ export default defineComponent({
                     OperateType: 1, // 操作类型: 申请
                     OrderSrc: 1, // 单据来源: 客户端下单
                     OrderPrice: res.price, // 委托价格
-                    OperatorID: Number(getLongTypeLoginID()),
+                    OperatorID: Number(geLoginID_number()),
                     // MarketMaxSub: number // 市价允许最大偏差(做市)
                     OrderQty: res.num, // 委托数量
                     BuyOrSell: 0, // 买卖方向  0 买 1 卖

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_settlement/index.vue

@@ -1,108 +1,97 @@
 <template>
-    <!-- 交收-->
-    <Drawer
-        :title="'交收'"
-        :placement="'right'"
-        class="bottom486"
-        :visible="visible"
-        @cancel="cancel"
-    >
-        <div class="listed c_c_s_s">
-            <a-form class="inlineForm dialogForm" ref="formRef">
-                <div class="formBar">
-                    <div class="formtop">
-                        <div class="firstTitle">
-                            <span>合约数量 {{selectedRow.enableqty}}</span>
-                            <span>可交收数量 {{getCanSettlementNum()}} {{selectedRow.goodunit}}</span>
-                        </div>
-                        <div class="secondLine">
-                            <div class="left">持有人/商品/仓库</div>
-                            <div class="middle">升贴水/数量</div>
-                            <div class="right">选择数量</div>
-                        </div>
-                        <a-checkbox-group
-                            class="commonCheckboxGroup"
-                            v-model:value="checked"
-                            @change="checkGroupChange"
-                        >
-                            <div
-                                class="lineBar"
-                                v-for="(item, index) in tableList"
-                                :key="index + '11'"
-                            >
-                                <div class="line1">
-                                    <div class>
-                                        <a-checkbox
-                                            @change="checkboxChange(item)"
-                                            :value="item.ladingbillid"
-                                        ></a-checkbox>
-                                    </div>
-                                    <div class="name">{{item.username}}</div>
-                                </div>
-                                <div class="line2">
-                                    <div class="left">
-                                        <div>{{item.wrtypename}}</div>
-                                        <div>{{item.warehousename}}</div>
-                                    </div>
-                                    <div class="middle">
-                                        <div>{{item.pricemove}}</div>
-                                        <div>{{item.avalidqty}}{{item.enumdicname}}</div>
-                                    </div>
-                                    <div class="right">
-                                        <template
-                                            class="inputNumberBlock"
-                                            :class="isChecked(item.ladingbillid) ? '' : 'disabled'"
-                                        >
-                                            <a-input-number
-                                                class="dialogInput dialogInput34"
-                                                v-model:value="item.num"
-                                                style="width: 130px !important; height: 34px;"
-                                                :disabled="!isChecked(item.ladingbillid)"
-                                                :max="item.avalidqty"
-                                                :min="0"
-                                            ></a-input-number>
-                                            <MinusOutlined @click="decrease(item)" />
-                                            <PlusOutlined @click="increase(item)" />
-                                        </template>
-                                    </div>
-                                </div>
-                            </div>
-                        </a-checkbox-group>
-                    </div>
+  <!-- 交收-->
+  <Drawer :title="'交收'"
+          :placement="'right'"
+          class="bottom486"
+          :visible="visible"
+          @cancel="cancel">
+    <div class="listed c_c_s_s">
+      <a-form class="inlineForm dialogForm"
+              ref="formRef">
+        <div class="formBar">
+          <div class="formtop">
+            <div class="firstTitle">
+              <span>合约数量 {{selectedRow.enableqty}}</span>
+              <span>可交收数量 {{getCanSettlementNum()}} {{selectedRow.goodunit}}</span>
+            </div>
+            <div class="secondLine">
+              <div class="left">持有人/商品/仓库</div>
+              <div class="middle">升贴水/数量</div>
+              <div class="right">选择数量</div>
+            </div>
+            <a-checkbox-group class="commonCheckboxGroup"
+                              v-model:value="checked"
+                              @change="checkGroupChange">
+              <div class="lineBar"
+                   v-for="(item, index) in tableList"
+                   :key="index + '11'">
+                <div class="line1">
+                  <div class>
+                    <a-checkbox @change="checkboxChange(item)"
+                                :value="item.ladingbillid"></a-checkbox>
+                  </div>
+                  <div class="name">{{item.username}}</div>
                 </div>
-                <div class="fixedBtns">
-                    <div class="formbottom">
-                        <div class="line1">
-                            <div>
-                                <span>已点选数量</span>
-                                <span class="white">{{selctedNum()}} {{selectedRow.goodunit}}</span>
-                                <span>，需合约数量</span>
-                                <span class="white">{{getNeedContractNum()}}</span>
-                            </div>
-                            <div class="yellow">升贴水1100</div>
-                        </div>
-                        <div class="line2" v-if="isBaseSpread()">
-                            <div>点价合约</div>
-                            <div class="right">
-                                <div>{{selectedRow.goodscode}}</div>
-                                <div>{{getDeliveryGoodsPrice()}}</div>
-                            </div>
-                        </div>
-                        <div v-if="isBaseSpread()" class="line3">预估贷款：{{getEstimatedPayment()}}</div>
-                    </div>
-
-                    <a-form-item class="btnCenter mt10">
-                        <a-button
-                            class="listedBtn"
-                            :loading="loading"
-                            :disabled="loading"
-                            @click="submit"
-                        >提交</a-button>
-                    </a-form-item>
+                <div class="line2">
+                  <div class="left">
+                    <div>{{item.wrtypename}}</div>
+                    <div>{{item.warehousename}}</div>
+                  </div>
+                  <div class="middle">
+                    <div>{{item.pricemove}}</div>
+                    <div>{{item.avalidqty}}{{item.enumdicname}}</div>
+                  </div>
+                  <div class="right">
+                    <template class="inputNumberBlock"
+                              :class="isChecked(item.ladingbillid) ? '' : 'disabled'">
+                      <a-input-number class="dialogInput dialogInput34"
+                                      v-model:value="item.num"
+                                      style="width: 130px !important; height: 34px;"
+                                      :disabled="!isChecked(item.ladingbillid)"
+                                      :max="item.avalidqty"
+                                      :min="0"></a-input-number>
+                      <MinusOutlined @click="decrease(item)" />
+                      <PlusOutlined @click="increase(item)" />
+                    </template>
+                  </div>
                 </div>
-            </a-form>
+              </div>
+            </a-checkbox-group>
+          </div>
+        </div>
+        <div class="fixedBtns">
+          <div class="formbottom">
+            <div class="line1">
+              <div>
+                <span>已点选数量</span>
+                <span class="white">{{selctedNum()}} {{selectedRow.goodunit}}</span>
+                <span>，需合约数量</span>
+                <span class="white">{{getNeedContractNum()}}</span>
+              </div>
+              <div class="yellow">升贴水1100</div>
+            </div>
+            <div class="line2"
+                 v-if="isBaseSpread()">
+              <div>点价合约</div>
+              <div class="right">
+                <div>{{selectedRow.goodscode}}</div>
+                <div>{{getDeliveryGoodsPrice()}}</div>
+              </div>
+            </div>
+            <div v-if="isBaseSpread()"
+                 class="line3">预估贷款：{{getEstimatedPayment()}}</div>
+          </div>
+
+          <a-form-item class="btnCenter mt10">
+            <a-button class="listedBtn"
+                      :loading="loading"
+                      :disabled="loading"
+                      @click="submit">提交</a-button>
+          </a-form-item>
         </div>
-    </Drawer>
+      </a-form>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
@@ -123,7 +112,7 @@ import { DeliveryOrder } from '@/services/proto/warehousetrade';
 import { v4 } from 'uuid';
 import moment from 'moment';
 import { DeliveryOrderReq } from '@/services/proto/warehousetrade/interface';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { message } from 'ant-design-vue';
 
 export default defineComponent({
@@ -177,7 +166,7 @@ export default defineComponent({
                     PQty: Long.fromNumber(PQty()),
                     OperateType: 0,
                     OrderSrc: 0,
-                    OperatorID: Number(getLongTypeLoginID()),
+                    OperatorID: Number(geLoginID_number()),
                     DeliveryQty: selected.value.num,
                     DeliveryOrderDetail: {
                         AccountID: getSelectedAccountId(),

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_transfer/index.vue

@@ -102,7 +102,7 @@ import Long from 'long';
 import { OrderReq } from '@/services/socket/order/interface';
 import { v4 as uuidv4 } from 'uuid';
 import moment from 'moment';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
 import { Order } from '@/services/socket/order';
 import { QueryTradePositionRsp } from '@/services/go/ermcp/order/interface';
@@ -142,7 +142,7 @@ export default defineComponent({
                     ClientSerialNo: uuidv4(), // 客户端流水号
                     ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // 客户端委托时间
                     ClientType: 4, // 终端类型
-                    LoginID: Number(getLongTypeLoginID() as LongType), // 登陆账号
+                    LoginID: geLoginID_number()!, // 登陆账号
                     AccountID: getSelectedAccountId(), // 交易账号
                     GoodsID: res.goodsid, // 商品ID
                     MarketID: getSelectedGoods().marketid, // 市场ID
@@ -150,7 +150,7 @@ export default defineComponent({
                     OperateType: 1, // 操作类型: 申请
                     OrderSrc: 1, // 单据来源: 客户端下单
                     OrderPrice: res.price, // 委托价格                      (需要填入)
-                    OperatorID: Number(getLongTypeLoginID()),
+                    OperatorID: Number(geLoginID_number()),
                     // MarketMaxSub: number // 市价允许最大偏差(做市)
                     OrderQty: res.num, // 委托数量                          (需要填入)
                     BuyOrSell: 1, // 买卖方向  0 买 1 卖

src/views/order/funding_information/components/funding_information_funding_summary/index.vue

@@ -1,42 +1,37 @@
 <template>
-    <!-- 资金汇总 -->
-    <section>
-        <a-table
-            :columns="columns"
-            class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '190px' }"
-            :pagination="false"
-            :loading="loading"
-            :expandedRowKeys="expandedRowKeys"
-            :customRow="Rowclick"
-            :expandIcon="expandIcon"
-            :expandIconAsCell="false"
-            rowKey="key"
-            :data-source="tableList"
-        >
-            <!-- 额外的展开行 -->
-            <template v-if="btnList.length" #expandedRowRender="{ record }">
-                <BtnList
-                    :btnList="btnList"
-                    :record="record"
-                    class="btn-list-sticky"
-                    @click="openComponent"
-                />
-            </template>
-            <template #balance="{record}">
-                <span>{{getCanUseMoney(record)}}</span>
-            </template>
-            <template #freezemargin="{record}">
-                <span>{{getFreeze(record, true)}}</span>
-            </template>
-        </a-table>
-        <component
-            :is="componentId"
-            v-if="componentId"
-            :selectedRow="selectedRow"
-            @cancel="closeComponent"
-        ></component>
-    </section>
+  <!-- 资金汇总 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '190px' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template v-if="btnList.length"
+                #expandedRowRender="{ record }">
+        <BtnList :btnList="btnList"
+                 :record="record"
+                 class="btn-list-sticky"
+                 @click="openComponent" />
+      </template>
+      <template #balance="{record}">
+        <span>{{getCanUseMoney(record)}}</span>
+      </template>
+      <template #freezemargin="{record}">
+        <span>{{getFreeze(record, true)}}</span>
+      </template>
+    </a-table>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </section>
 </template>
 
 <script lang="ts">
@@ -50,7 +45,7 @@ import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { getTaAccounts, queryAmountLog } from '@/services/go/TaAccount';
 import { GetTaAccountsReq, QueryAmountLogReq } from '@/services/go/TaAccount/interface';
 import { getSelectedAccountId, getCanUseMoney, getFreeze } from '@/services/bus/account';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import * as Long from 'long';
 import Bus from '@/utils/eventBus/index';
 import { expandIcon } from '@/common/setup/table/clolumn';
@@ -66,7 +61,7 @@ export default defineComponent({
         // 获取列表数据
         const queryTableAction = () => {
             const param: GetTaAccountsReq = {
-                loginID: Number(getLongTypeLoginID()),
+                loginID: Number(geLoginID_number()),
             };
             queryTable(getTaAccounts, param);
         };

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

@@ -16,7 +16,7 @@ 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 { geLoginID_number } from '@/services/bus/login';
 import { Modal } from 'ant-design-vue';
 import Bus from '@/utils/eventBus/index';
 
@@ -43,7 +43,7 @@ export default defineComponent({
                 ClientSerialNo: uuidv4(), // string 客户端流水号
                 ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
                 ClientType: 4, // uint32 终端类型
-                OperatorID: Number(getLongTypeLoginID()), // uint64 操作员账号ID
+                OperatorID: Number(geLoginID_number()), // uint64 操作员账号ID
                 BuyOrSell: props.selectedRow.buyorsell, // uint32 买卖方向
                 WRID: props.selectedRow.wrfactortypeid, // uint64 仓单ID,卖的时候填写
             };

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

@@ -16,7 +16,7 @@ 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 { geLoginID_number } from '@/services/bus/login';
 import { Modal } from 'ant-design-vue';
 import Bus from '@/utils/eventBus/index';
 
@@ -43,7 +43,7 @@ export default defineComponent({
                 ClientSerialNo: uuidv4(), // string 客户端流水号
                 ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
                 ClientType: 4, // uint32 终端类型
-                OperatorID: Number(getLongTypeLoginID()), // uint64 操作员账号ID
+                OperatorID: Number(geLoginID_number()), // uint64 操作员账号ID
                 BuyOrSell: props.selectedRow.buyorsell, // uint32 买卖方向
                 WRID: props.selectedRow.wrfactortypeid, // uint64 仓单ID,卖的时候填写
             };

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

@@ -1,107 +1,108 @@
 <template>
-    <!-- 现货仓单 现货明细 提货 true -->
-    <Drawer :title="'提货'" :placement="'right'" class="bottom" :visible="visible" @cancel="cancel">
-        <!-- 挂牌 -->
-        <div class="listed">
-            <div class="condition">
-                <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
-                <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
-                <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
-            </div>
-            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
-                <div class="formBar">
-                    <a-row :gutter="24">
-                        <a-col :span="12">
-                            <a-form-item label="提货数量" name="OutQty">
-                                <a-input-number
-                                    class="commonInput"
-                                    v-model:value="formState.OutQty"
-                                    :min="0"
-                                    :max="selectedRow.enableqty"
-                                    style="width: 140px"
-                                />
-                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="提货人" name="ContactName">
-                                <a-input
-                                    class="commonInput"
-                                    v-model:value="formState.ContactName"
-                                    style="width: 140px"
-                                />
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="12" class="mt-20">
-                            <a-form-item>
-                                <!-- <a-progress class="formProgress" :percent="30" /> -->
-                                <a-slider
-                                    v-model:value="formState.OutQty"
-                                    ::min="0"
-                                    :max="selectedRow.enableqty"
-                                    class="formSlider"
-                                    style="width: 140px;"
-                                />
-                                <div class="unit">
-                                    <span>0</span>
-                                    <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
-                                </div>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">&nbsp;</a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="12">
-                            <a-form-item label="联系方式" name="ContactNum">
-                                <a-input
-                                    class="commonInput"
-                                    v-model:value="formState.ContactNum"
-                                    style="width: 140px"
-                                />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="预约日期" name="AppointmentDate">
-                                <a-date-picker
-                                    class="commonDatePicker dialogDatePicker"
-                                    allowClear="false"
-                                    v-model:value="formState.AppointmentDate"
-                                    style="width: 140px"
-                                />
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="12">
-                            <a-form-item label="备注" name="AppointmentRemark">
-                                <a-input
-                                    class="commonInput"
-                                    v-model:value="formState.AppointmentRemark"
-                                    style="width: 140px"
-                                />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">&nbsp;</a-col>
-                    </a-row>
+  <!-- 现货仓单 现货明细 提货 true -->
+  <Drawer :title="'提货'"
+          :placement="'right'"
+          class="bottom"
+          :visible="visible"
+          @cancel="cancel">
+    <!-- 挂牌 -->
+    <div class="listed">
+      <div class="condition">
+        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
+        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
+        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
+      </div>
+      <a-form class="inlineForm dialogForm"
+              ref="formRef"
+              :model="formState"
+              :rules="rules">
+        <div class="formBar">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="提货数量"
+                           name="OutQty">
+                <a-input-number class="commonInput"
+                                v-model:value="formState.OutQty"
+                                :min="0"
+                                :max="selectedRow.enableqty"
+                                style="width: 140px" />
+                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="提货人"
+                           name="ContactName">
+                <a-input class="commonInput"
+                         v-model:value="formState.ContactName"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12"
+                   class="mt-20">
+              <a-form-item>
+                <!-- <a-progress class="formProgress" :percent="30" /> -->
+                <a-slider v-model:value="formState.OutQty"
+                          ::min="0"
+                          :max="selectedRow.enableqty"
+                          class="formSlider"
+                          style="width: 140px;" />
+                <div class="unit">
+                  <span>0</span>
+                  <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
                 </div>
-                <a-row :gutter="24">
-                    <a-col :span="24" class="fixedBtns">
-                        <a-form-item class="btnCenter">
-                            <a-button
-                                class="listedBtn"
-                                :loading="loading"
-                                :disabled="loading"
-                                @click="submit"
-                            >提货</a-button>
-                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-form>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">&nbsp;</a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="联系方式"
+                           name="ContactNum">
+                <a-input class="commonInput"
+                         v-model:value="formState.ContactNum"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="预约日期"
+                           name="AppointmentDate">
+                <a-date-picker class="commonDatePicker dialogDatePicker"
+                               allowClear="false"
+                               v-model:value="formState.AppointmentDate"
+                               style="width: 140px" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="备注"
+                           name="AppointmentRemark">
+                <a-input class="commonInput"
+                         v-model:value="formState.AppointmentRemark"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">&nbsp;</a-col>
+          </a-row>
         </div>
-    </Drawer>
+        <a-row :gutter="24">
+          <a-col :span="24"
+                 class="fixedBtns">
+            <a-form-item class="btnCenter">
+              <a-button class="listedBtn"
+                        :loading="loading"
+                        :disabled="loading"
+                        @click="submit">提货</a-button>
+              <a-button class="ml10 cancelBtn"
+                        @click="cancel">取消</a-button>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
@@ -117,7 +118,7 @@ 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 { geLoginID_number } from '@/services/bus/login';
 import * as Long from 'long';
 import { handleForm } from './setup';
 import { validateAction } from '@/common/setup/form';
@@ -152,7 +153,7 @@ export default defineComponent({
                     ContactName: res.ContactName, // string 收货人提货人
                     ContactNum: res.ContactNum, // string 收货人提货人手机
                     AppointmentRemark: '', // string 预约备注
-                    CreatorID: Number(getLongTypeLoginID()), // uint64 创建人ID
+                    CreatorID: Number(geLoginID_number()), // uint64 创建人ID
                     WROutInDetails: {
                         LadingBillID: props.selectedRow.ladingbillid, // string 提单ID
                         SubNum: props.selectedRow.subnum, // uint64 提单子单号

src/views/platinum/platinum_customer_info/compoments/check/index.vue

@@ -37,7 +37,7 @@ import { Modal } from 'ant-design-vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { auditWskhUserInfo, userInfoCheck } from '@/services/proto/accountinfo';
 import Detail from '../common-detail/index.vue';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
 
 export default defineComponent({
@@ -62,8 +62,8 @@ export default defineComponent({
                     let reqParam: AuditWskhUserInfoReq = {
                         UserID: props.selectedRow.userid,
                         UserState: 4,
-                        AuditedBy: Number(getLongTypeLoginID()),
-                        AuditRemark: ""
+                        AuditedBy: Number(geLoginID_number()),
+                        AuditRemark: '',
                     };
                     requestResultLoadingAndInfo(auditWskhUserInfo, reqParam, loading, ['审核成功', '审核失败:']).then(() => {
                         cancel();
@@ -84,8 +84,8 @@ export default defineComponent({
                     let reqParam: AuditWskhUserInfoReq = {
                         UserID: props.selectedRow.userid,
                         UserState: 5,
-                        AuditedBy: Number(getLongTypeLoginID()),
-                        AuditRemark: ""
+                        AuditedBy: Number(geLoginID_number()),
+                        AuditRemark: '',
                     };
                     requestResultLoadingAndInfo(auditWskhUserInfo, reqParam, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
                         cancel();

src/views/platinum/platinum_pick_query/list/tab/compoments/complete_stocking/index.vue

@@ -8,10 +8,10 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="submit">完成备货</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">完成备货</a-button>
       <a-button key="cancel"
                 type="primary"
                 :loading="loading"
@@ -25,20 +25,15 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
-import {
-    GoodsPickupConfirmReq,
-    GoodsPickupOperateReq,
-    t2bExchConfirmBusinessReq,
-    TradeGoodsInfo
-} from "@/services/proto/manager/interface";
-import {getTimeValue} from "@/utils/time";
-import {getUserId} from "@/services/bus/account";
-import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
-import {goodsPickupConfirm, goodsPickupOperate, t2bExchConfirmBusiness} from "@/services/proto/manager";
-import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import {getUUID} from "ant-design-vue/es/vc-select/utils/commonUtil";
-import Long from "long";
+import { GoodsPickupConfirmReq, GoodsPickupOperateReq, t2bExchConfirmBusinessReq, TradeGoodsInfo } from '@/services/proto/manager/interface';
+import { getTimeValue } from '@/utils/time';
+import { getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { goodsPickupConfirm, goodsPickupOperate, t2bExchConfirmBusiness } from '@/services/proto/manager';
+import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
+import { geLoginID_number } from '@/services/bus/login';
+import { getUUID } from 'ant-design-vue/es/vc-select/utils/commonUtil';
+import Long from 'long';
 
 export default defineComponent({
     name: 'platinum_pick_query_complete_stocking',
@@ -56,10 +51,10 @@ export default defineComponent({
             let reqParams: GoodsPickupConfirmReq = {
                 TakeOrderID: Long.fromString(props.selectedRow.takeorderid), // uint64 提货单号
                 Auditer: getUserId(), // uint64 审核人
-                CheckRemark: "", // string 审核备注
+                CheckRemark: '', // string 审核备注
                 ClientTicket: getUserId().toString(), // string 客户端流水号
                 MarketID: props.selectedRow.marketid,
-            }
+            };
             requestResultLoadingAndInfo(goodsPickupConfirm, reqParams, loading, ['完成备货成功', '完成备货失败:']).then(() => {
                 cancel();
                 context.emit('refresh');

src/views/platinum/platinum_pick_query/list/tab/compoments/confirm_pickup/index.vue

@@ -8,10 +8,10 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="submit">确认提货</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">确认提货</a-button>
       <a-button key="cancel"
                 type="primary"
                 :loading="loading"
@@ -25,13 +25,13 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
-import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
-import {GoodsPickupOperateReq} from "@/services/proto/manager/interface";
-import Long from "long";
-import {getUserId} from "@/services/bus/account";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
-import {goodsPickupOperate} from "@/services/proto/manager";
+import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
+import { GoodsPickupOperateReq } from '@/services/proto/manager/interface';
+import Long from 'long';
+import { getUserId } from '@/services/bus/account';
+import { geLoginID_number } from '@/services/bus/login';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { goodsPickupOperate } from '@/services/proto/manager';
 
 export default defineComponent({
     name: 'platinum_pick_query_confirm_pickup',
@@ -48,10 +48,10 @@ export default defineComponent({
         function submit() {
             let reqParams: GoodsPickupOperateReq = {
                 operatetype: 2, // uint32 操作类型-1:提货单上传物流信息 2:取货确认(自提) 3:收货确认(邮寄)
-                takeorderid : Long.fromString(props.selectedRow.takeorderid), // uint64 提货单号
+                takeorderid: Long.fromString(props.selectedRow.takeorderid), // uint64 提货单号
                 userid: getUserId(), // uint64 用户ID
-                loginid: Number(getLongTypeLoginID()) // uint64 登录ID
-            }
+                loginid: Number(geLoginID_number()), // uint64 登录ID
+            };
             requestResultLoadingAndInfo(goodsPickupOperate, reqParams, loading, ['确认取货成功', '确认取货失败:']).then(() => {
                 cancel();
                 context.emit('refresh');

src/views/platinum/platinum_pick_query/list/tab/compoments/query_receipt/index.vue

@@ -8,10 +8,10 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="submit">确认收货</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">确认收货</a-button>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
@@ -25,13 +25,13 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
-import {GoodsPickupConfirmReq, GoodsPickupOperateReq, TradeGoodsInfo} from "@/services/proto/manager/interface";
-import {getUserId} from "@/services/bus/account";
-import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
-import {goodsPickupConfirm, goodsPickupOperate} from "@/services/proto/manager";
-import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import Long from "long";
+import { GoodsPickupConfirmReq, GoodsPickupOperateReq, TradeGoodsInfo } from '@/services/proto/manager/interface';
+import { getUserId } from '@/services/bus/account';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { goodsPickupConfirm, goodsPickupOperate } from '@/services/proto/manager';
+import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
+import { geLoginID_number } from '@/services/bus/login';
+import Long from 'long';
 
 export default defineComponent({
     name: 'platinum_pick_query_receipt',
@@ -48,10 +48,10 @@ export default defineComponent({
         function submit() {
             let reqParams: GoodsPickupOperateReq = {
                 operatetype: 3, // uint32 操作类型-1:提货单上传物流信息 2:取货确认(自提) 3:收货确认(邮寄)
-                takeorderid : Long.fromString(props.selectedRow.takeorderid), // uint64 提货单号
+                takeorderid: Long.fromString(props.selectedRow.takeorderid), // uint64 提货单号
                 userid: getUserId(), // uint64 用户ID
-                loginid: Number(getLongTypeLoginID()) // uint64 登录ID
-            }
+                loginid: Number(geLoginID_number()), // uint64 登录ID
+            };
             requestResultLoadingAndInfo(goodsPickupOperate, reqParams, loading, ['确认收货成功', '确认收货失败:']).then(() => {
                 cancel();
                 context.emit('refresh');

src/views/platinum/platinum_pick_query/list/tab/compoments/upload_logistics/index.vue

@@ -50,7 +50,7 @@ import CommomDetail from '../common-detail/index.vue';
 import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
 import { GoodsPickupOperateReq } from '@/services/proto/manager/interface';
 import { getUserId } from '@/services/bus/account';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { goodsPickupOperate } from '@/services/proto/manager';
 import Long from 'long';
@@ -78,7 +78,7 @@ export default defineComponent({
                     operatetype: 1, // uint32 操作类型-1:提货单上传物流信息 2:取货确认(自提) 3:收货确认(邮寄)
                     takeorderid: Long.fromString(props.selectedRow.takeorderid), // uint64 提货单号
                     userid: getUserId(), // uint64 用户ID
-                    loginid: Number(getLongTypeLoginID()), // uint64 登录ID
+                    loginid: Number(geLoginID_number()), // uint64 登录ID
                     info: {
                         expresscompany, // string 物流公司
                         expressnum, // string 物流单号

src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/payment/index.vue

@@ -12,10 +12,10 @@
                 type="primary"
                 :loading="loading"
                 @click="submit">确认</a-button>
-        <a-button key="cancel"
-                  type="primary"
-                  :loading="loading"
-                  @click="cancel">关闭</a-button>
+      <a-button key="cancel"
+                type="primary"
+                :loading="loading"
+                @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />
   </a-modal>
@@ -26,12 +26,12 @@ import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import {t2bExchConfirmBusiness} from "@/services/proto/manager";
-import {t2bExchConfirmBusinessReq} from "@/services/proto/manager/interface";
-import {QhjAccountOutInApply} from "@/services/go/ermcp/qhj/interface";
-import {getTimeValue} from "@/utils/time";
-import {getUserId} from "@/services/bus/account";
-import {getLongTypeLoginID} from "@/services/bus/login";
+import { t2bExchConfirmBusiness } from '@/services/proto/manager';
+import { t2bExchConfirmBusinessReq } from '@/services/proto/manager/interface';
+import { QhjAccountOutInApply } from '@/services/go/ermcp/qhj/interface';
+import { getTimeValue } from '@/utils/time';
+import { getUserId } from '@/services/bus/account';
+import { geLoginID_number } from '@/services/bus/login';
 
 export default defineComponent({
     name: 'platinum_recharge_review_confirm_payment',
@@ -51,12 +51,12 @@ export default defineComponent({
                 AccountCode: props.selectedRow.accountcode, // 资金账户(交易所的出入金，填0)
                 exchticket: props.selectedRow.exchticket, // 交易所流水号（被审核的流水）
                 tradedate: props.selectedRow.tradedate, // 交易日(被审业务发生的交易日）
-                extoperatorid: getTimeValue(),  // 外部操作流水号
+                extoperatorid: getTimeValue(), // 外部操作流水号
                 bankticket: props.selectedRow.bankticket, // 中心流水号
-                businessconfirmstatus: 1,// 审核结果 1： 通过 2： 拒绝
-                businesstype: props.selectedRow.executetype === 1 ? 2 : 1,  // 交易类型 1: 入金  2：出金 3： 签约 4： 解约
-                auditid: Number(getUserId())  // 审核人
-            }
+                businessconfirmstatus: 1, // 审核结果 1： 通过 2： 拒绝
+                businesstype: props.selectedRow.executetype === 1 ? 2 : 1, // 交易类型 1: 入金  2：出金 3： 签约 4： 解约
+                auditid: Number(getUserId()), // 审核人
+            };
 
             requestResultLoadingAndInfo(t2bExchConfirmBusiness, reqParams, loading, ['确认收款成功', '确认收款失败:']).then(() => {
                 cancel();

src/views/setting/friends/index.vue

@@ -1,34 +1,37 @@
 <template>
-    <!-- 我的好友 -->
-    <a-spin :spinning="loading">
-        <div class="my-friend">
-            <a-input-search
-                placeholder="输入好友代码进行搜索"
-                enter-button="搜索"
-                class="searchFriendInput"
-                @search="handleSearch"
-            >
-                <template #prefix>
-                    <SearchOutlined />
-                </template>
-            </a-input-search>
-            <div class="mt10">
-                <div class="item" v-for="(item, index) in searchFriend" :key="index + '11'">
-                    <div class="left">
-                        <span>{{item.frienduserid}} {{ item.friendname }}</span>
-                    </div>
-                    <div class="right" @click="operate(item)">
-                        <span v-if="item.isfriend">
-                            <svg class="icon svg-icon" aria-hidden="true">
-                                <use xlink:href="#icon-shanchu" />
-                            </svg>
-                        </span>
-                        <span v-else class="addFriBtn">加为好友</span>
-                    </div>
-                </div>
-            </div>
+  <!-- 我的好友 -->
+  <a-spin :spinning="loading">
+    <div class="my-friend">
+      <a-input-search placeholder="输入好友代码进行搜索"
+                      enter-button="搜索"
+                      class="searchFriendInput"
+                      @search="handleSearch">
+        <template #prefix>
+          <SearchOutlined />
+        </template>
+      </a-input-search>
+      <div class="mt10">
+        <div class="item"
+             v-for="(item, index) in searchFriend"
+             :key="index + '11'">
+          <div class="left">
+            <span>{{item.frienduserid}} {{ item.friendname }}</span>
+          </div>
+          <div class="right"
+               @click="operate(item)">
+            <span v-if="item.isfriend">
+              <svg class="icon svg-icon"
+                   aria-hidden="true">
+                <use xlink:href="#icon-shanchu" />
+              </svg>
+            </span>
+            <span v-else
+                  class="addFriBtn">加为好友</span>
+          </div>
         </div>
-    </a-spin>
+      </div>
+    </div>
+  </a-spin>
 </template>
 
 <script lang="ts">
@@ -42,7 +45,7 @@ import { getUsrId } from '@/services/bus/user';
 import { queryResultLoadingAndInfo, requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { message } from 'ant-design-vue';
 import { Modal } from 'ant-design-vue';
-import { getLongTypeLoginID } from '@/services/bus/login';
+import { geLoginID_number } from '@/services/bus/login';
 
 export default defineComponent({
     name: 'friend',
@@ -59,7 +62,7 @@ export default defineComponent({
                 userid: getUsrId(),
                 frienduserid,
                 applysrc: 2,
-                applicantid: getLongTypeLoginID(),
+                applicantid: geLoginID_number(),
             };
         }
         // 删除好友