Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

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

@@ -6,7 +6,7 @@ import {
     ErmcpBizGroupEx,
     ErmcpBizGroupReq, ErmcpFuturesCompany,
     ErmcpLoginUserEx, ErmcpRole, ErmcpRoleMenuEx,
-    ErmcpTaAccountEx
+    ErmcpTaAccountEx, ErmcpTaAccountInfo, QueryAccMgrTaAccountInfoReq
 } from "@/services/go/ermcp/account/interface";
 
 /**
@@ -77,4 +77,15 @@ export function QueryAccMgrRole(): Promise<ErmcpRole> {
     return commonSearch_go('/Ermcp/QueryAccMgrRole', { userid }).catch((err) => {
         throw new Error(`查询账户管理角色设置: ${err.message}`);
     });
+}
+
+/**
+ * 查询账户管理授信(账户管理/账户设置/授信) /Ermcp/QueryAccMgrTaAccountInfo
+ * @param req
+ * @constructor
+ */
+export function QueryAccMgrTaAccountInfo(req: QueryAccMgrTaAccountInfoReq): Promise<ErmcpTaAccountInfo> {
+    return commonSearch_go('/Ermcp/QueryAccMgrTaAccountInfo', req).catch((err) => {
+        throw new Error(`查询账户管理授信: ${err.message}`);
+    });
 }

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

@@ -161,4 +161,56 @@ export interface ErmcpRole {
     roletype: number;//角色类型 - 1- 管理端 2- 交易端
 }
 
+/**
+ * 查询账户管理授信请求
+ */
+export interface QueryAccMgrTaAccountInfoReq {
+    userid: number  //   用户ID
+    accountid?: number // 账号id
+}
+
+/**
+ * 查询账户管理授信(账户管理/账户设置/授信) 返回
+ */
+export interface ErmcpTaAccountInfo {
+    accountname	:string;//机构名称
+    areauserid	:number;//所属机构\交易用户ID
+    begindate	:string;//开始交易日
+    biztype	:number;//业务类型 - 1:套保 2:套利
+    brandname	:string;//品牌名称
+    buypreinvoicedamount	:number;//采购预收票额(预收票额)
+    buyprepaidamount	:number;//采购预付款额(预付货款额)
+    buytodayinvoiceamount	:number;//采购今收票额(今收票额)
+    buytodayrefundamount	:number;//采购今收退款额(今收退款额)
+    buytodaysettleamount	:number;//采购今付款额(今付货款额)
+    buyuninvoicedamount	:number;//采购应收票额(应收票额)
+    buyunpaidamount	:number;//采购应付款额(应付货款额)
+    currencyid	:number;//结算币种ID
+    currencyname	:string;//币种名称
+    cycletime	:string;//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(number;
+//)【原值】
+    cycletype	:number;//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】
+    deliverygoodscode	:string;//现货品种代码
+    deliverygoodsid	:number;//现货品种ID
+    deliverygoodsname	:string;//现货品种名称
+    enddate	:string;//结束交易日
+    reckondate	:string;//日照时期(yyyyMMdd)
+    sellpreinvoicedamount	:number;//销售预开票额(预开票额)
+    sellprepaidamount	:number;//销售预收款额(预收货款额)
+    selltodayinvoiceamount	:number;//销售今开票额(今开票额)
+    selltodayrefundamount	:number;//销售今付退款额(今付退款额)
+    selltodaysettleamount	:number;//销售今收款额(今收货款额)
+    selluninvoicedamount	:number;//销售应开票额(应开票额)
+    sellunpaidamount	:number;//销售应收款额(应收货款额)
+    spotgoodsbrandid	:number;//现货品牌ID
+    todaypaysum	:number;//今付款合计
+    todayreceivesum	:number;//今收款合计
+    updatetime	:string;//更新时间
+    wrfactortypeid	:number;//仓单要素类型ID(212+Unix秒时间戳(1number;
+//位)+xxxxxx)
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:number;//现货商品ID
+    wrstandardname	:string;//品类名称
+}
+
 

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

@@ -27,15 +27,6 @@
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
-        <a-col :span="12">
-          <a-form-item label="手机号码"
-                       name="mobile">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     v-model:value="formState.mobile"
-                     placeholder="请输入登录账号" />
-          </a-form-item>
-        </a-col>
       </a-row>
     </a-form>
   </a-modal>
@@ -51,6 +42,7 @@ import { loginAccountOperate } from '@/services/proto/accountinfo';
 import { validateAction } from '@/common/setup/form';
 import { handleTradeForm } from '../setup';
 import { TraderFormState } from '../interface';
+import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'account_info_trade_btn_add',
@@ -69,10 +61,8 @@ export default defineComponent({
             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:修改用户信息
-                    userid: props.selectedData.roleid,
                     roleids: [24],
                     logintaaccounts: [],
-                    mobile: res.mobile, // string 手机号码（明文）
                     accountname: res.rolename,
                 };
                 requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['新增成功', '新增失败:']).then(() => {
@@ -81,6 +71,9 @@ export default defineComponent({
                 });
             });
         }
+
+        // 修改  operatetype = 13
+        // 注销  operatetype = 11
         return {
             formState,
             rules,

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

@@ -16,7 +16,7 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">注销
+                @click="submit">授信
       </a-button>
     </template>
     <a-form class="inlineForm">
@@ -53,18 +53,19 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+import {ErmcpLoginUser, ErmcpTaAccount, ErmcpTaAccountEx} from '@/services/go/ermcp/account/interface';
 import { Modal } from 'ant-design-vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { LoginaccountOperateReq } from '@/services/proto/accountinfo/interface';
-import { loginAccountOperate } from '@/services/proto/accountinfo';
+import {LoginaccountOperateReq, TaaccountTransfersxmoneyReq} from '@/services/proto/accountinfo/interface';
+import {loginAccountOperate, taAccountTransfersXMoneyReq} from '@/services/proto/accountinfo';
+import {getLongTypeLoginID} from "@/services/bus/login";
 
 export default defineComponent({
     name: 'account_info_futures_btn_child_credit',
     components: {},
     props: {
         selectedData: {
-            type: Object as PropType<ErmcpLoginUser>,
+            type: Object as PropType<ErmcpTaAccount>,
             default: {},
         },
     },
@@ -73,17 +74,17 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         function submit() {
             Modal.confirm({
-                title: '是否确认注销该账户',
-                okText: '确认注销',
+                title: '是否确认授信账户',
+                okText: '确认授信',
                 cancelText: '取消',
                 onOk() {
-                    let reqParam: LoginaccountOperateReq = {
-                        userid: props.selectedData.userid,
-                        loginid: props.selectedData.loginid,
-                        operatetype: 7, // 5: 锁定 6：解锁
-                        logintaaccounts: [],
+                    let reqParam: TaaccountTransfersxmoneyReq = {
+                        accountid: props.selectedData.accountid, // uint64 期货账户ID
+                        sxmoney: 1,// double 授信金额正为加负为减
+                        modifierid: Number(getLongTypeLoginID()),// uint64 修改人
+                        areauserid: props.selectedData.relateduserid,// uint64 机构用户ID
                     };
-                    requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['账户注销成功', '账户注销失败:']).then(() => {
+                    requestResultLoadingAndInfo(taAccountTransfersXMoneyReq, reqParam, loading, ['账户授信成功', '账户授信失败:']).then(() => {
                         cancel();
                         context.emit('refresh');
                     });

src/views/information/account_info/compoments/interface.ts

@@ -21,7 +21,6 @@ export interface ResetPasswordFormState {
 
 export interface TraderFormState {
     rolename: string; // 角色名称(交易账户->用户名称)
-    mobile: string; // 手机号
 }
 
 export interface AddFuturesFormState {

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

@@ -30,15 +30,6 @@
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
-        <a-col :span="12">
-          <a-form-item label="手机号码"
-                       name="mobile">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     v-model:value="formState.mobile"
-                     placeholder="请输入登录账号" />
-          </a-form-item>
-        </a-col>
       </a-row>
     </a-form>
   </a-modal>
@@ -83,7 +74,6 @@ export default defineComponent({
                     userid: props.selectedData.roleid,
                     roleids: [24],
                     logintaaccounts: [],
-                    mobile: res.mobile, // string 手机号码（明文）
                     accountname: res.rolename,
                 };
                 requestResultLoadingAndInfo(loginAccountOperate, reqParam, loading, ['修改成功', '修改失败:']).then(() => {