From 377b10900fce540c4e7d107a68cf42ef13978439 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Thu, 4 Sep 2025 15:16:30 +0800 Subject: [PATCH] 优化退款申请管理界面,增加搜索条件和统计信息展示,重构表格展示逻辑,提升用户体验。 --- .DS_Store | Bin 12292 -> 0 bytes .cursor/.DS_Store | Bin 0 -> 6148 bytes .cursor/mcp.json | 30 ++++++++++++++++++++++++++++++ antis-ncc-admin/.nvmrc | 1 + antis-ncc-admin/src/views/uavRefundApplication/Form.vue | 542 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------- antis-ncc-admin/src/views/uavRefundApplication/index.vue | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- antis-ncc-admin/src/views/uavSite/index.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++---------- antis-ncc-admin/src/views/uavWalletWithdrawApply/AuditForm.vue | 515 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/uavWalletWithdrawApply/ProcessForm.vue | 465 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/uavWalletWithdrawApply/index.vue | 489 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- netcore/src/.DS_Store | Bin 12292 -> 0 bytes netcore/src/Application/.DS_Store | Bin 10244 -> 0 bytes netcore/src/Application/NCC.API/.DS_Store | Bin 14340 -> 0 bytes netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavSite/Dto/UavSiteListOutput.cs | 10 ++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavWalletWithdrawApply/Dto/UavWalletWithdrawApplyAuditDetailOutput.cs | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavWalletWithdrawApply/Dto/UavWalletWithdrawApplyAuditInput.cs | 21 +++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavWalletWithdrawApply/Dto/UavWalletWithdrawApplyListOutput.cs | 25 +++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavWalletWithdrawApply/Dto/UavWalletWithdrawApplyListQueryInput.cs | 10 ++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavWalletWithdrawApply/Dto/UavWalletWithdrawApplyProcessInput.cs | 26 ++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend/MqttPublisherService.cs | 12 +++++++----- netcore/src/Modularity/Extend/NCC.Extend/NCC.Extend.xml | 25 ++++++++++++++++++++----- netcore/src/Modularity/Extend/NCC.Extend/UavSiteService.cs | 43 ++++++++++++++++++++++++++++++++++++++++--- netcore/src/Modularity/Extend/NCC.Extend/UavWalletWithdrawApplyService.cs | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- 23 files changed, 2539 insertions(+), 243 deletions(-) create mode 100644 .cursor/.DS_Store create mode 100644 .cursor/mcp.json create mode 100644 antis-ncc-admin/.nvmrc create mode 100644 antis-ncc-admin/src/views/uavWalletWithdrawApply/AuditForm.vue create mode 100644 antis-ncc-admin/src/views/uavWalletWithdrawApply/ProcessForm.vue create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavWalletWithdrawApply/Dto/UavWalletWithdrawApplyAuditDetailOutput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavWalletWithdrawApply/Dto/UavWalletWithdrawApplyAuditInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/uavWalletWithdrawApply/Dto/UavWalletWithdrawApplyProcessInput.cs diff --git a/.DS_Store b/.DS_Store index 76bb5ce..452424f 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.cursor/.DS_Store b/.cursor/.DS_Store new file mode 100644 index 0000000..686d99a Binary files /dev/null and b/.cursor/.DS_Store differ diff --git a/.cursor/mcp.json b/.cursor/mcp.json new file mode 100644 index 0000000..3d55742 --- /dev/null +++ b/.cursor/mcp.json @@ -0,0 +1,30 @@ +{ + "mcpServers": { + "my-sql-db": { + "command": "npx", + "args": [ + "--yes", + "@davewind/mysql-mcp-server", + "mysql://devuser:WrdDevMySql!123@rm-bp198425456ln4lu6uo.mysql.rds.aliyuncs.com:3306/antis_net_wurenji" + ] + }, + "my-api-spec": { + "command": "npx", + "args": [ + "--yes", + "@ivotoby/openapi-mcp-server", + "--openapi-spec", + "http://localhost:2011/swagger/Default/swagger.json", + "--api-base-url", + "http://localhost:2011" + ] + }, + "filesystem": { + "command": "npx", + "args": [ + "@modelcontextprotocol/server-filesystem", + "." + ] + } + } +} \ No newline at end of file diff --git a/antis-ncc-admin/.nvmrc b/antis-ncc-admin/.nvmrc new file mode 100644 index 0000000..b6a7d89 --- /dev/null +++ b/antis-ncc-admin/.nvmrc @@ -0,0 +1 @@ +16 diff --git a/antis-ncc-admin/src/views/uavRefundApplication/Form.vue b/antis-ncc-admin/src/views/uavRefundApplication/Form.vue index 2299ea2..fa9fa75 100644 --- a/antis-ncc-admin/src/views/uavRefundApplication/Form.vue +++ b/antis-ncc-admin/src/views/uavRefundApplication/Form.vue @@ -1,59 +1,178 @@  @@ -67,6 +186,7 @@ export default { data() { return { loading: false, + submitLoading: false, visible: false, isDetail: false, dataForm: { @@ -76,6 +196,20 @@ export default { applyAmount: undefined, userId: undefined, userPhone: undefined, + refundReason: '', + remark: '', + refundStatus: 0, + handleTime: undefined, + handleUser: '', + handleResult: '' + }, + handleForm: { + handleResult: '' + }, + handleRules: { + handleResult: [ + { required: true, message: '请填写处理结果', trigger: 'blur' } + ] }, rules: { }, @@ -95,63 +229,293 @@ export default { this.dataForm.id = id || 0; this.visible = true; this.isDetail = isDetail || false; + this.loading = true; this.$nextTick(() => { - this.$refs['elForm'].resetFields(); if (this.dataForm.id) { request({ url: '/api/Extend/UavRefundApplication/' + this.dataForm.id, method: 'get' }).then(res => { this.dataForm = res.data; + this.handleForm.handleResult = res.data.handleResult || ''; + this.loading = false; + }).catch(() => { + this.loading = false; }) + } else { + this.loading = false; } }) }, + formatDateTime(dateTime) { + if (!dateTime) return '-' + const date = new Date(dateTime) + return date.toLocaleString('zh-CN', { + year: 'numeric', + month: '2-digit', + day: '2-digit', + hour: '2-digit', + minute: '2-digit', + second: '2-digit' + }) + }, RejectRefund() { - request({ - url: `/api/Extend/UavRefundApplication/RejectRefund`, - method: 'post', - data: this.dataForm, - }).then((res) => { - this.$message({ - message: res.msg, - type: 'success', - duration: 1000, - onClose: () => { - this.visible = false, - this.$emit('refresh', true) - } - }) + this.$refs['handleForm'].validate((valid) => { + if (valid) { + this.$confirm('确认拒绝此退款申请吗?', '提示', { + type: 'warning' + }).then(() => { + this.submitLoading = true; + const submitData = { + ...this.dataForm, + handleResult: this.handleForm.handleResult + }; + request({ + url: `/api/Extend/UavRefundApplication/RejectRefund`, + method: 'post', + data: submitData, + }).then((res) => { + this.$message({ + message: res.msg, + type: 'success', + duration: 1000, + onClose: () => { + this.visible = false; + this.$emit('refresh', true); + } + }) + }).catch(() => { + this.submitLoading = false; + }) + }) + } }) }, dataFormSubmit() { - //提示是否确认退款 - this.$confirm('是否确认退款, 是否继续?', '提示', { - type: 'warning' - }).then(() => { - request({ - url: `/api/Extend/AliPay/RefundPay`, - method: 'post', - data: { - OutOrderNo: this.dataForm.orderNo, - } - }).then((res) => { - this.$message({ - message: res.data, - type: 'success', - duration: 1000, - onClose: () => { - this.visible = false, - this.$emit('refresh', true) - } + this.$refs['handleForm'].validate((valid) => { + if (valid) { + this.$confirm('确认同意此退款申请并执行退款吗?', '提示', { + type: 'warning' + }).then(() => { + this.submitLoading = true; + request({ + url: `/api/Extend/AliPay/RefundPay`, + method: 'post', + data: { + OutOrderNo: this.dataForm.orderNo, + handleResult: this.handleForm.handleResult + } + }).then((res) => { + this.$message({ + message: res.data, + type: 'success', + duration: 1000, + onClose: () => { + this.visible = false; + this.$emit('refresh', true); + } + }) + }).catch(() => { + this.submitLoading = false; + }) }) - }) + } }) }, } } - diff --git a/antis-ncc-admin/src/views/uavRefundApplication/index.vue b/antis-ncc-admin/src/views/uavRefundApplication/index.vue index 4df2349..3b11e96 100644 --- a/antis-ncc-admin/src/views/uavRefundApplication/index.vue +++ b/antis-ncc-admin/src/views/uavRefundApplication/index.vue @@ -1,64 +1,100 @@