commit 客户资料问题提交

src/services/go/ermcp/exposure/index.ts

@@ -2,7 +2,7 @@ import APP from '@/services';
 import { commonSearch_go } from '@/services/go';
 import { Ermcp3AreaSpot, Ermcp3AreaSpotDetail, Ermcp3AreaSpotDetailReq, Ermcp3ExposureDetail, Ermcp3ExposureReq, ErmcpExposurePostion, ErmcpExposurePostionReq, ErmcpHedgePosition, ErmcpHedgePositionDetail, ErmcpHedgePositionDetailReq, ErmcpRealExposureModel } from '@/services/go/ermcp/exposure/interface';
 import {getUserId} from "@/services/bus/account";
-import {getUserAccountType} from "@/services/bus/user";
+import {getAreaUserId, getUserAccountType} from "@/services/bus/user";
 
 /** ================================= 业务 - 敞口 ================================**/
 
@@ -23,9 +23,8 @@ export function QueryActualExposure(): Promise<ErmcpRealExposureModel[]> {
  * @constructor
  */
 export function QueryActualExposureDetail(req: Ermcp3ExposureReq): Promise<Ermcp3ExposureDetail[]> {
-    const userid = getUserId(); // 用户id
-    const usertype = getUserAccountType();  // 用户类型 2-机构 7-企业成员
-    return commonSearch_go('/Ermcp3/QueryExposureDetail', { userid, usertype, ...req }).catch((err) => {
+    const areaUserId = getAreaUserId(); // 用户id
+    return commonSearch_go('/Ermcp3/QueryExposureDetail', { areaUserId, ...req }).catch((err) => {
         throw new Error(`查询敞口 ->实时敞口 -> 现货明细: ${err.message}`);
     });
 }

src/services/go/ermcp/exposure/interface.ts

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

src/views/business/exposure/list/realTime/index.vue

@@ -103,7 +103,7 @@ function handleDeatil(loading: Ref<boolean>, selectedRow: ErmcpRealExposureModel
     // 现货明细信息
     function ActualExposureDetail() {
         loading.value = true;
-        const param = { middlegoodsid: unref(selectedRow).MiddleGoodsID };
+        const param = { middleGoodsId: unref(selectedRow).MiddleGoodsID };
         QueryActualExposureDetail(param)
             .then((res) => {
                 detailTableList.value = res.map((e, i) => {

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

@@ -140,8 +140,6 @@
                     message.error('请至少选择一个权限')
                     return
                 }
-
-                debugger
                 const reqParam: ManagerRoleOperateReq = {
                     autoid: getUserId(), // uint64 角色ID
                     operatetype: 1, // uint32 操作类型-1:新增 2:修改

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

@@ -86,19 +86,20 @@
 import { closeModal } from '@/common/setup/modal/index';
 import { defineComponent, ref, PropType, watchEffect } from 'vue';
 import { Modal } from 'ant-design-vue';
-import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
+import {LoginaccountOperateReq, TaaccountOperateReq} from '@/services/proto/accountinfo/interface';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { loginAccountOperate } from '@/services/proto/accountinfo';
+import {loginAccountOperate, taAccountOperateReq} from '@/services/proto/accountinfo';
 import { ErmcpLoginUser, ErmcpLoginUserEx, ErmcpTaAccount } from '@/services/go/ermcp/account/interface';
 import { handleBusinessForm, handleRoleName } from '../setup';
 import { mergeTwoObj } from '@/utils/objHandle';
+import {getLongTypeLoginID} from "@/services/bus/login";
 
 export default defineComponent({
     name: 'account_info_futures_btn_child_cancel',
     components: {},
     props: {
         selectedData: {
-            type: Object as PropType<ErmcpLoginUser>,
+            type: Object as PropType<ErmcpTaAccount>,
             default: {},
         },
         tableList: {
@@ -131,13 +132,13 @@ export default defineComponent({
                 okText: '确认注销',
                 cancelText: '取消',
                 onOk() {
-                    let reqParam: LoginaccountOperateReq = {
-                        userid: props.selectedData.userid,
-                        loginid: props.selectedData.loginid,
-                        operatetype: 7, // 5: 锁定 6：解锁
-                        logintaaccounts: [],
+                    let reqParam: TaaccountOperateReq = {
+                        accountid: props.selectedData.accountid, // uint64 期货账户ID
+                        tradestatus: 7,// double 授信金额正为加负为减
+                        modifierid: Number(getLongTypeLoginID()),// uint64 修改人
+                        areauserid: props.selectedData.relateduserid,// uint64 机构用户ID
                     };
-                    requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['账户注销成功', '账户注销失败:']).then(() => {
+                    requestResultLoadingAndInfo(taAccountOperateReq, reqParam, loading, ['账户注销成功', '账户注销失败:']).then(() => {
                         cancel();
                         context.emit('refresh');
                     });

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

@@ -141,8 +141,6 @@
                     message.error('请至少选择一个权限')
                     return
                 }
-
-                debugger
                 const reqParam: ManagerRoleOperateReq = {
                     autoid: getUserId(), // uint64 角色ID
                     operatetype: 1, // uint32 操作类型-1:新增 2:修改

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

@@ -141,8 +141,6 @@
                     message.error('请至少选择一个权限')
                     return
                 }
-
-                debugger
                 const reqParam: ManagerRoleOperateReq = {
                     autoid: getUserId(), // uint64 角色ID
                     operatetype: 1, // uint32 操作类型-1:新增 2:修改

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

@@ -142,8 +142,6 @@
                     message.error('请至少选择一个权限')
                     return
                 }
-
-                debugger
                 const reqParam: ManagerRoleOperateReq = {
                     autoid: getUserId(), // uint64 角色ID
                     operatetype: 1, // uint32 操作类型-1:新增 2:修改

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

@@ -308,13 +308,12 @@ export default defineComponent({
         function submit(OperateType: 1 | 2) {
             validateAction<FormState>(formRef, formState).then((param) => {
                 const reqParam: AddUserInfoApplyReq = {
-                    customername: param.customername, // 必填
+                    customername: Number(param.userinfotype) === 1 ? param.username : param.customername, // 必填
                     userid: 1, // 写死 必填
                     memberareaid: getUserId(),
                     userinfotype: Number(param.userinfotype),
-                    username: param.userinfotype === '2' ? param.customername : param.username,
+                    username: param.username,
                     userstate: OperateType, // 1： 保存草稿 2： 新增
-
                     // 以上必填
                     cardtype: param.cardtype, // 证件类型
                     cardnum: param.cardnum, // 证件号码
@@ -333,7 +332,6 @@ export default defineComponent({
                     taxpayernum: param.taxpayernum, // 纳税人识别号
                     email: param.email, // email
                 };
-                debugger
                 requestResultLoadingAndInfo(QueryAddUserInfoApply, reqParam, loading, OperateType === 1 ? ['保存草稿成功', '保存草稿失败:'] : ['修改客户资料成功', '修改客户资料失败:']).then(() => {
                     cancel();
                     context.emit('refresh');

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

@@ -29,7 +29,7 @@
           </a-form-item>
           <a-form-item label="姓名"
                        v-if="selectedRow.userinfotype !== '2'">
-            <span class="white">{{ formatValue(selectedRow.username)}}</span>
+            <span class="white">{{ formatValue(selectedRow.customername)}}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -120,7 +120,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="手机号码">
-              <span class="white">{{ formatValue(selectedRow.mobilephone) }}</span>
+              <span class="white">{{ formatValue(selectedRow.mobile) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -189,8 +189,10 @@ export default defineComponent({
         const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
+        console.log(props)
         function submit() {
-            cancel();
+            console.log(props)
+            cancel()
         }
         return {
             visible,