Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

src/permission.js

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

src/router/modules/remaining.ts

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

src/views/Basic/Dept/DeptForm.vue

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

src/views/Basic/Role/Comp/ReportDaily.vue

@@ -1,7 +1,140 @@
 <template>
-  <div> 每日快报 </div>
+  <div class="pl-20px pr-20px">
+    <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>
 
-<script setup name="ReportDaily"></script>
+<script setup name="ReportDaily">
+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>

src/views/Basic/Role/index.vue

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

src/views/Login/MPLogin.vue

@@ -0,0 +1,65 @@
+<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-9的参数值，最多128字节
+})
+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>