Compare commits

..

No commits in common. '9472c5ea56bd4f98b93ff0b579e53a57ba714b1f' and '4f150b0912c62329c3831bfb5959b8d8281b607d' have entirely different histories.

  1. 10
      src/permission.js
  2. 10
      src/router/modules/remaining.ts
  3. 190
      src/views/Basic/Dept/DeptForm.vue
  4. 137
      src/views/Basic/Role/Comp/ReportDaily.vue
  5. 12
      src/views/Basic/Role/index.vue
  6. 65
      src/views/Login/MPLogin.vue

@ -14,15 +14,7 @@ const { start, done } = useNProgress()
const { loadStart, loadDone } = usePageLoading() const { loadStart, loadDone } = usePageLoading()
// 路由不重定向白名单 // 路由不重定向白名单
const whiteList = [ const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/swagger']
'/login',
'/mp-login',
'/social-login',
'/auth-redirect',
'/bind',
'/register',
'/swagger'
]
// 路由加载前 // 路由加载前
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {

@ -161,16 +161,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
noTagsView: true noTagsView: true
} }
}, },
{
path: '/mp-login',
component: () => import('@/views/Login/MPLogin.vue'),
name: 'MPLogin',
meta: {
hidden: true,
title: '用户绑定',
noTagsView: true
}
},
{ {
path: '/sso', path: '/sso',
component: () => import('@/views/Login/Login.vue'), component: () => import('@/views/Login/Login.vue'),

@ -1,129 +1,76 @@
<template> <template>
<Dialog v-model="dialogVisible" :title="dialogTitle" width="800px"> <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
<el-tabs v-model="tabIndex"> <el-form
<el-tab-pane label="基础信息" :name="1"> ref="formRef"
<el-form v-loading="formLoading"
ref="formRef" :model="formData"
v-loading="formLoading" :rules="formRules"
:model="formData" label-width="80px"
:rules="formRules" >
label-width="80px" <el-row :gutter="20">
> <el-col :span="12" :offset="0">
<el-row :gutter="20"> <el-form-item label="上级部门" prop="parentId">
<el-col :span="12" :offset="0"> <el-tree-select
<el-form-item label="上级部门" prop="parentId"> v-model="formData.parentId"
<el-tree-select :data="deptTree"
v-model="formData.parentId" :props="defaultProps"
:data="deptTree" check-strictly
:props="defaultProps" default-expand-all
check-strictly placeholder="请选择上级部门"
default-expand-all value-key="deptId"
placeholder="请选择上级部门"
value-key="deptId"
/>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="部门名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入部门名称" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12" :offset="0">
<el-form-item label="负责人" prop="leaderUserId">
<el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
<el-option
v-for="item in userList"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="0"> 启用 </el-radio>
<el-radio :label="1"> 禁用 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12" :offset="0">
<el-form-item label="排序" prop="sort">
<el-input-number v-model="formData.sort" :min="0" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24" :offset="0">
<el-form-item label="备注" prop="remark">
<Editor v-model:modelValue="formData.remark" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane label="业务指标" :name="2">
<el-form :model="formData" label-width="auto">
<el-form-item label="每日跟进指标数">
<el-input-number
v-model="formData.followDaliyNum"
:controls="false"
style="width: 150px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="跟进指标生效日期"> </el-col>
<el-date-picker <el-col :span="12" :offset="0">
v-model="formData.effectDate" <el-form-item label="部门名称" prop="name">
type="date" <el-input v-model="formData.name" placeholder="请输入部门名称" />
placeholder="选择日期时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
style="width: 150px"
/>
</el-form-item> </el-form-item>
</el-form> </el-col>
<el-divider direction="horizontal" content-position="left">成交额指标</el-divider> </el-row>
<el-button class="mb-10px" type="primary" @click="taskList.push({})">添加年份</el-button> <el-row :gutter="20">
<el-table :data="taskList" border> <el-col :span="12" :offset="0">
<el-table-column label="年份" width="120"> <el-form-item label="负责人" prop="leaderUserId">
<template #default="{ row }"> <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
<el-date-picker <el-option
v-model="row.year" v-for="item in userList"
type="year" :key="item.id"
placeholder="选择年份" :label="item.nickname"
size="small" :value="item.id"
format="YYYY"
value-format="YYYY"
style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column v-for="col in 12" :key="col" :label="`${col}月`" width="100px">
<template #default="{ row }">
<el-input-number
v-model="row[`month${col}`]"
size="small"
:controls="false"
style="width: 100%"
/> />
</template> </el-select>
</el-table-column> </el-form-item>
</el-table> </el-col>
</el-tab-pane> <el-col :span="12" :offset="0">
</el-tabs> <el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="0"> 启用 </el-radio>
<el-radio :label="1"> 禁用 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12" :offset="0">
<el-form-item label="排序" prop="sort">
<el-input-number v-model="formData.sort" :min="0" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24" :offset="0">
<el-form-item label="备注" prop="remark">
<Editor v-model:modelValue="formData.remark" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer> <template #footer>
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="dialogVisible = false"> </el-button> <el-button @click="dialogVisible = false"> </el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script name="SystemDeptForm" setup> <script lang="ts" name="SystemDeptForm" setup>
import { defaultProps, handleTree } from '@/utils/tree' import { defaultProps, handleTree } from '@/utils/tree'
import * as DeptApi from '@/api/system/dept' import * as DeptApi from '@/api/system/dept'
import * as UserApi from '@/api/system/user' import * as UserApi from '@/api/system/user'
@ -134,9 +81,6 @@ const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // const dialogVisible = ref(false) //
const dialogTitle = ref('') // const dialogTitle = ref('') //
const tabIndex = ref(1)
const formLoading = ref(false) // 12 const formLoading = ref(false) // 12
const formType = ref('') // create - update - const formType = ref('') // create - update -
const formData = ref({ const formData = ref({
@ -148,7 +92,7 @@ const formData = ref({
status: CommonStatusEnum.ENABLE, status: CommonStatusEnum.ENABLE,
remark: undefined remark: undefined
}) })
const formRules = reactive({ const formRules = reactive<any>({
parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }], parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }], name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }], sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
@ -160,10 +104,10 @@ const formRules = reactive({
}) })
const formRef = ref() // Ref const formRef = ref() // Ref
const deptTree = ref() // const deptTree = ref() //
const userList = ref([]) // const userList = ref<UserApi.UserVO[]>([]) //
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type, id) => { const open = async (type: string, id?: number) => {
dialogVisible.value = true dialogVisible.value = true
dialogTitle.value = t('action.' + type) dialogTitle.value = t('action.' + type)
formType.value = type formType.value = type
@ -194,7 +138,7 @@ const submitForm = async () => {
// //
formLoading.value = true formLoading.value = true
try { try {
const data = formData.value const data = formData.value as unknown as DeptApi.DeptVO
if (formType.value === 'create') { if (formType.value === 'create') {
await DeptApi.createDept(data) await DeptApi.createDept(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
@ -228,10 +172,8 @@ const resetForm = () => {
const getTree = async () => { const getTree = async () => {
deptTree.value = [] deptTree.value = []
const data = await DeptApi.getSimpleDeptList() const data = await DeptApi.getSimpleDeptList()
let dept = { id: 0, name: '顶级部门', children: [] } let dept: Tree = { id: 0, name: '顶级部门', children: [] }
dept.children = handleTree(data) dept.children = handleTree(data)
deptTree.value.push(dept) deptTree.value.push(dept)
} }
const taskList = ref([])
</script> </script>

@ -1,140 +1,7 @@
<template> <template>
<div class="pl-20px pr-20px"> <div> 每日快报 </div>
<el-form :model="form" ref="formRef" :rules="rules" label-width="auto" v-loading="formLoading">
<el-form-item label="开启通知">
<el-radio-group v-model="form.kaiqitongzhi">
<el-radio :label="1"> 开启 </el-radio>
<el-radio :label="0"> 关闭 </el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="发送途径">
<el-checkbox-group v-model="form.fasongtujing">
<el-checkbox :label="1">系统通知</el-checkbox>
<el-checkbox :label="2">微信公众号</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="发送时间">
<el-time-picker
v-model="form.sendTime"
placeholder="任意时间点"
format="HH:mm:ss"
value-format="HH:mm:ss"
/>
</el-form-item>
<el-form-item label="发送内容">
<el-tree
ref="treeRef"
:data="contentOptions"
empty-text="加载中,请稍候"
node-key="value"
show-checkbox
default-expand-all
:default-checked-keys="form.sendContent"
style="width: 100%"
/>
</el-form-item>
<el-form-item>
<el-button :disabled="formLoading" type="primary" @click="submitForm"> </el-button>
</el-form-item>
</el-form>
</div>
</template> </template>
<script setup name="ReportDaily"> <script setup name="ReportDaily"></script>
import { handleTree } from '@/utils/tree'
const message = useMessage() //
const props = defineProps({
roleId: {
type: Number
}
})
const formLoading = ref(false)
const form = ref({
checkedMenuIds: []
})
onMounted(() => {
init()
})
const formRef = ref()
const rules = {}
const contentOptions = ref([])
async function init() {
getOptions()
getReportInfo()
}
const treeRef = ref()
function getOptions() {
const arr = [
{
value: 1,
label: '销售快报',
children: [
{ value: 11, label: '今日跟进线索数', pId: 1 },
{ value: 12, label: '今日待跟进数', pId: 1 },
{ value: 13, label: '今日接受线索数', pId: 1 }
]
},
{
value: 2,
label: '管理快报',
children: [
{ value: 21, label: '当日业绩(成交数,成交额)', pId: 2 },
{ value: 22, label: '当月业绩(成交数,成交额)', pId: 2 },
{ value: 23, label: '本月业绩完成情况(数值,比例)', pId: 2 }
]
}
]
contentOptions.value = arr
handleTree(arr)
}
async function getReportInfo() {
try {
formLoading.value = true
form.value = {
kaiqitongzhi: 1,
fasongtujing: [1, 2],
sendTime: '21:00:00',
sendContent: [21, 22, 23]
}
formLoading.value = false
} catch (error) {
console.log(error)
formLoading.value = false
}
}
/** 提交表单 */
const submitForm = async () => {
//
formLoading.value = true
try {
const data = {
roleId: props.roleId,
menuIds: [
...treeRef.value.getCheckedKeys(false), //
...treeRef.value.getHalfCheckedKeys() //
]
}
// await PermissionApi.assignRoleMenu(data)
console.log(data)
message.success('保存成功')
} finally {
formLoading.value = false
}
}
</script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>

@ -75,13 +75,9 @@
@success="getList" @success="getList"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="每日快报" :name="4"> <!-- <el-tab-pane label="每日快报" :name="4">
<ReportDaily <ReportDaily />
v-if="roleOperateIndex == 4" </el-tab-pane> -->
ref="reportDailyRef"
:roleId="list[libraryIndex].id"
/>
</el-tab-pane>
</el-tabs> </el-tabs>
</el-card> </el-card>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
@ -93,7 +89,7 @@ import RoleForm from './RoleForm.vue'
import RoleEmployee from './Comp/RoleEmployee.vue' import RoleEmployee from './Comp/RoleEmployee.vue'
import RoleAssignMenuForm from './RoleAssignMenuForm.vue' import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
import RoleDataPermissionForm from './RoleDataPermissionForm.vue' import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
import ReportDaily from './Comp/ReportDaily.vue' // import ReportDaily from './Comp/ReportDaily.vue'
import * as RoleApi from '@/api/system/role' import * as RoleApi from '@/api/system/role'
const message = useMessage() // const message = useMessage() //

@ -1,65 +0,0 @@
<template>
<div class="p-20px">
<p class="mb-30px font-bold text-20px">微信授权登陆</p>
<el-form :model="form" ref="formRef" :rules="rules" label-width="auto">
<el-form-item label="用户名" prop="username">
<el-input v-model="form.username" placeholder="请输入用户名" />
</el-form-item>
<el-form-item label="密码" prop="password">
<el-input v-model="form.password" placeholder="请输入密码" show-password type="password" />
</el-form-item>
</el-form>
<el-button type="primary" class="w-full" @click="onSubmit">授权登陆</el-button>
<div v-if="form.code">code: {{ form.code }}</div>
</div>
</template>
<script setup name="MPLogin">
const form = ref({
code: undefined,
username: undefined,
password: undefined
})
const formRef = ref()
const rules = {
username: { required: true, message: '用户名不可为空', trigger: 'blur' },
password: { required: true, message: '密码不可为空', trigger: 'blur' }
}
//
const WX_AUTH_URL = 'https://open.weixin.qq.com/connect/oauth2/authorize?'
// -
const REDIRECT = '#wechat_redirect'
const params = ref({
appid: 'wxf87aa1f474c0494f', // APP ID
redirect_uri: ``, // 使 urlEncode
response_type: 'code', //
scope: 'snsapi_base' // snsapi_base open id snsapi_userinfo
// state:'code', // a-zA-Z0-9128
})
function onSubmit() {
// code
if (!form.value.code) {
const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
location.href = access_url
} else {
alert(`授权成功!`)
}
}
onMounted(() => {
const uri = location.origin + location.pathname
params.value.redirect_uri = encodeURI(uri)
//
const param = new URLSearchParams(location.search)
form.value.code = param.get('code')
if (!form.value.code) {
const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
location.href = access_url
}
})
</script>
<style lang="scss" scoped></style>
Loading…
Cancel
Save