Browse Source

修好充值提现

huangbin 4 năm trước cách đây
mục cha
commit
b2a0c6bb24

+ 1 - 5
src/common/components/contextMenu/index.vue

@@ -22,10 +22,6 @@ export default defineComponent({
             default: [],
             type: Array as PropType<MenuItem[]>,
         },
-        tableList: {
-            default: [],
-            type: Array as PropType<any[]>,
-        },
         selectedRow: {
             default: null,
             type: Object,
@@ -41,7 +37,7 @@ export default defineComponent({
             menuList: props.contextMenuList,
             selectedData: props.selectedRow,
         });
-
+        function open() {}
         function onContextMenu(value: MouseEvent) {
             if (value.type === 'contextmenu') {
                 // 过滤右键表头

+ 11 - 11
src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/refuse/index.vue

@@ -5,7 +5,7 @@
            centered
            v-model:visible="visible"
            :maskClosable="false"
-           @cancel="submit"
+           @cancel="cancel"
            width="890px">
     <template #footer>
       <a-button key="submit"
@@ -23,11 +23,11 @@ import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import {t2bExchConfirmBusinessReq} from "@/services/proto/manager/interface";
-import {getTimeValue} from "@/utils/time";
-import {getUserId} from "@/services/bus/account";
-import {t2bExchConfirmBusiness} from "@/services/proto/manager";
-import {QhjAccountOutInApply} from "@/services/go/ermcp/qhj/interface";
+import { t2bExchConfirmBusinessReq } from '@/services/proto/manager/interface';
+import { getTimeValue } from '@/utils/time';
+import { getUserId } from '@/services/bus/account';
+import { t2bExchConfirmBusiness } from '@/services/proto/manager';
+import { QhjAccountOutInApply } from '@/services/go/ermcp/qhj/interface';
 
 export default defineComponent({
     name: 'custom-detail-desc',
@@ -47,12 +47,12 @@ export default defineComponent({
                 AccountCode: props.selectedRow.accountcode, // 资金账户(交易所的出入金,填0)
                 exchticket: props.selectedRow.exchticket, // 交易所流水号(被审核的流水)
                 tradedate: props.selectedRow.tradedate, // 交易日(被审业务发生的交易日)
-                extoperatorid: getTimeValue(),  // 外部操作流水号
+                extoperatorid: getTimeValue(), // 外部操作流水号
                 bankticket: props.selectedRow.bankticket, // 中心流水号
-                businessconfirmstatus: 2,// 审核结果 1: 通过 2: 拒绝
-                businesstype: props.selectedRow.executetype === 1 ? 2 : 1,  // 交易类型 1: 入金  2:出金 3: 签约 4: 解约
-                auditid: Number(getUserId())  // 审核人
-            }
+                businessconfirmstatus: 2, // 审核结果 1: 通过 2: 拒绝
+                businesstype: props.selectedRow.executetype === 1 ? 2 : 1, // 交易类型 1: 入金  2:出金 3: 签约 4: 解约
+                auditid: Number(getUserId()), // 审核人
+            };
 
             requestResultLoadingAndInfo(t2bExchConfirmBusiness, reqParams, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
                 cancel();

+ 4 - 2
src/views/platinum/platinum_recharge_withdrawal_review/list/setup.ts

@@ -12,8 +12,10 @@ export function queryTableList(type: 'in' | 'out') {
         queryResultLoadingAndInfo(queryAccountInOutApply, loading)
             .then(res => {
                 //申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
-                const arr = type === 'in' ? [2, 4, 6, 8] :  [1, 3, 5, 7]
-                tableList.value = res.filter((e: QhjAccountOutInApply) => arr.includes(e.executetype))
+                const arr = type === 'in' ? [2, 4, 6, 8] : [1, 3, 5, 7]
+                tableList.value = res.filter((e: QhjAccountOutInApply) => arr.includes(e.executetype)).map((e: QhjAccountOutInApply, i: number) => {
+                    return { ...e, key: String(i) }
+                })
             })
     }
     return { loading, tableList, queryTable }

+ 45 - 15
yarn.lock

@@ -1046,6 +1046,11 @@
   resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
   integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
 
+"@types/estree@^0.0.48":
+  version "0.0.48"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.48.tgz#18dc8091b285df90db2f25aa7d906cfc394b7f74"
+  integrity sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==
+
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
@@ -1519,6 +1524,17 @@
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
+"@vue/compiler-core@3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.1.2.tgz#31ab1d88e1706a5c7a545faeeb64c31bd0101db0"
+  integrity sha512-nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q==
+  dependencies:
+    "@babel/parser" "^7.12.0"
+    "@babel/types" "^7.12.0"
+    "@vue/shared" "3.1.2"
+    estree-walker "^2.0.1"
+    source-map "^0.6.1"
+
 "@vue/compiler-dom@3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz#b15fc1c909371fd671746020ba55b5dab4a730ee"
@@ -1527,17 +1543,26 @@
     "@vue/compiler-core" "3.0.11"
     "@vue/shared" "3.0.11"
 
-"@vue/compiler-sfc@^3.0.11":
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679"
-  integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw==
+"@vue/compiler-dom@3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz#75a7731bcc5d9718183a3c56c18e992f7c13e7b1"
+  integrity sha512-k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg==
+  dependencies:
+    "@vue/compiler-core" "3.1.2"
+    "@vue/shared" "3.1.2"
+
+"@vue/compiler-sfc@^3.0.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.1.2.tgz#23ff1e366d887b964899568bffcb11e3d0511fc4"
+  integrity sha512-SeG/2+DvwejQ7oAiSx8BrDh5qOdqCYHGClPiTvVIHTfSIHiS2JjMbCANdDCjHkTOh/O7WZzo2JhdKm98bRBxTw==
   dependencies:
     "@babel/parser" "^7.13.9"
     "@babel/types" "^7.13.0"
-    "@vue/compiler-core" "3.0.11"
-    "@vue/compiler-dom" "3.0.11"
-    "@vue/compiler-ssr" "3.0.11"
-    "@vue/shared" "3.0.11"
+    "@types/estree" "^0.0.48"
+    "@vue/compiler-core" "3.1.2"
+    "@vue/compiler-dom" "3.1.2"
+    "@vue/compiler-ssr" "3.1.2"
+    "@vue/shared" "3.1.2"
     consolidate "^0.16.0"
     estree-walker "^2.0.1"
     hash-sum "^2.0.0"
@@ -1549,13 +1574,13 @@
     postcss-selector-parser "^6.0.4"
     source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.0.11":
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.11.tgz#ac5a05fd1257412fa66079c823d8203b6a889a13"
-  integrity sha512-66yUGI8SGOpNvOcrQybRIhl2M03PJ+OrDPm78i7tvVln86MHTKhM3ERbALK26F7tXl0RkjX4sZpucCpiKs3MnA==
+"@vue/compiler-ssr@3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.1.2.tgz#e33ad0876d9b96f0950e22b0e174b94c1b049d2d"
+  integrity sha512-BwXo9LFk5OSWdMyZQ4bX1ELHX0Z/9F+ld/OaVnpUPzAZCHslBYLvyKUVDwv2C/lpLjRffpC2DOUEdl1+RP1aGg==
   dependencies:
-    "@vue/compiler-dom" "3.0.11"
-    "@vue/shared" "3.0.11"
+    "@vue/compiler-dom" "3.1.2"
+    "@vue/shared" "3.1.2"
 
 "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
   version "3.2.0"
@@ -1599,7 +1624,7 @@
   dependencies:
     "@vue/shared" "3.0.11"
 
-"@vue/runtime-core@3.0.11", "@vue/runtime-core@^3.0.11":
+"@vue/runtime-core@3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.11.tgz#c52dfc6acf3215493623552c1c2919080c562e44"
   integrity sha512-87XPNwHfz9JkmOlayBeCCfMh9PT2NBnv795DSbi//C/RaAnc/bGZgECjmkD7oXJ526BZbgk9QZBPdFT8KMxkAg==
@@ -1621,6 +1646,11 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
   integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
 
+"@vue/shared@3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.1.2.tgz#1069c0bc7d6f4bd15ccf3a5f3be29450aca368f9"
+  integrity sha512-EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg==
+
 "@vue/web-component-wrapper@^1.2.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a"