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

src/common/constants/buttonType.ts

@@ -107,6 +107,10 @@ export interface ButtonType {
     /******** =========================== 千海金 =========================== *********/
     platinum_custom_info_add: string; // 千海金 客户资料 新增
     platinum_customer_info_unsubmit_check: string; // 千海金 客户资料 审核
+    platinum_custom_info_normal_modify: string; //  千海金 客户资料 正常 - 修改
+    platinum_custom_info_normal_stop: string; //  千海金 客户资料 正常 - 停用
+    platinum_customer_info_stop_resume: string; // 千海金 客户资料 停用 - 恢复
+    platinum_customer_info_stop_delete: string; // 千海金 客户资料 停用 - 删除
 
     platinum_recharge_review_confirm_payment: string; // 千海金 充值审核 确认收款
     platinum_recharge_review_refuse: string; // 千海金 充值审核 审核拒绝

src/common/setup/table/interface.ts

@@ -92,5 +92,4 @@ export interface ButtonListKey {
     platinum_document_query_waiting: string; // 千海金 单据查询 待付单
     platinum_document_query_success: string; // 千海金 单据查询 成交单
     platinum_financing_information_tab: string; // 千海金 融资信息
-}
 }

src/services/proto/manager/index.ts

@@ -0,0 +1,14 @@
+/**
+ *****************     管理端接口  *******************
+ */
+import {protoMiddleware} from "@/services/socket/protobuf/buildReq";
+import {t2bExchConfirmBusinessReq, t2bExchConfirmBusinessRsp} from "@/services/proto/manager/interface";
+
+/**
+ * 交易所审核结果通知请求
+ * @param param
+ */
+export const t2bExchConfirmBusiness = (param: t2bExchConfirmBusinessReq): Promise<t2bExchConfirmBusinessRsp> => {
+    return protoMiddleware<t2bExchConfirmBusinessReq>(param, 't2bExchConfirmBusinessReq', 't2bExchConfirmBusinessRsp', 2)
+}
+

src/services/proto/manager/interface.ts

@@ -0,0 +1,26 @@
+// 交易所审核结果通知请求
+export interface t2bExchConfirmBusinessReq {
+    extoperatorid: number; // 外部操作流水号
+    cusbankid: string; // 托管银行编号
+    AccountCode: string; // 资金账户(交易所的出入金，填0)
+    exchid: string; // 交易所编号
+    tradedate: string; // 交易日(被审业务发生的交易日）
+    exchticket: string; // 交易所流水号（被审核的流水）
+    bankticket: string; // 中心流水号
+    businesstype: number; // 交易类型[1:入金；2：出金；3：签约；4：解约;5:资金调拨;
+    businessconfirmstatus: number; // 审核结果[1:通过；2：拒绝]
+    retcode: string; // 返回码
+    retmsg: string; // 返回结果说明
+    remark: string; // 备注
+    auditid: number; // 审核人
+    extend: string; // 扩展信息（若这个字段存在，则会更新到出入金申请表的扩展字段）
+}
+
+// 交易所审核结果通知应答
+export interface t2bExchConfirmBusinessRsp {
+    RetCode: number; // 返回码
+    RetDesc: string; // 描述信息
+    ExtOperatorID: number; // 外部操作流水号
+    Status: number; // 状态（0成功,其他数值参考银行服务的错误码）
+    ExchTicket: string; // 交易所流水号（操作流水，非被审核交易的流水）
+}

src/utils/storage/base64/index.ts

@@ -15,3 +15,11 @@ export function toBase64(str: string): string {
 export function parseBase64(str: string): string {
     return JSON.parse(decodeURIComponent(atob(str)));
 }
+
+/**
+ * base64编码
+ * @param str
+ */
+export function toBase64String(str: string): string {
+    return btoa(str)
+}

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

@@ -307,6 +307,7 @@ import UploadImg from '@/common/components/uploadImg/index.vue';
 import { getUploadImg } from '@/common/setup/upload';
 import { CustomerInfoOperateReq } from '@/services/proto/accountinfo/interface';
 import { initData } from '@/common/methods';
+import {toBase64, toBase64String} from "@/utils/storage/base64";
 
 export default defineComponent({
     name: 'add-custom',
@@ -342,7 +343,7 @@ export default defineComponent({
                     operatetype: 1,
                     areaid: param.areaid as number,
                     logincode: param.logincode,
-                    loginpwd: param.loginpwd,
+                    loginpwd: toBase64String(toBase64String(param.loginpwd)),
                     username: param.username, // 必填
                     userid: getUserId(), // 写死 必填
                     userinfotype: Number(param.userinfotype),

src/views/platinum/platinum_customer_info/compoments/common-detail/index.vue

@@ -21,19 +21,20 @@ import { formatValue } from '@/common/methods';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import { Des, DescriptionsList, handleDesList } from '@/common/components/commonDes';
 import { handlePreviewImg } from '@/common/setup/upload';
+import {QhjCustomer} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'custom-detail-desc',
     components: { Des },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjCustomer>,
             default: {},
         },
     },
     setup(props) {
         function isPersonal() {
-            return props.selectedRow.userinfotype === '1';
+            return props.selectedRow.userinfotype === 1;
         }
         const { desList, getDesList } = handleDesList();
         // 预览附件

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

@@ -36,13 +36,14 @@ import Recover from '../recover/index.vue';
 import Disable from '../disable/index.vue';
 import Cancel from '../cancel/index.vue';
 import Check from '../check/index.vue';
+import {QhjCustomer} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'custom-control-modal',
     components: { Detail, Delete, Add, Modify, Recover, Disable, Cancel, Check },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjCustomer>,
             default: {},
         },
     },

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

@@ -36,7 +36,7 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('custom_info_btn_delete');
+        const { visible, cancel } = closeModal('platinum_customer_info_stop_delete');
         const loading = ref<boolean>(false);
         console.log('是否确认删除客户资料');
         function submit() {

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

@@ -22,13 +22,14 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import Detail from '../common-detail/index.vue';
+import {QhjCustomer} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'custom-detail',
     components: { Detail },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjCustomer>,
             default: {},
         },
     },

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

@@ -41,7 +41,7 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('custom_info_btn_disable');
+        const { visible, cancel } = closeModal('platinum_custom_info_normal_stop');
         const maskClosableFlag = ref<boolean>(false);
         const loading = ref<boolean>(false);
 

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

@@ -323,7 +323,7 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('custom_info_btn_modify');
+        const { visible, cancel } = closeModal('platinum_custom_info_normal_modify');
         const loading = ref<boolean>(false);
         // 证件类型
         const cardTypeList = ref<AllEnums[]>(getCardType());

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

@@ -40,7 +40,7 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('custom_info_btn_recover');
+        const { visible, cancel } = closeModal('platinum_customer_info_stop_resume');
         const loading = ref<boolean>(false);
         // 恢复方法
         function recover() {

src/views/platinum/platinum_customer_info/list/normal-use/index.vue

@@ -18,7 +18,7 @@
           <BtnList :btnList="forDataBtn" />
         </template>
         <template #userinfotype="{ text }">
-          <a>{{ text === '2' ? '企业' : '个人' }}</a>
+          <a>{{ text === 2 ? '企业' : '个人' }}</a>
         </template>
         <template #status="{ text }">
           <a>{{ getStatusName(text) }}</a>
@@ -34,7 +34,16 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+    import {
+        defineComponent,
+        initData,
+        getTableColumns,
+        getTableEvent,
+        getBtnList,
+        contextMenu,
+        BtnList,
+        _getBtnList
+    } from '@/common/export/table';
 
 import { filterCustomTable } from '../../compoments';
 import { queryTableList, QueryCustomInfoType } from '../index';
@@ -55,8 +64,10 @@ export default defineComponent({
         const { columns, registerColumn, updateColumn } = getTableColumns();
         // 表格事件
         const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QhjCustomer>({});
+
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('platinum_custom_info_normal', true);
+        const [commonBtn, forDataBtn] = _getBtnList('platinum_custom_info_normal', true).value;
+
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
@@ -68,7 +79,6 @@ export default defineComponent({
 
         return {
             columns,
-
             expandedRowKeys,
             selectedRow,
             Rowclick,

src/views/platinum/platinum_customer_info/list/stop-use/index.vue

@@ -18,7 +18,7 @@
           <BtnList :btnList="forDataBtn" />
         </template>
         <template #userinfotype="{ text }">
-          <a>{{ text === '2' ? '企业' : '个人' }}</a>
+          <a>{{ text === 2 ? '企业' : '个人' }}</a>
         </template>
         <template #status="{ text }">
           <a>{{ getStatusName(text) }}</a>
@@ -34,7 +34,16 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+    import {
+        defineComponent,
+        initData,
+        getTableColumns,
+        getTableEvent,
+        getBtnList,
+        contextMenu,
+        BtnList,
+        _getBtnList
+    } from '@/common/export/table';
 
 import { filterCustomTable } from '../../compoments';
 
@@ -57,8 +66,10 @@ export default defineComponent({
         const { columns, registerColumn, updateColumn } = getTableColumns();
         // 表格事件
         const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QhjCustomer>({});
+
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('platinum_customer_info_stop', true);
+        const [commonBtn, forDataBtn] = _getBtnList('platinum_customer_info_stop', true).value;
+
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {