1
This commit is contained in:
parent
55123b6f8e
commit
303ed24ec7
@ -6,6 +6,7 @@ import { getToken } from "@/utils/auth";
|
||||
import { normalizeEntry, savePendingEntry, hasEntryAction } from "@/utils/entry";
|
||||
import type { EntryLaunchOptions } from "@/utils/entry";
|
||||
import { setUnauthorizedHandler } from "@/utils/auth-notify";
|
||||
import { appendIdentityLog } from "@/utils/identity-log";
|
||||
|
||||
/**
|
||||
* 捕获入口参数(扫码 / 链接 / 分享进入)
|
||||
@ -47,6 +48,12 @@ watch(
|
||||
);
|
||||
|
||||
onLaunch((options) => {
|
||||
// 排障流水:记下每次「启动 / 重进小程序」,便于把切换过程与重进后对照
|
||||
appendIdentityLog(
|
||||
'小程序启动',
|
||||
`本地有 token=${getToken() ? '有' : '无'} platform=${String(import.meta.env.VITE_APP_PLATFORM || '-')}`
|
||||
)
|
||||
|
||||
// ⚠️ 这里**不要**做「未登录就跳登录页」的判断。
|
||||
// 微信审核要求:打开小程序不能直接强制登录,登录入口必须由用户主动触发
|
||||
// (现在登录入口统一是**半屏抽屉**,见 store 的 `showAuthModal`)。
|
||||
|
||||
176
src/api/storage/receiving.ts
Normal file
176
src/api/storage/receiving.ts
Normal file
@ -0,0 +1,176 @@
|
||||
/**
|
||||
* 收货单列表(`storage.receiving.getStoreReceivingList`)
|
||||
*
|
||||
* 与 new3 Web 端 `src/views/storage/receiving_owner/index.vue` **同一个接口**
|
||||
* (它引的是 `@/api/storage_receiving/receiving` 的 `getReceivingListStore`)。
|
||||
*
|
||||
* ```
|
||||
* body = { pagination: { page, pageSize }, where: { <字段>: { operator, value } }, stock_query_where? }
|
||||
* 返回 data = { list: [...], pagination: { total } }
|
||||
* ```
|
||||
*
|
||||
* ⚠️ **`where` 的条件形状是 `{ operator, value }`**(new3 的 ScanBox 契约,
|
||||
* 见其 `applyWarehouseToWhere()` / `normalizeToWhere()`),**不是裸值** ——
|
||||
* 和「外仓商品」那个 `where.keyword = 'xxx'` 的写法不一样,别混。
|
||||
* 顶层参数只有 `stock_query_where`(商品条码/编码搜索),小程序端暂不用。
|
||||
*
|
||||
* 小程序端只展示 4 个信息(单号 / 收货状态 / 种类+数量 / 创建时间),
|
||||
* 并且**去掉**排序、页码、每页条数等不适合移动端的交互 —— 分页改为「上拉加载」,
|
||||
* 见 `pagesA/external-inventory/receiving.vue`。
|
||||
*/
|
||||
|
||||
import request from '@/utils/request'
|
||||
import type { BizResponse } from '@/utils/request'
|
||||
import { SYSTEM_URL, gatewayParams } from '@/utils/gateway'
|
||||
|
||||
/**
|
||||
* 每页条数:**固定 50 条,页面不提供修改**
|
||||
*
|
||||
* 与 Web 端(`el-pagination` 可选 20/50/100)不同:小程序端去掉「每页条数选择器」,
|
||||
* 固定一个值能少一层交互,也让翻页按钮的页码语义稳定。
|
||||
*/
|
||||
export const RECEIVING_PAGE_SIZE = 50
|
||||
|
||||
/** 收货状态(后端枚举) */
|
||||
export type ReceivingStatus = 'receiving' | 'completed' | 'cancelled' | string
|
||||
|
||||
/** 收货单列表项(只声明小程序用到的字段,其余用索引签名兜住) */
|
||||
export interface ReceivingItem {
|
||||
id?: number
|
||||
/** 收货单号 */
|
||||
receiving_number?: string
|
||||
/** 收货状态:receiving / completed / cancelled */
|
||||
status?: ReceivingStatus
|
||||
/** 匹配状态:all_matched / partial_matched / unmatched */
|
||||
detail_status?: string
|
||||
/** 入库状态:all / partial / waiting / none */
|
||||
storage_status?: string
|
||||
/** 商品种类数 */
|
||||
total_items?: number
|
||||
/** 总数量 */
|
||||
total_quantity?: number
|
||||
/** 总箱数 */
|
||||
total_boxes?: number
|
||||
/** 创建时间(后端已格式化) */
|
||||
create_at_display?: string
|
||||
/** 车牌号 */
|
||||
license_plate?: string
|
||||
/** 物流单号 */
|
||||
tracking_number?: string
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 列表响应体 `data` */
|
||||
export interface ReceivingPayload {
|
||||
list?: ReceivingItem[]
|
||||
total?: number
|
||||
pagination?: { page?: number; pageSize?: number; total?: number }
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 查询条件(页面传入) */
|
||||
export interface ReceivingQuery {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
/** 收货单号(模糊搜索),空字符串表示不过滤 */
|
||||
keyword?: string
|
||||
/** 货主 id,空字符串表示全部 */
|
||||
store_id?: number | string
|
||||
/** 收货状态,空字符串表示全部 */
|
||||
status?: string
|
||||
/** 仓库 id,空字符串表示全部 */
|
||||
warehouse_id?: number | string
|
||||
}
|
||||
|
||||
/** 收货状态 → 文案(与 new3 `receiving-config.ts` 的 `statusConfig` 对齐) */
|
||||
export const RECEIVING_STATUS_TEXT: Record<string, string> = {
|
||||
receiving: '收货中',
|
||||
completed: '已完成',
|
||||
cancelled: '已作废'
|
||||
}
|
||||
|
||||
/** 收货状态 → 主题色(小程序没有 el-tag,用文字色区分) */
|
||||
export const RECEIVING_STATUS_COLOR: Record<string, string> = {
|
||||
receiving: '#ff9900',
|
||||
completed: '#19be6b',
|
||||
cancelled: '#fa3534'
|
||||
}
|
||||
|
||||
/** 状态文案:未知状态原样显示(后端加了新状态也不会显示成空白) */
|
||||
export function readStatusText(status?: string): string {
|
||||
if (!status) return '—'
|
||||
return RECEIVING_STATUS_TEXT[status] || status
|
||||
}
|
||||
|
||||
/** 状态颜色 */
|
||||
export function readStatusColor(status?: string): string {
|
||||
if (!status) return '#909399'
|
||||
return RECEIVING_STATUS_COLOR[status] || '#909399'
|
||||
}
|
||||
|
||||
/** 状态选项(筛选用,含「全部」) */
|
||||
export const RECEIVING_STATUS_OPTIONS: Array<{ value: string; label: string }> = [
|
||||
{ value: '', label: '全部状态' },
|
||||
{ value: 'receiving', label: '收货中' },
|
||||
{ value: 'completed', label: '已完成' },
|
||||
{ value: 'cancelled', label: '已作废' }
|
||||
]
|
||||
|
||||
function isFilled(value: unknown): boolean {
|
||||
return value !== undefined && value !== null && value !== ''
|
||||
}
|
||||
|
||||
/** `where` 条件统一为 `{ operator, value }`(后端契约,见文件头说明) */
|
||||
const eq = (value: unknown) => ({ operator: 'eq', value })
|
||||
const like = (value: unknown) => ({ operator: 'like', value })
|
||||
|
||||
/** 组装请求体(条件字段/操作符要调整时改这里) */
|
||||
function buildBody(query: ReceivingQuery): Record<string, any> {
|
||||
const { page = 1, pageSize = RECEIVING_PAGE_SIZE, keyword, store_id, status, warehouse_id } = query
|
||||
|
||||
const where: Record<string, any> = {}
|
||||
// 收货单号模糊搜索:new3 的字段配置里 `receiving_number` 支持 like/contains/starts_with,
|
||||
// 若后端实际只支持其中某个,改这一行的 operator 即可
|
||||
if (keyword && String(keyword).trim()) where.receiving_number = like(String(keyword).trim())
|
||||
if (isFilled(store_id)) where.store_id = eq(store_id)
|
||||
if (isFilled(status)) where.status = eq(status)
|
||||
if (isFilled(warehouse_id)) where.warehouse_id = eq(warehouse_id)
|
||||
|
||||
return {
|
||||
pagination: { page, pageSize },
|
||||
where
|
||||
}
|
||||
}
|
||||
|
||||
/** 收货单列表(分页) */
|
||||
export function fetchStoreReceivingList(
|
||||
query: ReceivingQuery = {}
|
||||
): Promise<BizResponse<ReceivingPayload>> {
|
||||
return request<ReceivingPayload>({
|
||||
url: SYSTEM_URL,
|
||||
method: 'POST',
|
||||
params: gatewayParams('storage.receiving.getStoreReceivingList'),
|
||||
data: buildBody(query),
|
||||
// 需要登录:未登录时不发请求,直接弹登录抽屉
|
||||
auth: true
|
||||
})
|
||||
}
|
||||
|
||||
/** 总数:后端放在 `pagination.total`(也可能在顶层 `total`) */
|
||||
export function readTotal(payload: ReceivingPayload | undefined | null): number {
|
||||
const total = payload?.pagination?.total ?? payload?.total ?? 0
|
||||
const num = Number(total)
|
||||
return Number.isFinite(num) && num > 0 ? num : 0
|
||||
}
|
||||
|
||||
/**
|
||||
* 数量概览文案:`3 种 · 120 件`
|
||||
*
|
||||
* 缺失的字段直接省略(不显示 `0`,避免把「后端没给」误读成「没有货」)
|
||||
*/
|
||||
export function readQuantityText(item: ReceivingItem | undefined | null): string {
|
||||
const parts: string[] = []
|
||||
if (isFilled(item?.total_items)) parts.push(`${Number(item?.total_items)} 种`)
|
||||
if (isFilled(item?.total_quantity)) parts.push(`${Number(item?.total_quantity)} 件`)
|
||||
return parts.length ? parts.join(' · ') : '—'
|
||||
}
|
||||
186
src/components/option-picker/option-picker.vue
Normal file
186
src/components/option-picker/option-picker.vue
Normal file
@ -0,0 +1,186 @@
|
||||
<template>
|
||||
<up-popup :show="show" mode="bottom" :round="16" @close="emit('close')">
|
||||
<view class="option-picker">
|
||||
<view class="option-picker__title">{{ title }}</view>
|
||||
|
||||
<!-- 选项多时才给名称搜索(如货主 100+),选项少时搜索框是干扰 -->
|
||||
<view v-if="searchable" class="option-picker__search">
|
||||
<up-input
|
||||
v-model="keyword"
|
||||
color="#303133"
|
||||
placeholder-style="color: #c0c4cc"
|
||||
:placeholder="`搜索${title.replace(/^选择/, '')}名称`"
|
||||
prefix-icon="search"
|
||||
border="none"
|
||||
clearable
|
||||
></up-input>
|
||||
</view>
|
||||
|
||||
<scroll-view class="option-picker__list" scroll-y>
|
||||
<view
|
||||
v-for="option in visibleOptions"
|
||||
:key="String(option.value)"
|
||||
class="option-picker__item"
|
||||
:class="{ 'option-picker__item--active': option.value === value }"
|
||||
@click="emit('select', option)"
|
||||
>
|
||||
<text class="option-picker__item-text">{{ option.label }}</text>
|
||||
<up-icon
|
||||
v-if="option.value === value"
|
||||
name="checkmark"
|
||||
color="#2979ff"
|
||||
size="16"
|
||||
></up-icon>
|
||||
</view>
|
||||
|
||||
<view v-if="loading" class="option-picker__tip">加载中…</view>
|
||||
<view v-else-if="visibleOptions.length <= 1" class="option-picker__tip">
|
||||
{{ keyword ? '没有匹配的名称' : '暂无可选项' }}
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<view class="option-picker__cancel" @click="emit('close')">取消</view>
|
||||
</view>
|
||||
</up-popup>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
/**
|
||||
* 底部弹层选择器(移动端替掉 Web 的 `el-select`)
|
||||
*
|
||||
* 为什么抽组件:「外仓商品」「收货单」等列表页都要「胶囊 → 弹层选一个维度」这套交互,
|
||||
* 各写一遍必然漂移(一处加了搜索、另一处没加)。这里只做**展示与选择**:
|
||||
* 选项从哪来、选中后做什么,都由页面决定。
|
||||
*
|
||||
* 约定:
|
||||
* - `options` **由页面拼好**(含「全部…」那一项),本组件不关心来源(接口 / 本地常量均可)
|
||||
* - 选项超过 `searchThreshold` 才显示名称搜索框(选项少时搜索是干扰)
|
||||
*
|
||||
* 用法:
|
||||
* ```vue
|
||||
* <option-picker
|
||||
* :show="pickerVisible"
|
||||
* :title="pickerTitle"
|
||||
* :options="pickerOptions"
|
||||
* :value="pickerValue"
|
||||
* :loading="pickerLoading"
|
||||
* @select="chooseOption"
|
||||
* @close="closePicker"
|
||||
* />
|
||||
* ```
|
||||
*/
|
||||
|
||||
import { computed, ref, watch } from 'vue'
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
/** 是否显示 */
|
||||
show: boolean
|
||||
/** 弹层标题,如「选择货主」 */
|
||||
title: string
|
||||
/** 选项(页面已含「全部」项) */
|
||||
options: Array<{ value: string | number; label: string }>
|
||||
/** 当前选中值,用于打勾 */
|
||||
value?: string | number
|
||||
/** 选项是否加载中 */
|
||||
loading?: boolean
|
||||
/** 超过多少个选项才出搜索框 */
|
||||
searchThreshold?: number
|
||||
}>(),
|
||||
{
|
||||
value: '',
|
||||
loading: false,
|
||||
searchThreshold: 12
|
||||
}
|
||||
)
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'select', option: { value: string | number; label: string }): void
|
||||
(e: 'close'): void
|
||||
}>()
|
||||
|
||||
/** 弹层内的名称搜索 */
|
||||
const keyword = ref('')
|
||||
|
||||
const searchable = computed(() => props.options.length > props.searchThreshold)
|
||||
|
||||
const visibleOptions = computed(() => {
|
||||
const word = keyword.value.trim().toLowerCase()
|
||||
// 第一项(「全部…」,value 为空串)不参与过滤,永远置顶
|
||||
const all = props.options.filter((option) => option.value === '')
|
||||
const rest = props.options.filter((option) => option.value !== '')
|
||||
const matched = word
|
||||
? rest.filter((option) => option.label.toLowerCase().includes(word))
|
||||
: rest
|
||||
return [...all, ...matched]
|
||||
})
|
||||
|
||||
// 每次打开都清空上次的搜索词(否则下次打开看到的是「过滤后的空列表」)
|
||||
watch(
|
||||
() => props.show,
|
||||
(show) => {
|
||||
if (show) keyword.value = ''
|
||||
}
|
||||
)
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.option-picker {
|
||||
padding-top: 24rpx;
|
||||
|
||||
&__title {
|
||||
padding: 0 32rpx 16rpx;
|
||||
font-size: 30rpx;
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
&__search {
|
||||
margin: 0 32rpx 12rpx;
|
||||
padding: 0 20rpx;
|
||||
background-color: #f5f6fa;
|
||||
border-radius: 999rpx;
|
||||
}
|
||||
|
||||
&__list {
|
||||
/* scroll-view 需要高度上限,否则长列表会顶出屏幕 */
|
||||
max-height: 60vh;
|
||||
}
|
||||
|
||||
&__item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 26rpx 32rpx;
|
||||
font-size: 28rpx;
|
||||
color: #303133;
|
||||
|
||||
&--active {
|
||||
color: #2979ff;
|
||||
}
|
||||
}
|
||||
|
||||
&__item-text {
|
||||
flex: 1;
|
||||
margin-right: 16rpx;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
&__tip {
|
||||
padding: 32rpx;
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
&__cancel {
|
||||
padding: 24rpx;
|
||||
text-align: center;
|
||||
font-size: 28rpx;
|
||||
color: #606266;
|
||||
border-top: 1rpx solid #f2f3f5;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -69,6 +69,15 @@
|
||||
"backgroundTextStyle": "dark",
|
||||
"onReachBottomDistance": 80
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "external-inventory/receiving",
|
||||
"style": {
|
||||
"navigationBarTitleText": "收货单",
|
||||
"enablePullDownRefresh": true,
|
||||
"backgroundTextStyle": "dark",
|
||||
"onReachBottomDistance": 80
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -123,6 +132,10 @@
|
||||
{
|
||||
"name": "外仓商品",
|
||||
"path": "pagesA/external-stock/list"
|
||||
},
|
||||
{
|
||||
"name": "收货单",
|
||||
"path": "pagesA/external-inventory/receiving"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@ -343,10 +343,11 @@ const doChangeRole = async (roleId: number) => {
|
||||
await userStore.changeRole(roleId)
|
||||
uni.hideLoading()
|
||||
uni.$u.toast('身份已切换')
|
||||
} catch {
|
||||
} catch (err) {
|
||||
uni.hideLoading()
|
||||
// store 内已回滚选中身份,此处只需提示
|
||||
uni.$u.toast('切换失败,请稍后再试')
|
||||
// store 内已回滚 / 以服务端为准;提示优先用 store 给出的具体原因
|
||||
// (如「身份切换未生效」—— 比笼统的「切换失败」好定位得多)
|
||||
uni.$u.toast(err instanceof Error && err.message ? err.message : '切换失败,请稍后再试')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
572
src/pagesA/external-inventory/receiving.vue
Normal file
572
src/pagesA/external-inventory/receiving.vue
Normal file
@ -0,0 +1,572 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<!-- required 未登录:页内「请先登录」+ 去登录,**不自动跳转** -->
|
||||
<auth-gate auth="required">
|
||||
<template #default>
|
||||
<!-- 筛选区(吸顶):收货单号 + 搜索;货主 / 收货状态用胶囊按钮唤起底部选择器 -->
|
||||
<view class="filter">
|
||||
<view class="filter__row">
|
||||
<view class="filter__input">
|
||||
<up-input
|
||||
v-model="form.keyword"
|
||||
color="#303133"
|
||||
placeholder-style="color: #c0c4cc"
|
||||
placeholder="搜索收货单号"
|
||||
prefix-icon="search"
|
||||
border="none"
|
||||
clearable
|
||||
confirm-type="search"
|
||||
@confirm="onSearch"
|
||||
></up-input>
|
||||
</view>
|
||||
<up-button
|
||||
type="primary"
|
||||
shape="circle"
|
||||
size="small"
|
||||
text="搜索"
|
||||
@click="onSearch"
|
||||
></up-button>
|
||||
</view>
|
||||
|
||||
<view class="filter__row filter__row--chips">
|
||||
<view
|
||||
class="chip"
|
||||
:class="{ 'chip--active': isFilled(form.store_id) }"
|
||||
@click="openPicker('store')"
|
||||
>
|
||||
<text class="chip__text">{{ storeLabel }}</text>
|
||||
<up-icon
|
||||
name="arrow-down"
|
||||
size="12"
|
||||
:color="isFilled(form.store_id) ? '#2979ff' : '#909399'"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view
|
||||
class="chip"
|
||||
:class="{ 'chip--active': !!form.status }"
|
||||
@click="openPicker('status')"
|
||||
>
|
||||
<text class="chip__text">{{ statusLabel }}</text>
|
||||
<up-icon
|
||||
name="arrow-down"
|
||||
size="12"
|
||||
:color="form.status ? '#2979ff' : '#909399'"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view v-if="hasFilter" class="filter__reset" @click="onReset">重置</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 首屏加载(翻页时保留旧列表,只把页码控件置为「加载中…」,避免整屏闪动) -->
|
||||
<view v-if="loading && !list.length" class="loading">
|
||||
<up-loading-icon mode="circle" size="18" text="加载中"></up-loading-icon>
|
||||
</view>
|
||||
|
||||
<template v-else-if="list.length">
|
||||
<!-- 结果统计:移动端不给页码 / 跳页,只给总量与已加载数 -->
|
||||
<view class="count">
|
||||
共 {{ total }} 张收货单<text v-if="total > list.length"> · 已加载 {{ list.length }}</text>
|
||||
</view>
|
||||
|
||||
<!-- 收货单卡片:单号 + 状态 / 商品数量 / 创建时间(+ 车牌号,有才显示) -->
|
||||
<view
|
||||
v-for="(item, index) in list"
|
||||
:key="item.id ?? item.receiving_number ?? index"
|
||||
class="order"
|
||||
>
|
||||
<view class="order__head">
|
||||
<text class="order__no">{{ item.receiving_number || '—' }}</text>
|
||||
<text class="order__status" :style="{ color: statusColorOf(item) }">
|
||||
{{ statusTextOf(item) }}
|
||||
</text>
|
||||
</view>
|
||||
|
||||
<view class="order__row">
|
||||
<text class="order__label">商品</text>
|
||||
<text class="order__value">{{ quantityTextOf(item) }}</text>
|
||||
</view>
|
||||
|
||||
<view v-if="item.license_plate" class="order__row">
|
||||
<text class="order__label">车牌号</text>
|
||||
<text class="order__value">{{ item.license_plate }}</text>
|
||||
</view>
|
||||
|
||||
<view class="order__row">
|
||||
<text class="order__label">创建时间</text>
|
||||
<text class="order__value">{{ item.create_at_display || '—' }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
||||
<!-- 空态:无数据 / 加载失败(有筛选条件时文案不同) -->
|
||||
<empty-state v-else v-bind="emptyStateProps" @retry="loadPage(1)"></empty-state>
|
||||
</template>
|
||||
</auth-gate>
|
||||
|
||||
<!--
|
||||
分页器(固定底部,替代 Web 表格下方的 el-pagination)
|
||||
每页 50 条**固定不可改**(去掉 Web 的每页条数选择器);
|
||||
总数 + 当前页码 + 首/上/下/尾四个**小按钮排成一行**(刻意做小,不占两行高度)
|
||||
-->
|
||||
<view v-if="list.length" class="pager">
|
||||
<view class="pager__info">
|
||||
共 {{ total }} 条<text class="pager__sep">·</text>{{ loading ? '加载中…' : `第 ${pageNo}/${pageCount} 页` }}
|
||||
</view>
|
||||
<view class="pager__actions">
|
||||
<view
|
||||
v-for="btn in pagerButtons"
|
||||
:key="btn.label"
|
||||
class="pager__btn"
|
||||
:class="{ 'pager__btn--disabled': btn.disabled }"
|
||||
@click="goPage(btn.target)"
|
||||
>
|
||||
{{ btn.label }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 选择器(货主 / 收货状态):底部弹层,选项多时组件自带名称搜索 -->
|
||||
<option-picker
|
||||
:show="pickerVisible"
|
||||
:title="pickerTitle"
|
||||
:options="pickerOptions"
|
||||
:value="pickerValue"
|
||||
:loading="pickerLoading"
|
||||
@select="chooseOption"
|
||||
@close="closePicker"
|
||||
></option-picker>
|
||||
|
||||
<!-- 登录抽屉:点「去登录」或碰需要登录的接口时就地弹出(不跳页) -->
|
||||
<auth-modal></auth-modal>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
/**
|
||||
* 收货单(列表)
|
||||
*
|
||||
* 接口与 new3 Web 端 `views/storage/receiving_owner/index.vue` **同源**
|
||||
* (`storage.receiving.getStoreReceivingList`,见 `api/storage/receiving.ts`)。
|
||||
*
|
||||
* 分页:与 Web 的 `el-pagination` 对齐,但做了移动端取舍——
|
||||
* **每页固定 50 条不可改**(去掉每页条数选择器),保留 总条数 / 当前页码 /
|
||||
* 「首页·上一页·下一页·尾页」四个按钮,并把分页器**固定在屏幕底部**
|
||||
*(否则 50 条一页要滑到底才能翻页)。
|
||||
* 与「外仓商品」页不同:那页是无页码的流式加载(上拉追加),本页是**整页替换**。
|
||||
*
|
||||
* ⚠️ 三条必须保持一致,改任意一处都要同步另两处(`npm run check:pages` 会校验):
|
||||
* 1. 本文件的物理路径 `pagesA/external-inventory/receiving`
|
||||
* 2. `src/pages.json` 里 `subPackages[pagesA]` 的注册
|
||||
* 3. `src/router/pages.ts` 的 `PAGE_REGISTRY`(key = 后端 `wms_permission.path` = `/external-inventory/receiving`)
|
||||
*/
|
||||
import { computed, reactive, ref, watch } from 'vue'
|
||||
import { onLoad, onPullDownRefresh } from '@dcloudio/uni-app'
|
||||
import { usePageAuth } from '@/composables/usePageAuth'
|
||||
import AuthModal from '@/components/auth-modal/auth-modal.vue'
|
||||
import OptionPicker from '@/components/option-picker/option-picker.vue'
|
||||
import { fetchStoreOptions } from '@/api/index/index'
|
||||
import type { SelectOption } from '@/api/index/index'
|
||||
import {
|
||||
RECEIVING_PAGE_SIZE,
|
||||
RECEIVING_STATUS_OPTIONS,
|
||||
fetchStoreReceivingList,
|
||||
readQuantityText,
|
||||
readStatusColor,
|
||||
readStatusText,
|
||||
readTotal
|
||||
} from '@/api/storage/receiving'
|
||||
import type { ReceivingItem } from '@/api/storage/receiving'
|
||||
|
||||
/** 本页是 required:未登录时只做页内提示,不自动跳登录 */
|
||||
const { isLogin } = usePageAuth('required')
|
||||
|
||||
/** 筛选条件(收货单号回车 / 点搜索才生效,避免每输入一个字就请求) */
|
||||
const form = reactive({
|
||||
keyword: '',
|
||||
store_id: '' as string | number,
|
||||
status: ''
|
||||
})
|
||||
|
||||
const list = ref<ReceivingItem[]>([])
|
||||
/** 后端总数(「共 N 条」与总页数都靠它) */
|
||||
const total = ref(0)
|
||||
/** 当前页码(1-based) */
|
||||
const pageNo = ref(1)
|
||||
const loading = ref(false)
|
||||
|
||||
const isFilled = (value: unknown): boolean =>
|
||||
value !== undefined && value !== null && value !== ''
|
||||
|
||||
const hasFilter = computed(
|
||||
() => !!form.keyword.trim() || isFilled(form.store_id) || !!form.status
|
||||
)
|
||||
|
||||
const statusTextOf = (item: ReceivingItem): string => readStatusText(item?.status)
|
||||
const statusColorOf = (item: ReceivingItem): string => readStatusColor(item?.status)
|
||||
const quantityTextOf = (item: ReceivingItem): string => readQuantityText(item)
|
||||
|
||||
/** 总页数(按固定每页条数算;总数 0 时也算 1 页,避免出现「第 1/0 页」) */
|
||||
const pageCount = computed(() => Math.max(1, Math.ceil(total.value / RECEIVING_PAGE_SIZE)))
|
||||
const canPrev = computed(() => pageNo.value > 1)
|
||||
const canNext = computed(() => pageNo.value < pageCount.value)
|
||||
|
||||
/** 分页器按钮:首页 / 上一页 / 下一页 / 尾页(不满足条件或加载中则置灰) */
|
||||
const pagerButtons = computed(() => {
|
||||
const busy = loading.value
|
||||
return [
|
||||
{ label: '首页', target: 1, disabled: busy || !canPrev.value },
|
||||
{ label: '上一页', target: pageNo.value - 1, disabled: busy || !canPrev.value },
|
||||
{ label: '下一页', target: pageNo.value + 1, disabled: busy || !canNext.value },
|
||||
{ label: '尾页', target: pageCount.value, disabled: busy || !canNext.value }
|
||||
]
|
||||
})
|
||||
|
||||
/** 翻页后回到顶部(否则新一页会从上一页的滚动位置继续,看着像没动) */
|
||||
const scrollToTop = (): void => {
|
||||
uni.pageScrollTo({ scrollTop: 0, duration: 0 })
|
||||
}
|
||||
|
||||
/**
|
||||
* 拉取指定页(**整页替换**,不做追加 —— 分页由底部页码控件驱动)
|
||||
* @param target 目标页码(1-based),越界自动夹到 `[1, pageCount]`
|
||||
*/
|
||||
const loadPage = async (target = pageNo.value): Promise<void> => {
|
||||
if (!isLogin.value) return
|
||||
if (loading.value) return
|
||||
|
||||
// 未知总数时(首屏)先不夹上界,拿到 total 后页码自会收敛
|
||||
const max = total.value > 0 ? pageCount.value : Number.MAX_SAFE_INTEGER
|
||||
const page = Math.min(Math.max(1, Math.floor(target) || 1), max)
|
||||
|
||||
loading.value = true
|
||||
try {
|
||||
const res = await fetchStoreReceivingList({
|
||||
page,
|
||||
pageSize: RECEIVING_PAGE_SIZE,
|
||||
keyword: form.keyword,
|
||||
store_id: form.store_id,
|
||||
status: form.status
|
||||
})
|
||||
const payload = res?.data
|
||||
|
||||
list.value = payload?.list || []
|
||||
total.value = readTotal(payload)
|
||||
pageNo.value = page
|
||||
} catch {
|
||||
// 失败提示由 request 层统一 toast;这里保留原页与旧数据(不把用户用到空白页)
|
||||
} finally {
|
||||
loading.value = false
|
||||
uni.stopPullDownRefresh()
|
||||
}
|
||||
}
|
||||
|
||||
/** 切页(页容器按钮用):夹取范围、已在目标页则不动作 */
|
||||
const goPage = (target: number): void => {
|
||||
if (loading.value) return
|
||||
const next = Math.min(Math.max(1, Math.floor(target) || 1), pageCount.value)
|
||||
if (next === pageNo.value) return
|
||||
|
||||
loadPage(next).then(scrollToTop)
|
||||
}
|
||||
|
||||
/** 筛选变了必须重拉第 1 页(不能因为「还在第 1 页」就跳过) */
|
||||
const reloadFirstPage = (): void => {
|
||||
loadPage(1).then(scrollToTop)
|
||||
}
|
||||
|
||||
const onSearch = (): void => {
|
||||
reloadFirstPage()
|
||||
}
|
||||
|
||||
const onReset = (): void => {
|
||||
form.keyword = ''
|
||||
form.store_id = ''
|
||||
form.status = ''
|
||||
storeLabel.value = '全部货主'
|
||||
statusLabel.value = '全部状态'
|
||||
reloadFirstPage()
|
||||
}
|
||||
|
||||
/** 下拉刷新:重拉当前页;若当前页已越界(总数变少)则回到第 1 页 */
|
||||
const refresh = async (): Promise<void> => {
|
||||
await loadPage(pageNo.value)
|
||||
if (!list.value.length && pageNo.value > 1) await loadPage(1)
|
||||
}
|
||||
|
||||
// ── 货主 / 收货状态选择器(底部弹层,一个组件复用于两个维度)──
|
||||
type PickerKind = 'store' | 'status'
|
||||
|
||||
const pickerVisible = ref(false)
|
||||
const pickerKind = ref<PickerKind>('store')
|
||||
const pickerLoading = ref(false)
|
||||
const storeOptions = ref<SelectOption[]>([])
|
||||
|
||||
/** 胶囊上显示的名称(选中后显示具体名称,未选显示「全部…」) */
|
||||
const storeLabel = ref('全部货主')
|
||||
const statusLabel = ref('全部状态')
|
||||
|
||||
const pickerTitle = computed(() => (pickerKind.value === 'store' ? '选择货主' : '选择收货状态'))
|
||||
const pickerValue = computed(() =>
|
||||
pickerKind.value === 'store' ? form.store_id : form.status
|
||||
)
|
||||
/** 弹层选项:页面负责拼「全部…」,「选项多时的名称搜索」在 option-picker 内部处理 */
|
||||
const pickerOptions = computed<SelectOption[]>(() =>
|
||||
pickerKind.value === 'store'
|
||||
? [{ value: '', label: '全部货主' }, ...storeOptions.value]
|
||||
: RECEIVING_STATUS_OPTIONS
|
||||
)
|
||||
|
||||
/** 货主选项只有用到时才拉(拉过就缓存,不重复请求);状态是本地常量 */
|
||||
const ensureStoreOptions = async (): Promise<void> => {
|
||||
if (storeOptions.value.length) return
|
||||
pickerLoading.value = true
|
||||
try {
|
||||
storeOptions.value = await fetchStoreOptions()
|
||||
} catch {
|
||||
// 失败提示由 request 层统一 toast;这里保持空列表(弹层里只剩「全部」+ 提示)
|
||||
} finally {
|
||||
pickerLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const openPicker = (kind: PickerKind): void => {
|
||||
pickerKind.value = kind
|
||||
pickerVisible.value = true
|
||||
if (kind === 'store') ensureStoreOptions()
|
||||
}
|
||||
|
||||
const closePicker = (): void => {
|
||||
pickerVisible.value = false
|
||||
}
|
||||
|
||||
const chooseOption = (option: SelectOption): void => {
|
||||
if (pickerKind.value === 'store') {
|
||||
form.store_id = option.value
|
||||
storeLabel.value = option.label
|
||||
} else {
|
||||
form.status = String(option.value)
|
||||
statusLabel.value = option.label
|
||||
}
|
||||
closePicker()
|
||||
reloadFirstPage()
|
||||
}
|
||||
|
||||
/** 空态文案:有筛选条件时不能用「服务器出差了」这种口气 */
|
||||
const emptyStateProps = computed(() =>
|
||||
hasFilter.value ? { text: '没有符合条件的收货单,试试换个单号或筛选条件' } : {}
|
||||
)
|
||||
|
||||
// ── 生命周期 ──
|
||||
onLoad(() => {
|
||||
loadPage(1)
|
||||
})
|
||||
|
||||
// 未登录进来是空态(页内有登录引导);登录成功后自动拉一次
|
||||
watch(isLogin, (value) => {
|
||||
if (value && !list.value.length) loadPage(1)
|
||||
})
|
||||
|
||||
// 下拉刷新:重拉当前页
|
||||
onPullDownRefresh(() => {
|
||||
refresh()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.page {
|
||||
min-height: 100vh;
|
||||
background-color: #f5f6fa;
|
||||
/* 给固定底部的分页器留位置(分页器现在只有一行,约 72rpx),否则最后一张卡会被盖住 */
|
||||
padding-bottom: 140rpx;
|
||||
}
|
||||
|
||||
/* 筛选区:吸顶。部分低版本基础库不支持 sticky 就退化为普通块,不影响使用 */
|
||||
.filter {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 10;
|
||||
padding: 16rpx 24rpx 12rpx;
|
||||
background-color: #ffffff;
|
||||
border-bottom: 1rpx solid #ebeef5;
|
||||
|
||||
&__row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
&--chips {
|
||||
margin-top: 12rpx;
|
||||
}
|
||||
}
|
||||
|
||||
&__input {
|
||||
flex: 1;
|
||||
/* flex 子项里的输入框必须允许收缩,否则长占位符会把搜索按钮挤出去 */
|
||||
min-width: 0;
|
||||
margin-right: 16rpx;
|
||||
padding: 0 20rpx;
|
||||
background-color: #f5f6fa;
|
||||
border-radius: 999rpx;
|
||||
}
|
||||
|
||||
&__reset {
|
||||
padding: 8rpx 8rpx 8rpx 16rpx;
|
||||
font-size: 24rpx;
|
||||
color: #2979ff;
|
||||
}
|
||||
}
|
||||
|
||||
.chip {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
max-width: 320rpx;
|
||||
margin-right: 16rpx;
|
||||
padding: 10rpx 20rpx;
|
||||
background-color: #f5f6fa;
|
||||
border-radius: 999rpx;
|
||||
|
||||
&--active {
|
||||
background-color: rgba(41, 121, 255, 0.1);
|
||||
}
|
||||
|
||||
&__text {
|
||||
margin-right: 6rpx;
|
||||
font-size: 24rpx;
|
||||
color: #606266;
|
||||
/* 货主名可能很长:截断而不是把筛选行撑破 */
|
||||
max-width: 240rpx;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.loading {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 96rpx 0;
|
||||
}
|
||||
|
||||
.count {
|
||||
padding: 20rpx 32rpx 0;
|
||||
font-size: 24rpx;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
/* 收货单卡片 */
|
||||
.order {
|
||||
margin: 20rpx 24rpx 0;
|
||||
padding: 24rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 16rpx;
|
||||
|
||||
&__head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding-bottom: 16rpx;
|
||||
border-bottom: 1rpx solid #f2f3f5;
|
||||
}
|
||||
|
||||
&__no {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-right: 16rpx;
|
||||
font-size: 30rpx;
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
&__status {
|
||||
flex-shrink: 0;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
&__row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-top: 14rpx;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
&__label {
|
||||
flex-shrink: 0;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
&__value {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-left: 16rpx;
|
||||
text-align: right;
|
||||
color: #606266;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
/* 分页器:固定底部,**一行**放下(每页 50 条固定,不可改) */
|
||||
.pager {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: 20;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 12rpx 20rpx;
|
||||
/* iPhone 底部安全区:不支持 env() 时保留上一行的 12rpx */
|
||||
padding-bottom: calc(12rpx + env(safe-area-inset-bottom));
|
||||
background-color: #ffffff;
|
||||
border-top: 1rpx solid #ebeef5;
|
||||
|
||||
/* 总数 / 页码:可收缩,极端情况下省略号,保证四个按钮永远完整可见 */
|
||||
&__info {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-right: 12rpx;
|
||||
font-size: 22rpx;
|
||||
color: #909399;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
&__sep {
|
||||
margin: 0 6rpx;
|
||||
}
|
||||
|
||||
&__actions {
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
&__btn {
|
||||
margin-left: 8rpx;
|
||||
padding: 8rpx 16rpx;
|
||||
font-size: 22rpx;
|
||||
line-height: 1.4;
|
||||
color: #2979ff;
|
||||
text-align: center;
|
||||
background-color: #f5f6fa;
|
||||
border-radius: 8rpx;
|
||||
|
||||
&:first-child {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
&--disabled {
|
||||
color: #c0c4cc;
|
||||
background-color: #fafafa;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -115,49 +115,16 @@
|
||||
</template>
|
||||
</auth-gate>
|
||||
|
||||
<!-- 选择器(货主 / 仓库):底部弹层,避免移动端多层级选择 -->
|
||||
<up-popup :show="pickerVisible" mode="bottom" :round="16" @close="closePicker">
|
||||
<view class="picker">
|
||||
<view class="picker__title">{{ pickerTitle }}</view>
|
||||
|
||||
<!-- 选项多时(如货主 100+)给个名称搜索,不然要在长列表里划很久 -->
|
||||
<view v-if="pickerSearchable" class="picker__search">
|
||||
<up-input
|
||||
v-model="pickerKeyword"
|
||||
color="#303133"
|
||||
placeholder-style="color: #c0c4cc"
|
||||
:placeholder="`搜索${pickerKind === 'store' ? '货主' : '仓库'}名称`"
|
||||
prefix-icon="search"
|
||||
border="none"
|
||||
clearable
|
||||
></up-input>
|
||||
</view>
|
||||
|
||||
<scroll-view class="picker__list" scroll-y>
|
||||
<view
|
||||
v-for="option in pickerOptions"
|
||||
:key="String(option.value)"
|
||||
class="picker__item"
|
||||
:class="{ 'picker__item--active': option.value === pickerValue }"
|
||||
@click="chooseOption(option)"
|
||||
>
|
||||
<text class="picker__item-text">{{ option.label }}</text>
|
||||
<up-icon
|
||||
v-if="option.value === pickerValue"
|
||||
name="checkmark"
|
||||
color="#2979ff"
|
||||
size="16"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view v-if="pickerLoading" class="picker__tip">加载中…</view>
|
||||
<view v-else-if="pickerOptions.length <= 1" class="picker__tip">
|
||||
{{ pickerKeyword ? '没有匹配的名称' : '暂无可选项' }}
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<view class="picker__cancel" @click="closePicker">取消</view>
|
||||
</view>
|
||||
</up-popup>
|
||||
<!-- 选择器(货主 / 仓库):底部弹层,选项多时组件自带名称搜索 -->
|
||||
<option-picker
|
||||
:show="pickerVisible"
|
||||
:title="pickerTitle"
|
||||
:options="pickerOptions"
|
||||
:value="pickerValue"
|
||||
:loading="pickerLoading"
|
||||
@select="chooseOption"
|
||||
@close="closePicker"
|
||||
></option-picker>
|
||||
|
||||
<!-- 登录抽屉:点「去登录」或碰需要登录的接口时就地弹出(不跳页) -->
|
||||
<auth-modal></auth-modal>
|
||||
@ -188,6 +155,7 @@ import { computed, reactive, ref, watch } from 'vue'
|
||||
import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
|
||||
import { usePageAuth } from '@/composables/usePageAuth'
|
||||
import AuthModal from '@/components/auth-modal/auth-modal.vue'
|
||||
import OptionPicker from '@/components/option-picker/option-picker.vue'
|
||||
import { fetchStoreOptions, fetchWarehouseOptions } from '@/api/index/index'
|
||||
import type { SelectOption } from '@/api/index/index'
|
||||
import {
|
||||
@ -309,8 +277,6 @@ type PickerKind = 'store' | 'warehouse'
|
||||
const pickerVisible = ref(false)
|
||||
const pickerKind = ref<PickerKind>('store')
|
||||
const pickerLoading = ref(false)
|
||||
/** 弹层内的名称搜索(选项多时才有意义,见 pickerSearchable) */
|
||||
const pickerKeyword = ref('')
|
||||
const storeOptions = ref<SelectOption[]>([])
|
||||
const warehouseOptions = ref<SelectOption[]>([])
|
||||
|
||||
@ -322,24 +288,11 @@ const pickerTitle = computed(() => (pickerKind.value === 'store' ? '选择货主
|
||||
const pickerValue = computed(() =>
|
||||
pickerKind.value === 'store' ? form.store_id : form.warehouse_id
|
||||
)
|
||||
/** 选项超过这个数量才出搜索框(选项少时搜索框是干扰) */
|
||||
const pickerSearchable = computed(
|
||||
() =>
|
||||
(pickerKind.value === 'store' ? storeOptions.value : warehouseOptions.value).length > 12
|
||||
)
|
||||
const pickerOptions = computed<SelectOption[]>(() => {
|
||||
const allOption: SelectOption = {
|
||||
value: '',
|
||||
label: pickerKind.value === 'store' ? '全部货主' : '全部仓库'
|
||||
}
|
||||
const source = pickerKind.value === 'store' ? storeOptions.value : warehouseOptions.value
|
||||
const keyword = pickerKeyword.value.trim().toLowerCase()
|
||||
// 「全部」不参与过滤,永远置顶
|
||||
const matched = keyword
|
||||
? source.filter((option) => option.label.toLowerCase().includes(keyword))
|
||||
: source
|
||||
return [allOption, ...matched]
|
||||
})
|
||||
/** 弹层选项:页面负责拼「全部…」,「选项多时的名称搜索」在 option-picker 内部处理 */
|
||||
const pickerOptions = computed<SelectOption[]>(() => [
|
||||
{ value: '', label: pickerKind.value === 'store' ? '全部货主' : '全部仓库' },
|
||||
...(pickerKind.value === 'store' ? storeOptions.value : warehouseOptions.value)
|
||||
])
|
||||
|
||||
/** 首次打开某个维度时才拉它的选项(拉过就缓存,不重复请求) */
|
||||
const ensureOptions = async (kind: PickerKind): Promise<void> => {
|
||||
@ -359,7 +312,6 @@ const ensureOptions = async (kind: PickerKind): Promise<void> => {
|
||||
|
||||
const openPicker = (kind: PickerKind): void => {
|
||||
pickerKind.value = kind
|
||||
pickerKeyword.value = ''
|
||||
pickerVisible.value = true
|
||||
ensureOptions(kind)
|
||||
}
|
||||
@ -554,62 +506,4 @@ onReachBottom(() => {
|
||||
}
|
||||
}
|
||||
|
||||
.picker {
|
||||
padding-top: 24rpx;
|
||||
|
||||
&__title {
|
||||
padding: 0 32rpx 16rpx;
|
||||
font-size: 30rpx;
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
&__list {
|
||||
/* scroll-view 需要高度上限,否则长列表会顶出屏幕 */
|
||||
max-height: 60vh;
|
||||
}
|
||||
|
||||
&__search {
|
||||
margin: 0 32rpx 12rpx;
|
||||
padding: 0 20rpx;
|
||||
background-color: #f5f6fa;
|
||||
border-radius: 999rpx;
|
||||
}
|
||||
|
||||
&__item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 26rpx 32rpx;
|
||||
font-size: 28rpx;
|
||||
color: #303133;
|
||||
|
||||
&--active {
|
||||
color: #2979ff;
|
||||
}
|
||||
}
|
||||
|
||||
&__item-text {
|
||||
flex: 1;
|
||||
margin-right: 16rpx;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
&__tip {
|
||||
padding: 32rpx;
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
&__cancel {
|
||||
padding: 24rpx;
|
||||
text-align: center;
|
||||
font-size: 28rpx;
|
||||
color: #606266;
|
||||
border-top: 1rpx solid #f2f3f5;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -70,6 +70,101 @@
|
||||
{{ item }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="card">
|
||||
<view class="card__title">身份 / token 诊断</view>
|
||||
<up-cell-group :border="false">
|
||||
<up-cell
|
||||
title="user.info 身份ID"
|
||||
:value="String(userStore.user.employees_id ?? '-')"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell
|
||||
title="user.info 身份名"
|
||||
:value="String(userStore.user.employees_name ?? '-')"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell
|
||||
title="user.info 组织"
|
||||
:value="String(userStore.user.store_name ?? '-')"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell
|
||||
title="user.info platform_code"
|
||||
:value="String(userStore.user.platform_code ?? '-')"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell
|
||||
title="本地选中身份ID"
|
||||
:value="String(userStore.currentEmployeeId || '-')"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell
|
||||
title="本地选中身份名"
|
||||
:value="userStore.currentEmployee?.store_name || '-'"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell
|
||||
title="token 内存/存储"
|
||||
:value="tokenSynced ? '一致' : '不一致 ⚠️'"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell title="内存 token" :value="fingerprint(userStore.token)" :border="false"></up-cell>
|
||||
<up-cell title="存储 token" :value="fingerprint(storedToken)" :border="false"></up-cell>
|
||||
<up-cell
|
||||
title="token.platform_code"
|
||||
:value="payloadText('platform_code')"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell
|
||||
title="token.current_role_id"
|
||||
:value="payloadText('current_role_id')"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell
|
||||
title="token.current_store_id"
|
||||
:value="payloadText('current_store_id')"
|
||||
:border="false"
|
||||
></up-cell>
|
||||
<up-cell title="token 过期时间" :value="expText" :border="false"></up-cell>
|
||||
</up-cell-group>
|
||||
|
||||
<view class="text text--warn">
|
||||
现象对照:① 「本地选中身份ID」≠「user.info 身份ID」→ 前端状态与服务端不同步;
|
||||
② 「token.current_role_id」还是旧身份 → 新 token 没落地,
|
||||
切换后重进小程序必然变回旧身份(后端按 (账号, platform_code) 记当前身份)。
|
||||
</view>
|
||||
<view class="actions">
|
||||
<up-button
|
||||
type="primary"
|
||||
shape="circle"
|
||||
size="small"
|
||||
text="重拉 user.info"
|
||||
@click="onReload"
|
||||
></up-button>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="logEnabled" class="card">
|
||||
<view class="card__title">身份操作流水(最新在前)</view>
|
||||
<view v-if="!identityLog.length" class="text">暂无记录</view>
|
||||
<view v-for="(item, index) in identityLog" :key="index" class="log">
|
||||
<view class="log__head">
|
||||
<text class="log__time">{{ item.at }}</text>
|
||||
<text class="log__event">{{ item.event }}</text>
|
||||
</view>
|
||||
<view v-if="item.detail" class="log__detail">{{ item.detail }}</view>
|
||||
</view>
|
||||
<view class="actions">
|
||||
<up-button
|
||||
type="primary"
|
||||
:plain="true"
|
||||
shape="circle"
|
||||
size="small"
|
||||
text="清空流水"
|
||||
@click="onClearLog"
|
||||
></up-button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
</auth-gate>
|
||||
</view>
|
||||
@ -79,21 +174,71 @@
|
||||
/**
|
||||
* 测试页 —— 验证「后端 miniprogram_pages → 首页常用功能入口」整条链路
|
||||
*
|
||||
* 对应 `wms_permission` id = 627(type='miniprogram_pages',path='/test/index')。
|
||||
* 对应 `wms_permission` id = 628(type='miniprogram_pages',path='/test/index')。
|
||||
* 已加入 `pages.json` 的 `condition`,微信开发者工具「编译模式」可直达。
|
||||
*
|
||||
* ⚠️ 这是链路验证页,验证完成后可删除
|
||||
* (删除时同步清理:pages.json 的 subPackages / condition、PAGE_REGISTRY、以及数据库 627 行)。
|
||||
* (删除时同步清理:pages.json 的 subPackages / condition、PAGE_REGISTRY、以及数据库 628 行)。
|
||||
*/
|
||||
import { computed } from 'vue'
|
||||
import { computed, ref } from 'vue'
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import AuthModal from '@/components/auth-modal/auth-modal.vue'
|
||||
import { usePermissionStore } from '@/store/modules/permission'
|
||||
import { getToken } from '@/utils/auth'
|
||||
import { formatTokenTime, parseTokenPayload, tokenFingerprint } from '@/utils/token'
|
||||
import { clearIdentityLog, IDENTITY_LOG_ENABLED, readIdentityLog } from '@/utils/identity-log'
|
||||
import type { IdentityLogEntry } from '@/utils/identity-log'
|
||||
import type { MenuNode } from '@/router/entries'
|
||||
|
||||
const userStore = useUserStore()
|
||||
const permissionStore = usePermissionStore()
|
||||
|
||||
/* ───────── 身份 / token 诊断(用真实数据定位「切换身份后重进又变回旧身份」)───────── */
|
||||
|
||||
/** 存储里的 token(与内存副本对比,可看出新 token 是否真的落了地) */
|
||||
const storedToken = ref(getToken())
|
||||
|
||||
const tokenSynced = computed(() => !!userStore.token && userStore.token === storedToken.value)
|
||||
const tokenPayload = computed(() => parseTokenPayload(userStore.token || storedToken.value))
|
||||
|
||||
/** token payload 里的某个字段(缺值显示 `-`) */
|
||||
const payloadText = (key: string): string => {
|
||||
const value = tokenPayload.value?.[key]
|
||||
return value === undefined || value === null ? '-' : String(value)
|
||||
}
|
||||
|
||||
const expText = computed(() => formatTokenTime(tokenPayload.value?.exp))
|
||||
const fingerprint = (token?: string): string => tokenFingerprint(token)
|
||||
|
||||
/** 重拉一次 user.info,对比服务端返回的身份 */
|
||||
const onReload = (): void => {
|
||||
storedToken.value = getToken()
|
||||
identityLog.value = readIdentityLog()
|
||||
userStore.getInfo(true).catch(() => {
|
||||
// 失败提示由 request 层统一 toast
|
||||
})
|
||||
}
|
||||
|
||||
/* ───────── 身份操作流水(切换过程取证用,见 utils/identity-log.ts)───────── */
|
||||
|
||||
/** 总开关关闭时,卡片不渲染、读取恒为空(埋点调用保留在 store / App.vue 里) */
|
||||
const logEnabled = IDENTITY_LOG_ENABLED
|
||||
|
||||
const identityLog = ref<IdentityLogEntry[]>(readIdentityLog())
|
||||
|
||||
const onClearLog = (): void => {
|
||||
clearIdentityLog()
|
||||
identityLog.value = []
|
||||
uni.$u.toast('流水已清空')
|
||||
}
|
||||
|
||||
// 每次进入本页重新读一次存储,避免看到上一轮的旧值
|
||||
onShow(() => {
|
||||
storedToken.value = getToken()
|
||||
identityLog.value = readIdentityLog()
|
||||
})
|
||||
|
||||
/** 把后端菜单树拍平成 path 列表(最多 30 条),便于直接核对 */
|
||||
const menuPaths = computed<string[]>(() => {
|
||||
const out: string[] = []
|
||||
@ -154,4 +299,40 @@ const menuPaths = computed<string[]>(() => {
|
||||
border-radius: 6rpx;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 「重拉 user.info」等卡片内按钮 */
|
||||
.actions {
|
||||
padding: 8rpx 32rpx 24rpx;
|
||||
}
|
||||
|
||||
/* 身份操作流水 */
|
||||
.log {
|
||||
padding: 12rpx 32rpx;
|
||||
border-bottom: 1rpx solid #f2f3f5;
|
||||
|
||||
&__head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
&__time {
|
||||
margin-right: 12rpx;
|
||||
font-size: 24rpx;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
&__event {
|
||||
font-size: 26rpx;
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
&__detail {
|
||||
margin-top: 4rpx;
|
||||
font-size: 22rpx;
|
||||
line-height: 1.6;
|
||||
color: #606266;
|
||||
word-break: break-all;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -148,6 +148,16 @@ export const PAGE_REGISTRY: PageMeta[] = [
|
||||
// 必须与上面的 key **逐字符相等**,否则入口会被忽略并进 permissionStore.missing
|
||||
// 不设 hidden → 登录后由后端菜单下发才出现,首页以「外仓商品」**分类段**展示
|
||||
// 未设 common → 不进本地「常用功能」(它属于后端菜单那一侧)
|
||||
},
|
||||
{
|
||||
key: '/external-inventory/receiving',
|
||||
path: 'pagesA/external-inventory/receiving',
|
||||
title: '收货单',
|
||||
// 图标只是**本地兜底**:后端下发 meta_icon 时以后端为准(id=633 目前是 bag)
|
||||
icon: 'order',
|
||||
auth: 'required'
|
||||
// 对应后端 id=633(父节点 632「外仓库存」分类)—— 同样必须与 key 逐字符相等
|
||||
// 不设 hidden → 登录后由后端菜单下发才出现;不设 common → 走「后端菜单」那一侧
|
||||
}
|
||||
|
||||
// ─────────────── 待启用(页面文件就绪后再登记)───────────────
|
||||
|
||||
@ -11,6 +11,8 @@
|
||||
|
||||
import { defineStore } from 'pinia'
|
||||
import { getLoginChannel, getToken, removeToken, setLoginChannel, setToken } from '@/utils/auth'
|
||||
import { appendIdentityLog } from '@/utils/identity-log'
|
||||
import { parseTokenPayload, tokenFingerprint } from '@/utils/token'
|
||||
import type { LoginChannel } from '@/utils/auth'
|
||||
import {
|
||||
login as apiLogin,
|
||||
@ -525,6 +527,7 @@ export const useUserStore = defineStore('user', {
|
||||
if (user.is_bound === false) {
|
||||
this.user = user
|
||||
this.infoLoaded = true
|
||||
appendIdentityLog('user.info(微信未绑定)', `id=${user.id ?? '-'}`)
|
||||
return user
|
||||
}
|
||||
|
||||
@ -536,6 +539,15 @@ export const useUserStore = defineStore('user', {
|
||||
// 菜单 → 可见入口树(首页九宫格的渲染输入)
|
||||
usePermissionStore().loadFromMenus(user.menus || [])
|
||||
this.infoLoaded = true
|
||||
|
||||
// 排障流水:身份切换问题的关键证据就是「user.info 返回的身份」
|
||||
appendIdentityLog(
|
||||
'user.info 响应',
|
||||
`employees_id=${user.employees_id ?? '-'}` +
|
||||
` store=${user.store_id ?? '-'}/${user.store_name ?? '-'}` +
|
||||
` platform=${user.platform_code ?? '-'}` +
|
||||
` 菜单=${user.menus?.length ?? 0} 权限=${user.permissions?.length ?? 0}`
|
||||
)
|
||||
return user
|
||||
},
|
||||
|
||||
@ -543,8 +555,10 @@ export const useUserStore = defineStore('user', {
|
||||
* 写入可用身份列表并锁定「当前身份」
|
||||
*
|
||||
* 优先级(避免展示的身份与后端会话不一致):
|
||||
* ① 本地已选身份仍在列表中 → 保留(刷新 user.info 不会被莫名切换)
|
||||
* ② 后端会话当前身份(`user.info` 的 `employees_id`)在列表中 → 以其为准
|
||||
* ① **冷启动**(本次会话还没成功拉过 user.info)→ **以服务端为准**:
|
||||
* 后端按 `(account_id, platform_code)` 记当前身份(`wms_account_platform_active`),
|
||||
* 冷启动若沿用本地旧值,就会出现「在别处切了身份,重进小程序还是旧身份」的假象
|
||||
* ② 会话内刷新(切身份 / 手动重拉)→ 保留本地已选身份,避免刷新把人莫名切走
|
||||
* ③ 都没有 → 按默认规则挑(主身份 → 授权未过期 → 第一个)
|
||||
*/
|
||||
setEmployees(list: EmployeeInfo[], serverEmployeeId = 0): void {
|
||||
@ -552,7 +566,7 @@ export const useUserStore = defineStore('user', {
|
||||
const has = (id: number): boolean =>
|
||||
!!id && this.employees.some((item) => item.id === id)
|
||||
|
||||
if (has(this.currentEmployeeId)) return
|
||||
if (this.infoLoaded && has(this.currentEmployeeId)) return
|
||||
if (has(serverEmployeeId)) {
|
||||
this.currentEmployeeId = serverEmployeeId
|
||||
return
|
||||
@ -567,6 +581,9 @@ export const useUserStore = defineStore('user', {
|
||||
setCurrentEmployee(employeeId: number): void {
|
||||
const exists = this.employees.some((item) => item.id === employeeId)
|
||||
if (employeeId && !exists) return
|
||||
if (employeeId !== this.currentEmployeeId) {
|
||||
appendIdentityLog('本地身份指针', `${this.currentEmployeeId} → ${employeeId}`)
|
||||
}
|
||||
this.currentEmployeeId = employeeId
|
||||
},
|
||||
|
||||
@ -577,9 +594,29 @@ export const useUserStore = defineStore('user', {
|
||||
* ① `user.changeRole({ roleId, device })`
|
||||
* ② 若回传 `token` → 写新 token(未回传则沿用旧 token)
|
||||
* ③ 重调 `user.info` 重建 `menus` / `permissions`
|
||||
* ④ **校验切换是否真的生效**(对比 `user.info` 的 `employees_id`)
|
||||
*
|
||||
* 注意:**只有切换接口本身失败才回滚选中身份**;
|
||||
* 后续 `getInfo` 失败不回滚 —— 此时后端身份已切,回滚反而会造成前后端不一致。
|
||||
*
|
||||
* ⚠️ **已知后端缺陷(2026-09-26 实测,证据见下)**
|
||||
* `user.changeRole` **写库正确、签发 token 却用旧身份**。实测「天豹云仓(34) → 测试货主1111(33)」:
|
||||
*
|
||||
* | 观察点 | 结果 |
|
||||
* |---|---|
|
||||
* | `wms_account_platform_active(miniProgram)` | 已写成 **33**(updated_at 与请求同秒)✅ |
|
||||
* | 响应 `token.current_store_id` | `1000000`(= 目标 33 的 store)✅ |
|
||||
* | 响应 `token.current_role_id` | **`34`**(旧身份)❌ |
|
||||
* | 响应 `data.user.employees_id` | **`34`**(旧身份)❌ |
|
||||
* | 紧随的 `user.info` | `employees_id=34`(因为身份取自 token)❌ |
|
||||
* | 重试一次 | **拿到完全一样的响应**(同样 34)❌ |
|
||||
*
|
||||
* 而且**登录时拿到的 token 就已经是 34**(同账号 `platform_active.miniProgram` 明明是 33)⇒
|
||||
* 后端 token 里 `current_role_id` 的取值来源与它写入的 `platform_active` **不是同一处**
|
||||
*(疑似仍读旧的 `wx` 平台行 / 主身份),需要后端确认。
|
||||
*
|
||||
* ⇒ 前端只能:如实报错(不假装成功)+ 记流水,**不做重试**(实测重试无意义,只是多两次请求)。
|
||||
* 后端修好后,这里无需再改。
|
||||
*/
|
||||
async changeRole(roleId: number): Promise<void> {
|
||||
if (!roleId) {
|
||||
@ -588,32 +625,78 @@ export const useUserStore = defineStore('user', {
|
||||
if (roleId === this.currentEmployeeId) return
|
||||
|
||||
const previousId = this.currentEmployeeId
|
||||
appendIdentityLog('changeRole 请求', `roleId=${roleId} 当前本地身份=${previousId}`)
|
||||
// 乐观更新:界面立即反映选择
|
||||
this.setCurrentEmployee(roleId)
|
||||
|
||||
let resp: Awaited<ReturnType<typeof apiChangeRole>>
|
||||
/**
|
||||
* 调切换接口并落 token / user(只做这一步,不重拉 user.info)
|
||||
*
|
||||
* ⚠️ **响应结构容错**:实测 changeRole 是 `{ data: { token, user } }`,
|
||||
* 但已有「扁平响应」先例(`wechat.getMyLoginCode` 的业务字段就在顶层),
|
||||
* 所以顶层也兜一次 —— 读漏 token 会让新凭证不落地。
|
||||
*/
|
||||
const submit = async (): Promise<void> => {
|
||||
const resp = await apiChangeRole({ roleId, device: DEVICE })
|
||||
const flat = resp as unknown as Record<string, any>
|
||||
const payload = (resp.data || {}) as Record<string, any>
|
||||
|
||||
const token = payload.token || flat.token || ''
|
||||
if (token) {
|
||||
setToken(token)
|
||||
this.token = token
|
||||
}
|
||||
|
||||
const user = payload.user || flat.user
|
||||
if (user) {
|
||||
this.user = user
|
||||
if (user.permissions) this.permissions = user.permissions
|
||||
}
|
||||
|
||||
// 排障流水:这里能直接看出「后端实际给的是哪个身份」
|
||||
const tokenPayload = parseTokenPayload(token)
|
||||
appendIdentityLog(
|
||||
'changeRole 响应',
|
||||
`msg=${String(flat.message ?? '-')}` +
|
||||
` user.employees_id=${user?.employees_id ?? '-'}` +
|
||||
` user.store=${user?.store_id ?? '-'}(${user?.store_name ?? '-'})` +
|
||||
` token.role=${tokenPayload?.current_role_id ?? '-'}` +
|
||||
` token.store=${tokenPayload?.current_store_id ?? '-'}` +
|
||||
` token=${tokenFingerprint(token)}`
|
||||
)
|
||||
}
|
||||
|
||||
// ① 接口本身失败 → 回滚选中身份(后端没切,必须回滚)
|
||||
try {
|
||||
resp = await apiChangeRole({ roleId, device: DEVICE })
|
||||
await submit()
|
||||
} catch (err) {
|
||||
this.setCurrentEmployee(previousId)
|
||||
throw err
|
||||
}
|
||||
|
||||
// 后端可能换发 token(new3 行为)
|
||||
const token = resp.data?.token || ''
|
||||
if (token) {
|
||||
setToken(token)
|
||||
this.token = token
|
||||
}
|
||||
|
||||
// 后端直接回传 user 时先落库;菜单/权限仍以下面重拉的 user.info 为准
|
||||
const user = resp.data?.user
|
||||
if (user) {
|
||||
this.user = user
|
||||
if (user.permissions) this.permissions = user.permissions
|
||||
}
|
||||
|
||||
// ② 重拉 user.info(失败不回滚:接口已成功,后端身份已切)
|
||||
await this.getInfo(true)
|
||||
|
||||
const appliedId = Number(this.user.employees_id || 0)
|
||||
if (appliedId === roleId) {
|
||||
appendIdentityLog('切换校验通过', `身份已切到 ${roleId}`)
|
||||
return
|
||||
}
|
||||
|
||||
// ③ 后端没按请求生效 → 以服务端为准 + 明确报错(不再静默)
|
||||
//
|
||||
// ⚠️ **不要在这里加「自动重试」**:2026-09-26 实测(流水 + 数据库对照),重试拿到的是
|
||||
// **一模一样**的响应(token 里仍是旧身份),纯属多打两次请求。
|
||||
// 根因在后端(写库正确、签 token 用旧身份),只能后端修。
|
||||
appendIdentityLog('切换失败', `请求 ${roleId},user.info 返回 ${appliedId || '-'}`)
|
||||
console.warn(
|
||||
`[user] 身份切换未生效:请求 roleId=${roleId},` +
|
||||
`user.info 返回 employees_id=${appliedId || '-'}` +
|
||||
`(platform_code=${String(this.user.platform_code ?? '-')})` +
|
||||
';后端写库已成功但 token 仍是旧身份'
|
||||
)
|
||||
this.setCurrentEmployee(appliedId)
|
||||
throw new Error('身份切换未生效(后端 token 未更新)')
|
||||
},
|
||||
|
||||
/** 退出登录:先通知后端,无论成功与否都要清掉本地登录态 */
|
||||
@ -629,6 +712,7 @@ export const useUserStore = defineStore('user', {
|
||||
|
||||
/** 清空本地登录态 */
|
||||
resetToken(): void {
|
||||
appendIdentityLog('清登录态', 'removeToken + resetToken')
|
||||
removeToken()
|
||||
this.token = ''
|
||||
this.user = {}
|
||||
|
||||
84
src/utils/identity-log.ts
Normal file
84
src/utils/identity-log.ts
Normal file
@ -0,0 +1,84 @@
|
||||
/**
|
||||
* 身份操作流水(**排障用,当前状态:关闭**)
|
||||
*
|
||||
* 为什么需要它:身份切换出问题时,只看一段响应无法判断「后端到底写了什么、什么时候写的、
|
||||
* 前端拿到的 token 是哪一版」。这里把每次「小程序启动 / changeRole 请求 / changeRole 响应 /
|
||||
* user.info 响应 / 身份校验」的关键字段追加成一条流水(带时间),
|
||||
* **一次截图就能看到完整过程**,不用手工复制一堆 JSON。
|
||||
*
|
||||
* ## 开 / 关
|
||||
* 把 `IDENTITY_LOG_ENABLED` 改成 `true` 即可启用:
|
||||
* - store / App.vue 里的 `appendIdentityLog(...)` 调用**一直都在**(关闭时只是空转),无需改它们
|
||||
* - 测试页会自动出现「身份操作流水」卡(同一个开关控制)
|
||||
*
|
||||
* 2026-09-26 首轮使用完毕(当时定位了后端 `user.changeRole` 写库正确但 token 用旧身份的缺陷,
|
||||
* 后端已修复)⇒ 先关闭,不启用;以后再排查身份 / 菜单 / 权限类问题时再打开。
|
||||
*
|
||||
* 两个刻意的设计:
|
||||
* 1. **单独存储**(`identity_log`),**不随 token 一起清**
|
||||
* ⇒ 「退出登录 → 重新登录」以及「重进小程序」之后,仍然能看到切换前后的全过程
|
||||
* 2. **只记关键字段**(身份 id / store / token 指纹),**绝不记完整 token**(凭证不进日志/截图)
|
||||
*
|
||||
* 清空入口:测试页「身份操作流水」卡的「清空流水」按钮,或开发者工具「清除数据缓存」。
|
||||
*/
|
||||
|
||||
/** 总开关:`false` = 不记录、不展示(埋点调用保留,空转) */
|
||||
export const IDENTITY_LOG_ENABLED = false
|
||||
|
||||
const KEY = 'identity_log'
|
||||
/** 最多保留多少条(超出丢最旧的) */
|
||||
const MAX = 60
|
||||
|
||||
export interface IdentityLogEntry {
|
||||
/** 记录时间(本地时区,`HH:mm:ss`) */
|
||||
at: string
|
||||
/** 事件名,如 `changeRole 响应` */
|
||||
event: string
|
||||
/** 关键字段 */
|
||||
detail: string
|
||||
}
|
||||
|
||||
function nowText(): string {
|
||||
const date = new Date()
|
||||
const pad = (n: number): string => (n < 10 ? `0${n}` : String(n))
|
||||
return `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
|
||||
}
|
||||
|
||||
/** 追加一条流水(关闭时空转;任何失败静默:排障工具不能影响主流程) */
|
||||
export function appendIdentityLog(event: string, detail = ''): void {
|
||||
if (!IDENTITY_LOG_ENABLED) return
|
||||
try {
|
||||
const list = readIdentityLogRaw()
|
||||
list.push({ at: nowText(), event, detail })
|
||||
while (list.length > MAX) list.shift()
|
||||
uni.setStorageSync(KEY, JSON.stringify(list))
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
function readIdentityLogRaw(): IdentityLogEntry[] {
|
||||
try {
|
||||
const raw = uni.getStorageSync(KEY)
|
||||
if (typeof raw !== 'string' || !raw) return []
|
||||
const parsed = JSON.parse(raw)
|
||||
return Array.isArray(parsed) ? (parsed as IdentityLogEntry[]) : []
|
||||
} catch {
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
/** 读取流水(**最新在前**,便于直接渲染);关闭时返回空数组 */
|
||||
export function readIdentityLog(): IdentityLogEntry[] {
|
||||
if (!IDENTITY_LOG_ENABLED) return []
|
||||
return readIdentityLogRaw().slice().reverse()
|
||||
}
|
||||
|
||||
/** 清空流水(含关闭状态下清掉之前遗留的记录) */
|
||||
export function clearIdentityLog(): void {
|
||||
try {
|
||||
uni.removeStorageSync(KEY)
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
80
src/utils/token.ts
Normal file
80
src/utils/token.ts
Normal file
@ -0,0 +1,80 @@
|
||||
/**
|
||||
* JWT(token)解析工具 —— **仅供排障 / 诊断使用**
|
||||
*
|
||||
* ⚠️ 只做 base64url 解码,**不校验签名**。用途是把 token 里的 `platform_code` /
|
||||
* `current_role_id` 打出来与服务端返回对账(例如排查「切换身份后重进小程序又变回旧身份」),
|
||||
* **不能**用于任何鉴权判断 —— 鉴权一律以后端为准。
|
||||
*
|
||||
* ⚠️ 不做完整 UTF-8 解码:本项目的 token payload 全是 ASCII(id / username /
|
||||
* platform_code / 时间戳)。若以后出现中文(如 real_name),解析会失败并返回 null
|
||||
* (调用方按「拿不到」处理即可)。
|
||||
*/
|
||||
|
||||
export interface TokenPayload {
|
||||
/** 账号 ID */
|
||||
id?: number
|
||||
username?: string
|
||||
/** 签发时的平台编码(后端按 (账号, platform_code) 记当前身份) */
|
||||
platform_code?: string
|
||||
/** 签发时的当前身份 ID(= 用户身份列表里的 employees[].id) */
|
||||
current_role_id?: number
|
||||
/** 签发时的当前组织 ID */
|
||||
current_store_id?: number
|
||||
/** 微信登录态才有 */
|
||||
oauth_id?: number
|
||||
iat?: number
|
||||
exp?: number
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
/** 解析 JWT 的 payload 段;格式不对 / 解不出 JSON 时返回 null */
|
||||
export function parseTokenPayload(token?: string): TokenPayload | null {
|
||||
const parts = (token || '').split('.')
|
||||
if (parts.length < 2) return null
|
||||
|
||||
const base64Table = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
|
||||
const normalized = parts[1].replace(/-/g, '+').replace(/_/g, '/')
|
||||
|
||||
try {
|
||||
let binary = ''
|
||||
let buffer = 0
|
||||
let bits = 0
|
||||
for (const char of normalized) {
|
||||
const index = base64Table.indexOf(char)
|
||||
if (index === -1) continue
|
||||
buffer = (buffer << 6) | index
|
||||
bits += 6
|
||||
if (bits >= 8) {
|
||||
bits -= 8
|
||||
binary += String.fromCharCode((buffer >> bits) & 0xff)
|
||||
}
|
||||
}
|
||||
return JSON.parse(binary) as TokenPayload
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* token 指纹:只取前 12 位
|
||||
*
|
||||
* 为什么不全量展示:完整 token 是凭证,不能进日志 / 截图 / bug 报告;
|
||||
* 前 12 位足够区分「内存里的 token」和「存储里的 token」是不是同一个。
|
||||
*/
|
||||
export function tokenFingerprint(token?: string): string {
|
||||
if (!token) return '(空)'
|
||||
return `${token.slice(0, 12)}…(共 ${token.length} 字符)`
|
||||
}
|
||||
|
||||
/** 秒级时间戳 → `YYYY-MM-DD HH:mm:ss`(本地时区);空值返回「-」 */
|
||||
export function formatTokenTime(seconds?: number): string {
|
||||
if (!seconds) return '-'
|
||||
const date = new Date(seconds * 1000)
|
||||
if (Number.isNaN(date.getTime())) return '-'
|
||||
|
||||
const pad = (n: number): string => (n < 10 ? `0${n}` : String(n))
|
||||
return (
|
||||
`${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ` +
|
||||
`${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
|
||||
)
|
||||
}
|
||||
@ -347,6 +347,58 @@ body = { warehouse_id?, pagination: { page, pageSize }, where: { keyword?, store
|
||||
- 校验:`npm run type-check` 通过;`check:pages` 9/9、0 告警;产物 `list.js/json/wxml/wxss` 已生成,
|
||||
引用完整性 110 个引用 / 0 缺失
|
||||
|
||||
### 3.5 收货单页面实现(2026-09-26)
|
||||
|
||||
后端新增小程序页面权限:**632** `/external-inventory`「外仓库存」(分类)、
|
||||
**633** `/external-inventory/receiving`「收货单」(632 的子)。
|
||||
|
||||
#### 接口(`src/api/storage/receiving.ts`)
|
||||
|
||||
```
|
||||
POST {base}/system?method=storage.receiving.getStoreReceivingList&v=1.0×tamp=...
|
||||
body = { pagination: { page, pageSize }, where: { <字段>: { operator, value } } }
|
||||
返回 data = { list: [...], pagination: { total } }
|
||||
```
|
||||
|
||||
- 实测:方法存在(不带 token → **401**)。
|
||||
- ⚠️ **`where` 的形状与「外仓商品」不同**:这里是 **`{ operator, value }`**
|
||||
(new3 ScanBox 契约,见其 `applyWarehouseToWhere()` / `normalizeToWhere()`),
|
||||
不是 `where.keyword = 'xxx'` 那种裸值 —— **两套別混**。
|
||||
- 收货单号模糊搜索用 `receiving_number: { operator: 'like', value }`(new3 字段配置声明支持
|
||||
like / contains / starts_with;若后端只支持其中一个,改 `buildBody()` 一行)。
|
||||
|
||||
#### 页面(`pagesA/external-inventory/receiving.vue`)
|
||||
|
||||
顶部吸顶筛选(收货单号 + 搜索 + 货主 / 收货状态胶囊 + 重置)+ 卡片列表 + 下拉刷新 + 空态。
|
||||
卡片展示 4 项:**收货单号 + 收货状态**(按状态着色:收货中/已完成/已作废)/ 商品(`N 种 · M 件`)/
|
||||
车牌号(有才显示)/ 创建时间。
|
||||
|
||||
**分页器(2026-09-26 调整,对齐 Web 的 `el-pagination` 功能)**:
|
||||
|
||||
- **每页固定 50 条,不可改**(`RECEIVING_PAGE_SIZE`;去掉 Web 的每页条数选择器)
|
||||
- 显示 **总条数 + 当前页码**(`共 128 条 · 第 2/3 页`;加载中显示「加载中…」)
|
||||
- 4 个按钮:**首页 / 上一页 / 下一页 / 尾页**,到边界或加载中自动置灰
|
||||
- 分页器 **固定在屏幕底部、一行放下**(`position: fixed` + `env(safe-area-inset-bottom)`)——
|
||||
50 条一页不必滑到底才能翻页;按钮刻意做小(`padding: 8rpx 16rpx` / `font-size: 22rpx`,
|
||||
与总数页码同行),`.page` 留 140rpx 底部空白避免盖住最后一张卡;
|
||||
总数/页码文字可收缩省略,保证四个按钮永远完整可见
|
||||
- 翻页与筛选后 `uni.pageScrollTo` 回顶部
|
||||
- **去掉了上拉加载**(`onReachBottom`):本页是**整页替换**,与「外仓商品」的流式追加不同
|
||||
- 下拉刷新 = 重拉当前页;若当前页已越界(总数变少)则自动回第 1 页
|
||||
|
||||
#### 顺带:选择器抽成公共组件
|
||||
|
||||
新增 `src/components/option-picker/option-picker.vue`(底部弹层选择器):
|
||||
|
||||
- 页面只负责拼 `options`(含「全部…」项)与处理 `@select`;组件负责列表、打勾、取消、空/加载提示
|
||||
- **选项超过 12 个自动出名称搜索框**(货主 124 个,纯滚动不可用),每次打开清空上次搜索词
|
||||
- 「全部…」(`value === ''`)永远置顶且不参与过滤
|
||||
- 「外仓商品」页已改用它(删掉页内 60 行弹层代码与样式),「收货单」页直接复用
|
||||
|
||||
**校验**:`type-check` 通过;`check:pages` → **10 条注册表 / 10 个已注册页面 / 0 告警**;
|
||||
产物 `pagesA/external-inventory/receiving.{js,json,wxml,wxss}` + `components/option-picker/*` 均已生成,
|
||||
引用完整性 117 个引用 / 0 缺失。
|
||||
|
||||
---
|
||||
|
||||
## 4. 下一步任务清单
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user