管理员新增渠道channel_id和代理angent_id

web/src/lang/backend/en/auth/admin.ts

@@ -1,12 +1,16 @@
 export default {
     username: 'Username',
     nickname: 'Nickname',
+    channel_id: 'Channel',
+    channel_name: 'Channel name',
+    'Please select channel': 'Please select channel',
     group: 'Group',
     avatar: 'Avatar',
     email: 'Email',
     mobile: 'Mobile Number',
     'Last login': 'Last login',
     Password: 'Password',
+    agent_id: 'agent',
     'Please leave blank if not modified': 'Please leave blank if you do not modify.',
     'Personal signature': 'Personal Signature',
     'Administrator login': 'Administrator Login Name',

web/src/lang/backend/zh-cn/auth/admin.ts

@@ -1,12 +1,16 @@
 export default {
     username: '用户名',
     nickname: '昵称',
+    channel_id: '渠道',
+    channel_name: '渠道名称',
+    'Please select channel': '请选择渠道',
     group: '角色组',
     avatar: '头像',
     email: '电子邮箱',
     mobile: '手机号',
     'Last login': '最后登录',
     Password: '密码',
+    agent_id: '代理',
     'Please leave blank if not modified': '不修改请留空',
     'Personal signature': '个性签名',
     'Administrator login': '管理员登录名',

web/src/views/backend/auth/admin/index.vue

@@ -48,7 +48,7 @@ const baTable = new baTableClass(
             { label: t('Id'), prop: 'id', align: 'center', operator: '=', operatorPlaceholder: t('Id'), width: 70 },
             { label: t('auth.admin.username'), prop: 'username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
             { label: t('auth.admin.nickname'), prop: 'nickname', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
-            { label: t('auth.admin.group'), prop: 'group_name_arr', align: 'center', operator: false, render: 'tags' },
+            { label: t('auth.admin.group'), prop: 'group_name_arr', align: 'center', minWidth: 120, operator: false, render: 'tags' },
             { label: t('auth.admin.avatar'), prop: 'avatar', align: 'center', render: 'image', operator: false },
             { label: t('auth.admin.email'), prop: 'email', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
             { label: t('auth.admin.mobile'), prop: 'mobile', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
@@ -61,6 +61,20 @@ const baTable = new baTableClass(
                 operator: 'RANGE',
                 width: 160,
             },
+            {
+                label: t('auth.admin.channel_name'),
+                prop: 'channel.name',
+                align: 'center',
+                minWidth: 120,
+                operator: false,
+            },
+            {
+                label: t('auth.admin.agent_id'),
+                prop: 'agent_id',
+                align: 'center',
+                width: '160',
+                showOverflowTooltip: true,
+            },
             { label: t('Create time'), prop: 'create_time', align: 'center', render: 'datetime', sortable: 'custom', operator: 'RANGE', width: 160 },
             {
                 label: t('State'),

web/src/views/backend/auth/admin/popupForm.vue

@@ -41,6 +41,19 @@
                         prop="nickname"
                         :placeholder="t('Please input field', { field: t('auth.admin.nickname') })"
                     />
+                    <FormItem
+                        v-if="baTable.form.operate === 'Add' && adminInfo.super"
+                        :label="t('auth.admin.channel_id')"
+                        v-model="baTable.form.items!.channel_id"
+                        prop="channel_id"
+                        type="remoteSelect"
+                        :input-attr="{
+                            pk: 'id',
+                            field: 'name',
+                            remoteUrl: '/admin/channel.Manage/index',
+                            placeholder: t('auth.admin.Please select channel'),
+                        }"
+                    />
                     <FormItem
                         :label="t('auth.admin.group')"
                         v-model="baTable.form.items!.group_arr"
@@ -134,6 +147,17 @@ const { t } = useI18n()
 const rules: Partial<Record<string, FormItemRule[]>> = reactive({
     username: [buildValidatorData({ name: 'required', title: t('auth.admin.username') }), buildValidatorData({ name: 'account' })],
     nickname: [buildValidatorData({ name: 'required', title: t('auth.admin.nickname') })],
+    channel_id: [
+        {
+            validator: (_rule: any, val: any, callback: Function) => {
+                if (baTable.form.operate === 'Add' && adminInfo.super && !val) {
+                    return callback(new Error(t('auth.admin.Please select channel')))
+                }
+                return callback()
+            },
+            trigger: 'change',
+        },
+    ],
     group_arr: [buildValidatorData({ name: 'required', message: t('Please select field', { field: t('auth.admin.group') }) })],
     email: [buildValidatorData({ name: 'email', message: t('Please enter the correct field', { field: t('auth.admin.email') }) })],
     mobile: [buildValidatorData({ name: 'mobile', message: t('Please enter the correct field', { field: t('auth.admin.mobile') }) })],