1
This commit is contained in:
parent
303ed24ec7
commit
13af833645
@ -9,7 +9,7 @@ VITE_APP_BASE_API = 'http://192.168.11.56:6060/'
|
||||
|
||||
# 请求头 platform:后端 /system 网关会校验,非白名单值直接返回 HTTP 400(响应体为空)
|
||||
# 实测白名单:web / app / wx / miniProgram(**大小写不敏感**,mp-weixin / h5 / mp / mobile 等被拒)
|
||||
VITE_APP_PLATFORM = 'miniProgram'
|
||||
VITE_APP_PLATFORM = 'miniprogram'
|
||||
|
||||
# 请求头 project:后端同样校验(实测白名单:all / wms)
|
||||
VITE_APP_PROJECT = 'all'
|
||||
|
||||
@ -7,12 +7,15 @@
|
||||
* body = {
|
||||
* warehouse_id?: number, // 顶层(new3 已验证可用)
|
||||
* pagination: { page, pageSize },
|
||||
* where: { keyword?, store_id? }, // 通用过滤条件
|
||||
* where: { keyword?, is_sn_mgmt?, is_batch_mgmt?, store_id? }, // 通用过滤(**裸值**)
|
||||
* sort?: { sortField, sortOrder } // 小程序端不用(见下)
|
||||
* }
|
||||
* 返回 data = { list: [...], pagination: { total }, summary?: {...} }
|
||||
* ```
|
||||
*
|
||||
* `is_sn_mgmt` / `is_batch_mgmt` 取值 `'Y'` / `'N'`(字段与 new3 的筛选配置一致,
|
||||
* 对应表 `wms_stock_warehouse` 上的 char 字段)。
|
||||
*
|
||||
* 小程序端只取 3 个字段展示(商品图片 / 商品名称 / 可用库存),并且**去掉**了排序、
|
||||
* 每页条数选择、页码跳转等不适合移动端的交互 —— 分页改为「上拉加载」,
|
||||
* 见 `pagesA/external-stock/list.vue`。
|
||||
@ -63,22 +66,46 @@ export interface ExternalStockQuery {
|
||||
pageSize?: number
|
||||
/** 关键词(商品名称 / 编码),空字符串表示不过滤 */
|
||||
keyword?: string
|
||||
/** 货主 id,空字符串表示全部 */
|
||||
store_id?: number | string
|
||||
/** 仓库 id,空字符串表示全部 */
|
||||
warehouse_id?: number | string
|
||||
/** SN 管理:`'Y'` / `'N'`,空字符串表示全部 */
|
||||
is_sn_mgmt?: string
|
||||
/** 批次管理:`'Y'` / `'N'`,空字符串表示全部 */
|
||||
is_batch_mgmt?: string
|
||||
/**
|
||||
* 货主 id
|
||||
*
|
||||
* ⚠️ 小程序端**目前不提供该筛选**(2026-09-28 按要求移除,new3 也没有这个筛选),
|
||||
* 能力保留在这里:以后要恢复货主筛选,页面传值即可(是否生效仍需后端确认)。
|
||||
*/
|
||||
store_id?: number | string
|
||||
}
|
||||
|
||||
function isFilled(value: unknown): boolean {
|
||||
return value !== undefined && value !== null && value !== ''
|
||||
}
|
||||
|
||||
/** 组装请求体(⚠️ 货主过滤位置要调整时改这里) */
|
||||
/**
|
||||
* 组装请求体
|
||||
*
|
||||
* ⚠️ 本接口的 `where` 是**裸值**(`where.keyword = 'x'`、`where.is_sn_mgmt = 'Y'`),
|
||||
* 不是 `storage.receiving.*` 那种 `{ operator, value }` —— 两者别混。
|
||||
*/
|
||||
function buildBody(query: ExternalStockQuery): Record<string, any> {
|
||||
const { page = 1, pageSize = EXTERNAL_STOCK_PAGE_SIZE, keyword, store_id, warehouse_id } = query
|
||||
const {
|
||||
page = 1,
|
||||
pageSize = EXTERNAL_STOCK_PAGE_SIZE,
|
||||
keyword,
|
||||
warehouse_id,
|
||||
is_sn_mgmt,
|
||||
is_batch_mgmt,
|
||||
store_id
|
||||
} = query
|
||||
|
||||
const where: Record<string, any> = {}
|
||||
if (keyword && String(keyword).trim()) where.keyword = String(keyword).trim()
|
||||
if (isFilled(is_sn_mgmt)) where.is_sn_mgmt = is_sn_mgmt
|
||||
if (isFilled(is_batch_mgmt)) where.is_batch_mgmt = is_batch_mgmt
|
||||
if (isFilled(store_id)) where.store_id = store_id
|
||||
|
||||
return {
|
||||
|
||||
@ -14,9 +14,13 @@
|
||||
* 和「外仓商品」那个 `where.keyword = 'xxx'` 的写法不一样,别混。
|
||||
* 顶层参数只有 `stock_query_where`(商品条码/编码搜索),小程序端暂不用。
|
||||
*
|
||||
* 小程序端只展示 4 个信息(单号 / 收货状态 / 种类+数量 / 创建时间),
|
||||
* 并且**去掉**排序、页码、每页条数等不适合移动端的交互 —— 分页改为「上拉加载」,
|
||||
* 见 `pagesA/external-inventory/receiving.vue`。
|
||||
* 小程序端展示的字段(单号 / 收货状态 / 入库状态 / 匹配状态 / 种类+数量 / 车牌号 /
|
||||
* 创建时间 / 备注),并且**去掉**排序、每页条数选择器这类不适合移动端的交互
|
||||
*(翻页用固定底部的 `components/page-pager`),见 `pagesA/external-inventory/receiving.vue`。
|
||||
*
|
||||
* 筛选维度(与 new3 `views/storage/receiving_owner/index.vue` 去掉 scan-box 后保留的一致):
|
||||
* 收货单号(like)/ 收货状态 / 入库状态 / 匹配状态 / 审核状态 / 仓库;
|
||||
* **不含货主(store_id)** —— new3 货主侧页面也已 `.filter(f => f.value !== 'store_id')` 移除。
|
||||
*/
|
||||
|
||||
import request from '@/utils/request'
|
||||
@ -51,6 +55,15 @@ export interface ReceivingItem {
|
||||
total_quantity?: number
|
||||
/** 总箱数 */
|
||||
total_boxes?: number
|
||||
/** 备注 */
|
||||
remark?: string
|
||||
/**
|
||||
* 审核状态:1 = 已审核 / 0 = 未审核
|
||||
*
|
||||
* ⚠️ new3 货主侧的列定义(`receivingStoreColumns`)里**没有**这一列,
|
||||
* 所以列表项可能不下发;本页只把它当**筛选条件**用,不展示。
|
||||
*/
|
||||
is_review?: number | string
|
||||
/** 创建时间(后端已格式化) */
|
||||
create_at_display?: string
|
||||
/** 车牌号 */
|
||||
@ -74,10 +87,21 @@ export interface ReceivingQuery {
|
||||
pageSize?: number
|
||||
/** 收货单号(模糊搜索),空字符串表示不过滤 */
|
||||
keyword?: string
|
||||
/** 货主 id,空字符串表示全部 */
|
||||
/**
|
||||
* 货主 id,空字符串表示全部
|
||||
*
|
||||
* 小程序端**目前不提供该筛选**(2026-09-28 按要求移除,与 new3 货主侧页面一致),
|
||||
* 能力保留在这里,需要时可从页面再接回去
|
||||
*/
|
||||
store_id?: number | string
|
||||
/** 收货状态,空字符串表示全部 */
|
||||
/** 收货状态 receiving / completed / cancelled,空字符串表示全部 */
|
||||
status?: string
|
||||
/** 匹配状态 all_matched / partial_matched / unmatched,空字符串表示全部 */
|
||||
detail_status?: string
|
||||
/** 入库状态 waiting / none / partial / all,空字符串表示全部 */
|
||||
storage_status?: string
|
||||
/** 审核状态:'1' = 已审核 / '0' = 未审核(请求前会转成数字),空字符串表示全部 */
|
||||
is_review?: number | string
|
||||
/** 仓库 id,空字符串表示全部 */
|
||||
warehouse_id?: number | string
|
||||
}
|
||||
@ -110,12 +134,95 @@ export function readStatusColor(status?: string): string {
|
||||
|
||||
/** 状态选项(筛选用,含「全部」) */
|
||||
export const RECEIVING_STATUS_OPTIONS: Array<{ value: string; label: string }> = [
|
||||
{ value: '', label: '全部状态' },
|
||||
{ value: '', label: '全部' },
|
||||
{ value: 'receiving', label: '收货中' },
|
||||
{ value: 'completed', label: '已完成' },
|
||||
{ value: 'cancelled', label: '已作废' }
|
||||
]
|
||||
|
||||
/** 匹配状态(`detail_status`)→ 文案 */
|
||||
export const RECEIVING_DETAIL_STATUS_TEXT: Record<string, string> = {
|
||||
all_matched: '全部匹配',
|
||||
partial_matched: '部分匹配',
|
||||
unmatched: '未匹配'
|
||||
}
|
||||
|
||||
/** 匹配状态 → 主题色 */
|
||||
export const RECEIVING_DETAIL_STATUS_COLOR: Record<string, string> = {
|
||||
all_matched: '#19be6b',
|
||||
partial_matched: '#ff9900',
|
||||
unmatched: '#909399'
|
||||
}
|
||||
|
||||
/** 入库状态(`storage_status`)→ 文案 */
|
||||
export const RECEIVING_STORAGE_STATUS_TEXT: Record<string, string> = {
|
||||
all: '全部入库',
|
||||
partial: '部分入库',
|
||||
waiting: '待入库',
|
||||
none: '未入库'
|
||||
}
|
||||
|
||||
/** 入库状态 → 主题色 */
|
||||
export const RECEIVING_STORAGE_STATUS_COLOR: Record<string, string> = {
|
||||
all: '#19be6b',
|
||||
partial: '#ff9900',
|
||||
waiting: '#2979ff',
|
||||
none: '#909399'
|
||||
}
|
||||
|
||||
/** 匹配状态选项(筛选用,含「全部」) */
|
||||
export const RECEIVING_DETAIL_OPTIONS: Array<{ value: string; label: string }> = [
|
||||
{ value: '', label: '全部' },
|
||||
{ value: 'all_matched', label: '全部匹配' },
|
||||
{ value: 'partial_matched', label: '部分匹配' },
|
||||
{ value: 'unmatched', label: '未匹配' }
|
||||
]
|
||||
|
||||
/**
|
||||
* 入库状态选项(筛选用,含「全部」)
|
||||
*
|
||||
* 选项文案照抄 new3 的筛选项(`all` 在筛选里写的是「已入库」、
|
||||
* 而列表展示用的是 `storageStatusConfig` 的「全部入库」)—— 两边不一致是 Web 端原样
|
||||
*/
|
||||
export const RECEIVING_STORAGE_OPTIONS: Array<{ value: string; label: string }> = [
|
||||
{ value: '', label: '全部' },
|
||||
{ value: 'waiting', label: '待入库' },
|
||||
{ value: 'none', label: '未入库' },
|
||||
{ value: 'partial', label: '部分入库' },
|
||||
{ value: 'all', label: '已入库' }
|
||||
]
|
||||
|
||||
/** 审核状态选项(筛选用,含「全部」);值是数字字符串,请求前转数字 */
|
||||
export const RECEIVING_REVIEW_OPTIONS: Array<{ value: string; label: string }> = [
|
||||
{ value: '', label: '全部' },
|
||||
{ value: '1', label: '已审核' },
|
||||
{ value: '0', label: '未审核' }
|
||||
]
|
||||
|
||||
/** 匹配状态文案:未知值原样显示(后端加了新状态也不会显示成空白) */
|
||||
export function readDetailStatusText(status?: string): string {
|
||||
if (!status) return '—'
|
||||
return RECEIVING_DETAIL_STATUS_TEXT[status] || status
|
||||
}
|
||||
|
||||
/** 匹配状态颜色 */
|
||||
export function readDetailStatusColor(status?: string): string {
|
||||
if (!status) return '#909399'
|
||||
return RECEIVING_DETAIL_STATUS_COLOR[status] || '#909399'
|
||||
}
|
||||
|
||||
/** 入库状态文案 */
|
||||
export function readStorageStatusText(status?: string): string {
|
||||
if (!status) return '—'
|
||||
return RECEIVING_STORAGE_STATUS_TEXT[status] || status
|
||||
}
|
||||
|
||||
/** 入库状态颜色 */
|
||||
export function readStorageStatusColor(status?: string): string {
|
||||
if (!status) return '#909399'
|
||||
return RECEIVING_STORAGE_STATUS_COLOR[status] || '#909399'
|
||||
}
|
||||
|
||||
function isFilled(value: unknown): boolean {
|
||||
return value !== undefined && value !== null && value !== ''
|
||||
}
|
||||
@ -124,9 +231,25 @@ function isFilled(value: unknown): boolean {
|
||||
const eq = (value: unknown) => ({ operator: 'eq', value })
|
||||
const like = (value: unknown) => ({ operator: 'like', value })
|
||||
|
||||
/** 纯数字字符串转数字(`is_review` 这类字段后端是数值,传字符串可能匹配不上) */
|
||||
const toNumeric = (value: unknown): unknown => {
|
||||
const text = String(value).trim()
|
||||
return /^-?\d+(\.\d+)?$/.test(text) ? Number(text) : value
|
||||
}
|
||||
|
||||
/** 组装请求体(条件字段/操作符要调整时改这里) */
|
||||
function buildBody(query: ReceivingQuery): Record<string, any> {
|
||||
const { page = 1, pageSize = RECEIVING_PAGE_SIZE, keyword, store_id, status, warehouse_id } = query
|
||||
const {
|
||||
page = 1,
|
||||
pageSize = RECEIVING_PAGE_SIZE,
|
||||
keyword,
|
||||
store_id,
|
||||
status,
|
||||
detail_status,
|
||||
storage_status,
|
||||
is_review,
|
||||
warehouse_id
|
||||
} = query
|
||||
|
||||
const where: Record<string, any> = {}
|
||||
// 收货单号模糊搜索:new3 的字段配置里 `receiving_number` 支持 like/contains/starts_with,
|
||||
@ -134,6 +257,9 @@ function buildBody(query: ReceivingQuery): Record<string, any> {
|
||||
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(detail_status)) where.detail_status = eq(detail_status)
|
||||
if (isFilled(storage_status)) where.storage_status = eq(storage_status)
|
||||
if (isFilled(is_review)) where.is_review = eq(toNumeric(is_review))
|
||||
if (isFilled(warehouse_id)) where.warehouse_id = eq(warehouse_id)
|
||||
|
||||
return {
|
||||
|
||||
154
src/components/page-pager/page-pager.vue
Normal file
154
src/components/page-pager/page-pager.vue
Normal file
@ -0,0 +1,154 @@
|
||||
<template>
|
||||
<view class="pager">
|
||||
<view class="pager__info">
|
||||
共 {{ total }} {{ unit }}<text class="pager__sep">·</text>{{ loading ? '加载中…' : `第 ${page}/${pageCount} 页` }}
|
||||
</view>
|
||||
<view class="pager__actions">
|
||||
<view
|
||||
v-for="btn in buttons"
|
||||
:key="btn.label"
|
||||
class="pager__btn"
|
||||
:class="{ 'pager__btn--disabled': btn.disabled }"
|
||||
@click="onTap(btn)"
|
||||
>
|
||||
{{ btn.label }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
/**
|
||||
* 底部分页器(固定定位,一行放下)—— 列表页共用
|
||||
*
|
||||
* 替代 Web 端表格下方的 `el-pagination`,按移动端取舍:
|
||||
* - **不做每页条数选择器 / 跳页**(每页条数由调用方的接口常量固定)
|
||||
* - 只保留 总条数 + 当前页/总页数 + 「首页 / 上一页 / 下一页 / 尾页」四个**小按钮**
|
||||
* - 到边界或加载中自动置灰(不让用户点出无效请求)
|
||||
*
|
||||
* ⚠️ 组件是 `position: fixed; bottom: 0`,**父页面要给底部留白**(本页用到时给
|
||||
* `.page { padding-bottom: 140rpx }`),否则最后一张卡会被盖住。
|
||||
* `env(safe-area-inset-bottom)` 已在这里处理,父页面不用管。
|
||||
*
|
||||
* 用法:
|
||||
* ```vue
|
||||
* <page-pager
|
||||
* v-if="list.length"
|
||||
* :total="total"
|
||||
* :page="pageNo"
|
||||
* :page-size="EXTERNAL_STOCK_PAGE_SIZE"
|
||||
* :loading="loading"
|
||||
* unit="件商品"
|
||||
* @change="goPage"
|
||||
* />
|
||||
* ```
|
||||
*/
|
||||
|
||||
import { computed } from 'vue'
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
/** 后端总数 */
|
||||
total: number
|
||||
/** 当前页码(1-based) */
|
||||
page: number
|
||||
/** 每页条数(固定值,由调用方的接口常量决定) */
|
||||
pageSize: number
|
||||
/** 是否正在翻页(置灰 + 显示「加载中…」) */
|
||||
loading?: boolean
|
||||
/** 数量单位:条 / 件商品 / 张收货单 */
|
||||
unit?: string
|
||||
}>(),
|
||||
{
|
||||
loading: false,
|
||||
unit: '条'
|
||||
}
|
||||
)
|
||||
|
||||
const emit = defineEmits<{ (e: 'change', page: number): void }>()
|
||||
|
||||
/** 总页数(总数 0 时也算 1 页,避免出现「第 1/0 页」) */
|
||||
const pageCount = computed(() =>
|
||||
Math.max(1, Math.ceil(props.total / Math.max(1, props.pageSize)))
|
||||
)
|
||||
|
||||
const canPrev = computed(() => props.page > 1)
|
||||
const canNext = computed(() => props.page < pageCount.value)
|
||||
|
||||
/** 四个按钮(首页 / 上一页 / 下一页 / 尾页) */
|
||||
const buttons = computed(() => {
|
||||
const busy = props.loading
|
||||
return [
|
||||
{ label: '首页', target: 1, disabled: busy || !canPrev.value },
|
||||
{ label: '上一页', target: props.page - 1, disabled: busy || !canPrev.value },
|
||||
{ label: '下一页', target: props.page + 1, disabled: busy || !canNext.value },
|
||||
{ label: '尾页', target: pageCount.value, disabled: busy || !canNext.value }
|
||||
]
|
||||
})
|
||||
|
||||
const onTap = (btn: { label: string; target: number; disabled: boolean }): void => {
|
||||
if (btn.disabled) return
|
||||
emit('change', btn.target)
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
/* 固定底部,**一行**放下(按钮刻意做小,不占两行高度) */
|
||||
.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>
|
||||
@ -3,7 +3,7 @@
|
||||
<!-- required 未登录:页内「请先登录」+ 去登录,**不自动跳转** -->
|
||||
<auth-gate auth="required">
|
||||
<template #default>
|
||||
<!-- 筛选区(吸顶):收货单号 + 搜索;货主 / 收货状态用胶囊按钮唤起底部选择器 -->
|
||||
<!-- 筛选区(吸顶):收货单号 + 搜索;收货状态 / 入库状态 / 审核状态 / 仓库用胶囊按钮唤起底部选择器 -->
|
||||
<view class="filter">
|
||||
<view class="filter__row">
|
||||
<view class="filter__input">
|
||||
@ -29,30 +29,54 @@
|
||||
</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>
|
||||
<text class="chip__text">{{ labelOf('status') }}</text>
|
||||
<up-icon
|
||||
name="arrow-down"
|
||||
size="12"
|
||||
:color="form.status ? '#2979ff' : '#909399'"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view
|
||||
class="chip"
|
||||
:class="{ 'chip--active': !!form.storage_status }"
|
||||
@click="openPicker('storage')"
|
||||
>
|
||||
<text class="chip__text">{{ labelOf('storage') }}</text>
|
||||
<up-icon
|
||||
name="arrow-down"
|
||||
size="12"
|
||||
:color="form.storage_status ? '#2979ff' : '#909399'"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view
|
||||
class="chip"
|
||||
:class="{ 'chip--active': !!form.is_review }"
|
||||
@click="openPicker('review')"
|
||||
>
|
||||
<text class="chip__text">{{ labelOf('review') }}</text>
|
||||
<up-icon
|
||||
name="arrow-down"
|
||||
size="12"
|
||||
:color="form.is_review ? '#2979ff' : '#909399'"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view
|
||||
class="chip"
|
||||
:class="{ 'chip--active': isFilled(form.warehouse_id) }"
|
||||
@click="openPicker('warehouse')"
|
||||
>
|
||||
<text class="chip__text">{{ labelOf('warehouse') }}</text>
|
||||
<up-icon
|
||||
name="arrow-down"
|
||||
size="12"
|
||||
:color="isFilled(form.warehouse_id) ? '#2979ff' : '#909399'"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view v-if="hasFilter" class="filter__reset" @click="onReset">重置</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -63,12 +87,8 @@
|
||||
</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"
|
||||
@ -86,6 +106,20 @@
|
||||
<text class="order__value">{{ quantityTextOf(item) }}</text>
|
||||
</view>
|
||||
|
||||
<view class="order__row">
|
||||
<text class="order__label">入库状态</text>
|
||||
<text class="order__value" :style="{ color: storageStatusColorOf(item) }">
|
||||
{{ storageStatusTextOf(item) }}
|
||||
</text>
|
||||
</view>
|
||||
|
||||
<view class="order__row">
|
||||
<text class="order__label">匹配状态</text>
|
||||
<text class="order__value" :style="{ color: detailStatusColorOf(item) }">
|
||||
{{ detailStatusTextOf(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>
|
||||
@ -95,8 +129,12 @@
|
||||
<text class="order__label">创建时间</text>
|
||||
<text class="order__value">{{ item.create_at_display || '—' }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="item.remark" class="order__row">
|
||||
<text class="order__label">备注</text>
|
||||
<text class="order__value">{{ item.remark }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- 空态:无数据 / 加载失败(有筛选条件时文案不同) -->
|
||||
@ -104,29 +142,18 @@
|
||||
</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>
|
||||
<!-- 分页器(固定底部,公共组件;每页条数由 RECEIVING_PAGE_SIZE 固定,不可改) -->
|
||||
<page-pager
|
||||
v-if="list.length"
|
||||
:total="total"
|
||||
:page="pageNo"
|
||||
:page-size="RECEIVING_PAGE_SIZE"
|
||||
:loading="loading"
|
||||
unit="张收货单"
|
||||
@change="goPage"
|
||||
></page-pager>
|
||||
|
||||
<!-- 选择器(货主 / 收货状态):底部弹层,选项多时组件自带名称搜索 -->
|
||||
<!-- 选择器(收货状态 / 入库状态 / 审核状态 / 仓库):底部弹层,选项多时组件自带名称搜索 -->
|
||||
<option-picker
|
||||
:show="pickerVisible"
|
||||
:title="pickerTitle"
|
||||
@ -151,9 +178,9 @@
|
||||
*
|
||||
* 分页:与 Web 的 `el-pagination` 对齐,但做了移动端取舍——
|
||||
* **每页固定 50 条不可改**(去掉每页条数选择器),保留 总条数 / 当前页码 /
|
||||
* 「首页·上一页·下一页·尾页」四个按钮,并把分页器**固定在屏幕底部**
|
||||
*(否则 50 条一页要滑到底才能翻页)。
|
||||
* 与「外仓商品」页不同:那页是无页码的流式加载(上拉追加),本页是**整页替换**。
|
||||
* 「首页·上一页·下一页·尾页」四个按钮,分页器**固定在屏幕底部**
|
||||
*(否则滑到底才能翻页)—— 用公共组件 `components/page-pager`(「外仓商品」页同款,
|
||||
* 那边每页 20 条,因为带图片、单页重);两端都是**整页替换**,不做上拉追加。
|
||||
*
|
||||
* ⚠️ 三条必须保持一致,改任意一处都要同步另两处(`npm run check:pages` 会校验):
|
||||
* 1. 本文件的物理路径 `pagesA/external-inventory/receiving`
|
||||
@ -165,15 +192,22 @@ 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 PagePager from '@/components/page-pager/page-pager.vue'
|
||||
import { fetchWarehouseOptions } from '@/api/index/index'
|
||||
import type { SelectOption } from '@/api/index/index'
|
||||
import {
|
||||
RECEIVING_PAGE_SIZE,
|
||||
RECEIVING_REVIEW_OPTIONS,
|
||||
RECEIVING_STATUS_OPTIONS,
|
||||
RECEIVING_STORAGE_OPTIONS,
|
||||
fetchStoreReceivingList,
|
||||
readDetailStatusColor,
|
||||
readDetailStatusText,
|
||||
readQuantityText,
|
||||
readStatusColor,
|
||||
readStatusText,
|
||||
readStorageStatusColor,
|
||||
readStorageStatusText,
|
||||
readTotal
|
||||
} from '@/api/storage/receiving'
|
||||
import type { ReceivingItem } from '@/api/storage/receiving'
|
||||
@ -181,11 +215,13 @@ import type { ReceivingItem } from '@/api/storage/receiving'
|
||||
/** 本页是 required:未登录时只做页内提示,不自动跳登录 */
|
||||
const { isLogin } = usePageAuth('required')
|
||||
|
||||
/** 筛选条件(收货单号回车 / 点搜索才生效,避免每输入一个字就请求) */
|
||||
/** 筛选条件(收货单号回车 / 点搜索才生效,避免每输入一个字就请求;胶囊点选立即生效) */
|
||||
const form = reactive({
|
||||
keyword: '',
|
||||
store_id: '' as string | number,
|
||||
status: ''
|
||||
status: '',
|
||||
storage_status: '',
|
||||
is_review: '',
|
||||
warehouse_id: '' as string | number
|
||||
})
|
||||
|
||||
const list = ref<ReceivingItem[]>([])
|
||||
@ -199,28 +235,28 @@ const isFilled = (value: unknown): boolean =>
|
||||
value !== undefined && value !== null && value !== ''
|
||||
|
||||
const hasFilter = computed(
|
||||
() => !!form.keyword.trim() || isFilled(form.store_id) || !!form.status
|
||||
() =>
|
||||
!!form.keyword.trim() ||
|
||||
!!form.status ||
|
||||
!!form.storage_status ||
|
||||
!!form.is_review ||
|
||||
isFilled(form.warehouse_id)
|
||||
)
|
||||
|
||||
const statusTextOf = (item: ReceivingItem): string => readStatusText(item?.status)
|
||||
const statusColorOf = (item: ReceivingItem): string => readStatusColor(item?.status)
|
||||
const storageStatusTextOf = (item: ReceivingItem): string =>
|
||||
readStorageStatusText(item?.storage_status)
|
||||
const storageStatusColorOf = (item: ReceivingItem): string =>
|
||||
readStorageStatusColor(item?.storage_status)
|
||||
const detailStatusTextOf = (item: ReceivingItem): string =>
|
||||
readDetailStatusText(item?.detail_status)
|
||||
const detailStatusColorOf = (item: ReceivingItem): string =>
|
||||
readDetailStatusColor(item?.detail_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 => {
|
||||
@ -245,8 +281,10 @@ const loadPage = async (target = pageNo.value): Promise<void> => {
|
||||
page,
|
||||
pageSize: RECEIVING_PAGE_SIZE,
|
||||
keyword: form.keyword,
|
||||
store_id: form.store_id,
|
||||
status: form.status
|
||||
status: form.status,
|
||||
storage_status: form.storage_status,
|
||||
is_review: form.is_review,
|
||||
warehouse_id: form.warehouse_id
|
||||
})
|
||||
const payload = res?.data
|
||||
|
||||
@ -281,10 +319,10 @@ const onSearch = (): void => {
|
||||
|
||||
const onReset = (): void => {
|
||||
form.keyword = ''
|
||||
form.store_id = ''
|
||||
form.status = ''
|
||||
storeLabel.value = '全部货主'
|
||||
statusLabel.value = '全部状态'
|
||||
form.storage_status = ''
|
||||
form.is_review = ''
|
||||
form.warehouse_id = ''
|
||||
reloadFirstPage()
|
||||
}
|
||||
|
||||
@ -294,37 +332,85 @@ const refresh = async (): Promise<void> => {
|
||||
if (!list.value.length && pageNo.value > 1) await loadPage(1)
|
||||
}
|
||||
|
||||
// ── 货主 / 收货状态选择器(底部弹层,一个组件复用于两个维度)──
|
||||
type PickerKind = 'store' | 'status'
|
||||
// ── 收货状态 / 入库状态 / 审核状态 / 仓库 选择器(同一个底部弹层组件复用)──
|
||||
type PickerKind = 'status' | 'storage' | 'review' | 'warehouse'
|
||||
|
||||
const pickerVisible = ref(false)
|
||||
const pickerKind = ref<PickerKind>('store')
|
||||
const pickerKind = ref<PickerKind>('status')
|
||||
const pickerLoading = ref(false)
|
||||
const storeOptions = ref<SelectOption[]>([])
|
||||
const warehouseOptions = ref<SelectOption[]>([])
|
||||
|
||||
/** 胶囊上显示的名称(选中后显示具体名称,未选显示「全部…」) */
|
||||
const storeLabel = ref('全部货主')
|
||||
const statusLabel = ref('全部状态')
|
||||
const PICKER_TITLES: Record<PickerKind, string> = {
|
||||
status: '选择收货状态',
|
||||
storage: '选择入库状态',
|
||||
review: '选择审核状态',
|
||||
warehouse: '选择仓库'
|
||||
}
|
||||
|
||||
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 PICKER_NAMES: Record<PickerKind, string> = {
|
||||
status: '收货状态',
|
||||
storage: '入库状态',
|
||||
review: '审核状态',
|
||||
warehouse: '仓库'
|
||||
}
|
||||
|
||||
/** 维度 → 表单字段名(只在这里维护一次映射) */
|
||||
const FIELD_OF: Record<PickerKind, 'status' | 'storage_status' | 'is_review' | 'warehouse_id'> = {
|
||||
status: 'status',
|
||||
storage: 'storage_status',
|
||||
review: 'is_review',
|
||||
warehouse: 'warehouse_id'
|
||||
}
|
||||
|
||||
/** 本地常量选项(仓库选项来自接口,不在这里) */
|
||||
const LOCAL_OPTIONS: Record<Exclude<PickerKind, 'warehouse'>, SelectOption[]> = {
|
||||
status: RECEIVING_STATUS_OPTIONS,
|
||||
storage: RECEIVING_STORAGE_OPTIONS,
|
||||
review: RECEIVING_REVIEW_OPTIONS
|
||||
}
|
||||
|
||||
/** 某个维度当前选中的值 */
|
||||
const valueOf = (kind: PickerKind): string | number => form[FIELD_OF[kind]]
|
||||
|
||||
const pickerTitle = computed(() => PICKER_TITLES[pickerKind.value])
|
||||
const pickerValue = computed(() => valueOf(pickerKind.value))
|
||||
/** 弹层选项:仓库来自接口(含「全部仓库」),三个状态是本地常量;「名称搜索」在 option-picker 内部 */
|
||||
const pickerOptions = computed<SelectOption[]>(() => {
|
||||
if (pickerKind.value === 'warehouse') {
|
||||
return [{ value: '', label: '全部仓库' }, ...warehouseOptions.value]
|
||||
}
|
||||
return LOCAL_OPTIONS[pickerKind.value as Exclude<PickerKind, 'warehouse'>]
|
||||
})
|
||||
|
||||
/**
|
||||
* 胶囊文案:未选中 = 筛选项名,选中 = 选项文案(找不到就原样显示值)
|
||||
*
|
||||
* 文案由「当前值 + 选项表」算出来,不再额外维护一份 label 状态,
|
||||
* 重置时也就不会漏掉某个胶囊
|
||||
*/
|
||||
const labelOf = (kind: PickerKind): string => {
|
||||
const value = valueOf(kind)
|
||||
if (!isFilled(value)) return PICKER_NAMES[kind]
|
||||
|
||||
const options = kind === 'warehouse' ? warehouseOptions.value : LOCAL_OPTIONS[kind]
|
||||
return options.find((option) => String(option.value) === String(value))?.label || String(value)
|
||||
}
|
||||
|
||||
/** 仓库选项只有用到时才拉(拉过就缓存,不重复请求) */
|
||||
const ensureWarehouseOptions = async (): Promise<void> => {
|
||||
if (warehouseOptions.value.length) return
|
||||
|
||||
/** 货主选项只有用到时才拉(拉过就缓存,不重复请求);状态是本地常量 */
|
||||
const ensureStoreOptions = async (): Promise<void> => {
|
||||
if (storeOptions.value.length) return
|
||||
pickerLoading.value = true
|
||||
try {
|
||||
storeOptions.value = await fetchStoreOptions()
|
||||
warehouseOptions.value = await fetchWarehouseOptions()
|
||||
} catch {
|
||||
// 失败提示由 request 层统一 toast;这里保持空列表(弹层里只剩「全部」+ 提示)
|
||||
// 失败提示由 request 层统一 toast;这里保持空列表(弹层里只剩「全部仓库」)
|
||||
} finally {
|
||||
pickerLoading.value = false
|
||||
}
|
||||
@ -333,7 +419,7 @@ const ensureStoreOptions = async (): Promise<void> => {
|
||||
const openPicker = (kind: PickerKind): void => {
|
||||
pickerKind.value = kind
|
||||
pickerVisible.value = true
|
||||
if (kind === 'store') ensureStoreOptions()
|
||||
if (kind === 'warehouse') ensureWarehouseOptions()
|
||||
}
|
||||
|
||||
const closePicker = (): void => {
|
||||
@ -341,13 +427,8 @@ const closePicker = (): void => {
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
// 表单各字段类型不同(string / string | number),用索引赋值避免联合类型收窄报错
|
||||
;(form as Record<string, unknown>)[FIELD_OF[pickerKind.value]] = option.value
|
||||
closePicker()
|
||||
reloadFirstPage()
|
||||
}
|
||||
@ -395,7 +476,9 @@ onPullDownRefresh(() => {
|
||||
align-items: center;
|
||||
|
||||
&--chips {
|
||||
margin-top: 12rpx;
|
||||
margin-top: 8rpx;
|
||||
/* 筛选项变多了(收货状态 / 入库状态 / 审核状态 / 仓库 / 重置):允许换行,否则会被挤出屏幕 */
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
}
|
||||
|
||||
@ -420,7 +503,8 @@ onPullDownRefresh(() => {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
max-width: 320rpx;
|
||||
margin-right: 16rpx;
|
||||
/* 筛选项有四个 + 重置:允许换行,所以上下各留 4rpx 避免换行后贴在一起 */
|
||||
margin: 4rpx 16rpx 4rpx 0;
|
||||
padding: 10rpx 20rpx;
|
||||
background-color: #f5f6fa;
|
||||
border-radius: 999rpx;
|
||||
@ -433,7 +517,7 @@ onPullDownRefresh(() => {
|
||||
margin-right: 6rpx;
|
||||
font-size: 24rpx;
|
||||
color: #606266;
|
||||
/* 货主名可能很长:截断而不是把筛选行撑破 */
|
||||
/* 仓库名可能很长:截断而不是把筛选行撑破 */
|
||||
max-width: 240rpx;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
@ -448,12 +532,6 @@ onPullDownRefresh(() => {
|
||||
padding: 96rpx 0;
|
||||
}
|
||||
|
||||
.count {
|
||||
padding: 20rpx 32rpx 0;
|
||||
font-size: 24rpx;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
/* 收货单卡片 */
|
||||
.order {
|
||||
margin: 20rpx 24rpx 0;
|
||||
@ -511,62 +589,5 @@ onPullDownRefresh(() => {
|
||||
}
|
||||
}
|
||||
|
||||
/* 分页器:固定底部,**一行**放下(每页 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* 分页器样式在 components/page-pager(两个列表页共用,勿在此重复定义) */
|
||||
</style>
|
||||
|
||||
@ -29,18 +29,6 @@
|
||||
</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': isFilled(form.warehouse_id) }"
|
||||
@ -53,21 +41,40 @@
|
||||
:color="isFilled(form.warehouse_id) ? '#2979ff' : '#909399'"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view
|
||||
class="chip"
|
||||
:class="{ 'chip--active': !!form.is_sn_mgmt }"
|
||||
@click="openPicker('sn')"
|
||||
>
|
||||
<text class="chip__text">{{ snLabel }}</text>
|
||||
<up-icon
|
||||
name="arrow-down"
|
||||
size="12"
|
||||
:color="form.is_sn_mgmt ? '#2979ff' : '#909399'"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view
|
||||
class="chip"
|
||||
:class="{ 'chip--active': !!form.is_batch_mgmt }"
|
||||
@click="openPicker('batch')"
|
||||
>
|
||||
<text class="chip__text">{{ batchLabel }}</text>
|
||||
<up-icon
|
||||
name="arrow-down"
|
||||
size="12"
|
||||
:color="form.is_batch_mgmt ? '#2979ff' : '#909399'"
|
||||
></up-icon>
|
||||
</view>
|
||||
<view v-if="hasFilter" class="filter__reset" @click="onReset">重置</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 首屏加载 -->
|
||||
<view v-if="loading" class="loading">
|
||||
<!-- 首屏加载(翻页时保留旧列表,只把页码控件置为「加载中…」,避免整屏闪动) -->
|
||||
<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"
|
||||
@ -86,6 +93,7 @@
|
||||
|
||||
<view class="goods__main">
|
||||
<view class="goods__name">{{ item.item_name || '未命名商品' }}</view>
|
||||
<view class="goods__code">编码 {{ item.item_code || '—' }}</view>
|
||||
<view class="goods__qty">
|
||||
可用库存
|
||||
<text class="goods__qty-num">{{ qtyTextOf(item) }}</text>
|
||||
@ -93,28 +101,24 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!--
|
||||
移动端分页器(替掉 Web 的 页码 / 每页条数 / 跳页):
|
||||
上拉自动加载;点这一行也能加载或重试(解决部分容器 onReachBottom 不触发)
|
||||
-->
|
||||
<view class="more" @click="onTapMore">
|
||||
<up-loading-icon
|
||||
v-if="loadingMore"
|
||||
mode="circle"
|
||||
size="16"
|
||||
text="加载中"
|
||||
></up-loading-icon>
|
||||
<text v-else-if="failed" class="more__retry">加载失败,点击重试</text>
|
||||
<text v-else-if="noMore" class="more__end">没有更多了</text>
|
||||
<text v-else class="more__text">上拉加载更多</text>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- 空态:首次加载失败 / 无数据(有筛选条件时文案不同) -->
|
||||
<empty-state v-else v-bind="emptyStateProps" @retry="load(true)"></empty-state>
|
||||
<!-- 空态:无数据 / 加载失败(有筛选条件时文案不同) -->
|
||||
<empty-state v-else v-bind="emptyStateProps" @retry="loadPage(1)"></empty-state>
|
||||
</template>
|
||||
</auth-gate>
|
||||
|
||||
<!-- 分页器(固定底部,与「收货单」同一个组件) -->
|
||||
<page-pager
|
||||
v-if="list.length"
|
||||
:total="total"
|
||||
:page="pageNo"
|
||||
:page-size="EXTERNAL_STOCK_PAGE_SIZE"
|
||||
:loading="loading"
|
||||
unit="件商品"
|
||||
@change="goPage"
|
||||
></page-pager>
|
||||
|
||||
<!-- 选择器(货主 / 仓库):底部弹层,选项多时组件自带名称搜索 -->
|
||||
<option-picker
|
||||
:show="pickerVisible"
|
||||
@ -141,8 +145,8 @@
|
||||
*
|
||||
* | Web 端 | 小程序端(本页) |
|
||||
* |---|---|
|
||||
* | 工具栏 + 高级筛选字段树 | 顶部固定筛选区:关键词 + 搜索 + 货主 / 仓库 |
|
||||
* | 底部页码 / 每页条数 / 跳页 / 多列排序 | **上拉自动加载**,底部一行状态(加载中 / 没有更多 / 点击重试) |
|
||||
* | 工具栏 + 高级筛选字段树(字段很多) | 顶部固定筛选区:关键词 + 搜索 + 仓库 / SN管理 / 批次管理(只挑移动端常用的) |
|
||||
* | 底部页码 / 每页条数 / 跳页 / 多列排序 | **固定底部分页器**(与「收货单」同款组件):总数 + `第 X/Y 页` + 首页/上一页/下一页/尾页 |
|
||||
* | 表格多列(编码 / 品牌 / 单位 / 管理属性…) | 卡片,**只展示 商品图片 / 商品名称 / 可用库存** |
|
||||
* | 刷新按钮 | 下拉刷新(`enablePullDownRefresh`) |
|
||||
*
|
||||
@ -152,11 +156,12 @@
|
||||
* 3. `src/router/pages.ts` 的 `PAGE_REGISTRY`(key = 后端 `wms_permission.path`)
|
||||
*/
|
||||
import { computed, reactive, ref, watch } from 'vue'
|
||||
import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
|
||||
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, fetchWarehouseOptions } from '@/api/index/index'
|
||||
import PagePager from '@/components/page-pager/page-pager.vue'
|
||||
import { fetchWarehouseOptions } from '@/api/index/index'
|
||||
import type { SelectOption } from '@/api/index/index'
|
||||
import {
|
||||
EXTERNAL_STOCK_PAGE_SIZE,
|
||||
@ -173,25 +178,29 @@ const { isLogin } = usePageAuth('required')
|
||||
/** 筛选条件(关键词回车 / 点搜索才生效,避免每输入一个字就请求) */
|
||||
const form = reactive({
|
||||
keyword: '',
|
||||
store_id: '' as string | number,
|
||||
warehouse_id: '' as string | number
|
||||
warehouse_id: '' as string | number,
|
||||
/** SN 管理:'Y' / 'N','' = 全部 */
|
||||
is_sn_mgmt: '',
|
||||
/** 批次管理:'Y' / 'N','' = 全部 */
|
||||
is_batch_mgmt: ''
|
||||
})
|
||||
|
||||
const list = ref<ExternalStockItem[]>([])
|
||||
/** 后端总数(用于「共 N 件」与判断是否到底) */
|
||||
/** 后端总数(「共 N 件」与总页数都靠它) */
|
||||
const total = ref(0)
|
||||
/** 已加载到第几页(0 = 还没加载过) */
|
||||
const page = ref(0)
|
||||
/** 当前页码(1-based) */
|
||||
const pageNo = ref(1)
|
||||
const loading = ref(false)
|
||||
const loadingMore = ref(false)
|
||||
const noMore = ref(false)
|
||||
const failed = ref(false)
|
||||
|
||||
const isFilled = (value: unknown): boolean =>
|
||||
value !== undefined && value !== null && value !== ''
|
||||
|
||||
const hasFilter = computed(
|
||||
() => !!form.keyword.trim() || isFilled(form.store_id) || isFilled(form.warehouse_id)
|
||||
() =>
|
||||
!!form.keyword.trim() ||
|
||||
isFilled(form.warehouse_id) ||
|
||||
!!form.is_sn_mgmt ||
|
||||
!!form.is_batch_mgmt
|
||||
)
|
||||
|
||||
/** 可用库存文案:后端没给数据显示 `—`(**不能回退成 0**,会被误读成「没库存」) */
|
||||
@ -202,109 +211,138 @@ const qtyTextOf = (item: ExternalStockItem): string => {
|
||||
|
||||
const coverOf = (item: ExternalStockItem): string => readCover(item)
|
||||
|
||||
/** 总页数(按固定每页条数算;总数 0 时也算 1 页,避免出现「第 1/0 页」) */
|
||||
const pageCount = computed(() =>
|
||||
Math.max(1, Math.ceil(total.value / EXTERNAL_STOCK_PAGE_SIZE))
|
||||
)
|
||||
|
||||
/** 翻页后回到顶部(否则新一页会从上一页的滚动位置继续,看着像没动) */
|
||||
const scrollToTop = (): void => {
|
||||
uni.pageScrollTo({ scrollTop: 0, duration: 0 })
|
||||
}
|
||||
|
||||
/**
|
||||
* 拉取列表
|
||||
* @param reset true = 回到第 1 页(首次 / 搜索 / 筛选 / 下拉刷新);false = 加载下一页
|
||||
* 拉取指定页(**整页替换**,不做追加 —— 分页由底部页码控件驱动)
|
||||
* @param target 目标页码(1-based),越界自动夹到 `[1, pageCount]`
|
||||
*/
|
||||
const load = async (reset = false): Promise<void> => {
|
||||
const loadPage = async (target = pageNo.value): Promise<void> => {
|
||||
if (!isLogin.value) return
|
||||
if (loading.value || loadingMore.value) return
|
||||
if (!reset && noMore.value) return
|
||||
if (loading.value) return
|
||||
|
||||
// 失败时不推进 page,所以「重试」会重发同一页
|
||||
const target = reset ? 1 : page.value + 1
|
||||
|
||||
if (reset) loading.value = true
|
||||
else loadingMore.value = true
|
||||
failed.value = false
|
||||
// 未知总数时(首屏)先不夹上界,拿到 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 externalStockList({
|
||||
page: target,
|
||||
page,
|
||||
pageSize: EXTERNAL_STOCK_PAGE_SIZE,
|
||||
keyword: form.keyword,
|
||||
store_id: form.store_id,
|
||||
warehouse_id: form.warehouse_id
|
||||
warehouse_id: form.warehouse_id,
|
||||
is_sn_mgmt: form.is_sn_mgmt,
|
||||
is_batch_mgmt: form.is_batch_mgmt
|
||||
})
|
||||
const payload = res?.data
|
||||
const rows = payload?.list || []
|
||||
|
||||
list.value = reset ? rows : [...list.value, ...rows]
|
||||
list.value = payload?.list || []
|
||||
total.value = readTotal(payload)
|
||||
page.value = target
|
||||
|
||||
// 后端没给 total 时(readTotal = 0)用「本页不满一页」兜底判到底
|
||||
noMore.value =
|
||||
rows.length < EXTERNAL_STOCK_PAGE_SIZE ||
|
||||
(total.value > 0 && list.value.length >= total.value)
|
||||
pageNo.value = page
|
||||
} catch {
|
||||
// 失败提示由 request 层统一 toast;这里只管状态:首屏失败 → 空态可重试;加载更多 → 底部可重试
|
||||
if (reset) {
|
||||
list.value = []
|
||||
total.value = 0
|
||||
page.value = 0
|
||||
}
|
||||
failed.value = true
|
||||
// 失败提示由 request 层统一 toast;这里保留原页与旧数据(不把用户用到空白页)
|
||||
} finally {
|
||||
loading.value = false
|
||||
loadingMore.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 => {
|
||||
load(true)
|
||||
reloadFirstPage()
|
||||
}
|
||||
|
||||
const onReset = (): void => {
|
||||
form.keyword = ''
|
||||
form.store_id = ''
|
||||
form.warehouse_id = ''
|
||||
storeLabel.value = '全部货主'
|
||||
warehouseLabel.value = '全部仓库'
|
||||
load(true)
|
||||
form.is_sn_mgmt = ''
|
||||
form.is_batch_mgmt = ''
|
||||
warehouseLabel.value = '仓库'
|
||||
snLabel.value = 'SN管理'
|
||||
batchLabel.value = '批次管理'
|
||||
reloadFirstPage()
|
||||
}
|
||||
|
||||
/** 点底部状态行:加载更多 / 重试(到底了就什么都不做) */
|
||||
const onTapMore = (): void => {
|
||||
if (noMore.value) return
|
||||
load(false)
|
||||
/** 下拉刷新:重拉当前页;若当前页已越界(总数变少)则回到第 1 页 */
|
||||
const refresh = async (): Promise<void> => {
|
||||
await loadPage(pageNo.value)
|
||||
if (!list.value.length && pageNo.value > 1) await loadPage(1)
|
||||
}
|
||||
|
||||
// ── 货主 / 仓库选择器(底部弹层,一个组件复用于两个维度)──
|
||||
type PickerKind = 'store' | 'warehouse'
|
||||
// ── 仓库 / SN管理 / 批次管理 选择器(底部弹层,一个组件复用于多个维度)──
|
||||
type PickerKind = 'warehouse' | 'sn' | 'batch'
|
||||
|
||||
const pickerVisible = ref(false)
|
||||
const pickerKind = ref<PickerKind>('store')
|
||||
const pickerKind = ref<PickerKind>('warehouse')
|
||||
const pickerLoading = ref(false)
|
||||
const storeOptions = ref<SelectOption[]>([])
|
||||
const warehouseOptions = ref<SelectOption[]>([])
|
||||
|
||||
/** 胶囊上显示的名称(选中后显示具体名称,未选显示「全部…」) */
|
||||
const storeLabel = ref('全部货主')
|
||||
const warehouseLabel = ref('全部仓库')
|
||||
/** SN管理 / 批次管理:本地固定选项(取值 Y/N,与 new3 的筛选配置一致) */
|
||||
const YES_NO_OPTIONS: SelectOption[] = [
|
||||
{ value: '', label: '全部' },
|
||||
{ value: 'Y', label: '是' },
|
||||
{ value: 'N', label: '否' }
|
||||
]
|
||||
|
||||
const pickerTitle = computed(() => (pickerKind.value === 'store' ? '选择货主' : '选择仓库'))
|
||||
const pickerValue = computed(() =>
|
||||
pickerKind.value === 'store' ? form.store_id : form.warehouse_id
|
||||
const PICKER_TITLES: Record<PickerKind, string> = {
|
||||
warehouse: '选择仓库',
|
||||
sn: '选择 SN 管理',
|
||||
batch: '选择批次管理'
|
||||
}
|
||||
|
||||
/**
|
||||
* 胶囊上显示的名称
|
||||
*
|
||||
* 未选中时显示的是**筛选项名**(仓库 / SN管理 / 批次管理),
|
||||
* 选中后显示具体值(仓库名 / 是 / 否)
|
||||
*/
|
||||
const warehouseLabel = ref('仓库')
|
||||
const snLabel = ref('SN管理')
|
||||
const batchLabel = ref('批次管理')
|
||||
|
||||
const pickerTitle = computed(() => PICKER_TITLES[pickerKind.value])
|
||||
const pickerValue = computed(() => {
|
||||
if (pickerKind.value === 'warehouse') return form.warehouse_id
|
||||
return pickerKind.value === 'sn' ? form.is_sn_mgmt : form.is_batch_mgmt
|
||||
})
|
||||
/** 弹层选项:仓库来自接口(含「全部仓库」),SN/批次是本地常量 */
|
||||
const pickerOptions = computed<SelectOption[]>(() =>
|
||||
pickerKind.value === 'warehouse'
|
||||
? [{ value: '', label: '全部仓库' }, ...warehouseOptions.value]
|
||||
: YES_NO_OPTIONS
|
||||
)
|
||||
/** 弹层选项:页面负责拼「全部…」,「选项多时的名称搜索」在 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> => {
|
||||
const target = kind === 'store' ? storeOptions : warehouseOptions
|
||||
if (target.value.length) return
|
||||
/** 仓库选项只有用到时才拉(拉过就缓存,不重复请求) */
|
||||
const ensureWarehouseOptions = async (): Promise<void> => {
|
||||
if (warehouseOptions.value.length) return
|
||||
|
||||
pickerLoading.value = true
|
||||
try {
|
||||
const options = kind === 'store' ? await fetchStoreOptions() : await fetchWarehouseOptions()
|
||||
target.value = options
|
||||
warehouseOptions.value = await fetchWarehouseOptions()
|
||||
} catch {
|
||||
// 失败提示由 request 层统一 toast;这里保持空列表(弹层里只剩「全部」+ 提示)
|
||||
// 失败提示由 request 层统一 toast;这里保持空列表(弹层里只剩「全部仓库」)
|
||||
} finally {
|
||||
pickerLoading.value = false
|
||||
}
|
||||
@ -313,7 +351,7 @@ const ensureOptions = async (kind: PickerKind): Promise<void> => {
|
||||
const openPicker = (kind: PickerKind): void => {
|
||||
pickerKind.value = kind
|
||||
pickerVisible.value = true
|
||||
ensureOptions(kind)
|
||||
if (kind === 'warehouse') ensureWarehouseOptions()
|
||||
}
|
||||
|
||||
const closePicker = (): void => {
|
||||
@ -321,15 +359,19 @@ const closePicker = (): void => {
|
||||
}
|
||||
|
||||
const chooseOption = (option: SelectOption): void => {
|
||||
if (pickerKind.value === 'store') {
|
||||
form.store_id = option.value
|
||||
storeLabel.value = option.label
|
||||
} else {
|
||||
// 选中「全部」时,胶囊回到**筛选项名**(而不是「全部」这种字样)
|
||||
if (pickerKind.value === 'warehouse') {
|
||||
form.warehouse_id = option.value
|
||||
warehouseLabel.value = option.label
|
||||
warehouseLabel.value = isFilled(option.value) ? option.label : '仓库'
|
||||
} else if (pickerKind.value === 'sn') {
|
||||
form.is_sn_mgmt = String(option.value)
|
||||
snLabel.value = String(option.value) ? option.label : 'SN管理'
|
||||
} else {
|
||||
form.is_batch_mgmt = String(option.value)
|
||||
batchLabel.value = String(option.value) ? option.label : '批次管理'
|
||||
}
|
||||
closePicker()
|
||||
load(true)
|
||||
reloadFirstPage()
|
||||
}
|
||||
|
||||
/** 空态文案:有筛选条件时不能用「服务器出差了」这种口气 */
|
||||
@ -339,22 +381,17 @@ const emptyStateProps = computed(() =>
|
||||
|
||||
// ── 生命周期 ──
|
||||
onLoad(() => {
|
||||
load(true)
|
||||
loadPage(1)
|
||||
})
|
||||
|
||||
// 未登录进来是空态(页内有登录引导);登录成功后自动拉一次
|
||||
watch(isLogin, (value) => {
|
||||
if (value && !list.value.length) load(true)
|
||||
if (value && !list.value.length) loadPage(1)
|
||||
})
|
||||
|
||||
// 下拉刷新:替代 Web 端的「刷新」按钮
|
||||
// 下拉刷新:重拉当前页
|
||||
onPullDownRefresh(() => {
|
||||
load(true)
|
||||
})
|
||||
|
||||
// 上拉加载下一页:替代 Web 端底部的页码控件
|
||||
onReachBottom(() => {
|
||||
load(false)
|
||||
refresh()
|
||||
})
|
||||
</script>
|
||||
|
||||
@ -362,7 +399,8 @@ onReachBottom(() => {
|
||||
.page {
|
||||
min-height: 100vh;
|
||||
background-color: #f5f6fa;
|
||||
padding-bottom: 24rpx;
|
||||
/* 给固定底部的分页器留位置(分页器只有一行,约 72rpx),否则最后一张卡会被盖住 */
|
||||
padding-bottom: 140rpx;
|
||||
}
|
||||
|
||||
/* 筛选区:吸顶。部分低版本基础库不支持 sticky 就退化为普通块,不影响使用 */
|
||||
@ -379,7 +417,9 @@ onReachBottom(() => {
|
||||
align-items: center;
|
||||
|
||||
&--chips {
|
||||
margin-top: 12rpx;
|
||||
margin-top: 8rpx;
|
||||
/* 筛选项变多了(仓库 / SN管理 / 批次管理 / 重置):允许换行,否则会被挤出屏幕 */
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
}
|
||||
|
||||
@ -404,7 +444,8 @@ onReachBottom(() => {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
max-width: 320rpx;
|
||||
margin-right: 16rpx;
|
||||
/* 筛选项有三个 + 重置:允许换行,所以上下各留 4rpx 避免换行后贴在一起 */
|
||||
margin: 4rpx 16rpx 4rpx 0;
|
||||
padding: 10rpx 20rpx;
|
||||
background-color: #f5f6fa;
|
||||
border-radius: 999rpx;
|
||||
@ -432,12 +473,6 @@ onReachBottom(() => {
|
||||
padding: 96rpx 0;
|
||||
}
|
||||
|
||||
.count {
|
||||
padding: 20rpx 32rpx 0;
|
||||
font-size: 24rpx;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.goods {
|
||||
display: flex;
|
||||
margin: 20rpx 24rpx 0;
|
||||
@ -465,7 +500,6 @@ onReachBottom(() => {
|
||||
margin-left: 20rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
&__name {
|
||||
@ -479,7 +513,18 @@ onReachBottom(() => {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
&__code {
|
||||
margin-top: 8rpx;
|
||||
font-size: 22rpx;
|
||||
color: #909399;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
&__qty {
|
||||
/* 撑到卡片下沿:名称 / 编码在上,库存数与之对齐 */
|
||||
margin-top: auto;
|
||||
font-size: 24rpx;
|
||||
color: #909399;
|
||||
}
|
||||
@ -492,18 +537,5 @@ onReachBottom(() => {
|
||||
}
|
||||
}
|
||||
|
||||
/* 底部状态行 = 移动端的分页器(见模板注释) */
|
||||
.more {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 32rpx 24rpx;
|
||||
font-size: 24rpx;
|
||||
color: #909399;
|
||||
|
||||
&__retry {
|
||||
color: #2979ff;
|
||||
}
|
||||
}
|
||||
|
||||
/* 分页器样式在 components/page-pager(两个列表页共用,勿在此重复定义) */
|
||||
</style>
|
||||
|
||||
@ -347,6 +347,15 @@ 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 缺失
|
||||
|
||||
**2026-09-28 调整(筛选条件与卡片字段)**:
|
||||
|
||||
- 筛选区改为 **仓库 / SN管理 / 批次管理**(**移除货主筛选**)
|
||||
- 胶囊未选中时显示**筛选项名**(仓库 / SN管理 / 批次管理),选中后显示具体值(仓库名 / 是 / 否);
|
||||
选「全部…」时回到筛选项名;筛选项多了,筛选行改为允许换行(`flex-wrap`)
|
||||
- SN管理 / 批次管理 取值 `'Y'`/`'N'`,走 `where` 的**裸值**
|
||||
(与 new3 `handleConditionChange` 一致:它会把 ScanBox 的 `{operator,value}` 剥成裸值再传)
|
||||
- 卡片新增**商品编码**行(`item_code`)
|
||||
|
||||
### 3.5 收货单页面实现(2026-09-26)
|
||||
|
||||
后端新增小程序页面权限:**632** `/external-inventory`「外仓库存」(分类)、
|
||||
@ -399,6 +408,27 @@ body = { pagination: { page, pageSize }, where: { <字段>: { operator, value }
|
||||
产物 `pagesA/external-inventory/receiving.{js,json,wxml,wxss}` + `components/option-picker/*` 均已生成,
|
||||
引用完整性 117 个引用 / 0 缺失。
|
||||
|
||||
**2026-09-28 调整(筛选条件与卡片字段,对齐 new3 `receiving_owner`)**:
|
||||
|
||||
- 筛选区改为 **收货状态 / 入库状态 / 审核状态 / 仓库**(**移除货主筛选** —— new3 货主侧页面也已
|
||||
`.filter(f => f.value !== 'store_id')`;接口层 `store_id` 能力保留,可从页面接回)
|
||||
- 「全部状态」胶囊更名 **「收货状态」**(未选中显示筛选项名,选中显示具体值;选「全部」回到筛选项名)
|
||||
- 新增筛选取值(都走 `{ operator: 'eq', value }`):
|
||||
| 维度 | 字段 | 取值 |
|
||||
|---|---|---|
|
||||
| 收货状态 | `status` | receiving 收货中 / completed 已完成 / cancelled 已作废 |
|
||||
| 入库状态 | `storage_status` | waiting 待入库 / none 未入库 / partial 部分入库 / all(筛选写「已入库」、列表写「全部入库」,Web 原样) |
|
||||
| 审核状态 | `is_review` | **数值** 1 已审核 / 0 未审核(页面存字符串,`buildBody()` 里转数字) |
|
||||
| 仓库 | `warehouse_id` | 接口 `index.loadWarehouses`(含「全部仓库」项,选中时才拉、拉过缓存) |
|
||||
- 卡片新增 3 行:**入库状态 / 匹配状态**(按状态着色)+ **备注**(有值才显示)
|
||||
- 顺带:胶囊文案改为**算出来**(`labelOf(kind)` = 当前值 → 选项表),不再手工维护
|
||||
`storeLabel` / `statusLabel` 这类 ref,重置不会漏;筛选行加 `flex-wrap`(4 个胶囊 + 重置会换行)
|
||||
- 备好未接线:匹配状态筛选项常量 `RECEIVING_DETAIL_OPTIONS`(本次只要求「显示」,未加筛选)
|
||||
- 校验:`type-check` 通过;`check:pages` 10/10、0 告警;产物 17:24 已重建(页面 js 含
|
||||
`storage_status` / `is_review` / `warehouse_id`,wxml 含「入库状态/匹配状态/备注」,无「全部货主」),
|
||||
引用完整性 125 个 / 0 缺失
|
||||
- ⚠️ 待实测:`is_review` **不在** new3 货主侧列定义里,筛选是否生效需在工具里点一次确认
|
||||
|
||||
---
|
||||
|
||||
## 4. 下一步任务清单
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user