Merge pull request 'uesr' (#17) from uesr into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/17

src/api/common/index.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request.js'
+
+export const requestList = ( api, params, method = 'get' ) => {
+  return request({
+    url: api,
+    method,
+    params
+  })
+}

src/api/user/user.js

@@ -1,5 +1,20 @@
 import request from '@/utils/request.js'
 
+// 根据角色或者部门id获取对应数据
+export const getDeptOpt = () => {
+  return request({
+    url: `/admin/mosr/department/option`,
+    method: 'get'
+  })
+}
+
+export const getSubCompOpt = () => {
+  return request({
+    url: `/admin/mosr/sub/company/option`,
+    method: 'get'
+  })
+}
+
 export const getUserList = (params) => {
   return request({
     url: '/admin/user',

src/fvcomponents/fvCheckbox/index.vue

@@ -0,0 +1,41 @@
+<template>
+  <el-checkbox-group v-model="localVal" v-bind="$attrs" @change="change">
+    <el-checkbox 
+      v-for="item in options"
+      :label="item.label"
+      :value="item.value"
+      :key="item.value"
+      :disabled="item.disabled || false"
+    />
+  </el-checkbox-group>
+</template>
+
+<script setup>
+const props = defineProps({
+  options: {
+    type: Array,
+    default: []
+  },
+  modelValue: {
+    type: Array,
+    default: []
+  }
+})
+
+const emits = defineEmits(['change', 'update:modelValue'])
+
+const localVal = ref([])
+
+watchEffect(()=>{
+  localVal.value = props.modelValue
+})
+
+const change = (val) => {
+  emits('update:modelValue', val)
+  emits('change', val)
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/fvcomponents/fvForm/index.vue

@@ -0,0 +1,109 @@
+<template>
+  <el-form
+    :model="form"
+    v-bind="$attrs"
+    label-width="auto"
+    ref="formInstance"
+  >
+    <el-row>
+      <el-col
+        v-for="item in filterSchma"
+        v-bind="item.colProps || { span: 12}"
+        :key="item.prop"
+      >
+        <el-form-item 
+          v-bind="item"
+          :key="item.prop"
+        >
+          <template #default>
+            <component 
+              v-if="item.component"
+              :is="item.component"
+              v-bind="item.props || {}"
+              v-on="item.on || {}"
+              v-model="form[item.prop]"
+            >
+            </component>
+            <span v-else>
+              {{ form[item.prop] || '--' }}
+            </span>
+          </template>
+          <template #label>
+            <slot :name="item?.slots?.label" v-bind="{item, form}">
+              {{ item?.label || '' }}
+            </slot>
+          </template>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script setup lang="jsx">
+import { ElMessage } from 'element-plus';
+
+
+
+const props = defineProps({
+  schema: {
+    type: Array,
+    default: []
+  }
+})
+
+const emits = defineEmits(['getInstance'])
+
+const form = ref({})
+const formInstance = ref(null)
+
+const filterSchma = computed(()=>{
+  return props.schema.filter(item=>{
+    if(item.prop) return true
+  })
+})
+
+console.log(filterSchma.value, 'filterSchma');
+
+const validate = async () => {
+  let validObj = {}
+  await formInstance.value.validate((valid, fields)=>{
+    validObj.isValidate = valid
+    validObj.fields = fields
+  })
+  return validObj
+}
+
+const getValues = () => {
+  return form.value
+}
+
+const setValues = (data) => {
+  try {
+    if(data instanceof Object) {
+      form.value = {...data}
+    }
+  } catch (error) {
+    ElMessage.warning('传入参数格式有误')
+  }
+}
+
+const resetFields = () => {
+  formInstance.value.resetFields()
+}
+
+onMounted(()=>{
+  emits('getInstance',Object.assign({}, unref(formInstance), {
+    getValues,
+    validate,
+    setValues,
+    resetFields
+  }))
+})
+
+defineExpose({ getValues, setValues, validate, resetFields, formInstance, form })
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/fvcomponents/fvPagination/index.vue

@@ -0,0 +1,82 @@
+<template>
+  <el-config-provider :locale="locale">
+    <el-pagination
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="pageSizes"
+      :background="isBackground"
+      :small="small"
+      :disabled="disabled"
+      layout="->,total, sizes, prev, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </el-config-provider>
+</template>
+
+<script setup>
+import { ElConfigProvider } from 'element-plus'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+const emit = defineEmits(['goPage', 'changeSize','handleTop'])
+const props = defineProps({
+  total: {
+    type: Number,
+    default: 0,
+  },
+  currentPage: {
+    type: Number,
+    default: 1,
+  },
+  pageSize: {
+    type: Number,
+    default: 10,
+  },
+  pageSizes: {
+    type: Object,
+    default(rawProps) {
+      return [10, 15, 20, 30, 50]
+    },
+  },
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+  isBackground: {
+    type: Boolean,
+    default: false,
+  },
+})
+//中文
+const locale = zhCn
+//总条数
+const total = ref(0)
+//对应页数
+const currentPage = ref(1)
+//每页多少条
+const pageSize = ref(10)
+//默认每页多少条的数组
+const pageSizes = ref([])
+//是否使用小型分页样式
+const small = ref(false)
+//是否禁用分页
+const disabled = ref(false)
+//分页大小
+const handleSizeChange = limit => {
+  emit('changeSize', limit)
+  emit('handleTop')
+}
+//分页切换
+const handleCurrentChange = page => {
+  emit('goPage', page)
+  emit('handleTop')
+}
+watchEffect(() => {
+  total.value = props.total
+  pageSizes.value = props.pageSizes
+})
+</script>

src/fvcomponents/fvRadio/index.vue

@@ -0,0 +1,48 @@
+<template>
+  <el-radio-group v-model="localVal" v-bind="$attrs" @change="change">
+    <el-radio v-for="item in localOptions" :label="item.value" :key="item.value">
+      {{ item.label }}
+    </el-radio>
+  </el-radio-group>
+</template>
+
+<script setup>
+import { useCacheStore } from "@/stores/cache.js";
+const cacheStore = useCacheStore();
+const props = defineProps({
+  options: {
+    type: Array,
+    default: []
+  },
+  modelValue: {
+    type: [Number, String],
+    default: ''
+  },
+  cacheKey: {
+    type: String,
+    default: ''
+  }
+})
+
+const emits = defineEmits(['change', 'update: modelValue'])
+
+const localVal = ref()
+
+const localOptions = ref([])
+
+watchEffect(()=>{
+  localVal.value = props.modelValue
+  props.cacheKey ? 
+  localOptions.value = cacheStore.getDict(props.cacheKey) :
+  localOptions.value = props.options
+})
+
+const change = (val) => {
+  emits('change', val),
+  emits('update: modelValue', val)
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/fvcomponents/fvSearchForm/index.vue

@@ -0,0 +1,113 @@
+<template>
+  <el-form
+    :model="form"
+    v-bind="$attrs"
+    label-width="auto"
+    ref="formInstance"
+    class="search-form"
+  >
+    <el-row>
+      <el-col
+        v-for="(item, index) in filterConfig"
+        :span="5"
+        :offset="index == 0 || index / 4 ==1 ? 0 : 1"
+        :key="item.prop"
+      >
+        <el-form-item 
+          v-bind="item"
+          :key="item.prop"
+        >
+          <template #default>
+            <component 
+              :is="item.component"
+              v-bind="item.props || {}"
+              v-on="item.on || {}"
+              v-model="form[item.prop]"
+            >
+            </component>
+          </template>
+        </el-form-item>
+      </el-col>
+      <el-col :span="filterConfig.length % 4 == 0 ? 4 : 6" class="btn-col">
+        <el-form-item>
+          <el-button v-if="searchConfig.length>=4" link type="primary" @click="showMore = !showMore">
+            {{ showMore ? '收起' : '展开' }}
+          </el-button>
+          <el-button type="primary" @click="getValues" :icon="Search">搜索</el-button>
+          <el-button @click="handleReset" :icon="Refresh">重置</el-button>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script setup>
+import {Refresh, Search} from '@element-plus/icons-vue'
+
+const props = defineProps({
+  searchConfig: {
+    type: Array,
+    default: []
+  }
+})
+
+const emits = defineEmits(['getInstance', 'search'])
+
+const form = ref({})
+const formInstance = ref(null)
+
+const showMore = ref(false)
+
+const filterConfig = computed(()=>{
+  const arr = props.searchConfig.filter(item=>{
+    if(item.prop) return true
+  })
+  return arr.length >= 4 && showMore.value ? arr : arr.slice(0, 3)
+})
+
+console.log(filterConfig.value, 'filterConfig');
+
+// 搜索功能表单元素默认值
+const setDefaultFormValues = () => {
+  filterConfig.value.forEach(item=>{
+    form.value[item.prop] = item.props.defaultValue || null
+  })
+}
+
+watchEffect(()=>{
+  if(filterConfig.value.length) {
+    setDefaultFormValues()
+  }
+})
+
+const getValues = () => {
+  emits('search', form.value)
+  return form.value
+}
+
+//重置
+const handleReset = () => {
+  form.value = {}
+  setDefaultFormValues()
+  emits('search', form.value)
+}
+
+onMounted(()=>{
+  emits('getInstance', Object.assign({}, unref(formInstance),{
+    getValues,
+    handleReset,
+  }))
+})
+
+</script>
+
+<style lang="scss" scoped>
+.search-form {
+  padding-top: 18px;
+}
+.btn-col {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+</style>

src/fvcomponents/fvSelect/index.vue

@@ -0,0 +1,59 @@
+<template>
+  <el-select v-model="localVal" v-bind="$attrs" @change="change">
+    <el-option 
+      v-for="item in localOptions" 
+      :label="item.label" 
+      :value="item.value" 
+      :key="item.value" 
+      :disabled="item.disabled || false"
+    />
+  </el-select>
+</template>
+
+<script setup>
+import { useCacheStore } from "@/stores/cache.js";
+const cacheStore = useCacheStore();
+const props = defineProps({
+  options: {
+    type: Array,
+    default: []
+  },
+  modelValue: {
+    type: [String, Number, Array],
+    default: undefined
+  },
+  cacheKey: {
+    type: String,
+    default: ''
+  }
+})
+
+const emits = defineEmits(['change', 'update:modelValue'])
+
+const localVal = ref()
+
+const localOptions = ref([])
+
+watchEffect(()=>{
+  localVal.value = props.modelValue
+  props.cacheKey ? 
+  localOptions.value = cacheStore.getDict(props.cacheKey) :
+  localOptions.value = props.options
+})
+
+const change = (val) => {
+  let value
+  emits('update:modelValue', val)
+  if(val instanceof Array) {
+    value = val.map(item=>props.options.find(v=>item == v.value))
+  } else {
+    value = props.options.find(v=>v.value == val)
+  }
+  emits('change', value)
+}
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/fvcomponents/fvTable/index.vue

@@ -0,0 +1,188 @@
+<template>
+  <div class="fv-table-container">
+    <!-- 表格头部按钮 -->
+    <div class="fv-table-btn" v-if="tableConfig.btns">
+      <el-button 
+        v-for="btn in tableConfig.btns"
+        :key="btn.key" 
+        :type="btn.type || ''"
+        :v-perm="btn.auth || '[*:*:*]'"
+        @click="handleClickBtns(btn.key)"
+      >
+        {{ btn.name }}
+      </el-button>
+    </div>
+    <!-- 表格部分 -->
+    <div class="fv-table">
+      <el-table
+        :data="localData.list"
+        v-loading="localData.loading"
+        :row-key="tableConfig?.rowKey || 'id'"
+        v-bind="$attrs"
+        table-layout="fixed"
+        :show-overflow-tooltip="true"
+        highlight-current-row
+        @selection-change="selectionChange"
+        @row-click="rowClick"
+        @row-dblclick="rowDblclick"
+        @cell-click="cellClick"
+        v-tabh
+        ref="tableInstance"
+      >
+        <template #default>
+          <fvTableColumn v-for="column in tableConfig.columns" :key="column.prop" :columns="column">
+            <template v-if="column?.slots?.header" #[column?.slots?.header]="params">
+              <slot :name="column?.slots?.header" v-bind="params || {}"></slot>
+            </template>
+            <template v-if="column?.slots?.default" #[column?.slots?.default]="params">
+              <slot :name="column?.slots?.default" v-bind="params || {}"></slot>
+            </template>
+          </fvTableColumn>
+        </template>
+        <template #empty>
+          <slot name="empty"></slot>
+        </template>
+        <template #append>
+          <slot name="append"></slot>
+        </template>
+      </el-table>
+      <!-- 分页 -->
+      <fvPagination 
+        v-if="pagination"
+        :current-page="localData.query.pageNum"
+        :page-size="localData.query.pageSize"
+        :page-sizes="[10, 20, 30, 40,50]"
+        :total="localData.total"
+        @changeSize="handleSizeChange"
+        @goPage="handleCurrentChange"
+        >
+      </fvPagination>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ElMessage } from 'element-plus';
+import { requestList } from '../../api/common';
+
+const props = defineProps({
+  //表格配置
+  tableConfig: {
+    type: Object,
+    default: {}
+  },
+  //若使用外部数据
+  data: {
+    type: Array,
+    default: []
+  },
+  //是否使用分页
+  pagination: {
+    type: Boolean,
+    default: true
+  }
+})
+
+const tableInstance = ref()
+
+const localData = reactive({
+  list: [], // 表格数据
+  query: {
+    pageSize: 10,
+    pageNum: 1
+  },
+  total: 0,
+  loading: false
+})
+
+const emits = defineEmits(['headBtnClick', 'selectionChange', 'rowClick', 'rowDblclick', 'getBaseQuery', 'cellClick'])
+
+const handleClickBtns = (key) => {
+  emits('headBtnClick', key)
+}
+
+const getList = async () => {
+  const { api, params } = props.tableConfig
+  const queryParmas = {...localData.query, ...params}
+  if(api) {
+    localData.loading = true
+    try {
+      const { code, data, msg } = await requestList(api, queryParmas)
+      if ( code === 1000 ) {
+        localData.list = data.rows
+        localData.total = data.total
+        localData.loading = false
+      } else {
+        ElMessage.error(msg)
+        localData.loading = false
+      }
+    } catch (error) {
+      ElMessage.error('请求数据失败')
+      localData.loading = false
+    }
+  } else {
+    localData.list = props.data
+  }
+}
+
+const selectionChange = (data) => {
+  emits('selectionChange', data)
+}
+
+const rowClick = (row, column) => {
+  emits('rowClick', row, column)
+}
+
+const rowDblclick = (row, column) => {
+  emits('rowDblclick', row, column)
+}
+
+const cellClick = (row, column) => {
+  emits('cellClick', row, column)
+}
+
+//切换每页显示条数
+const handleSizeChange = (val) => {
+  localData.query.pageSize = val
+  emits('getBaseQuery', localData.query)
+  getList()
+}
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  localData.query.pageNum = val
+  emits('getBaseQuery', localData.query)
+  getList()
+}
+
+// watchEffect(()=>{
+//   if(!props.tableConfig.api) {
+//     localData.list = props.data
+//   }else {
+//     getList()
+//   }
+// })
+//刷新
+const refresh = ({resetPage=false}={}) => {
+  resetPage ? localData.query.pageNum = 1 : null
+  getList()
+}
+//改变loading状态
+const updateLoading = (status) => {
+  localData.loading = status
+}
+//获取基础查询条件
+const getQuery = () => {
+  return localData.query
+}
+
+defineExpose({ refresh, updateLoading, getQuery, tableInstance })
+
+onMounted(() => {
+  getList()
+})
+ 
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/fvcomponents/fvTableColumn/index.vue

@@ -0,0 +1,58 @@
+<template>
+  <el-table-column 
+    v-bind="columns"
+  >
+    <template v-if="columns?.slots?.header" #header>
+      <slot :name="columns?.slots?.header"></slot>
+    </template>
+    <template #default="scope">
+      <template v-if="columns.children?.length">
+        <fvTableColumn 
+          v-for="columnChildren in columns.children"
+          :key="columnChildren.prop"
+          :columns="columnChildren"
+        >
+        </fvTableColumn>
+      </template>
+      <slot v-else-if="columns.slots?.default" :name="columns.slots?.default" v-bind="scope"></slot>
+      <component v-else-if="columns?.currentRender" :is="contentRender(columns?.currentRender, scope)"></component>
+      <template v-else-if="!['selection', 'index', 'expand'].includes(columns?.type)">
+        {{ renderCell(scope) }}
+      </template>
+    </template>
+  </el-table-column>
+</template>
+
+<script setup lang="jsx">
+import { isVNode } from 'vue'
+
+  defineOptions({
+    name: 'fvTableColumn',
+    inheritAttrs: false
+  })
+
+  const props = defineProps({
+    columns: {
+      type: Object,
+      default: []
+    }
+  })
+
+  const contentRender = (render, scope) => {
+    const content = render({row: unref(scope.row), index: scope.$index})
+    return isVNode(content) ? content : <span>{content || '!(^-^)!'}</span>
+  }
+
+  const renderCell = ({row, column, $index}) => {
+    const property = column.property
+    const value = property && row[property]
+    if(column && column?.formatter) {
+      return column.formatter(row, column, value, $index) || '--'
+    }
+    return value ? value.toString() : '--'
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/stores/userstore.js

@@ -46,6 +46,7 @@ export const useAuthStore = defineStore('auth', () => {
   return {
     userinfo,
     permisstions,
+    roles,
     casToken,
     userLogin,
     userLogout,

src/views/system/user/index.vue

@@ -1,541 +1,143 @@
 <template>
-  <div class="layout">
+  <fvSearchForm ref="form" :searchConfig="searchConfig" @search="search"></fvSearchForm>
-    <div class="layout-left" style="width: 20%;border:none;">
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
-      <el-form :model="queryDept" @submit.prevent>
-        <el-form-item prop="dictType">
-          <el-input v-model="queryDept.deptName" placeholder="请输入部门名称" :prefix-icon="Search"
-                    clearable @clear="handleSearchDept" @input="handleSearchDept"></el-input>
-        </el-form-item>
-      </el-form>
-      <div class="scrollbar-user scrollbar-dict">
-      <el-tree :data="deptList" :props="deptProps" empty-text="" node-key="value" default-expand-all
-               highlight-current :expand-on-click-node="false"
-               @node-click="handle">
-        <template #default="{ node, data }">
-          {{ node.label }}
-        </template>
-      </el-tree>
-        </div>
-    </div>
-    <div class="layout-right">
-      <el-form :model="queryParams" class="query-form" inline ref="userForm">
-        <el-form-item label="用户名称" prop="userName">
-          <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="手机号码" prop="phoneNumber">
-          <el-input
-              v-model="queryParams.phoneNumber"
-              placeholder="请输入手机号码"
-              clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="状态" prop="state">
-          <el-select
-              v-model="queryParams.state"
-              placeholder="用户状态"
-              clearable
-              filterable
-          >
-            <el-option
-                v-for="item in cacheStore.getDict('normal_disable')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="dateValue">
-          <el-config-provider>
-            <el-date-picker
-                v-model="dateValue"
-                type="datetimerange"
-                :shortcuts="shortcuts"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="YYYY-MM-DD HH:mm:ss"
-            />
-          </el-config-provider>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
-          <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <div class="table-header-btn">
-        <el-button type="primary" @click="handleAdd" :icon="Plus">新增</el-button>
-      </div>
-      <div class="table">
-        <el-table
-            :data="list"
-            row-key="userId"
-            :lazy="true"
-            v-loading="loading"
-            :header-cell-style="{'background':'#f5f5f8'}"
-            v-tabh
-        >
-          <el-table-column label="序号" type="index" align="center" width="60"/>
-          <!--          <el-table-column prop="userId" label="用户编号" align="center"/>-->
-          <el-table-column prop="userName" label="用户名称" align="center"/>
-          <el-table-column prop="nickName" label="用户昵称" align="center"/>
-          <el-table-column prop="departmentName" label="部门" align="center"/>
-          <el-table-column prop="mobile" label="手机号码" align="center"/>
-          <el-table-column prop="state" label="状态" align="center">
-            <template #default="scope">
-              <tag dict-type="normal_disable" :value="scope.row.state"/>
-            </template>
-          </el-table-column>
-          <el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
-          <el-table-column label="操作" align="center">
-            <template #default="scope">
-              <el-button type="primary" size="mini"
-                         @click="handleEdit(scope.row.userId)"  link>编辑
-              </el-button>
-              <popover-delete :name="scope.row.userName" :type="'用户'"
-                              @delete="handleDelete(scope.row.userId)"/>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-              :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-      <el-dialog v-model="isVisited" :title="title" width="700px">
-        <el-form :model="form" ref="formInstance" label-width="80px" :rules="rules">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="form.userName" placeholder="请输入用户名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="用户昵称" prop="nickName">
-                <el-input v-model="form.nickName" placeholder="请输入用户昵称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="用户性别" prop="sex">
-                <el-select v-model="form.sex"
-                           placeholder="请选择用户性别"
-                           style="width: 250px" filterable>
-                  <el-option
-                      v-for="item in cacheStore.getDict('user_sex')"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="用户密码" prop="password">
-                <el-input
-                    v-model="form.password"
-                    type="password"
-                    placeholder="请输入密码"
-                    show-password
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="归属部门" prop="deptId">
-                <el-tree-select
-                    ref="treeSelect"
-                    v-model="form.deptId"
-                    :data="deptList"
-                    :props="deptProps"
-                    value-key="value"
-                    check-strictly
-                    :render-after-expand="false"
-                    @node-click=""
-                    style="width: 250px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="手机号码" prop="phoneNumber">
-                <el-input v-model="form.phoneNumber" placeholder="请输入手机号码"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="邮箱" prop="email">
-                <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="状态" prop="state">
-                <el-radio-group v-model="form.state" size="mini">
-                  <el-radio v-for="user in cacheStore.getDict('normal_disable')" :key="user.value"
-                            :label="user.value">
-                    {{ user.label }}
-                  </el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="岗位" prop="postIds">
-                <el-select
-                    v-model="form.postIds"
-                    multiple
-                    placeholder="请选择岗位"
-                    style="width: 250px" filterable
-                >
-                  <div v-if="title=='新增用户'">
-                    <el-option
-                        v-for="item in postList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </div>
-                  <div v-else>
-                    <el-option
-                        v-for="item in form.postList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </div>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="角色" prop="roleIds">
-                <el-select v-model="form.roleIds"
-                           multiple
-                           placeholder="请选择角色"
-                           style="width: 250px" filterable>
-                  <div v-if="title=='新增用户'">
-                    <el-option
-                        v-for="item in roleList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </div>
-                  <div v-else>
-                    <el-option
-                        v-for="item in form.roleList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    />
-                  </div>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="备注" prop="remark">
-                <el-input
-                    type="textarea"
-                    :rows="3"
-                    maxlength="255"
-                    show-word-limit
-                    placeholder="请输入内容"
-                    v-model="form.remark">
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-      <span>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
-      </span>
-        </template>
-      </el-dialog>
-
-    </div>
-  </div>
 </template>
 
-<script setup>
+<script setup lang="jsx">
-import {Search, Refresh, Plus, Edit, Delete} from "@element-plus/icons-vue";
-import {defineProps} from "vue";
-import {getRoleOption} from "@/api/role/role";
-import {getUserList, getUserDetail, addUser, editUser,deleteUser} from "@/api/user/user";
-import {getDeptList} from "@/api/dept/dept";
-import {getSelectOption} from "@/api/post/post";
-import {ElMessage, ElMessageBox} from "element-plus";
-import {useCacheStore} from "@/stores/cache.js";
 import Tag from '@/components/Tag.vue'
-import Paging from "@/components/pagination/index.vue";
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import { useAuthStore } from '@/stores/userstore.js'
+import { getDeptOpt, getSubCompOpt } from '../../../api/user/user';
 
-const cacheStore = useCacheStore();
+const authStore = useAuthStore()
-//查询参数
+
-const queryDept = reactive({
+const localData = reactive({
-  deptName: ""
+  deptOption:[],
-});
+  subCompanyOpt:[],
-const queryParams = reactive({
+})
-  deptId: "",
+
-  userName: "",
+const deptOption = ref([])
-  phoneNumber: "",
+const subCompanyOpt = ref([])
-  state: "",
+
-  startTime: "",
+const searchConfig = ref([
-  endTime: ""
-});
-const userForm = ref();
-const list = ref([]);
-const total = ref([]);
-//页面信息
-const pageInfo = reactive({
-  pageNum: 1,
-  pageSize: 10
-});
-const loading = ref(true);
-const treeSelect = ref();
-const postList = ref([]);
-const roleList = ref([]);
-const deptList = ref([]);
-const deptProps = reactive({
-  value: "deptId",
-  label: "deptName"
-});
-const props = defineProps({
-  value: {
-    type: Array,
-    default: () => {
-      return [];
-    }
-  }
-});
-const form = ref({
-  // user: [],
-  // postIds: "",
-  // roleIds: "",
-  roleList: [],
-  postList: []
-});
-const formInstance = ref();
-const isVisited = ref(false);
-const title = ref("");
-const rules = reactive({
-  nickName: [
-    {required: true, message: "请输入用户昵称", trigger: "blur"}
-  ],
-  userName: [
-    {required: true, message: "请输入用户名称", trigger: "blur"}
-  ],
-  password: [
-    {required: true, message: "请输入用户密码", trigger: "blur"}
-  ]
-});
-const dateValue = ref();
-const shortcuts = [
   {
-    text: "上周",
+    label: '子公司ID',
-    value: () => {
+    prop: 'subCompanyId',
-      const end = new Date();
+    component: shallowRef(fvSelect),
-      const start = new Date();
+    props: {
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      placeholder: '请输入',
-      return [start, end];
+      clearable: true,
+      options: [],
+      filterable: true
     }
   },
   {
-    text: "上月",
+    label: '部门ID',
-    value: () => {
+    prop: 'departmentId',
-      const end = new Date();
+    component: 'el-cascader',
-      const start = new Date();
+    props: {
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      placeholder: '请选择',
-      return [start, end];
+      clearable: true,
+      options: [],
+      filterable: true
     }
   },
   {
-    text: "三月前",
+    label: '用户账号',
-    value: () => {
+    prop: 'userName',
-      const end = new Date();
+    component: 'el-input',
-      const start = new Date();
+    props: {
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+      placeholder: '请输入',
-      return [start, end];
+      clearable: true
     }
+  },
+  {
+    label: '状态',
+    prop: 'state',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请输入',
+      cacheKey: 'normal_disable',
+      clearable: true
+    }
+  },
+])
+
+const tableIns = ref()
+
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'userName',
+      label: '用户名称',
+      align: 'center',
+    },
+    {
+      prop: 'nickName',
+      label: '用户昵称',
+      align: 'center',
+    },
+    {
+      prop: 'subCompanyName',
+      label: '子公司名称',
+      align: 'center',
+    },
+    {
+      prop: 'jobActivityDesc',
+      label: '岗位名称',
+      align: 'center',
+    },
+    {
+      prop: 'departmentName',
+      label: '部门',
+      align: 'center',
+    },
+    {
+      prop: 'mobile',
+      label: '手机号码',
+      align: 'center',
+    },
+    {
+      prop: 'state',
+      label: '状态',
+      align: 'center',
+      currentRender: ({row, index}) => (<Tag dictType={'normal_disable'} value={row.state} />)
+    },
+    {
+      prop: 'createTime',
+      label: '创建时间',
+      align: 'center',
+    },
+  ],
+  api: '/admin/mosr/user',
+  params: {}
+})
+
+const init = async () => {
+  // deptOption.value = await getDeptOpt()
+  console.log(authStore.roles,'userinfo');
+  if(!authStore.roles.includes('superAdmin')) {
+    searchConfig.value = searchConfig.value.slice(1)
   }
-];
+  searchConfig.value = searchConfig.value
-//获取部门数据
-const getDepartmentList = async () => {
-  let params = {
-    ...queryDept
-  };
-  //获取部门信息
-  getDeptList(params).then(res => {
-    if (res.code === 1000) {
-      deptList.value = res.data;
-    } else {
-      ElMessage.error(res.msg);
-    }
-  });
-};
-//获取用户数据
-const getList = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  };
-  const date = dateValue.value
-  if (date !== undefined && date !== null) {
-    params.startTime = date[0]
-    params.endTime = date[1]
-  }
-  loading.value = true
-  getUserList(params).then(res => {
-    if (res.code === 1000) {
-      list.value = res.data.rows;
-      total.value = res.data.total;
-      loading.value = false;
-    } else {
-      ElMessage.error(res.msg);
-    }
-  });
-};
-const getRole = () => {
-  getRoleOption().then(res => {
-    if (res.code === 1000) {
-      roleList.value = res.data;
-    }
-  });
-};
-const getPost= async () => {
-  getSelectOption().then(res => {
-    if (res.code === 1000) {
-      postList.value = res.data;
-    }
-  })
-}
-//搜索部门
-const handleSearchDept = () => {
-  getDepartmentList();
-};
-//点击部门节点筛选数据
-const handle = (node) => {
-  queryParams.deptId = node.deptId;
-  getList();
-};
 
-//用户搜索重置
+  const { data } = await getDeptOpt()
-const handleReset = () => {
+  searchConfig.value.find(item=>item.prop == 'departmentId').props.options = data
-  dateValue.value = [];
+  // searchConfig[1].props.options = data
-  userForm.value.resetFields();
+  const res = await getSubCompOpt()
-  getList();
+  searchConfig.value.find(item=>item.prop == 'subCompanyId').props.options = res.data
-};
-const restForm = () => {
-  form.value = {
-    roleList: [],
-    postList: [],
-    userName: null,
-    nickName: null,
-    deptId: null,
-    phoneNumber: null,
-    email: null,
-    password: null,
-    sex: null,
-    state: "1",
-    postIds: [],
-    roleIds: [],
-    remark: null,
-  };
-};
-//新增用户
-const handleAdd = () => {
-  rules.password[0].required = true
-  restForm();
-  getRole();
-  getPost()
-  title.value = "新增用户";
-  isVisited.value = true;
-  nextTick(()=>{
-    // 清空校验
-    formInstance.value.clearValidate()
-  })
-};
-
-//修改用户
-const handleEdit = (userId) => {
-  restForm();
-  getRole();
-  getPost()
-  //查看详情
-  getUserDetail(userId).then(res => {
-    if (res.code === 1000) {
-      rules.password[0].required = false
-      form.value = res.data.user;
-      form.value.roleIds = res.data.roleIds;
-      form.value.postIds = res.data.postIds;
-      form.value.roleList = res.data.roleList;
-      form.value.postList = res.data.postList;
-      title.value = "修改用户";
-      isVisited.value = true;
-      nextTick(()=>{
-        // 清空校验
-        formInstance.value.clearValidate()
-      })
-    }
-  });
-};
-//删除功能
-const handleDelete = (userId) => {
-  // ElMessageBox.confirm(`确认删除用户名称为${row.userName}的数据吗?`, "系统提示", {
-  //   confirmButtonText: "确定",
-  //   cancelButtonText: "取消",
-  //   type: "warning"
-  // }).then(() => {
-    deleteUser(userId).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg);
-        getList();
-      } else {
-        ElMessage.error(res.msg);
-      }
-    });
-  // });
-};
-
-//取消
-const handleCancel = () => {
-  restForm();
-  isVisited.value = false;
-};
-//提交
-const handleSubmit = async (formInstance) => {
-  if (!formInstance) return;
-  formInstance.validate(async (valid) => {
-    if (!valid) return;
-    if (title.value === "新增用户") {
-      addUser(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg);
-          getList();
-          isVisited.value = false;
-        } else {
-          ElMessage.error(res.msg);
-        }
-      });
-    } else {
-      editUser(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg);
-          getList();
-          isVisited.value = false;
-        } else {
-          ElMessage.error(res.msg);
-        }
-      });
-    }
-  })
 }
 
-//切换每页显示条数
+init()
-const handleSizeChange = (val) => {
-  pageInfo.pageSize = val;
-  getList();
-};
 
-//点击页码进行分页功能
+const search = (val) => {
-const handleCurrentChange = (val) => {
+  tableConfig.params = {...val}
-  pageInfo.pageNum = val;
+  tableIns.value.refresh()
-  getList();
+}
-};
+
-getDepartmentList();
+const headBtnClick = (key) => {}
-getList();
 </script>
+
+<style lang="scss" scoped>
+
+</style>

vite.config.js

@@ -28,6 +28,7 @@ export default defineConfig({
       ],
     }),
     Components({
+      dirs: ['src/components', 'src/fvcomponents'],
       resolvers: [
         // 自动注册图标组件
         IconsResolver({