[update]新增背景颜色

app/admin/controller/Dashboard.php

@@ -37,13 +37,13 @@ class Dashboard extends Backend
         $bankList = Bank::field([
             'id', 'bank_name', 'bank_account', 'current_balance', 'safe_alert', 'label_color', 'weigh',
             // 子查询：入款总额
-            "(SELECT SUM(money/100) FROM ba_user_money_log WHERE bank_id = ba_bank.id AND type = 1 and create_time BETWEEN {$start} AND {$end}) AS total_fund_in",
+            "(SELECT SUM(money/100) FROM ba_user_money_log WHERE bank_id = ba_bank.id AND type in (1,3) and create_time BETWEEN {$start} AND {$end}) AS total_fund_in",
             // 子查询：出款总额
-            "(SELECT SUM(money/100) FROM ba_user_money_log WHERE bank_id = ba_bank.id AND type = 2 and create_time BETWEEN {$start} AND {$end}) AS total_fund_out",
+            "(SELECT SUM(money/100) FROM ba_user_money_log WHERE bank_id = ba_bank.id AND type in (2,4) and create_time BETWEEN {$start} AND {$end}) AS total_fund_out",
             // 子查询：入款次数
-            "(SELECT COUNT(*) FROM ba_user_money_log WHERE bank_id = ba_bank.id AND type = 1 and create_time BETWEEN {$start} AND {$end}) AS count_fund_in",
+            "(SELECT COUNT(*) FROM ba_user_money_log WHERE bank_id = ba_bank.id AND type in (1,3) and create_time BETWEEN {$start} AND {$end}) AS count_fund_in",
             // 子查询：出款次数
-            "(SELECT COUNT(*) FROM ba_user_money_log WHERE bank_id = ba_bank.id AND type = 2 and create_time BETWEEN {$start} AND {$end}) AS count_fund_out",
+            "(SELECT COUNT(*) FROM ba_user_money_log WHERE bank_id = ba_bank.id AND type in (2,4) and create_time BETWEEN {$start} AND {$end}) AS count_fund_out",
         ])
             ->where('status', 1)
             ->order('weigh', 'desc')
@@ -268,4 +268,56 @@ class Dashboard extends Backend
         }
         $this->success('', $history);
     }
+
+    public function editTransact(): void
+    {
+        $userMoneyLog = new UserMoneyLog();
+        $pk  = $userMoneyLog->getPk();
+        $id  = $this->request->param($pk);
+        $row = $userMoneyLog->find($id);
+        if (!$row) {
+            $this->error(__('Record not found'));
+        }
+
+        if ($this->request->isPost()) {
+            $data = $this->request->post();
+            if (!$data) {
+                $this->error(__('Parameter %s can not be empty', ['']));
+            }
+
+            $result = false;
+            $userMoneyLog->startTrans();
+            try {
+                $result = $row->save($data);
+                $userMoneyLog->commit();
+            } catch (Throwable $e) {
+                $userMoneyLog->rollback();
+                $this->error($e->getMessage());
+            }
+            if ($result !== false) {
+                $this->success(__('Update successful'));
+            } else {
+                $this->error(__('No rows updated'));
+            }
+            return;
+        }
+        $this->success('', [
+            'row' => $row
+        ]);
+    }
+
+    public function delTransact($id): void
+    {
+        $result = false;
+        try {
+            $result = Db::table('ba_user_money_log')->delete($id);
+        } catch (Throwable $e) {
+            $this->error(__('%d records and files have been deleted', [1]) . $e->getMessage());
+        }
+        if ($result) {
+            $this->success(__('%d records and files have been deleted', [1]));
+        } else {
+            $this->error(__('No rows were deleted'));
+        }
+    }
 }

app/admin/model/UserMoneyLog.php

@@ -45,10 +45,6 @@ class UserMoneyLog extends model
         $new->save();
 
     }
-    public static function onBeforeDelete(): bool
-    {
-        return false;
-    }
 
     public function getMoneyAttr($value): string
     {

web/src/api/backend/user/moneyLog.ts

@@ -11,3 +11,11 @@ export function add(userId: string) {
         },
     })
 }
+
+export function logHistory(params: { id: number | string }) {
+    return createAxios({
+        url: url + 'logHistory',
+        method: 'get',
+        params,
+    })
+}

web/src/lang/backend/en/user/moneyLog.ts

@@ -19,6 +19,8 @@ export default {
     'type_list': {
         1 : 'Deposit',
         2 : 'Withdraw',
+        3 : 'IN',
+        4 : 'OUT',
     },
     'Game Ticket' : 'Game Ticket',
     'game_type': {

web/src/lang/backend/zh-cn/user/moneyLog.ts

@@ -19,6 +19,8 @@ export default {
     'type_list': {
         1 : '存款',
         2 : '取款',
+        3 : '转入',
+        4 : '转出',
     },
     'Game Ticket' : '游戏门票',
     'game_type': {

web/src/views/backend/dashboard.vue

@@ -14,7 +14,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="bank in visibleBanks" :key="bank.id" :class="bank.rowClass">
+                            <tr v-for="bank in visibleBanks" :key="bank.id" :class="bank.rowClass" :style="{ backgroundColor: bank.labelColor }">
                                 <td>
                                     <strong>{{ bank.name }}</strong>
                                     <small>{{ bank.account }}</small>
@@ -156,7 +156,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="Username">
-                    <el-input v-model="transactionForm.username" placeholder="e.g. PLAYER001" />
+                    <el-input v-model="transactionForm.username" :disabled="transactionDialog.mode === 'edit'" placeholder="e.g. PLAYER001" />
                 </el-form-item>
                 <el-form-item label="Remark">
                     <el-input v-model="transactionForm.remark" placeholder="(optional)" />
@@ -251,6 +251,7 @@ interface Bank {
     withdrawCount: number
     alert?: string
     rowClass?: string
+    labelColor?: string
 }
 
 interface DashboardBank {
@@ -271,6 +272,7 @@ interface DashboardBank {
     withdraw_count?: number | string
     safe_alert?: number | string
     status?: number | string
+    label_color?: string
 }
 
 interface Transaction {
@@ -396,6 +398,7 @@ const mapBank = (bank: DashboardBank): Bank => {
         withdrawCount: toNumber(bank.count_fund_out ?? bank.withdraw_count ?? bank.tx_out),
         alert: safeAlertLabels[safeAlert],
         rowClass: String(bank.status ?? '1') === '0' ? 'bank-muted' : '',
+        labelColor: bank.label_color || '',
     }
 }
 

web/src/views/backend/user/moneyLog/index.vue

@@ -4,7 +4,7 @@
 
         <!-- 表格顶部菜单 -->
         <TableHeader
-            :buttons="['refresh', 'add', 'comSearch', 'quickSearch', 'columnDisplay']"
+            :buttons="['refresh', 'add', 'delete', 'comSearch', 'quickSearch', 'columnDisplay']"
             :quick-search-placeholder="
                 t('Quick search placeholder', { fields: t('user.moneyLog.User name') + '/' + t('user.moneyLog.User nickname') })
             "
@@ -22,6 +22,20 @@
 
         <!-- 表单 -->
         <PopupForm />
+
+        <el-dialog v-model="historyDialog.visible" title="Transaction Edit History" width="720px">
+            <p class="dialog-note">Transaction edit history is only kept for the most recent 12 months.</p>
+            <p class="dialog-note">Transaction 的编辑历史记录仅保存最近 12 个月。</p>
+            <el-table v-loading="historyDialog.loading" :data="historyDialog.rows" border size="small" empty-text="No Record">
+                <el-table-column prop="id" label="Tx ID" width="100" />
+                <el-table-column prop="editedBy" label="Edit By" width="120" />
+                <el-table-column prop="editedTime" label="Edit Time" width="170" />
+                <el-table-column prop="changes" label="Changes (Old → New)" />
+            </el-table>
+            <template #footer>
+                <el-button @click="historyDialog.visible = false">CANCEL</el-button>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
@@ -31,7 +45,7 @@ import { provide, reactive, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute } from 'vue-router'
 import PopupForm from './popupForm.vue'
-import { add, url } from '/@/api/backend/user/moneyLog'
+import { add, logHistory, url } from '/@/api/backend/user/moneyLog'
 import { baTableApi } from '/@/api/common'
 import TableHeader from '/@/components/table/header/index.vue'
 import Table from '/@/components/table/index.vue'
@@ -48,6 +62,84 @@ const defalutUser = (route.query.user_id ?? '') as string
 const state = reactive({
     userInfo: {} as anyObj,
 })
+interface HistoryRow {
+    id: number | string
+    editedBy: string
+    editedTime: string
+    changes: string
+}
+
+const historyDialog = reactive({
+    visible: false,
+    loading: false,
+    rows: [] as HistoryRow[],
+})
+const gameTypeMap = scoreLog.game_type as Record<string, string>
+const optButtons: OptButton[] = [
+    {
+        render: 'tipButton',
+        name: 'history',
+        title: 'History',
+        text: '',
+        type: 'primary',
+        icon: 'fa fa-history',
+        class: 'table-row-history',
+        disabledTip: false,
+        click: (row: TableRow) => {
+            openHistory(row)
+        },
+    },
+    ...defaultOptButtons(['edit']),
+    ...defaultOptButtons(['delete']),
+]
+
+const toNumber = (value: unknown) => {
+    const number = Number(value)
+    return Number.isFinite(number) ? number : 0
+}
+
+const formatDateTime = (value: unknown) => {
+    if (typeof value === 'string' && value.trim() && !Number.isFinite(Number(value))) {
+        return value
+    }
+
+    const timestamp = toNumber(value)
+    if (!timestamp) return ''
+
+    const date = new Date(timestamp * 1000)
+    const pad = (number: number) => number.toString().padStart(2, '0')
+    return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
+}
+
+const stringifyChange = (history: Record<string, unknown>) => {
+    if (history.bank_befter !== undefined || history.bank_after !== undefined) {
+        return `Bank:${history.bank_befter ?? ''}→${history.bank_after ?? ''}`
+    }
+
+    return JSON.stringify(history)
+}
+
+const mapHistory = (history: Record<string, unknown>): HistoryRow => ({
+    id: (history.id || history.money_log_id || '') as number | string,
+    editedBy: String(history.admin_name || ''),
+    editedTime: formatDateTime(history.create_time),
+    changes: stringifyChange(history),
+})
+
+const openHistory = (row: TableRow) => {
+    historyDialog.visible = true
+    historyDialog.loading = true
+    historyDialog.rows = []
+
+    logHistory({ id: row.id })
+        .then((res) => {
+            const data = Array.isArray(res.data) ? res.data : res.data?.list
+            historyDialog.rows = Array.isArray(data) ? data.map((item) => mapHistory(item as Record<string, unknown>)) : []
+        })
+        .finally(() => {
+            historyDialog.loading = false
+        })
+}
 
 const baTable = new baTableClass(
     new baTableApi(url),
@@ -61,16 +153,9 @@ const baTable = new baTableClass(
                 width: 70,
                 formatter: (row: TableRow) => {
                     return row.admin?.username || 'web'
-                }
+                },
-            },
-            { label: t('user.moneyLog.User name'), prop: 'user.username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
-            {
-                label: t('user.moneyLog.User nickname'),
-                prop: 'user.nickname',
-                align: 'center',
-                operator: 'LIKE',
-                operatorPlaceholder: t('Fuzzy query'),
             },
+            { label: t('user.moneyLog.User name'), prop: 'user.jk_username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
             { label: t('user.moneyLog.Change balance'), prop: 'money', align: 'center', operator: 'RANGE', sortable: 'custom' },
             { label: t('user.moneyLog.bank_id'), prop: 'bank.bank_name', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
             { label: t('user.moneyLog.Transaction id'), prop: 'transaction_id', align: 'center', operator: 'RANGE' },
@@ -81,11 +166,13 @@ const baTable = new baTableClass(
                 // 使用渲染函数手动构建显示内容
                 formatter: (row: TableRow) => {
                     if (!row.scoreLog || row.scoreLog.length === 0) return '-'
-                    return row.scoreLog.map((item: any) => {
+                    return row.scoreLog
-                        const gameName = scoreLog.game_type[item.game_type] || item.game_type
+                        .map((item: any) => {
-                        return `${gameName}: ${item.score}`
+                            const gameName = gameTypeMap[String(item.game_type)] || item.game_type
-                    }).join(' | ')
+                            return `${gameName}: ${item.score}`
-                }
+                        })
+                        .join(' | ')
+                },
             },
             {
                 label: t('user.moneyLog.type'),
@@ -97,6 +184,8 @@ const baTable = new baTableClass(
                 custom: {
                     '1': 'success',
                     '2': 'danger',
+                    '3': 'success',
+                    '4': 'danger',
                 },
                 replaceValue: { ...tm('user.moneyLog.type_list') },
             },
@@ -109,7 +198,7 @@ const baTable = new baTableClass(
                 showOverflowTooltip: true,
             },
             { label: t('Create time'), prop: 'create_time', align: 'center', render: 'datetime', sortable: 'custom', operator: 'RANGE', width: 160 },
-            { label: t('Operate'), align: 'center', width: '60', render: 'buttons', buttons: defaultOptButtons(['edit']) },
+            { label: t('Operate'), align: 'center', width: '130', render: 'buttons', buttons: optButtons },
         ],
         dblClickNotEditColumn: ['all'],
     },

web/src/views/backend/user/moneyLog/popupForm.vue

@@ -19,28 +19,61 @@
             >
                 <el-form
                     ref="formRef"
-                    @keyup.enter="baTable.onSubmit(formRef)"
+                    @keyup.enter="submitForm"
                     :model="baTable.form.items"
                     :label-position="config.layout.shrink ? 'top' : 'right'"
                     :label-width="baTable.form.labelWidth + 'px'"
                     :rules="rules"
                     v-if="!baTable.form.loading"
                 >
-                    <FormItem
+                    <template v-if="baTable.form.operate == 'Edit'">
-                        type="remoteSelect"
+                        <el-form-item label="Date & Time">
-                        prop="user_id"
+                            <el-date-picker v-model="state.editTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" />
-                        :label="t('user.moneyLog.User ID')"
+                            <el-radio-group v-model="state.timeMode" class="inline-mode">
-                        v-model="baTable.form.items!.user_id"
+                                <el-radio value="Auto">Auto</el-radio>
-                        :placeholder="t('Click select')"
+                                <el-radio value="Manual">Manual</el-radio>
-                        :input-attr="{
+                            </el-radio-group>
-                            pk: 'user.id',
+                        </el-form-item>
-                            field: 'nickname_text',
+                        <el-form-item label="Category">
-                            remoteUrl: '/admin/user.User/index',
+                            <el-select v-model="baTable.form.items!.category">
-                            onChange: getAdd,
+                                <el-option label="Customer" :value="1" />
-                            disabled: baTable.form.operate == 'Edit'
+                                <el-option label="Other Adjust" :value="2" />
-                        }"
+                            </el-select>
-                    />
+                        </el-form-item>
-                    <el-form-item :label="t('user.moneyLog.bank_id')" prop="bank_id">
+                        <el-form-item label="Type" prop="type">
+                            <el-radio-group v-model="baTable.form.items!.type">
+                                <el-radio-button :value="1">Deposit</el-radio-button>
+                                <el-radio-button :value="2">Withdraw</el-radio-button>
+                                <el-radio-button :value="3">IN</el-radio-button>
+                                <el-radio-button :value="4">OUT</el-radio-button>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item label="Username">
+                            <el-input v-model="baTable.form.items!.user_name" disabled placeholder="e.g. PLAYER001" />
+                        </el-form-item>
+                        <el-form-item label="Remark" prop="memo">
+                            <el-input v-model="baTable.form.items!.memo" placeholder="(optional)" />
+                        </el-form-item>
+                        <el-form-item label="Amount (AUD)" prop="money">
+                            <el-input-number v-model="baTable.form.items!.money" :min="0" :precision="2" />
+                        </el-form-item>
+                    </template>
+                    <template v-else>
+                        <FormItem
+                            type="remoteSelect"
+                            prop="user_id"
+                            :label="t('user.moneyLog.User ID')"
+                            v-model="baTable.form.items!.user_id"
+                            :placeholder="t('Click select')"
+                            :input-attr="{
+                                pk: 'user.id',
+                                field: 'nickname_text',
+                                remoteUrl: '/admin/user.User/index',
+                                onChange: getAdd,
+                            }"
+                        />
+                    </template>
+                    <el-form-item :label="baTable.form.operate == 'Edit' ? 'Bank' : t('user.moneyLog.bank_id')" prop="bank_id">
                         <el-select
                             v-model="baTable.form.items!.bank_id"
                             filterable
@@ -51,57 +84,64 @@
                             clearable
                             style="width: 100%"
                         >
-                            <el-option
+                            <el-option v-for="item in state.bankOptions" :key="item.id" :label="item.bank_name" :value="item.id">
-                                v-for="item in state.bankOptions"
+                                <div style="display: flex; justify-content: space-between; align-items: center">
-                                :key="item.id"
-                                :label="item.bank_name"
-                                :value="item.id"
-                            >
-                                <div style="display: flex; justify-content: space-between; align-items: center;">
                                     <span>{{ item.bank_name }}</span>
-                                    <span style="color: #a8abb2; font-size: 12px;">{{ item.bank_account }}</span>
+                                    <span style="color: #a8abb2; font-size: 12px">{{ item.bank_account }}</span>
                                 </div>
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <FormItem
+                    <template v-if="baTable.form.operate == 'Edit'">
-                        :label="t('user.moneyLog.type')"
+                        <el-form-item label="Label">
-                        type="select"
+                            <el-select v-model="baTable.form.items!.label" placeholder="- (optional) -" clearable>
-                        v-model="baTable.form.items!.type"
+                                <el-option label="First Deposit" :value="1" />
-                        prop="type"
+                                <el-option label="Unclaim" :value="2" />
-                        :input-attr="{
+                            </el-select>
-                            content: {
+                        </el-form-item>
-                                '1': t('user.moneyLog.type_list.1'),
+                        <el-form-item label="Game Ticket Auto">
-                                '2': t('user.moneyLog.type_list.2'),
+                            <el-checkbox v-model="state.gameTicketAuto">Auto generate ticket</el-checkbox>
-                            },
+                        </el-form-item>
-                        }"
+                    </template>
-                        :placeholder="t('Please select field', { field: t('user.moneyLog.type') })"
+                    <template v-else>
-                        @change="(val) => { baTable.form.items!.type = val; }"
+                        <FormItem
-                    />
+                            :label="t('user.moneyLog.type')"
-                    <el-form-item prop="money" :label="t('user.moneyLog.Change amount')">
+                            type="select"
-                        <el-input
+                            v-model="baTable.form.items!.type"
-                            v-model="baTable.form.items!.money"
+                            prop="type"
-                            type="number"
+                            :input-attr="{
-                            :placeholder="t('user.moneyLog.Please enter the balance change amount')"
+                                content: {
-                            @input="changeMoney"
+                                    '1': t('user.moneyLog.type_list.1'),
-                        ></el-input>
+                                    '2': t('user.moneyLog.type_list.2'),
-                    </el-form-item>
+                                },
-                    <el-form-item prop="memo" :label="t('user.moneyLog.remarks')">
+                            }"
-                        <el-input
+                            :placeholder="t('Please select field', { field: t('user.moneyLog.type') })"
-                            @keyup.enter.stop=""
+                            @change="onTypeChange"
-                            @keyup.ctrl.enter="baTable.onSubmit(formRef)"
+                        />
-                            v-model="baTable.form.items!.memo"
+                        <el-form-item prop="money" :label="t('user.moneyLog.Change amount')">
-                            type="textarea"
+                            <el-input
-                            :placeholder="t('user.moneyLog.Please enter change remarks / description')"
+                                v-model="baTable.form.items!.money"
-                        ></el-input>
+                                type="number"
-                    </el-form-item>
+                                :placeholder="t('user.moneyLog.Please enter the balance change amount')"
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item prop="memo" :label="t('user.moneyLog.remarks')">
+                            <el-input
+                                @keyup.enter.stop=""
+                                @keyup.ctrl.enter="submitForm"
+                                v-model="baTable.form.items!.memo"
+                                type="textarea"
+                                :placeholder="t('user.moneyLog.Please enter change remarks / description')"
+                            ></el-input>
+                        </el-form-item>
+                    </template>
                 </el-form>
             </div>
         </el-scrollbar>
         <template #footer>
             <div :style="'width: calc(100% - ' + baTable.form.labelWidth! / 1.8 + 'px)'">
                 <el-button @click="baTable.toggleForm('')">{{ t('Cancel') }}</el-button>
-                <el-button v-blur :loading="baTable.form.submitLoading" @click="baTable.onSubmit(formRef)" type="primary">
+                <el-button v-blur :loading="baTable.form.submitLoading" @click="submitForm" type="primary">
                     {{ baTable.form.operateIds!.length > 1 ? t('Save and edit next item') : t('Save') }}
                 </el-button>
             </div>
@@ -110,7 +150,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, inject, watch, useTemplateRef, nextTick } from 'vue'
+import { reactive, inject, watch, useTemplateRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 import type baTableClass from '/@/utils/baTable'
 import { add } from '/@/api/backend/user/moneyLog'
@@ -127,14 +167,16 @@ const getBankList = (query: string = '') => {
         params: {
             // BuildAdmin 后端标准的搜索与分页格式
             quickSearch: query,
-            limit: 20
+            limit: 20,
-        }
+        },
-    }).then((res) => {
-        // BuildAdmin 列表的标准返回结构是 res.data.list
-        state.bankOptions = res.data.list || []
-    }).finally(() => {
-        state.bankLoading = false
     })
+        .then((res) => {
+            // BuildAdmin 列表的标准返回结构是 res.data.list
+            state.bankOptions = res.data.list || []
+        })
+        .finally(() => {
+            state.bankLoading = false
+        })
 }
 const config = useConfig()
 const { t } = useI18n()
@@ -162,13 +204,19 @@ const formRef = useTemplateRef('formRef')
 const state: {
     userInfo: anyObj
     after: number
-    bankOptions: any[]    // 新增：存放银行下拉选项
+    bankOptions: any[]
-    bankLoading: boolean  // 新增：下拉框加载状态
+    bankLoading: boolean
+    editTime: string
+    timeMode: 'Auto' | 'Manual'
+    gameTicketAuto: boolean
 } = reactive({
     userInfo: {},
     after: 0,
-    bankOptions: [],      // 初始化
+    bankOptions: [],
-    bankLoading: false
+    bankLoading: false,
+    editTime: '',
+    timeMode: 'Manual',
+    gameTicketAuto: true,
 })
 
 const getAdd = () => {
@@ -190,9 +238,7 @@ watch(
         }
 
         const inputAmount = newMoney === '' ? 0 : parseFloat(newMoney as string)
-        const currentMoney = baTable.form.operate == 'Edit'
+        const currentMoney = baTable.form.operate == 'Edit' ? parseFloat(baTable.form.items!.before) : parseFloat(state.userInfo.money)
-            ? parseFloat(baTable.form.items!.before)
-            : parseFloat(state.userInfo.money)
 
         // 核心逻辑判断
         let result = 0
@@ -209,8 +255,71 @@ watch(
     { deep: true } // 深度监听
 )
 
-const changeMoney = (value: string) => {
+const pad = (number: number) => number.toString().padStart(2, '0')
 
+const formatDateTime = (value: unknown) => {
+    const timestamp = Number(value)
+    if (!Number.isFinite(timestamp) || !timestamp) return ''
+
+    const date = new Date(timestamp * 1000)
+    return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
+}
+
+const timestampFromEditTime = () => {
+    if (state.timeMode === 'Auto' || !state.editTime) {
+        return Math.floor(Date.now() / 1000)
+    }
+
+    const timestamp = Math.floor(new Date(state.editTime.replace(' ', 'T')).getTime() / 1000)
+    return Number.isFinite(timestamp) ? timestamp : Math.floor(Date.now() / 1000)
+}
+
+const onTypeChange = (val: number | string) => {
+    baTable.form.items!.type = val
+}
+
+const findTableRow = (rows: TableRow[] = [], id: number | string): TableRow | undefined => {
+    for (const row of rows) {
+        if (row.id == id) return row
+        if (row.children) {
+            const child = findTableRow(row.children, id)
+            if (child) return child
+        }
+    }
+}
+
+const getUsername = (items: anyObj) => {
+    const tableRow = findTableRow(baTable.table.data, items.id)
+    return items.user?.jk_username || tableRow?.user?.jk_username || ''
+}
+
+const initEditForm = () => {
+    const items = baTable.form.items
+    if (!items || baTable.form.operate !== 'Edit') return
+
+    items.category = items.category || 1
+    if (!items.user_name) {
+        items.user_name = getUsername(items)
+    }
+    items.bank_id = items.bank_id || items.bank?.id || ''
+    items.label = items.label || ''
+    state.editTime = formatDateTime(items.create_time)
+    state.timeMode = 'Manual'
+    state.gameTicketAuto =
+        items.game_ticket !== undefined ? Number(items.game_ticket) === 1 : Array.isArray(items.scoreLog) && items.scoreLog.length > 0
+
+    if (items.bank && !state.bankOptions.some((bank) => bank.id === items.bank_id)) {
+        state.bankOptions.unshift(items.bank)
+    }
+}
+
+const submitForm = () => {
+    if (baTable.form.operate === 'Edit') {
+        baTable.form.items!.create_time = timestampFromEditTime()
+        baTable.form.items!.game_ticket = state.gameTicketAuto ? 1 : 0
+    }
+
+    baTable.onSubmit(formRef.value)
 }
 
 // 打开表单时刷新用户数据
@@ -219,9 +328,18 @@ watch(
     (newValue) => {
         if (newValue) {
             getAdd()
+            getBankList()
+            initEditForm()
         }
     }
 )
+
+watch(
+    () => baTable.form.items,
+    () => {
+        initEditForm()
+    }
+)
 </script>
 
 <style scoped lang="scss">
@@ -229,4 +347,11 @@ watch(
     width: 60px;
     height: 60px;
 }
+.inline-mode {
+    margin-left: 12px;
+}
+:deep(.el-form-item .el-select),
+:deep(.el-form-item .el-input) {
+    width: 100%;
+}
 </style>

web/src/views/backend/user/user/index.vue

@@ -78,10 +78,9 @@ const baTable = new baTableClass(
         column: [
             { type: 'selection', align: 'center', operator: false },
             { label: t('Id'), prop: 'id', align: 'center', operator: '=', operatorPlaceholder: t('Id'), width: 70 },
-            { label: t('user.user.User name'), prop: 'username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
+            { label: t('user.user.User name'), prop: 'jk_username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
             { label: t('user.user.nickname'), prop: 'nickname', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
             { label: t('user.user.jk user id'), prop: 'jk_user_id', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
-            { label: t('user.user.jk user name'), prop: 'jk_username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
             { label: t('user.user.referrer code'), prop: 'referrer_code', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), width: 120,},
             {
                 label: t('user.user.group'),

web/src/views/backend/user/user/popupForm.vue

@@ -29,7 +29,7 @@
                 >
                     <el-form-item prop="username" :label="t('user.user.User name')">
                         <el-input
-                            v-model="baTable.form.items!.username"
+                            v-model="baTable.form.items!.jk_username"
                             type="string"
                             :placeholder="t('Please input field', { field: t('user.user.User name') + '(' + t('user.user.Login account') + ')' })"
                             :disabled="baTable.form.operate === 'Edit'"