diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 916339a..bce6ae5 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -1049,7 +1049,9 @@ const handleAddForm = async () => { // 客服编辑收款(撤回后重新提交) const handleEditForm = async () => { try { - await waitJwcodeQuery() + // 如果失焦事件已经触发了查询,这里会等待并拿到结果,否则返回null + const waitResult = await waitJwcodeQuery() + await addFormRef.value.validate(); if (!testGold().valid) { ElMessage.error(testGold().message); @@ -1090,6 +1092,19 @@ const handleEditForm = async () => { return; } ifReAddDone.value = true + + // 核心判断:如果上面没有拦截到正在进行的请求,说明是直接点击的提交,需要主动查一次 + let jwcodeResult = waitResult + if (!jwcodeResult) { + jwcodeResult = await jwcodeSeachMarket() + } + + // 判断精网号查询的结果,如果是返回错误或者是 code=0 则直接退出新增流程 + if (!jwcodeResult || jwcodeResult.code === 0 || jwcodeResult.code === 500) { + ifReAddDone.value = false; + return; + } + const result = await request({ url: '/cashCollection/reSubmit', data: { diff --git a/src/views/walletManage/WalletBalance.vue b/src/views/walletManage/WalletBalance.vue index edd9483..16b058f 100644 --- a/src/views/walletManage/WalletBalance.vue +++ b/src/views/walletManage/WalletBalance.vue @@ -557,7 +557,7 @@ const getExportList = async ({ showLoading = true, silentError = false } = {}) = if (result.code === 200) { // 过滤只显示type为16和17的导出记录 const filteredData = result.data.filter(item => { - return item.type === 16 || item.type === 17; + return item.type === 17; }); exportList.value = sortExportList(filteredData) if (exportListVisible.value && hasPendingExportTask(exportList.value)) { diff --git a/src/views/walletManage/components/WalletDetailTemplate.vue b/src/views/walletManage/components/WalletDetailTemplate.vue index d1788c7..5bac989 100644 --- a/src/views/walletManage/components/WalletDetailTemplate.vue +++ b/src/views/walletManage/components/WalletDetailTemplate.vue @@ -257,7 +257,7 @@ const getExportList = async ({ showLoading = true, silentError = false } = {}) = if (result.code === 200) { // 过滤只显示 type 为 16 和 17 的导出记录(保持和 WalletBalance 页面一致) const filteredData = result.data.filter(item => { - return item.type === 16 || item.type === 17; + return item.type === 16; }); exportList.value = sortExportList(filteredData) if (exportListVisible.value && hasPendingExportTask(exportList.value)) {