Browse Source

commit 解决bug

yu.jie 4 năm trước cách đây
mục cha
commit
a6790ce7a1

+ 2 - 2
src/services/go/ermcp/exposure/index.ts

@@ -23,8 +23,8 @@ export function QueryActualExposure(): Promise<ErmcpRealExposureModel[]> {
  * @constructor
  */
 export function QueryActualExposureDetail(req: Ermcp3ExposureReq): Promise<Ermcp3ExposureDetail[]> {
-    const areaUserId = getAreaUserId(); // 用户id
-    return commonSearch_go('/Ermcp3/QueryExposureDetail', { areaUserId, ...req }).catch((err) => {
+    const userid = getAreaUserId(); // 用户id
+    return commonSearch_go('/Ermcp3/QueryExposureDetail', { userid, ...req }).catch((err) => {
         throw new Error(`查询敞口 ->实时敞口 -> 现货明细: ${err.message}`);
     });
 }

+ 2 - 2
src/services/go/ermcp/exposure/interface.ts

@@ -37,7 +37,7 @@ export interface ErmcpRealExposureModel {
  * 查询实时敞口现货明细请求
  */
 export interface Ermcp3ExposureReq {
-    middleGoodsId: number  //    套保商品
+    middlegoodsid: number  //    套保商品
 }
 
 /**
@@ -66,7 +66,7 @@ export interface Ermcp3ExposureDetail {
  * 实时敞口期货明细请求
  */
 export interface ErmcpExposurePostionReq {
-    middleGoodsId: number //套保商品ID
+    middlegoodsid: number //套保商品ID
 }
 
 /**

+ 31 - 18
src/views/business/exposure/list/realTime/index.vue

@@ -43,7 +43,12 @@ import { getBtnList } from '@/common/setup/contextMenu/index';
 import contextMenu from '@/common/components/contextMenu/index.vue';
 import { getColumsAndSearch } from '../setup';
 import { QueryActualExposure, QueryActualExposureDetail, QueryAutualExposurePosition } from '@/services/go/ermcp/exposure/index';
-import { ErmcpRealExposureModel, Ermcp3ExposureDetail, ErmcpExposurePostion } from '@/services/go/ermcp/exposure/interface';
+import {
+    ErmcpRealExposureModel,
+    Ermcp3ExposureDetail,
+    ErmcpExposurePostion,
+    ErmcpExposurePostionReq, Ermcp3ExposureReq
+} from '@/services/go/ermcp/exposure/interface';
 import { message } from 'ant-design-vue';
 import { handleTableEvent } from '@/common/setup/event/index';
 import ThridMenu from '@/common/components/thirdMenu/index.vue';
@@ -103,29 +108,37 @@ function handleDeatil(loading: Ref<boolean>, selectedRow: ErmcpRealExposureModel
     // 现货明细信息
     function ActualExposureDetail() {
         loading.value = true;
-        const param = { middleGoodsId: unref(selectedRow).MiddleGoodsID };
-        QueryActualExposureDetail(param)
-            .then((res) => {
-                detailTableList.value = res.map((e, i) => {
-                    return { ...e, key: String(i) };
+        let param: Ermcp3ExposureReq = {
+            middlegoodsid: unref(selectedRow).MiddleGoodsID
+        }
+        if(undefined !== unref(selectedRow).MiddleGoodsID) {
+            QueryActualExposureDetail(param)
+                .then((res) => {
+                    detailTableList.value = res.map((e, i) => {
+                        return { ...e, key: String(i) };
+                    });
+                    loading.value = false;
+                })
+                .catch((err) => {
+                    message.error(err);
+                    loading.value = false;
                 });
-                loading.value = false;
-            })
-            .catch((err) => {
-                message.error(err);
-                loading.value = false;
-            });
+        }
     }
     // 期货头寸明细
     function AutualExposurePosition() {
         loading.value = true;
-        const param = { middleGoodsId: unref(selectedRow).MiddleGoodsID };
-        QueryAutualExposurePosition(param).then((res) => {
-            detailTableList.value = res.map((e, i) => {
-                return { ...e, key: String(i) };
+        let param: ErmcpExposurePostionReq = {
+            middlegoodsid: unref(selectedRow).MiddleGoodsID
+        }
+        if(undefined !== unref(selectedRow).MiddleGoodsID) {
+            QueryAutualExposurePosition(param).then((res) => {
+                detailTableList.value = res.map((e, i) => {
+                    return {...e, key: String(i)};
+                });
+                loading.value = false;
             });
-            loading.value = false;
-        });
+        }
     }
     return { tabList, selectMenu, detailTableList, detailColumns };
 }

+ 1 - 1
src/views/information/account_info/compoments/add-traders/index.vue

@@ -60,7 +60,7 @@ export default defineComponent({
         function submit() {
             validateAction<TraderFormState>(formRef, formState).then((res) => {
                 const reqParam: LoginaccountOperateReq = {
-                    operatetype: 1, // uint32 操作类型-1:新增 2:修改 3:新增管理员 4:修改管理员 5:锁定 6:解锁 7:注销 8:恢复 9:重置密码 10:新增登录帐号 11:停用用户 12:恢复用户 13:修改用户信息
+                    operatetype: 10, // uint32 操作类型-1:新增 2:修改 3:新增管理员 4:修改管理员 5:锁定 6:解锁 7:注销 8:恢复 9:重置密码 10:新增登录帐号 11:停用用户 12:恢复用户 13:修改用户信息
                     roleids: [24],
                     logintaaccounts: [],
                     accountname: res.rolename,