From 041f3eeda142c3fda1b23dedafd1a1af5f60c33a Mon Sep 17 00:00:00 2001 From: nsnail Date: Sat, 2 Aug 2025 17:33:13 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=94=A8=20=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5=20(#343)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tk --- assets/res/NetAdmin.Fields.ln | 6 +- assets/res/NetAdmin.Statements.ln | 3 +- assets/res/YourSolution.AdmServer.Fields.ln | 1 - .../Enums/AdminTradeTypes.cs | 11 +- .../Enums/TradeTypes.cs | 11 +- .../NetAdmin.Infrastructure.csproj | 10 +- .../Services/Sys/WalletTradeService.cs | 10 ++ .../Controllers/Sys/UserWalletController.cs | 1 - src/frontend/admin/src/api/sys/userwallet.js | 11 ++ .../src/components/na-table-page/detail.vue | 52 +++++++-- .../src/components/na-table-page/index.vue | 107 ++++++++++++------ .../admin/src/components/sc-select/index.vue | 7 +- .../src/components/sc-table-select/index.vue | 6 +- src/frontend/admin/src/style/app.scss | 4 +- src/frontend/admin/src/views/profile/logs.vue | 2 +- .../src/views/sys/dev/template/index.vue | 3 +- .../src/views/sys/finance/order/index.vue | 2 +- .../views/sys/finance/trade/frozen/index.vue | 5 +- .../views/sys/finance/trade/list/index.vue | 5 +- .../src/views/sys/finance/wallet/index.vue | 1 + .../admin/src/views/sys/log/login/index.vue | 2 +- .../src/views/sys/log/operation/index.vue | 2 +- .../src/views/sys/market/invite/index.vue | 1 + .../admin/src/views/sys/power/user/save.vue | 2 +- .../src/views/sys/system/job/record/index.vue | 2 +- 25 files changed, 184 insertions(+), 83 deletions(-) diff --git a/assets/res/NetAdmin.Fields.ln b/assets/res/NetAdmin.Fields.ln index db1e63fb..f5170936 100644 --- a/assets/res/NetAdmin.Fields.ln +++ b/assets/res/NetAdmin.Fields.ln @@ -41,7 +41,6 @@ USDT 响应体 响应状态码 唯一编码 -处理中 备注 外国人居留证 外部错误 @@ -59,14 +58,12 @@ USDT 已冻结 已发送 已婚 -已完成 已校验 已解冻 已读 并且 归属角色 归属部门 -待执行 微信支付 成功 或者 @@ -101,7 +98,6 @@ USDT 最后登录时间 未处理异常 未婚 -未结算 未读 本人数据 本科 @@ -116,7 +112,6 @@ USDT 消息类型 港澳台通行证 用户代理 -用户取消 用户名 用户导出 用户邀请导出 @@ -133,6 +128,7 @@ USDT 等于 等待发送 等待支付 +管理员充值 管理员扣费 管理员赠送 管理模块 diff --git a/assets/res/NetAdmin.Statements.ln b/assets/res/NetAdmin.Statements.ln index d92ca1de..cc12d0e4 100644 --- a/assets/res/NetAdmin.Statements.ln +++ b/assets/res/NetAdmin.Statements.ln @@ -61,6 +61,7 @@ XML注释文件不存在 未指定部门 未获取到待执行任务 档案可见性不正确 +此操作不被允许 此节点已下线 民族不正确 消息主题不能为空 @@ -100,7 +101,6 @@ XML注释文件不存在 请求地址不能为空 请求对象不能为空 请求方法不正确 -请稍后重试 请联系管理员激活账号 读取用户令牌出错 账号不能为空 @@ -116,7 +116,6 @@ XML注释文件不存在 随机延时结束时间不正确 随机延时起始时间不正确 非JSON字符串 -此操作不被允许 验证数据不能为空 验证码不正确 验证码不能为空 diff --git a/assets/res/YourSolution.AdmServer.Fields.ln b/assets/res/YourSolution.AdmServer.Fields.ln index 8c136503..e69de29b 100644 --- a/assets/res/YourSolution.AdmServer.Fields.ln +++ b/assets/res/YourSolution.AdmServer.Fields.ln @@ -1 +0,0 @@ -示例导出 \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/AdminTradeTypes.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/AdminTradeTypes.cs index d2d5e1dd..a4f8390b 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/AdminTradeTypes.cs +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/AdminTradeTypes.cs @@ -11,7 +11,7 @@ public enum AdminTradeTypes /// [ResourceDescription(nameof(Ln.管理员赠送))] [Trade(Direction = TradeDirections.Income)] - AdminDeposit = 1 + AdminGift = 1 , @@ -21,4 +21,13 @@ public enum AdminTradeTypes [ResourceDescription(nameof(Ln.管理员扣费))] [Trade(Direction = TradeDirections.Expense)] AdminDeduct = 2 + + , + + /// + /// 管理员充值 + /// + [ResourceDescription(nameof(Ln.管理员充值))] + [Trade(Direction = TradeDirections.Income)] + AdminDeposit = 6 } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/TradeTypes.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/TradeTypes.cs index 91b0e6c4..62225771 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/TradeTypes.cs +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/TradeTypes.cs @@ -11,7 +11,7 @@ public enum TradeTypes /// [ResourceDescription(nameof(Ln.管理员赠送))] [Trade(Direction = TradeDirections.Income)] - AdminDeposit = 1 + AdminGift = 1 , @@ -47,5 +47,12 @@ public enum TradeTypes /// [ResourceDescription(nameof(Ln.转账收入))] [Trade(Direction = TradeDirections.Income)] - TransferIncome = 5 + TransferIncome = 5, + + /// + /// 管理员充值 + /// + [ResourceDescription(nameof(Ln.管理员充值))] + [Trade(Direction = TradeDirections.Income)] + AdminDeposit = 6 } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index ab22b90a..f392e168 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -3,13 +3,13 @@ - - - + + + - - + + diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/WalletTradeService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/WalletTradeService.cs index 591f0963..d3cbb28c 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/WalletTradeService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/WalletTradeService.cs @@ -147,6 +147,11 @@ public sealed class WalletTradeService(BasicRepository rp throw new NetAdminInvalidOperationException(Ln.此操作不被允许); } + // 不允许自己对自己转账 + if (UserToken.Id == fromAccount.Id) { + throw new NetAdminInvalidOperationException(Ln.此操作不被允许); + } + var fromUser = await S().GetAsync(new QueryUserReq { Id = fromAccount.Id }).ConfigureAwait(false); // 源账户扣钱 @@ -178,6 +183,11 @@ public sealed class WalletTradeService(BasicRepository rp { var toUser = await S().GetAsync(new QueryUserReq { Id = req.OwnerId!.Value }).ConfigureAwait(false); + // 不允许自己对自己转账 + if (UserToken.Id == toUser.Id) { + throw new NetAdminInvalidOperationException(Ln.此操作不被允许); + } + // 自己账户扣钱 _ = await CreateAsync(new CreateWalletTradeReq { Amount = -req.Amount diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/UserWalletController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/UserWalletController.cs index addf2e5d..b06240c0 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/UserWalletController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/UserWalletController.cs @@ -99,7 +99,6 @@ public sealed class UserWalletController(IUserWalletCache cache) : ControllerBas /// /// 用户钱包求和 /// - [NonAction] public Task SumAsync(QueryReq req) { return Cache.SumAsync(req); diff --git a/src/frontend/admin/src/api/sys/userwallet.js b/src/frontend/admin/src/api/sys/userwallet.js index 257605e5..eb1d3ac4 100644 --- a/src/frontend/admin/src/api/sys/userwallet.js +++ b/src/frontend/admin/src/api/sys/userwallet.js @@ -81,4 +81,15 @@ export default { return await http.post(this.url, data, config) }, }, + + /** + * 用户钱包求和 + */ + sum: { + url: `${config.API_URL}/api/sys/user.wallet/sum`, + name: `用户钱包求和`, + post: async function (data = {}, config = {}) { + return await http.post(this.url, data, config) + }, + }, } \ No newline at end of file diff --git a/src/frontend/admin/src/components/na-table-page/detail.vue b/src/frontend/admin/src/components/na-table-page/detail.vue index 4b12cf73..37f99752 100644 --- a/src/frontend/admin/src/components/na-table-page/detail.vue +++ b/src/frontend/admin/src/components/na-table-page/detail.vue @@ -29,18 +29,39 @@ :disabled="item.disabled?.includes(mode)" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" /> - - - + + diff --git a/src/frontend/admin/src/components/na-table-page/index.vue b/src/frontend/admin/src/components/na-table-page/index.vue index ce5291d7..0e9c14a1 100644 --- a/src/frontend/admin/src/components/na-table-page/index.vue +++ b/src/frontend/admin/src/components/na-table-page/index.vue @@ -3,12 +3,15 @@ - + - + @@ -55,9 +58,20 @@ - {{ - rightButtons[0].label - }} + {{ rightButtons[0].label }} @@ -68,7 +82,9 @@ Object.assign( { queryApi: $API[entityName].pagedQuery, - exportApi: $API[entityName].export, + exportApi: $GLOBAL.hasApiPermission($API[entityName].export?.url.replace(`${config.API_URL}/`, ``)) + ? $API[entityName].export + : null, remoteFilter: true, remoteSort: true, rowKey: `id`, @@ -100,10 +116,10 @@ :options=" item.options ?? (item.enum - ? Object.entries(this.$GLOBAL.enums[item.enum]).map((x) => { + ? Object.entries(this.$GLOBAL.enums[item.enum.name]).map((x) => { return { value: x[0], - text: item.enumText ? item.enumText(x) : x[1][1], + text: item.enum.text ? item.enum.text(x) : x[1][1], type: x[1][2], pulse: x[1][3] === `true`, } @@ -127,8 +143,12 @@ @@ -200,12 +220,20 @@ export default { }, created() { for (const f of this.dyFilters) { - this.query.dynamicFilter.filters.push(f) + if (f.operator === 'dateRange') { + this.query.dynamicFilter.filters.push({ + field: f.field, + operator: f.operator, + value: f.value.map((x) => x.replace(/ 00:00:00$/, '')), + }) + } else this.query.dynamicFilter.filters.push(f) } const searchFields = [] this.searchControls = [] for (const item in this.columns) { + this.resetSumList(item) + this.table.menu.extra[item] = this.columns[item].extra if (this.columns[item].searchable) { searchFields.push({ label: this.columns[item].label, key: item }) @@ -215,8 +243,8 @@ export default { this.searchControls.push({ type: `select-input`, field: [`dy`, searchFields], - placeholder: this.$t(`匹配内容`), - style: `width:25rem`, + placeholder: this.$t(`检索内容`), + style: `width:${this.searchInputWidth}rem`, selectStyle: `width:8rem`, }) } @@ -238,7 +266,7 @@ export default { { value: true, label: this.$t(`是`) }, { value: false, label: this.$t(`否`) }, ] - : Object.entries(this.$GLOBAL.enums[col.enum]).map((x) => { + : Object.entries(this.$GLOBAL.enums[col.enum.name]).map((x) => { return { value: x[0], label: x[1][1], @@ -307,6 +335,11 @@ export default { }, inject: [`reload`], methods: { + resetSumList(item) { + if (this.columns[item].sum && (!this.columns[item].condition || this.columns[item].condition())) { + this.statistics.sumList[this.columns[item].sum.label] = ['...', '', this.columns[item].sum.span, this.columns[item].sum.sort ?? 0] + } + }, // ---------------------------- ↓ 过滤器事件 ---------------------------- onFilterChange(data) { Object.entries(data).forEach(([key, value]) => { @@ -321,35 +354,24 @@ export default { Object.entries(this.$refs.selectFilter?.selected ?? []).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = [``])) }, async onSearch(form) { - if (Array.isArray(form.dy.createdTime)) { - this.query.dynamicFilter.filters.push({ - field: `createdTime`, - operator: `dateRange`, - value: form.dy.createdTime.map((x) => x.replace(/ 00:00:00$/, '')), - }) - } for (const item in this.columns) { + this.resetSumList(item) + let field = form.dy[item] if (field === undefined) field = form.dy[item[0].toUpperCase() + item.substring(1)] - if (field === undefined || field === `` || typeof field === `object`) { + if (field === undefined || field === `` || field == null) { continue } + const operator = this.columns[item].operator ?? `eq` this.query.dynamicFilter.filters.push({ field: item, - operator: this.columns[item].operator ?? `eq`, - value: field, + operator: operator, + value: operator === 'dateRange' ? field.map((x) => x.replace(/ 00:00:00$/, '')) : field, }) } - for (const item of this.dyFilters) { - const exists = this.query.dynamicFilter.filters.find((x) => x.field === item.field) - if (!exists) { - this.query.dynamicFilter.filters.push(item) - } - } - await this.$refs.table.upData() }, // ---------------------------- 搜索栏事件 ↑ ---------------------------- @@ -438,18 +460,24 @@ export default { }), ) } - if (this.columns[col].sum) { + if (this.columns[col].sum && (!this.columns[col].condition || this.columns[col].condition())) { const res = await this.$API[this.entityName].sum.post({ filter: this.query.filter, dynamicFilter: { filters: this.query.dynamicFilter.filters }, requiredFields: [col.replace(/(?:^|\.)[a-z]/g, (m) => m.toUpperCase())], }) + this.statistics.sumList[this.columns[col].sum.label] = [ - this.columns[col].sum.currency ? (res.data / 100).toFixed(2) : res.data, - this.columns[col].sum.currency, + this.columns[col].sum.currency + ? (res.data / (this.columns[col].sum.currency.multiple ?? 100)).toFixed(this.columns[col].sum.currency.decimal ?? 2) + : res.data, + this.columns[col].sum.currency?.flag, + this.columns[col].sum.span, + this.columns[col].sum.sort ?? 0, ] } } + const res = await Promise.all(countByCalls) Object.assign(this.statistics, { res }) for (const item of res) { @@ -490,7 +518,9 @@ export default { } for (const f of this.dyFilters) { - this.$refs.search.selectInputKey = f.field + if (this.searchControls.findIndex((x) => x.field[1] === f.field) >= 0) { + this.$refs.search.selectInputKey = f.field + } this.$refs.search.form.dy[f.field] = f.value this.$refs.search.keeps.push({ field: f.field, @@ -507,6 +537,7 @@ export default { summary: { type: String }, selectFilters: { type: Array, default: [] }, customSearchControls: { type: Array, default: [] }, + searchInputWidth: { type: Number, default: 25 }, columns: { type: Object }, operations: { type: Array, default: [`view`, `add`, `edit`, `del`] }, rowButtons: { type: Array, default: [] }, @@ -522,4 +553,8 @@ export default { } - \ No newline at end of file diff --git a/src/frontend/admin/src/components/sc-select/index.vue b/src/frontend/admin/src/components/sc-select/index.vue index 47bd12dc..4ea0dbb6 100644 --- a/src/frontend/admin/src/components/sc-select/index.vue +++ b/src/frontend/admin/src/components/sc-select/index.vue @@ -7,10 +7,10 @@ + :value="typeof props.value === `function` ? props.value(item) : $TOOL.getNestedProperty(item, props.value)"> @@ -27,7 +27,6 @@ export default { default: () => {}, }, dic: { type: String, default: '' }, - objValueType: { type: Boolean, default: false }, allowCreate: { type: Boolean, default: false }, params: { type: Object, default: () => ({}) }, config: { type: Object }, diff --git a/src/frontend/admin/src/components/sc-table-select/index.vue b/src/frontend/admin/src/components/sc-table-select/index.vue index edc78fa9..4990c214 100644 --- a/src/frontend/admin/src/components/sc-table-select/index.vue +++ b/src/frontend/admin/src/components/sc-table-select/index.vue @@ -110,7 +110,7 @@ export default { }, mounted() { this.defaultProps = Object.assign(this.defaultProps, this.props) - this.defaultValue = this.modelValue + this.defaultValue = this.multiple ? this.modelValue || [] : this.modelValue this.autoCurrentLabel() }, methods: { @@ -233,7 +233,9 @@ export default { //tags删除后回调 removeTag(tag) { const row = this.findRowByKey(tag[this.defaultProps.value]) - this.$refs.table.toggleRowSelection(row, false) + if (row) { + this.$refs.table.toggleRowSelection(row, false) + } this.$emit('update:modelValue', this.defaultValue) }, //清空后的回调 diff --git a/src/frontend/admin/src/style/app.scss b/src/frontend/admin/src/style/app.scss index 42e0a5d1..4d7ce02c 100644 --- a/src/frontend/admin/src/style/app.scss +++ b/src/frontend/admin/src/style/app.scss @@ -504,7 +504,9 @@ textarea { .mt-8 { margin-top: 2rem; } - +.mb-4 { + margin-bottom: 1rem; +} .mb-8 { margin-bottom: 2rem; } diff --git a/src/frontend/admin/src/views/profile/logs.vue b/src/frontend/admin/src/views/profile/logs.vue index ff30a728..af3eb4d2 100644 --- a/src/frontend/admin/src/views/profile/logs.vue +++ b/src/frontend/admin/src/views/profile/logs.vue @@ -1,6 +1,6 @@ diff --git a/src/frontend/admin/src/views/sys/dev/template/index.vue b/src/frontend/admin/src/views/sys/dev/template/index.vue index f822c538..658a0d76 100644 --- a/src/frontend/admin/src/views/sys/dev/template/index.vue +++ b/src/frontend/admin/src/views/sys/dev/template/index.vue @@ -21,7 +21,7 @@ gender: { label: $t(`性别`), is: `na-col-indicator`, - enum: `genders`, + enum: { name: `genders` }, width: 100, align: `center`, countBy: true, @@ -56,6 +56,7 @@ createdTime: { label: $t(`创建时间`), show: [`view`], + operator: `dateRange`, }, version: { label: $t(`数据版本`), diff --git a/src/frontend/admin/src/views/sys/finance/order/index.vue b/src/frontend/admin/src/views/sys/finance/order/index.vue index 12b6a6d8..5d252531 100644 --- a/src/frontend/admin/src/views/sys/finance/order/index.vue +++ b/src/frontend/admin/src/views/sys/finance/order/index.vue @@ -62,7 +62,7 @@ { label: $t('充值点数'), key: 'depositPoint' }, ], ], - placeholder: $t('匹配内容'), + placeholder: $t('检索内容'), style: 'width:25rem', selectStyle: 'width:8rem', }, diff --git a/src/frontend/admin/src/views/sys/finance/trade/frozen/index.vue b/src/frontend/admin/src/views/sys/finance/trade/frozen/index.vue index b57b3ad6..e8907068 100644 --- a/src/frontend/admin/src/views/sys/finance/trade/frozen/index.vue +++ b/src/frontend/admin/src/views/sys/finance/trade/frozen/index.vue @@ -51,7 +51,7 @@ }, status: { is: `na-col-indicator`, - enum: `walletFrozenStatues`, + enum: { name: `walletFrozenStatues` }, label: $t(`状态`), countBy: true, align: `center`, @@ -64,7 +64,7 @@ }, countBy: true, is: `na-col-indicator`, - enum: `walletFrozenReasons`, + enum: { name: `walletFrozenReasons` }, label: $t(`冻结原因`), align: `center`, width: 100, @@ -84,6 +84,7 @@ createdTime: { label: $t(`创建时间`), show: [`view`], + operator: `dateRange`, }, version: { label: $t(`数据版本`), diff --git a/src/frontend/admin/src/views/sys/finance/trade/list/index.vue b/src/frontend/admin/src/views/sys/finance/trade/list/index.vue index 46568e05..f64eb6e6 100644 --- a/src/frontend/admin/src/views/sys/finance/trade/list/index.vue +++ b/src/frontend/admin/src/views/sys/finance/trade/list/index.vue @@ -42,7 +42,7 @@ }, countBy: true, is: `na-col-indicator`, - enum: `tradeDirections`, + enum: { name: `tradeDirections` }, label: $t(`交易方向`), align: `center`, width: 100, @@ -54,7 +54,7 @@ }, countBy: true, is: `na-col-indicator`, - enum: `tradeTypes`, + enum: { name: `tradeTypes` }, label: $t(`交易类型`), align: `center`, width: 150, @@ -100,6 +100,7 @@ createdTime: { label: $t(`创建时间`), show: [`view`], + operator: `dateRange`, }, createdUserId: { headerAlign: `center`, diff --git a/src/frontend/admin/src/views/sys/finance/wallet/index.vue b/src/frontend/admin/src/views/sys/finance/wallet/index.vue index 5eddcc4f..dd7fd149 100644 --- a/src/frontend/admin/src/views/sys/finance/wallet/index.vue +++ b/src/frontend/admin/src/views/sys/finance/wallet/index.vue @@ -57,6 +57,7 @@ createdTime: { label: $t(`创建时间`), show: [`view`], + operator: `dateRange`, }, modifiedTime: { relativeTime: true, diff --git a/src/frontend/admin/src/views/sys/log/login/index.vue b/src/frontend/admin/src/views/sys/log/login/index.vue index 6313d1a5..7678fcb8 100644 --- a/src/frontend/admin/src/views/sys/log/login/index.vue +++ b/src/frontend/admin/src/views/sys/log/login/index.vue @@ -84,7 +84,7 @@ { label: $t('客户端IP'), key: 'createdClientIp' }, ], ], - placeholder: $t('匹配内容'), + placeholder: $t('检索内容'), style: 'width:25rem', selectStyle: 'width:8rem', }, diff --git a/src/frontend/admin/src/views/sys/log/operation/index.vue b/src/frontend/admin/src/views/sys/log/operation/index.vue index 9e29e994..75a3863a 100644 --- a/src/frontend/admin/src/views/sys/log/operation/index.vue +++ b/src/frontend/admin/src/views/sys/log/operation/index.vue @@ -101,7 +101,7 @@ { label: '客户端IP', key: 'createdClientIp' }, ], ], - placeholder: '匹配内容', + placeholder: '检索内容', style: 'width:25rem', selectStyle: 'width:8rem', }, diff --git a/src/frontend/admin/src/views/sys/market/invite/index.vue b/src/frontend/admin/src/views/sys/market/invite/index.vue index 6113f853..8bb34353 100644 --- a/src/frontend/admin/src/views/sys/market/invite/index.vue +++ b/src/frontend/admin/src/views/sys/market/invite/index.vue @@ -27,6 +27,7 @@ align: `right`, show: [`list`], width: 170, + operator: `dateRange`, }, ownerId: { headerAlign: `center`, diff --git a/src/frontend/admin/src/views/sys/power/user/save.vue b/src/frontend/admin/src/views/sys/power/user/save.vue index 3ebbc5c2..3189bfc3 100644 --- a/src/frontend/admin/src/views/sys/power/user/save.vue +++ b/src/frontend/admin/src/views/sys/power/user/save.vue @@ -241,7 +241,7 @@ - + diff --git a/src/frontend/admin/src/views/sys/system/job/record/index.vue b/src/frontend/admin/src/views/sys/system/job/record/index.vue index 1c76a857..20bdda19 100644 --- a/src/frontend/admin/src/views/sys/system/job/record/index.vue +++ b/src/frontend/admin/src/views/sys/system/job/record/index.vue @@ -72,7 +72,7 @@ { label: '作业编号', key: 'jobId' }, ], ], - placeholder: '匹配内容', + placeholder: '检索内容', style: 'width:25rem', selectStyle: 'width:8rem', },