From 64e49daf8bb4486b94431449aaa7ab7a8198b7e5 Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Wed, 25 Dec 2024 16:37:19 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/src/views/audit/refundAudit.vue | 41 ++++++++++++------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue index 27bb550..bc69422 100644 --- a/vue/gold-system/src/views/audit/refundAudit.vue +++ b/vue/gold-system/src/views/audit/refundAudit.vue @@ -228,27 +228,24 @@ const getProduct = async function () { // 在这里可以处理错误逻辑，比如显示错误提示等 } }; -// // 获取地区 -// const getArea = async function () { -// try { -// // 发送POST请求 -// const result = await API.post( -// "http://192.168.8.93:10010/recharge/recharge", -// {} -// ); -// // 将响应结果存储到响应式数据中 -// console.log("请求成功", result); -// // 存储全部数据 -// allData.value = result.data; -// console.log("allData", allData.value); -// // 分离并去重地区列表 -// area.value = [...new Set(allData.value.map((item) => item.area))]; -// console.log("地区", area.value); -// } catch (error) { -// console.log("请求失败", error); -// // 在这里可以处理错误逻辑，比如显示错误提示等 -// } -// }; +// 获取地区 +const getArea = async function () { + try { + // 发送POST请求 + const result = await API.post( + "http://192.168.8.93:10010/recharge/user/search", + {} + ); + // 将响应结果存储到响应式数据中 + console.log("请求成功", result); + // 存储全部数据 + area.value = result.data; + console.log("allData", allData.value); + } catch (error) { + console.log("请求失败", error); + // 在这里可以处理错误逻辑，比如显示错误提示等 + } +}; // 验证跳转输入框的数字是否合法 const checkNumber = function () { if (typeof parseInt(getObj.value.pageNum) === "number") { @@ -380,7 +377,7 @@ const rules = reactive({ onMounted(async function () { await get(); getProduct(); - // await getArea(); + await getArea(); }); From 36b89067fd4a871b2c0b57c9f8791f98194b6757 Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Wed, 25 Dec 2024 17:15:36 +0800 Subject: [PATCH 2/7] 11111 --- vue/gold-system/src/views/audit/refundAudit.vue | 19 +------------------ vue/gold-system/src/views/usergoldInfo/index.vue | 2 +- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue index 682f005..8823e9b 100644 --- a/vue/gold-system/src/views/audit/refundAudit.vue +++ b/vue/gold-system/src/views/audit/refundAudit.vue @@ -228,24 +228,7 @@ const getProduct = async function () { // 在这里可以处理错误逻辑，比如显示错误提示等 } }; -// 获取地区 -const getArea = async function () { - try { - // 发送POST请求 - const result = await API.post( - "http://192.168.8.93:10010/recharge/user/search", - {} - ); - // 将响应结果存储到响应式数据中 - console.log("请求成功", result); - // 存储全部数据 - area.value = result.data; - console.log("allData", allData.value); - } catch (error) { - console.log("请求失败", error); - // 在这里可以处理错误逻辑，比如显示错误提示等 - } -}; + // 获取地区 const getArea = async function () { try { diff --git a/vue/gold-system/src/views/usergoldInfo/index.vue b/vue/gold-system/src/views/usergoldInfo/index.vue index 09f9d8d..aed2d03 100644 --- a/vue/gold-system/src/views/usergoldInfo/index.vue +++ b/vue/gold-system/src/views/usergoldInfo/index.vue @@ -74,7 +74,7 @@ const get = async function (val) { // 发送POST请求 const result = await API.post("http://192.168.8.93:10010/detailY/select", { ...getObj.value, - detailY: { ...detailY.value }, + detailYgold: { ...detailY.value }, }); // const result2 = await API.post("http://192.168.8.93:10010/detailY/select", { // ...getAllObj.value, From 63ef06202e78890b7fd5444a6d15e45e59901fb2 Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Thu, 26 Dec 2024 11:03:59 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8A=A0=E4=BA=86excel=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/README.md | 19 ++++++++++--------- vue/gold-system/package-lock.json | 16 ++++++++++++++++ vue/gold-system/package.json | 1 + vue/gold-system/src/main.ts | 6 ++++++ vue/gold-system/src/views/usergoldInfo/index.vue | 13 ++++++++++++- 5 files changed, 45 insertions(+), 10 deletions(-) diff --git a/vue/gold-system/README.md b/vue/gold-system/README.md index aed662e..5ae1561 100644 --- a/vue/gold-system/README.md +++ b/vue/gold-system/README.md @@ -6,20 +6,21 @@ Learn more about the recommended Project Setup and IDE Support in the [Vue Docs npm install 下载依赖包 -npm run dev 启动项目 +npm run dev 启动项目 -npm install vue-router 下载vue-router组件 +npm install vue-router 下载 vue-router 组件 -npm install axios 下载axios组件 +npm install axios 下载 axios 组件 -npm install element-plus --save 下载element-plus组件 +npm install element-plus --save 下载 element-plus 组件 -npm install @element-plus/icons-vue 下载element-plus图标库 +npm install @element-plus/icons-vue 下载 element-plus 图标库 -npm install vue-icons-plus --save 下载外部图标库 +npm install vue-icons-plus --save 下载外部图标库 -npm install echarts 安装echarts组件 +npm install echarts 安装 echarts 组件 -npm install moment 安装moment组件 +npm install moment 安装 moment 组件 -npm install mathjs 安装mathjs组件,解决数据计算问题 \ No newline at end of file +npm install mathjs 安装 mathjs 组件,解决数据计算问题 +npm install vue-json-excel 安装导出 excel 组件 diff --git a/vue/gold-system/package-lock.json b/vue/gold-system/package-lock.json index 14bc872..e76bec5 100644 --- a/vue/gold-system/package-lock.json +++ b/vue/gold-system/package-lock.json @@ -16,6 +16,7 @@ "moment": "^2.30.1", "vue": "^3.5.12", "vue-icons-plus": "^0.1.7", + "vue-json-excel": "^0.3.0", "vue-router": "^4.5.0" }, "devDependencies": { @@ -1193,6 +1194,12 @@ "node": ">=0.4.0" } }, + "node_modules/downloadjs": { + "version": "1.4.7", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/downloadjs/-/downloadjs-1.4.7.tgz", + "integrity": "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q==", + "license": "MIT" + }, "node_modules/echarts": { "version": "5.5.1", "resolved": "https://mirrors.huaweicloud.com/repository/npm/echarts/-/echarts-5.5.1.tgz", @@ -1765,6 +1772,15 @@ "vue": ">=2.7.0" } }, + "node_modules/vue-json-excel": { + "version": "0.3.0", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/vue-json-excel/-/vue-json-excel-0.3.0.tgz", + "integrity": "sha512-FrSh0tVUpw4K+ilLO8g0Qp52eFJw/hkk3rZPTEKo9qVkJgVfQtZwzj3UWc5ACYxA3jLk9HtjK+f9xKHCN4Kgag==", + "license": "MIT", + "dependencies": { + "downloadjs": "^1.4.7" + } + }, "node_modules/vue-router": { "version": "4.5.0", "resolved": "https://mirrors.huaweicloud.com/repository/npm/vue-router/-/vue-router-4.5.0.tgz", diff --git a/vue/gold-system/package.json b/vue/gold-system/package.json index a629569..91b59d8 100644 --- a/vue/gold-system/package.json +++ b/vue/gold-system/package.json @@ -18,6 +18,7 @@ "moment": "^2.30.1", "vue": "^3.5.12", "vue-icons-plus": "^0.1.7", + "vue-json-excel": "^0.3.0", "vue-router": "^4.5.0" }, "devDependencies": { diff --git a/vue/gold-system/src/main.ts b/vue/gold-system/src/main.ts index 5f84645..0e243ac 100644 --- a/vue/gold-system/src/main.ts +++ b/vue/gold-system/src/main.ts @@ -6,13 +6,19 @@ import zhCn from 'element-plus/es/locale/lang/zh-cn' import 'element-plus/dist/index.css' import * as ElementPlusIconsVue from '@element-plus/icons-vue' import './assets/css/common.css'; // 引入公共CSS文件 +import JsonExcel from 'vue-json-excel' const app = createApp(App) +// 全局注册 ElementPlus 图标 for (const [key, component] of Object.entries(ElementPlusIconsVue)) { app.component(key, component) } +// 使用 ElementPlus 和路由器 app.use(ElementPlus, { locale: zhCn, }).use(router).mount('#app'); + +// 注册 JsonExcel 组件 +app.component('downloadExcel', JsonExcel) \ No newline at end of file diff --git a/vue/gold-system/src/views/usergoldInfo/index.vue b/vue/gold-system/src/views/usergoldInfo/index.vue index aed2d03..cb3a659 100644 --- a/vue/gold-system/src/views/usergoldInfo/index.vue +++ b/vue/gold-system/src/views/usergoldInfo/index.vue @@ -193,7 +193,18 @@ onMounted(async function () {
- + + + From b5b7afa979163b032fa7dba182c4c9fa62dc6213 Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Sat, 28 Dec 2024 09:04:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?12.27=E5=8F=B7=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/package-lock.json | 106 +++++++++++++++++++++- vue/gold-system/package.json | 3 +- vue/gold-system/src/views/audit/rechargeAudit.vue | 19 ++++ vue/gold-system/src/views/consume/addConsume.vue | 3 + vue/gold-system/src/views/refund/addRefund.vue | 2 +- vue/gold-system/src/views/usergold/index.vue | 54 ++++++++++- 6 files changed, 183 insertions(+), 4 deletions(-) diff --git a/vue/gold-system/package-lock.json b/vue/gold-system/package-lock.json index e76bec5..04f9117 100644 --- a/vue/gold-system/package-lock.json +++ b/vue/gold-system/package-lock.json @@ -17,7 +17,8 @@ "vue": "^3.5.12", "vue-icons-plus": "^0.1.7", "vue-json-excel": "^0.3.0", - "vue-router": "^4.5.0" + "vue-router": "^4.5.0", + "xlsx": "^0.18.5" }, "devDependencies": { "@vitejs/plugin-vue": "^5.1.4", @@ -1088,6 +1089,15 @@ } } }, + "node_modules/adler-32": { + "version": "1.3.1", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/adler-32/-/adler-32-1.3.1.tgz", + "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/alien-signals": { "version": "0.2.2", "resolved": "https://mirrors.huaweicloud.com/repository/npm/alien-signals/-/alien-signals-0.2.2.tgz", @@ -1135,6 +1145,28 @@ "balanced-match": "^1.0.0" } }, + "node_modules/cfb": { + "version": "1.2.2", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/cfb/-/cfb-1.2.2.tgz", + "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==", + "license": "Apache-2.0", + "dependencies": { + "adler-32": "~1.3.0", + "crc-32": "~1.2.0" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/codepage": { + "version": "1.15.0", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/codepage/-/codepage-1.15.0.tgz", + "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://mirrors.huaweicloud.com/repository/npm/combined-stream/-/combined-stream-1.0.8.tgz", @@ -1160,6 +1192,18 @@ "url": "https://github.com/sponsors/rawify" } }, + "node_modules/crc-32": { + "version": "1.2.2", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", + "license": "Apache-2.0", + "bin": { + "crc32": "bin/crc32.njs" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/csstype": { "version": "3.1.3", "resolved": "https://mirrors.huaweicloud.com/repository/npm/csstype/-/csstype-3.1.3.tgz", @@ -1339,6 +1383,15 @@ "node": ">= 6" } }, + "node_modules/frac": { + "version": "1.1.2", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/frac/-/frac-1.1.2.tgz", + "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/fraction.js": { "version": "5.2.1", "resolved": "https://mirrors.huaweicloud.com/repository/npm/fraction.js/-/fraction.js-5.2.1.tgz", @@ -1640,6 +1693,18 @@ "node": ">=0.10.0" } }, + "node_modules/ssf": { + "version": "0.11.2", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/ssf/-/ssf-0.11.2.tgz", + "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==", + "license": "Apache-2.0", + "dependencies": { + "frac": "~1.1.2" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/tiny-emitter": { "version": "2.1.0", "resolved": "https://mirrors.huaweicloud.com/repository/npm/tiny-emitter/-/tiny-emitter-2.1.0.tgz", @@ -1814,6 +1879,45 @@ "typescript": ">=5.0.0" } }, + "node_modules/wmf": { + "version": "1.0.2", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/wmf/-/wmf-1.0.2.tgz", + "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/word": { + "version": "0.3.0", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/word/-/word-0.3.0.tgz", + "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/xlsx": { + "version": "0.18.5", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/xlsx/-/xlsx-0.18.5.tgz", + "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==", + "license": "Apache-2.0", + "dependencies": { + "adler-32": "~1.3.0", + "cfb": "~1.2.1", + "codepage": "~1.15.0", + "crc-32": "~1.2.1", + "ssf": "~0.11.2", + "wmf": "~1.0.1", + "word": "~0.3.0" + }, + "bin": { + "xlsx": "bin/xlsx.njs" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/zrender": { "version": "5.6.0", "resolved": "https://mirrors.huaweicloud.com/repository/npm/zrender/-/zrender-5.6.0.tgz", diff --git a/vue/gold-system/package.json b/vue/gold-system/package.json index 91b59d8..5d314de 100644 --- a/vue/gold-system/package.json +++ b/vue/gold-system/package.json @@ -19,7 +19,8 @@ "vue": "^3.5.12", "vue-icons-plus": "^0.1.7", "vue-json-excel": "^0.3.0", - "vue-router": "^4.5.0" + "vue-router": "^4.5.0", + "xlsx": "^0.18.5" }, "devDependencies": { "@vitejs/plugin-vue": "^5.1.4", diff --git a/vue/gold-system/src/views/audit/rechargeAudit.vue b/vue/gold-system/src/views/audit/rechargeAudit.vue index 1cc8b90..5017093 100644 --- a/vue/gold-system/src/views/audit/rechargeAudit.vue +++ b/vue/gold-system/src/views/audit/rechargeAudit.vue @@ -14,6 +14,24 @@ const admin = ref({ area: "中国", }); +//这是获取用户信息的接口 +const adminData = ref({}); +const getAdminData = async function () { + try { + const result = await API.post( + "http://192.168.8.93:10010/admin/userinfo", + {} + ); + adminData.value = result; + addConsume.value.adminId = adminData.value.adminId; + console.log("请求成功", result); + console.log("用户信息", adminData.value); + } catch (error) { + console.log("请求失败", error); + } +}; +getAdminData(); + // 充值明细表格 const tableData = ref([]); // 搜索====================================== @@ -306,6 +324,7 @@ const pass = function (row) { passObj.value.jwcode = row.jwcode; passObj.value.paidGold = row.paidGold; passObj.value.freeGold = row.freeGold; + passObj.value.adminName = adminData.value.adminName; console.log("通过对象", passObj.value); }; diff --git a/vue/gold-system/src/views/consume/addConsume.vue b/vue/gold-system/src/views/consume/addConsume.vue index 6d3b7e7..e3efd6a 100644 --- a/vue/gold-system/src/views/consume/addConsume.vue +++ b/vue/gold-system/src/views/consume/addConsume.vue @@ -18,6 +18,7 @@ const getAdminData = async function () { ); adminData.value = result; addConsume.value.adminId = adminData.value.adminId; + addConsume.value.name = adminData.value.name; console.log("请求成功", result); console.log("用户信息", adminData.value); } catch (error) { @@ -193,6 +194,8 @@ const getUserGold = async function (jwcode) { console.log("请求成功", result); // 存储表格数据 userGold.value = result.data; + addConsume.value.username = result.data.name; + addConsume.value.area = result.data.area; if (result.data.code === 0) { ElMessage.error("查询失败，请检查精网号是否正确"); } diff --git a/vue/gold-system/src/views/refund/addRefund.vue b/vue/gold-system/src/views/refund/addRefund.vue index 154f5b3..9704a3e 100644 --- a/vue/gold-system/src/views/refund/addRefund.vue +++ b/vue/gold-system/src/views/refund/addRefund.vue @@ -329,7 +329,7 @@ const handleSelectionChange = (value) => { - + 全部退款 部分退款 diff --git a/vue/gold-system/src/views/usergold/index.vue b/vue/gold-system/src/views/usergold/index.vue index f8cd92d..7d6ed0a 100644 --- a/vue/gold-system/src/views/usergold/index.vue +++ b/vue/gold-system/src/views/usergold/index.vue @@ -6,6 +6,7 @@ import axios from "axios"; import moment from "moment"; import { ta } from "element-plus/es/locales.mjs"; import API from "../../api/index.js"; +import * as XLSX from "xlsx"; // 充值明细表格 const tableData = ref([]); @@ -29,6 +30,8 @@ const getObj = ref({ pageNum: 1, pageSize: 50, }); +//开启条件筛选导出excel +const getPutEX = ref(false); // 支付方式选项 const updateType = [ @@ -210,9 +213,52 @@ const checkNumber = function () { onMounted(async function () { await get(); }); + +// 这是导出excel表格的方法 +// 导出Excel的方法 +// 定义字段映射 +const json_fields = (row) => { + return [ + row.uname, // 姓名 + row.jwcode, // 精网号 + row.area, // 所属地区 + row.consumePlatform, // 平台信息 + row.firstexam_score, // 更新数量 + row.freeCoin, // 免费金币 + row.rechageCoin, // 充值金币 + row.taskCoin, // 任务金币 + row.name, // 提交人 + moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"), // 更新时间，假设你想要格式化时间 + ]; +}; + +// 定义元数据 +const json_meta = [ + [ + { + key: "charset", + value: "utf-8", + }, + ], +]; +const exportExcel = () => { + const ws = XLSX.utils.json_to_sheet(tableData.value, json_fields); + const wb = XLSX.utils.book_new(); + XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); + XLSX.writeFile(wb, "客户金币明细.xlsx"); +}; - + Date: Sat, 28 Dec 2024 10:26:12 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/src/views/audit/refundAudit.vue | 8 +-- vue/gold-system/src/views/consume/allConsume.vue | 12 +++- vue/gold-system/src/views/refund/allRefund.vue | 9 +-- vue/gold-system/src/views/usergold/index.vue | 78 +++++++++++++++++++++++- 4 files changed, 96 insertions(+), 11 deletions(-) diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue index 8823e9b..bf44a3f 100644 --- a/vue/gold-system/src/views/audit/refundAudit.vue +++ b/vue/gold-system/src/views/audit/refundAudit.vue @@ -49,12 +49,12 @@ const activeName = ref("all"); // 退款类型选项 const refundType = [ { - value: "退金币", - label: "退金币", + value: "退款金币", + label: "退款金币", }, { - value: "退商品", - label: "退商品", + value: "退款商品", + label: "退款商品", }, ]; diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue index a02f516..f81c83f 100644 --- a/vue/gold-system/src/views/consume/allConsume.vue +++ b/vue/gold-system/src/views/consume/allConsume.vue @@ -111,6 +111,7 @@ const reset = function () { detailVo.value.consumeType = ""; detailVo.value.startDate = ""; detailVo.value.endDate = ""; + getTime.value = {}; }; // 今天 const getToday = function () { @@ -333,9 +334,16 @@ getGoods(); style="width: 100%" :default-sort="{ prop: 'createTime ', order: 'descending' }" > - + diff --git a/vue/gold-system/src/views/refund/allRefund.vue b/vue/gold-system/src/views/refund/allRefund.vue index fafe524..7d6b2bc 100644 --- a/vue/gold-system/src/views/refund/allRefund.vue +++ b/vue/gold-system/src/views/refund/allRefund.vue @@ -32,12 +32,12 @@ const activeName = ref("all"); // 退款类型 const consumeType = [ { - value: "退商品", - label: "退商品", + value: "退款金币", + label: "退款金币", }, { - value: "退金币", - label: "退金币", + value: "退款商品", + label: "退款商品", }, ]; @@ -97,6 +97,7 @@ const reset = function () { detail.value.area = ""; detail.value.startDate = ""; detail.value.endDate = ""; + getTime.value = {}; }; // 今天 const getToday = function () { diff --git a/vue/gold-system/src/views/usergold/index.vue b/vue/gold-system/src/views/usergold/index.vue index 7d6ed0a..06e5d19 100644 --- a/vue/gold-system/src/views/usergold/index.vue +++ b/vue/gold-system/src/views/usergold/index.vue @@ -247,16 +247,92 @@ const exportExcel = () => { XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); XLSX.writeFile(wb, "客户金币明细.xlsx"); }; + +const putExcel = ref({});