From 107e5dae831a257364c213c598d43ca271b216a2 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Wed, 25 Jun 2025 12:02:08 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=86=99=E5=AE=8C?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- src/views/audit/rechargeAudit.vue | 325 ++--------------- src/views/audit/refundAudit.vue | 34 +- src/views/permissions/index.vue | 691 ++++++++---------------------------- src/views/recharge/coinRecharge.vue | 1 - src/views/workspace/index.vue | 2 +- 6 files changed, 181 insertions(+), 875 deletions(-) diff --git a/.env.development b/.env.development index b87c5db..f2e81e2 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,4 @@ # VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.94:8080/' # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://54.251.137.151:10704/' -VITE_API_BASE='http://192.168.8.225:8080/' +VITE_API_BASE='http://192.168.8.94:8080/' diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue index 553cfb8..923b9a5 100644 --- a/src/views/audit/rechargeAudit.vue +++ b/src/views/audit/rechargeAudit.vue @@ -7,12 +7,12 @@ import axios from 'axios' import request from '@/util/http' import moment from 'moment' -//这是获取用户信息的接口 const adminData = ref({}) +const Ref = ref(null) const getAdminData = async function () { try { const result = await request({ - url: '/admin/userinfo', + url: '', data: {} }) adminData.value = result @@ -21,25 +21,15 @@ const getAdminData = async function () { console.log('请求失败', error) } } - -// 充值明细表格 -const tableData = ref([]) -// 搜索====================================== -const rechargeVo = ref({ - rechargeWay: '客服充值' -}) // 搜索对象 const getObj = ref({ pageNum: 1, pageSize: 50 }) -//分页总条目 const total = ref(100) // 搜索对象时间 const getTime = ref([]) -// 搜索活动列表 const activity = ref([]) -// 搜索地区列表 const area = ref([]) // 驳回弹出框 const rejectVisible = ref(false) @@ -47,154 +37,18 @@ const rejectVisible = ref(false) const rejectObj = ref({}) // 通过对象 const passObj = ref({}) -//标签页默认是待审批 const activeName = ref('wait') // 支付方式选项 const payWay = [ { value: '微信', label: '微信' - }, - { - value: '支付宝', - label: '支付宝' - }, - { - value: '银联', - label: '银联' - }, - { - value: '信用卡', - label: '信用卡' - }, - { - value: '借记卡', - label: '借记卡' + },{ + value:'.....................................'// 待补充 } ] -// 表单验证ref -const Ref = ref(null) -// 方法 -// 统计合计数 -const trueGold = ref(0) -const trueCount = ref(0) -const trueRGold = ref(0) -const trueFGold = ref(0) -// 保留两位小数 -const formattedTrueGold = computed(() => trueGold.value.toFixed(2)) -const formattedTrueRGold = computed(() => trueRGold.value.toFixed(2)) -const formattedTrueFGold = computed(() => trueFGold.value.toFixed(2)) -// 待审核条数 -const pendingCount = ref(0) -// 待审核金币数 -const pendingGold = ref(0) -const pendingRGold = ref(0) -const pendingFGold = ref(0) -// 已通过条数 -const approvedCount = ref(0) -// 已通过金币数 -const approvedGold = ref(0) -const approvedRGold = ref(0) -const approvedFGold = ref(0) -// 已驳回条数 -const rejectedCount = ref(0) -// 已驳回金币数 -const rejectedGold = ref(0) -const rejectedRGold = ref(0) -const rejectedFGold = ref(0) -// 搜索方法 -const get = async function (val) { - try { - // 地区赋值 - if (adminData.value.area === '泰国') { - rechargeVo.value.areas = ['泰国', '越南'] - } - // 搜索参数页码赋值 - if (typeof val === 'number') { - getObj.value.pageNum = val - } - // 搜索参数时间赋值 - if (getTime.value != null) { - if (getTime.value.startDate != '' && getTime.value.endDate != '') { - rechargeVo.value.startDate = getTime.value[0] - rechargeVo.value.endDate = getTime.value[1] - } - } else { - rechargeVo.value.startDate = '' - rechargeVo.value.endDate = '' - } - rechargeVo.value.sortField = sortField.value - rechargeVo.value.sortOrder = sortOrder.value - console.log('搜索参数', getObj.value) - const result = await request({ - url: '/recharge/recharge', - data: { - pageNum: getObj.value.pageNum, - pageSize: getObj.value.pageSize, - rechargeVo: { ...rechargeVo.value } - } - }) - // 合计数的接口 - // 复制一份rechargeVo.value，去掉排序和状态 - const rechargeVo1 = { ...rechargeVo.value } - delete rechargeVo1.sortField - delete rechargeVo1.sortOrder - delete rechargeVo1.status - const result2 = await request({ - url: '/recharge/recharge/RechargeA', - data: rechargeVo1 - }) - // 统计合计数 - if (result2.data) { - result2.data.forEach((item) => { - switch (item.auditStatus) { - case '待审核': - // 若 item.raudit 为空则赋值为 0 - pendingCount.value = item.raudit || 0 - // 若 item.sumRaudit 为空则赋值为 0 - pendingGold.value = item.sumRaudit || 0 - pendingRGold.value = item.sumRaudit1 || 0 - pendingFGold.value = item.sumRaudit2 || 0 - break - case '已通过': - approvedCount.value = item.raudit || 0 - approvedGold.value = item.sumRaudit || 0 - approvedRGold.value = item.sumRaudit1 || 0 - approvedFGold.value = item.sumRaudit2 || 0 - break - case '已驳回': - rejectedCount.value = item.raudit || 0 - rejectedGold.value = item.sumRaudit || 0 - rejectedRGold.value = item.sumRaudit1 || 0 - rejectedFGold.value = item.sumRaudit2 || 0 - break - } - }) - } - - trueGold.value = pendingGold.value + approvedGold.value + rejectedGold.value - trueCount.value = pendingCount.value + approvedCount.value + rejectedCount.value - trueRGold.value = pendingRGold.value + approvedRGold.value + rejectedRGold.value - trueFGold.value = pendingFGold.value + approvedFGold.value + rejectedFGold.value - console.log('搜索对象', getObj.value) - // 存储表格数据 - tableData.value = result.data.list - console.log('tableData', tableData.value) - // 存储分页总数 - total.value = result.data.total - console.log('total', total.value) - } catch (error) { - console.log('请求失败', error) - } -} -// 搜索 -const search = function () { - trimJwCode(); - getObj.value.pageNum = 1 - get() -} // 重置 const reset = function () { delete rechargeVo.value.activityId @@ -257,41 +111,8 @@ const get7Days = function () { console.log('getTime', getTime.value) get() } -//待审核充值明细 -const adminWait = async function () { - rechargeVo.value.status = 0 - getObj.value.pageNum = 1 - await get() - console.log('adminWait') - trueCount.value = pendingCount.value - trueGold.value = pendingGold.value - trueRGold.value = pendingRGold.value - trueFGold.value = pendingFGold.value -} -//已通过充值明细 -const adminPass = async function () { - rechargeVo.value.status = 1 - getObj.value.pageNum = 1 - await get() - console.log('adminPass') - trueCount.value = approvedCount.value - trueGold.value = approvedGold.value - trueRGold.value = approvedRGold.value - trueFGold.value = approvedFGold.value -} -//已驳回充值明细 -const adminReject = async function () { - rechargeVo.value.status = 2 - getObj.value.pageNum = 1 - await get() - console.log('adminReject') - trueCount.value = rejectedCount.value - trueGold.value = rejectedGold.value - trueRGold.value = rejectedRGold.value - trueFGold.value = rejectedFGold.value -} -const handleClick = function (tab, event) { +const handleClick = function (tab) { if (tab.props.name === 'wait') { adminWait() } else if (tab.props.name === 'pass') { @@ -304,7 +125,7 @@ const handleClick = function (tab, event) { const getActivity = async function () { try { const result = await request({ - url: '/recharge/activity/select', + url: '', data: {} }) activity.value = result.data @@ -317,7 +138,7 @@ const getActivity = async function () { const getArea = async function () { try { const result = await request({ - url: '/recharge/user/search', + url: '', data: {} }) area.value = result.data @@ -334,106 +155,16 @@ const handleCurrentChange = function (val) { getObj.value.pageNum = val get() } -// 编辑==================================== -// 通过按钮 -const pass = function (row) { - // 通过初始化 - passObj.value = row - passObj.value.adminId = adminData.value.adminId - passObj.value.auditId = row.auditId - // passObj.value.status = 1 - passObj.value.rechargeId = row.rechargeId - passObj.value.detailId = row.detailId - 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) -} - -// 通过确认 -const passConfirm = async function () { - try { - // 也许大概应该在点击确认时改变状态 - passObj.value.status = 1 - console.log('通过对象', passObj.value) - // 发送POST请求 - // passObj.value.flag = 0; - const result = await request({ - url: '/audit/audit/goldedit', - data: passObj.value - }) - console.log('请求成功', result) - get() - //提示 - ElMessage({ - type: 'success', - message: '通过成功！' - }) - } catch (error) { - console.error('请求失败', error); - ElMessage({ - type: 'error', - message: '出错了，不知道咋回事' - }); - } -} // 打开驳回弹出框 -const openRejectVisible = function () { +const openRej = function () { rejectVisible.value = true } // 关闭驳回弹出框 -const closeRejectVisible = function () { +const closeRej = function () { rejectVisible.value = false } -// 驳回按钮 -const reject = function (row) { - // 驳回初始化 - rejectObj.value.adminId = adminData.value.adminId - rejectObj.value.auditId = row.auditId - rejectObj.value.status = 2 - rejectObj.value.reson = '' - rejectObj.value.rechargeId = row.rechargeId - rejectObj.value.detailId = row.detailId - console.log('驳回对象', rejectObj.value) - openRejectVisible() -} -// 驳回确认 -const rejectConfirm = async function () { - Ref.value.validate(async (valid) => { - if (valid) { - try { - console.log('驳回对象', rejectObj.value) - // 发送POST请求 - const result = await request({ - url: '/audit/audit/goldedit', - data: rejectObj.value - }) - console.log('请求成功', result) - get() - closeRejectVisible()// 关闭弹出框 - ElMessage({ - type: 'success', - message: '驳回成功！' - }) - } catch (error) { - console.log('请求失败', error) - } - } else { - ElMessage({ - type: 'error', - message: '请检查输入内容' - }) - } - }) -} -// 表单验证 -const rules = reactive({ - reson: [{ required: true, message: '请输入驳回理由', trigger: 'blur' }] -}) // 挂载 onMounted(async function () { @@ -449,18 +180,8 @@ const sortOrder = ref('') const handleSortChange = (column) => { console.log('排序字段：', column.prop) console.log('排序方式：', column.order) - if (column.prop === 'rechargeGold') { - sortField.value = 'recharge_gold' - } else if (column.prop === 'freeGold') { - sortField.value = 'free_gold' - } else if (column.prop === 'rechargeTime') { - sortField.value = 'recharge_time' - } else if (column.prop === 'createTime') { - sortField.value = 'create_time' - } else if (column.prop === 'paidGold') { - sortField.value = 'paid_gold' - } else if (column.prop === 'auditTime') { - sortField.value = 'audit_time' + if (column.prop === '待补充') { + sortField.value = '' } sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' get() @@ -511,16 +232,16 @@ const trimJwCode = () => { 添加时间： - 今 - 昨 - 近7天 + 今 + 昨 + 近7天 重置 - 查询 + 查询 @@ -577,10 +298,8 @@ const trimJwCode = () => {
@@ -589,10 +308,8 @@ const trimJwCode = () => { 确定 - + 驳回
@@ -610,7 +327,7 @@ const trimJwCode = () => { - + diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue index f4bd188..e630d5a 100644 --- a/src/views/audit/refundAudit.vue +++ b/src/views/audit/refundAudit.vue @@ -150,7 +150,7 @@ const pagination = ref({ }) const tableData = ref([]) -const productOptions = ref([]) +const product = ref([]) const areaOptions = ref([]) const adminInfo = ref({}) const stats = ref({ @@ -165,9 +165,9 @@ const rejectDialog = ref(false) // 驳回对话框 const rejectForm = ref({ reason: '' }) const currentRecord = ref(null) // 获取用户信息 -const fetchAdminInfo = async () => { +const getAdminInfo = async () => { try { - const res = await request({ url: '/admin/userinfo' }) + const res = await request({ url: '' }) adminInfo.value = res if (res.area !== '总部') { searchForm.value.area = res.area @@ -178,19 +178,19 @@ const fetchAdminInfo = async () => { } // 查商品 -const fetchProducts = async () => { +const getProducts = async () => { try { - const res = await request({ url: '/product' }) - productOptions.value = res.data || [] + const res = await request({ url: '' }) + product.value = res.data || [] } catch (error) { console.error('获取商品列表失败', error) } } // 查地区 -const fetchAreas = async () => { +const getAreas = async () => { try { - const result = await request({ url: '/recharge/user/search' }) + const result = await request({ url: '' }) areaOptions.value = result.data || [] } catch (error) { console.error('获取地区列表失败', error) @@ -215,24 +215,24 @@ const get = async () => { } const res = await request({ - url: '/audit/audit/refund', + url: '', data: params }) tableData.value = res.data?.list || [] pagination.value.total = res.data?.total || 0 - fetchStats() + getStats() } catch (error) { console.error('获取数据失败', error) } } -const fetchStats = async () => { +const getStats = async () => { try { const params = { ...searchForm.value, status: getCurrentStatus() } const res = await request({ - url: '/refund/RefundA', + url: '', data: params }) @@ -342,7 +342,7 @@ const approveRefund = async () => { } await request({ - url: '/audit/audit/edit', + url: '', data: params }) @@ -370,7 +370,7 @@ const rejectRefund = async () => { } await request({ - url: '/audit/audit/edit', + url: '', data: params }) @@ -384,10 +384,10 @@ const rejectRefund = async () => { } onMounted(async () => { - await fetchAdminInfo()// 用户信息要挂吗 + await getAdminInfo()// 用户信息要挂吗 - await fetchProducts() - await fetchAreas() + await getProducts() + await getAreas() get() }) diff --git a/src/views/permissions/index.vue b/src/views/permissions/index.vue index 583b3ac..ba50192 100644 --- a/src/views/permissions/index.vue +++ b/src/views/permissions/index.vue @@ -9,214 +9,103 @@ import { UserFilled } from '@element-plus/icons-vue' import _ from 'lodash' import request from '@/util/http' -// 充值明细表格 const tableData = ref([]) -// 搜索=========================================== //分页总条目 const total = ref(100) -// 搜索detailY const admin = ref({}) // 搜索对象 const getObj = ref({ pageNum: 1, pageSize: 10 }) -// 新增用户权限弹窗 -const permissionAddVisible = ref(false) -// 编辑用户权限弹窗 -const permissionEditVisible = ref(false) -//选地区 +// 控制新增权限弹窗的 +const addVisible = ref(false) +// 控制编辑权限弹窗的 +const editVisible = ref(false) const area = ref([]) -// 选部门 -const store = ref([]) -// 新增用户权限对象 -const permissionAddObj = ref({}) -// 新增用户权限对象 -const addAdmin = ref({}) -// 编辑用户权限对象 -const permissionEditObj = ref({}) -// 删除权限对象 +const store = ref([])// 好像是部门 +// 新增权限的对象，做初始化的 +const addInit = ref({}) +// 新增权限对象，传给后端的 +const addObj = ref({}) +// 编辑权限的对象 +const editObj = ref({}) +// 删除权限的对象 const delObj = ref({}) -// 搜索接口 const get = async function (val) { try { - // 搜索参数页码赋值 + if (admin.value.jwcode) { + admin.value.jwcode = admin.value.jwcode.replace(/\s/g, ''); + } if (typeof val === 'number') { getObj.value.pageNum = val + } else { + getObj.value.pageNum = 1 } - console.log('搜索参数', getObj.value) - // 发送POST请求 const result = await request({ - url: '/admin/search', + url: '',// 待补充 data: { ...getObj.value, admin: { ...admin.value } } }) tableData.value = result.data.list - console.log('tableData', tableData.value) total.value = result.data.total } catch (error) { console.log('请求失败', error) } } -// 精网号去空格 -const trimJwCode = () => { - if (admin.value.jwcode) { - admin.value.jwcode = admin.value.jwcode.replace(/\s/g, ''); - } -} -// 搜索 -const search = function () { - trimJwCode(); - getObj.value.pageNum = 1 - get() -} -// 重置 + const reset = function () { admin.value = {} } - -// 获取地区 const getArea = async function () { try { const result = await request({ - url: '/admin/area', + url: '', data: {} }) area.value = result.data } catch (error) { console.log('请求失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 } } -// 获取部门 const getStore = async function () { try { const result = await request({ - url: '/admin/store', + url: '', data: {} }) store.value = result.data } catch (error) { console.log('请求失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 - } -} - -// 验证跳转输入框的数字是否合法 -const checkNumber = function () { - if (typeof parseInt(getObj.value.pageNum) === 'number') { - console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize)) - if ( - getObj.value.pageNum > 0 && - getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize) - ) { - getObj.value.pageNum = parseInt(getObj.value.pageNum) - console.log('输入的数字合法') - get() - } else { - //提示 - ElMessage({ - type: 'error', - message: '请检查输入内容' - }) - } - } else { - //提示 - ElMessage({ - type: 'error', - message: '请检查输入内容' - }) } } // 打开新增用户权限弹窗 -const openPermissionAddVisible = function () { - permissionAddVisible.value = true +const openaddVisible = function () { + addVisible.value = true } // 关闭新增用户权限弹窗 -const closePermissionAddVisible = function () { - permissionAddVisible.value = false +const closeaddVisible = function () { + addVisible.value = false } // 新增用户权限初始化 const permissionAddInit = function () { - permissionAddObj.value = {} - openPermissionAddVisible() -} -// 通过精网号查询没有权限的用户 -const getAdminByJwcodeWithoutPermission = async function () { - try { - const result = await request({ - url: '/admin/selectNo', - data: permissionAddObj.value - }) - if (result.code == 200) { - permissionAddObj.value = result.data[0] - ElMessage.success('精网号查询成功') - } else { - ElMessage.error(result.msg) - } - console.log('精网号查询没有权限的用户', permissionAddObj.value) - } catch (error) { - console.log('请求失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 - } + addInit.value = {} + openaddVisible() } -// 新增用户权限提交 -// const permissionAdd = async function () { -// try { -// if ( -// permissionAddObj.value.jwcode == "" || -// permissionAddObj.value.jwcode == null || -// permissionAddObj.value.name == "" || -// permissionAddObj.value.name == null -// ) { -// ElMessage.error("请选择要添加权限的用户"); -// return; -// } -// if ( -// permissionAddObj.value.permisson == "" || -// permissionAddObj.value.permission == null -// ) { -// ElMessage.error("请选择权限"); -// return; -// } -// console.log("新增用户权限提交", permissionAddObj.value); - -// const result = await request( -// { -// url: "/admin/update", -// data: permissionAddObj.value} -// ); - -// // 将响应结果存储到响应式数据中 -// console.log("请求成功", result); - -// ElMessage.success("添加成功"); -// get(); - -// closePermissionAddVisible(); -// } catch (error) { -// console.log("新增用户权限失败", error); -// // 在这里可以处理错误逻辑，比如显示错误提示等 - -// ElMessage.error("新增用户权限失败"); -// closePermissionAddVisible(); -// } -// }; const permissionAdd = async function () { Ref.value.validate(async (valid) => { - console.log('valid', valid) if (valid) { try { - addAdmin.value.adminFlag = 1 - addAdmin.value.status1 = 1 + addObj.value.adminFlag = 1 + addObj.value.status1 = 1 const result = await request({ - url: '/admin/add', - data: addAdmin.value + url: '', + data: addObj.value }) if (result.code == 200) { @@ -224,29 +113,24 @@ const permissionAdd = async function () { } else { ElMessage.error(result.msg) } - - addAdmin.value = {} + addObj.value = {} + closeaddVisible() get() - - closePermissionAddVisible() } catch (error) { console.log('新增用户权限失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 - ElMessage.error('新增用户权限失败') - closePermissionAddVisible() + closeaddVisible() } } else { - //提示 ElMessage({ type: 'error', message: '请检查输入内容' }) } }) -} -// 表格添加的条件 -const rules = reactive({ +} // 这个要简化，哪来那么多if-else + +const rules = reactive({// 只有一个必填属性的话，能否直接设置在表单中 jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }], name: [{ required: true, message: '请输入用户名', trigger: 'blur' }], store: [{ required: true, message: '请输入职称', trigger: 'blur' }], @@ -254,95 +138,72 @@ const rules = reactive({ area: [{ required: true, message: '请选择所属地区', trigger: 'blur' }], permission: [{ required: true, message: '请选择权限', trigger: 'blur' }] }) -// 验证表单 // 表单验证ref const Ref = ref(null) -// 使用 _.throttle 并设置 trailing 为 false 实现严格节流，只执行一次 +// 使用 _.throttle 并设置 trailing 为 false 实现严格节流，只执行一次 节吗呢?什么鬼 const throttledPermissionAdd = _.throttle(permissionAdd, 5000, { trailing: false }) // 权限类别 -const permissionList = [ +const list = [ { label: '总部', value: '1' }, { - label: '地区经理', - value: '5' - }, - { - label: '财务', - value: '3' - }, - { - label: '客服', - value: '2' + label: '', + value: '' } ] -// 获取地区 -// 获取地区 +// 地区列表 const areaList = ref([]) const getAreas = async function () { try { - // 发送POST请求 const result = await request({ - url: '/recharge/user/search', + url: '', data: {} }) - - // 将响应结果存储到响应式数据中 - console.log('请求成功', result) - // 存储地区信息 + console.log('result', result) areaList.value = result.data console.log('地区', area.value) } catch (error) { console.log('请求失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 } } -getAreas() + // 打开编辑用户权限弹窗 -const openPermissionEditVisible = function () { - permissionEditVisible.value = true +const openVisable = function () { + editVisible.value = true } // 关闭编辑用户权限弹窗 -const closePermissionEditVisible = function () { - permissionEditVisible.value = false +const closeEdit = function () { + editVisible.value = false } // 编辑用户权限初始化 -const permissionEditInit = function (row) { - permissionEditObj.value = {} - permissionEditObj.value.jwcode = row.jwcode - permissionEditObj.value.name = row.name - permissionEditObj.value.area = row.area - permissionEditObj.value.store = row.store - permissionEditObj.value.permission = row.permission - console.log('编辑用户权限', permissionEditObj.value) - openPermissionEditVisible() +const editInit = function (row) { + editObj.value = {} + editObj.value.jwcode = row.jwcode + editObj.value.name = row.name + editObj.value.area = row.area + editObj.value.store = row.store + editObj.value.permission = row.permission + console.log('编辑用户权限', editObj.value) + openVisable() } // 编辑用户权限提交 const permissionEdit = async function () { try { const result = await request({ - url: '/admin/update', - data: permissionEditObj.value + url: '', + data: editObj.value }) - - // 将响应结果存储到响应式数据中 console.log('请求成功', result) - ElMessage.success('编辑用户权限成功') - + closeEdit() get() - - closePermissionEditVisible() } catch (error) { - console.log('编辑用户权限失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 ElMessage.error('编辑用户权限失败') - - closePermissionEditVisible() + closeEdit() } } const throttledPermissionEdit = _.throttle(permissionEdit, 5000, { @@ -361,20 +222,18 @@ const delConfirm = async function () { console.log(delObj.value) const result = await request({ - url: '/admin/update', + url: '', data: delObj.value }) - // 将响应结果存储到响应式数据中 console.log('请求成功', result) - ElMessage.success('删除权限成功') delObj.value = {} get() } catch (error) { console.log('删除权限失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 ElMessage.error('删除权限失败') + get() } } // 禁用启用用户权限 @@ -382,28 +241,25 @@ const editStatus = async function (row) { try { console.log(row) - permissionEditObj.value = {} - permissionEditObj.value.jwcode = row.jwcode - permissionEditObj.value.status1 = row.status1 + editObj.value = {} + editObj.value.jwcode = row.jwcode + editObj.value.status1 = row.status1 - console.log('修改用户权限状态', permissionEditObj.value) + console.log('修改用户权限状态', editObj.value) const result = await request({ - url: '/admin/update', - data: permissionEditObj.value + url: '', + data: editObj.value }) - - // 将响应结果存储到响应式数据中 console.log('请求成功', result) ElMessage.success( - permissionEditObj.value.status1 == 1 ? '启用成功' : '禁用成功' + editObj.value.status1 == 1 ? '启用成功' : '禁用成功' ) - permissionEditObj.value = {} + editObj.value = {} get() } catch (error) { console.log('修改用户权限失败', error) - // 在这里可以处理错误逻辑，比如显示错误提示等 } } @@ -427,53 +283,26 @@ const handleCurrentChange = function (val) { -
-
- 精网号： - +
+
+ OA号： +
-
- 所属地区： - - +
+ 所属地区： + +
- -
- 职位名称： - - +
+ 职位名称： + +
- -
+
重置 - 查询 + 查询
@@ -482,393 +311,167 @@ const handleCurrentChange = function (val) { -
- 新增用户 + 新增用户
- + - - - - - + + + + + - + - +
- - + - - - + + - {{ permissionEditObj.jwcode }} + {{ editObj.jwcode }} - {{ permissionEditObj.name }} + {{ editObj.name }} - {{ permissionEditObj.area }} + {{ editObj.area }} - {{ permissionEditObj.store }} + {{ editObj.store }} -
- 权限设置: - + 权限设置: + 总部管理员 - 分部经理 - 分部财务 - 分部客服 + ..............................................................................待补充
From 4c3c8cd5e0cfe6f9a41bc8969df42fc56bb8f3c9 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Sun, 29 Jun 2025 11:59:53 +0800 Subject: [PATCH 3/6] ?? --- .env.development | 6 +- src/views/managerecharge/rate.vue | 416 -------------------------------------- src/views/permissions/index.vue | 9 - 3 files changed, 1 insertion(+), 430 deletions(-) diff --git a/.env.development b/.env.development index f5143b4..80e0348 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,7 @@ # VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://54.251.137.151:10704/' -<<<<<<< HEAD -VITE_API_BASE='http://192.168.8.94:8080/' -======= # VITE_API_BASE='http://192.168.8.225:8080/' # VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='http://192.168.8.247:8081/' +VITE_API_BASE='http://18.143.76.3/' ->>>>>>> milestone-20250623-金币前端 diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue index 7f45288..3788d08 100644 --- a/src/views/managerecharge/rate.vue +++ b/src/views/managerecharge/rate.vue @@ -1,423 +1,8 @@ - -