新增用户

src/lang/package/zh-cn/pages.js

@@ -42,7 +42,6 @@ export default {
     is_admin_role: '是否是管理员使用的角色'
   },
   admin: {
-    dialogTitle: '用户信息',
     account: '账号',
     nick_name: '名称',
     role: '角色',
@@ -61,6 +60,7 @@ export default {
   },
   user: {
     dialogTitle: '用户信息',
+    addDialogTitle: '新增用户 ',
     examDialogTitle: '用户审核',
     openid: '微信唯一标识',
     account: '账号',
@@ -534,7 +534,6 @@ export default {
     phone: '联系电话',
     email: '电子邮箱',
     email_pla: '请输入电子邮箱',
-    status: '状态',
     logo: '企业Logo',
     pattern: '企业类型',
     pattern_pla: '请选择企业类型',

src/views/user/parts/user.vue

@@ -5,6 +5,7 @@
         <el-option v-for="i in sectorList" :key="i.id" :label="i.title" :value="i.title"></el-option>
       </template>
     </custom-search-bar>
+    <custom-button-bar :fields="buttonFields" @add="toAdd"></custom-button-bar>
     <custom-table :data="data" :fields="fields" @query="search" :total="total" :opera="opera" @view="toView" @exam="toExam" @delete="toDelete">
       <template #role="{ row }">
         <div class="tags">
@@ -42,6 +43,19 @@
             </template>
           </custom-form>
         </el-col>
+        <el-col :span="24" v-if="dialog.type == '3'">
+          <custom-form v-model="form" :fields="formFields" @save="toSave">
+            <template #role>
+              <el-checkbox v-for="i in roleList" :key="i.code" :label="i.name" :value="i.code" />
+            </template>
+            <template #industry>
+              <el-checkbox v-for="i in sectorList" :key="i.id" :label="i.title" :value="i.title" />
+            </template>
+            <template #gender>
+              <el-option v-for="i in genderList" :key="i.id" :label="i.label" :value="i.value"></el-option>
+            </template>
+          </custom-form>
+        </el-col>
       </el-row>
     </el-dialog>
   </div>
@@ -125,6 +139,7 @@ const opera = [
     type: 'danger'
   }
 ]
+const buttonFields = [{ label: t('common.create'), method: 'add' }]
 const searchForm = ref({})
 const dialog = ref({ type: '1', show: false, title: t('pages.user.dialogTitle') })
 // 查询
@@ -138,6 +153,16 @@ const search = async (query = { skip, limit }) => {
     total.value = res.total
   }
 }
+const formFields = ref([
+  { label: t('pages.user.account'), model: 'account' },
+  { label: t('pages.user.password'), model: 'password', type: 'password' },
+  { label: t('pages.user.nick_name'), model: 'nick_name' },
+  { label: t('pages.user.role'), model: 'role', type: 'checkbox' },
+  { label: t('pages.user.industry'), model: 'industry', type: 'checkbox' },
+  { label: t('pages.user.gender'), model: 'gender', type: 'select' },
+  { label: t('pages.user.email'), model: 'email' },
+  { label: t('pages.user.phone'), model: 'phone' }
+])
 // 表单验证
 const ruleFormRef = ref()
 const form = ref({})
@@ -171,9 +196,6 @@ const searchOther = async () => {
   // 性别
   result = await dictDataStore.query({ code: 'gender', is_use: '0' })
   if ($checkRes(result)) genderList.value = result.data
-  // 角色
-  result = await roleStore.query({ is_use: '0' })
-  if ($checkRes(result)) roleList.value = result.data
   // 专家领域
   result = await dictDataStore.query({ code: 'field', is_use: '0' })
   if ($checkRes(result)) fieldList.value = result.data
@@ -202,7 +224,7 @@ const searchOther = async () => {
   result = await regionStore.area({ level: 'province', code: 22 })
   if ($checkRes(result)) cityList.value = result.data
   // 角色
-  result = await roleStore.query({ is_use: '0' })
+  result = await roleStore.query({ is_use: '0', is_admin_role: '0' })
   if ($checkRes(result)) roleList.value = result.data
   // 行业
   result = await sectorStore.query({ is_use: '0' })
@@ -233,11 +255,15 @@ const getDict = (data, model) => {
     return get(res, 'label')
   }
 }
+const toAdd = () => {
+  form.value = { role: ['User'] }
+  dialog.value = { type: '3', show: true, title: t('pages.user.addDialogTitle') }
+}
 // 查看
 const toView = async (data) => {
   form.value = data
-  user_id.value = data.id
   role.value = get(data, 'role')
+  user_id.value = data.id
   dialog.value = { type: '1', show: true, title: t('pages.user.dialogTitle') }
 }
 // 标签改变
@@ -301,6 +327,16 @@ const toExamSave = async () => {
     toClose()
   }
 }
+const toSave = async () => {
+  const data = cloneDeep(form.value)
+  let res
+  if (get(data, 'id')) res = await store.update(data)
+  else res = await store.create(data)
+  if ($checkRes(res, true)) {
+    search({ skip, limit })
+    toClose()
+  }
+}
 const toClose = () => {
   form.value = {}
   type.value = 'User'
@@ -331,8 +367,7 @@ provide('IndustryList', IndustryList)
 provide('cardTypeList', cardTypeList)
 provide('contributionList', contributionList)
 provide('modeList', modeList)
-// 方法
-provide('getRole', getRole)
+provide('roleList', roleList)
 </script>
 <style scoped lang="scss">
 .tags {

src/views/user/parts/user/user.vue

@@ -2,9 +2,7 @@
   <div class="index">
     <custom-form v-model="form" :fields="formFields" @save="onSubmit">
       <template #role>
-        <div class="tags">
-          <el-tag v-for="(item, index) in form.role" :key="index" type="primary">{{ getRole(item) }}</el-tag>
-        </div>
+        <el-checkbox v-for="i in roleList" :key="i.code" :label="i.name" :value="i.code" />
       </template>
       <template #industry>
         <el-checkbox v-for="i in sectorList" :key="i.id" :label="i.title" :value="i.title" />
@@ -19,19 +17,19 @@
 // 基础
 const { t } = useI18n()
 const form = inject('form')
-const getRole = inject('getRole')
 const formFields = ref([
   { label: t('pages.user.openid'), model: 'openid', options: { readonly: true } },
   { label: t('pages.user.account'), model: 'account', options: { readonly: true } },
-  { label: t('pages.user.nick_name'), model: 'nick_name', options: { readonly: true } },
+  { label: t('pages.user.nick_name'), model: 'nick_name' },
+  { label: t('pages.user.role'), model: 'role', type: 'checkbox' },
   { label: t('pages.user.industry'), model: 'industry', type: 'checkbox' },
   { label: t('pages.user.gender'), model: 'gender', type: 'select' },
-  { label: t('pages.user.email'), model: 'email', options: { readonly: true } },
-  { label: t('pages.user.phone'), model: 'phone', options: { readonly: true } },
-  { label: t('pages.user.role'), model: 'role', custom: true }
+  { label: t('pages.user.email'), model: 'email' },
+  { label: t('pages.user.phone'), model: 'phone' }
 ])
 // 字典表
 const genderList = inject('genderList')
+const roleList = inject('roleList')
 const sectorList = inject('sectorList')
 const onSubmit = inject('onSubmit')
 </script>