admin_new P0+P1 全批次合并 (84 commits) #2

Merged
direv merged 85 commits from develop into main 2026-08-07 11:27:17 +08:00
Showing only changes of commit 25a0db5cb2 - Show all commits

View File

@ -14,7 +14,6 @@
* sex 性别 0男1女 (选填) * sex 性别 0男1女 (选填)
* enabled 禁用标识 0正常1禁用 (选填, 默认正常) * enabled 禁用标识 0正常1禁用 (选填, 默认正常)
* enterpriseId 关联企业 (单选, 取 tb_user.enterpriseId; 真多对多需后端加 user_enterprise_bind 表, 当前未做) * enterpriseId 关联企业 (单选, 取 tb_user.enterpriseId; 真多对多需后端加 user_enterprise_bind 表, 当前未做)
* remark 备注 (选填)
* *
* 已去掉: * 已去掉:
* - header (头像 URL): 改用默认头像, 此处无意义 * - header (头像 URL): 改用默认头像, 此处无意义
@ -32,7 +31,6 @@ interface UserForm {
sex: '' | '0' | '1' sex: '' | '0' | '1'
enterpriseId: number | null enterpriseId: number | null
enabled: '' | '0' | '1' enabled: '' | '0' | '1'
remark: string
} }
interface EnterpriseOpt { id: number; name: string } interface EnterpriseOpt { id: number; name: string }
@ -62,7 +60,6 @@ const form = reactive<UserForm>({
sex: '', sex: '',
enterpriseId: null, enterpriseId: null,
enabled: '0', enabled: '0',
remark: ''
}) })
const rules = { const rules = {
@ -107,7 +104,6 @@ function resetForm() {
form.sex = '' form.sex = ''
form.enterpriseId = null form.enterpriseId = null
form.enabled = '0' form.enabled = '0'
form.remark = ''
} }
/** /**
@ -144,7 +140,6 @@ async function loadDetail() {
form.sex = (data.sex === 0 || data.sex === 1 ? String(data.sex) : '') as UserForm['sex'] form.sex = (data.sex === 0 || data.sex === 1 ? String(data.sex) : '') as UserForm['sex']
form.enterpriseId = data.enterpriseId ? Number(data.enterpriseId) : null form.enterpriseId = data.enterpriseId ? Number(data.enterpriseId) : null
form.enabled = (data.enabled === 0 || data.enabled === 1 ? String(data.enabled) : '0') as UserForm['enabled'] form.enabled = (data.enabled === 0 || data.enabled === 1 ? String(data.enabled) : '0') as UserForm['enabled']
form.remark = data.remark || ''
} }
await nextTick() await nextTick()
formRef.value?.clearValidate() formRef.value?.clearValidate()
@ -177,7 +172,6 @@ async function submit() {
if (form.sex !== '') payload.sex = Number(form.sex) if (form.sex !== '') payload.sex = Number(form.sex)
if (form.enterpriseId) payload.enterpriseId = Number(form.enterpriseId) if (form.enterpriseId) payload.enterpriseId = Number(form.enterpriseId)
if (form.enabled !== '') payload.enabled = Number(form.enabled) if (form.enabled !== '') payload.enabled = Number(form.enabled)
if (form.remark) payload.remark = form.remark
if (mode.value === 'create') { if (mode.value === 'create') {
await httpPost('/user/user/save', payload) await httpPost('/user/user/save', payload)
@ -259,7 +253,6 @@ async function submit() {
:value="opt.id" :value="opt.id"
/> />
</el-select> </el-select>
<div class="rr-form-tip">由企业认证流程自动带过来, 手动修改可能与认证状态不一致</div>
</el-form-item> </el-form-item>
<el-form-item label="禁用标识"> <el-form-item label="禁用标识">
@ -269,9 +262,6 @@ async function submit() {
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" maxlength="200" />
</el-form-item>
</el-form> </el-form>
</div> </div>
@ -285,10 +275,4 @@ async function submit() {
</template> </template>
<style scoped> <style scoped>
.rr-form-tip {
font-size: 12px;
color: var(--ink-3, #94A3B8);
line-height: 18px;
margin-top: 4px;
}
</style> </style>