commit 提交代码

src/common/constants/EnumKey.ts

@@ -8,4 +8,5 @@ export interface EnumKey {
     warehouseinfoType: string; // 仓库类型
     paycurrency: string; // 币种
     spotContractType: string; // 套保计划类型
+    operateType: string;  //资金操作类型
 }

src/common/constants/enumsName.ts

@@ -46,6 +46,15 @@ export function getSpotContractTypeEnumItemName(enumdicid: number): string {
 }
 
 
+/**
+ *资金枚举名称
+ */
+export function getOperateTypeEnumItemName(enumdicid: number): string {
+    return getItemEnumName('operateType', enumdicid)
+}
+
+
+
 
 /****************  页面枚举  *******************/
 /**
@@ -732,4 +741,223 @@ export function getPaymentTypeName(type: number){
             break
     }
     return result
+}
+
+/**
+ * 资金操作类型
+ * 资金操作类型 (AccountFundCmdOp)- 101:入金 102:入金手续费 103:出金 104:出金冻结 105:出金解冻 106:出金手续费 107:出金手续费冻结 108:出金手续费解冻
+ * 201:交易冻结 202:交易解冻 203:交易占用 204:交易解占用 205:交易手续费冻结 206:交易手续费解冻 207:交易手续费 208:交易货款 209:交易盈亏
+ * 301:交割冻结 302:交割解冻 303:交割手续费 304:交割手续费冻结 305:交割手续费解冻 306:交割货款 307:交割税款 401:结算盈亏 402:结算递延费 403:分润收入
+ * 404:延期分润 501:授信增加 502:授信减少 503:转积分 504:转入 505:转出 506:转出冻结 507:转出解冻 601:履约金额冻结 602:履约最大冻结 603:履约金额解冻 604:履约扣款
+ * 605:履约收款 606:履约违约手续费 607:履约违约收入 608:履约最大扣款 701:供应链金融冻结 702:供应链金融解冻 703:供应链金融最大冻结 704:供应链金融利息 705:供应链金融货款
+ * 706:供应链金融押金 707:供应链金融最大扣款 801:仓单贸易冻结 802:仓单贸易解冻 803:仓单贸易首付款 804:仓单贸易最大扣款 901:商城扣款冻结 902:商城扣款解冻 903:商城扣款
+ * 904:商城收款 1001:期权冻结 1002:期权解冻 1003:期权权力金 1004:期权手续费冻结 1005:期权手续费解冻 1006:期权手续费 1007:期权盈亏 1101:营销扣款 1102:营销收款
+ * @param type
+ */
+export function getOperateTypeName(type: number){
+    let result = '--'
+    switch (type) {
+        case 101:
+            result = '入金'
+            break
+        case 102:
+            result = '入金手续费'
+            break
+        case 103:
+            result = '出金'
+            break
+        case 104:
+            result = '出金冻结'
+            break
+        case 105:
+            result = '出金解冻'
+            break
+        case 106:
+            result = '出金手续费'
+            break
+        case 107:
+            result = '出金手续费冻结'
+            break
+        case 108:
+            result = '出金手续费解冻'
+            break
+        case 201:
+            result = '交易冻结'
+            break
+        case 202:
+            result = '交易解冻'
+            break
+        case 203:
+            result = '交易占用'
+            break
+        case 204:
+            result = '交易解占用'
+            break
+        case 205:
+            result = '交易手续费冻结'
+            break
+        case 206:
+            result = '交易手续费解冻'
+            break
+        case 207:
+            result = '交易手续费'
+            break
+        case 208:
+            result = '交易货款'
+            break
+        case 209:
+            result = '交易盈亏'
+            break
+        case 301:
+            result = '交割冻结'
+            break
+        case 302:
+            result = '交割解冻'
+            break
+        case 303:
+            result = '交割手续费'
+            break
+        case 304:
+            result = '交割手续费冻结'
+            break
+        case 305:
+            result = '交割手续费解冻'
+            break
+        case 306:
+            result = '交割货款'
+            break
+        case 307:
+            result = '交割税款'
+            break
+        case 401:
+            result = '结算盈亏'
+            break;
+        case 402:
+            result = '结算递延费'
+            break;
+        case 403:
+            result = '分润收入'
+            break;
+        case 404:
+            result = '延期分润'
+            break;
+        case 501:
+            result = '授信增加'
+            break;
+        case 502:
+            result = '授信减少'
+            break;
+        case 503:
+            result = '转积分'
+            break;
+        case 504:
+            result = '转入'
+            break;
+        case 505:
+            result = '转出'
+            break;
+        case 506:
+            result = '转出冻结'
+            break;
+        case 507:
+            result = '转出解冻'
+            break;
+        case 601:
+            result = '履约金额冻结'
+            break;
+        case 602:
+            result = '履约最大冻结'
+            break;
+        case 603:
+            result = '履约金额解冻'
+            break;
+        case 604:
+            result = '履约扣款'
+            break;
+        case 605:
+            result = '履约收款'
+            break;
+        case 606:
+            result = '履约违约手续费'
+            break;
+        case 607:
+            result = '履约违约收入'
+            break;
+        case 608:
+            result = '履约最大扣款'
+            break;
+        case 701:
+            result = '供应链金融冻结'
+            break;
+        case 702:
+            result = '供应链金融解冻'
+            break;
+        case 703:
+            result = '供应链金融最大冻结'
+            break;
+        case 704:
+            result = '供应链金融利息'
+            break;
+        case 705:
+            result = '供应链金融货款'
+            break;
+        case 706:
+            result = '供应链金融押金'
+            break;
+        case 707:
+            result = '供应链金融最大扣款'
+            break;
+        case 801:
+            result = '仓单贸易冻结'
+            break;
+        case 802:
+            result = '仓单贸易解冻'
+            break;
+        case 803:
+            result = '仓单贸易首付款'
+            break;
+        case 804:
+            result = '仓单贸易最大扣款'
+            break;
+        case 901:
+            result = '商城扣款冻结'
+            break;
+        case 902:
+            result = '商城扣款解冻'
+            break;
+        case 903:
+            result = '商城扣款'
+            break;
+        case 904:
+            result = '商城收款'
+            break;
+        case 1001:
+            result = '期权冻结'
+            break;
+        case 1002:
+            result = '期权解冻'
+            break;
+        case 1003:
+            result = '期权权力金'
+            break;
+        case 1004:
+            result = '期权手续费冻结'
+            break;
+        case 1005:
+            result = '期权手续费解冻'
+            break;
+        case 1006:
+            result = '期权手续费'
+            break;
+        case 1007:
+            result = '期权盈亏'
+            break;
+        case 1101:
+            result = '营销扣款'
+            break;
+        case 1102:
+            result = '营销收款'
+            break;
+    }
+    return result
 }

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

@@ -30,11 +30,11 @@
 import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { UserInfoCheckMangeReq } from '@/services/proto/accountinfo/interface';
+import {AuditWskhUserInfoReq, UserInfoCheckMangeReq} from '@/services/proto/accountinfo/interface';
 import { getUserId } from '@/services/bus/account';
 import { Modal } from 'ant-design-vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { userInfoCheck } from '@/services/proto/accountinfo';
+import {auditWskhUserInfo, userInfoCheck} from '@/services/proto/accountinfo';
 import Detail from '../common-detail/index.vue';
 
 export default defineComponent({
@@ -57,13 +57,12 @@ export default defineComponent({
                 okText: '确认通过',
                 cancelText: '取消',
                 onOk() {
-                    let reqParam: UserInfoCheckMangeReq = {
-                        audituserid: getUserId(),
-                        userid: props.selectedRow.userid,
-                        auditflag: 1,
-                        remark: '',
+                    let reqParam: AuditWskhUserInfoReq = {
+                        UserID: props.selectedRow.userid, // uint64 用户ID(自增ID)SEQ_WSKH_USERINFO
+                        UserState: 4, // uint32 审核状态：4-审核通过，5-审核拒绝
+                        AuditedBy: getUserId(),// uint64 审核人
                     };
-                    requestResultLoadingAndInfo(userInfoCheck, reqParam, loading, ['审核成功', '审核失败:']).then(() => {
+                    requestResultLoadingAndInfo(auditWskhUserInfo, reqParam, loading, ['审核成功', '审核失败:']).then(() => {
                         cancel();
                         context.emit('refresh');
                     });
@@ -79,13 +78,12 @@ export default defineComponent({
                 okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
-                    let reqParam: UserInfoCheckMangeReq = {
-                        audituserid: getUserId(),
-                        userid: props.selectedRow.userid,
-                        auditflag: 2,
-                        remark: '',
+                    let reqParam: AuditWskhUserInfoReq = {
+                        UserID: props.selectedRow.userid, // uint64 用户ID(自增ID)SEQ_WSKH_USERINFO
+                        UserState: 5, // uint32 审核状态：4-审核通过，5-审核拒绝
+                        AuditedBy: getUserId(),// uint64 审核人
                     };
-                    requestResultLoadingAndInfo(userInfoCheck, reqParam, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
+                    requestResultLoadingAndInfo(auditWskhUserInfo, reqParam, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
                         cancel();
                         context.emit('refresh');
                     });

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

@@ -16,6 +16,9 @@
             <template #expandedRowRender="{ record }">
                 <BtnList :btnList="btnList" :record="record" @click="openComponent" />
             </template>
+            <template #createtime="{ record }">
+                <a>{{ formatTime(record.createtime) }}</a>
+            </template>
         </a-table>
         <component
             :is="componentId"
@@ -37,6 +40,8 @@ import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { queryAmountLog } from '@/services/go/TaAccount';
 import { QueryAmountLogReq } from '@/services/go/TaAccount/interface';
 import { getSelectedAccountId } from '@/services/bus/account';
+import {getOperateTypeEnumItemName, getOperateTypeName} from "@/common/constants/enumsName";
+import {formatTime} from "@/common/methods";
 export default defineComponent({
     name: enumOrderComponents.funding_information_funding_log,
     components: {
@@ -63,6 +68,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrPerformancePlan>(param),
             loading,
             tableList,
+            formatTime,
         };
     },
 });

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

@@ -16,14 +16,15 @@
                  :record="record"
                  @click="openComponent" />
       </template>
-      <!--  委托状态-->
-      <template #wrtradeorderstatus="{ record }">
-        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
-      </template>
-      <!-- 挂牌类型 -->
-      <template #wrtradetype="{ record }">
-        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-      </template>
+        <!--  委托状态-->
+        <template #wrtradeorderstatus="{ record }">
+            <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+        </template>
+        <!-- 挂牌类型 -->
+        <template #wrtradetype="{ record }">
+            <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+        </template>
+        <!-- 挂牌价格 -->
     </a-table>
     <component :is="componentId"
                v-if="componentId"