更新密码找回uniapp
This commit is contained in:
1 parent
7f9a66da0f
commit
3fdda89833
1304 files changed
+3503
-26132
No files matched your search
@@ -4,7 +4,6 @@
|
||||
import { getGuestToken } from '@/utils/guest.js'
|
||||
|
||||
const LOGIN_PAGE = '/pages/login/login'
|
||||
// 不需要登录即可停留的页面:门户首页(默认落地)/ 登录 / 注册 / 忘记密码 / 人机验证 / 小程序码确认页 / 启动跳板页
|
||||
const PUBLIC_ROUTES = [
|
||||
'pages/nav/nav',
|
||||
'pages/login/login',
|
||||
@@ -15,7 +14,6 @@
|
||||
'pages/index/index'
|
||||
]
|
||||
|
||||
/** 当前页面路由(取不到时返回空串,交给页面级检测兜底) */
|
||||
function currentRoute() {
|
||||
try {
|
||||
const pages = getCurrentPages()
|
||||
@@ -27,10 +25,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
/** 未登录一律回登录页:覆盖「切后台回来」「从其他入口直接进内页」等场景。
|
||||
* 游客令牌(手机号授权签发)可停留任意页面:免登录范围由菜单级配置决定,
|
||||
* 能进哪些页、能调哪些接口由后端公开菜单与控制器 guest 分支兜底;
|
||||
* 无令牌时回门户 nav 触发授权引导,而不是直接甩进登录页。 */
|
||||
function ensureLogin() {
|
||||
const route = currentRoute()
|
||||
if (!route || PUBLIC_ROUTES.indexOf(route) !== -1) return
|
||||
@@ -68,9 +62,6 @@
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
/* 全局统一 border-box:必须显式覆盖 scroll-view / swiper / input 等盒元素,
|
||||
否则它们 width:100% + padding 会按 content-box 溢出视口(小程序端高发),
|
||||
导致带左右内边距的列表/弹层右侧内容被裁切。 */
|
||||
view,
|
||||
text,
|
||||
scroll-view,
|
||||
@@ -84,11 +75,6 @@
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
/* ============ 全局自适应(宽屏:桌面 / 平板 H5)============
|
||||
说明:手机竖屏 CSS 宽度普遍 < 560px,此断链不会命中,App / 小程
|
||||
序 / 手机 H5 行为完全不变;仅在宽屏下把整个应用收敛为居中的手机列,
|
||||
避免页面铺满超宽屏、两侧大片留白。配合 pages.json 的 rpx 上限,
|
||||
无需逐页适配。 */
|
||||
@media (min-width: 560px) {
|
||||
body {
|
||||
background: #e9edf3;
|
||||
|
||||
+6
-52
@@ -1,16 +1,5 @@
|
||||
/**
|
||||
* 自定义审批流(移动端)接口封装。
|
||||
* 对应后端 go/controllers/app_approval.go 的 /api/oa/approval/* 接口。
|
||||
*
|
||||
* 数据模型:yz_approval_instance(实例)+ yz_approval_task(任务)。
|
||||
* 与 Web 端 /backend/approval/* 共用同一套数据与 services/approval 引擎,
|
||||
* 仅鉴权放宽为 app 令牌(oaClaims)。
|
||||
*/
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
// ============================ 常量 ============================
|
||||
|
||||
/** 实例状态:0-草稿 1-审批中 2-已通过 3-已驳回 4-已撤回 5-已取消 */
|
||||
export const APPROVAL_INSTANCE_STATUS_OPTIONS = [
|
||||
{ value: 0, label: '草稿' },
|
||||
{ value: 1, label: '审批中' },
|
||||
@@ -20,7 +9,6 @@ export const APPROVAL_INSTANCE_STATUS_OPTIONS = [
|
||||
{ value: 5, label: '已取消' }
|
||||
]
|
||||
|
||||
/** 任务状态:0-待审批 1-已通过 2-已驳回 3-已退回 4-已跳过 5-已超时 6-已通知 */
|
||||
export const APPROVAL_TASK_STATUS_OPTIONS = [
|
||||
{ value: 0, label: '待审批' },
|
||||
{ value: 1, label: '已通过' },
|
||||
@@ -31,20 +19,18 @@ export const APPROVAL_TASK_STATUS_OPTIONS = [
|
||||
{ value: 6, label: '已通知' }
|
||||
]
|
||||
|
||||
/** 多签方式:1-或签(任一通过)2-会签(全部通过) */
|
||||
export const APPROVAL_MULTI_MODE_OPTIONS = [
|
||||
{ value: 1, label: '或签' },
|
||||
{ value: 2, label: '会签' }
|
||||
]
|
||||
|
||||
/** uview-plus u-tag 类型映射 */
|
||||
const APPROVAL_STATUS_TAG = {
|
||||
0: 'info', // 草稿
|
||||
1: 'warning', // 审批中
|
||||
2: 'success', // 已通过
|
||||
3: 'error', // 已驳回
|
||||
4: 'info', // 已撤回
|
||||
5: 'info' // 已取消
|
||||
0: 'info',
|
||||
1: 'warning',
|
||||
2: 'success',
|
||||
3: 'error',
|
||||
4: 'info',
|
||||
5: 'info'
|
||||
}
|
||||
|
||||
const APPROVAL_TASK_TAG = {
|
||||
@@ -57,8 +43,6 @@ const APPROVAL_TASK_TAG = {
|
||||
6: 'info'
|
||||
}
|
||||
|
||||
// ============================ 工具函数 ============================
|
||||
|
||||
function labelOf(options, value, fallback = '') {
|
||||
const hit = options.find(item => item.value === Number(value))
|
||||
return hit ? hit.label : fallback
|
||||
@@ -84,13 +68,6 @@ export function getApprovalMultiModeLabel(value) {
|
||||
return labelOf(APPROVAL_MULTI_MODE_OPTIONS, value, '或签')
|
||||
}
|
||||
|
||||
// ============================ 我的发起 ============================
|
||||
|
||||
/**
|
||||
* 获取我发起的审批实例列表(移动端「我的发起」页面)。
|
||||
* 入参:page / pageSize / keyword / status / biz_type
|
||||
* 返回:{ list, total, page, pageSize }
|
||||
*/
|
||||
export async function fetchApprovalList(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/oa/approval/list',
|
||||
@@ -110,12 +87,6 @@ export async function fetchApprovalList(params = {}) {
|
||||
}
|
||||
}
|
||||
|
||||
// ============================ 待我审批 ============================
|
||||
|
||||
/**
|
||||
* 获取我作为审批人的待办列表(移动端「待我审批」)。
|
||||
* 每条 task 包含当前实例的基本信息(task.instance 字段)。
|
||||
*/
|
||||
export async function fetchApprovalTodoList(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/oa/approval/todo',
|
||||
@@ -132,12 +103,6 @@ export async function fetchApprovalTodoList(params = {}) {
|
||||
}
|
||||
}
|
||||
|
||||
// ============================ 详情 ============================
|
||||
|
||||
/**
|
||||
* 获取审批详情(含实例 + 任务时间线 + 权限标志)。
|
||||
* 返回结构:{ item, timeline, can_approve, can_withdraw, current_task_id }
|
||||
*/
|
||||
export async function fetchApprovalDetail(id) {
|
||||
if (!id) {
|
||||
throw new Error('缺少审批ID')
|
||||
@@ -153,14 +118,6 @@ export async function fetchApprovalDetail(id) {
|
||||
}
|
||||
}
|
||||
|
||||
// ============================ 审批 / 撤回 ============================
|
||||
// 说明:审批不允许在此处「自由发起」,统一由具体业务模块提交
|
||||
// (如报销单在「报销管理」提交后自动进入审批流),本模块只负责查询与处理。
|
||||
|
||||
/**
|
||||
* 审批人通过 / 驳回任务。
|
||||
* payload: { task_id, pass, comment }
|
||||
*/
|
||||
export async function approveTask(payload) {
|
||||
return request({
|
||||
url: '/api/oa/approval/approve',
|
||||
@@ -173,9 +130,6 @@ export async function approveTask(payload) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 发起人撤回审批(仅审批中可撤回)。
|
||||
*/
|
||||
export async function withdrawApproval(id) {
|
||||
if (!id) throw new Error('缺少审批ID')
|
||||
return request({
|
||||
|
||||
+40
-60
@@ -1,9 +1,5 @@
|
||||
/**
|
||||
* 移动端认证接口 — 对接 Go /api/*
|
||||
*/
|
||||
import { request, requestRaw } from '@/api/request.js'
|
||||
|
||||
/** 账号密码登录(旧:租户端直登) */
|
||||
export function login(data) {
|
||||
return request({
|
||||
url: '/api/login',
|
||||
@@ -12,16 +8,7 @@ export function login(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/* ==================== 统一认证中心(UAC) ====================
|
||||
* APP / 小程序不走浏览器跳转,直接用密码直连模式:
|
||||
* POST /auth/login 拿 access + refresh,多企业时再调 switch-tenant。
|
||||
* 开关:默认即为统一认证,VITE_AUTH_MODE=legacy 时回退旧直登
|
||||
* (见 utils/auth.js 的 isSSOEnabled)
|
||||
* ============================================================ */
|
||||
|
||||
/** 统一认证:账号密码登录 */
|
||||
export function loginUAC(data) {
|
||||
// 小程序端与一键登录同用 yz-miniapp:后端据此跳过极验(小程序无 SDK 支持)
|
||||
let clientId = 'yz-uniapp'
|
||||
// #ifdef MP-WEIXIN
|
||||
clientId = 'yz-miniapp'
|
||||
@@ -33,7 +20,6 @@ export function loginUAC(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 统一认证:选择/切换企业(一人多企业) */
|
||||
export function switchTenant(data) {
|
||||
let clientId = 'yz-uniapp'
|
||||
// #ifdef MP-WEIXIN
|
||||
@@ -46,7 +32,6 @@ export function switchTenant(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 统一认证:拉取当前登录用户(userinfo,返回扁平结构无 code 包装) */
|
||||
export function fetchUserInfo() {
|
||||
return request({
|
||||
url: '/auth/userinfo',
|
||||
@@ -55,7 +40,6 @@ export function fetchUserInfo() {
|
||||
})
|
||||
}
|
||||
|
||||
/** 统一认证:登录人机验证配置(极验 captcha_id 等) */
|
||||
export function getAuthVerifyConfig(params = {}) {
|
||||
return request({
|
||||
url: '/auth/verify-config',
|
||||
@@ -66,7 +50,6 @@ export function getAuthVerifyConfig(params = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 统一认证:单点登出(吊销会话与令牌) */
|
||||
export function logoutUAC() {
|
||||
return request({
|
||||
url: '/auth/logout',
|
||||
@@ -76,11 +59,6 @@ export function logoutUAC() {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 申请「移动端免登录票据」:用当前登录态换一个一次性票据,
|
||||
* Web 端拿它换自己的令牌,实现移动端打开 Web 功能页时不二次登录。
|
||||
* 票据一次性、60 秒有效。
|
||||
*/
|
||||
export function createAppTicket(clientId = 'yz-backend') {
|
||||
return request({
|
||||
url: '/auth/app-ticket',
|
||||
@@ -91,12 +69,6 @@ export function createAppTicket(clientId = 'yz-backend') {
|
||||
})
|
||||
}
|
||||
|
||||
/* ==================== 微信小程序一键登录 ====================
|
||||
* 仅小程序端可用:uni.login 拿 code + getPhoneNumber 拿动态 code,
|
||||
* 由服务端换取 openid / 手机号并定位统一身份,签发同一套 UAC 令牌。
|
||||
* ============================================================ */
|
||||
|
||||
/** 小程序登录是否已开通(未开通时前端隐藏一键登录入口) */
|
||||
export function getMiniappLoginConfig() {
|
||||
return request({
|
||||
url: '/auth/wechat/miniapp/config',
|
||||
@@ -106,10 +78,6 @@ export function getMiniappLoginConfig() {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 小程序一键登录
|
||||
* @param {{ code: string, phoneCode?: string }} params code=uni.login 的 code;phoneCode=getPhoneNumber 的动态 code
|
||||
*/
|
||||
export function loginByMiniapp({ code, phoneCode = '' } = {}) {
|
||||
return request({
|
||||
url: '/auth/wechat/miniapp/login',
|
||||
@@ -122,11 +90,6 @@ export function loginByMiniapp({ code, phoneCode = '' } = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 小程序端确认注册:网页注册页展示的小程序码扫码进入本页,
|
||||
* 用户点确认后由服务端把 openid 绑定到该注册会话,网页端即可继续注册。
|
||||
* @param {{ scene: string, code: string, phoneCode?: string, appid?: string }} params
|
||||
*/
|
||||
export function confirmMiniappRegister({ scene, code, phoneCode = '', appid = '' } = {}) {
|
||||
return request({
|
||||
url: '/auth/register/mini/confirm',
|
||||
@@ -135,10 +98,6 @@ export function confirmMiniappRegister({ scene, code, phoneCode = '', appid = ''
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 已登录态下把当前微信 openid 绑定到该账号(静默调用,失败不提示)。
|
||||
* 小程序认证中 / 未开通手机号能力时,一键登录靠这条绑定按 openid 认人。
|
||||
*/
|
||||
export function bindMiniapp(data) {
|
||||
return request({
|
||||
url: '/auth/wechat/miniapp/bind',
|
||||
@@ -149,7 +108,6 @@ export function bindMiniapp(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 统一认证:刷新访问令牌 */
|
||||
export function refreshTokenUAC(data) {
|
||||
return request({
|
||||
url: '/auth/token',
|
||||
@@ -160,7 +118,6 @@ export function refreshTokenUAC(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 统一认证:吊销令牌(登出) */
|
||||
export function revokeUAC(data = {}) {
|
||||
return request({
|
||||
url: '/auth/revoke',
|
||||
@@ -171,7 +128,6 @@ export function revokeUAC(data = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 发送登录验证码(账号二次校验用,需后台开启验证) */
|
||||
export function sendLoginCode(data) {
|
||||
return request({
|
||||
url: '/api/sendLoginCode',
|
||||
@@ -180,7 +136,6 @@ export function sendLoginCode(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 手机号验证码登录 */
|
||||
export function loginBySms(data) {
|
||||
return request({
|
||||
url: '/api/loginBySms',
|
||||
@@ -189,7 +144,6 @@ export function loginBySms(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 退出登录(后端无状态,失败可忽略;短超时避免卡住) */
|
||||
export function logoutApi(data = {}) {
|
||||
return request({
|
||||
url: '/api/logout',
|
||||
@@ -200,7 +154,6 @@ export function logoutApi(data = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 当前用户信息 */
|
||||
export function getCurrentUser() {
|
||||
return request({
|
||||
url: '/api/currentUser',
|
||||
@@ -208,7 +161,6 @@ export function getCurrentUser() {
|
||||
})
|
||||
}
|
||||
|
||||
/** 修改当前用户资料:{ name, email };手机号由微信验证,只读不传 */
|
||||
export function updateCurrentUserProfile(data) {
|
||||
return request({
|
||||
url: '/api/currentUser/profile',
|
||||
@@ -218,7 +170,6 @@ export function updateCurrentUserProfile(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 是否开启登录人机/验证码校验 */
|
||||
export function getOpenVerify() {
|
||||
return request({
|
||||
url: '/api/login/getOpenVerify',
|
||||
@@ -228,7 +179,6 @@ export function getOpenVerify() {
|
||||
})
|
||||
}
|
||||
|
||||
/** 极验 3 配置 */
|
||||
export function getGeetest3Infos() {
|
||||
return request({
|
||||
url: '/api/login/getGeetest3Infos',
|
||||
@@ -237,7 +187,6 @@ export function getGeetest3Infos() {
|
||||
})
|
||||
}
|
||||
|
||||
/** 极验 4 配置 */
|
||||
export function getGeetest4Infos() {
|
||||
return request({
|
||||
url: '/api/login/getGeetest4Infos',
|
||||
@@ -247,7 +196,6 @@ export function getGeetest4Infos() {
|
||||
})
|
||||
}
|
||||
|
||||
/** 注册 */
|
||||
export function register(data) {
|
||||
return request({
|
||||
url: '/api/register',
|
||||
@@ -256,7 +204,6 @@ export function register(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 发送注册验证码 */
|
||||
export function sendRegisterCode(data) {
|
||||
return request({
|
||||
url: '/api/sendRegisterCode',
|
||||
@@ -265,7 +212,6 @@ export function sendRegisterCode(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 重置密码 */
|
||||
export function resetPassword(data) {
|
||||
return request({
|
||||
url: '/api/resetPassword',
|
||||
@@ -274,7 +220,14 @@ export function resetPassword(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 验证租户和账号(找回密码第一步) */
|
||||
export function changePassword(data) {
|
||||
return request({
|
||||
url: '/api/changePassword',
|
||||
method: 'POST',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function verifyAccount(data) {
|
||||
return request({
|
||||
url: '/api/verifyAccount',
|
||||
@@ -283,7 +236,6 @@ export function verifyAccount(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 发送找回密码验证码(找回密码第二步) */
|
||||
export function sendResetCode(data) {
|
||||
return request({
|
||||
url: '/api/sendResetCode',
|
||||
@@ -292,10 +244,38 @@ export function sendResetCode(data) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析 getOpenVerify 返回的 label/value 列表
|
||||
* @returns {Promise<{ openVerify: boolean, verifyType: string }>}
|
||||
*/
|
||||
export function sendResetSmsCode(data) {
|
||||
return request({
|
||||
url: '/auth/forgot/send-code',
|
||||
method: 'POST',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function resetPasswordByMobile(data) {
|
||||
return request({
|
||||
url: '/auth/forgot',
|
||||
method: 'POST',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function sendResetEmailCode(data) {
|
||||
return request({
|
||||
url: '/auth/forgot/send-email-code',
|
||||
method: 'POST',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function resetPasswordByEmail(data) {
|
||||
return request({
|
||||
url: '/auth/forgot/email',
|
||||
method: 'POST',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export async function fetchVerifyConfig() {
|
||||
try {
|
||||
const data = await getOpenVerify()
|
||||
|
||||
@@ -1,22 +1,8 @@
|
||||
/**
|
||||
* 接口 baseURL 解析。
|
||||
* 优先级:VITE_API_BASE_URL > H5 开发代理 > H5 生产域名推断 > 默认生产 API
|
||||
*/
|
||||
|
||||
/** 极验 4.0 captcha_id(前端展示用;KEY 仅在后端校验) */
|
||||
export const GEETEST4_CAPTCHA_ID = '75e8a175c43b9ecfa15372c658be05e5'
|
||||
|
||||
const DEFAULT_PROD_API = 'https://api.yunzer.cn'
|
||||
|
||||
/**
|
||||
* @returns {string} 去掉末尾斜杠的 baseURL
|
||||
*/
|
||||
/**
|
||||
* 小程序端 baseURL 兜底:微信要求 request 必须走「已配置的 https 合法域名」,
|
||||
* localhost / 127.0.0.1 / 相对路径 / http 明文在体验版与正式版都会直接报
|
||||
* "url not in domain list"。出现这类取值一律回退生产 API(本地调试请用 H5 端,
|
||||
* 或在开发者工具勾选「不校验合法域名」时用真机调试)。
|
||||
*/
|
||||
function sanitizeMiniProgramBase(base) {
|
||||
const b = String(base || '')
|
||||
if (!b || b.startsWith('/') || !/^https:\/\//i.test(b) || /(localhost|127\.0\.0\.1)/i.test(b)) {
|
||||
@@ -50,12 +36,10 @@ export function resolveBaseURL() {
|
||||
if (typeof window !== 'undefined' && window.location) {
|
||||
const { hostname, protocol } = window.location
|
||||
|
||||
// 生产域名优先:避免 HBuilderX 构建后 DEV 仍为 true 时误走 /proxy-api
|
||||
if (hostname.includes('yunzer.cn')) {
|
||||
return DEFAULT_PROD_API
|
||||
}
|
||||
|
||||
// 本地 H5 开发走 vite 代理
|
||||
if (
|
||||
(hostname === 'localhost' || hostname === '127.0.0.1') &&
|
||||
typeof import.meta !== 'undefined' &&
|
||||
@@ -74,20 +58,10 @@ export function resolveBaseURL() {
|
||||
return DEFAULT_PROD_API
|
||||
}
|
||||
|
||||
/** 与 resolveBaseURL 相同,便于业务侧统一引用 */
|
||||
export function getBaseURL() {
|
||||
return resolveBaseURL()
|
||||
}
|
||||
|
||||
/**
|
||||
* 租户 Web 端(管理后台)地址。
|
||||
*
|
||||
* 移动端作为 ERP/OA/CRM/CMS 的聚合入口,绝大多数业务功能仍在 Web 端实现,
|
||||
* 端上通过 webview 容器打开对应页面。Web 端已统一认证:首次打开会跳
|
||||
* /auth/login 登录页,在 webview 内登录一次后会话保持。
|
||||
*
|
||||
* 可用环境变量 VITE_WEB_CONSOLE_BASE 覆盖(本地联调指向开发域名)。
|
||||
*/
|
||||
export function getWebConsoleBase() {
|
||||
let base = ''
|
||||
try {
|
||||
@@ -105,26 +79,12 @@ export function getWebConsoleBase() {
|
||||
return String(base).replace(/\/$/, '')
|
||||
}
|
||||
|
||||
/**
|
||||
* 由菜单 path 拼出 Web 端深链。
|
||||
* Web 端是 hash 路由(createWebHashHistory),因此形如 https://back.yunzer.cn/#/apps/crm/clue
|
||||
*/
|
||||
export function resolveWebConsoleURL(path) {
|
||||
const p = String(path || '').trim()
|
||||
if (!p) return ''
|
||||
return `${getWebConsoleBase()}/#${p.startsWith('/') ? p : `/${p}`}`
|
||||
}
|
||||
|
||||
/**
|
||||
* 拼出「移动端免登录」深链。
|
||||
*
|
||||
* Web 端只认自己 localStorage 里的令牌,移动端登录态传不过去,
|
||||
* 直接跳业务路径会再次弹出统一登录页。因此先跳 /app-login 兑换页,
|
||||
* 由它用票据换发 Web 端令牌后再回跳到 redirect 指定的业务页。
|
||||
*
|
||||
* @param {string} path 菜单 path,如 /apps/oa/dashboard
|
||||
* @param {string} ticket 一次性票据(由 /auth/app-ticket 签发)
|
||||
*/
|
||||
export function resolveWebSSOURL(path, ticket) {
|
||||
const p = String(path || '').trim()
|
||||
if (!p) return ''
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
/**
|
||||
* 通讯录(移动端)接口封装。
|
||||
* 对应后端 go/controllers/app_contact.go 的 /api/oa/contact/* 只读接口。
|
||||
*/
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/** 联系人类型:1-内部员工 2-外部联系人 */
|
||||
export const CONTACT_TYPE_OPTIONS = [
|
||||
{ value: 1, label: '内部' },
|
||||
{ value: 2, label: '外部' }
|
||||
@@ -14,10 +9,6 @@ export function getContactTypeLabel(value) {
|
||||
return Number(value) === 2 ? '外部' : '内部'
|
||||
}
|
||||
|
||||
/**
|
||||
* 多手机号格式化:JSON 数组 / 分隔符字符串 / 单个号码 → "138…、139…"(无内容返回空串)。
|
||||
* 与 Web 管理端 contact/index.vue 的 formatMobiles 口径保持一致。
|
||||
*/
|
||||
export function formatMobiles(val) {
|
||||
if (!val) return ''
|
||||
let arr = []
|
||||
@@ -36,7 +27,6 @@ export function formatMobiles(val) {
|
||||
return arr.map((m) => String(m || '').trim()).filter(Boolean).join('、')
|
||||
}
|
||||
|
||||
/** 取联系人首选号码:优先 phone,其次 mobiles 中的第一个 */
|
||||
export function primaryPhone(contact) {
|
||||
if (!contact) return ''
|
||||
const phone = String(contact.phone || '').trim()
|
||||
@@ -45,7 +35,6 @@ export function primaryPhone(contact) {
|
||||
return first ? first.split('、')[0] : ''
|
||||
}
|
||||
|
||||
/** 分页查询通讯录 */
|
||||
export async function fetchContacts(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/oa/contact/list',
|
||||
@@ -60,12 +49,10 @@ export async function fetchContacts(params = {}) {
|
||||
return { list: (data && data.list) || [], total: (data && data.total) || 0 }
|
||||
}
|
||||
|
||||
/** 组织架构树(含各部门内部联系人数量) */
|
||||
export function fetchContactOrgTree() {
|
||||
return request({ url: '/api/oa/contact/org-tree' })
|
||||
}
|
||||
|
||||
/** 联系人详情 */
|
||||
export function getContact(id) {
|
||||
return request({ url: `/api/oa/contact/${id}` })
|
||||
}
|
||||
@@ -1,13 +1,5 @@
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/**
|
||||
* 进销存移动端接口封装,对应后端 /api/erp/*(路由表 go/routers/api/erp.go)。
|
||||
* 与 Web 后台 /backend/erp/* 共用同一份统计口径:报表只认「已生效」单据与库存流水,
|
||||
* 所以手机端看到的金额、毛利、预警数与 Web 端永远一致。
|
||||
* 商品/仓库/客商在本端只读,建档一律回 Web 端完成。
|
||||
*/
|
||||
|
||||
/** 单据状态机:草稿 →(提交审批) 审批中 →(引擎通过) 已生效;驳回/作废为终态 */
|
||||
export const DOC_STATUS = {
|
||||
DRAFT: 0,
|
||||
APPROVING: 1,
|
||||
@@ -24,14 +16,12 @@ export const DOC_STATUS_OPTIONS = [
|
||||
{ value: DOC_STATUS.CANCELLED, label: '已作废', type: 'warning' }
|
||||
]
|
||||
|
||||
/** 往来账核销状态 */
|
||||
export const BILL_STATUS_OPTIONS = [
|
||||
{ value: 0, label: '未核销', type: 'warning' },
|
||||
{ value: 1, label: '部分核销', type: 'primary' },
|
||||
{ value: 2, label: '已结清', type: 'success' }
|
||||
]
|
||||
|
||||
/** 收付款方式:1收款 2付款 3其他收入 4费用支出 */
|
||||
export const FUND_TYPES = [
|
||||
{ value: 1, label: '收款', color: 'success' },
|
||||
{ value: 2, label: '付款', color: 'error' },
|
||||
@@ -39,7 +29,6 @@ export const FUND_TYPES = [
|
||||
{ value: 4, label: '费用支出', color: 'warning' }
|
||||
]
|
||||
|
||||
/** 收款/付款单的结算方式(与 Web 端 payment.vue methodOptions 同一套值) */
|
||||
export const FUND_METHODS = [
|
||||
{ value: 'cash', label: '现金' },
|
||||
{ value: 'bank', label: '银行转账' },
|
||||
@@ -47,21 +36,18 @@ export const FUND_METHODS = [
|
||||
{ value: 'alipay', label: '支付宝' }
|
||||
]
|
||||
|
||||
/** 收付款单状态:仅草稿可改,确认后驱动核销,作废会回滚已核销余额 */
|
||||
export const FUND_STATUS_OPTIONS = [
|
||||
{ value: 0, label: '草稿', type: 'info' },
|
||||
{ value: 1, label: '已确认', type: 'success' },
|
||||
{ value: 4, label: '已作废', type: 'warning' }
|
||||
]
|
||||
|
||||
/** 往来账核销状态(列表筛选值,与后端 settle_state 参数一致) */
|
||||
export const SETTLE_STATES = [
|
||||
{ value: 'open', label: '未结清' },
|
||||
{ value: 'part', label: '部分核销' },
|
||||
{ value: 'done', label: '已结清' }
|
||||
]
|
||||
|
||||
/** 单据类型 → 中文名(列表/流水里只有 doc_type 字符串时兜底用) */
|
||||
export const DOC_TYPE_LABELS = {
|
||||
purchase_order: '采购订单',
|
||||
purchase_in: '采购入库',
|
||||
@@ -79,7 +65,6 @@ export function docTypeLabel(type) {
|
||||
return DOC_TYPE_LABELS[type] || type
|
||||
}
|
||||
|
||||
/** 往来账类型 */
|
||||
export const BILL_TYPES = [
|
||||
{ value: 1, label: '应收', color: 'error' },
|
||||
{ value: 2, label: '应付', color: 'success' }
|
||||
@@ -90,7 +75,6 @@ export const PARTNER_TYPES = [
|
||||
{ value: 'customer', label: '客户' }
|
||||
]
|
||||
|
||||
/** 库存预警状态(后端 safety_state 三值) */
|
||||
export const SAFETY_STATE_OPTIONS = [
|
||||
{ value: '', label: '全部' },
|
||||
{ value: 'low', label: '低于安全库存', type: 'warning' },
|
||||
@@ -98,7 +82,6 @@ export const SAFETY_STATE_OPTIONS = [
|
||||
{ value: 'normal', label: '正常', type: 'success' }
|
||||
]
|
||||
|
||||
/** 批次效期状态 */
|
||||
export const EXPIRE_STATE_OPTIONS = [
|
||||
{ value: '', label: '全部' },
|
||||
{ value: 'expired', label: '已过期', type: 'error' },
|
||||
@@ -106,7 +89,6 @@ export const EXPIRE_STATE_OPTIONS = [
|
||||
{ value: 'normal', label: '正常', type: 'success' }
|
||||
]
|
||||
|
||||
/** 购销汇总维度 */
|
||||
export const REPORT_DIMENSIONS = [
|
||||
{ value: 'product', label: '按商品' },
|
||||
{ value: 'supplier', label: '按供应商' },
|
||||
@@ -156,19 +138,16 @@ export function safetyStateLabel(state) {
|
||||
return findOption(SAFETY_STATE_OPTIONS, state).label || state
|
||||
}
|
||||
|
||||
/** 金额展示:千分位可选,统一两位小数 */
|
||||
export function moneyText(value) {
|
||||
const num = Number(value || 0)
|
||||
return num.toFixed(2)
|
||||
}
|
||||
|
||||
/** 数量展示:去掉浮点尾巴,最多四位小数 */
|
||||
export function qtyText(value) {
|
||||
const num = Number(value || 0)
|
||||
return String(Math.round(num * 10000) / 10000)
|
||||
}
|
||||
|
||||
/** ISO 时间串取日期部分 */
|
||||
export function dayText(value) {
|
||||
return String(value || '').slice(0, 10)
|
||||
}
|
||||
@@ -178,7 +157,6 @@ export function dateTimeText(value) {
|
||||
return s ? `${s.slice(0, 10)} ${s.slice(11, 16)}` : ''
|
||||
}
|
||||
|
||||
/** 分页参数归一:后端 pageSize 上限 100,越界回落 20 */
|
||||
function pageArgs(params) {
|
||||
return {
|
||||
page: params.page || 1,
|
||||
@@ -186,7 +164,6 @@ function pageArgs(params) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 日期区间参数:空值不传,避免覆盖后端默认口径 */
|
||||
function rangeArgs(params) {
|
||||
const out = {}
|
||||
if (params.dateFrom) out.date_from = params.dateFrom
|
||||
@@ -194,24 +171,15 @@ function rangeArgs(params) {
|
||||
return out
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------- 元数据 / 看板
|
||||
|
||||
/**
|
||||
* 开单字典:单据类型(含往来口径与是否动库存)、状态档、默认仓库、价格体系、负库存开关
|
||||
*/
|
||||
export function fetchErpMeta() {
|
||||
return request({ url: '/api/erp/meta' })
|
||||
}
|
||||
|
||||
/** 单据类型字典(列表筛选、开单选择都用它,避免端上硬编码十种类型) */
|
||||
export async function fetchDocTypes() {
|
||||
const meta = await fetchErpMeta()
|
||||
return meta.doc_types || []
|
||||
}
|
||||
|
||||
/**
|
||||
* 经营看板:本月购销/毛利、今日销售、库存价值、往来余额、待办、近 6 月趋势、预警计数
|
||||
*/
|
||||
export async function fetchErpDashboard() {
|
||||
const data = await request({ url: '/api/erp/dashboard' })
|
||||
return {
|
||||
@@ -225,13 +193,6 @@ export async function fetchErpDashboard() {
|
||||
}
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------- 单据
|
||||
|
||||
/**
|
||||
* 单据列表
|
||||
* params: { docType | docTypes[], status, keyword, partnerId, warehouseId, sourceDocId,
|
||||
* dateFrom, dateTo, page, pageSize }
|
||||
*/
|
||||
export async function fetchDocs(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/document/list',
|
||||
@@ -250,18 +211,12 @@ export async function fetchDocs(params = {}) {
|
||||
return { list: (data.list || []).map(normalizeDoc), total: data.total || 0 }
|
||||
}
|
||||
|
||||
/** 单据详情(含明细行、实时库存与审批实例摘要) */
|
||||
export async function getDoc(id) {
|
||||
const data = await request({ url: `/api/erp/document/detail/${id}` })
|
||||
if (!data) return null
|
||||
return normalizeDoc(data, true)
|
||||
}
|
||||
|
||||
/**
|
||||
* 新建/覆盖保存单据(草稿),返回 { id, docNo }
|
||||
* doc: { id?, docType, bizDate, warehouseId, toWarehouseId, partnerId, sourceDocId,
|
||||
* discountAmount, remark, items: [{ productId, quantity, unitPrice, ... }] }
|
||||
*/
|
||||
export async function saveDoc(doc) {
|
||||
const res = await request({
|
||||
url: '/api/erp/document/save',
|
||||
@@ -271,38 +226,30 @@ export async function saveDoc(doc) {
|
||||
return { id: res?.id, docNo: res?.doc_no || '' }
|
||||
}
|
||||
|
||||
/** 直接审核生效(跳过审批引擎,用于未绑定审批流的租户) */
|
||||
export function approveDoc(id) {
|
||||
return request({ url: `/api/erp/document/approve/${id}`, method: 'POST', data: {} })
|
||||
}
|
||||
|
||||
/** 作废单据(草稿/审批中/已驳回可作废) */
|
||||
export function cancelDoc(id) {
|
||||
return request({ url: `/api/erp/document/cancel/${id}`, method: 'POST', data: {} })
|
||||
}
|
||||
|
||||
/** 删除单据(仅草稿/已驳回) */
|
||||
export async function deleteDoc(id) {
|
||||
await request({ url: `/api/erp/document/delete/${id}`, method: 'DELETE' })
|
||||
return true
|
||||
}
|
||||
|
||||
/** 提交审批:flowId 为空时后端按单据类型自动选流(flow_id 走 query,不进 body) */
|
||||
export async function submitDoc(id, flowId) {
|
||||
const query = flowId ? `?flow_id=${flowId}` : ''
|
||||
const res = await request({ url: `/api/erp/document/submit/${id}${query}`, method: 'POST', data: {} })
|
||||
return res?.instance_id
|
||||
}
|
||||
|
||||
/** 单据类型可用的审批流 */
|
||||
export async function fetchDocFlows(docType) {
|
||||
const data = await request({ url: '/api/erp/document/flows', data: { doc_type: docType } })
|
||||
return { list: data.list || [], bizType: data.biz_type || '' }
|
||||
}
|
||||
|
||||
/**
|
||||
* 来源订单的可执行明细行(下单量 - 已执行量),用于「订单转入库/出库」
|
||||
*/
|
||||
export async function fetchExecutableDocs(docId) {
|
||||
const data = await request({ url: `/api/erp/document/executable/${docId}` })
|
||||
return {
|
||||
@@ -316,19 +263,11 @@ export async function fetchExecutableDocs(docId) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 盘点表:带出仓库账面库存,供盘点录入对比差异 */
|
||||
export async function fetchTakeSheet(warehouseId) {
|
||||
const data = await request({ url: '/api/erp/document/takeSheet', data: { warehouse_id: warehouseId } })
|
||||
return (data.list || []).map(row => ({ ...row, book_qty: Number(row.book_qty || 0) }))
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------- 库存
|
||||
|
||||
/**
|
||||
* 库存查询
|
||||
* params: { warehouseId, productId, categoryId, batchNo, keyword, groupBy('product'|其它=分仓批次),
|
||||
* safetyState, onlyStock, page, pageSize } → { list, total, sumAmount }
|
||||
*/
|
||||
export async function fetchStocks(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/stock/list',
|
||||
@@ -347,10 +286,6 @@ export async function fetchStocks(params = {}) {
|
||||
return { list: data.list || [], total: data.total || 0, sumAmount: Number(data.sum_amount || 0) }
|
||||
}
|
||||
|
||||
/**
|
||||
* 库存流水(收发存台账)
|
||||
* params: { productId, warehouseId, docType, batchNo, docNo, dateFrom, dateTo, page, pageSize }
|
||||
*/
|
||||
export async function fetchStockLedger(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/stock/ledger',
|
||||
@@ -374,7 +309,6 @@ export async function fetchStockLedger(params = {}) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 库存预警四类分组 + 计数 */
|
||||
export async function fetchStockWarning() {
|
||||
const data = await request({ url: '/api/erp/stock/warning' })
|
||||
return {
|
||||
@@ -386,16 +320,11 @@ export async function fetchStockWarning() {
|
||||
}
|
||||
}
|
||||
|
||||
/** 智能补货建议(含在途、近 30 天销量、建议量与金额) */
|
||||
export async function fetchReplenish() {
|
||||
const data = await request({ url: '/api/erp/stock/replenish' })
|
||||
return { list: data.list || [], total: data.total || 0 }
|
||||
}
|
||||
|
||||
/**
|
||||
* 批次台账
|
||||
* params: { warehouseId, productId, keyword, expireState, onlyPositive, page, pageSize }
|
||||
*/
|
||||
export async function fetchBatches(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/stock/batch',
|
||||
@@ -411,12 +340,6 @@ export async function fetchBatches(params = {}) {
|
||||
return { list: data.list || [], total: data.total || 0 }
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------- 档案(只读)
|
||||
|
||||
/**
|
||||
* 商品列表
|
||||
* params: { keyword, categoryId, brand, onlyEnabled, page, pageSize }
|
||||
*/
|
||||
export async function fetchProducts(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/product/list',
|
||||
@@ -431,18 +354,15 @@ export async function fetchProducts(params = {}) {
|
||||
return { list: data.list || [], total: data.total || 0 }
|
||||
}
|
||||
|
||||
/** 商品详情(含分仓库存 stocks[]) */
|
||||
export function getProduct(id) {
|
||||
return request({ url: `/api/erp/product/detail/${id}` })
|
||||
}
|
||||
|
||||
/** 商品分类:list 平铺 + tree 递归树 */
|
||||
export async function fetchCategories() {
|
||||
const data = await request({ url: '/api/erp/product/category/list' })
|
||||
return { list: data.list || [], tree: data.tree || [] }
|
||||
}
|
||||
|
||||
/** 仓库列表(带在库品种数与货值,无分页) */
|
||||
export async function fetchWarehouses(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/warehouse/list',
|
||||
@@ -455,10 +375,6 @@ export async function fetchWarehouses(params = {}) {
|
||||
}))
|
||||
}
|
||||
|
||||
/**
|
||||
* 客商列表(统一出参)
|
||||
* params: { partnerType('supplier'|其它=客户), keyword, onlyEnabled, page, pageSize }
|
||||
*/
|
||||
export async function fetchPartners(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/partner/list',
|
||||
@@ -472,21 +388,10 @@ export async function fetchPartners(params = {}) {
|
||||
return { list: data.list || [], total: data.total || 0 }
|
||||
}
|
||||
|
||||
/**
|
||||
* 客商详情:必须显式带 partner_type,缺省后端按客户查
|
||||
*/
|
||||
export function getPartner(id, partnerType) {
|
||||
return request({ url: `/api/erp/partner/detail/${id}`, data: { partner_type: partnerType || 'customer' } })
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------- 往来账 / 收付款
|
||||
|
||||
/**
|
||||
* 应收应付列表
|
||||
* params: { billType(1|2), partnerId, sourceDocId, settleState('open'|'part'|'done'),
|
||||
* keyword, dateFrom, dateTo, page, pageSize }
|
||||
* → { list, total, summary: { openReceivable, openPayable } }
|
||||
*/
|
||||
export async function fetchBills(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/finance/bill/list',
|
||||
@@ -511,7 +416,6 @@ export async function fetchBills(params = {}) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 往来账详情:核销记录、关联收付款单、来源单据明细 */
|
||||
export async function getBill(id) {
|
||||
const data = await request({ url: `/api/erp/finance/bill/detail/${id}` })
|
||||
if (!data) return null
|
||||
@@ -523,7 +427,6 @@ export async function getBill(id) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 账龄分析:按客商分桶 + 应收/应付合计 */
|
||||
export async function fetchAging() {
|
||||
const data = await request({ url: '/api/erp/finance/aging' })
|
||||
return {
|
||||
@@ -533,7 +436,6 @@ export async function fetchAging() {
|
||||
}
|
||||
}
|
||||
|
||||
/** 资金流水(按日汇总,默认近 30 天) */
|
||||
export async function fetchCashFlow(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/finance/cashflow',
|
||||
@@ -547,7 +449,6 @@ export async function fetchCashFlow(params = {}) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 客商往来汇总(累计/未结,收付双向) */
|
||||
export async function fetchPartnerSummary(partnerType) {
|
||||
const data = await request({
|
||||
url: '/api/erp/finance/partner',
|
||||
@@ -556,10 +457,6 @@ export async function fetchPartnerSummary(partnerType) {
|
||||
return data.list || []
|
||||
}
|
||||
|
||||
/**
|
||||
* 收付款单列表
|
||||
* params: { fundType(1..4), status, partnerId, keyword, dateFrom, dateTo, page, pageSize }
|
||||
*/
|
||||
export async function fetchFunds(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/finance/fund/list',
|
||||
@@ -575,14 +472,12 @@ export async function fetchFunds(params = {}) {
|
||||
return { list: (data.list || []).map(normalizeFund), total: data.total || 0 }
|
||||
}
|
||||
|
||||
/** 收付款单详情(含核销行与被核销的往来账) */
|
||||
export async function getFund(id) {
|
||||
const data = await request({ url: `/api/erp/finance/fund/detail/${id}` })
|
||||
if (!data) return null
|
||||
return { fund: normalizeFund(data.fund || {}), settles: data.fund?.settles || [], bills: data.bills || [] }
|
||||
}
|
||||
|
||||
/** 待核销的往来账(confirm 页面选账用):fundType=2 查应付,其余查应收 */
|
||||
export async function fetchOpenBills(fundType, partnerId) {
|
||||
const data = await request({
|
||||
url: '/api/erp/finance/fund/openBills',
|
||||
@@ -591,7 +486,6 @@ export async function fetchOpenBills(fundType, partnerId) {
|
||||
return (data.list || []).map(row => ({ ...row, balance: Number(row.balance || 0) }))
|
||||
}
|
||||
|
||||
/** 新建/修改收付款草稿,返回 { id, fundNo } */
|
||||
export async function saveFund(fund) {
|
||||
const res = await request({
|
||||
url: '/api/erp/finance/fund/save',
|
||||
@@ -610,11 +504,6 @@ export async function saveFund(fund) {
|
||||
return { id: res?.id, fundNo: res?.fund_no || '' }
|
||||
}
|
||||
|
||||
/**
|
||||
* 确认收付款并核销
|
||||
* settles 为空 → 后端按到期日 FIFO 自动核销;
|
||||
* settles = [{ partnerBillId, amount }] → 按单核销
|
||||
*/
|
||||
export function confirmFund(id, settles) {
|
||||
return request({
|
||||
url: `/api/erp/finance/fund/confirm/${id}`,
|
||||
@@ -623,20 +512,15 @@ export function confirmFund(id, settles) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 作废收付款单(已发生核销的不可作废,需做反向冲销) */
|
||||
export function voidFund(id) {
|
||||
return request({ url: `/api/erp/finance/fund/void/${id}`, method: 'POST', data: {} })
|
||||
}
|
||||
|
||||
/** 删除收付款草稿(仅草稿) */
|
||||
export async function deleteFund(id) {
|
||||
await request({ url: `/api/erp/finance/fund/delete/${id}`, method: 'DELETE' })
|
||||
return true
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------- 报表
|
||||
|
||||
/** 采购汇总:dimension = product|supplier|month */
|
||||
export async function fetchPurchaseSummary(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/report/purchase',
|
||||
@@ -645,7 +529,6 @@ export async function fetchPurchaseSummary(params = {}) {
|
||||
return normalizeSummary(data)
|
||||
}
|
||||
|
||||
/** 销售汇总:dimension = product|customer|month */
|
||||
export async function fetchSalesSummary(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/report/sales',
|
||||
@@ -654,7 +537,6 @@ export async function fetchSalesSummary(params = {}) {
|
||||
return normalizeSummary(data)
|
||||
}
|
||||
|
||||
/** 热销(order=desc)/滞销(order=asc)排行 */
|
||||
export async function fetchSalesRank(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/report/rank',
|
||||
@@ -663,7 +545,6 @@ export async function fetchSalesRank(params = {}) {
|
||||
return { list: data.list || [], order: data.order || 'desc', range: data.range || [] }
|
||||
}
|
||||
|
||||
/** 收发存汇总表:期初 = 期末 -(本期入 - 本期出),与库存结存账实一致 */
|
||||
export async function fetchStockMove(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/report/stockmove',
|
||||
@@ -677,7 +558,6 @@ export async function fetchStockMove(params = {}) {
|
||||
return { list: data.list || [], total: data.total || 0, summary: data.summary || {} }
|
||||
}
|
||||
|
||||
/** 毛利分析:收入=销售出库-销售退货,成本取库存流水实际出库成本 */
|
||||
export async function fetchProfit(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/erp/report/profit',
|
||||
@@ -686,9 +566,6 @@ export async function fetchProfit(params = {}) {
|
||||
return { list: data.list || [], summary: data.summary || {} }
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------- 归一化
|
||||
|
||||
/** 单据主表归一;withItems=true 时明细行日期/金额也归一 */
|
||||
function normalizeDoc(row, withItems) {
|
||||
const out = {
|
||||
...row,
|
||||
@@ -715,7 +592,6 @@ function normalizeDoc(row, withItems) {
|
||||
return out
|
||||
}
|
||||
|
||||
/** 组装后端要求的单据请求体(明细只传可编辑字段,单价缺省由后端按价格体系取) */
|
||||
function buildDocPayload(doc) {
|
||||
return {
|
||||
id: doc.id || 0,
|
||||
@@ -745,7 +621,6 @@ function buildDocPayload(doc) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 往来账行:后端返回 { bill, balance, overdue_days, status_label },摊平给列表用 */
|
||||
function normalizeBillRow(row) {
|
||||
const bill = row.bill || {}
|
||||
return {
|
||||
|
||||
@@ -2,13 +2,6 @@ import { request } from '@/api/request.js'
|
||||
import { getBaseURL } from '@/api/config.js'
|
||||
import { getToken } from '@/utils/auth.js'
|
||||
|
||||
/**
|
||||
* OA 报销管理接口封装,对应后端 /api/oa/expense/*。
|
||||
* 与 Web 后台 /backend/reimbursements* 是同一套数据(yz_backend_reimbursements),
|
||||
* 状态机:0草稿 → 1审批中 → 2已通过 / 3已驳回 / 4已撤回 → 5已打款。
|
||||
*/
|
||||
|
||||
/** 报销单状态常量 */
|
||||
export const EXPENSE_STATUS = {
|
||||
DRAFT: 0,
|
||||
APPROVING: 1,
|
||||
@@ -18,7 +11,6 @@ export const EXPENSE_STATUS = {
|
||||
PAID: 5
|
||||
}
|
||||
|
||||
/** 状态选项(label 与 Web 端一致;type 为 u-tag 颜色) */
|
||||
export const EXPENSE_STATUS_OPTIONS = [
|
||||
{ value: 0, label: '草稿', type: 'info' },
|
||||
{ value: 1, label: '审批中', type: 'primary' },
|
||||
@@ -28,7 +20,6 @@ export const EXPENSE_STATUS_OPTIONS = [
|
||||
{ value: 5, label: '已打款', type: 'success' }
|
||||
]
|
||||
|
||||
/** 审批记录动作文案(与 Web 端 detail 页 actionLabel 一致) */
|
||||
export const EXPENSE_ACTION_LABELS = {
|
||||
1: '提交申请',
|
||||
2: '审批通过',
|
||||
@@ -49,15 +40,10 @@ export function getExpenseActionLabel(action) {
|
||||
return EXPENSE_ACTION_LABELS[Number(action)] || '审批操作'
|
||||
}
|
||||
|
||||
/** 金额展示:统一两位小数 */
|
||||
export function moneyText(value) {
|
||||
return Number(value || 0).toFixed(2)
|
||||
}
|
||||
|
||||
/**
|
||||
* 报销单列表(支持状态/关键词筛选)
|
||||
* 返回 { list, total }
|
||||
*/
|
||||
export async function fetchExpenses(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/oa/expense/list',
|
||||
@@ -71,9 +57,6 @@ export async function fetchExpenses(params = {}) {
|
||||
return { list: data.list || [], total: data.total || 0 }
|
||||
}
|
||||
|
||||
/**
|
||||
* 报销单详情(含费用明细与发票文件)
|
||||
*/
|
||||
export async function getExpense(id) {
|
||||
const data = await request({ url: `/api/oa/expense/detail/${id}` })
|
||||
if (!data) return null
|
||||
@@ -83,9 +66,6 @@ export async function getExpense(id) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 新建报销单(草稿),返回新单据 id
|
||||
*/
|
||||
export async function createExpense(payload) {
|
||||
const res = await request({
|
||||
url: '/api/oa/expense/create',
|
||||
@@ -98,9 +78,6 @@ export async function createExpense(payload) {
|
||||
return res?.id
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑报销单基本信息(仅草稿)
|
||||
*/
|
||||
export function updateExpense(id, payload) {
|
||||
return request({
|
||||
url: `/api/oa/expense/update/${id}`,
|
||||
@@ -112,18 +89,11 @@ export function updateExpense(id, payload) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除报销单(仅草稿,软删除)
|
||||
*/
|
||||
export async function deleteExpense(id) {
|
||||
await request({ url: `/api/oa/expense/delete/${id}`, method: 'DELETE' })
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增费用明细(仅草稿)
|
||||
* item: { expenseType, expenseDate, amount, quantity, unitPrice, description, receipts: [{id,url,name}] }
|
||||
*/
|
||||
export async function addExpenseItem(reimbursementId, item) {
|
||||
return request({
|
||||
url: `/api/oa/expense/item/add/${reimbursementId}`,
|
||||
@@ -132,9 +102,6 @@ export async function addExpenseItem(reimbursementId, item) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新费用明细(仅草稿)
|
||||
*/
|
||||
export async function updateExpenseItem(reimbursementId, itemId, item) {
|
||||
return request({
|
||||
url: `/api/oa/expense/item/update/${reimbursementId}/${itemId}`,
|
||||
@@ -143,9 +110,6 @@ export async function updateExpenseItem(reimbursementId, itemId, item) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除费用明细(仅草稿)
|
||||
*/
|
||||
export async function deleteExpenseItem(reimbursementId, itemId) {
|
||||
await request({
|
||||
url: `/api/oa/expense/item/delete/${reimbursementId}/${itemId}`,
|
||||
@@ -154,18 +118,11 @@ export async function deleteExpenseItem(reimbursementId, itemId) {
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交审批(仅草稿;需租户已配置启用的审批流程)
|
||||
*/
|
||||
export async function submitExpense(id) {
|
||||
await request({ url: `/api/oa/expense/submit/${id}`, method: 'POST' })
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 报销人确认款项到账(仅「已通过」的单据可用)
|
||||
* 确认成功后单据状态变为「已打款」;其它状态由审批引擎推进,端上不可手动修改。
|
||||
*/
|
||||
export async function confirmExpensePaid(id) {
|
||||
const res = await request({
|
||||
url: `/api/oa/expense/status/${id}`,
|
||||
@@ -175,17 +132,11 @@ export async function confirmExpensePaid(id) {
|
||||
return res?.status ?? EXPENSE_STATUS.PAID
|
||||
}
|
||||
|
||||
/**
|
||||
* 审批记录(时间线)
|
||||
*/
|
||||
export async function fetchExpenseRecords(id) {
|
||||
const rows = await request({ url: `/api/oa/expense/records/${id}` })
|
||||
return Array.isArray(rows) ? rows : []
|
||||
}
|
||||
|
||||
/**
|
||||
* 费用类型下拉(全局通用 + 本租户专有,仅启用)
|
||||
*/
|
||||
export async function fetchExpenseTypes() {
|
||||
const rows = await request({ url: '/api/oa/expense/types' })
|
||||
return (Array.isArray(rows) ? rows : []).map(row => ({
|
||||
@@ -194,10 +145,6 @@ export async function fetchExpenseTypes() {
|
||||
}))
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传报销发票附件(multipart,图片或 PDF,单个 ≤10MB)
|
||||
* 文件落入租户文件管理,返回 { id, url, name } 引用信息
|
||||
*/
|
||||
export function uploadExpenseReceipt(filePath) {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
@@ -210,7 +157,6 @@ export function uploadExpenseReceipt(filePath) {
|
||||
try {
|
||||
body = JSON.parse(res.data || '{}')
|
||||
} catch (e) {
|
||||
// 非 JSON 响应按失败处理
|
||||
}
|
||||
if (res.statusCode >= 200 && res.statusCode < 300 && body.code === 200 && body.data) {
|
||||
resolve(body.data)
|
||||
@@ -228,13 +174,6 @@ export function uploadExpenseReceipt(filePath) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 组装后端要求的费用明细请求体(发票只传文件 ID 列表,发票金额暂不在端上维护)。
|
||||
*
|
||||
* 不传发票挂靠字段:挂靠只允许挂「当前报销单」里上传的发票,而移动端保存是
|
||||
* 「删旧重建」且不带 receipt_amounts(票面金额),重建期间发票池暂时为空或无票面,
|
||||
* 带上旧挂靠会导致校验失败并留下半重建数据。挂靠统一在 Web 端建立。
|
||||
*/
|
||||
function buildExpenseItemPayload(item) {
|
||||
const receipts = item.receipts || []
|
||||
return {
|
||||
@@ -249,10 +188,6 @@ function buildExpenseItemPayload(item) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 图片地址兜底:后端可能返回相对路径(如 /uploads/...),
|
||||
* 小程序 image 组件无法加载相对路径,统一拼上 baseURL。
|
||||
*/
|
||||
export function resolveImageUrl(url) {
|
||||
const value = String(url || '').trim()
|
||||
if (!value) return ''
|
||||
@@ -260,31 +195,23 @@ export function resolveImageUrl(url) {
|
||||
return `${getBaseURL().replace(/\/$/, '')}${value.startsWith('/') ? '' : '/'}${value}`
|
||||
}
|
||||
|
||||
/** 查我的待审批任务(审批人视角):返回 {task_id,node_name},无待办返回 null */
|
||||
export function fetchMyApproveTask(id) {
|
||||
return request({ url: `/api/oa/expense/my-approve-task/${id}` })
|
||||
}
|
||||
|
||||
/** 通过当前审批节点(body: {comment}),返回引擎提示(会签等待/流转/完成) */
|
||||
export function approveExpense(id, comment = '') {
|
||||
return request({ url: `/api/oa/expense/approve/${id}`, method: 'POST', data: { comment } })
|
||||
}
|
||||
|
||||
/** 驳回报销单(body: {comment}) */
|
||||
export function rejectExpense(id, comment = '') {
|
||||
return request({ url: `/api/oa/expense/reject/${id}`, method: 'POST', data: { comment } })
|
||||
}
|
||||
|
||||
/**
|
||||
* 发票引用是否为 PDF 文件:PDF 不能用 image 组件渲染(会被 ORB 拦截不显示),
|
||||
* 需要走 openDocument 打开。
|
||||
*/
|
||||
export function isPdfReceipt(receipt) {
|
||||
const target = `${receipt?.name || ''} ${receipt?.url || ''}`.toLowerCase()
|
||||
return target.includes('.pdf')
|
||||
}
|
||||
|
||||
/** 归一化明细:日期取前 10 位,发票引用统一为 {id,url,name}(后端 receipt_files 元素为 file_id) */
|
||||
function normalizeExpenseItem(item) {
|
||||
const receipts = (Array.isArray(item.receipt_files) ? item.receipt_files : []).map(img => ({
|
||||
id: img.file_id,
|
||||
|
||||
@@ -1,14 +1,5 @@
|
||||
/**
|
||||
* 游客轻身份接口(后端 controllers/guest.go)
|
||||
* 失败均由调用方静默处理,不弹全局 toast。
|
||||
*/
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/**
|
||||
* 游客登录:微信手机号动态凭证换游客令牌
|
||||
* @param {{ code: string, phoneCode: string, appid?: string }} params code=uni.login 的登录凭证
|
||||
* @returns {Promise<{ token: string, guest_id: number, phone_mask: string, expires_in: number }>}
|
||||
*/
|
||||
export function guestMiniLogin({ code = '', phoneCode = '', appid = '' } = {}) {
|
||||
return request({
|
||||
url: '/api/guest/mini-login',
|
||||
@@ -18,10 +9,6 @@ export function guestMiniLogin({ code = '', phoneCode = '', appid = '' } = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 转正合并:正式登录令牌调用,把该手机号下的游客数据并入账号
|
||||
* @returns {Promise<object>} 各模块合并条数,如 { notebook: 3, schedule: 1, passwordStore: 2 }
|
||||
*/
|
||||
export function guestMerge() {
|
||||
return request({
|
||||
url: '/api/guest/merge',
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/** 读取平台端维护的法律单页内容。路径不包含前导斜杠。 */
|
||||
export function fetchLegalDocument(path) {
|
||||
return request({
|
||||
url: `/platform/website/page/path/${encodeURIComponent(path)}`,
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/**
|
||||
* 获取笔记列表
|
||||
*/
|
||||
export async function fetchNotes(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/notebook/list',
|
||||
@@ -19,9 +16,6 @@ export async function fetchNotes(params = {}) {
|
||||
return { list, total: data.total || 0 }
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单条笔记
|
||||
*/
|
||||
export async function getNote(id) {
|
||||
const data = await request({ url: `/api/notebook/${id}` })
|
||||
if (!data) return null
|
||||
@@ -33,9 +27,6 @@ export async function getNote(id) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建笔记
|
||||
*/
|
||||
export async function createNote(data) {
|
||||
const res = await request({
|
||||
url: '/api/notebook',
|
||||
@@ -49,9 +40,6 @@ export async function createNote(data) {
|
||||
return res
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新笔记
|
||||
*/
|
||||
export async function updateNote(id, data) {
|
||||
const res = await request({
|
||||
url: `/api/notebook/${id}`,
|
||||
@@ -65,17 +53,11 @@ export async function updateNote(id, data) {
|
||||
return res
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除笔记
|
||||
*/
|
||||
export async function deleteNote(id) {
|
||||
await request({ url: `/api/notebook/${id}`, method: 'DELETE' })
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 切换置顶
|
||||
*/
|
||||
export async function toggleNotePin(id) {
|
||||
const res = await request({
|
||||
url: `/api/notebook/${id}/togglePin`,
|
||||
|
||||
@@ -1,24 +1,17 @@
|
||||
/**
|
||||
* OA 协同办公(移动端)接口封装。
|
||||
* 对应后端 go/controllers/app_oa.go 的 /api/oa/* 只读接口。
|
||||
*/
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/** 公告类型:0-通知 1-公告 2-活动 */
|
||||
export const NOTICE_TYPE_OPTIONS = [
|
||||
{ value: 0, label: '通知' },
|
||||
{ value: 1, label: '公告' },
|
||||
{ value: 2, label: '活动' }
|
||||
]
|
||||
|
||||
/** 公告级别:0-普通 1-重要 2-紧急 */
|
||||
export const NOTICE_LEVEL_OPTIONS = [
|
||||
{ value: 0, label: '普通' },
|
||||
{ value: 1, label: '重要' },
|
||||
{ value: 2, label: '紧急' }
|
||||
]
|
||||
|
||||
/** 文档类型:与 models.DocType* 常量一致 */
|
||||
export const DOC_TYPE_OPTIONS = [
|
||||
{ value: 0, label: '其他', icon: 'file' },
|
||||
{ value: 1, label: '文档', icon: 'file-lines' },
|
||||
@@ -31,7 +24,6 @@ export const DOC_TYPE_OPTIONS = [
|
||||
{ value: 8, label: '音频', icon: 'file-audio' }
|
||||
]
|
||||
|
||||
/** 薪资单状态:0-草稿 1-已确认 2-已发放 3-已归档 */
|
||||
export const PAYROLL_STATUS_OPTIONS = [
|
||||
{ value: 0, label: '草稿' },
|
||||
{ value: 1, label: '已确认' },
|
||||
@@ -39,14 +31,12 @@ export const PAYROLL_STATUS_OPTIONS = [
|
||||
{ value: 3, label: '已归档' }
|
||||
]
|
||||
|
||||
/** 在职状态:1-试用 2-正式 3-离职 */
|
||||
export const EMPLOYMENT_STATUS_OPTIONS = [
|
||||
{ value: 1, label: '试用' },
|
||||
{ value: 2, label: '正式' },
|
||||
{ value: 3, label: '离职' }
|
||||
]
|
||||
|
||||
/** 婚姻状况:0-未填 1-未婚 2-已婚 3-离异 4-丧偶 */
|
||||
export const MARITAL_STATUS_OPTIONS = [
|
||||
{ value: 0, label: '未填' },
|
||||
{ value: 1, label: '未婚' },
|
||||
@@ -55,7 +45,6 @@ export const MARITAL_STATUS_OPTIONS = [
|
||||
{ value: 4, label: '丧偶' }
|
||||
]
|
||||
|
||||
/** 档案子记录类型:1-教育经历 2-工作经历 3-合同信息 4-证照附件 */
|
||||
export const FILE_RECORD_TYPE_OPTIONS = [
|
||||
{ value: 1, label: '教育经历' },
|
||||
{ value: 2, label: '工作经历' },
|
||||
@@ -96,7 +85,6 @@ export function getDocTypeMeta(value) {
|
||||
return DOC_TYPE_OPTIONS.find(item => item.value === Number(value)) || DOC_TYPE_OPTIONS[0]
|
||||
}
|
||||
|
||||
/** 文件大小人性化展示 */
|
||||
export function formatFileSize(size) {
|
||||
const bytes = Number(size) || 0
|
||||
if (bytes <= 0) return ''
|
||||
@@ -106,8 +94,6 @@ export function formatFileSize(size) {
|
||||
return (bytes / 1024 / 1024 / 1024).toFixed(2) + ' GB'
|
||||
}
|
||||
|
||||
// ---------------- 通知公告 ----------------
|
||||
|
||||
export async function fetchNotices(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/oa/notice/list',
|
||||
@@ -124,8 +110,6 @@ export function getNotice(id) {
|
||||
return request({ url: `/api/oa/notice/${id}` })
|
||||
}
|
||||
|
||||
// ---------------- 文档库 ----------------
|
||||
|
||||
export function fetchDocCategories(scope = 'shared') {
|
||||
return request({ url: '/api/oa/document/categories', data: { scope } })
|
||||
}
|
||||
@@ -159,8 +143,6 @@ export function toggleDocStar(id) {
|
||||
return request({ url: `/api/oa/document/${id}/star`, method: 'POST' })
|
||||
}
|
||||
|
||||
// ---------------- 薪酬工资单(仅本人) ----------------
|
||||
|
||||
export async function fetchPayrolls(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/oa/compensation/payrolls',
|
||||
@@ -177,15 +159,11 @@ export function getPayroll(id) {
|
||||
return request({ url: `/api/oa/compensation/payrolls/${id}` })
|
||||
}
|
||||
|
||||
// ---------------- 员工档案 ----------------
|
||||
|
||||
/** 当前用户是否具备 HR 视角(可见全公司档案)。角色里勾了「员工档案」菜单即为 HR。 */
|
||||
export async function getEmployeeFileAccess() {
|
||||
const data = await request({ url: '/api/oa/employee-file/access' })
|
||||
return !!(data && data.can_view_all)
|
||||
}
|
||||
|
||||
/** 全公司档案分页列表(HR),支持 keyword / status / org_id */
|
||||
export async function fetchEmployeeFiles(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/oa/employee-file/list',
|
||||
@@ -200,12 +178,10 @@ export async function fetchEmployeeFiles(params = {}) {
|
||||
return { list: (data && data.list) || [], total: (data && data.total) || 0 }
|
||||
}
|
||||
|
||||
/** 指定员工档案详情(含教育/工作/合同/证照子记录) */
|
||||
export function getEmployeeFileDetail(id) {
|
||||
return request({ url: `/api/oa/employee-file/detail/${id}` })
|
||||
}
|
||||
|
||||
/** 本人档案(无 HR 权限时的兜底视图) */
|
||||
export function getMyEmployeeFile() {
|
||||
return request({ url: '/api/oa/employee-file' })
|
||||
}
|
||||
+13
-26
@@ -1,23 +1,9 @@
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/**
|
||||
* OA 考勤打卡接口封装,对应后端 /api/oa/attendance/*。
|
||||
*
|
||||
* 打卡联动工作排班:今日排班由后端匹配,匹配不上时 today.warning 非空,
|
||||
* 但 can_clock_in / can_clock_out 仍为 true(提醒后仍可签到)。
|
||||
*/
|
||||
|
||||
/** 今日打卡状态:{date, employee, entry, record, matched, warning, can_clock_in, can_clock_out, recent, stats} */
|
||||
export function fetchAttendanceToday(days = 7) {
|
||||
return request({ url: '/api/oa/attendance/today', data: { days } })
|
||||
}
|
||||
|
||||
/**
|
||||
* 签到 / 签退
|
||||
* @param {'in'|'out'} type
|
||||
* @param {{location?:string,remark?:string}} extra
|
||||
* @returns {Promise<{record:object,warning:string,duplicated:boolean,message:string}>}
|
||||
*/
|
||||
export function clockAttendance(type, extra = {}) {
|
||||
return request({
|
||||
url: '/api/oa/attendance/clock',
|
||||
@@ -30,11 +16,6 @@ export function clockAttendance(type, extra = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 我的考勤记录(默认本月)
|
||||
* @param {{page?:number,pageSize?:number,startDate?:string,endDate?:string}} params
|
||||
* @returns {Promise<{list:Array,total:number,stats:object}>}
|
||||
*/
|
||||
export function fetchMyAttendanceRecords(params = {}) {
|
||||
return request({
|
||||
url: '/api/oa/attendance/records',
|
||||
@@ -47,12 +28,6 @@ export function fetchMyAttendanceRecords(params = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 个人考勤卡:按 月 / 季 / 年 聚合
|
||||
* @param {'month'|'quarter'|'year'} period
|
||||
* @param {string} date 锚点日期 "YYYY-MM-DD",默认今天
|
||||
* @returns {Promise<{period:string,label:string,start_date:string,end_date:string,stats:object}>}
|
||||
*/
|
||||
export function fetchAttendanceStats(period = 'month', date = '') {
|
||||
return request({
|
||||
url: '/api/oa/attendance/stats',
|
||||
@@ -60,7 +35,19 @@ export function fetchAttendanceStats(period = 'month', date = '') {
|
||||
})
|
||||
}
|
||||
|
||||
/** 今日 "YYYY-MM-DD"(与后端本地日期口径一致) */
|
||||
export function submitAttendanceFix(data) {
|
||||
return request({
|
||||
url: '/api/oa/attendance/fix',
|
||||
method: 'POST',
|
||||
data: {
|
||||
record_id: data.recordId,
|
||||
fix_type: data.fixType,
|
||||
fix_time: data.fixTime || '',
|
||||
reason: data.reason || ''
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
export function todayString() {
|
||||
const now = new Date()
|
||||
const pad = (n) => String(n).padStart(2, '0')
|
||||
|
||||
@@ -2,22 +2,10 @@ import { request } from '@/api/request.js'
|
||||
import { getBaseURL } from '@/api/config.js'
|
||||
import { getToken } from '@/utils/auth.js'
|
||||
|
||||
/**
|
||||
* OA 工作日报接口封装,对应后端 /api/oa/dailyreport/*。
|
||||
* 与后台 PC 端 /backend/oa/dailyreport/* 共用同一套数据与权限:
|
||||
* 本人 / 部门主管 / 管理员三级可见,已提交日报支持评论与回复。
|
||||
*/
|
||||
|
||||
/** 当前用户身份与可见范围 */
|
||||
export function fetchDailyReportProfile() {
|
||||
return request({ url: '/api/oa/dailyreport/profile' })
|
||||
}
|
||||
|
||||
/**
|
||||
* 我的日报列表
|
||||
* @param {{page?:number,pageSize?:number,startDate?:string,endDate?:string}} params
|
||||
* @returns {{list:Array,total:number,summary:Object}}
|
||||
*/
|
||||
export function fetchMyDailyReports(params = {}) {
|
||||
return request({
|
||||
url: '/api/oa/dailyreport/mine/list',
|
||||
@@ -30,11 +18,6 @@ export function fetchMyDailyReports(params = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 我的日报近期热力图(默认含本月往前 3 个月)
|
||||
* @param {{months?:number}} params
|
||||
* @returns {{start_date:string,end_date:string,total:number,submitted:number,days:Array<{date:string,status:number,id:number}>}}
|
||||
*/
|
||||
export function fetchMyDailyReportCalendar(params = {}) {
|
||||
return request({
|
||||
url: '/api/oa/dailyreport/calendar',
|
||||
@@ -42,15 +25,10 @@ export function fetchMyDailyReportCalendar(params = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 日报详情:{ report, comments, can_edit, can_delete, can_comment } */
|
||||
export function fetchDailyReportDetail(id) {
|
||||
return request({ url: `/api/oa/dailyreport/detail/${id}` })
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存日报
|
||||
* @param {{date:string,todayDone:string,tomorrowPlan:string,issues:string,attachments:Array,submit:boolean}} payload
|
||||
*/
|
||||
export function saveDailyReport(payload) {
|
||||
return request({
|
||||
url: '/api/oa/dailyreport/save',
|
||||
@@ -70,16 +48,10 @@ export function deleteDailyReport(id) {
|
||||
return request({ url: `/api/oa/dailyreport/delete/${id}`, method: 'DELETE' })
|
||||
}
|
||||
|
||||
/** 撤销提交:已提交日报退回草稿,本次提交内容写入修改痕迹,需重新提交 */
|
||||
export function withdrawDailyReport(id) {
|
||||
return request({ url: `/api/oa/dailyreport/withdraw/${id}`, method: 'POST' })
|
||||
}
|
||||
|
||||
/**
|
||||
* 团队日报汇总
|
||||
* @param {{date?:string,orgId?:number,keyword?:string,page?:number,pageSize?:number}} params
|
||||
* @returns {{date:string,list:Array,total:number,stats:Object}}
|
||||
*/
|
||||
export function fetchTeamDailyReports(params = {}) {
|
||||
return request({
|
||||
url: '/api/oa/dailyreport/team/status',
|
||||
@@ -93,12 +65,10 @@ export function fetchTeamDailyReports(params = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 团队筛选部门:{ list: [{id,parent_id,name,member_count}] } */
|
||||
export function fetchTeamDailyReportOrgs() {
|
||||
return request({ url: '/api/oa/dailyreport/team/orgs' })
|
||||
}
|
||||
|
||||
/** 评论 / 回复:replyToId=0 表示直接评论 */
|
||||
export function addDailyReportComment(reportId, content, replyToId = 0) {
|
||||
return request({
|
||||
url: '/api/oa/dailyreport/comment',
|
||||
@@ -115,10 +85,6 @@ export function deleteDailyReportComment(id) {
|
||||
return request({ url: `/api/oa/dailyreport/comment/${id}`, method: 'DELETE' })
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传日报附件(multipart,字段名 file,单文件 ≤10MB)
|
||||
* 返回 { id, url, name },与 Web 端上传结果结构一致。
|
||||
*/
|
||||
export function uploadDailyReportFile(filePath) {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
@@ -131,7 +97,6 @@ export function uploadDailyReportFile(filePath) {
|
||||
try {
|
||||
body = JSON.parse(res.data || '{}')
|
||||
} catch (e) {
|
||||
// 非 JSON 响应按失败处理
|
||||
}
|
||||
if (res.statusCode >= 200 && res.statusCode < 300 && body.code === 200 && body.data) {
|
||||
resolve(body.data)
|
||||
@@ -149,7 +114,6 @@ export function uploadDailyReportFile(filePath) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 今日 "YYYY-MM-DD"(与后端本地日期口径一致) */
|
||||
export function todayString() {
|
||||
const now = new Date()
|
||||
const pad = (n) => String(n).padStart(2, '0')
|
||||
|
||||
@@ -2,24 +2,15 @@ import { request } from '@/api/request.js'
|
||||
import { getBaseURL } from '@/api/config.js'
|
||||
import { getToken } from '@/utils/auth.js'
|
||||
|
||||
/**
|
||||
* OA 工作日程(日历待办)接口封装,对应后端 /api/oa/schedule/*。
|
||||
* 数据表 yz_backend_oa_schedule,与「日程提醒」(/api/schedule/*,
|
||||
* yz_backend_schedule)是两个独立功能,不要混用。
|
||||
*/
|
||||
|
||||
/** 优先级选项(与 Web 后台一致:0 普通 / 1 重要 / 2 紧急) */
|
||||
export const OA_SCHEDULE_PRIORITY_OPTIONS = [
|
||||
{ value: 0, label: '普通' },
|
||||
{ value: 1, label: '重要' },
|
||||
{ value: 2, label: '紧急' }
|
||||
]
|
||||
|
||||
/** 归一化单条日程:补齐端上排序/分组用的时间戳与派生字段 */
|
||||
export function normalizeOaSchedule(item) {
|
||||
const date = String(item.schedule_date || '').slice(0, 10)
|
||||
const startTime = item.start_time || ''
|
||||
// 拼一个 Date 时间戳便于日历分组与时间排序(全天事件按 00:00)
|
||||
let timestamp = 0
|
||||
if (date) {
|
||||
const [y, m, d] = date.split('-').map(Number)
|
||||
@@ -35,10 +26,6 @@ export function normalizeOaSchedule(item) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工作日程列表(支持日期区间 / 分类筛选)
|
||||
* 返回 { list, total, counts },counts 为各分类数量角标
|
||||
*/
|
||||
export async function fetchOaSchedules(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/oa/schedule/list',
|
||||
@@ -57,18 +44,12 @@ export async function fetchOaSchedules(params = {}) {
|
||||
return { list, total: data.total || 0, counts: data.counts || {} }
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单条日程详情
|
||||
*/
|
||||
export async function getOaSchedule(id) {
|
||||
const data = await request({ url: `/api/oa/schedule/detail/${id}` })
|
||||
if (!data || !data.item) return null
|
||||
return { ...normalizeOaSchedule(data.item), images: data.images || [] }
|
||||
}
|
||||
|
||||
/**
|
||||
* 新建日程
|
||||
*/
|
||||
export async function createOaSchedule(payload) {
|
||||
return request({
|
||||
url: '/api/oa/schedule/create',
|
||||
@@ -77,9 +58,6 @@ export async function createOaSchedule(payload) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新日程
|
||||
*/
|
||||
export async function updateOaSchedule(id, payload) {
|
||||
return request({
|
||||
url: `/api/oa/schedule/update/${id}`,
|
||||
@@ -88,26 +66,16 @@ export async function updateOaSchedule(id, payload) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除日程(软删除)
|
||||
*/
|
||||
export async function deleteOaSchedule(id) {
|
||||
await request({ url: `/api/oa/schedule/delete/${id}`, method: 'DELETE' })
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 切换完成状态(待办 <-> 已完成)
|
||||
*/
|
||||
export async function toggleOaScheduleComplete(id) {
|
||||
const res = await request({ url: `/api/oa/schedule/finish/${id}`, method: 'POST' })
|
||||
return { status: res?.status ?? 0, completed: res?.status === 1 }
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传日程资料图片(multipart,单张 ≤10MB)
|
||||
* 文件落入租户文件管理,返回 { id, url, name } 引用信息
|
||||
*/
|
||||
export function uploadOaScheduleImage(filePath) {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
@@ -120,7 +88,6 @@ export function uploadOaScheduleImage(filePath) {
|
||||
try {
|
||||
body = JSON.parse(res.data || '{}')
|
||||
} catch (e) {
|
||||
// 非 JSON 响应按失败处理
|
||||
}
|
||||
if (res.statusCode >= 200 && res.statusCode < 300 && body.code === 200 && body.data) {
|
||||
resolve(body.data)
|
||||
@@ -138,9 +105,6 @@ export function uploadOaScheduleImage(filePath) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存日程资料图片引用列表(整体覆盖)
|
||||
*/
|
||||
export async function setOaScheduleImages(id, images) {
|
||||
const res = await request({
|
||||
url: `/api/oa/schedule/images/${id}`,
|
||||
@@ -156,7 +120,6 @@ export async function setOaScheduleImages(id, images) {
|
||||
return res?.images || []
|
||||
}
|
||||
|
||||
/** 组装后端要求的请求体(提醒绑定暂不在小程序端开放) */
|
||||
function buildOaSchedulePayload(p) {
|
||||
return {
|
||||
title: p.title,
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
/**
|
||||
* 小程序新用户引导:手机号授权 → 密码注册 → 创建 / 挂靠企业。
|
||||
* 统一走 /api/onboarding/*,其余业务接口不变。
|
||||
*/
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/** 微信手机号授权:返回 { exists, need_register, register_token, mobile_mask } */
|
||||
export function onboardingPhone({ code, phoneCode, appid = '' } = {}) {
|
||||
return request({
|
||||
url: '/api/onboarding/phone',
|
||||
@@ -14,7 +9,6 @@ export function onboardingPhone({ code, phoneCode, appid = '' } = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 无账号时设置密码注册(≥6 位),返回 { tokens, need_tenant, mobile_mask } */
|
||||
export function onboardingRegister({ token, password, confirmPassword }) {
|
||||
return request({
|
||||
url: '/api/onboarding/register',
|
||||
@@ -24,12 +18,10 @@ export function onboardingRegister({ token, password, confirmPassword }) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 企业绑定 / 最新申请状态 / 微信手机号(手机号只读) */
|
||||
export function getOnboardingStatus() {
|
||||
return request({ url: '/api/onboarding/status', method: 'GET', silent: true })
|
||||
}
|
||||
|
||||
/** 挂靠企业:按企业全称搜索 */
|
||||
export function searchOnboardingTenants(keyword) {
|
||||
return request({
|
||||
url: '/api/onboarding/tenants',
|
||||
@@ -39,7 +31,6 @@ export function searchOnboardingTenants(keyword) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 挂靠企业:按企业取部门下拉 */
|
||||
export function getOnboardingDepartments(tid) {
|
||||
return request({
|
||||
url: '/api/onboarding/departments',
|
||||
@@ -49,7 +40,6 @@ export function getOnboardingDepartments(tid) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 挂靠企业:按企业 + 部门取职位下拉 */
|
||||
export function getOnboardingPositions(tid, departmentId) {
|
||||
return request({
|
||||
url: '/api/onboarding/positions',
|
||||
@@ -59,12 +49,10 @@ export function getOnboardingPositions(tid, departmentId) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 提交挂靠企业申请(手机号由后端取微信验证结果,禁止前端传) */
|
||||
export function applyJoin(data) {
|
||||
return request({ url: '/api/onboarding/apply-join', method: 'POST', data, silent: true })
|
||||
}
|
||||
|
||||
/** 提交创建企业申请(沿用 PC 完整字段与校验) */
|
||||
export function applyCreate(data) {
|
||||
return request({ url: '/api/onboarding/apply-create', method: 'POST', data, silent: true })
|
||||
}
|
||||
@@ -1,10 +1,5 @@
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/**
|
||||
* 账号管理(密码库)——记录个人各平台账号。
|
||||
* 与 Web 端密码存储管理同一套数据(一个平台下挂多个账号)。
|
||||
* 服务端自动过滤当前登录用户的记录,无需传 user_id。
|
||||
*/
|
||||
export function fetchPasswordStores(keyword) {
|
||||
return request({
|
||||
url: '/api/passwordStore/list',
|
||||
@@ -44,7 +39,6 @@ export function deletePasswordStore(id) {
|
||||
}).then(() => true)
|
||||
}
|
||||
|
||||
/** 只取服务端接收的字段 */
|
||||
function pickStore(data) {
|
||||
return {
|
||||
platform: data.platform || '',
|
||||
@@ -59,7 +53,6 @@ function pickStore(data) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 统一账号列表结构,避免后端缺字段导致渲染报错 */
|
||||
function normalizeStore(item) {
|
||||
const store = item || {}
|
||||
return {
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
/**
|
||||
* 统一请求封装:baseURL、Bearer Token、业务 code 处理。
|
||||
* 接口地址统一从 .env 的 VITE_API_BASE_URL 读取(见 api/config.js)。
|
||||
*/
|
||||
import { getToken, logout, isSSOEnabled, getRefreshToken, setAuthTokens, isLoggedIn } from '@/utils/auth.js'
|
||||
import { getGuestToken, clearGuestToken } from '@/utils/guest.js'
|
||||
import { resolveBaseURL, getBaseURL } from '@/api/config.js'
|
||||
@@ -12,10 +8,6 @@ function buildFullUrl(url) {
|
||||
return resolveBaseURL().replace(/\/$/, '') + url
|
||||
}
|
||||
|
||||
/**
|
||||
* 用 refresh_token 换取新的访问令牌(独立封装,避免与 request 递归调用)。
|
||||
* 仅在统一认证模式(VITE_AUTH_MODE=sso)下使用。
|
||||
*/
|
||||
function refreshAccessToken() {
|
||||
return new Promise((resolve, reject) => {
|
||||
const refresh = getRefreshToken()
|
||||
@@ -43,7 +35,6 @@ function refreshAccessToken() {
|
||||
})
|
||||
}
|
||||
|
||||
/** 续期后重放原请求,返回与 request 一致的 data 解包结果 */
|
||||
async function replayRequest(options) {
|
||||
const token = await refreshAccessToken()
|
||||
const res = await new Promise((resolve, reject) => {
|
||||
@@ -69,10 +60,6 @@ async function replayRequest(options) {
|
||||
return typeof res.data !== 'undefined' ? res.data : res
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {{ url: string, method?: string, data?: object, header?: object, silent?: boolean }} options
|
||||
* @returns {Promise<any>} 业务 data 字段(若无 data 则返回整包)
|
||||
*/
|
||||
export function request(options = {}) {
|
||||
const { url, method = 'GET', data, header = {}, silent = false, timeout = 30000 } = options
|
||||
const headers = {
|
||||
@@ -95,8 +82,6 @@ export function request(options = {}) {
|
||||
const body = res.data || {}
|
||||
|
||||
if (status === 401 || body.code === 401) {
|
||||
// 游客令牌过期/被吊销:只清游客态并回门户重新授权,
|
||||
// 不进登录引导(免登录模块对游客令牌报 403 端不匹配,不会走到这里)。
|
||||
if (!isLoggedIn() && getGuestToken()) {
|
||||
clearGuestToken()
|
||||
if (!silent) {
|
||||
@@ -108,24 +93,17 @@ export function request(options = {}) {
|
||||
reject(new Error(body.msg || '未授权'))
|
||||
return
|
||||
}
|
||||
// 统一认证模式:先用 refresh_token 静默续期并重放请求,
|
||||
// 续期失败(令牌过期/被吊销/被踢下线)才真正登出。
|
||||
if (isSSOEnabled()) {
|
||||
try {
|
||||
resolve(await replayRequest(options))
|
||||
return
|
||||
} catch (e) {
|
||||
// 续期失败,继续走下面的登出流程
|
||||
}
|
||||
}
|
||||
logout()
|
||||
if (!silent) {
|
||||
uni.showToast({ title: body.msg || '请重新登录', icon: 'none' })
|
||||
}
|
||||
// 门户首页 nav 是默认落地页,允许游客停留。
|
||||
// 若 401 发生在 nav(多为残留/过期令牌触发的 /api/home),
|
||||
// 登出后回 nav 以游客态重载,而不是强跳统一认证登录页;
|
||||
// 业务内页(需登录)仍照常引导到登录。
|
||||
const onNav = (() => {
|
||||
const ps = (typeof getCurrentPages === 'function' && getCurrentPages()) || []
|
||||
const cur = ps.length ? ps[ps.length - 1] : null
|
||||
@@ -144,14 +122,12 @@ export function request(options = {}) {
|
||||
const msg = body.msg || `请求失败(${status})`
|
||||
if (!silent) uni.showToast({ title: msg, icon: 'none' })
|
||||
const err = new Error(msg)
|
||||
// 保留响应体:登录等接口用 reason 等字段做差异化引导
|
||||
err.code = typeof body.code !== 'undefined' ? body.code : status
|
||||
err.response = body
|
||||
reject(err)
|
||||
return
|
||||
}
|
||||
|
||||
// 统一后端 { code, msg, data }
|
||||
if (typeof body.code !== 'undefined' && body.code !== 200) {
|
||||
const msg = body.msg || '操作失败'
|
||||
if (!silent) uni.showToast({ title: msg, icon: 'none' })
|
||||
@@ -179,10 +155,6 @@ export function request(options = {}) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 注入 Authorization:正式令牌优先;未登录但持有游客令牌(手机号授权签发)时带游客令牌,
|
||||
* 由后端各控制器自行决定是否放行 guest 端(不放行者报 403,不影响游客态浏览)。
|
||||
*/
|
||||
function applyAuth(headers) {
|
||||
const token = getToken()
|
||||
if (token) {
|
||||
@@ -195,7 +167,6 @@ function applyAuth(headers) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 返回完整响应体(含 code/msg),用于需要自行判断 code 的场景 */
|
||||
export function requestRaw(options = {}) {
|
||||
const { url, method = 'GET', data, header = {} } = options
|
||||
const headers = {
|
||||
|
||||
@@ -56,9 +56,6 @@ export function normalizeSchedule(item) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取日程列表
|
||||
*/
|
||||
export async function fetchSchedules(params = {}) {
|
||||
const data = await request({
|
||||
url: '/api/schedule/list',
|
||||
@@ -73,17 +70,11 @@ export async function fetchSchedules(params = {}) {
|
||||
return { list, total: data.total || 0 }
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单条日程
|
||||
*/
|
||||
export async function getSchedule(id) {
|
||||
const data = await request({ url: `/api/schedule/${id}` })
|
||||
return data ? normalizeSchedule(data) : null
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建日程
|
||||
*/
|
||||
export async function createSchedule(data) {
|
||||
const channels = (data.remindChannels || []).map(ch => {
|
||||
if (ch === 'app') return 'SITE_MSG'
|
||||
@@ -104,9 +95,6 @@ export async function createSchedule(data) {
|
||||
return res
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新日程
|
||||
*/
|
||||
export async function updateSchedule(id, data) {
|
||||
const channels = (data.remindChannels || []).map(ch => {
|
||||
if (ch === 'app') return 'SITE_MSG'
|
||||
@@ -126,17 +114,11 @@ export async function updateSchedule(id, data) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除日程
|
||||
*/
|
||||
export async function deleteSchedule(id) {
|
||||
await request({ url: `/api/schedule/${id}`, method: 'DELETE' })
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 切换完成状态
|
||||
*/
|
||||
export async function toggleScheduleComplete(id) {
|
||||
const res = await request({
|
||||
url: `/api/schedule/${id}/toggle`,
|
||||
|
||||
@@ -1,14 +1,5 @@
|
||||
/**
|
||||
* 小程序订阅消息(对应后端 go/controllers/api_mini_subscribe.go)
|
||||
*
|
||||
* 订阅消息是「用户授权 → 服务器主动推给用户」的通道:
|
||||
* 1. getSubscribeTemplates() 取当前可订阅的模板
|
||||
* 2. 用户在微信弹窗里同意后,authorizeSubscribe() 上报,服务器记一次发送机会
|
||||
* 3. 之后业务侧发站内信/审批待办,服务器自动推送到用户微信
|
||||
*/
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/** 取可订阅的模板列表(含模板 ID、跳转页面、剩余可发送次数) */
|
||||
export function getSubscribeTemplates() {
|
||||
return request({
|
||||
url: '/api/mini/subscribe/templates',
|
||||
@@ -16,10 +7,6 @@ export function getSubscribeTemplates() {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 上报授权结果:每授权一次,服务器记一次可发送机会
|
||||
* @param {string[]} templateIds 用户同意的模板 ID 列表
|
||||
*/
|
||||
export function authorizeSubscribe(templateIds) {
|
||||
return request({
|
||||
url: '/api/mini/subscribe/authorize',
|
||||
@@ -28,10 +15,6 @@ export function authorizeSubscribe(templateIds) {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 发一条测试订阅消息(验证模板配置是否正确)
|
||||
* @param {{title?: string, content?: string}} payload
|
||||
*/
|
||||
export function sendTestSubscribeNotice(payload = {}) {
|
||||
return request({
|
||||
url: '/api/mini/subscribe/test',
|
||||
|
||||
@@ -1,20 +1,9 @@
|
||||
/**
|
||||
* 移动端「工作台」接口
|
||||
*
|
||||
* /api/home 一次返回首屏所需的全部数据(应用模块卡片 + 可见菜单 + KPI),
|
||||
* 避免移动端首屏多次往返。
|
||||
*/
|
||||
import { request } from '@/api/request.js'
|
||||
|
||||
/**
|
||||
* 内存缓存:nav.vue 与 dashboard 都会拉同一份数据,
|
||||
* 30 秒内复用,避免切页反复请求。登出/切换企业时由 clearHomeCache 失效。
|
||||
*/
|
||||
const CACHE_TTL = 30 * 1000
|
||||
let cache = null
|
||||
let cacheAt = 0
|
||||
|
||||
/** 工作台聚合数据:{ user, modules, menus, stats } */
|
||||
export async function fetchHome(force = false) {
|
||||
if (!force && cache && Date.now() - cacheAt < CACHE_TTL) return cache
|
||||
const data = await request({
|
||||
@@ -28,17 +17,11 @@ export async function fetchHome(force = false) {
|
||||
return data
|
||||
}
|
||||
|
||||
/** 登出 / 切换企业后调用,避免脏数据留在内存缓存里 */
|
||||
export function clearHomeCache() {
|
||||
cache = null
|
||||
cacheAt = 0
|
||||
}
|
||||
|
||||
/**
|
||||
* 免登录模块宫格:GET /api/modules/public(公开接口,无需 token)。
|
||||
* 返回 [{ id, code, name, icon, path, description, require_login }]。
|
||||
* 供未登录用户渲染 nav 首页,按 require_login 决定点击是「进登录引导」还是「直接进入」。
|
||||
*/
|
||||
export function fetchPublicModules() {
|
||||
return request({
|
||||
url: '/api/modules/public',
|
||||
@@ -48,12 +31,6 @@ export function fetchPublicModules() {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 免登录菜单:GET /api/menus/public(公开接口,无需 token)。
|
||||
* 返回 [{ id, pid, title, path, icon, type, sort, module, leaf }],
|
||||
* 菜单级 require_login=0 的集合:游客(持游客令牌)可用功能的唯一入口清单,
|
||||
* nav 宫格据此判定模块是否可免登录进入,子系统据此渲染游客功能列表。
|
||||
*/
|
||||
export function fetchPublicMenus() {
|
||||
return request({
|
||||
url: '/api/menus/public',
|
||||
|
||||
@@ -23,14 +23,6 @@
|
||||
<script setup>
|
||||
import { computed } from 'vue'
|
||||
|
||||
/**
|
||||
* 底部 tabbar。
|
||||
*
|
||||
* variant = 'route':独立页模式。每个子系统(crm / erp / oa / cms / toolbox)有独立的页面组,
|
||||
* 通过 group(子系统目录名)解析路由并 redirectTo 跳转;导航页 nav.vue 不使用本组件。
|
||||
* variant = 'switch':页内模式。用于 pages/sub/tabs.vue,切换时只 emit change 由父页控制
|
||||
* 内容区显隐,避免页面栈堆积、保留各页签状态;tabs 可由父页传入。
|
||||
*/
|
||||
const props = defineProps({
|
||||
group: {
|
||||
type: String,
|
||||
@@ -56,15 +48,12 @@ const DEFAULT_TABS = [
|
||||
{ name: 'home', text: '概览', icon: 'gauge' },
|
||||
{ name: 'functions', text: '功能', icon: 'table-cells' },
|
||||
{ name: 'todo', text: '待办', icon: 'circle-check' },
|
||||
// 末位不再是「我的」,而是回平台(模块选择页);name 保留 mine 以兼容 current="mine"
|
||||
{ name: 'mine', text: '回平台', icon: 'arrow-left' }
|
||||
]
|
||||
|
||||
const list = computed(() => (props.tabs && props.tabs.length ? props.tabs : DEFAULT_TABS))
|
||||
|
||||
function onTap(name) {
|
||||
// 「回平台」:清空页面栈回到模块选择页。必须放在 current 判重之前,
|
||||
// 否则停在原「我的」页时点击会被判重拦下。
|
||||
if (name === 'mine' || name === 'platform') {
|
||||
uni.reLaunch({ url: '/pages/nav/nav' })
|
||||
return
|
||||
@@ -74,7 +63,6 @@ function onTap(name) {
|
||||
emit('change', name)
|
||||
return
|
||||
}
|
||||
// 子系统内部页面与 tab 一一对应,用 redirectTo 避免页面栈堆积
|
||||
uni.redirectTo({ url: `/pages/${props.group}/${name}/${name}` })
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="apv-head" :style="headPad">
|
||||
<!-- 左侧:返回按钮 + 可选标题前缀 -->
|
||||
<view class="apv-head-left">
|
||||
<view class="apv-back" hover-class="apv-back-active" @tap="onBack">
|
||||
<FaIcon name="chevron-left" color="#1f2b48" :size="20" />
|
||||
@@ -8,12 +7,10 @@
|
||||
<text v-if="backText" class="apv-back-text">{{ backText }}</text>
|
||||
</view>
|
||||
|
||||
<!-- 中间:标题 -->
|
||||
<view class="apv-head-center">
|
||||
<text class="apv-title">{{ title }}</text>
|
||||
</view>
|
||||
|
||||
<!-- 右侧:可选操作槽(默认占位,避免标题被挤偏) -->
|
||||
<view class="apv-head-right">
|
||||
<slot name="right" />
|
||||
</view>
|
||||
@@ -25,14 +22,8 @@ import { computed } from 'vue'
|
||||
import { mpHeadPad } from '@/utils/mpHead.js'
|
||||
|
||||
const props = defineProps({
|
||||
/** 标题 */
|
||||
title: { type: String, required: true },
|
||||
/** 返回按钮旁的文字(不传则只显示箭头图标)。常见「返回」「关闭」。 */
|
||||
backText: { type: String, default: '' },
|
||||
/**
|
||||
* 自定义返回行为。函数返回 false 时阻止默认 navigateBack。
|
||||
* 例:detail 页面有未保存修改时拦截。
|
||||
*/
|
||||
beforeBack: { type: Function, default: null }
|
||||
})
|
||||
|
||||
@@ -45,12 +36,10 @@ function onBack() {
|
||||
if (pages.length > 1) {
|
||||
uni.navigateBack({ delta: 1 })
|
||||
} else {
|
||||
// 栈内只有自己(直链进入),回到子系统首页
|
||||
uni.reLaunch({ url: '/pages/nav/nav' })
|
||||
}
|
||||
}
|
||||
|
||||
// 状态栏高度避让:胶囊可用则按胶囊底缘 + 8px,否则回退到 safe-area-inset-top
|
||||
const headPad = computed(() => mpHeadPad(8))
|
||||
</script>
|
||||
|
||||
|
||||
@@ -25,14 +25,9 @@ const props = defineProps({
|
||||
}
|
||||
})
|
||||
|
||||
// 菜单图标在数据库里常以完整 Font Awesome 类名字符串存储(如 "fas fa-dashboard"、
|
||||
// "fa-brands fa-cash-app"、"far fa-trash-can"),而 FA_ICONS 的键是去前缀的裸名字。
|
||||
// 这里统一归一化:解析出裸图标名与字重(solid/regular/brands),
|
||||
// 使同一份图标数据在移动端也能正确渲染;已是裸名字(如 "chevron-left")时原样返回。
|
||||
const parsed = computed(() => {
|
||||
const raw = String(props.name || '').trim()
|
||||
if (!raw) return { name: '', brands: false }
|
||||
// 完整类名:按空白拆 token,取以 fa- 开头且非样式字重(fa-solid/regular/brands)的最后一段
|
||||
if (/\bfa-(solid|regular|light|thin|duotone|brands)\b|\bfas\b|\bfar\b|\bfal\b|\bfab\b/.test(raw)) {
|
||||
const tokens = raw.split(/\s+/)
|
||||
let brands = false
|
||||
@@ -45,7 +40,6 @@ const parsed = computed(() => {
|
||||
}
|
||||
return { name: icon, brands }
|
||||
}
|
||||
// 裸名字:可能仍带一个 fa- 前缀,去掉后查表
|
||||
return { name: raw.replace(/^fa-/, ''), brands: props.type === 'brands' }
|
||||
})
|
||||
|
||||
|
||||
@@ -23,11 +23,6 @@
|
||||
<script setup>
|
||||
import { computed } from 'vue'
|
||||
|
||||
/**
|
||||
* 主 tabbar —— 默认「工作台 / 应用 / 我的」。
|
||||
* 传入 tabs 时按自定义页签渲染(个人中心用「我的 / 回平台」两项);
|
||||
* name=platform 为特殊动作:清空页面栈回到平台模块选择页。
|
||||
*/
|
||||
const props = defineProps({
|
||||
current: {
|
||||
type: String,
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="note-editor-wrapper">
|
||||
<!-- 通用富文本工具栏(H5 与 Android/iOS App 手机端均完整支持) -->
|
||||
<view class="editor-toolbar">
|
||||
<view class="toolbar-group">
|
||||
<view class="tb-btn" title="加粗" @tap="handleFormat('bold')">
|
||||
@@ -48,7 +47,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 表格操作组(全端支持插入与行列增删) -->
|
||||
<view class="toolbar-divider" />
|
||||
<view class="toolbar-group">
|
||||
<view class="tb-btn" title="插入表格" @tap="onInsertTable">
|
||||
@@ -97,7 +95,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 编辑区(H5 与 App-plus 均使用真正的 HTML5 Webview DOM 渲染与编辑表格) -->
|
||||
<!-- #ifdef H5 -->
|
||||
<div
|
||||
ref="h5EditorRef"
|
||||
@@ -157,7 +154,6 @@ const isInternalUpdate = ref(false)
|
||||
const lastAppliedHtml = ref('')
|
||||
const renderAction = ref(null)
|
||||
|
||||
// 响应 RenderJS 传递上来的内容更新
|
||||
function onContentChange(html) {
|
||||
lastAppliedHtml.value = html
|
||||
isInternalUpdate.value = true
|
||||
@@ -167,7 +163,6 @@ function onContentChange(html) {
|
||||
})
|
||||
}
|
||||
|
||||
// 供 template 绑定的 Renderjs 桥接方法
|
||||
function onRenderChange(html) {
|
||||
onContentChange(html)
|
||||
}
|
||||
@@ -224,7 +219,6 @@ function onInsertTable() {
|
||||
})
|
||||
}
|
||||
|
||||
// ================= H5 专属 DOM 操作 =================
|
||||
function execH5Format(cmd, value = null) {
|
||||
const el = h5EditorRef.value
|
||||
if (!el) return
|
||||
@@ -359,7 +353,6 @@ onMounted(() => {
|
||||
// #endif
|
||||
})
|
||||
|
||||
// 将 onRenderChange 挂载到组件实例供 Renderjs 调用
|
||||
defineExpose({
|
||||
onRenderChange
|
||||
})
|
||||
@@ -608,7 +601,6 @@ export default {
|
||||
<style lang="scss">
|
||||
@import '@/src/styles/rich-content.scss';
|
||||
|
||||
/* 小程序端用 class 选择器,避免标签选择器兼容性警告 */
|
||||
.note-rich-editor-table {
|
||||
display: table !important;
|
||||
border-collapse: collapse !important;
|
||||
|
||||
@@ -49,12 +49,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 移动端通用底部选择器(单选)。
|
||||
* 单据开单要选商品/仓库/客商/审批流,选项动辄上千条,
|
||||
* 原生 picker 无法搜索,这里统一用「搜索 + 列表 + 点选即回填」的抽屉。
|
||||
* 默认本地过滤;数据量大时传 remote 并监听 search,由页面做服务端搜索。
|
||||
*/
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
|
||||
@@ -63,12 +57,9 @@ const props = defineProps({
|
||||
title: { type: String, default: '请选择' },
|
||||
placeholder: { type: String, default: '搜索' },
|
||||
options: { type: Array, default: () => [] },
|
||||
/** 当前选中值,用于高亮(可选) */
|
||||
modelValue: { type: [String, Number, null], default: null },
|
||||
/** 服务端搜索:关键字变化时向外抛 search,不在本地过滤 */
|
||||
remote: { type: Boolean, default: false },
|
||||
loading: { type: Boolean, default: false },
|
||||
/** 列表顶部提示(如「仅显示前 50 条」) */
|
||||
tip: { type: String, default: '' }
|
||||
})
|
||||
|
||||
@@ -173,7 +164,6 @@ function close() {
|
||||
min-height: 0;
|
||||
max-height: 52vh;
|
||||
padding: 0 $page-padding-x 20rpx;
|
||||
/* scroll-view 默认 content-box,加左右内边距会把内容顶出屏幕右侧 */
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
<text class="empty-text">该子系统下暂无你可见的功能</text>
|
||||
</view>
|
||||
|
||||
<!-- 功能分组:每个分组一个 card,组内为功能 card(一行 4 个,仅图标 + 名称) -->
|
||||
<view v-else class="group-list">
|
||||
<view v-for="group in groups" :key="group.id" class="group-card">
|
||||
<view class="group-head">
|
||||
@@ -71,7 +70,6 @@ const emit = defineEmits(['switch-tab', 'back'])
|
||||
|
||||
const { sub, loading, loadError, allMenus, load } = useSubsystem(props.slug)
|
||||
|
||||
/** 模块 code → 图标,用于菜单自身没配图标时的兜底 */
|
||||
const fallbackIcon = computed(() => {
|
||||
const map = {
|
||||
crm: 'handshake',
|
||||
@@ -83,7 +81,6 @@ const fallbackIcon = computed(() => {
|
||||
return map[String(sub.module || '').toLowerCase()] || 'file-lines'
|
||||
})
|
||||
|
||||
/** 判断菜单项是否命中 WEB_RULES(小程序端不再展示,由 Web 端处理) */
|
||||
function isWebEntry(menu) {
|
||||
if (!menu) return false
|
||||
const title = String(menu.title || '')
|
||||
@@ -91,13 +88,7 @@ function isWebEntry(menu) {
|
||||
return WEB_RULES.some(kw => title.includes(kw) || path.includes(kw))
|
||||
}
|
||||
|
||||
/**
|
||||
* 按「一级分类目录」分组:
|
||||
* 菜单层级形如 模块根 → 个人办公 → 通讯录,分组取一级目录(个人办公 / 人事管理 …),
|
||||
* 组内为该目录下的全部可见功能。无分类归属的快捷功能不在功能页展示,由首页「常用功能」承载。
|
||||
*/
|
||||
const groups = computed(() => {
|
||||
// 先把命中 WEB_RULES 的菜单项过滤掉(这些是 Web 端入口,小程序功能页不展示)
|
||||
const menus = allMenus.value
|
||||
.filter(m => !isWebEntry(m))
|
||||
.slice()
|
||||
@@ -105,9 +96,7 @@ const groups = computed(() => {
|
||||
const byId = {}
|
||||
menus.forEach((m) => { byId[m.id] = m })
|
||||
|
||||
// 取该菜单所属的「一级分组」节点
|
||||
function groupNodeOf(m) {
|
||||
// 自底向上收集祖先链:chain[0] 为链上最顶层节点
|
||||
const chain = [m]
|
||||
let cur = m
|
||||
let guard = 0
|
||||
@@ -117,12 +106,9 @@ const groups = computed(() => {
|
||||
}
|
||||
const top = chain[0]
|
||||
if (top.pid === 0) {
|
||||
// 模块根在列表内:跳过根,取它下一层(个人办公 / 人事管理 …)
|
||||
if (chain.length >= 2) return chain[1]
|
||||
// 顶层节点自身:目录视为模块容器跳过,叶子无分类归属
|
||||
return top.leaf === false ? null : top
|
||||
}
|
||||
// 模块根不在列表内:链上顶层节点本身就是一级分组
|
||||
return top
|
||||
}
|
||||
|
||||
@@ -132,7 +118,6 @@ const groups = computed(() => {
|
||||
const g = groupNodeOf(m)
|
||||
if (!g) return
|
||||
if (g.id === m.id) {
|
||||
// 自身即分组节点:目录作组标题(不重复出现在组内),叶子无分类归属不展示
|
||||
if (g.leaf === false && !groupMap.has(g.id)) {
|
||||
groupMap.set(g.id, { id: g.id, title: g.title, sort: g.sort, items: [] })
|
||||
}
|
||||
@@ -144,14 +129,12 @@ const groups = computed(() => {
|
||||
groupMap.get(g.id).items.push(m)
|
||||
})
|
||||
|
||||
// 功能页只展示「归属分类目录且有可见功能」的分组;无归属功能由首页「常用功能」承载
|
||||
const list = []
|
||||
groupMap.forEach((g) => {
|
||||
if (g.items.length) list.push(g)
|
||||
})
|
||||
list.sort((a, b) => (a.sort || 0) - (b.sort || 0))
|
||||
|
||||
// 颜色下标按展开顺序统一编号,避免每个分组都从 tint-0 开始
|
||||
let colorIndex = 0
|
||||
return list.map((group) => ({
|
||||
...group,
|
||||
@@ -168,8 +151,6 @@ function goBackNav() {
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// 菜单:登录走 /api/home,游客走公开免登录菜单(菜单级 require_login 控制),
|
||||
// 无免登录菜单的子系统游客看到空列表,不强制跳登录
|
||||
load()
|
||||
})
|
||||
|
||||
@@ -184,7 +165,6 @@ onShow(() => {
|
||||
.page {
|
||||
@include page-shell;
|
||||
|
||||
// 嵌入模式下由父页(tabs.vue)的 scroll-view 统一滚动,这里改为自然高度
|
||||
&.embedded {
|
||||
height: auto;
|
||||
}
|
||||
@@ -202,7 +182,6 @@ onShow(() => {
|
||||
|
||||
.head-title {
|
||||
display: block;
|
||||
/* 取消顶部返回按钮后,保留头部避让高度 */
|
||||
margin-top: 32rpx;
|
||||
font-size: 36rpx;
|
||||
font-weight: 600;
|
||||
@@ -261,9 +240,6 @@ onShow(() => {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* ============ 分组卡:白色卡片 + 一行 4 个功能宫格(图标在上、名称在下) ============
|
||||
cell 占 25% 宽并自带右侧间隙,容器用负 margin 抵消末列间隙,
|
||||
避免使用 calc 除法——小程序端 wxss 对复杂 calc 支持不稳。 */
|
||||
.group-card {
|
||||
@include card;
|
||||
padding: 24rpx 20rpx 8rpx;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="page" :class="{ embedded }">
|
||||
<!-- 顶部标识条(独立页模式使用;嵌入 tabs.vue 时由父页提供) -->
|
||||
<view v-if="!embedded" class="hero" :class="sub.tint" :style="headPad">
|
||||
<view class="hero-main">
|
||||
<view class="hero-icon">
|
||||
@@ -14,7 +13,6 @@
|
||||
</view>
|
||||
|
||||
<view class="body">
|
||||
<!-- 未开通 -->
|
||||
<view v-if="!enabled" class="lock-box">
|
||||
<FaIcon name="lock" color="#f04438" :size="28" />
|
||||
<text class="lock-title">该子系统未开通</text>
|
||||
@@ -22,7 +20,6 @@
|
||||
</view>
|
||||
|
||||
<block v-else>
|
||||
<!-- 加载失败 -->
|
||||
<view v-if="loadError" class="err-box" @tap="load(true)">
|
||||
<FaIcon name="triangle-exclamation" color="#f04438" :size="18" />
|
||||
<view class="err-body">
|
||||
@@ -33,9 +30,7 @@
|
||||
</view>
|
||||
|
||||
<block v-else>
|
||||
<!-- 首页卡片流:flex 纵向 + 统一 gap,避免跨组件 margin 不折叠导致间距不均 -->
|
||||
<view class="home-stack">
|
||||
<!-- OA 工作台仪表盘上半:公告 + 数据统计(常用功能插在下面) -->
|
||||
<SubOaDashboard
|
||||
v-if="isOa && dash"
|
||||
part="top"
|
||||
@@ -44,7 +39,6 @@
|
||||
@view-schedules="goSchedules"
|
||||
/>
|
||||
|
||||
<!-- 概览 / 日程待办 / 最新公告:非 OA 子系统,或 OA 仪表盘加载失败时兜底展示 -->
|
||||
<block v-if="!(isOa && dash)">
|
||||
<view class="kpi-card">
|
||||
<view class="kpi-item">
|
||||
@@ -65,7 +59,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 日程待办 -->
|
||||
<view class="block">
|
||||
<view class="block-head">
|
||||
<text class="block-title">日程待办</text>
|
||||
@@ -94,7 +87,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 最新公告(仅 OA 子系统) -->
|
||||
<view v-if="isOa" class="block">
|
||||
<view class="block-head">
|
||||
<text class="block-title">最新公告</text>
|
||||
@@ -124,7 +116,6 @@
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- 常用功能:与仪表盘卡片统一的样式,点「全部」切到功能页签 -->
|
||||
<view class="quick-card">
|
||||
<view class="quick-head">
|
||||
<view class="quick-head-left">
|
||||
@@ -152,7 +143,6 @@
|
||||
<text class="fn-name">{{ item.title }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 末位固定「+」:点击选择要加入常用功能的功能 -->
|
||||
<view class="cell">
|
||||
<view class="fn-card fn-add" @tap="openPicker">
|
||||
<view class="add-icon">
|
||||
@@ -164,7 +154,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- OA 工作台仪表盘下半:报销趋势 + 状态分布 -->
|
||||
<SubOaDashboard
|
||||
v-if="isOa && dash"
|
||||
part="bottom"
|
||||
@@ -181,7 +170,6 @@
|
||||
|
||||
<AppTabbar v-if="!embedded" :group="slug" current="home" />
|
||||
|
||||
<!-- 常用功能选择器:勾选 + 拖动手柄排序(顺序即首页宫格展示顺序) -->
|
||||
<view v-if="pickerVisible" class="picker-mask" @tap="pickerVisible = false">
|
||||
<view class="picker-sheet" @tap.stop>
|
||||
<view class="picker-head">
|
||||
@@ -194,7 +182,6 @@
|
||||
<view v-if="pickerItems.length === 0" class="picker-empty">
|
||||
当前子系统暂无可添加的功能
|
||||
</view>
|
||||
<!-- 整份列表:前 pickerSelectedCount 个为已选(高亮 + 序号),拖进/拖出前 N 个即加入/移出常用功能 -->
|
||||
<view
|
||||
v-for="(item, index) in pickerItems"
|
||||
:key="item.id"
|
||||
@@ -259,13 +246,10 @@ const { sub, loading, loadError, enabled, allMenus, leafMenus, quickMenuIds, loa
|
||||
const pending = ref([])
|
||||
const doneCount = ref(0)
|
||||
const notices = ref([])
|
||||
// OA 工作台仪表盘数据(仅 isOa 时加载)
|
||||
const dash = ref(null)
|
||||
|
||||
/** 是否 OA 子系统(决定是否展示「最新公告」卡片) */
|
||||
const isOa = computed(() => String(sub.module || '').toLowerCase() === 'oa')
|
||||
|
||||
/** 模块 code → 图标,用于菜单自身没配图标时的兜底 */
|
||||
const fallbackIcon = computed(() => {
|
||||
const map = {
|
||||
crm: 'handshake',
|
||||
@@ -277,14 +261,12 @@ const fallbackIcon = computed(() => {
|
||||
return map[String(sub.module || '').toLowerCase()] || 'file-lines'
|
||||
})
|
||||
|
||||
/** 仪表盘类菜单:不属于「常用功能」可选项,也不在宫格展示 */
|
||||
function isDashboardMenu(m) {
|
||||
const title = String(m.title || '').trim()
|
||||
const path = String(m.path || '')
|
||||
return title === '仪表盘' || /\/dashboard\/?$/.test(path)
|
||||
}
|
||||
|
||||
/** 可作为「常用功能」的候选:可跳转叶子菜单、排除仪表盘 */
|
||||
const quickCandidates = computed(() =>
|
||||
allMenus.value
|
||||
.filter((m) => m.leaf !== false && !isDashboardMenu(m))
|
||||
@@ -292,10 +274,8 @@ const quickCandidates = computed(() =>
|
||||
.sort((a, b) => (a.sort || 0) - (b.sort || 0))
|
||||
)
|
||||
|
||||
/** 宫格最多展示 7 个功能,末位固定留给「+」入口(共 8 格 = 2 行) */
|
||||
const QUICK_MAX = 7
|
||||
|
||||
/** 常用功能:优先用用户自定义顺序,未自定义时回落默认取前 QUICK_MAX 个 */
|
||||
const quickMenus = computed(() => {
|
||||
const base = quickCandidates.value
|
||||
const byId = {}
|
||||
@@ -305,14 +285,10 @@ const quickMenus = computed(() => {
|
||||
return base.slice(0, QUICK_MAX)
|
||||
})
|
||||
|
||||
// ============ 常用功能选择器(末位「+」) ============
|
||||
// 单一列表模型:pickerIds 为全部可选功能的顺序,前 pickerSelectedCount 个即「已选」,
|
||||
// 也就是首页宫格展示的常用功能——拖动改变顺序时,进出前 N 个即自动加入/移出常用功能。
|
||||
const pickerVisible = ref(false)
|
||||
const pickerIds = ref([])
|
||||
const pickerSelectedCount = ref(0)
|
||||
|
||||
/** 选择器列表(按当前顺序渲染全部功能) */
|
||||
const pickerItems = computed(() => {
|
||||
const byId = {}
|
||||
quickCandidates.value.forEach((m) => { byId[m.id] = m })
|
||||
@@ -329,7 +305,6 @@ function openPicker() {
|
||||
pickerVisible.value = true
|
||||
}
|
||||
|
||||
/** 点整行:已选→移出到已选区之后;未选→插到已选区末尾(最多 QUICK_MAX 个) */
|
||||
function togglePick(id) {
|
||||
const ids = pickerIds.value.slice()
|
||||
const i = ids.indexOf(id)
|
||||
@@ -350,9 +325,6 @@ function togglePick(id) {
|
||||
pickerIds.value = ids
|
||||
}
|
||||
|
||||
// ---- 列表拖动排序 ----
|
||||
// 行高与样式 .picker-row 的 height 保持同一数值;拖动只作用于右侧手柄,
|
||||
// 手柄上 catchtouchmove 阻止 scroll-view 跟随滚动,因此不会与列表滚动冲突。
|
||||
const SORT_ROW_RPX = 100
|
||||
const dragId = ref(null)
|
||||
const dragOffset = ref(0)
|
||||
@@ -360,7 +332,6 @@ let dragStartY = 0
|
||||
let dragRowH = 1
|
||||
let dragFromIndex = -1
|
||||
|
||||
/** 拖拽行跟随手指的残余位移(其余行由数组重排自然换位) */
|
||||
function dragRowStyle(item) {
|
||||
if (dragId.value !== item.id) return ''
|
||||
return `transform: translateY(${dragOffset.value}px);`
|
||||
@@ -392,7 +363,6 @@ function onDragMove(e) {
|
||||
ids.splice(target, 0, dragId.value)
|
||||
pickerIds.value = ids
|
||||
}
|
||||
// 抵消已经跨过的整行位移,剩余部分让行跟着手指走;越界时限制在一行内
|
||||
const residual = delta - (target - dragFromIndex) * dragRowH
|
||||
dragOffset.value = Math.max(-dragRowH, Math.min(dragRowH, residual))
|
||||
}
|
||||
@@ -423,13 +393,11 @@ async function savePicker() {
|
||||
}
|
||||
}
|
||||
|
||||
// ============ OA 工作台仪表盘 ============
|
||||
async function loadDashboard() {
|
||||
if (!isOa.value) return
|
||||
try {
|
||||
dash.value = await request({ url: '/api/oa/dashboard', method: 'GET', silent: true })
|
||||
} catch (e) {
|
||||
// 仪表盘失败不影响首页其余内容
|
||||
dash.value = null
|
||||
}
|
||||
}
|
||||
@@ -479,7 +447,6 @@ function goBackNav() {
|
||||
uni.reLaunch({ url: '/pages/nav/nav' })
|
||||
}
|
||||
|
||||
// 「功能」页签在 TAB_ORDER 中的下标为 1
|
||||
function goFunctions() {
|
||||
if (props.embedded) {
|
||||
emit('switch-tab', 1)
|
||||
@@ -501,8 +468,6 @@ function goNoticeDetail(id) {
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// 菜单:登录走 /api/home,游客走公开免登录菜单(菜单级 require_login 控制);
|
||||
// 待办等受保护数据需登录或持游客令牌(手机号授权)才拉,失败不阻断外壳
|
||||
load()
|
||||
if (!isLoggedIn() && !getGuestToken()) return
|
||||
loadTodo()
|
||||
@@ -525,7 +490,6 @@ onShow(() => {
|
||||
.page {
|
||||
@include page-shell;
|
||||
|
||||
// 嵌入模式下由父页(tabs.vue)的 scroll-view 统一滚动,这里改为自然高度
|
||||
&.embedded {
|
||||
height: auto;
|
||||
}
|
||||
@@ -544,7 +508,6 @@ onShow(() => {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 20rpx;
|
||||
/* 取消顶部返回按钮后,补偿其占位,保证与状态栏/胶囊的间距 */
|
||||
margin-top: 40rpx;
|
||||
}
|
||||
|
||||
@@ -590,7 +553,6 @@ onShow(() => {
|
||||
padding: 28rpx $page-padding-x 0;
|
||||
}
|
||||
|
||||
/* 首页卡片流:统一纵向间距(跨组件 margin 不折叠,故用 flex gap) */
|
||||
.home-stack {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -616,7 +578,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 概览卡 ============ */
|
||||
.kpi-card {
|
||||
@include card;
|
||||
display: flex;
|
||||
@@ -658,7 +619,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 列表卡 ============ */
|
||||
.list-card {
|
||||
@include card;
|
||||
overflow: hidden;
|
||||
@@ -734,10 +694,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 常用功能宫格:一行 4 个 ============
|
||||
cell 占 25% 宽并自带右侧间隙,容器用负 margin 抵消末列间隙,
|
||||
避免使用 calc 除法——小程序端 wxss 对复杂 calc 支持不稳。 */
|
||||
/* 与 SubOaDashboard 的 dash-card 保持同一视觉语言 */
|
||||
.quick-card {
|
||||
@include card;
|
||||
padding: 26rpx 24rpx 10rpx;
|
||||
@@ -820,7 +776,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* 末位「+」添加格:虚线框,区别于普通功能 */
|
||||
.fn-card.fn-add {
|
||||
background: transparent;
|
||||
border: 1rpx dashed #c7cede;
|
||||
@@ -836,7 +791,6 @@ onShow(() => {
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
/* ============ 常用功能选择器 ============ */
|
||||
.picker-mask {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
@@ -907,7 +861,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* 行高固定,拖动排序按行高换算目标位置;改这里需同步 SORT_ROW_RPX */
|
||||
.picker-row {
|
||||
position: relative;
|
||||
display: flex;
|
||||
@@ -918,7 +871,6 @@ onShow(() => {
|
||||
padding: 0 0 0 16rpx;
|
||||
border-bottom: 1rpx solid $color-divider;
|
||||
|
||||
/* 前 N 个(已选)高亮,拖动进出即加入/移出常用功能 */
|
||||
&.on {
|
||||
background: #f2f7ff;
|
||||
}
|
||||
@@ -974,7 +926,6 @@ onShow(() => {
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
/* 未选中行:空心圆(点击整行加入常用功能) */
|
||||
.picker-check {
|
||||
width: 36rpx;
|
||||
height: 36rpx;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="page" :class="{ embedded }">
|
||||
<!-- 独立页模式:渐变用户头部(嵌入 tabs.vue 时由父页提供顶部条) -->
|
||||
<view v-if="!embedded" class="head" :style="headPad">
|
||||
<view class="user">
|
||||
<view class="avatar">
|
||||
@@ -22,7 +21,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 用户卡(嵌入模式显示,独立页模式的用户信息已在头部) -->
|
||||
<view v-if="embedded" class="user-card" @tap="goProfile">
|
||||
<view class="avatar avatar-light">
|
||||
<text class="avatar-text avatar-text-dark">{{ avatarText }}</text>
|
||||
@@ -34,57 +32,51 @@
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
|
||||
<!-- 数据概览 -->
|
||||
<view class="kpi-card">
|
||||
<view class="kpi-item">
|
||||
<text class="kpi-value">{{ pendingCount }}</text>
|
||||
<text class="kpi-label">待办</text>
|
||||
</view>
|
||||
<view class="kpi-item">
|
||||
<text class="kpi-value">{{ doneCount }}</text>
|
||||
<text class="kpi-label">已完成</text>
|
||||
</view>
|
||||
<view class="kpi-item">
|
||||
<text class="kpi-value" :class="{ warn: overdue > 0 }">{{ overdue }}</text>
|
||||
<text class="kpi-label">已逾期</text>
|
||||
</view>
|
||||
<view class="kpi-item">
|
||||
<text class="kpi-value">{{ leafMenus.length }}</text>
|
||||
<text class="kpi-label">可用功能</text>
|
||||
<view class="menu-card">
|
||||
<view class="menu-row" @tap="onSubscribe">
|
||||
<view class="tint-icon row-icon tint-0">
|
||||
<FaIcon name="bell" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
<view class="row-main">
|
||||
<text class="row-title">订阅消息提醒</text>
|
||||
<text class="row-sub">审批、日程与公告的微信通知</text>
|
||||
</view>
|
||||
<text class="row-value">去开启</text>
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 常用操作:分组卡片模板,一行 4 个 -->
|
||||
<view class="group-card">
|
||||
<view class="group-head">
|
||||
<view class="group-bar" />
|
||||
<text class="group-title">常用操作</text>
|
||||
<view class="menu-card">
|
||||
<view class="menu-row" @tap="goChangePassword">
|
||||
<view class="tint-icon row-icon tint-1">
|
||||
<FaIcon name="key" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
<view class="row-main">
|
||||
<text class="row-title">修改密码</text>
|
||||
<text class="row-sub">定期更换密码,保障账号安全</text>
|
||||
</view>
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
<view class="grid">
|
||||
<view class="cell" @tap="goFunctions">
|
||||
<view class="fn-card">
|
||||
<view class="tint-icon fn-icon tint-0">
|
||||
<FaIcon name="table-cells" color="#ffffff" :size="18" />
|
||||
</view>
|
||||
<text class="fn-name">全部功能</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="menu-card">
|
||||
<view class="menu-row" @tap="goHelp">
|
||||
<view class="tint-icon row-icon tint-2">
|
||||
<FaIcon name="circle-question" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
<view class="cell" @tap="goProfile">
|
||||
<view class="fn-card">
|
||||
<view class="tint-icon fn-icon tint-1">
|
||||
<FaIcon name="user" color="#ffffff" :size="18" />
|
||||
</view>
|
||||
<text class="fn-name">账号与安全</text>
|
||||
</view>
|
||||
<view class="row-main">
|
||||
<text class="row-title">帮助中心</text>
|
||||
</view>
|
||||
<!-- <view class="cell" @tap="goBackNav">
|
||||
<view class="fn-card">
|
||||
<view class="tint-icon fn-icon tint-2">
|
||||
<FaIcon name="arrow-right-arrow-left" color="#ffffff" :size="18" />
|
||||
</view>
|
||||
<text class="fn-name">切换子系统</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
<view class="menu-row" @tap="goSettings">
|
||||
<view class="tint-icon row-icon tint-3">
|
||||
<FaIcon name="gear" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
<view class="row-main">
|
||||
<text class="row-title">设置</text>
|
||||
</view>
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -100,15 +92,15 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue'
|
||||
import { computed, onMounted } from 'vue'
|
||||
import { mpHeadPad } from '@/utils/mpHead.js'
|
||||
|
||||
const headPad = mpHeadPad()
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import { isLoggedIn, logout, isSSOEnabled, getToken, clearPendingAuth } from '@/utils/auth.js'
|
||||
import { logoutUAC, logoutApi } from '@/api/auth.js'
|
||||
import { request } from '@/api/request.js'
|
||||
import { clearHomeCache } from '@/api/workspace.js'
|
||||
import { requestSubscribeNotice } from '@/utils/subscribe.js'
|
||||
import { useSubsystem } from '@/utils/subsystem.js'
|
||||
import AppTabbar from '@/components/AppTabbar.vue'
|
||||
|
||||
@@ -117,68 +109,33 @@ const props = defineProps({
|
||||
embedded: { type: Boolean, default: false }
|
||||
})
|
||||
|
||||
const emit = defineEmits(['switch-tab', 'back'])
|
||||
|
||||
const { sub, loading, loadError, user, leafMenus, load } = useSubsystem(props.slug)
|
||||
|
||||
const pendingCount = ref(0)
|
||||
const overdue = ref(0)
|
||||
const doneCount = ref(0)
|
||||
const { loading, loadError, user, load } = useSubsystem(props.slug)
|
||||
|
||||
const avatarText = computed(() => {
|
||||
const name = user.value.name || user.value.account || '云'
|
||||
return String(name).charAt(0).toUpperCase()
|
||||
})
|
||||
|
||||
async function loadStats() {
|
||||
try {
|
||||
const [p, d] = await Promise.all([
|
||||
request({ url: '/api/schedule/list', data: { status: 'pending', pageSize: 50 } }),
|
||||
request({ url: '/api/schedule/list', data: { status: 'done', pageSize: 50 } })
|
||||
])
|
||||
const pending = (p && p.list) || []
|
||||
pendingCount.value = pending.length
|
||||
overdue.value = pending.filter((s) => isOverdue(s)).length
|
||||
doneCount.value = ((d && d.list) || []).length
|
||||
} catch (e) {
|
||||
pendingCount.value = 0
|
||||
overdue.value = 0
|
||||
doneCount.value = 0
|
||||
}
|
||||
}
|
||||
|
||||
function isOverdue(item) {
|
||||
const t = String(item.schedule_time || item.created_at || '')
|
||||
return t.length >= 10 && t.slice(0, 10) < todayStr()
|
||||
}
|
||||
|
||||
function todayStr() {
|
||||
const d = new Date()
|
||||
const p = (n) => String(n).padStart(2, '0')
|
||||
return d.getFullYear() + '-' + p(d.getMonth() + 1) + '-' + p(d.getDate())
|
||||
}
|
||||
|
||||
function goBackNav() {
|
||||
if (props.embedded) {
|
||||
emit('back')
|
||||
return
|
||||
}
|
||||
uni.reLaunch({ url: '/pages/nav/nav' })
|
||||
}
|
||||
|
||||
// 「功能」页签在 TAB_ORDER 中的下标为 1
|
||||
function goFunctions() {
|
||||
if (props.embedded) {
|
||||
emit('switch-tab', 1)
|
||||
return
|
||||
}
|
||||
uni.redirectTo({ url: `/pages/${props.slug}/functions/functions` })
|
||||
}
|
||||
|
||||
function goProfile() {
|
||||
uni.redirectTo({ url: '/pages/profile/profile' })
|
||||
}
|
||||
|
||||
function onSubscribe() {
|
||||
requestSubscribeNotice({ tip: '已开启消息提醒' })
|
||||
}
|
||||
|
||||
function goChangePassword() {
|
||||
uni.navigateTo({ url: '/pages/profile/changePassword' })
|
||||
}
|
||||
|
||||
function goHelp() {
|
||||
uni.navigateTo({ url: '/pages/common/developing?t=' + encodeURIComponent('帮助中心') })
|
||||
}
|
||||
|
||||
function goSettings() {
|
||||
uni.navigateTo({ url: '/pages/common/developing?t=' + encodeURIComponent('设置') })
|
||||
}
|
||||
|
||||
function handleLogout() {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
@@ -187,7 +144,6 @@ function handleLogout() {
|
||||
cancelText: '取消',
|
||||
success(res) {
|
||||
if (!res.confirm) return
|
||||
// 统一认证:先吊销服务端会话与令牌
|
||||
if (isSSOEnabled() && getToken()) {
|
||||
logoutUAC().catch(() => {})
|
||||
} else {
|
||||
@@ -202,16 +158,13 @@ function handleLogout() {
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// 游客进入免登录模块:停留外壳,不拉受保护数据,也不强制跳登录
|
||||
if (!isLoggedIn()) return
|
||||
load()
|
||||
loadStats()
|
||||
})
|
||||
|
||||
onShow(() => {
|
||||
if (isLoggedIn() && !loading.value) {
|
||||
load()
|
||||
loadStats()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
@@ -222,13 +175,11 @@ onShow(() => {
|
||||
.page {
|
||||
@include page-shell;
|
||||
|
||||
// 嵌入模式下由父页(tabs.vue)的 scroll-view 统一滚动,这里改为自然高度
|
||||
&.embedded {
|
||||
height: auto;
|
||||
}
|
||||
}
|
||||
|
||||
/* ============ 独立页模式的渐变用户头部 ============ */
|
||||
.head {
|
||||
flex-shrink: 0;
|
||||
padding: calc(var(--status-bar-height, 44px) + 20rpx) $page-padding-x 40rpx;
|
||||
@@ -242,7 +193,6 @@ onShow(() => {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 20rpx;
|
||||
/* 取消顶部返回按钮后,补偿其占位 */
|
||||
margin-top: 42rpx;
|
||||
}
|
||||
|
||||
@@ -294,7 +244,6 @@ onShow(() => {
|
||||
padding: 28rpx $page-padding-x 0;
|
||||
}
|
||||
|
||||
/* ============ 嵌入模式的用户卡 ============ */
|
||||
.user-card {
|
||||
@include card;
|
||||
display: flex;
|
||||
@@ -329,126 +278,63 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 数据概览 ============ */
|
||||
.kpi-card {
|
||||
.menu-card {
|
||||
@include card;
|
||||
display: flex;
|
||||
padding: 30rpx 0;
|
||||
margin-bottom: 32rpx;
|
||||
padding: 0 24rpx;
|
||||
margin-bottom: 24rpx;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.kpi-item {
|
||||
flex: 1;
|
||||
.menu-row {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 6rpx;
|
||||
position: relative;
|
||||
gap: 18rpx;
|
||||
padding: 26rpx 0;
|
||||
|
||||
& + &::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 6rpx;
|
||||
bottom: 6rpx;
|
||||
width: 1rpx;
|
||||
background: $color-divider;
|
||||
& + & {
|
||||
border-top: 1rpx solid $color-divider;
|
||||
}
|
||||
|
||||
&:active {
|
||||
opacity: 0.75;
|
||||
}
|
||||
}
|
||||
|
||||
.kpi-value {
|
||||
font-size: 40rpx;
|
||||
font-weight: 600;
|
||||
line-height: 1.1;
|
||||
color: $color-text;
|
||||
|
||||
&.warn {
|
||||
color: $color-danger;
|
||||
}
|
||||
}
|
||||
|
||||
.kpi-label {
|
||||
font-size: 22rpx;
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 常用操作:分组卡 + 一行 4 个格子 ============ */
|
||||
.group-card {
|
||||
@include card;
|
||||
padding: 24rpx 20rpx 8rpx;
|
||||
}
|
||||
|
||||
.group-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 14rpx;
|
||||
padding: 0 4rpx 20rpx;
|
||||
}
|
||||
|
||||
.group-bar {
|
||||
width: 6rpx;
|
||||
height: 28rpx;
|
||||
border-radius: $radius-full;
|
||||
background: $color-primary;
|
||||
.row-icon {
|
||||
@include tint-icon(64rpx, 18rpx);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.group-title {
|
||||
.row-main {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.row-title {
|
||||
display: block;
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
color: $color-text;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* cell 占 25% 并自带右间隙,容器负 margin 抵消末列间隙 */
|
||||
.grid {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
margin-right: -16rpx;
|
||||
}
|
||||
|
||||
.cell {
|
||||
width: 25%;
|
||||
padding-right: 16rpx;
|
||||
margin-bottom: 16rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.fn-card {
|
||||
height: 100%;
|
||||
padding: 18rpx 6rpx 16rpx;
|
||||
border-radius: $radius-md;
|
||||
background: $color-bg-page;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 12rpx;
|
||||
transition: transform 0.15s ease;
|
||||
|
||||
&:active {
|
||||
transform: scale(0.95);
|
||||
}
|
||||
}
|
||||
|
||||
.fn-icon {
|
||||
@include tint-icon(64rpx, 18rpx);
|
||||
}
|
||||
|
||||
.fn-name {
|
||||
max-width: 100%;
|
||||
.row-sub {
|
||||
display: block;
|
||||
margin-top: 6rpx;
|
||||
font-size: 22rpx;
|
||||
line-height: 1.3;
|
||||
color: $color-text;
|
||||
text-align: center;
|
||||
color: $color-text-muted;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.row-value {
|
||||
flex-shrink: 0;
|
||||
font-size: 24rpx;
|
||||
color: $color-primary;
|
||||
}
|
||||
|
||||
.logout {
|
||||
@include card;
|
||||
margin-top: 40rpx;
|
||||
@@ -465,7 +351,6 @@ onShow(() => {
|
||||
color: $color-danger;
|
||||
}
|
||||
|
||||
/* ============ 错误态 ============ */
|
||||
.err-box {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -500,4 +385,4 @@ onShow(() => {
|
||||
.bottom-space {
|
||||
height: 32rpx;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
@@ -1,8 +1,6 @@
|
||||
<template>
|
||||
<view class="oa-dash">
|
||||
<!-- ============ 上半:公告 + 数据统计 ============ -->
|
||||
<template v-if="part !== 'bottom'">
|
||||
<!-- 通知公告 -->
|
||||
<view class="dash-card">
|
||||
<view class="dash-head">
|
||||
<view class="dash-head-left">
|
||||
@@ -20,7 +18,6 @@
|
||||
<FaIcon name="bullhorn" color="#c0c4cc" :size="24" />
|
||||
<text class="dash-empty-text">暂无公告</text>
|
||||
</view>
|
||||
<!-- 单行垂直轮播公告 -->
|
||||
<swiper
|
||||
v-else
|
||||
class="notice-swiper"
|
||||
@@ -45,7 +42,6 @@
|
||||
</swiper>
|
||||
</view>
|
||||
|
||||
<!-- 数据统计:待办 + 报销 -->
|
||||
<view class="dash-card">
|
||||
<view class="dash-head">
|
||||
<view class="dash-head-left">
|
||||
@@ -56,7 +52,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 待办 -->
|
||||
<view class="stat-tile" @tap="emit('view-schedules')">
|
||||
<view class="stat-tile-head">
|
||||
<view class="tile-icon ti-todo">
|
||||
@@ -85,7 +80,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 报销 -->
|
||||
<view class="stat-tile">
|
||||
<view class="stat-tile-head">
|
||||
<view class="tile-icon ti-money">
|
||||
@@ -107,7 +101,6 @@
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- ============ 下半:报销趋势 + 状态分布 ============ -->
|
||||
<template v-else>
|
||||
<view v-if="trend.length || statusList.length" class="dash-card">
|
||||
<view class="dash-head">
|
||||
@@ -132,7 +125,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 状态分布 -->
|
||||
<view v-if="statusList.length" class="status-block">
|
||||
<text class="status-title">状态分布</text>
|
||||
<view v-for="s in statusList" :key="s.key" class="dist-row">
|
||||
@@ -154,21 +146,18 @@ import FaIcon from '@/components/FaIcon.vue'
|
||||
|
||||
const props = defineProps({
|
||||
data: { type: Object, default: () => ({}) },
|
||||
// top:公告 + 数据统计;bottom:报销趋势 + 状态分布(中间由首页插入「常用功能」)
|
||||
part: { type: String, default: 'top' }
|
||||
})
|
||||
const emit = defineEmits(['view-notices', 'view-schedules'])
|
||||
|
||||
const num = (v) => Number(v || 0)
|
||||
|
||||
// ---------- 待办概览 ----------
|
||||
const ss = computed(() => props.data?.schedule_stats || {})
|
||||
const overdue = computed(() => num(ss.value.overdue))
|
||||
const todayPending = computed(() => num(ss.value.today_total) - num(ss.value.today_done))
|
||||
const weekPending = computed(() => num(ss.value.week_total) - num(ss.value.week_done))
|
||||
const monthPending = computed(() => num(ss.value.month_total) - num(ss.value.month_done))
|
||||
|
||||
// ---------- 报销 ----------
|
||||
const emptyStat = () => ({ total: 0, paid: 0, unpaid: 0, count: 0 })
|
||||
const rb = computed(() => props.data?.reimburse || {})
|
||||
const moneyCards = computed(() => [
|
||||
@@ -177,7 +166,6 @@ const moneyCards = computed(() => [
|
||||
{ label: '本年', data: rb.value.year || emptyStat() }
|
||||
])
|
||||
|
||||
// ---------- 趋势(近6月,堆叠柱) ----------
|
||||
const trend = computed(() => rb.value.trend || [])
|
||||
const trendMax = computed(() => {
|
||||
let m = 1
|
||||
@@ -188,7 +176,6 @@ const MAX_BAR = 160
|
||||
const barH = (v) => Math.round((num(v) / trendMax.value) * MAX_BAR) + 'rpx'
|
||||
const monthLabel = (m) => String(m || '').slice(5) + '月'
|
||||
|
||||
// ---------- 状态分布 ----------
|
||||
const statusColors = { 0: '#94a3b8', 1: '#f59e0b', 2: '#10b981', 3: '#ef4444', 4: '#94a3b8', 5: '#2563eb' }
|
||||
const statusColor = (k) => statusColors[Number(k)] || '#94a3b8'
|
||||
const statusList = computed(() => {
|
||||
@@ -200,14 +187,12 @@ const statusList = computed(() => {
|
||||
.map((x) => ({ ...x, pct: Math.round((num(x.count) / total) * 100) + '%' }))
|
||||
})
|
||||
|
||||
// ---------- 公告 ----------
|
||||
const notices = computed(() => props.data?.notices || [])
|
||||
|
||||
const noticeTypeLabel = (type) => ({ 1: '公告', 2: '活动' }[type] || '通知')
|
||||
|
||||
const pad2 = (n) => String(n).padStart(2, '0')
|
||||
const fmtDate = (d) => `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())}`
|
||||
// 公告右侧时间:今天显示 HH:mm,本年显示 M/D,跨年显示 YYYY-M-D
|
||||
function noticeTime(ts) {
|
||||
if (!ts) return ''
|
||||
const d = new Date(String(ts).replace(/-/g, '/'))
|
||||
@@ -305,7 +290,6 @@ const money = (value) =>
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 数据统计:待办 / 报销 双磁贴 ============ */
|
||||
.stat-tile {
|
||||
padding: 20rpx 20rpx 8rpx;
|
||||
border-radius: $radius-md;
|
||||
@@ -397,7 +381,6 @@ const money = (value) =>
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* ============ 趋势柱状 ============ */
|
||||
.legend {
|
||||
display: flex;
|
||||
gap: 16rpx;
|
||||
@@ -470,7 +453,6 @@ const money = (value) =>
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 状态分布 ============ */
|
||||
.status-block {
|
||||
margin-top: 26rpx;
|
||||
padding-top: 22rpx;
|
||||
@@ -522,7 +504,6 @@ const money = (value) =>
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* ============ 公告(单行垂直轮播) ============ */
|
||||
.notice-swiper {
|
||||
height: 68rpx;
|
||||
}
|
||||
|
||||
@@ -112,7 +112,6 @@ function goSchedules() {
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// 游客进入免登录模块:停留外壳,不拉受保护数据,也不强制跳登录
|
||||
if (!isLoggedIn()) return
|
||||
load()
|
||||
loadTodo()
|
||||
@@ -129,7 +128,6 @@ onShow(() => {
|
||||
.page {
|
||||
@include page-shell;
|
||||
|
||||
// 嵌入模式下由父页(tabs.vue)的 scroll-view 统一滚动,这里改为自然高度
|
||||
&.embedded {
|
||||
height: auto;
|
||||
}
|
||||
@@ -147,7 +145,6 @@ onShow(() => {
|
||||
|
||||
.head-title {
|
||||
display: block;
|
||||
/* 取消顶部返回按钮后,保留头部避让高度 */
|
||||
margin-top: 32rpx;
|
||||
font-size: 36rpx;
|
||||
font-weight: 600;
|
||||
|
||||
@@ -1,12 +1,3 @@
|
||||
/**
|
||||
* 子系统注册表
|
||||
*
|
||||
* nav.vue(导航页,无 tabbar)按这里配置渲染子系统宫格;
|
||||
* 点击卡片进入 pages/{slug}/home.vue,该子系统拥有自己的页面组与 tabbar。
|
||||
*
|
||||
* module 对应后端 yz_system_modules.code(菜单归属靠 path 前缀匹配),
|
||||
* slug 是端上路由目录名,务必与 pages/{slug}/ 保持一致。
|
||||
*/
|
||||
export const SUBSYSTEMS = [
|
||||
{
|
||||
slug: 'crm',
|
||||
@@ -55,21 +46,15 @@ export const SUBSYSTEMS = [
|
||||
}
|
||||
]
|
||||
|
||||
/** 按 slug 取子系统配置 */
|
||||
export function getSubsystem(slug) {
|
||||
return SUBSYSTEMS.find((s) => s.slug === slug) || null
|
||||
}
|
||||
|
||||
/** 按后端模块 code 取子系统配置(menus[].module 与 yz_system_modules.code 对应) */
|
||||
export function getSubsystemByModule(module) {
|
||||
const key = String(module || '').toLowerCase()
|
||||
return SUBSYSTEMS.find((s) => String(s.module).toLowerCase() === key) || null
|
||||
}
|
||||
|
||||
/**
|
||||
* 进入某子系统的概览页。
|
||||
* 后端模块没有对应端上页面时(未在 SUBSYSTEMS 注册),返回 false 让调用方自行降级。
|
||||
*/
|
||||
export function goSubsystem(slug) {
|
||||
if (!getSubsystem(slug)) return false
|
||||
uni.navigateTo({ url: `/pages/sub/tabs?slug=${slug}` })
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
|
||||
</script>
|
||||
<title></title>
|
||||
<!--preload-links-->
|
||||
<!--app-context-->
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"><!--app-html--></div>
|
||||
|
||||
@@ -121,6 +121,13 @@
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTitleText": "企业绑定"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/profile/changePassword",
|
||||
"style": {
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTitleText": "修改密码"
|
||||
}
|
||||
}
|
||||
],
|
||||
"subPackages": [
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!-- 系统导航栏已带返回按钮 + 标题,无需自定义 header -->
|
||||
|
||||
<scroll-view class="body" scroll-y :show-scrollbar="false">
|
||||
<!-- 顶部摘要 -->
|
||||
<view class="summary">
|
||||
<view class="summary-main">
|
||||
<text class="summary-title">{{ item.biz_title || '审批详情' }}</text>
|
||||
@@ -18,7 +16,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 基本信息 -->
|
||||
<view class="card">
|
||||
<text class="card-title">基本信息</text>
|
||||
<view class="info-row">
|
||||
@@ -47,7 +44,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 审批流程 -->
|
||||
<view class="card">
|
||||
<text class="card-title">审批流程</text>
|
||||
<view v-if="!timeline.length" class="timeline-empty">暂无流程节点</view>
|
||||
@@ -82,20 +78,16 @@
|
||||
<view class="bottom-space" />
|
||||
</scroll-view>
|
||||
|
||||
<!-- 底部操作栏:只有有操作权限时才显示 -->
|
||||
<view v-if="showActionBar" class="action-bar">
|
||||
<!-- 当前审批人:通过 + 驳回 -->
|
||||
<view v-if="canApprove" class="btn-row">
|
||||
<view class="btn-reject" hover-class="btn-active" @tap="openApprove(false)">驳回</view>
|
||||
<view class="btn-pass" hover-class="btn-active" @tap="openApprove(true)">通过</view>
|
||||
</view>
|
||||
<!-- 发起人:仅撤回(不能审批自己的单子) -->
|
||||
<view v-else-if="canWithdraw" class="btn-row">
|
||||
<view class="btn-withdraw" hover-class="btn-active" @tap="doWithdraw">撤回审批</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 审批意见弹窗 -->
|
||||
<view v-if="showApprove" class="modal-overlay" @tap="hideApprove">
|
||||
<view class="modal-container" @tap.stop>
|
||||
<view class="modal-head">
|
||||
@@ -158,7 +150,6 @@ const approveForm = ref({ pass: true, comment: '' })
|
||||
|
||||
const showActionBar = computed(() => canApprove.value || canWithdraw.value)
|
||||
|
||||
// 当前节点名(审批弹窗展示用)
|
||||
const currentNodeLabel = computed(() => {
|
||||
const cur = timeline.value.find(t => t.is_current)
|
||||
return cur ? (cur.node_name || cur.node_key) : ''
|
||||
@@ -187,24 +178,20 @@ async function loadDetail(id) {
|
||||
canWithdraw.value = !!data.canWithdraw
|
||||
currentTaskID.value = data.currentTaskID || 0
|
||||
} catch (e) {
|
||||
// request.js 已 toast
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 头像文字:取姓名字首字 */
|
||||
function avatarText(task) {
|
||||
const name = String(task.approver_name || '').trim()
|
||||
return name ? name.slice(0, 1) : '系'
|
||||
}
|
||||
|
||||
/** 头像底色:审批人蓝色,结束节点灰色 */
|
||||
function avatarClass(task) {
|
||||
return task.node_type === 3 ? 'avatar-end' : ''
|
||||
}
|
||||
|
||||
/** 状态角标配色:进行中橙 / 已通过绿 / 已驳回红 / 其它灰 */
|
||||
function badgeClass(task) {
|
||||
if (task.is_current) return 'badge-running'
|
||||
if (task.status === 1) return 'badge-pass'
|
||||
@@ -219,21 +206,18 @@ function badgeIcon(task) {
|
||||
return '—'
|
||||
}
|
||||
|
||||
/** 主标题:申请人带「(申请人)」标识,末尾固定「流程结束」 */
|
||||
function nodeTitle(task) {
|
||||
if (task.node_type === 1) return `${task.approver_name || '发起人'}(申请人)`
|
||||
if (task.node_type === 3) return '流程结束'
|
||||
return task.approver_name || task.node_name || '审批节点'
|
||||
}
|
||||
|
||||
/** 副标题:部门/角色,缺失时回退节点名 */
|
||||
function nodeSub(task) {
|
||||
if (task.node_type === 1) return '提交申请'
|
||||
if (task.node_type === 3) return task.status_label || ''
|
||||
return task.approver_sub || task.node_name || '审批'
|
||||
}
|
||||
|
||||
/** 时间只展示到分钟,保持与设计稿一致的紧凑排版 */
|
||||
function nodeTime(task) {
|
||||
const value = task.finish_time || task.create_time || ''
|
||||
return value ? String(value).slice(0, 16) : ''
|
||||
@@ -250,8 +234,6 @@ function hideApprove() {
|
||||
|
||||
async function doApprove() {
|
||||
if (approving.value) return
|
||||
// currentTaskID 为 0 表示当前用户不是审批人(典型:发起人视角),
|
||||
// 仍然把请求交给后端判定:后端会返回 403「您无权处理该任务」并由 request.js 弹 toast。
|
||||
approving.value = true
|
||||
try {
|
||||
await approveTask({
|
||||
@@ -265,8 +247,6 @@ async function doApprove() {
|
||||
})
|
||||
hideApprove()
|
||||
|
||||
// 如果是报销单审批,跳转回报销详情页并触发刷新事件
|
||||
// (biz_type 兼容新写法 reimburse 与早期按模块记录的 oa)
|
||||
if (['reimburse', 'oa'].includes(item.value.biz_type) && item.value.biz_id) {
|
||||
uni.$emit('expense-updated', { id: item.value.biz_id })
|
||||
uni.redirectTo({
|
||||
@@ -277,7 +257,6 @@ async function doApprove() {
|
||||
|
||||
loadDetail(item.value.id)
|
||||
} catch (e) {
|
||||
// request.js 已 toast
|
||||
} finally {
|
||||
approving.value = false
|
||||
}
|
||||
@@ -297,7 +276,6 @@ async function doWithdraw() {
|
||||
uni.showToast({ title: '已撤回', icon: 'success' })
|
||||
loadDetail(item.value.id)
|
||||
} catch (e) {
|
||||
// request.js 已 toast
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -321,7 +299,6 @@ async function doWithdraw() {
|
||||
padding-bottom: calc(160rpx + env(safe-area-inset-bottom));
|
||||
}
|
||||
|
||||
/* ====== 摘要区 ====== */
|
||||
.summary {
|
||||
@include card;
|
||||
margin-bottom: 20rpx;
|
||||
@@ -358,7 +335,6 @@ async function doWithdraw() {
|
||||
padding-top: 4rpx;
|
||||
}
|
||||
|
||||
/* ====== 卡片 ====== */
|
||||
.card {
|
||||
@include card;
|
||||
margin-bottom: 20rpx;
|
||||
@@ -374,7 +350,6 @@ async function doWithdraw() {
|
||||
color: $color-text;
|
||||
margin-bottom: 24rpx;
|
||||
|
||||
/* 左侧蓝色竖条标识(与设计稿一致) */
|
||||
&::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
@@ -412,21 +387,18 @@ async function doWithdraw() {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* ====== 时间线 ====== */
|
||||
.timeline-empty {
|
||||
font-size: 24rpx;
|
||||
color: $color-text-muted;
|
||||
padding: 16rpx 0 8rpx;
|
||||
}
|
||||
|
||||
/* 审批流时间线(公共 mixin,与报销详情的审批记录同一套样式) */
|
||||
@include flow-timeline;
|
||||
|
||||
.bottom-space {
|
||||
height: 40rpx;
|
||||
}
|
||||
|
||||
/* ====== 底部操作栏 ====== */
|
||||
.action-bar {
|
||||
flex-shrink: 0;
|
||||
background: $color-card;
|
||||
@@ -471,7 +443,6 @@ async function doWithdraw() {
|
||||
|
||||
.btn-active { opacity: 0.85; }
|
||||
|
||||
/* ====== 审批弹窗 ====== */
|
||||
.modal-overlay {
|
||||
position: fixed;
|
||||
top: 0; left: 0; right: 0; bottom: 0;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!-- 顶部工具栏(系统导航栏已带返回按钮 + 标题,这里只放搜索/筛选) -->
|
||||
<view class="toolbar">
|
||||
<view class="search-box">
|
||||
<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
|
||||
@@ -15,7 +14,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 状态筛选 -->
|
||||
<scroll-view class="tab-scroll" scroll-x :show-scrollbar="false">
|
||||
<view class="tab-list">
|
||||
<view
|
||||
@@ -30,10 +28,8 @@
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<!-- 说明:审批单据由各业务模块提交后进入此处,这里不提供新增 -->
|
||||
<text class="page-tip">审批由各业务模块提交后在此查看与处理</text>
|
||||
|
||||
<!-- 列表 -->
|
||||
<scroll-view class="list-scroll" scroll-y :show-scrollbar="false" @scrolltolower="loadMore">
|
||||
<view v-if="loading && !list.length" class="state-box">
|
||||
<text class="state-text">加载中...</text>
|
||||
@@ -93,7 +89,6 @@ import { isLoggedIn } from '@/utils/auth.js'
|
||||
|
||||
const PAGE_SIZE = 20
|
||||
|
||||
/** 状态 tab(首个为「全部」,不展示「草稿」) */
|
||||
const statusTabs = [
|
||||
{ value: '', label: '全部' },
|
||||
...APPROVAL_INSTANCE_STATUS_OPTIONS.filter(o => o.value !== 0)
|
||||
@@ -189,7 +184,6 @@ function openDetail(id) {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
/* ====== 顶部搜索 ====== */
|
||||
.toolbar {
|
||||
position: relative;
|
||||
z-index: 10;
|
||||
@@ -221,7 +215,6 @@ function openDetail(id) {
|
||||
}
|
||||
}
|
||||
|
||||
/* ====== 状态筛选 tab ====== */
|
||||
.tab-scroll {
|
||||
flex-shrink: 0;
|
||||
white-space: nowrap;
|
||||
@@ -257,7 +250,6 @@ function openDetail(id) {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ====== 列表 ====== */
|
||||
.list-scroll {
|
||||
flex: 1;
|
||||
height: 0;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!-- 顶部:搜索(系统导航栏已带返回按钮 + 标题) -->
|
||||
<view class="toolbar">
|
||||
<view class="search-box">
|
||||
<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
|
||||
@@ -19,7 +18,6 @@
|
||||
<text class="stat-text">共 {{ total }} 条待办</text>
|
||||
</view>
|
||||
|
||||
<!-- 待办列表 -->
|
||||
<scroll-view class="list-scroll" scroll-y :show-scrollbar="false" @scrolltolower="loadMore">
|
||||
<view v-if="loading && !list.length" class="state-box">
|
||||
<text class="state-text">加载中...</text>
|
||||
@@ -54,8 +52,6 @@
|
||||
<view class="card-meta" v-if="task.deadline">
|
||||
<text class="meta-text">截止:{{ task.deadline }}</text>
|
||||
</view>
|
||||
<!-- card-actions 不接管 tap,只把"查看详情"按钮的 tap 单独拦在按钮层,
|
||||
这样 card 主体其它区域的 tap 仍能正常冒泡到 .todo-card 触发跳转 -->
|
||||
<view class="card-actions">
|
||||
<view class="op-btn op-view" hover-class="btn-active" @tap.stop="openDetail(task.instance)">查看详情</view>
|
||||
</view>
|
||||
@@ -167,7 +163,6 @@ function openDetail(instance) {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
/* ====== 顶部搜索 ====== */
|
||||
.toolbar {
|
||||
flex-shrink: 0;
|
||||
padding: 20rpx $page-padding-x;
|
||||
@@ -197,7 +192,6 @@ function openDetail(instance) {
|
||||
}
|
||||
}
|
||||
|
||||
/* ====== 计数条 ====== */
|
||||
.stat-bar {
|
||||
flex-shrink: 0;
|
||||
padding: 16rpx $page-padding-x;
|
||||
@@ -210,7 +204,6 @@ function openDetail(instance) {
|
||||
color: $color-text-secondary;
|
||||
}
|
||||
|
||||
/* ====== 列表 ====== */
|
||||
.list-scroll {
|
||||
flex: 1;
|
||||
height: 0;
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!--
|
||||
小程序端 web-view 组件会自动铺满整屏(不受样式约束),
|
||||
因此该端使用原生导航栏(pages.json 里 navigationStyle 保持 default);
|
||||
H5 / App 端 web-view 渲染为 iframe,需要自绘标题栏。
|
||||
-->
|
||||
<!-- #ifndef MP-WEIXIN -->
|
||||
<view class="bar">
|
||||
<view class="bar-btn" @tap="goBack">
|
||||
@@ -34,12 +29,6 @@ import { resolveWebConsoleURL, resolveWebSSOURL } from '@/api/config.js'
|
||||
const url = ref('')
|
||||
const title = ref('功能')
|
||||
|
||||
/**
|
||||
* 参数解码。
|
||||
* 各端行为不一致:H5(vue-router)会先解一次码,小程序不会。
|
||||
* 这里对纯 ASCII 参数(path / ticket)重复解码是幂等的,安全;
|
||||
* 含中文的 title 解码一次后已无可解字符,再解也是空操作。
|
||||
*/
|
||||
function decodeParam(v) {
|
||||
if (!v) return ''
|
||||
try {
|
||||
@@ -60,7 +49,6 @@ onLoad((options) => {
|
||||
return
|
||||
}
|
||||
|
||||
// 带票据 → 走 Web 端免登录兑换页;否则按普通深链打开
|
||||
if (ticket) {
|
||||
url.value = resolveWebSSOURL(raw, ticket)
|
||||
} else if (/^https?:\/\//i.test(raw)) {
|
||||
@@ -81,7 +69,6 @@ function goBack() {
|
||||
}
|
||||
}
|
||||
|
||||
// 重新加载:改 src 强制 webview/iframe 刷新
|
||||
function onReload() {
|
||||
const cur = url.value
|
||||
if (!cur) return
|
||||
@@ -90,7 +77,6 @@ function onReload() {
|
||||
}
|
||||
|
||||
function onMessage() {
|
||||
// 预留:Web 端 postMessage 回传(如通知外层刷新数据)
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* cms 子系统 · functions 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubFunctions from '@/components/sub/SubFunctions.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* cms 子系统 · home 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubHome from '@/components/sub/SubHome.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* cms 子系统 · 我的页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubMine.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubMine from '@/components/sub/SubMine.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* cms 子系统 · todo 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubTodo from '@/components/sub/SubTodo.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* crm 子系统 · functions 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubFunctions from '@/components/sub/SubFunctions.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* crm 子系统 · home 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubHome from '@/components/sub/SubHome.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* crm 子系统 · 我的页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubMine.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubMine from '@/components/sub/SubMine.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* crm 子系统 · todo 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubTodo from '@/components/sub/SubTodo.vue'
|
||||
</script>
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!-- ============ Hero 头部 ============ -->
|
||||
<view class="hero" :style="headPad">
|
||||
<view class="hero-glow hero-glow-1" />
|
||||
<view class="hero-glow hero-glow-2" />
|
||||
@@ -20,9 +19,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- ============ 内容区 ============ -->
|
||||
<view class="body">
|
||||
<!-- KPI 数据条(悬浮压在 Hero 上) -->
|
||||
<view class="kpi">
|
||||
<view
|
||||
v-for="item in kpiList"
|
||||
@@ -35,7 +32,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 数据加载失败提示(避免把接口故障误显示成「尚未配置」) -->
|
||||
<view v-if="loadError" class="err-box" @tap="loadAll">
|
||||
<FaIcon name="triangle-exclamation" color="#f04438" :size="18" />
|
||||
<view class="err-body">
|
||||
@@ -45,7 +41,6 @@
|
||||
<FaIcon name="rotate" color="#f04438" :size="16" />
|
||||
</view>
|
||||
|
||||
<!-- 应用:按模块分组,每组一个 card,组头 + 组内一行 4 个功能 -->
|
||||
<view class="block">
|
||||
<view class="block-head">
|
||||
<text class="block-title">应用</text>
|
||||
@@ -96,7 +91,6 @@
|
||||
</block>
|
||||
</view>
|
||||
|
||||
<!-- 常用功能:宫格卡(一行 4 个) -->
|
||||
<view class="block">
|
||||
<view class="block-head">
|
||||
<text class="block-title">常用功能</text>
|
||||
@@ -130,7 +124,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 今日待办 -->
|
||||
<view class="block">
|
||||
<view class="block-head">
|
||||
<text class="block-title">今日待办</text>
|
||||
@@ -160,7 +153,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 最近动态 -->
|
||||
<view v-if="activities.length" class="block">
|
||||
<view class="block-head">
|
||||
<text class="block-title">最近动态</text>
|
||||
@@ -195,7 +187,6 @@ import { openMenu, resolveNativeRoute } from '@/utils/nav.js'
|
||||
import { request } from '@/api/request.js'
|
||||
import AppTabbar from '@/components/MainTabbar.vue'
|
||||
|
||||
/** 公共菜单(无 module 归属)的协作工具图标 */
|
||||
const TOOL_ICONS = ['note-sticky', 'calendar-days', 'file-lines', 'clock-rotate-left', 'chart-line']
|
||||
|
||||
const loading = ref(true)
|
||||
@@ -206,8 +197,6 @@ const stats = ref({ todo: 0, overdue: 0, note: 0, message: 0, reimburse: 0 })
|
||||
const pendingList = ref([])
|
||||
const activities = ref([])
|
||||
|
||||
/* ==================== 派生数据 ==================== */
|
||||
|
||||
const greeting = computed(() => {
|
||||
const h = new Date().getHours()
|
||||
const slot = h < 6 ? '夜深了' : h < 11 ? '早上好' : h < 13 ? '中午好' : h < 18 ? '下午好' : '晚上好'
|
||||
@@ -215,7 +204,6 @@ const greeting = computed(() => {
|
||||
return name ? slot + ',' + name : slot
|
||||
})
|
||||
|
||||
/** 统一账号:企业 · 账号 · 角色(账号在全平台各系统通用) */
|
||||
const orgLine = computed(() => {
|
||||
const parts = []
|
||||
if (user.value.tenant) parts.push(user.value.tenant)
|
||||
@@ -226,24 +214,15 @@ const orgLine = computed(() => {
|
||||
|
||||
const badgeText = computed(() => (stats.value.message > 99 ? '99+' : String(stats.value.message || '')))
|
||||
|
||||
/** 叶子菜单(可直接跳转的功能页) */
|
||||
const leafMenus = computed(() => menus.value.filter((m) => m.leaf !== false && !m.locked))
|
||||
|
||||
/**
|
||||
* 按「一级分类目录」归组(与子系统功能页 SubFunctions.vue 一致):
|
||||
* 菜单层级形如 模块根 → 个人办公 → 通讯录,分组取一级目录名(个人办公 / 人事管理 …);
|
||||
* 模块根仅作容器被跳过;无分类归属的顶层功能统一归入「常用功能」。
|
||||
* 祖先链需在「全部菜单」里查找(目录不是叶子,不在 leafMenus 中)。
|
||||
*/
|
||||
const moduleGroups = computed(() => {
|
||||
const byId = {}
|
||||
menus.value.forEach((m) => {
|
||||
byId[m.id] = m
|
||||
})
|
||||
// 只有叶子菜单才是可点功能;目录只作分组标题
|
||||
const leaves = leafMenus.value.slice().sort((a, b) => (a.sort || 0) - (b.sort || 0))
|
||||
|
||||
// 取该菜单所属的「一级分组」节点(自底向上找到链上最顶层节点)
|
||||
function groupNodeOf(m) {
|
||||
const chain = [m]
|
||||
let cur = m
|
||||
@@ -254,12 +233,9 @@ const moduleGroups = computed(() => {
|
||||
}
|
||||
const top = chain[0]
|
||||
if (top.pid === 0) {
|
||||
// 模块根在列表内:跳过根,取它下一层(个人办公 / 人事管理 …)
|
||||
if (chain.length >= 2) return chain[1]
|
||||
// 顶层节点自身:目录容器跳过,叶子归入「常用功能」
|
||||
return top.leaf === false ? null : top
|
||||
}
|
||||
// 模块根不在列表内:链上顶层节点本身就是一级分组
|
||||
return top
|
||||
}
|
||||
|
||||
@@ -270,7 +246,6 @@ const moduleGroups = computed(() => {
|
||||
const g = groupNodeOf(m)
|
||||
if (!g) return
|
||||
if (g.id === m.id) {
|
||||
// 无分类归属的顶层散装功能
|
||||
common.items.push(m)
|
||||
return
|
||||
}
|
||||
@@ -288,7 +263,6 @@ const moduleGroups = computed(() => {
|
||||
if (common.items.length) all.push(common)
|
||||
all.push(...dirGroups)
|
||||
|
||||
// 工作台只展示 2 行(一行 4 个),更多功能留给「全部应用」页
|
||||
return all.map((group, gi) => ({
|
||||
...group,
|
||||
icon: group.icon || 'file-lines',
|
||||
@@ -299,14 +273,8 @@ const moduleGroups = computed(() => {
|
||||
}))
|
||||
})
|
||||
|
||||
/**
|
||||
* 协作工具:真正无模块归属的公共菜单(如后续新增的通用功能)。
|
||||
* 系统设置类与已归入模块的菜单都不在这里,避免把日志/角色/字典等后台配置
|
||||
* 和业务功能混在一块。
|
||||
*/
|
||||
const commonMenus = computed(() => menus.value.filter((m) => !m.module && m.leaf !== false).slice(0, 6))
|
||||
|
||||
/** 常用应用:端上原生页面优先,再补各模块首个功能 */
|
||||
const quickApps = computed(() => {
|
||||
const picked = []
|
||||
const seen = new Set()
|
||||
@@ -337,8 +305,6 @@ const kpiList = computed(() => [
|
||||
{ label: '我的笔记', value: stats.value.note || 0, warn: false, tap: () => openMenu({ title: '记事本' }) }
|
||||
])
|
||||
|
||||
/* ==================== 数据加载 ==================== */
|
||||
|
||||
async function loadHome() {
|
||||
try {
|
||||
const data = await fetchHome()
|
||||
@@ -383,13 +349,6 @@ async function loadAll() {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
/* ==================== 交互 ==================== */
|
||||
|
||||
/**
|
||||
* 点击应用卡片 → 进入该功能系统。
|
||||
* 优先进入模块下的第一个功能页(各模块的仪表盘/首页,即系统入口),
|
||||
* 没有功能页时回落到模块自身 path。
|
||||
*/
|
||||
function onModuleTap(group) {
|
||||
if (group.locked) {
|
||||
openMenu({ locked: true, title: group.name })
|
||||
@@ -410,8 +369,6 @@ function goSchedules() {
|
||||
uni.navigateTo({ url: '/pages/tools/schedule/index' })
|
||||
}
|
||||
|
||||
/* ==================== 工具 ==================== */
|
||||
|
||||
function isOverdue(item) {
|
||||
const t = String(item.schedule_time || item.created_at || '')
|
||||
return t.length >= 10 && t.slice(0, 10) < todayStr()
|
||||
@@ -451,8 +408,6 @@ function formatTime(dateStr) {
|
||||
return d.getMonth() + 1 + '/' + d.getDate()
|
||||
}
|
||||
|
||||
/* ==================== 生命周期 ==================== */
|
||||
|
||||
onMounted(() => {
|
||||
if (!isLoggedIn()) {
|
||||
uni.reLaunch({ url: '/pages/login/login' })
|
||||
@@ -473,11 +428,8 @@ onShow(() => {
|
||||
@include page-shell;
|
||||
}
|
||||
|
||||
/* ============ Hero ============ */
|
||||
.hero {
|
||||
position: relative;
|
||||
/* 与 .kpi 显式分层:不依赖渲染器对 position:relative 同级元素的隐式绘制顺序,
|
||||
否则部分 WebView 下 .kpi 的负边距上移部分会被本层裁掉 */
|
||||
z-index: 1;
|
||||
flex-shrink: 0;
|
||||
padding: calc(var(--status-bar-height, 44px) + 28rpx) $page-padding-x 76rpx;
|
||||
@@ -586,7 +538,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 内容区 ============ */
|
||||
.body {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
@@ -595,8 +546,6 @@ onShow(() => {
|
||||
padding: 0 $page-padding-x;
|
||||
}
|
||||
|
||||
/* KPI 悬浮卡 */
|
||||
/* KPI 悬浮卡:上移量 = 顶部内边距,保证数字恰好落在 Hero 下边缘之后 */
|
||||
.kpi {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
@@ -643,7 +592,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 加载失败提示 ============ */
|
||||
.err-box {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -675,7 +623,6 @@ onShow(() => {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* ============ 区块通用 ============ */
|
||||
.block {
|
||||
margin-top: 36rpx;
|
||||
}
|
||||
@@ -718,7 +665,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 分组卡:外层一个 card,组头 + 组内一行 4 个功能 ============ */
|
||||
.group-card {
|
||||
@include card;
|
||||
padding: 24rpx 20rpx 8rpx;
|
||||
@@ -773,9 +719,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 功能宫格:一行 4 个 ============
|
||||
cell 占 25% 宽并自带右侧间隙,容器用负 margin 抵消末列间隙,
|
||||
避免使用 calc 除法——小程序端 wxss 对复杂 calc 支持不稳。 */
|
||||
.quick-card {
|
||||
@include card;
|
||||
padding: 24rpx 20rpx 8rpx;
|
||||
@@ -829,7 +772,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 列表(待办 / 动态) ============ */
|
||||
.list-card {
|
||||
@include card;
|
||||
overflow: hidden;
|
||||
|
||||
@@ -107,11 +107,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 商品详情(只读):资料 / 价格 / 库存管控 / 分仓结存。
|
||||
* 建档与改价一律回 Web 端,这里把「这个货现在有多少、成本多少、卖多少」讲清楚,
|
||||
* 现场接单或盘库时一眼能判断能不能发。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import {
|
||||
|
||||
@@ -79,11 +79,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 商品档案(移动端只读)。
|
||||
* 建档、改价、启停都在 Web 后台做,手机端只负责「查得到、看得清、点得进」,
|
||||
* 库存与价格取的正是 Web 端同一批接口字段,两端不会出现两套数。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onReachBottom, onShow } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
@@ -150,7 +145,6 @@ async function loadCategories() {
|
||||
product_count: c.product_count || 0
|
||||
}))
|
||||
} catch (e) {
|
||||
// 分类拉不到不影响商品列表,只是筛选栏少一项
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -60,9 +60,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 仓库档案(移动端只读):一屏看清每个仓压了多少货,点进去直接查该仓库存。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
</view>
|
||||
|
||||
<block v-else-if="dash">
|
||||
<!-- 本月经营 -->
|
||||
<view class="hero-card">
|
||||
<view class="hero-main">
|
||||
<text class="hero-label">本月销售金额</text>
|
||||
@@ -30,7 +29,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 指标格子 -->
|
||||
<view class="kpi-grid">
|
||||
<view class="kpi-cell" @tap="go('/pages/erp/document/index?doc_type=sales_out')">
|
||||
<text class="kpi-value">{{ moneyText(today.sales_amount) }}</text>
|
||||
@@ -58,7 +56,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 库存预警 -->
|
||||
<view class="card warn-card">
|
||||
<view class="block-head">
|
||||
<text class="block-title">库存预警</text>
|
||||
@@ -87,7 +84,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 近 6 个月购销趋势 -->
|
||||
<view class="card trend-card">
|
||||
<view class="block-head">
|
||||
<text class="block-title">近 6 个月购销趋势</text>
|
||||
@@ -116,7 +112,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 常用入口 -->
|
||||
<view class="card entry-card">
|
||||
<view class="block-head">
|
||||
<text class="block-title">常用功能</text>
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
</view>
|
||||
|
||||
<block v-else-if="doc">
|
||||
<!-- 概要 -->
|
||||
<view class="head-card">
|
||||
<view class="head-top">
|
||||
<text class="head-type">{{ doc.doc_type_label || doc.doc_type }}</text>
|
||||
@@ -29,7 +28,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 往来与仓储 -->
|
||||
<view class="card">
|
||||
<view class="line">
|
||||
<text class="line-label">{{ partnerLabel }}</text>
|
||||
@@ -63,7 +61,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 明细 -->
|
||||
<view class="card">
|
||||
<view class="block-head">
|
||||
<text class="block-title">商品明细({{ items.length }} 行)</text>
|
||||
@@ -86,7 +83,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 审批实例 -->
|
||||
<view v-if="instance" class="card">
|
||||
<view class="block-head">
|
||||
<text class="block-title">审批进度</text>
|
||||
@@ -116,7 +112,6 @@
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- 操作栏 -->
|
||||
<view v-if="doc" class="actions">
|
||||
<block v-if="isDraft">
|
||||
<view class="act ghost" @tap="goEdit">编辑</view>
|
||||
@@ -164,7 +159,6 @@ import {
|
||||
submitDoc
|
||||
} from '@/api/erp.js'
|
||||
|
||||
/** 已生效单据可继续生成的下游单据(与后端来源单类型白名单一致) */
|
||||
const NEXT_MAP = {
|
||||
purchase_order: ['purchase_in'],
|
||||
sales_order: ['sales_out'],
|
||||
@@ -257,7 +251,6 @@ async function onApprove() {
|
||||
uni.showToast({ title: '已审核生效', icon: 'success' })
|
||||
await load()
|
||||
} catch (e) {
|
||||
// 错误提示已由请求层统一弹出
|
||||
} finally {
|
||||
busy.value = false
|
||||
}
|
||||
@@ -271,7 +264,6 @@ async function onSubmit() {
|
||||
uni.showToast({ title: instanceId ? '已提交审批' : '已提交', icon: 'success' })
|
||||
await load()
|
||||
} catch (e) {
|
||||
// 未绑定审批流等业务失败已在请求层提示,可退回用「审核生效」
|
||||
} finally {
|
||||
busy.value = false
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
</view>
|
||||
|
||||
<block v-else>
|
||||
<!-- 表头 -->
|
||||
<view class="card">
|
||||
<view class="card-head">
|
||||
<text class="card-title">{{ typeLabel }}</text>
|
||||
@@ -51,7 +50,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 明细 -->
|
||||
<view class="card">
|
||||
<view class="card-head">
|
||||
<text class="card-title">商品明细({{ items.length }} 行)</text>
|
||||
@@ -99,7 +97,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 金额 -->
|
||||
<view class="card">
|
||||
<view class="line">
|
||||
<text class="line-label">数量合计</text>
|
||||
@@ -150,7 +147,6 @@
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- 明细编辑抽屉 -->
|
||||
<view v-if="itemVisible" class="item-mask" @tap="closeItem">
|
||||
<view class="item-sheet" @tap.stop>
|
||||
<view class="sheet-head">
|
||||
@@ -237,16 +233,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 单据开单 / 草稿编辑页(十类单据共用)。
|
||||
*
|
||||
* 表头字段按单据类型动态出现:采购类选供应商、销售类选客户、调拨多一个调入仓库、
|
||||
* 盘点只需要仓库不需要客商 —— 这些规则全部取自 /api/erp/meta 的 doc_types,
|
||||
* 与 Web 端 DocEditor、Go 端 erpValidateDocHead 同一份口径,避免端上自己判型判错。
|
||||
*
|
||||
* 明细只传可编辑字段:单价留空由后端按价格体系取价,金额由后端重算,
|
||||
* 保证手机端提交的单与 Web 端算出来的一分不差。
|
||||
*/
|
||||
import { computed, reactive, ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
@@ -298,7 +284,6 @@ const form = reactive({
|
||||
const typeDict = ref([])
|
||||
const meta = ref({ default_warehouse_id: 0, sales_price_type: '', negative_stock: false })
|
||||
const warehouses = ref([])
|
||||
/** 商品选择器当前页的原始行,选中后要拿 enable_batch / shelf_life_days / 价格字段 */
|
||||
const productRows = ref([])
|
||||
const blocked = ref('')
|
||||
const saving = ref(false)
|
||||
@@ -339,7 +324,6 @@ onLoad(async (query = {}) => {
|
||||
uni.setNavigationBarTitle({ title: typeLabel.value || '开单' })
|
||||
})
|
||||
|
||||
/** 该类型有没有配审批流:有则第二个按钮是「提交审批」,没有就是「直接审核生效」 */
|
||||
async function loadFlowable() {
|
||||
if (!form.docType) return
|
||||
const flows = await fetchDocFlows(form.docType).catch(() => ({ list: [] }))
|
||||
@@ -389,7 +373,6 @@ async function loadDoc(id) {
|
||||
syncTypeFields()
|
||||
}
|
||||
|
||||
/** 列表/详情的明细行 → 端上行模型(保留 id 与来源行引用,价格与库存档案快照单独存) */
|
||||
function toRow(it) {
|
||||
return {
|
||||
id: it.id || 0,
|
||||
@@ -410,8 +393,6 @@ function toRow(it) {
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------ 类型派生的表单形态
|
||||
|
||||
const typeInfo = computed(() => typeDict.value.find((t) => t.value === form.docType) || {})
|
||||
const typeLabel = computed(() => typeInfo.value.label || '')
|
||||
const needWarehouse = computed(() => !!typeInfo.value.affects_stock || isStockTake.value)
|
||||
@@ -419,7 +400,6 @@ const isTransfer = computed(() => form.docType === 'transfer')
|
||||
const isStockTake = computed(() => form.docType === 'stock_take')
|
||||
const partnerRequired = computed(() => !!typeInfo.value.partner_type)
|
||||
|
||||
/** 需要往来单位时才出现客商行;调拨多一行调入仓库 */
|
||||
const headRows = computed(() => {
|
||||
const rows = []
|
||||
if (needWarehouse.value) {
|
||||
@@ -461,7 +441,6 @@ const headRows = computed(() => {
|
||||
return rows
|
||||
})
|
||||
|
||||
/** 允许的来源单据类型(与 Go 端 docTypeSources 一致) */
|
||||
const sourceTypes = computed(() => {
|
||||
switch (form.docType) {
|
||||
case 'purchase_in':
|
||||
@@ -506,8 +485,6 @@ function applyDefaultWarehouse() {
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------ 选择器
|
||||
|
||||
function openPicker(key) {
|
||||
picker.key = key
|
||||
picker.loading = false
|
||||
@@ -645,8 +622,6 @@ function docTypeText(type) {
|
||||
return (typeDict.value.find((t) => t.value === type) || {}).label || type
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------ 明细
|
||||
|
||||
const showBatch = computed(() => !!draft.enable_batch || !!draft.batch_no || isStockTake.value)
|
||||
const batchRequired = computed(() => Number(draft.enable_batch) === 1 && form.docType === 'purchase_in')
|
||||
const showProductDate = computed(
|
||||
@@ -697,7 +672,6 @@ function fillDraftProduct(p) {
|
||||
loadStockHint(p.id)
|
||||
}
|
||||
|
||||
/** 预警/补货页带商品过来开单:直接铺好一行,用户只补供应商和数量 */
|
||||
async function prefillProduct(id, quantity) {
|
||||
try {
|
||||
const p = await getProduct(id)
|
||||
@@ -716,11 +690,9 @@ async function prefillProduct(id, quantity) {
|
||||
}
|
||||
]
|
||||
} catch (e) {
|
||||
// 商品拉不到就让用户手动加行,不拦开单入口
|
||||
}
|
||||
}
|
||||
|
||||
/** 与 Go 端 erpPickPrice 同规则:采购价/销售价按租户价格体系回落 */
|
||||
function pickPrice(p) {
|
||||
const type = form.docType
|
||||
if (['purchase_order', 'purchase_in', 'purchase_return', 'other_in'].includes(type)) {
|
||||
@@ -739,7 +711,6 @@ function pickPrice(p) {
|
||||
async function loadStockHint(productId) {
|
||||
stockText.value = ''
|
||||
if (!typeInfo.value.affects_stock || !form.warehouseId || !productId) return
|
||||
// 同一商品可能有多批次行,按商品聚合才是这一仓真正可发的量
|
||||
const { list } = await fetchStocks({ warehouseId: form.warehouseId, productId, groupBy: 'product', pageSize: 1 })
|
||||
const row = list[0]
|
||||
if (!row) {
|
||||
@@ -800,7 +771,6 @@ const actualAmount = computed(() => {
|
||||
return Math.max(0, totalAmount.value - minus)
|
||||
})
|
||||
|
||||
/** 盘点:按仓库账面库存铺行,盘点员只改实盘数 */
|
||||
async function loadTakeSheet() {
|
||||
const rows = await fetchTakeSheet(form.warehouseId)
|
||||
if (!rows.length) {
|
||||
@@ -821,7 +791,6 @@ async function loadTakeSheet() {
|
||||
uni.showToast({ title: `已载入 ${rows.length} 行`, icon: 'none' })
|
||||
}
|
||||
|
||||
/** 订单转入库/出库:按「下单量 - 已执行量」带出,行 ID 作为 ref_item_id 供后端做超收校验 */
|
||||
async function pullFromSource() {
|
||||
if (!form.sourceDocId) return
|
||||
const data = await fetchExecutableDocs(form.sourceDocId)
|
||||
@@ -861,7 +830,6 @@ async function pullFromSource() {
|
||||
})
|
||||
}
|
||||
|
||||
/** 从详情页「生成下游单」进入:带出来源单号、客商、仓库与可执行明细 */
|
||||
async function attachSource(id) {
|
||||
form.sourceDocId = Number(id)
|
||||
const doc = await getDoc(id)
|
||||
@@ -878,8 +846,6 @@ async function attachSource(id) {
|
||||
await pullFromSource()
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------ 保存
|
||||
|
||||
function headCheck() {
|
||||
if (!form.docType) return '缺少单据类型'
|
||||
if (!form.bizDate) return '请选择业务日期'
|
||||
@@ -935,13 +901,11 @@ async function onSave(thenGo) {
|
||||
if (thenGo) await advance(id)
|
||||
else uni.showToast({ title: '草稿已保存', icon: 'success' })
|
||||
} catch (e) {
|
||||
// 具体原因由请求层 toast,这里只负责不吞掉「已保存但提交失败」这种半成功状态
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 提交审批:未配置审批流时直接审核生效,与 Web 端按钮语义一致 */
|
||||
async function advance(id) {
|
||||
if (flowable.value) {
|
||||
await submitDoc(id, 0)
|
||||
|
||||
@@ -220,7 +220,6 @@ async function loadDictionaries() {
|
||||
docTypes.value = types
|
||||
warehouses.value = houses
|
||||
} catch (e) {
|
||||
// 字典失败不影响列表,筛选降级为「全部」
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -115,10 +115,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 往来账单详情:核销进度、逐笔核销来源、关联的收付款单与原始单据明细。
|
||||
* funds 是后端按核销记录聚合出来的收付款单字典,核销行靠 fund_bill_id 反查单号与方式。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
|
||||
@@ -105,10 +105,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 应收应付账单列表。
|
||||
* 「未收/未付合计」用的是接口随列表返回的全量汇总,不是本页累加,翻页也不会跳数。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
@@ -195,7 +191,6 @@ async function loadPage() {
|
||||
function switchType(value) {
|
||||
if (billType.value === value) return
|
||||
billType.value = value
|
||||
// 应收只看客户、应付只看供应商,跨类型带的客商筛选必须一起清掉
|
||||
partnerId.value = ''
|
||||
partnerName.value = ''
|
||||
refresh()
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
<u-tag :text="fundStatusLabel(status)" :type="fundStatusType(status)" size="mini" />
|
||||
</view>
|
||||
|
||||
<!-- 单据信息 -->
|
||||
<view class="form-card">
|
||||
<view class="field">
|
||||
<text class="field-label">款项类型 <text class="required">*</text></text>
|
||||
@@ -102,7 +101,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 核销:收款/付款 + 已选往来单位时才出现 -->
|
||||
<view v-if="showSettle" class="settle-card">
|
||||
<view class="settle-head">
|
||||
<text class="settle-title">核销往来账</text>
|
||||
@@ -204,11 +202,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 收付款开单 / 查看。
|
||||
* 草稿只是登记,确认那一刻后端才写核销明细并回写往来账余额;
|
||||
* 已确认的单不可改,只能作废(余额同步回滚),所以 view 模式复用同一张表单只读渲染。
|
||||
*/
|
||||
import { computed, reactive, ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
@@ -281,7 +274,6 @@ onLoad(async (query = {}) => {
|
||||
if (query.id) {
|
||||
await loadFund(Number(query.id))
|
||||
} else if (needPartner.value && form.partnerId) {
|
||||
// 从账单详情跳过来时把这张账单预勾选,金额默认取未结额
|
||||
await loadBills(Number(query.bill_id || 0))
|
||||
}
|
||||
})
|
||||
@@ -312,7 +304,6 @@ async function loadFund(id) {
|
||||
async function onType(value) {
|
||||
if (Number(form.fundType) === Number(value)) return
|
||||
form.fundType = Number(value)
|
||||
// 收款只核客户应收、付款只核供应商应付,切换后原往来单位与勾选一并作废
|
||||
form.partnerId = 0
|
||||
form.partnerName = ''
|
||||
clearPicks()
|
||||
@@ -463,7 +454,6 @@ async function onDelete() {
|
||||
})
|
||||
}
|
||||
|
||||
/** 列表页跳来的栈可能是账单详情,优先回到它的来源列表 */
|
||||
function back() {
|
||||
const pages = getCurrentPages()
|
||||
if (pages.length > 1) uni.navigateBack()
|
||||
|
||||
@@ -107,10 +107,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 收付款单列表。四类单据共用一页,靠 fund_type 分流。
|
||||
* 草稿只登记不核销,确认后后端才写核销明细并回写往来账余额。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
@@ -131,7 +127,6 @@ const status = ref('')
|
||||
const keyword = ref('')
|
||||
const dateFrom = ref('')
|
||||
const dateTo = ref('')
|
||||
/** 从客商页带过来时只看这一家的收付款 */
|
||||
const partnerScope = ref('')
|
||||
|
||||
const sumText = computed(() => {
|
||||
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* erp 子系统 · functions 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubFunctions from '@/components/sub/SubFunctions.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* erp 子系统 · home 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubHome from '@/components/sub/SubHome.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* erp 子系统 · 我的页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubMine.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubMine from '@/components/sub/SubMine.vue'
|
||||
</script>
|
||||
@@ -96,11 +96,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 客商详情:档案 + 未结账单 + 一键收付款。
|
||||
* 余额口径直接取往来账(bill)与对账汇总,和 Web 端「应收应付」页一致,
|
||||
* 端上不另算一套,避免业务在手机上看到的欠款跟财务对不上。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import {
|
||||
@@ -155,7 +150,6 @@ async function load() {
|
||||
profile.value = p
|
||||
bills.value = b.list || []
|
||||
billTotal.value = b.total || 0
|
||||
// 对账汇总按 partner_type:id 归并,这里只取当前这一家
|
||||
summary.value = rows.find((r) => Number(r.partner_id) === partnerId.value) || {}
|
||||
} catch (e) {
|
||||
uni.showToast({ title: '客商信息加载失败', icon: 'none' })
|
||||
|
||||
@@ -64,10 +64,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 客商列表(供应商 / 客户同一个页,靠 partner_type 分流)。
|
||||
* 与后端 partner/list 一致:只列正式启用、有归属的对象,公海客户不参与开单也不在这里出现。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
<text class="quick" @tap="useQuick">近30天</text>
|
||||
</view>
|
||||
|
||||
<!-- 购销汇总:方向 + 维度 -->
|
||||
<view v-if="tab === 'summary'" class="chip-row">
|
||||
<view
|
||||
v-for="s in SIDES"
|
||||
@@ -51,7 +50,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 排行:榜单方向 + 条数 -->
|
||||
<view v-else-if="tab === 'rank'" class="chip-row">
|
||||
<view class="chip" :class="{ active: order === 'desc' }" @tap="onOrder('desc')">
|
||||
<text>热销榜</text>
|
||||
@@ -65,7 +63,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 收发存:仓库 + 关键字 -->
|
||||
<template v-else-if="tab === 'move'">
|
||||
<view class="chip-row">
|
||||
<view class="chip" :class="{ active: !!warehouseId }" @tap="openWarehouse">
|
||||
@@ -89,7 +86,6 @@
|
||||
<text class="state-text">统计中...</text>
|
||||
</view>
|
||||
|
||||
<!-- 购销汇总 -->
|
||||
<template v-else-if="tab === 'summary'">
|
||||
<view class="kpi-row">
|
||||
<view class="kpi">
|
||||
@@ -113,7 +109,6 @@
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- 热销 / 滞销排行 -->
|
||||
<template v-else-if="tab === 'rank'">
|
||||
<view v-if="!rank.list.length" class="state-box">
|
||||
<u-empty mode="search" text="暂无排行数据" />
|
||||
@@ -128,7 +123,6 @@
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- 收发存汇总 -->
|
||||
<template v-else-if="tab === 'move'">
|
||||
<view class="kpi-row">
|
||||
<view class="kpi">
|
||||
@@ -181,7 +175,6 @@
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- 毛利分析 -->
|
||||
<template v-else-if="tab === 'profit'">
|
||||
<view class="hero-card">
|
||||
<view class="hero-line">
|
||||
@@ -218,7 +211,6 @@
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- 账龄分析 -->
|
||||
<template v-else-if="tab === 'aging'">
|
||||
<view v-for="side in AGING_SIDES" :key="side.key" class="ag-block">
|
||||
<view class="ag-head">
|
||||
@@ -253,7 +245,6 @@
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- 资金流水 -->
|
||||
<template v-else>
|
||||
<view class="kpi-row">
|
||||
<view class="kpi">
|
||||
@@ -298,10 +289,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 报表中心。所有口径都直接取后端结果,端上不再二次汇总:
|
||||
* 购销汇总的退货冲减、毛利的实际出库成本、收发存的期初倒推,与 Web 端同一份 core。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad, onReachBottom } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
@@ -400,7 +387,6 @@ function onDate(key, e) {
|
||||
run()
|
||||
}
|
||||
|
||||
/** 报表默认看最近一个周转周期,空区间会把「没数据」误读成「没配好」 */
|
||||
function useQuick() {
|
||||
const to = new Date()
|
||||
const from = new Date(to.getTime() - 29 * 86400000)
|
||||
@@ -433,7 +419,6 @@ async function run() {
|
||||
else if (tab.value === 'aging') await loadAging()
|
||||
else await loadCash()
|
||||
} catch (e) {
|
||||
// 单个报表失败只清当前视图,不影响切到其他 tab 再看
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
@@ -102,10 +102,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 批次与效期台账。批次只从入库流水回溯到期日,未登记效期的批次到期列留空不算异常。
|
||||
* 点行跳到该商品+该批次的收发流水,做效期倒查不用再手动筛。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
@@ -159,7 +155,6 @@ async function loadWarehouses() {
|
||||
try {
|
||||
warehouses.value = await fetchWarehouses({ onlyEnabled: true })
|
||||
} catch (e) {
|
||||
// 仓库字典拉不到只是不能按仓筛
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -102,11 +102,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 库存结存查询。
|
||||
* 默认「分仓分批次」逐行看,切到「按商品汇总」看总量;
|
||||
* 货值 = 数量 × 移动加权成本,与报表中心收发存汇总同源。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
@@ -135,7 +130,6 @@ const safetyState = ref('')
|
||||
const groupByProduct = ref(false)
|
||||
const onlyStock = ref(true)
|
||||
const warehouses = ref([])
|
||||
/** 从商品详情跳过来时锁定单个商品,端上把 id 存下来随查询一起下发 */
|
||||
const productId = ref('')
|
||||
|
||||
const picker = ref({ show: false })
|
||||
@@ -174,7 +168,6 @@ async function loadWarehouses() {
|
||||
try {
|
||||
warehouses.value = await fetchWarehouses({ onlyEnabled: true })
|
||||
} catch (e) {
|
||||
// 仓库列表拉不到不影响查询,只是不能按仓筛
|
||||
}
|
||||
}
|
||||
|
||||
@@ -321,7 +314,6 @@ function openProduct(row) {
|
||||
.state-scroll {
|
||||
margin-top: 16rpx;
|
||||
white-space: nowrap;
|
||||
/* scroll-view 不设 border-box,左右内边距会把最后几个标签顶出屏幕 */
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
|
||||
@@ -110,10 +110,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 收发存流水台账。每行是「某商品某仓库某批次」的一次变动,前滚后结存直接可核对。
|
||||
* 商品维度可能上千,筛商品走服务端搜索;单据号点行可回到来源单据详情。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
@@ -155,7 +151,6 @@ const pickerTitle = computed(() =>
|
||||
({ warehouse: '选择仓库', product: '选择商品', docType: '选择单据类型' })[picker.value.key] || '请选择'
|
||||
)
|
||||
|
||||
/** 从商品/批次页带条件跳进来时,把锁定条件显式画出来,免得用户对着半屏数据找原因 */
|
||||
const filterText = computed(() =>
|
||||
[productName.value, batchNo.value ? `批次 ${batchNo.value}` : ''].filter(Boolean).join(' · ')
|
||||
)
|
||||
@@ -189,7 +184,6 @@ async function loadDicts() {
|
||||
try {
|
||||
warehouses.value = await fetchWarehouses({ onlyEnabled: true })
|
||||
} catch (e) {
|
||||
// 字典拉不到只是不能筛,流水本身仍可查看
|
||||
}
|
||||
}
|
||||
if (!docTypes.value.length) {
|
||||
|
||||
@@ -113,11 +113,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 库存预警与智能补货。
|
||||
* 四类预警一次取回(同源同一份结存快照),切 tab 只换视图不重复打接口;
|
||||
* 补货建议口径更重(含近30天销量与在途),单独按需拉。
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* erp 子系统 · todo 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubTodo from '@/components/sub/SubTodo.vue'
|
||||
</script>
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!-- 吸顶搜索 -->
|
||||
<view class="search-wrap" :style="headPad">
|
||||
<view class="search-bar">
|
||||
<FaIcon name="magnifying-glass" color="#8a94ad" :size="16" />
|
||||
@@ -19,7 +18,6 @@
|
||||
</view>
|
||||
|
||||
<view class="body">
|
||||
<!-- 搜索结果:跨模块扁平列表 -->
|
||||
<block v-if="keyword.trim()">
|
||||
<view class="result-hint">
|
||||
<text class="result-hint-text">找到 {{ searchResults.length }} 个结果</text>
|
||||
@@ -47,7 +45,6 @@
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- 默认:按业务域分组浏览 -->
|
||||
<block v-else>
|
||||
<view v-if="groups.length === 0" class="empty-box">
|
||||
<FaIcon name="cube" color="#c0c4cc" :size="32" />
|
||||
@@ -118,22 +115,15 @@ const loading = ref(true)
|
||||
const modules = ref([])
|
||||
const menus = ref([])
|
||||
|
||||
/**
|
||||
* 按「一级分类目录」归组,与子系统功能页(SubFunctions.vue)保持一致:
|
||||
* 菜单层级形如 模块根 → 个人办公 → 通讯录,分组取一级目录名(个人办公 / 人事管理 …);
|
||||
* 模块根仅作容器被跳过;无分类归属的顶层功能统一归入「常用功能」。
|
||||
*/
|
||||
const groups = computed(() => {
|
||||
const byId = {}
|
||||
menus.value.forEach((m) => {
|
||||
byId[m.id] = m
|
||||
})
|
||||
// 只有叶子菜单才是可点功能;目录只作为分组标题,避免二级目录被当成卡片塞进组内
|
||||
const leaves = menus.value
|
||||
.filter((m) => m.leaf !== false)
|
||||
.sort((a, b) => (a.sort || 0) - (b.sort || 0))
|
||||
|
||||
// 取该菜单所属的「一级分组」节点(自底向上找到链上最顶层节点)
|
||||
function groupNodeOf(m) {
|
||||
const chain = [m]
|
||||
let cur = m
|
||||
@@ -144,12 +134,9 @@ const groups = computed(() => {
|
||||
}
|
||||
const top = chain[0]
|
||||
if (top.pid === 0) {
|
||||
// 模块根在列表内:跳过根,取它下一层(个人办公 / 人事管理 …)
|
||||
if (chain.length >= 2) return chain[1]
|
||||
// 顶层节点自身:目录容器跳过,叶子归入「常用功能」
|
||||
return top.leaf === false ? null : top
|
||||
}
|
||||
// 模块根不在列表内:链上顶层节点本身就是一级分组
|
||||
return top
|
||||
}
|
||||
|
||||
@@ -160,7 +147,6 @@ const groups = computed(() => {
|
||||
const g = groupNodeOf(m)
|
||||
if (!g) return
|
||||
if (g.id === m.id) {
|
||||
// 无分类归属的顶层散装功能
|
||||
common.items.push(m)
|
||||
return
|
||||
}
|
||||
@@ -178,7 +164,6 @@ const groups = computed(() => {
|
||||
if (common.items.length) all.push(common)
|
||||
all.push(...dirGroups)
|
||||
|
||||
// 组级「未开通」:整组菜单均被锁定;卡片浅底色与图标色按展开顺序统一编号轮换
|
||||
let colorIndex = 0
|
||||
return all.map((group) => {
|
||||
const locked = group.items.length > 0 && group.items.every((it) => it.locked === true)
|
||||
@@ -191,7 +176,6 @@ const groups = computed(() => {
|
||||
})
|
||||
})
|
||||
|
||||
/** 跨模块搜索:应用名 + 模块名 + 菜单标题 */
|
||||
const searchResults = computed(() => {
|
||||
const q = keyword.value.trim().toLowerCase()
|
||||
if (!q) return []
|
||||
@@ -322,9 +306,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 分组卡:白色卡片 + 一行 4 个功能宫格(图标在上、名称在下) ============
|
||||
cell 占 25% 并自带右间隙,容器负 margin 抵消末列间隙,
|
||||
避免使用 calc 除法——小程序端 wxss 对复杂 calc 支持不稳。 */
|
||||
.group-card {
|
||||
@include card;
|
||||
padding: 24rpx 20rpx 8rpx;
|
||||
|
||||
@@ -9,10 +9,6 @@
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import { isLoggedIn } from '@/utils/auth.js'
|
||||
|
||||
/**
|
||||
* 启动跳板页:若启动入口指向本页(脚手架默认首页),先做登录检测再分流,
|
||||
* 未登录直接进登录页,已登录进首页(pages/nav/nav)。
|
||||
*/
|
||||
onShow(() => {
|
||||
uni.reLaunch({ url: isLoggedIn() ? '/pages/nav/nav' : '/pages/login/login' })
|
||||
})
|
||||
|
||||
+306
-140
@@ -8,61 +8,90 @@
|
||||
|
||||
<view class="header" :style="headPad">
|
||||
<text class="title">忘记密码</text>
|
||||
<text class="subtitle">
|
||||
{{ currentStep === 1 ? '验证您的账号' : currentStep === 2 ? '通过手机号验证身份' : '设置新密码' }}
|
||||
</text>
|
||||
<text class="subtitle">{{ stepSubtitle }}</text>
|
||||
</view>
|
||||
|
||||
<view class="form-card">
|
||||
<!-- 第一步:验证租户和账号 -->
|
||||
<view v-if="currentStep === 1" class="form">
|
||||
<view class="field">
|
||||
<input
|
||||
class="field-input"
|
||||
v-model="form.tenant_name"
|
||||
type="text"
|
||||
placeholder="租户名称"
|
||||
placeholder-class="field-placeholder"
|
||||
/>
|
||||
</view>
|
||||
<view class="field">
|
||||
<input
|
||||
class="field-input"
|
||||
v-model="form.account"
|
||||
type="text"
|
||||
placeholder="账号"
|
||||
placeholder-class="field-placeholder"
|
||||
/>
|
||||
<view class="mode-tabs">
|
||||
<view
|
||||
v-for="item in MODES"
|
||||
:key="item.key"
|
||||
class="mode-tab"
|
||||
:class="{ on: mode === item.key }"
|
||||
@tap="pickMode(item.key)"
|
||||
>
|
||||
<text class="mode-tab-text">{{ item.label }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="btn-primary" :class="{ disabled: loading }" @tap="handleVerifyAccount">
|
||||
<template v-if="mode === 'account'">
|
||||
<view class="field">
|
||||
<input
|
||||
class="field-input"
|
||||
v-model="form.tenant_name"
|
||||
type="text"
|
||||
placeholder="租户名称"
|
||||
placeholder-class="field-placeholder"
|
||||
/>
|
||||
</view>
|
||||
<view class="field">
|
||||
<input
|
||||
class="field-input"
|
||||
v-model="form.account"
|
||||
type="text"
|
||||
placeholder="账号"
|
||||
placeholder-class="field-placeholder"
|
||||
/>
|
||||
</view>
|
||||
<text class="mode-tip">验证通过后,验证码将发送到该账号绑定的手机号;忘记租户名称可用手机号或邮箱找回</text>
|
||||
</template>
|
||||
|
||||
<template v-else-if="mode === 'phone'">
|
||||
<view class="field">
|
||||
<input
|
||||
class="field-input"
|
||||
v-model="form.mobile"
|
||||
type="number"
|
||||
maxlength="11"
|
||||
placeholder="手机号"
|
||||
placeholder-class="field-placeholder"
|
||||
/>
|
||||
</view>
|
||||
<text class="mode-tip">验证码将以短信形式发送到该手机号</text>
|
||||
</template>
|
||||
|
||||
<template v-else>
|
||||
<view class="field">
|
||||
<input
|
||||
class="field-input"
|
||||
v-model="form.email"
|
||||
type="text"
|
||||
placeholder="邮箱"
|
||||
placeholder-class="field-placeholder"
|
||||
/>
|
||||
</view>
|
||||
<text class="mode-tip">验证码将以邮件形式发送到该邮箱</text>
|
||||
</template>
|
||||
|
||||
<view class="btn-primary" :class="{ disabled: loading }" @tap="handleNextFromIdentity">
|
||||
{{ loading ? '验证中...' : '下一步' }}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 第二步:验证手机号并发送验证码 -->
|
||||
<view v-if="currentStep === 2" class="form">
|
||||
<view class="info-box">
|
||||
<view v-else-if="currentStep === 2" class="form">
|
||||
<view v-if="mode === 'account'" class="info-box">
|
||||
<text class="info-label">租户</text>
|
||||
<text class="info-value">{{ form.tenant_name }}</text>
|
||||
</view>
|
||||
<view class="info-box">
|
||||
<view v-if="mode === 'account'" class="info-box">
|
||||
<text class="info-label">账号</text>
|
||||
<text class="info-value">{{ form.account }}</text>
|
||||
</view>
|
||||
|
||||
<view v-if="verifyResult.phone" class="field">
|
||||
<input
|
||||
class="field-input"
|
||||
v-model="form.phone"
|
||||
type="tel"
|
||||
maxlength="11"
|
||||
placeholder="手机号"
|
||||
placeholder-class="field-placeholder"
|
||||
/>
|
||||
</view>
|
||||
<view v-else class="empty-contact">
|
||||
<text>账号未绑定手机号,请联系管理员</text>
|
||||
<view class="info-box">
|
||||
<text class="info-label">{{ targetLabel }}</text>
|
||||
<text class="info-value">{{ maskedTarget }}</text>
|
||||
</view>
|
||||
|
||||
<view class="field field-row">
|
||||
@@ -71,36 +100,36 @@
|
||||
v-model="form.sms_code"
|
||||
type="number"
|
||||
maxlength="6"
|
||||
placeholder="短信验证码"
|
||||
placeholder="验证码"
|
||||
placeholder-class="field-placeholder"
|
||||
/>
|
||||
<text
|
||||
class="code-link"
|
||||
:class="{ disabled: countdown > 0 || codeLoading || !verifyResult.phone }"
|
||||
:class="{ disabled: countdown > 0 || codeLoading }"
|
||||
@tap="handleSendCode"
|
||||
>{{ countdown > 0 ? `${countdown}s` : (codeLoading ? '发送中' : '获取验证码') }}</text>
|
||||
</view>
|
||||
<text class="code-tip">{{ codeTip }}</text>
|
||||
|
||||
<view class="btn-primary" :class="{ disabled: loading }" @tap="handleVerifyPhone">
|
||||
<view class="btn-primary" :class="{ disabled: loading }" @tap="handleNextFromCode">
|
||||
{{ loading ? '验证中...' : '下一步' }}
|
||||
</view>
|
||||
|
||||
<view class="action-row">
|
||||
<text class="link-text" @tap="currentStep = 1">返回上一步</text>
|
||||
<text class="link-text" @tap="backToPrev">返回上一步</text>
|
||||
<text class="link-text" @tap="goBack">返回登录</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 第三步:重置密码 -->
|
||||
<view v-if="currentStep === 3" class="form">
|
||||
<view class="info-box">
|
||||
<text class="info-label">租户</text>
|
||||
<text class="info-value">{{ form.tenant_name }}</text>
|
||||
</view>
|
||||
<view class="info-box">
|
||||
<view v-else class="form">
|
||||
<view v-if="mode === 'account'" class="info-box">
|
||||
<text class="info-label">账号</text>
|
||||
<text class="info-value">{{ form.account }}</text>
|
||||
</view>
|
||||
<view class="info-box">
|
||||
<text class="info-label">{{ targetLabel }}</text>
|
||||
<text class="info-value">{{ maskedTarget }}</text>
|
||||
</view>
|
||||
|
||||
<view class="field">
|
||||
<input
|
||||
@@ -126,7 +155,7 @@
|
||||
</view>
|
||||
|
||||
<view class="action-row">
|
||||
<text class="link-text" @tap="currentStep = 2">返回上一步</text>
|
||||
<text class="link-text" @tap="backToPrev">返回上一步</text>
|
||||
<text class="link-text" @tap="goBack">返回登录</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -136,13 +165,29 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { reactive, ref, onUnmounted } from 'vue'
|
||||
import { reactive, ref, computed, onUnmounted } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { mpHeadPad } from '@/utils/mpHead.js'
|
||||
|
||||
const headPad = mpHeadPad()
|
||||
import { verifyAccount, resetPassword, sendResetCode } from '@/api/auth.js'
|
||||
import { setTenantName, getTenantName } from '@/utils/auth.js'
|
||||
import {
|
||||
verifyAccount,
|
||||
resetPassword,
|
||||
sendResetCode,
|
||||
sendResetSmsCode,
|
||||
resetPasswordByMobile,
|
||||
sendResetEmailCode,
|
||||
resetPasswordByEmail
|
||||
} from '@/api/auth.js'
|
||||
import { setTenantName, getTenantName, getRememberLogin } from '@/utils/auth.js'
|
||||
|
||||
const MODES = [
|
||||
{ key: 'account', label: '账号' },
|
||||
{ key: 'phone', label: '手机号' },
|
||||
{ key: 'email', label: '邮箱' }
|
||||
]
|
||||
|
||||
const mode = ref('account')
|
||||
const currentStep = ref(1)
|
||||
const loading = ref(false)
|
||||
const codeLoading = ref(false)
|
||||
@@ -153,14 +198,71 @@ const form = reactive({
|
||||
tenant_name: getTenantName() || '',
|
||||
account: '',
|
||||
phone: '',
|
||||
mobile: '',
|
||||
email: '',
|
||||
sms_code: '',
|
||||
new_password: '',
|
||||
confirm_password: ''
|
||||
})
|
||||
|
||||
const verifyResult = reactive({
|
||||
phone: '',
|
||||
email: ''
|
||||
const stepSubtitle = computed(() => {
|
||||
if (currentStep.value === 1) {
|
||||
if (mode.value === 'account') return '填写租户与账号'
|
||||
if (mode.value === 'phone') return '填写账号绑定的手机号'
|
||||
return '填写账号绑定的邮箱'
|
||||
}
|
||||
if (currentStep.value === 2) return '输入验证码验证身份'
|
||||
return '设置新密码'
|
||||
})
|
||||
|
||||
const targetLabel = computed(() => (mode.value === 'email' ? '邮箱' : '手机号'))
|
||||
|
||||
const maskedTarget = computed(() => {
|
||||
if (mode.value === 'email') return maskEmail(form.email)
|
||||
if (mode.value === 'phone') return maskPhone(form.mobile)
|
||||
return maskPhone(form.phone)
|
||||
})
|
||||
|
||||
const codeTip = computed(() =>
|
||||
mode.value === 'email' ? '验证码将发送至上面的邮箱' : '验证码将发送至上面的手机号'
|
||||
)
|
||||
|
||||
function maskPhone(phone) {
|
||||
const s = String(phone || '')
|
||||
if (s.length < 7) return s
|
||||
return s.slice(0, 3) + '****' + s.slice(-4)
|
||||
}
|
||||
|
||||
function maskEmail(email) {
|
||||
const s = String(email || '')
|
||||
const at = s.indexOf('@')
|
||||
if (at <= 0) return s
|
||||
const name = s.slice(0, at)
|
||||
const keep = name.length <= 2 ? 1 : 2
|
||||
return name.slice(0, keep) + '***' + s.slice(at)
|
||||
}
|
||||
|
||||
onLoad((options = {}) => {
|
||||
const remembered = getRememberLogin() || {}
|
||||
let handed = {}
|
||||
try {
|
||||
handed = uni.getStorageSync('app_forget_prefill') || {}
|
||||
uni.removeStorageSync('app_forget_prefill')
|
||||
} catch (e) {
|
||||
handed = {}
|
||||
}
|
||||
const tenant = String(options.tenant_name || handed.tenant_name || '').trim()
|
||||
const acc = String(options.account || handed.account || remembered.account || '').trim()
|
||||
if (tenant) form.tenant_name = tenant
|
||||
if (/^1[3-9]\d{9}$/.test(acc)) {
|
||||
form.mobile = acc
|
||||
mode.value = 'phone'
|
||||
} else if (acc.indexOf('@') > 0) {
|
||||
form.email = acc
|
||||
mode.value = 'email'
|
||||
} else if (acc) {
|
||||
form.account = acc
|
||||
}
|
||||
})
|
||||
|
||||
function startCountdown() {
|
||||
@@ -175,94 +277,99 @@ function startCountdown() {
|
||||
}, 1000)
|
||||
}
|
||||
|
||||
// 第一步:验证租户和账号
|
||||
async function handleVerifyAccount() {
|
||||
if (loading.value) return
|
||||
if (!form.tenant_name.trim() || !form.account.trim()) {
|
||||
uni.showToast({ title: '请填写租户和账号', icon: 'none' })
|
||||
return
|
||||
}
|
||||
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await verifyAccount({
|
||||
tenant_name: form.tenant_name.trim(),
|
||||
account: form.account.trim()
|
||||
})
|
||||
verifyResult.phone = data?.phone || ''
|
||||
verifyResult.email = data?.email || ''
|
||||
if (!verifyResult.phone && !verifyResult.email) {
|
||||
uni.showToast({ title: '账号未绑定验证方式', icon: 'none' })
|
||||
return
|
||||
}
|
||||
form.phone = verifyResult.phone || ''
|
||||
currentStep.value = 2
|
||||
} catch (err) {
|
||||
// error handled by request interceptor
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
function resetCountdown() {
|
||||
if (timer) clearInterval(timer)
|
||||
timer = null
|
||||
countdown.value = 0
|
||||
}
|
||||
|
||||
function pickMode(key) {
|
||||
if (mode.value === key) return
|
||||
mode.value = key
|
||||
form.sms_code = ''
|
||||
resetCountdown()
|
||||
}
|
||||
|
||||
async function handleNextFromIdentity() {
|
||||
if (loading.value) return
|
||||
|
||||
if (mode.value === 'account') {
|
||||
if (!form.tenant_name.trim() || !form.account.trim()) {
|
||||
uni.showToast({ title: '请填写租户和账号', icon: 'none' })
|
||||
return
|
||||
}
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await verifyAccount({
|
||||
tenant_name: form.tenant_name.trim(),
|
||||
account: form.account.trim()
|
||||
})
|
||||
form.phone = String(data?.phone || '').trim()
|
||||
if (!form.phone) {
|
||||
uni.showToast({ title: '该账号未绑定手机号,请联系管理员重置', icon: 'none' })
|
||||
return
|
||||
}
|
||||
currentStep.value = 2
|
||||
} catch (err) {
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if (mode.value === 'phone') {
|
||||
const phone = form.mobile.trim()
|
||||
if (!/^1[3-9]\d{9}$/.test(phone)) {
|
||||
uni.showToast({ title: '请输入正确的手机号', icon: 'none' })
|
||||
return
|
||||
}
|
||||
currentStep.value = 2
|
||||
return
|
||||
}
|
||||
|
||||
const email = form.email.trim()
|
||||
if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
|
||||
uni.showToast({ title: '请输入正确的邮箱地址', icon: 'none' })
|
||||
return
|
||||
}
|
||||
currentStep.value = 2
|
||||
}
|
||||
|
||||
// 第二步:发送验证码
|
||||
async function handleSendCode() {
|
||||
if (codeLoading.value || countdown.value > 0) return
|
||||
if (!form.phone.trim()) {
|
||||
uni.showToast({ title: '请输入手机号', icon: 'none' })
|
||||
return
|
||||
}
|
||||
if (!/^1\d{10}$/.test(form.phone)) {
|
||||
uni.showToast({ title: '请输入正确的手机号', icon: 'none' })
|
||||
return
|
||||
}
|
||||
|
||||
codeLoading.value = true
|
||||
try {
|
||||
await sendResetCode({
|
||||
tenant_name: form.tenant_name.trim(),
|
||||
account: form.account.trim(),
|
||||
phone: form.phone.trim(),
|
||||
channel: 'sms'
|
||||
})
|
||||
if (mode.value === 'account') {
|
||||
await sendResetCode({
|
||||
tenant_name: form.tenant_name.trim(),
|
||||
account: form.account.trim(),
|
||||
phone: form.phone,
|
||||
channel: 'sms'
|
||||
})
|
||||
} else if (mode.value === 'phone') {
|
||||
await sendResetSmsCode({ phone: form.mobile.trim() })
|
||||
} else {
|
||||
await sendResetEmailCode({ email: form.email.trim() })
|
||||
}
|
||||
uni.showToast({ title: '验证码已发送', icon: 'success' })
|
||||
startCountdown()
|
||||
} catch (err) {
|
||||
// error handled by request interceptor
|
||||
} finally {
|
||||
codeLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// 第二步验证:验证手机和验证码
|
||||
async function handleVerifyPhone() {
|
||||
if (loading.value) return
|
||||
if (!form.phone.trim()) {
|
||||
uni.showToast({ title: '请输入手机号', icon: 'none' })
|
||||
return
|
||||
}
|
||||
function handleNextFromCode() {
|
||||
if (!form.sms_code.trim()) {
|
||||
uni.showToast({ title: '请输入验证码', icon: 'none' })
|
||||
return
|
||||
}
|
||||
|
||||
loading.value = true
|
||||
try {
|
||||
// 后端的验证码验证在重置密码时进行,这里只是提交到第三步
|
||||
currentStep.value = 3
|
||||
} catch (err) {
|
||||
// error handled by request interceptor
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
currentStep.value = 3
|
||||
}
|
||||
|
||||
// 第三步:重置密码
|
||||
async function handleResetPassword() {
|
||||
if (loading.value) return
|
||||
if (!form.tenant_name.trim() || !form.account.trim() || !form.phone.trim()) {
|
||||
uni.showToast({ title: '请填写租户、账号和手机号', icon: 'none' })
|
||||
return
|
||||
}
|
||||
if (!form.new_password) {
|
||||
uni.showToast({ title: '请输入新密码', icon: 'none' })
|
||||
return
|
||||
@@ -276,32 +383,54 @@ async function handleResetPassword() {
|
||||
return
|
||||
}
|
||||
if (!form.sms_code.trim()) {
|
||||
uni.showToast({ title: '请输入验证码', icon: 'none' })
|
||||
uni.showToast({ title: '请先获取并输入验证码', icon: 'none' })
|
||||
return
|
||||
}
|
||||
|
||||
loading.value = true
|
||||
try {
|
||||
await resetPassword({
|
||||
tenant_name: form.tenant_name.trim(),
|
||||
account: form.account.trim(),
|
||||
phone: form.phone.trim(),
|
||||
sms_code: form.sms_code.trim(),
|
||||
new_password: form.new_password,
|
||||
confirm_password: form.confirm_password
|
||||
})
|
||||
setTenantName(form.tenant_name.trim())
|
||||
if (mode.value === 'account') {
|
||||
await resetPassword({
|
||||
tenant_name: form.tenant_name.trim(),
|
||||
account: form.account.trim(),
|
||||
phone: form.phone,
|
||||
sms_code: form.sms_code.trim(),
|
||||
new_password: form.new_password,
|
||||
confirm_password: form.confirm_password
|
||||
})
|
||||
setTenantName(form.tenant_name.trim())
|
||||
} else if (mode.value === 'phone') {
|
||||
await resetPasswordByMobile({
|
||||
phone: form.mobile.trim(),
|
||||
code: form.sms_code.trim(),
|
||||
password: form.new_password,
|
||||
confirm: form.confirm_password
|
||||
})
|
||||
} else {
|
||||
await resetPasswordByEmail({
|
||||
email: form.email.trim(),
|
||||
code: form.sms_code.trim(),
|
||||
password: form.new_password,
|
||||
confirm: form.confirm_password
|
||||
})
|
||||
}
|
||||
resetCountdown()
|
||||
uni.showToast({ title: '重置成功,请登录', icon: 'success' })
|
||||
setTimeout(() => {
|
||||
uni.reLaunch({ url: '/pages/login/login' })
|
||||
}, 500)
|
||||
}, 600)
|
||||
} catch (err) {
|
||||
// error handled by request interceptor
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function backToPrev() {
|
||||
resetCountdown()
|
||||
form.sms_code = ''
|
||||
currentStep.value = Math.max(1, currentStep.value - 1)
|
||||
}
|
||||
|
||||
function goBack() {
|
||||
uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/login/login' }) })
|
||||
}
|
||||
@@ -370,6 +499,44 @@ onUnmounted(() => {
|
||||
gap: 20rpx;
|
||||
}
|
||||
|
||||
.mode-tabs {
|
||||
display: flex;
|
||||
gap: 8rpx;
|
||||
padding: 6rpx;
|
||||
border-radius: $radius-md;
|
||||
background: $color-bg-page;
|
||||
}
|
||||
|
||||
.mode-tab {
|
||||
flex: 1;
|
||||
height: 72rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 12rpx;
|
||||
|
||||
&.on {
|
||||
background: $color-card;
|
||||
box-shadow: 0 2rpx 8rpx rgba(15, 23, 42, 0.08);
|
||||
}
|
||||
}
|
||||
|
||||
.mode-tab-text {
|
||||
font-size: 28rpx;
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
.mode-tab.on .mode-tab-text {
|
||||
font-weight: 600;
|
||||
color: $color-primary;
|
||||
}
|
||||
|
||||
.mode-tip {
|
||||
font-size: 22rpx;
|
||||
line-height: 1.5;
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
.field {
|
||||
background: $color-bg-page;
|
||||
border-radius: $radius-md;
|
||||
@@ -417,6 +584,12 @@ onUnmounted(() => {
|
||||
}
|
||||
}
|
||||
|
||||
.code-tip {
|
||||
font-size: 22rpx;
|
||||
line-height: 1.5;
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
.info-box {
|
||||
background: $color-bg-page;
|
||||
border-radius: $radius-md;
|
||||
@@ -482,11 +655,4 @@ onUnmounted(() => {
|
||||
color: $color-primary;
|
||||
padding: 12rpx 0;
|
||||
}
|
||||
|
||||
.footer-link {
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: $color-primary;
|
||||
padding: 16rpx 0 4rpx;
|
||||
}
|
||||
</style>
|
||||
@@ -66,7 +66,6 @@ onLoad((query) => {
|
||||
const curPage = pagesList[pagesList.length - 1]
|
||||
eventChannel = curPage?.getOpenerEventChannel?.()
|
||||
|
||||
// 轮询 plus.storage 结果(每 60ms 检查一次)
|
||||
pollTimer = setInterval(() => {
|
||||
if (settled) return
|
||||
try {
|
||||
|
||||
+48
-108
@@ -1,10 +1,8 @@
|
||||
<template>
|
||||
<view class="login-page">
|
||||
<!-- 背景装饰(纯视觉,不拦截点击) -->
|
||||
<view class="deco deco-a" />
|
||||
<view class="deco deco-b" />
|
||||
|
||||
<!-- 顶部自绘导航(账号密码 / 选择企业视图) -->
|
||||
<view v-if="step !== 'main'" class="nav-bar" :style="{ paddingTop: navPadTop }">
|
||||
<view class="nav-back" :class="{ invisible: !canGoBack }" @tap="onNavBack">
|
||||
<FaIcon name="chevron-left" color="#1e293b" :size="20" />
|
||||
@@ -13,9 +11,7 @@
|
||||
<view class="nav-side" />
|
||||
</view>
|
||||
|
||||
<!-- 品牌区 + 表单卡片 -->
|
||||
<view class="login-body">
|
||||
<!-- 品牌区 -->
|
||||
<view class="brand" :class="{ compact: step !== 'main' }" :style="{ paddingTop: brandPadTop }">
|
||||
<view class="brand-logo">
|
||||
<FaIcon name="shield-halved" color="#ffffff" :size="22" />
|
||||
@@ -25,7 +21,6 @@
|
||||
</view>
|
||||
|
||||
<view class="card">
|
||||
<!-- ============ 主视图:微信一键登录 ============ -->
|
||||
<block v-if="step === 'main'">
|
||||
<view class="panel-head">
|
||||
<text class="panel-title">欢迎登录</text>
|
||||
@@ -37,7 +32,6 @@
|
||||
</view>
|
||||
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<!-- 微信端且服务端已开通:一键登录主 CTA -->
|
||||
<block v-if="showMiniLogin">
|
||||
<button
|
||||
class="btn-wechat"
|
||||
@@ -57,7 +51,6 @@
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
|
||||
<!-- 弱化入口:切换到独立的账号密码登录视图 -->
|
||||
<view class="alt-entry" @tap="goAccount">
|
||||
<view class="alt-line" />
|
||||
<text class="alt-text">使用账号密码登录</text>
|
||||
@@ -65,14 +58,16 @@
|
||||
<view class="alt-line" />
|
||||
</view>
|
||||
|
||||
<!-- 返回门户:不登录也能先用免登录功能 -->
|
||||
<view class="forget-entry" @tap="goForget">
|
||||
<text class="forget-entry-text">无法登录?忘记密码</text>
|
||||
</view>
|
||||
|
||||
<view class="back-portal" @tap="goPortal">
|
||||
<FaIcon name="chevron-left" color="#94a3b8" :size="12" />
|
||||
<text class="back-portal-text">返回门户,先使用免登录功能</text>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- ============ 账号密码登录(独立视图) ============ -->
|
||||
<block v-else-if="step === 'account'">
|
||||
<view class="panel-head">
|
||||
<text class="panel-title">欢迎回来</text>
|
||||
@@ -124,7 +119,9 @@
|
||||
<view class="checkbox" :class="{ on: rememberMe }" />
|
||||
<text class="remember-text">记住账号</text>
|
||||
</view>
|
||||
<text class="link" @tap="goForget">忘记密码</text>
|
||||
<view class="link-btn" @tap="goForget">
|
||||
<text class="link">忘记密码</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view
|
||||
@@ -135,19 +132,16 @@
|
||||
<text>{{ submitting ? '登录中...' : '登 录' }}</text>
|
||||
</view>
|
||||
|
||||
<!-- 登录页不提供注册入口:账号由企业管理员在后台统一开通 -->
|
||||
<view class="back-row">
|
||||
<text class="tip-text">没有账号?请联系企业管理员开通</text>
|
||||
</view>
|
||||
|
||||
<!-- 返回门户:不登录也能先用免登录功能 -->
|
||||
<view class="back-portal" @tap="goPortal">
|
||||
<FaIcon name="chevron-left" color="#94a3b8" :size="12" />
|
||||
<text class="back-portal-text">返回门户,先使用免登录功能</text>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- ============ 选择企业(一人多企业) ============ -->
|
||||
<block v-else>
|
||||
<view class="panel-head">
|
||||
<text class="panel-title">请选择企业</text>
|
||||
@@ -178,7 +172,6 @@
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- ============ 协议(企业选择视图无需) ============ -->
|
||||
<block v-if="step !== 'tenant'">
|
||||
<view class="agreement" @tap="toggleAgree">
|
||||
<view class="agree-dot" :class="{ on: agreed }" />
|
||||
@@ -190,7 +183,6 @@
|
||||
</text>
|
||||
</view>
|
||||
|
||||
<!-- 未勾选协议提示 -->
|
||||
<view v-if="!agreed && showAgreementTip" class="agree-tip">
|
||||
<FaIcon name="circle-info" color="#f79009" :size="12" />
|
||||
<text class="agree-tip-text">请先阅读并勾选同意《用户协议》和《隐私政策》</text>
|
||||
@@ -228,6 +220,7 @@ import {
|
||||
setTenants,
|
||||
setTid,
|
||||
setTenantName,
|
||||
getTenantName,
|
||||
resolveTenantName,
|
||||
clearPendingAuth,
|
||||
getToken
|
||||
@@ -237,7 +230,6 @@ import { getGuestToken, clearGuestToken } from '@/utils/guest.js'
|
||||
import { guestMerge } from '@/api/guest.js'
|
||||
import FaIcon from '@/components/FaIcon.vue'
|
||||
|
||||
/** 运行端检测:h5 / apk(app-plus) / mp-weixin,决定登录方式优先级 */
|
||||
const platform = ref('')
|
||||
// #ifdef H5
|
||||
platform.value = 'h5'
|
||||
@@ -249,17 +241,10 @@ platform.value = 'apk'
|
||||
platform.value = 'mp-weixin'
|
||||
// #endif
|
||||
|
||||
/**
|
||||
* 视图状态:
|
||||
* main 微信一键登录主入口(小程序端默认视图)
|
||||
* account 账号密码登录(独立视图,由主视图弱化入口进入)
|
||||
* tenant 选择企业(一人多企业)
|
||||
*/
|
||||
const step = ref(platform.value === 'mp-weixin' ? 'main' : 'account')
|
||||
const account = ref('')
|
||||
const password = ref('')
|
||||
const showPassword = ref(false)
|
||||
/** 用户协议必须主动勾选,默认不勾选(此前默认 true 导致未勾选也能登录) */
|
||||
const agreed = ref(false)
|
||||
const rememberMe = ref(false)
|
||||
const submitting = ref(false)
|
||||
@@ -268,20 +253,13 @@ const errorMsg = ref('')
|
||||
const tenants = ref([])
|
||||
const verifyCfg = ref({ needGeetest: false, captchaId: '' })
|
||||
|
||||
/** 仅微信小程序端且服务端已开通时展示「一键登录」入口 */
|
||||
const showMiniLogin = ref(false)
|
||||
|
||||
/** 顶部导航标题 */
|
||||
const navTitle = computed(() => {
|
||||
if (step.value === 'tenant') return '选择企业'
|
||||
return '账号密码登录'
|
||||
})
|
||||
|
||||
/**
|
||||
* 状态栏高度(px)。
|
||||
* 小程序端 env(safe-area-inset-top) 在无刘海的安卓机型返回 0,
|
||||
* 自绘导航会被状态栏压住,因此这里取系统信息里的真实状态栏高度。
|
||||
*/
|
||||
const statusBarHeight = ref(0)
|
||||
try {
|
||||
const info =
|
||||
@@ -291,30 +269,25 @@ try {
|
||||
statusBarHeight.value = 0
|
||||
}
|
||||
|
||||
/** 自绘导航的上内边距:状态栏高度(导航本体固定 88rpx) */
|
||||
const navPadTop = computed(() => `${statusBarHeight.value}px`)
|
||||
|
||||
/** 品牌区上内边距:主视图需让开状态栏,紧凑视图(账号/企业)由导航栏已占位 */
|
||||
const brandPadTop = computed(() => {
|
||||
if (step.value !== 'main') return '32rpx'
|
||||
return `${statusBarHeight.value + uni.upx2px(88)}px`
|
||||
})
|
||||
|
||||
/** 是否显示可返回的上级箭头(账号视图无论能否退回主视图都可见:退不了就回门户) */
|
||||
const canGoBack = computed(() => {
|
||||
if (step.value === 'tenant') return true
|
||||
if (step.value === 'account') return true
|
||||
return false
|
||||
})
|
||||
|
||||
/** 切换到账号密码登录视图 */
|
||||
function goAccount() {
|
||||
if (submitting.value) return
|
||||
step.value = 'account'
|
||||
errorMsg.value = ''
|
||||
}
|
||||
|
||||
/** 返回微信一键登录主视图 */
|
||||
function goMain() {
|
||||
if (submitting.value) return
|
||||
if (!showMiniLogin.value) return
|
||||
@@ -322,7 +295,6 @@ function goMain() {
|
||||
errorMsg.value = ''
|
||||
}
|
||||
|
||||
/** 顶部导航返回:登录内部层级优先逐级退;无可退上级时返回门户(免登录页) */
|
||||
function onNavBack() {
|
||||
if (step.value === 'tenant') {
|
||||
backToAccount()
|
||||
@@ -332,15 +304,9 @@ function onNavBack() {
|
||||
goMain()
|
||||
return
|
||||
}
|
||||
// 无登录内部上级 → 返回门户,继续用免登录功能
|
||||
goPortal()
|
||||
}
|
||||
|
||||
/**
|
||||
* 返回门户首页(nav)。
|
||||
* 多数从 nav 点「需登录」模块进来,直接 navigateBack 回上一页(保留游客宫格);
|
||||
* 若是被 401 兑回登录页等无栈场景,回落到 reLaunch nav 以游客态重载。
|
||||
*/
|
||||
function goPortal() {
|
||||
if (submitting.value) return
|
||||
const pages = (typeof getCurrentPages === 'function' && getCurrentPages()) || []
|
||||
@@ -364,7 +330,6 @@ onMounted(async () => {
|
||||
loadMiniLoginConfig()
|
||||
})
|
||||
|
||||
/** 拉取统一认证的登录验证配置(极验开关与 captcha_id) */
|
||||
async function loadVerifyConfig() {
|
||||
try {
|
||||
const data = await getAuthVerifyConfig()
|
||||
@@ -377,7 +342,6 @@ async function loadVerifyConfig() {
|
||||
}
|
||||
}
|
||||
|
||||
/** 小程序一键登录是否已开通(仅微信端拉取,未开通则回退账号密码登录) */
|
||||
async function loadMiniLoginConfig() {
|
||||
if (platform.value !== 'mp-weixin') return
|
||||
try {
|
||||
@@ -386,21 +350,17 @@ async function loadMiniLoginConfig() {
|
||||
} catch {
|
||||
showMiniLogin.value = false
|
||||
}
|
||||
// 服务端未开通一键登录:直接落到账号密码视图
|
||||
if (!showMiniLogin.value && step.value === 'main') {
|
||||
step.value = 'account'
|
||||
}
|
||||
}
|
||||
|
||||
/* ==================== 登录主流程 ==================== */
|
||||
|
||||
async function handleLogin() {
|
||||
console.log('[login] tap handleLogin', { submitting: submitting.value, agreed: agreed.value })
|
||||
if (submitting.value) {
|
||||
uni.showToast({ title: '登录处理中,请稍候', icon: 'none' })
|
||||
return
|
||||
}
|
||||
// 未勾选协议:弹窗确认,确认后自动勾选并继续登录
|
||||
if (!agreed.value) {
|
||||
let ok = false
|
||||
try {
|
||||
@@ -427,7 +387,6 @@ async function handleLogin() {
|
||||
errorMsg.value = ''
|
||||
try {
|
||||
let captcha = null
|
||||
// 小程序端无极验 SDK:不弹验证,后端对 yz-miniapp 客户端也跳过校验
|
||||
if (verifyCfg.value.needGeetest && platform.value !== 'mp-weixin') {
|
||||
if (!verifyCfg.value.captchaId) {
|
||||
errorMsg.value = '人机验证未配置,请联系管理员'
|
||||
@@ -446,17 +405,12 @@ async function handleLogin() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 统一处理 /auth/login 与 /auth/wechat/miniapp/login 的返回:
|
||||
* 两者的令牌与待选企业标记都在顶层,结构一致。
|
||||
*/
|
||||
async function handleAuthResult(data, fallbackAccount = '') {
|
||||
if (!data || data.code !== 200) {
|
||||
errorMsg.value = (data && data.msg) || '登录失败'
|
||||
return
|
||||
}
|
||||
|
||||
// 一人多企业:先落待选令牌,再让用户选企业
|
||||
if (data.need_choose_tenant) {
|
||||
setAuthTokens(data.tokens || { access_token: data.access_token, sid: data.sid })
|
||||
tenants.value = data.tenants || []
|
||||
@@ -481,7 +435,6 @@ function chooseTenant(item) {
|
||||
uni.showLoading({ title: '进入中...', mask: true })
|
||||
switchTenant({ tid: item.tid })
|
||||
.then(async (res) => {
|
||||
// request 已解包 data:{ tokens, identity }
|
||||
if (!res || !res.tokens) {
|
||||
errorMsg.value = (res && res.msg) || '进入企业失败'
|
||||
return
|
||||
@@ -495,20 +448,17 @@ function chooseTenant(item) {
|
||||
})
|
||||
}
|
||||
|
||||
/** 从「选择企业」退回账号密码视图 */
|
||||
function backToAccount() {
|
||||
clearAuthState()
|
||||
step.value = 'account'
|
||||
errorMsg.value = ''
|
||||
}
|
||||
|
||||
/** 写入登录态并跳转首页 */
|
||||
async function finishLogin(tokens, tenantList, tid, fallbackAccount = '') {
|
||||
setAuthTokens(tokens || {})
|
||||
const list = Array.isArray(tenantList) ? tenantList : []
|
||||
setTenants(list)
|
||||
|
||||
// /auth/login 不返回身份信息,统一用 userinfo 补全(含 id / group_id)
|
||||
let profile = null
|
||||
try {
|
||||
profile = await fetchUserInfo()
|
||||
@@ -536,11 +486,8 @@ async function finishLogin(tokens, tenantList, tid, fallbackAccount = '') {
|
||||
}
|
||||
})
|
||||
|
||||
// 微信端:登录成功后静默绑定 openid,认证中/无手机号能力时一键登录靠它认人
|
||||
await silentBindMiniapp()
|
||||
|
||||
// 游客数据转正:持游客令牌(手机号授权)时静默并入账号;
|
||||
// 失败不阻断跳转(令牌保留,下次登录自动重试;令牌失效则由 401 自动清理)
|
||||
if (getGuestToken()) {
|
||||
try {
|
||||
await guestMerge()
|
||||
@@ -557,9 +504,6 @@ async function finishLogin(tokens, tenantList, tid, fallbackAccount = '') {
|
||||
}, 400)
|
||||
}
|
||||
|
||||
/* ==================== 微信小程序一键登录 ==================== */
|
||||
|
||||
/** 取 uni.login 的临时登录凭证 */
|
||||
function uniLoginCode() {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.login({
|
||||
@@ -573,23 +517,16 @@ function uniLoginCode() {
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 微信端登录成功后静默把当前 openid 绑到该账号。
|
||||
* 小程序认证中 / 未开通手机号能力时,一键登录拿不到手机号,
|
||||
* 后端按这条绑定认人;绑定失败不阻塞登录。
|
||||
*/
|
||||
async function silentBindMiniapp() {
|
||||
if (platform.value !== 'mp-weixin') return
|
||||
try {
|
||||
const code = await uniLoginCode()
|
||||
await bindMiniapp({ code })
|
||||
} catch {
|
||||
/* 静默:不影响已完成的登录 */
|
||||
}
|
||||
}
|
||||
|
||||
// #ifdef MP-WEIXIN
|
||||
/** getPhoneNumber 授权回调:动态 code + uni.login code 一起换登录态 */
|
||||
async function onGetPhoneNumber(e) {
|
||||
if (submitting.value) return
|
||||
const detail = (e && e.detail) || {}
|
||||
@@ -598,7 +535,6 @@ async function onGetPhoneNumber(e) {
|
||||
uni.showToast({ title: '你已取消手机号授权', icon: 'none' })
|
||||
return
|
||||
}
|
||||
// 手机号授权码可能不可用;仍继续尝试按已绑定的 openid 登录
|
||||
const phoneCode = detail.code && errMsg.indexOf('fail') === -1 ? detail.code : ''
|
||||
if (!agreed.value) {
|
||||
const ok = await confirmAgreement()
|
||||
@@ -621,7 +557,6 @@ async function onGetPhoneNumber(e) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 按后端返回的 reason 给出差异化引导 */
|
||||
function handleMiniError(err) {
|
||||
const reason = err && err.response && err.response.reason
|
||||
if (reason === 'identity_not_found') {
|
||||
@@ -646,9 +581,6 @@ function handleMiniError(err) {
|
||||
}
|
||||
// #endif
|
||||
|
||||
/* ==================== 工具 ==================== */
|
||||
|
||||
/** 只记住账号,绝不保存密码 */
|
||||
function saveRememberAccount(acc) {
|
||||
if (rememberMe.value) {
|
||||
saveRememberLogin({ tenantName: '', account: acc })
|
||||
@@ -657,14 +589,12 @@ function saveRememberAccount(acc) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 清除待选企业阶段的临时令牌,避免半登录态残留 */
|
||||
function clearAuthState() {
|
||||
clearPendingAuth()
|
||||
}
|
||||
|
||||
function showError(err) {
|
||||
const raw = (err && err.message) || ''
|
||||
// 微信未配置 request 合法域名:原始报错是英文,给出可操作的中文提示
|
||||
if (/url not in domain list/i.test(raw)) {
|
||||
errorMsg.value =
|
||||
'当前小程序未配置服务器域名,请在微信公众平台「开发管理 - 开发设置 - 服务器域名」中添加 api.yunzer.cn 为 request 合法域名'
|
||||
@@ -673,7 +603,6 @@ function showError(err) {
|
||||
errorMsg.value = raw || '登录失败,请稍后重试'
|
||||
}
|
||||
|
||||
/** 勾选/取消用户协议:勾选后自动收起未勾选提示 */
|
||||
function toggleAgree() {
|
||||
agreed.value = !agreed.value
|
||||
if (agreed.value) showAgreementTip.value = false
|
||||
@@ -683,14 +612,6 @@ function openLegal(path, title) {
|
||||
uni.navigateTo({ url: `/pages/legal/document?path=${encodeURIComponent(path)}&title=${encodeURIComponent(title)}` })
|
||||
}
|
||||
|
||||
/**
|
||||
* 未勾选协议时的二次确认弹窗。
|
||||
* 点「同意登录」→ 自动勾选协议并返回 true,调用方继续登录;
|
||||
* 点「再看看」→ 返回 false,停在当前页并高亮提示。
|
||||
* 兜底:部分端 showModal 既不回调 success 也不回调 fail,会导致 await 永久挂起、
|
||||
* 点击登录「没反应」,这里用超时保证一定会返回,绝不阻塞。
|
||||
* @returns {Promise<boolean>}
|
||||
*/
|
||||
function confirmAgreement() {
|
||||
return new Promise((resolve) => {
|
||||
let settled = false
|
||||
@@ -726,14 +647,24 @@ function confirmAgreement() {
|
||||
}
|
||||
|
||||
function goForget() {
|
||||
uni.navigateTo({ url: '/pages/login/forget' })
|
||||
if (submitting.value) return
|
||||
const remembered = getRememberLogin() || {}
|
||||
const acc = String(account.value || remembered.account || '').trim()
|
||||
const tenant = String(getTenantName() || remembered.tenantName || '').trim()
|
||||
uni.setStorageSync('app_forget_prefill', { tenant_name: tenant, account: acc })
|
||||
uni.navigateTo({
|
||||
url: '/pages/login/forget',
|
||||
fail: (err) => {
|
||||
console.error('[login] 打开忘记密码失败:', err)
|
||||
uni.showToast({ title: '打开忘记密码失败,请重试', icon: 'none' })
|
||||
}
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import '@/src/styles/page-common.scss';
|
||||
|
||||
/* ---------- 页面骨架:浅蓝白渐变 ---------- */
|
||||
.login-page {
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
@@ -745,12 +676,10 @@ function goForget() {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 主体(品牌 + 卡片):自动上下外边距实现垂直居中,内容超高时不裁切 */
|
||||
.login-body {
|
||||
margin: auto 0;
|
||||
}
|
||||
|
||||
/* 背景光斑:纯装饰,径向渐变让边缘自然消隐 */
|
||||
.deco {
|
||||
position: absolute;
|
||||
border-radius: 50%;
|
||||
@@ -773,14 +702,12 @@ function goForget() {
|
||||
background: radial-gradient(circle, rgba(37, 99, 235, 0.14) 0%, rgba(37, 99, 235, 0) 70%);
|
||||
}
|
||||
|
||||
/* ---------- 顶部自绘导航 ---------- */
|
||||
.nav-bar {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
/* 高度不含状态栏内边距:padding-top 由脚本按真实状态栏高度注入 */
|
||||
box-sizing: content-box;
|
||||
height: 88rpx;
|
||||
margin-top: 8rpx;
|
||||
@@ -813,14 +740,12 @@ function goForget() {
|
||||
color: $color-text;
|
||||
}
|
||||
|
||||
/* ---------- 品牌区 ---------- */
|
||||
.brand {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
/* 上内边距由脚本按状态栏高度注入,这里给无脚本时的兜底值 */
|
||||
padding-top: 88rpx;
|
||||
padding-bottom: 48rpx;
|
||||
|
||||
@@ -869,7 +794,6 @@ function goForget() {
|
||||
color: $color-text-secondary;
|
||||
}
|
||||
|
||||
/* ---------- 表单卡片 ---------- */
|
||||
.card {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
@@ -979,7 +903,6 @@ function goForget() {
|
||||
gap: 10rpx;
|
||||
}
|
||||
|
||||
/* 记住账号勾选框:与协议勾选框同款对号,仅配色相反 */
|
||||
.checkbox {
|
||||
position: relative;
|
||||
width: 32rpx;
|
||||
@@ -1013,7 +936,6 @@ function goForget() {
|
||||
color: $color-text-secondary;
|
||||
}
|
||||
|
||||
/* 主按钮(账号密码登录) */
|
||||
.btn {
|
||||
height: 92rpx;
|
||||
border-radius: $radius-md;
|
||||
@@ -1032,7 +954,6 @@ function goForget() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 主 CTA:微信一键登录(品牌蓝,弱化微信绿以保持蓝白统一) */
|
||||
.btn-wechat {
|
||||
margin-top: 0;
|
||||
height: 96rpx;
|
||||
@@ -1076,7 +997,6 @@ function goForget() {
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
/* 弱化入口:切换账号密码登录 */
|
||||
.alt-entry {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -1096,7 +1016,6 @@ function goForget() {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* 弱化入口:切换账号密码登录 */
|
||||
.alt-entry {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -1124,7 +1043,6 @@ function goForget() {
|
||||
margin-top: 32rpx;
|
||||
}
|
||||
|
||||
/* 返回门户:不登录也能先浏览免登录模块 */
|
||||
.back-portal {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -1148,7 +1066,34 @@ function goForget() {
|
||||
color: $color-primary;
|
||||
}
|
||||
|
||||
/* ---------- 企业选择 ---------- */
|
||||
.link-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 12rpx 0 12rpx 32rpx;
|
||||
margin: -12rpx 0;
|
||||
|
||||
&:active {
|
||||
opacity: 0.6;
|
||||
}
|
||||
}
|
||||
|
||||
.forget-entry {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-top: 12rpx;
|
||||
padding: 16rpx 0;
|
||||
|
||||
&:active {
|
||||
opacity: 0.6;
|
||||
}
|
||||
}
|
||||
|
||||
.forget-entry-text {
|
||||
font-size: 26rpx;
|
||||
color: $color-primary;
|
||||
}
|
||||
|
||||
.tenant-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -1207,7 +1152,6 @@ function goForget() {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ---------- 协议 ---------- */
|
||||
.agreement {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
@@ -1218,7 +1162,6 @@ function goForget() {
|
||||
padding: 0 4rpx;
|
||||
}
|
||||
|
||||
/* 协议勾选框:对号用 CSS 绘制(不依赖字体图标,任何端渲染一致) */
|
||||
.agree-dot {
|
||||
position: relative;
|
||||
width: 34rpx;
|
||||
@@ -1234,7 +1177,6 @@ function goForget() {
|
||||
border-color: $color-primary;
|
||||
}
|
||||
|
||||
/* 对号:两条边 + 旋转 45°,比图标字体更清晰 */
|
||||
&.on::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
@@ -1260,7 +1202,6 @@ function goForget() {
|
||||
color: $color-primary;
|
||||
}
|
||||
|
||||
/* 未勾选协议时的行内提示 */
|
||||
.agree-tip {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -1278,7 +1219,6 @@ function goForget() {
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
/* ---------- 页脚 ---------- */
|
||||
.foot-tip {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
|
||||
@@ -161,7 +161,6 @@ async function handleSendCode() {
|
||||
uni.showToast({ title: '验证码已发送', icon: 'success' })
|
||||
startCountdown()
|
||||
} catch {
|
||||
// handled
|
||||
} finally {
|
||||
codeLoading.value = false
|
||||
}
|
||||
@@ -199,7 +198,6 @@ async function handleSubmit() {
|
||||
uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/login/login' }) })
|
||||
}, 500)
|
||||
} catch {
|
||||
// handled
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!-- 顶部信息:融入页面背景,不再单独做彩色抬头 -->
|
||||
<view class="head" :style="headPad">
|
||||
<view class="head-row">
|
||||
<view>
|
||||
@@ -15,11 +14,9 @@
|
||||
<view class="tenant-copy"><text class="tenant-label">当前企业</text><text class="tenant-name">{{ user.tenant || '尚未加入企业' }}</text></view>
|
||||
<view class="tenant-action"><text>切换</text><FaIcon name="chevron-down" color="#3478f6" :size="12" /></view>
|
||||
</view>
|
||||
<!-- <text class="head-sub">{{ guest ? '免登录可逛部分功能,登录后使用完整工作台' : '选择一个业务系统,开始高效工作' }}</text> -->
|
||||
</view>
|
||||
|
||||
<view class="body">
|
||||
<!-- 加载失败 -->
|
||||
<view v-if="loadError" class="err-box" @tap="load(true)">
|
||||
<FaIcon name="triangle-exclamation" color="#f04438" :size="18" />
|
||||
<view class="err-body">
|
||||
@@ -29,7 +26,6 @@
|
||||
<FaIcon name="rotate" color="#f04438" :size="16" />
|
||||
</view>
|
||||
|
||||
<!-- 子系统分组卡:组内一行 4 个 -->
|
||||
<view v-else-if="!loading && cards.length === 0" class="empty-box">
|
||||
<FaIcon name="cube" color="#c0c4cc" :size="32" />
|
||||
<text class="empty-text">暂无子系统,请联系管理员开通</text>
|
||||
@@ -37,7 +33,6 @@
|
||||
|
||||
<view v-else class="grid">
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<!-- 未授权手机号:卡片本身就是微信授权按钮,点一下直接拉起手机号授权 -->
|
||||
<button
|
||||
v-for="card in cards"
|
||||
v-show="guest"
|
||||
@@ -54,7 +49,6 @@
|
||||
</view>
|
||||
</button>
|
||||
<!-- #endif -->
|
||||
<!-- 已授权(注册即登录):普通卡片,按模块是否需要企业分流 -->
|
||||
<view
|
||||
v-for="card in cards"
|
||||
v-show="!guest || !isMp"
|
||||
@@ -75,16 +69,8 @@
|
||||
</view>
|
||||
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<!-- 游客无感授权:无弹窗,全屏透明按钮——首次点按即拉起微信原生手机号确认层;
|
||||
后端按手机号自动判定:绑定过租户→直接登录,否则→游客令牌 -->
|
||||
<!-- <view v-if="guestAuthVisible" class="guest-auth-mask">
|
||||
<button class="guest-auth-full" open-type="getPhoneNumber" :disabled="guestAuthLoading" @getphonenumber="onGuestPhone" />
|
||||
<text class="guest-auth-later" @tap="skipGuestAuth">暂不,先浏览</text>
|
||||
</view> -->
|
||||
<!-- #endif -->
|
||||
|
||||
<!-- 企业选择:自绘底部抽屉。原生 actionSheet 只有一行居中文本,长企业名会挤在一起,
|
||||
也无法标注「当前企业」;这里给每项独立卡片 + 两行标题 + 状态标识 -->
|
||||
<view v-if="tenantPickerVisible" class="tenant-picker-mask" @tap="closeTenantPicker">
|
||||
<view class="tenant-picker-sheet" @tap.stop>
|
||||
<view class="picker-grabber" />
|
||||
@@ -148,20 +134,15 @@ import { getSubsystemByModule, goSubsystem } from '@/config/subsystems.js'
|
||||
import { getGuestToken, setGuestToken, clearGuestToken } from '@/utils/guest.js'
|
||||
import { guestMiniLogin, guestMerge } from '@/api/guest.js'
|
||||
|
||||
/* ==================== 游客手机号授权(免登录保存) ==================== */
|
||||
|
||||
const guestAuthVisible = ref(false)
|
||||
const guestAuthLoading = ref(false)
|
||||
// 本次停留内跳过:关闭后不在 nav 反复弹窗,下次冷启动再引导
|
||||
const guestAuthDismissed = ref(false)
|
||||
const phoneBusy = ref(false)
|
||||
// 非微信端没有 getPhoneNumber 能力:卡片退化为普通点击并给出提示
|
||||
let isMp = false
|
||||
// #ifdef MP-WEIXIN
|
||||
isMp = true
|
||||
// #endif
|
||||
|
||||
/** 仅微信小程序可拿手机号动态凭证 */
|
||||
function canRequestGuestPhone() {
|
||||
// #ifdef MP-WEIXIN
|
||||
return true
|
||||
@@ -178,7 +159,6 @@ function maybeAskGuestAuth() {
|
||||
guestAuthVisible.value = true
|
||||
}
|
||||
|
||||
/** 取 uni.login 临时登录凭证(配合手机号动态 code 换游客令牌) */
|
||||
function navUniLoginCode() {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.login({
|
||||
@@ -206,7 +186,6 @@ async function onGuestPhone(e) {
|
||||
appid = ''
|
||||
}
|
||||
const res = await guestMiniLogin({ code, phoneCode: detail.code, appid })
|
||||
// 已注册手机号:后端已签发正式令牌,直接按登录处理(不再当作游客)
|
||||
if (res && res.type === 'user') {
|
||||
guestAuthVisible.value = false
|
||||
await completeUserLogin(res)
|
||||
@@ -224,7 +203,6 @@ async function onGuestPhone(e) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 手机号识别为正式账号:落登录态;多企业先选企业再进入 */
|
||||
async function completeUserLogin(res) {
|
||||
const list = Array.isArray(res.tenants) ? res.tenants : []
|
||||
setAuthTokens(res.tokens || {})
|
||||
@@ -238,18 +216,14 @@ async function completeUserLogin(res) {
|
||||
setTid(t0.tid)
|
||||
setTenantName(t0.tenant_name || '')
|
||||
}
|
||||
// 先游客后转正:企业落定后把游客数据移植到正式账号
|
||||
await mergeGuestIfAny()
|
||||
await load(true)
|
||||
uni.showToast({ title: '已登录,欢迎回来', icon: 'none' })
|
||||
}
|
||||
|
||||
/* ==================== 企业选择抽屉(替代 uni.showActionSheet) ==================== */
|
||||
// 原生 actionSheet 只有一行居中文本:长企业名挤成一片、无法标注「当前企业」。
|
||||
// 登录后的首次选择必须选一家(不可关闭),主动切换可取消,两者共用这一套抽屉。
|
||||
const tenantPickerVisible = ref(false)
|
||||
const tenantPickerRequired = ref(false)
|
||||
const tenantPickerMode = ref('login') // login=登录后的首次选择 / switch=主动切换
|
||||
const tenantPickerMode = ref('login')
|
||||
const tenantPickerList = ref([])
|
||||
const tenantPickingTid = ref('')
|
||||
|
||||
@@ -282,7 +256,6 @@ function isPickingTenant(item) {
|
||||
return item && tenantPickingTid.value === String(item.tid)
|
||||
}
|
||||
|
||||
/** 待选状态下必须选一家企业才能继续 */
|
||||
function askChooseTenant(list) {
|
||||
openTenantPicker(list, 'login', true)
|
||||
}
|
||||
@@ -306,10 +279,8 @@ async function pickTenant(item) {
|
||||
setUser(nextUser)
|
||||
user.value = { ...user.value, tenant: item.tenant_name || '', account: nextUser.account || user.value.account }
|
||||
}
|
||||
// 成功才关闭;失败保留抽屉让用户直接重试
|
||||
tenantPickerRequired.value = false
|
||||
tenantPickerVisible.value = false
|
||||
// 先游客后转正:企业落定后把游客数据并入正式账号
|
||||
await mergeGuestIfAny()
|
||||
await load(true)
|
||||
uni.showToast({ title: isSwitch ? '已切换企业' : '已登录,欢迎回来', icon: isSwitch ? 'success' : 'none' })
|
||||
@@ -328,7 +299,6 @@ function skipGuestAuth() {
|
||||
guestAuthVisible.value = false
|
||||
}
|
||||
|
||||
/** 存有游客令牌时静默移植数据(登录链路已带正式令牌);失败保留令牌下次登录重试 */
|
||||
async function mergeGuestIfAny() {
|
||||
if (!getGuestToken()) return
|
||||
try {
|
||||
@@ -339,13 +309,11 @@ async function mergeGuestIfAny() {
|
||||
}
|
||||
}
|
||||
|
||||
/** 模块 code → 子系统 slug → 进入其概览页;未注册返回 false */
|
||||
function goSubsystemByModule(code) {
|
||||
const sub = getSubsystemByModule(code)
|
||||
return sub ? goSubsystem(sub.slug) : false
|
||||
}
|
||||
|
||||
/** 模块 code → 端上图标(后端 icon 存的是 Element Plus 图标名,端上用不了) */
|
||||
const MODULE_ICONS = {
|
||||
crm: 'handshake',
|
||||
erp: 'boxes-stacked',
|
||||
@@ -363,23 +331,17 @@ const modules = ref([])
|
||||
const menus = ref([])
|
||||
const tenants = ref(getTenants())
|
||||
const switchingTenant = ref(false)
|
||||
// 游客态:未登录时默认落在 nav,渲染公开模块宫格,按菜单级免登录配置分流。
|
||||
const guest = ref(!isLoggedIn())
|
||||
const publicModules = ref([])
|
||||
// 免登录菜单(/api/menus/public,require_login=0):模块宫格是否可免登录进入的唯一依据
|
||||
const publicMenus = ref([])
|
||||
|
||||
/** 含免登录菜单的模块 code 集合(小写) */
|
||||
const guestMenuModuleSet = computed(
|
||||
() => new Set(publicMenus.value.map((m) => String(m.module || '').toLowerCase()).filter(Boolean))
|
||||
)
|
||||
|
||||
/** 叶子菜单(可直接跳转的功能页),已锁定的过滤掉 */
|
||||
const leafMenus = computed(() => menus.value.filter((m) => m.leaf !== false && !m.locked))
|
||||
|
||||
/** 子系统卡片:每个业务模块一张卡 */
|
||||
const cards = computed(() => {
|
||||
// 游客:模块可免登录 = 该模块下存在免登录菜单(菜单级 require_login 控制)
|
||||
if (guest.value) {
|
||||
return publicModules.value.map((mod, index) => {
|
||||
const code = String(mod.code || '').toLowerCase()
|
||||
@@ -408,7 +370,7 @@ const cards = computed(() => {
|
||||
})
|
||||
|
||||
return modules.value
|
||||
.filter((m) => m.type !== 2) // 2=系统配置,不作为子系统入口
|
||||
.filter((m) => m.type !== 2)
|
||||
.map((mod, index) => {
|
||||
const code = String(mod.code || '').toLowerCase()
|
||||
const items = byCode[mod.code] || []
|
||||
@@ -431,14 +393,9 @@ const cards = computed(() => {
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
/* ==================== 数据加载 ==================== */
|
||||
|
||||
async function load(force = false) {
|
||||
loading.value = true
|
||||
guest.value = !isLoggedIn()
|
||||
// 游客:公开模块宫格 + 免登录菜单;模块可点的判定下沉到菜单级
|
||||
// (存在 require_login=0 的菜单即免登录,模块级 require_login 不再作为依据)
|
||||
if (guest.value) {
|
||||
try {
|
||||
const [list, menuList] = await Promise.all([fetchPublicModules(), fetchPublicMenus()])
|
||||
@@ -451,7 +408,6 @@ async function load(force = false) {
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
// 新流程:不再自动弹授权,点任意模块卡片时才拉起微信手机号授权
|
||||
return
|
||||
}
|
||||
try {
|
||||
@@ -469,9 +425,6 @@ async function load(force = false) {
|
||||
}
|
||||
}
|
||||
|
||||
/* ==================== 交互 ==================== */
|
||||
|
||||
/** 点击右上角用户名 → 进入个人中心修改资料(游客态 chip 不绑定此函数) */
|
||||
function goProfile() {
|
||||
uni.navigateTo({ url: '/pages/profile/profile' })
|
||||
}
|
||||
@@ -485,9 +438,6 @@ function chooseTenant() {
|
||||
openTenantPicker(list, 'switch', false)
|
||||
}
|
||||
|
||||
/* ==================== 手机号授权 / 注册 / 企业分流 ==================== */
|
||||
|
||||
/** 手机号授权统一入口:card 为空表示只做识别/注册(如点「游客」),不进入模块 */
|
||||
async function onCardPhone(e, card = null) {
|
||||
const detail = (e && e.detail) || {}
|
||||
if (String(detail.errMsg || '').indexOf('ok') === -1 || !detail.code) {
|
||||
@@ -515,7 +465,6 @@ async function onCardPhone(e, card = null) {
|
||||
})
|
||||
return
|
||||
}
|
||||
// 已有账号:复用小程序一键登录(后端按手机号认人并绑定 openid)
|
||||
const ready = await silentLogin(code, detail.code)
|
||||
if (!ready) return
|
||||
await load(true)
|
||||
@@ -532,7 +481,6 @@ async function onCardPhone(e, card = null) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 已有账号静默登录;无企业时后端签发 tid=0 令牌,多企业时拉起企业选择抽屉 */
|
||||
async function silentLogin(code, phoneCode) {
|
||||
const res = await loginByMiniapp({ code, phoneCode })
|
||||
if (!res || !res.tokens || !res.tokens.access_token) {
|
||||
@@ -553,10 +501,6 @@ async function silentLogin(code, phoneCode) {
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 点击子系统卡片 → 进入该子系统独立页面组(带自己的 tabbar)。
|
||||
* 需企业模块:查审核状态,未通过则引导创建 / 挂靠企业;通过后刷新企业令牌再进入。
|
||||
*/
|
||||
async function enter(card) {
|
||||
if (card.locked) {
|
||||
openMenu({ locked: true, title: card.name })
|
||||
@@ -575,7 +519,6 @@ async function enter(card) {
|
||||
return
|
||||
}
|
||||
if (st && st.has_tenant) {
|
||||
// 审核刚通过时本地令牌可能仍是 tid=0,重新静默登录拿企业令牌
|
||||
if (!getTid()) {
|
||||
try {
|
||||
const code = await navUniLoginCode()
|
||||
@@ -588,7 +531,6 @@ async function enter(card) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 不暂存卡片:避免企业申请页返回工作台时 onShow 再次自动跳回,形成循环
|
||||
uni.navigateTo({ url: '/pages/onboarding/company' })
|
||||
return
|
||||
}
|
||||
@@ -606,16 +548,12 @@ async function enter(card) {
|
||||
uni.showToast({ title: card.name + '暂未开放', icon: 'none' })
|
||||
}
|
||||
|
||||
/* ==================== 生命周期 ==================== */
|
||||
|
||||
onMounted(() => {
|
||||
load()
|
||||
})
|
||||
|
||||
onShow(() => {
|
||||
// 注册 / 企业申请页回来后登录态可能变化,重新判定并加载
|
||||
if (!loading.value) load()
|
||||
// 注册完成后自动继续进入用户刚才点击的模块
|
||||
const pending = takePendingCard()
|
||||
if (pending && isLoggedIn()) {
|
||||
setTimeout(() => enter(pending), 600)
|
||||
@@ -630,7 +568,6 @@ onShow(() => {
|
||||
@include page-shell;
|
||||
}
|
||||
|
||||
/* ============ 顶部信息(融入页面背景) ============ */
|
||||
.head {
|
||||
flex-shrink: 0;
|
||||
padding: calc(var(--status-bar-height, 44px) + 32rpx) $page-padding-x 28rpx;
|
||||
@@ -676,7 +613,6 @@ onShow(() => {
|
||||
font-size: 22rpx;
|
||||
}
|
||||
|
||||
/* 游客态 chip 是微信手机号授权按钮:抹平 button 默认样式,外观与普通 chip 一致 */
|
||||
.account-chip-button {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -729,7 +665,6 @@ onShow(() => {
|
||||
color: #8295b0;
|
||||
}
|
||||
|
||||
/* ============ 内容区 ============ */
|
||||
.body {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
@@ -739,7 +674,6 @@ onShow(() => {
|
||||
background: #f5f8fd;
|
||||
}
|
||||
|
||||
/* ============ 失败提示 ============ */
|
||||
.err-box {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -786,7 +720,6 @@ onShow(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ============ 子系统门户宫格:一行 2 个,仅图标 + 名称 ============ */
|
||||
.grid {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
@@ -833,12 +766,10 @@ onShow(() => {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* 未开通:灰底图标 + 灰字,不做角标,保持门户的干净 */
|
||||
.portal-card.locked .portal-name {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* 未授权时卡片是微信授权按钮:抹平 button 默认样式,保持与 view 卡片一致 */
|
||||
.cell-button {
|
||||
display: block;
|
||||
margin: 0 0 20rpx 0;
|
||||
@@ -858,7 +789,6 @@ onShow(() => {
|
||||
height: 48rpx;
|
||||
}
|
||||
|
||||
/* ============ 游客无感授权层(无弹窗,首次点按即拉起微信原生确认) ============ */
|
||||
.guest-auth-mask {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
@@ -898,7 +828,6 @@ onShow(() => {
|
||||
padding: 16rpx;
|
||||
}
|
||||
|
||||
/* ============ 企业选择抽屉(自绘,替代原生 actionSheet) ============ */
|
||||
.tenant-picker-mask {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<view class="body">
|
||||
<!-- ==================== 今日打卡 ==================== -->
|
||||
<view class="punch-card">
|
||||
<view class="punch-head">
|
||||
<view class="head-left">
|
||||
@@ -25,7 +24,6 @@
|
||||
</text>
|
||||
</view>
|
||||
|
||||
<!-- 未匹配排班等提醒:只提示,不阻断打卡 -->
|
||||
<view v-if="warning" class="warn-bar">
|
||||
<FaIcon name="triangle-exclamation" color="#b45309" :size="14" />
|
||||
<text class="warn-text">{{ warning }}</text>
|
||||
@@ -49,6 +47,17 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="record.id && (record.fix_status_text || canFix(record))" class="punch-fix">
|
||||
<text
|
||||
v-if="record.fix_status_text"
|
||||
class="fix-chip"
|
||||
:class="fixChipClass(record)"
|
||||
@tap="openFixApproval(record)"
|
||||
>{{ record.fix_status_text }} · 查看审批 ›</text>
|
||||
<text v-else class="punch-fix-tip">打卡异常?可申请补卡</text>
|
||||
<text v-if="canFix(record)" class="fix-link" @tap="openFixSheet(record)">补卡</text>
|
||||
</view>
|
||||
|
||||
<view class="punch-actions">
|
||||
<view class="punch-btn is-in" :class="{ 'is-disabled': !canClockIn, 'is-busy': punching }" @tap="punch('in')">
|
||||
<text class="btn-title">{{ record.clock_in_hm ? '已签到' : '签到' }}</text>
|
||||
@@ -61,7 +70,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- ==================== 近 7 天 ==================== -->
|
||||
<view v-if="recentDays.length" class="week-card">
|
||||
<view class="block-head">
|
||||
<text class="block-title">近 7 天</text>
|
||||
@@ -82,7 +90,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- ==================== 考勤卡(本月 / 本季 / 本年) ==================== -->
|
||||
<view class="stat-card">
|
||||
<view class="block-head">
|
||||
<text class="block-title">考勤卡</text>
|
||||
@@ -107,7 +114,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- ==================== 考勤记录 ==================== -->
|
||||
<view class="list-card">
|
||||
<view class="block-head">
|
||||
<text class="block-title">考勤记录</text>
|
||||
@@ -139,6 +145,15 @@
|
||||
<text class="rm-punch">签退 {{ item.clock_out_hm || '--:--' }}</text>
|
||||
</view>
|
||||
<text v-if="recordNote(item)" class="rm-note">{{ recordNote(item) }}</text>
|
||||
<view v-if="item.fix_status_text || canFix(item)" class="rm-foot">
|
||||
<text
|
||||
v-if="item.fix_status_text"
|
||||
class="fix-chip"
|
||||
:class="fixChipClass(item)"
|
||||
@tap="openFixApproval(item)"
|
||||
>{{ item.fix_status_text }} · 查看审批 ›</text>
|
||||
<text v-if="canFix(item)" class="fix-link" @tap="openFixSheet(item)">补卡</text>
|
||||
</view>
|
||||
</view>
|
||||
<text class="record-status" :class="dayClass(item.day_status)">{{ item.day_status_text }}</text>
|
||||
</view>
|
||||
@@ -151,18 +166,70 @@
|
||||
|
||||
<view class="bottom-space" />
|
||||
</view>
|
||||
|
||||
<view v-if="fixVisible" class="fix-mask" @tap="closeFixSheet">
|
||||
<view class="fix-sheet" @tap.stop>
|
||||
<view class="fix-head">
|
||||
<text class="fix-cancel" @tap="closeFixSheet">取消</text>
|
||||
<text class="fix-title">补卡申请</text>
|
||||
<text class="fix-submit" :class="{ disabled: fixSubmitting }" @tap="submitFix">
|
||||
{{ fixSubmitting ? '提交中…' : '提交' }}
|
||||
</text>
|
||||
</view>
|
||||
|
||||
<view class="fix-body">
|
||||
<view class="fix-info">
|
||||
<text class="fix-info-date">{{ fixForm.date }}</text>
|
||||
<text class="fix-info-shift">{{ fixForm.shift }}</text>
|
||||
</view>
|
||||
<text class="fix-desc">迟到、早退、缺卡可申请补卡。提交后进入审批,通过后当天打卡恢复正常;审批单与审批意见仍可在审批中心查看。</text>
|
||||
|
||||
<text class="fix-label">补卡类型</text>
|
||||
<view class="fix-types">
|
||||
<view
|
||||
v-for="opt in fixTypeOptions"
|
||||
:key="opt.value"
|
||||
class="fix-type"
|
||||
:class="{ on: fixForm.fixType === opt.value }"
|
||||
@tap="chooseFixType(opt)"
|
||||
>
|
||||
<text class="fix-type-text">{{ opt.label }}</text>
|
||||
<text class="fix-type-sub">{{ opt.sub }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<template v-if="fixForm.needTime">
|
||||
<text class="fix-label">实际打卡时间</text>
|
||||
<picker mode="time" :value="fixForm.fixTime" @change="onFixTimeChange">
|
||||
<view class="fix-input" :class="{ placeholder: !fixForm.fixTime }">
|
||||
{{ fixForm.fixTime || '请选择时间' }}
|
||||
</view>
|
||||
</picker>
|
||||
</template>
|
||||
|
||||
<text class="fix-label">补卡原因</text>
|
||||
<textarea
|
||||
v-model="fixForm.reason"
|
||||
class="fix-textarea"
|
||||
placeholder="请说明迟到 / 早退 / 缺卡原因"
|
||||
:maxlength="200"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, ref } from 'vue'
|
||||
import { computed, reactive, ref } from 'vue'
|
||||
import { onHide, onReachBottom, onShow, onUnload } from '@dcloudio/uni-app'
|
||||
import { isLoggedIn } from '@/utils/auth.js'
|
||||
import {
|
||||
clockAttendance,
|
||||
fetchAttendanceStats,
|
||||
fetchAttendanceToday,
|
||||
fetchMyAttendanceRecords
|
||||
fetchMyAttendanceRecords,
|
||||
submitAttendanceFix
|
||||
} from '@/api/oaAttendance.js'
|
||||
|
||||
const WEEKDAY_LABELS = ['', '周一', '周二', '周三', '周四', '周五', '周六', '周日']
|
||||
@@ -245,7 +312,6 @@ const statItems = computed(() => {
|
||||
]
|
||||
})
|
||||
|
||||
// 近 7 天:后端按「最近在前」返回,这里翻成从左到右的时间轴
|
||||
const recentDays = computed(() => {
|
||||
const list = Array.isArray(today.value.recent) ? today.value.recent : []
|
||||
return list.slice().reverse()
|
||||
@@ -316,6 +382,130 @@ function recordNote(item) {
|
||||
return item.clock_out_note || item.clock_in_note || ''
|
||||
}
|
||||
|
||||
const FIX_RUNNING = 1
|
||||
const fixVisible = ref(false)
|
||||
const fixSubmitting = ref(false)
|
||||
const fixTypeOptions = ref([])
|
||||
const fixForm = reactive({
|
||||
recordId: 0,
|
||||
date: '',
|
||||
shift: '',
|
||||
fixType: 1,
|
||||
needTime: false,
|
||||
fixTime: '',
|
||||
reason: ''
|
||||
})
|
||||
|
||||
function abnormalSides(item) {
|
||||
const bad = (status) => [2, 3, 4].includes(Number(status))
|
||||
const sides = []
|
||||
if (!item.clock_in_hm || bad(item.clock_in_status)) {
|
||||
sides.push({
|
||||
value: 1,
|
||||
label: '签到补卡',
|
||||
sub: item.clock_in_hm ? `当前 ${item.clock_in_hm} ${item.clock_in_text || '异常'}` : '未签到(缺卡)',
|
||||
needTime: !item.clock_in_hm
|
||||
})
|
||||
}
|
||||
if (!item.clock_out_hm || bad(item.clock_out_status)) {
|
||||
sides.push({
|
||||
value: 2,
|
||||
label: '签退补卡',
|
||||
sub: item.clock_out_hm ? `当前 ${item.clock_out_hm} ${item.clock_out_text || '异常'}` : '未签退(缺卡)',
|
||||
needTime: !item.clock_out_hm
|
||||
})
|
||||
}
|
||||
return sides
|
||||
}
|
||||
|
||||
function canFix(item) {
|
||||
if (!item || !item.id) return false
|
||||
return Number(item.day_status) !== 8 && abnormalSides(item).length > 0 && Number(item.fix_status) !== FIX_RUNNING
|
||||
}
|
||||
|
||||
function fixChipClass(item) {
|
||||
switch (Number(item.fix_status)) {
|
||||
case 1:
|
||||
return 'is-running'
|
||||
case 2:
|
||||
return 'is-done'
|
||||
case 3:
|
||||
return 'is-reject'
|
||||
default:
|
||||
return 'is-muted'
|
||||
}
|
||||
}
|
||||
|
||||
function openFixApproval(item) {
|
||||
const id = Number(item.fix_instance_id || 0)
|
||||
if (!id) {
|
||||
uni.showToast({ title: '暂无审批单,请稍后重试', icon: 'none' })
|
||||
return
|
||||
}
|
||||
uni.navigateTo({ url: `/pages/approval/detail?id=${id}` })
|
||||
}
|
||||
|
||||
function openFixSheet(item) {
|
||||
const sides = abnormalSides(item)
|
||||
if (!sides.length) {
|
||||
uni.showToast({ title: '当前记录无需补卡', icon: 'none' })
|
||||
return
|
||||
}
|
||||
fixTypeOptions.value = sides
|
||||
const first = sides[0]
|
||||
fixForm.recordId = item.id
|
||||
fixForm.date = item.attend_date
|
||||
fixForm.shift = item.shift_name || '未匹配排班'
|
||||
fixForm.fixType = first.value
|
||||
fixForm.needTime = first.needTime
|
||||
fixForm.fixTime = ''
|
||||
fixForm.reason = ''
|
||||
fixVisible.value = true
|
||||
}
|
||||
|
||||
function closeFixSheet() {
|
||||
if (!fixSubmitting.value) fixVisible.value = false
|
||||
}
|
||||
|
||||
function chooseFixType(opt) {
|
||||
fixForm.fixType = opt.value
|
||||
fixForm.needTime = opt.needTime
|
||||
if (!opt.needTime) fixForm.fixTime = ''
|
||||
}
|
||||
|
||||
function onFixTimeChange(e) {
|
||||
fixForm.fixTime = (e && e.detail && e.detail.value) || ''
|
||||
}
|
||||
|
||||
async function submitFix() {
|
||||
if (fixSubmitting.value) return
|
||||
const reason = String(fixForm.reason || '').trim()
|
||||
if (!reason) {
|
||||
uni.showToast({ title: '请填写补卡原因', icon: 'none' })
|
||||
return
|
||||
}
|
||||
if (fixForm.needTime && !fixForm.fixTime) {
|
||||
uni.showToast({ title: '请选择实际打卡时间', icon: 'none' })
|
||||
return
|
||||
}
|
||||
fixSubmitting.value = true
|
||||
try {
|
||||
const data = await submitAttendanceFix({
|
||||
recordId: fixForm.recordId,
|
||||
fixType: fixForm.fixType,
|
||||
fixTime: fixForm.needTime ? fixForm.fixTime : '',
|
||||
reason
|
||||
})
|
||||
fixVisible.value = false
|
||||
uni.showToast({ title: (data && data.message) || '补卡申请已提交', icon: 'success' })
|
||||
await Promise.all([loadToday(), loadRecords(true)])
|
||||
} catch (error) {
|
||||
uni.showToast({ title: (error && error.message) || '补卡申请提交失败', icon: 'none' })
|
||||
} finally {
|
||||
fixSubmitting.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function confirmDialog(title, content) {
|
||||
return new Promise((resolve) => {
|
||||
uni.showModal({
|
||||
@@ -343,13 +533,11 @@ async function loadToday() {
|
||||
}
|
||||
}
|
||||
|
||||
/** 月度卡标题(today 接口只返回区间数字,标题在前端拼) */
|
||||
function monthLabel() {
|
||||
const now = new Date()
|
||||
return `${now.getFullYear()} 年 ${now.getMonth() + 1} 月`
|
||||
}
|
||||
|
||||
/** 切换考勤卡维度:本月 / 本季 / 本年(后端返回统一口径的统计) */
|
||||
async function loadStats(period) {
|
||||
if (statsLoading.value || (statsPeriod.value === period && statsLabel.value)) {
|
||||
return
|
||||
@@ -407,7 +595,6 @@ async function punch(type) {
|
||||
return
|
||||
}
|
||||
|
||||
// 排班匹配不上:先提醒,确认后仍可打卡
|
||||
if (warning.value) {
|
||||
const ok = await confirmDialog('排班提醒', `${warning.value}\n\n是否继续${type === 'in' ? '签到' : '签退'}?`)
|
||||
if (!ok) return
|
||||
@@ -471,7 +658,6 @@ onReachBottom(() => {
|
||||
padding: 28rpx $page-padding-x 0;
|
||||
}
|
||||
|
||||
/* ==================== 今日打卡 ==================== */
|
||||
.punch-card {
|
||||
@include card;
|
||||
padding: 28rpx 24rpx 24rpx;
|
||||
@@ -688,7 +874,6 @@ onReachBottom(() => {
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
/* ==================== 近 7 天 ==================== */
|
||||
.week-card,
|
||||
.stat-card,
|
||||
.list-card {
|
||||
@@ -844,7 +1029,6 @@ onReachBottom(() => {
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
/* ==================== 考勤记录 ==================== */
|
||||
.state-box {
|
||||
padding: 60rpx 0;
|
||||
display: flex;
|
||||
@@ -966,4 +1150,203 @@ onReachBottom(() => {
|
||||
.bottom-space {
|
||||
height: 40rpx;
|
||||
}
|
||||
|
||||
.punch-fix {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 12rpx;
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
|
||||
.punch-fix-tip {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
font-size: 22rpx;
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
.rm-foot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 12rpx;
|
||||
margin-top: 8rpx;
|
||||
}
|
||||
|
||||
.fix-chip {
|
||||
font-size: 22rpx;
|
||||
padding: 6rpx 14rpx;
|
||||
border-radius: $radius-full;
|
||||
background: #f1f5f9;
|
||||
|
||||
&.is-running { color: $color-primary; background: #e8f1ff; }
|
||||
&.is-done { color: $color-success; background: #e7f8ee; }
|
||||
&.is-reject { color: $color-danger; background: #fef2f2; }
|
||||
&.is-muted { color: $color-text-muted; }
|
||||
}
|
||||
|
||||
.fix-link {
|
||||
font-size: 24rpx;
|
||||
color: $color-primary;
|
||||
padding: 6rpx 14rpx;
|
||||
border: 1rpx solid $color-primary;
|
||||
border-radius: $radius-full;
|
||||
|
||||
&:active { opacity: 0.6; }
|
||||
}
|
||||
|
||||
.fix-mask {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
top: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: 1000;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
background: rgba(15, 23, 42, 0.48);
|
||||
@include mask-responsive;
|
||||
}
|
||||
|
||||
.fix-sheet {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 28rpx $page-padding-x 40rpx;
|
||||
padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
|
||||
border-radius: 32rpx 32rpx 0 0;
|
||||
background: #ffffff;
|
||||
@include sheet-responsive;
|
||||
}
|
||||
|
||||
.fix-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 24rpx;
|
||||
}
|
||||
|
||||
.fix-cancel {
|
||||
font-size: 26rpx;
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
.fix-title {
|
||||
font-size: 32rpx;
|
||||
font-weight: 700;
|
||||
color: $color-text;
|
||||
}
|
||||
|
||||
.fix-submit {
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
color: $color-primary;
|
||||
|
||||
&.disabled { opacity: 0.55; }
|
||||
}
|
||||
|
||||
.fix-body {
|
||||
max-height: 65vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.fix-info {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16rpx;
|
||||
padding: 20rpx;
|
||||
border-radius: $radius-md;
|
||||
background: #f8fafc;
|
||||
}
|
||||
|
||||
.fix-info-date {
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
color: $color-text;
|
||||
}
|
||||
|
||||
.fix-info-shift {
|
||||
font-size: 24rpx;
|
||||
color: $color-text-secondary;
|
||||
}
|
||||
|
||||
.fix-desc {
|
||||
display: block;
|
||||
margin: 20rpx 0 8rpx;
|
||||
font-size: 22rpx;
|
||||
line-height: 1.6;
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
.fix-label {
|
||||
display: block;
|
||||
margin: 22rpx 0 12rpx;
|
||||
font-size: 25rpx;
|
||||
font-weight: 600;
|
||||
color: #334155;
|
||||
}
|
||||
|
||||
.fix-types {
|
||||
display: flex;
|
||||
gap: 16rpx;
|
||||
}
|
||||
|
||||
.fix-type {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
padding: 18rpx 20rpx;
|
||||
box-sizing: border-box;
|
||||
border: 2rpx solid #e2e8f0;
|
||||
border-radius: $radius-md;
|
||||
background: #ffffff;
|
||||
|
||||
&.on {
|
||||
border-color: $color-primary;
|
||||
background: #f2f7ff;
|
||||
}
|
||||
}
|
||||
|
||||
.fix-type-text {
|
||||
display: block;
|
||||
font-size: 27rpx;
|
||||
font-weight: 600;
|
||||
color: $color-text;
|
||||
}
|
||||
|
||||
.fix-type-sub {
|
||||
display: block;
|
||||
margin-top: 6rpx;
|
||||
font-size: 21rpx;
|
||||
color: $color-text-muted;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.fix-input {
|
||||
height: 88rpx;
|
||||
line-height: 88rpx;
|
||||
padding: 0 22rpx;
|
||||
box-sizing: border-box;
|
||||
border: 1rpx solid #dce7f7;
|
||||
border-radius: $radius-md;
|
||||
background: #fbfdff;
|
||||
font-size: 28rpx;
|
||||
color: $color-text;
|
||||
|
||||
&.placeholder { color: #adb6c9; font-size: 26rpx; }
|
||||
}
|
||||
|
||||
.fix-textarea {
|
||||
width: 100%;
|
||||
min-height: 160rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 18rpx 22rpx;
|
||||
border: 1rpx solid #dce7f7;
|
||||
border-radius: $radius-md;
|
||||
background: #fbfdff;
|
||||
font-size: 27rpx;
|
||||
line-height: 1.6;
|
||||
color: $color-text;
|
||||
}
|
||||
</style>
|
||||
@@ -91,7 +91,6 @@ import {
|
||||
} from '@/api/contact.js'
|
||||
import { isLoggedIn } from '@/utils/auth.js'
|
||||
|
||||
/** 顶部大类 tab:全部 / 内部 / 外部,索引与 contact_type 对应(0 表示不筛选) */
|
||||
const TYPE_TABS = [{ name: '全部' }, { name: '内部' }, { name: '外部' }]
|
||||
const TYPE_VALUES = [0, 1, 2]
|
||||
|
||||
@@ -117,7 +116,6 @@ onMounted(() => {
|
||||
loadContacts(true)
|
||||
})
|
||||
|
||||
/** 部门下拉选项:全部 + 有内部联系人的部门(带人数) */
|
||||
const deptOptions = computed(() => {
|
||||
const options = [{ label: '全部部门', value: 0 }]
|
||||
orgs.value.forEach((org) => {
|
||||
@@ -127,7 +125,6 @@ const deptOptions = computed(() => {
|
||||
return options
|
||||
})
|
||||
|
||||
/** 组织树拍平为部门列表,只保留有内部联系人的部门 */
|
||||
function flattenOrgs(nodes, out) {
|
||||
;(nodes || []).forEach((n) => {
|
||||
if (Number(n.contact_count) > 0) {
|
||||
|
||||
@@ -191,7 +191,6 @@ function openEdit() {
|
||||
})
|
||||
}
|
||||
|
||||
// 撤销提交:退回草稿并留存修改痕迹,改完需重新提交
|
||||
function handleWithdraw() {
|
||||
uni.showModal({
|
||||
title: '撤销提交',
|
||||
|
||||
@@ -128,7 +128,6 @@ async function loadProfile() {
|
||||
const data = await fetchDailyReportProfile()
|
||||
if (data) profile.value = { ...profile.value, ...data }
|
||||
} catch (e) {
|
||||
// 窗口信息失败时仍允许按今日编辑
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,7 +146,6 @@ async function loadDetail(id) {
|
||||
function applyDetail(data) {
|
||||
const report = data?.report
|
||||
if (!report) return
|
||||
// 已提交的日报已锁定:不进入编辑,引导到详情中撤销提交
|
||||
if (report.status === 1) {
|
||||
uni.showModal({
|
||||
title: '日报已提交',
|
||||
@@ -169,7 +167,6 @@ function applyDetail(data) {
|
||||
: []
|
||||
}
|
||||
|
||||
/** 按日期查找已有日报;载入后可直接编辑 */
|
||||
async function loadByDate(date, notify = true) {
|
||||
const data = await fetchMyDailyReports({ page: 1, pageSize: 1, startDate: date, endDate: date })
|
||||
const item = data?.list?.[0]
|
||||
@@ -255,7 +252,6 @@ async function chooseImages() {
|
||||
size: files[i]?.size || 0
|
||||
})
|
||||
} catch (e) {
|
||||
// 上传失败已提示,继续处理其余文件
|
||||
}
|
||||
}
|
||||
uploading.value = false
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- ==================== 我的日报 ==================== -->
|
||||
<view v-if="activeTab === 'mine'" class="content">
|
||||
<view class="summary-row">
|
||||
<view class="summary-item">
|
||||
@@ -160,7 +159,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- ==================== 团队日报 ==================== -->
|
||||
<view v-else class="content">
|
||||
<view class="team-filter">
|
||||
<picker mode="date" :value="teamDate" :end="today" @change="onTeamDateChange">
|
||||
@@ -268,7 +266,6 @@ const mineList = ref([])
|
||||
const minePage = ref(1)
|
||||
const hasMore = ref(false)
|
||||
|
||||
// 近期热力图(近三个月)
|
||||
const calendarDays = ref([])
|
||||
const calendarRange = ref({ start: '', end: '' })
|
||||
const calendarTotal = ref(0)
|
||||
@@ -303,7 +300,6 @@ const todayStatusClass = computed(() => {
|
||||
const calendarMap = computed(() => {
|
||||
const map = new Map()
|
||||
calendarDays.value.forEach((day) => {
|
||||
// 后端 DATE 字段可能带出时间,统一截到 YYYY-MM-DD 再建索引
|
||||
const key = String(day?.date || '').slice(0, 10)
|
||||
if (key) map.set(key, day)
|
||||
})
|
||||
@@ -315,7 +311,6 @@ const calendarRangeText = computed(() => {
|
||||
return start && end ? `${start} 至 ${end}` : ''
|
||||
})
|
||||
|
||||
// 按区间生成热力图:每列一周(周一在上、周日在下),月内补空格,每月固定 6 周
|
||||
const calendarMonths = computed(() => {
|
||||
const map = calendarMap.value
|
||||
const { start, end } = calendarRange.value
|
||||
@@ -373,7 +368,6 @@ async function loadCalendar() {
|
||||
calendarTotal.value = data?.total || 0
|
||||
calendarSubmitted.value = data?.submitted || 0
|
||||
} catch (e) {
|
||||
// 热力图加载失败不阻断列表展示
|
||||
}
|
||||
}
|
||||
|
||||
@@ -391,8 +385,6 @@ function cellClass(cell) {
|
||||
return cell.isFuture ? 'is-future' : 'is-none'
|
||||
}
|
||||
|
||||
// 补写窗口内、往日尚未写日报的日期标注「补」,点击直接进入补写
|
||||
// 今天属于正常填写,未写时不标「补」
|
||||
function cellBackfill(cell) {
|
||||
if (!cell || cell.isFuture || cell.record) return false
|
||||
if (cell.date === today) return false
|
||||
@@ -497,7 +489,6 @@ function openBackfill() {
|
||||
function writeToday() {
|
||||
const id = summary.value.today_report_id
|
||||
if (id) {
|
||||
// 已提交的日报已锁定,直接进详情,可在详情中撤销提交
|
||||
if (summary.value.today_status === 1) {
|
||||
uni.showToast({ title: '今日日报已提交并锁定,可先在详情中撤销提交', icon: 'none' })
|
||||
openDetail(id)
|
||||
@@ -518,13 +509,11 @@ function previewText(item) {
|
||||
return text || '暂无内容'
|
||||
}
|
||||
|
||||
// ---------------- 团队 ----------------
|
||||
async function loadTeamOrgs() {
|
||||
try {
|
||||
const data = await fetchTeamDailyReportOrgs()
|
||||
orgOptions.value = data?.list || []
|
||||
} catch (e) {
|
||||
// 部门列表失败不阻断团队汇总主流程
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -127,7 +127,6 @@ async function loadDetail() {
|
||||
}
|
||||
}
|
||||
|
||||
/** 把可能的相对地址补全为绝对地址 */
|
||||
function absoluteUrl(url) {
|
||||
const value = String(url || '').trim()
|
||||
if (!value) return ''
|
||||
|
||||
@@ -127,10 +127,6 @@ const file = ref(null)
|
||||
const records = ref([])
|
||||
const loading = ref(true)
|
||||
|
||||
/**
|
||||
* 档案 ID。
|
||||
* 带 id(HR 从列表进入)看指定员工档案;不带 id 则看本人档案。
|
||||
*/
|
||||
const fileId = ref(0)
|
||||
|
||||
const avatarText = computed(() => {
|
||||
@@ -199,7 +195,6 @@ onLoad((options) => {
|
||||
uni.reLaunch({ url: '/pages/login/login' })
|
||||
return
|
||||
}
|
||||
// 带 id 进入(HR 从档案列表进入)看指定员工档案;不带 id 则看本人档案
|
||||
fileId.value = Number((options && options.id) || 0)
|
||||
loadFile()
|
||||
})
|
||||
|
||||
@@ -82,12 +82,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 员工档案(HR 视角):展示全公司员工的档案列表。
|
||||
*
|
||||
* 权限口径:租户角色里勾选了「员工档案」菜单即为 HR,可见全公司档案;
|
||||
* 未开通该权限的用户自动降级为查看本人档案(跳详情页),与旧版行为一致。
|
||||
*/
|
||||
import { ref, computed } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import {
|
||||
@@ -95,11 +89,9 @@ import {
|
||||
fetchEmployeeFiles,
|
||||
getEmploymentStatusLabel
|
||||
} from '@/api/oa.js'
|
||||
// 组织树复用通讯录接口(同一套组织数据,仅用于部门筛选)
|
||||
import { fetchContactOrgTree } from '@/api/contact.js'
|
||||
import { isLoggedIn } from '@/utils/auth.js'
|
||||
|
||||
/** 在职状态 tab:全部 / 试用 / 正式 / 离职,索引与 employment_status 对应(0 表示不筛选) */
|
||||
const STATUS_TABS = [{ name: '全部' }, { name: '试用' }, { name: '正式' }, { name: '离职' }]
|
||||
const STATUS_VALUES = [0, 1, 2, 3]
|
||||
|
||||
@@ -131,7 +123,6 @@ async function init() {
|
||||
canViewAll = false
|
||||
}
|
||||
if (!canViewAll) {
|
||||
// 无 HR 权限:保持原有「只能看本人档案」的行为
|
||||
uni.redirectTo({ url: '/pages/oa/employeefile/detail' })
|
||||
return
|
||||
}
|
||||
@@ -139,14 +130,12 @@ async function init() {
|
||||
loadFiles(true)
|
||||
}
|
||||
|
||||
/** 部门下拉选项:全部 + 各部门(组织树含子级,展开为平铺列表) */
|
||||
const deptOptions = computed(() => {
|
||||
const options = [{ label: '全部部门', value: 0 }]
|
||||
flattenOrgs(orgs.value, options)
|
||||
return options
|
||||
})
|
||||
|
||||
/** 组织树拍平为部门列表 */
|
||||
function flattenOrgs(nodes, out) {
|
||||
;(nodes || []).forEach((node) => {
|
||||
if (node.org_name) {
|
||||
@@ -160,7 +149,6 @@ function flattenOrgs(nodes, out) {
|
||||
|
||||
async function loadOrgTree() {
|
||||
try {
|
||||
// 复用通讯录的组织树接口:同一套组织数据,仅用于筛选,不涉及联系人明细
|
||||
const tree = await fetchContactOrgTree()
|
||||
orgs.value = Array.isArray(tree) ? tree : []
|
||||
} catch (e) {
|
||||
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* oa 子系统 · functions 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubFunctions from '@/components/sub/SubFunctions.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* oa 子系统 · home 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubHome from '@/components/sub/SubHome.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* oa 子系统 · 我的页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubMine.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubMine from '@/components/sub/SubMine.vue'
|
||||
</script>
|
||||
@@ -67,7 +67,6 @@ onMounted(() => {
|
||||
loadDetail()
|
||||
})
|
||||
|
||||
/** 公告级别 → u-tag 类型:1 重要 / 2 紧急 / 其他 普通 */
|
||||
function levelTagType(level) {
|
||||
const n = Number(level)
|
||||
if (n === 1) return 'warning'
|
||||
|
||||
@@ -80,7 +80,6 @@ function clearSearch() {
|
||||
loadNotices()
|
||||
}
|
||||
|
||||
/** 公告级别 → uview tag 类型 */
|
||||
function levelTagType(level) {
|
||||
const n = Number(level)
|
||||
if (n === 1) return 'warning'
|
||||
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* oa 子系统 · todo 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubTodo from '@/components/sub/SubTodo.vue'
|
||||
</script>
|
||||
@@ -6,7 +6,6 @@
|
||||
<text class="desc">使用业务功能需要先创建企业,或申请挂靠已有企业</text>
|
||||
</view>
|
||||
|
||||
<!-- 审核状态 -->
|
||||
<view v-if="status" class="status-card" :class="statusClass">
|
||||
<text class="status-title">{{ statusTitle }}</text>
|
||||
<text class="status-desc">{{ statusDesc }}</text>
|
||||
@@ -17,7 +16,6 @@
|
||||
<view class="tab" :class="{ active: tab === 'join' }" @tap="tab = 'join'">挂靠企业</view>
|
||||
</view>
|
||||
|
||||
<!-- ============ 创建企业:沿用完整字段与后端校验 ============ -->
|
||||
<view v-if="tab === 'create'" class="card">
|
||||
<view class="field">
|
||||
<text class="label">企业全称 <text class="required">*</text></text>
|
||||
@@ -56,7 +54,6 @@
|
||||
<text class="hint">提交后由平台管理员审核,通过后自动成为该企业管理员</text>
|
||||
</view>
|
||||
|
||||
<!-- ============ 挂靠企业 ============ -->
|
||||
<view v-else class="card">
|
||||
<view class="field">
|
||||
<text class="label">企业全称 <text class="required">*</text></text>
|
||||
@@ -105,10 +102,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 需企业模块的引导页:创建企业(平台审核) / 挂靠企业(租户管理员审核)。
|
||||
* 手机号由后端从微信验证结果读取,前端只读展示,不接受输入。
|
||||
*/
|
||||
import { ref, reactive, computed } from 'vue'
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import {
|
||||
|
||||
@@ -25,10 +25,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 手机号授权后未查到账号:设置密码完成注册(后端同时绑定微信 openid 并签发 tid=0 令牌)。
|
||||
* 注册完成后回到工作台,由 nav 自动继续进入刚才点击的模块。
|
||||
*/
|
||||
import { ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { onboardingRegister } from '@/api/onboarding.js'
|
||||
@@ -79,7 +75,6 @@ async function handleSubmit() {
|
||||
setTid(0)
|
||||
setTenantName('')
|
||||
clearHomeCache()
|
||||
// 注册前以游客身份产生的数据并入正式账号
|
||||
if (getGuestToken()) {
|
||||
try {
|
||||
await guestMerge()
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
</view>
|
||||
|
||||
<scroll-view class="body" scroll-y>
|
||||
<!-- 已绑定企业 -->
|
||||
<view class="card">
|
||||
<view class="card-head">
|
||||
<text class="card-title">已绑定企业</text>
|
||||
@@ -27,7 +26,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 绑定其他企业 -->
|
||||
<view class="card">
|
||||
<text class="card-title">绑定其他企业</text>
|
||||
<view class="field">
|
||||
@@ -75,7 +73,6 @@
|
||||
<text class="form-tip">提交后由该企业管理员审核,通过后可在工作台切换企业</text>
|
||||
</view>
|
||||
|
||||
<!-- 申请记录 -->
|
||||
<view class="card">
|
||||
<text class="card-title">申请记录</text>
|
||||
<view v-if="!applies.length" class="empty">暂无申请记录</view>
|
||||
@@ -96,10 +93,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 「我的 → 企业绑定」:展示已绑定的多租户,并向其他企业提交绑定申请。
|
||||
* 复用挂靠申请链路(企业搜索 / 部门 / 职位 / 微信手机号只读 / 租户管理员审核)。
|
||||
*/
|
||||
import { ref, computed } from 'vue'
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import {
|
||||
@@ -144,7 +137,6 @@ async function loadStatus() {
|
||||
tenants.value = list
|
||||
applies.value = Array.isArray(res?.applies) ? res.applies : []
|
||||
mobileMask.value = res?.mobile_mask || ''
|
||||
// 同步本地企业列表,工作台右上角「切换」立即可用
|
||||
setTenants(list.map((t) => ({ tid: t.tid, tenant_name: t.tenant_name })))
|
||||
} catch (e) {
|
||||
console.warn('[bindTenant] status failed:', e)
|
||||
|
||||
@@ -0,0 +1,277 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<view class="nav" :style="headPad">
|
||||
<view class="nav-back" @tap="goBack">
|
||||
<FaIcon name="chevron-left" color="#1e293b" :size="18" />
|
||||
<text class="nav-text">返回</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="header">
|
||||
<text class="title">修改密码</text>
|
||||
<text class="subtitle">统一认证账号密码,修改后全端同步生效</text>
|
||||
</view>
|
||||
|
||||
<view class="form-card">
|
||||
<view class="field">
|
||||
<text class="label">当前密码</text>
|
||||
<view class="input-wrap">
|
||||
<FaIcon name="lock" color="#94a3b8" :size="15" />
|
||||
<input
|
||||
v-model="form.old_password"
|
||||
class="input"
|
||||
:password="!showPassword"
|
||||
placeholder="请输入当前密码"
|
||||
placeholder-class="ph"
|
||||
/>
|
||||
<view class="eye" @tap="showPassword = !showPassword">
|
||||
<FaIcon
|
||||
:name="showPassword ? 'eye-slash' : 'eye'"
|
||||
color="#a7b1c7"
|
||||
:size="15"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="field">
|
||||
<text class="label">新密码</text>
|
||||
<view class="input-wrap">
|
||||
<FaIcon name="key" color="#94a3b8" :size="15" />
|
||||
<input
|
||||
v-model="form.new_password"
|
||||
class="input"
|
||||
:password="!showPassword"
|
||||
placeholder="至少 6 位字符"
|
||||
placeholder-class="ph"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="field">
|
||||
<text class="label">确认新密码</text>
|
||||
<view class="input-wrap">
|
||||
<FaIcon name="key" color="#94a3b8" :size="15" />
|
||||
<input
|
||||
v-model="form.confirm_password"
|
||||
class="input"
|
||||
:password="!showPassword"
|
||||
placeholder="再次输入新密码"
|
||||
placeholder-class="ph"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<text v-if="errorText" class="error-text">{{ errorText }}</text>
|
||||
|
||||
<view class="submit" :class="{ disabled: submitting }" @tap="submit">
|
||||
{{ submitting ? '提交中…' : '确认修改' }}
|
||||
</view>
|
||||
|
||||
<view class="tip">
|
||||
<FaIcon name="circle-info" color="#94a3b8" :size="12" />
|
||||
<text class="tip-text">修改成功后手机端、Web 后台与小程序密码同时更新,无需重新登录。</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { reactive, ref } from 'vue'
|
||||
import { mpHeadPad } from '@/utils/mpHead.js'
|
||||
import { changePassword } from '@/api/auth.js'
|
||||
|
||||
const headPad = mpHeadPad()
|
||||
|
||||
const form = reactive({
|
||||
old_password: '',
|
||||
new_password: '',
|
||||
confirm_password: ''
|
||||
})
|
||||
const showPassword = ref(false)
|
||||
const submitting = ref(false)
|
||||
const errorText = ref('')
|
||||
|
||||
async function submit() {
|
||||
if (submitting.value) return
|
||||
errorText.value = ''
|
||||
|
||||
if (!form.old_password) {
|
||||
errorText.value = '请输入当前密码'
|
||||
return
|
||||
}
|
||||
if (!form.new_password || form.new_password.length < 6) {
|
||||
errorText.value = '新密码长度不能少于 6 位'
|
||||
return
|
||||
}
|
||||
if (form.new_password !== form.confirm_password) {
|
||||
errorText.value = '两次输入的新密码不一致'
|
||||
return
|
||||
}
|
||||
if (form.new_password === form.old_password) {
|
||||
errorText.value = '新密码不能与当前密码相同'
|
||||
return
|
||||
}
|
||||
|
||||
submitting.value = true
|
||||
try {
|
||||
await changePassword({
|
||||
old_password: form.old_password,
|
||||
new_password: form.new_password,
|
||||
confirm_password: form.confirm_password
|
||||
})
|
||||
uni.showToast({ title: '密码已修改', icon: 'success' })
|
||||
setTimeout(() => {
|
||||
goBack()
|
||||
}, 700)
|
||||
} catch (e) {
|
||||
errorText.value = (e && e.message) || '修改失败,请重试'
|
||||
} finally {
|
||||
submitting.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function goBack() {
|
||||
uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/nav/nav' }) })
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import '@/src/styles/page-common.scss';
|
||||
|
||||
.page {
|
||||
min-height: 100vh;
|
||||
background: $color-bg-page;
|
||||
padding: 0 $page-padding-x calc(env(safe-area-inset-bottom, 0px) + 40rpx);
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.nav {
|
||||
padding-top: calc(var(--status-bar-height, 44px) + 16rpx);
|
||||
/* #ifdef MP-WEIXIN */
|
||||
padding-top: calc(env(safe-area-inset-top, 25px) + 80rpx);
|
||||
/* #endif */
|
||||
}
|
||||
|
||||
.nav-back {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4rpx;
|
||||
padding: 8rpx 0;
|
||||
width: fit-content;
|
||||
}
|
||||
|
||||
.nav-text {
|
||||
font-size: 28rpx;
|
||||
color: $color-text;
|
||||
}
|
||||
|
||||
.header {
|
||||
padding: 20rpx 0 32rpx;
|
||||
}
|
||||
|
||||
.title {
|
||||
display: block;
|
||||
font-size: 44rpx;
|
||||
font-weight: 600;
|
||||
color: $color-text;
|
||||
}
|
||||
|
||||
.subtitle {
|
||||
display: block;
|
||||
margin-top: 10rpx;
|
||||
font-size: 24rpx;
|
||||
color: $color-text-muted;
|
||||
}
|
||||
|
||||
.form-card {
|
||||
@include card;
|
||||
padding: 32rpx 28rpx;
|
||||
}
|
||||
|
||||
.field {
|
||||
margin-bottom: 28rpx;
|
||||
}
|
||||
|
||||
.label {
|
||||
display: block;
|
||||
margin-bottom: 12rpx;
|
||||
font-size: 26rpx;
|
||||
font-weight: 500;
|
||||
color: $color-text-secondary;
|
||||
}
|
||||
|
||||
.input-wrap {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12rpx;
|
||||
padding: 0 20rpx;
|
||||
border-radius: $radius-md;
|
||||
background: $color-bg-page;
|
||||
border: 1rpx solid $color-border;
|
||||
}
|
||||
|
||||
.input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
height: 92rpx;
|
||||
font-size: 30rpx;
|
||||
color: $color-text;
|
||||
}
|
||||
|
||||
.ph {
|
||||
color: #adb6c9;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
|
||||
.eye {
|
||||
width: 52rpx;
|
||||
height: 52rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.error-text {
|
||||
display: block;
|
||||
margin-bottom: 8rpx;
|
||||
font-size: 24rpx;
|
||||
color: $color-danger;
|
||||
}
|
||||
|
||||
.submit {
|
||||
height: 96rpx;
|
||||
margin-top: 16rpx;
|
||||
border-radius: $radius-md;
|
||||
background: $color-primary;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 32rpx;
|
||||
font-weight: 600;
|
||||
color: #ffffff;
|
||||
|
||||
&:active {
|
||||
background: $color-primary-dark;
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
opacity: 0.7;
|
||||
}
|
||||
}
|
||||
|
||||
.tip {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 8rpx;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
|
||||
.tip-text {
|
||||
flex: 1;
|
||||
font-size: 22rpx;
|
||||
line-height: 1.6;
|
||||
color: $color-text-muted;
|
||||
}
|
||||
</style>
|
||||
+140
-145
@@ -13,53 +13,76 @@
|
||||
<FaIcon name="pen-to-square" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="profile-stats">
|
||||
<view class="profile-stat" v-for="item in profileStats" :key="item.label">
|
||||
<text class="stat-num">{{ item.value }}</text>
|
||||
<text class="stat-label">{{ item.label }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="main-scroll" style="margin-top:10rpx">
|
||||
<view class="menu-group" v-for="(group, gIndex) in menuGroups" :key="gIndex">
|
||||
<u-cell-group :border="false">
|
||||
<u-cell
|
||||
v-for="item in group"
|
||||
:key="item.title"
|
||||
:title="item.title"
|
||||
is-link
|
||||
@click="onMenuTap(item)"
|
||||
>
|
||||
<template #icon>
|
||||
<view class="menu-icon">
|
||||
<FaIcon :name="item.icon" color="#2563eb" :size="18" />
|
||||
</view>
|
||||
</template>
|
||||
<template #value>
|
||||
<text v-if="item.badge" class="menu-badge">{{ item.badge }}</text>
|
||||
</template>
|
||||
</u-cell>
|
||||
</u-cell-group>
|
||||
<scroll-view class="main-scroll" scroll-y>
|
||||
<view class="menu-card">
|
||||
<view class="menu-row" @tap="onSubscribe">
|
||||
<view class="tint-icon row-icon tint-0">
|
||||
<FaIcon name="bell" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
<view class="row-main">
|
||||
<text class="row-title">订阅消息提醒</text>
|
||||
<text class="row-sub">审批、日程与公告的微信通知</text>
|
||||
</view>
|
||||
<text class="row-value">去开启</text>
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="logout-wrap">
|
||||
<u-button
|
||||
type="error"
|
||||
plain
|
||||
shape="circle"
|
||||
text="退出登录"
|
||||
@click="handleLogout"
|
||||
/>
|
||||
<view class="menu-card">
|
||||
<view class="menu-row" @tap="goChangePassword">
|
||||
<view class="tint-icon row-icon tint-1">
|
||||
<FaIcon name="key" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
<view class="row-main">
|
||||
<text class="row-title">修改密码</text>
|
||||
<text class="row-sub">定期更换密码,保障账号安全</text>
|
||||
</view>
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
<view class="menu-row" @tap="goBindTenant">
|
||||
<view class="tint-icon row-icon tint-2">
|
||||
<FaIcon name="building" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
<view class="row-main">
|
||||
<text class="row-title">企业绑定</text>
|
||||
<text class="row-sub">查看已绑定企业,或申请绑定其他企业</text>
|
||||
</view>
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="menu-card">
|
||||
<view class="menu-row" @tap="goHelp">
|
||||
<view class="tint-icon row-icon tint-3">
|
||||
<FaIcon name="circle-question" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
<view class="row-main">
|
||||
<text class="row-title">帮助中心</text>
|
||||
</view>
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
<view class="menu-row" @tap="goSettings">
|
||||
<view class="tint-icon row-icon tint-4">
|
||||
<FaIcon name="gear" color="#ffffff" :size="16" />
|
||||
</view>
|
||||
<view class="row-main">
|
||||
<text class="row-title">设置</text>
|
||||
</view>
|
||||
<FaIcon name="chevron-right" color="#c8cfdf" :size="12" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="logout" @tap="handleLogout">
|
||||
<text class="logout-text">退出登录</text>
|
||||
</view>
|
||||
|
||||
<view class="bottom-space" />
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<AppTabbar current="profile" :tabs="profileTabs" />
|
||||
|
||||
<!-- 编辑资料:姓名 / 邮箱可改,手机号由微信验证只读 -->
|
||||
<view v-if="editVisible" class="edit-mask" @tap="closeEdit">
|
||||
<view class="edit-sheet" @tap.stop>
|
||||
<view class="edit-head">
|
||||
@@ -102,7 +125,6 @@ import AppTabbar from '@/components/MainTabbar.vue'
|
||||
|
||||
const user = ref(null)
|
||||
|
||||
// 个人中心底部只保留两项:左侧「我的」、右侧「回平台」(platform 由 MainTabbar 处理跳转)
|
||||
const profileTabs = [
|
||||
{ name: 'profile', text: '我的', icon: 'user' },
|
||||
{ name: 'platform', text: '回平台', icon: 'arrow-left' }
|
||||
@@ -122,31 +144,6 @@ const userId = computed(() => {
|
||||
return '-'
|
||||
})
|
||||
|
||||
const profileStats = ref([
|
||||
{ label: '关注', value: '128' },
|
||||
{ label: '粉丝', value: '256' },
|
||||
{ label: '获赞', value: '1.2k' }
|
||||
])
|
||||
|
||||
const menuGroups = ref([
|
||||
[
|
||||
{ title: '我的订单', icon: 'clipboard-list' },
|
||||
{ title: '我的收藏', icon: 'star' },
|
||||
{ title: '浏览历史', icon: 'clock-rotate-left' }
|
||||
],
|
||||
[
|
||||
{ title: '企业绑定', icon: 'building' },
|
||||
{ title: '消息通知', icon: 'bell', badge: '3' },
|
||||
{ title: '账号安全', icon: 'lock' },
|
||||
{ title: '隐私设置', icon: 'eye' }
|
||||
],
|
||||
[
|
||||
{ title: '帮助中心', icon: 'circle-question' },
|
||||
{ title: '关于我们', icon: 'circle-info' },
|
||||
{ title: '设置', icon: 'gear' }
|
||||
]
|
||||
])
|
||||
|
||||
async function loadUser() {
|
||||
user.value = getUser()
|
||||
try {
|
||||
@@ -162,27 +159,43 @@ async function loadUser() {
|
||||
user.value = merged
|
||||
}
|
||||
} catch {
|
||||
// 401 时 request 会跳转登录
|
||||
user.value = getUser()
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
if (!isLoggedIn()) {
|
||||
// 新流程没有独立登录页:回平台点击模块即可重新授权手机号
|
||||
uni.reLaunch({ url: '/pages/nav/nav' })
|
||||
return
|
||||
}
|
||||
loadUser()
|
||||
})
|
||||
|
||||
/* ==================== 编辑资料 ==================== */
|
||||
function onSubscribe() {
|
||||
requestSubscribeNotice({ tip: '已开启消息提醒' })
|
||||
}
|
||||
|
||||
function goChangePassword() {
|
||||
uni.navigateTo({ url: '/pages/profile/changePassword' })
|
||||
}
|
||||
|
||||
function goBindTenant() {
|
||||
uni.navigateTo({ url: '/pages/profile/bindTenant' })
|
||||
}
|
||||
|
||||
function goHelp() {
|
||||
uni.navigateTo({ url: '/pages/common/developing?t=' + encodeURIComponent('帮助中心') })
|
||||
}
|
||||
|
||||
function goSettings() {
|
||||
uni.navigateTo({ url: '/pages/common/developing?t=' + encodeURIComponent('设置') })
|
||||
}
|
||||
|
||||
const editVisible = ref(false)
|
||||
const saving = ref(false)
|
||||
const editError = ref('')
|
||||
const editForm = reactive({ name: '', email: '' })
|
||||
|
||||
// 手机号来自微信验证,只读展示(掩码),不随表单提交
|
||||
const phoneText = computed(() => {
|
||||
const u = user.value || {}
|
||||
const p = u.phone || (u.account && /^1\d{10}$/.test(String(u.account)) ? String(u.account) : '')
|
||||
@@ -235,25 +248,6 @@ async function saveProfile() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
function onMenuTap(item) {
|
||||
if (item.title === '企业绑定') {
|
||||
uni.navigateTo({ url: '/pages/profile/bindTenant' })
|
||||
return
|
||||
}
|
||||
if (item.title === '账号安全') {
|
||||
uni.navigateTo({ url: '/pages/login/forget' })
|
||||
return
|
||||
}
|
||||
if (item.title === '消息通知') {
|
||||
// 订阅消息授权:用户同意后,服务器才有一次主动推送的机会
|
||||
requestSubscribeNotice()
|
||||
return
|
||||
}
|
||||
uni.showToast({ title: item.title, icon: 'none' })
|
||||
}
|
||||
|
||||
function handleLogout() {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
@@ -262,13 +256,11 @@ function handleLogout() {
|
||||
cancelText: '取消',
|
||||
success(res) {
|
||||
if (!res.confirm) return
|
||||
// 统一认证:先吊销服务端会话与令牌(默认 1 号 1 机,不吊销会占着名额)
|
||||
if (isSSOEnabled() && getToken()) {
|
||||
logoutUAC().catch(() => {})
|
||||
} else {
|
||||
logoutApi().catch(() => {})
|
||||
}
|
||||
// 再清本地并跳转,避免接口超时/失败导致“退出无效”
|
||||
logout()
|
||||
uni.reLaunch({ url: '/pages/nav/nav' })
|
||||
}
|
||||
@@ -322,7 +314,6 @@ function handleLogout() {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 24rpx;
|
||||
/* 取消顶部回平台按钮后补偿占位,headPad 内联 paddingTop 继续避让状态栏/胶囊 */
|
||||
margin-top: 20rpx;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
@@ -380,84 +371,88 @@ function handleLogout() {
|
||||
}
|
||||
}
|
||||
|
||||
.profile-stats {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
margin-top: 40rpx;
|
||||
padding-top: 32rpx;
|
||||
border-top: 1rpx solid rgba(255, 255, 255, 0.2);
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.profile-stat {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.stat-num {
|
||||
font-size: 36rpx;
|
||||
font-weight: 600;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.stat-label {
|
||||
font-size: 24rpx;
|
||||
color: rgba(255, 255, 255, 0.75);
|
||||
margin-top: 6rpx;
|
||||
}
|
||||
|
||||
.main-scroll {
|
||||
@include scroll-body;
|
||||
margin-top: -20rpx;
|
||||
}
|
||||
|
||||
.menu-group {
|
||||
.menu-card {
|
||||
@include card;
|
||||
padding: 0 24rpx;
|
||||
margin-bottom: 24rpx;
|
||||
overflow: hidden;
|
||||
border-radius: 16rpx;
|
||||
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.08);
|
||||
transition: box-shadow 0.3s ease;
|
||||
}
|
||||
|
||||
.menu-group:active {
|
||||
box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.12);
|
||||
}
|
||||
|
||||
.menu-icon {
|
||||
width: 56rpx;
|
||||
height: 56rpx;
|
||||
border-radius: 12rpx;
|
||||
background: linear-gradient(135deg, rgba(57, 115, 255, 0.12) 0%, rgba(82, 168, 255, 0.14) 100%);
|
||||
.menu-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 18rpx;
|
||||
padding: 26rpx 0;
|
||||
|
||||
& + & {
|
||||
border-top: 1rpx solid $color-divider;
|
||||
}
|
||||
|
||||
&:active {
|
||||
opacity: 0.75;
|
||||
}
|
||||
}
|
||||
|
||||
.row-icon {
|
||||
@include tint-icon(64rpx, 18rpx);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.menu-badge {
|
||||
font-size: 20rpx;
|
||||
font-weight: 600;
|
||||
color: #ffffff;
|
||||
background: linear-gradient(135deg, #2563eb 0%, #60a5fa 100%);
|
||||
padding: 6rpx 14rpx;
|
||||
border-radius: 12rpx;
|
||||
min-width: 36rpx;
|
||||
text-align: center;
|
||||
line-height: 1.4;
|
||||
box-shadow: 0 4rpx 12rpx rgba(37, 99, 235, 0.3);
|
||||
.row-main {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.logout-wrap {
|
||||
margin-bottom: 12rpx;
|
||||
.row-title {
|
||||
display: block;
|
||||
font-size: 28rpx;
|
||||
color: $color-text;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.row-sub {
|
||||
display: block;
|
||||
margin-top: 6rpx;
|
||||
font-size: 22rpx;
|
||||
color: $color-text-muted;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.row-value {
|
||||
flex-shrink: 0;
|
||||
font-size: 24rpx;
|
||||
color: $color-primary;
|
||||
}
|
||||
|
||||
.logout {
|
||||
@include card;
|
||||
margin-top: 12rpx;
|
||||
padding: 28rpx 0;
|
||||
text-align: center;
|
||||
|
||||
&:active {
|
||||
background: $color-bg-page;
|
||||
}
|
||||
}
|
||||
|
||||
.logout-text {
|
||||
font-size: 28rpx;
|
||||
color: $color-danger;
|
||||
}
|
||||
|
||||
.bottom-space {
|
||||
height: 48rpx;
|
||||
}
|
||||
/* ============ 编辑资料弹层 ============ */
|
||||
|
||||
.edit-mask {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
|
||||
@@ -24,11 +24,6 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* 小程序码扫码注册确认页:
|
||||
* 电脑端注册页展示小程序码(scene=注册会话)→ 微信扫码进入本页 →
|
||||
* uni.login 取 code 调 /auth/register/mini/confirm → 电脑端轮询到已确认后继续注册。
|
||||
*/
|
||||
import { ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { confirmMiniappRegister } from '@/api/auth.js'
|
||||
@@ -40,7 +35,6 @@ const errorMsg = ref('')
|
||||
const statusText = ref('')
|
||||
|
||||
onLoad((options = {}) => {
|
||||
// scene 由小程序码携带,微信会自动做一次 URL 解码
|
||||
scene.value = options.scene || ''
|
||||
if (!scene.value) {
|
||||
errorMsg.value = '缺少会话标识,请回到电脑端重新获取二维码'
|
||||
@@ -91,7 +85,6 @@ async function confirm(phoneCode = '') {
|
||||
}
|
||||
}
|
||||
|
||||
/** 手机号快速验证为可选项:未开通或用户拒绝时仍按 openid 完成确认 */
|
||||
function onPhone(e) {
|
||||
const detail = (e && e.detail) || {}
|
||||
const errMsg = detail.errMsg || ''
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!-- 顶部子系统标识条 -->
|
||||
<view v-if="sub" class="hero" :class="sub.tint" :style="headPad">
|
||||
<view class="hero-main">
|
||||
<view class="hero-icon">
|
||||
@@ -13,11 +12,6 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!--
|
||||
内容区:三页签共用底部 tabbar,H5 / APK / 微信小程序结构完全一致。
|
||||
各自独立 scroll-view(保留各自滚动位置);首页进入即挂载,
|
||||
其余页签首次切换才挂载,之后用 v-show 保留状态。
|
||||
-->
|
||||
<view v-if="sub" class="content">
|
||||
<scroll-view v-if="visited.home" v-show="activeTab === 'home'" class="pane" scroll-y>
|
||||
<SubHome :slug="slug" embedded @switch-tab="switchByIndex" @back="goBackNav" />
|
||||
@@ -47,12 +41,10 @@ import SubHome from '@/components/sub/SubHome.vue'
|
||||
import SubFunctions from '@/components/sub/SubFunctions.vue'
|
||||
import SubMine from '@/components/sub/SubMine.vue'
|
||||
|
||||
// 页签下标顺序,与 Sub 组件 @switch-tab 抛出的数字一一对应
|
||||
const TAB_ORDER = ['home', 'functions', 'mine']
|
||||
const tabs = [
|
||||
{ name: 'home', text: '首页', icon: 'house' },
|
||||
{ name: 'functions', text: '功能', icon: 'table-cells' },
|
||||
// 末位为「回平台」:点击由 AppTabbar 统一 reLaunch 到 /pages/nav/nav
|
||||
{ name: 'mine', text: '回平台', icon: 'arrow-left' }
|
||||
]
|
||||
|
||||
@@ -94,12 +86,10 @@ function goBackNav() {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* ============ 顶部标识条 ============ */
|
||||
.hero {
|
||||
flex-shrink: 0;
|
||||
position: relative;
|
||||
z-index: 0;
|
||||
// H5 端 --status-bar-height 为 0,此时仅保留 32rpx 内边距
|
||||
padding: calc(var(--status-bar-height, 44px) + 32rpx) $page-padding-x 72rpx;
|
||||
}
|
||||
|
||||
@@ -107,7 +97,6 @@ function goBackNav() {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 22rpx;
|
||||
/* 取消顶部回平台按钮后,补偿其占位;headPad 内联 paddingTop 继续避让胶囊 */
|
||||
margin-top: 44rpx;
|
||||
}
|
||||
|
||||
@@ -144,7 +133,6 @@ function goBackNav() {
|
||||
color: rgba(255, 255, 255, 0.82);
|
||||
}
|
||||
|
||||
/* ============ 内容区:上移压住渐变条,圆角衔接 ============ */
|
||||
.content {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* tools 子系统 · functions 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubFunctions from '@/components/sub/SubFunctions.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* tools 子系统 · home 页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubXxx.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubHome from '@/components/sub/SubHome.vue'
|
||||
</script>
|
||||
@@ -3,10 +3,5 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
/**
|
||||
* toolbox 子系统 · 我的页。
|
||||
* 页面逻辑全部收敛在 components/sub/SubMine.vue,这里只做 slug 绑定,
|
||||
* 便于统一维护;该子系统拥有独立的页面目录与独立 tabbar。
|
||||
*/
|
||||
import SubMine from '@/components/sub/SubMine.vue'
|
||||
</script>
|
||||
Loaded 100 of 1304 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user