diff --git a/src/api/index.ts b/src/api/index.ts index b8f9b5d..7017818 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -78,3 +78,82 @@ export function changeUserRole(roleId: string | number) { export function logout() { return request('user.logout', {}) } + +/** + * 按 token(ye4s 登录临时码)查询用户信息(免登录、免鉴权) + * - 以 ye4s 库 ye4s_user 表 tmp_code 字段为入参查询用户 + * - 命中返回 flag=success、code=200 与 real_name(真实姓名)、wms_account_id(WMS 账号 ID) + * - 未命中返回 flag=failure、code=404(用户不存在);token 为空返回 code=400 + */ +export function queryUserByToken(token: string) { + return request('index.queryUserByToken', { token }, { skipAuth: true }) +} + +/** + * 绑定工作台成员(免登录、免鉴权,以工作台 token 鉴权) + * - 入参:userId(可为空,兼容非系统账号用户)+ userName(姓名,必填)+ token(工作台 token) + * - 无 token 返回 401、token 无效返回 403;成功后新增 wms_workbench_member 成员行 + */ +export function bindWorkbenchMember(data: { + userId?: number | null + userName: string + token: string +}) { + return request('workbench.bindMember', data, { skipAuth: true }) +} + +/** + * 移除工作台成员(免登录、免鉴权,以工作台 token 鉴权) + * - 入参:ids(成员行 ID,支持数组/单值/逗号分隔串)+ token(工作台 token) + * - 按 token 解析工作台后仅软删除归属该工作台的成员行,返回 removed 数量与 ids 列表 + */ +export function removeWorkbenchMember(data: { + ids: Array | number | string + token: string +}) { + return request('workbench.removeMember', data, { skipAuth: true }) +} + +/** + * 工作台条码查询订单(免登录、免鉴权,以工作台 token 鉴权) + * - 入参 token(工作台 token)+ barcode(条码/运单号);仓库与工作台由服务端从 token 解析注入 + * - 散单 isSandan=1 附 order.intercept_flag/pack_flag;团购 isSandan=0 附 batch 波次信息 + */ +export function queryPackOrder(token: string, barcode: string) { + return request( + 'workbench.queryOrder', + { token, barcode }, + { skipAuth: true } + ) +} + +/** + * 工作台打包上报(免登录、免鉴权,以工作台 token 鉴权) + * - 入参 token + 发货单号(必填)等;仓库与工作台由服务端从 token 解析注入 + * - 散单按 order_id、团购按 wave_no 去重后创建打包任务(wms_pack_task) + */ +export function packOrder(data: { + token: string + delivery_order_code: string + wave_no?: string + status?: number + pack_time?: number + wave_total_orders?: number + items_count?: number + items_total?: number + users?: Array<{ + wms_account_id?: number | null + id?: number | null + real_name?: string + }> +}) { + return request('workbench.packOrder', data, { skipAuth: true }) +} + +/** + * 工作台打包完成(免登录、免鉴权,以工作台 token 鉴权) + * - 入参 token(工作台 token);结束该工作台最后一个未结束的打包任务并回写订单打包状态 + */ +export function finishPack(token: string) { + return request('workbench.finishPack', { token }, { skipAuth: true }) +} diff --git a/src/pages/packaging/index.vue b/src/pages/packaging/index.vue index 598a7d5..ae32c4e 100644 --- a/src/pages/packaging/index.vue +++ b/src/pages/packaging/index.vue @@ -1,42 +1,224 @@ @@ -212,7 +1274,7 @@ export default { } .mode-title { - font-size: 34rpx; + font-size: 38rpx; font-weight: 600; color: #fff; } @@ -221,7 +1283,7 @@ export default { width: 160rpx; height: 60rpx; line-height: 60rpx; - font-size: 26rpx; + font-size: 30rpx; margin: 0; padding: 0; border-radius: 8rpx; @@ -235,8 +1297,10 @@ export default { flex: 1; min-height: 0; box-sizing: border-box; + display: flex; + flex-direction: column; padding: 40rpx; - overflow-y: auto; + overflow: hidden; } .mode-card { @@ -249,7 +1313,7 @@ export default { .mode-card-title { display: block; - font-size: 34rpx; + font-size: 38rpx; color: #333; font-weight: 600; margin-bottom: 16rpx; @@ -257,7 +1321,7 @@ export default { .mode-card-desc { display: block; - font-size: 26rpx; + font-size: 30rpx; color: #888; line-height: 1.6; } @@ -290,7 +1354,7 @@ export default { .info-name { display: block; - font-size: 38rpx; + font-size: 42rpx; font-weight: 600; color: #333; margin-bottom: 16rpx; @@ -306,7 +1370,7 @@ export default { display: inline-block; padding: 6rpx 20rpx; border-radius: 999rpx; - font-size: 24rpx; + font-size: 28rpx; color: #2f7dff; background-color: #eef5ff; margin: 0 8rpx; @@ -341,13 +1405,13 @@ export default { } .info-label { - font-size: 26rpx; + font-size: 30rpx; color: #888; flex-shrink: 0; } .info-value { - font-size: 26rpx; + font-size: 30rpx; color: #333; text-align: right; word-break: break-all; @@ -358,7 +1422,7 @@ export default { width: 200rpx; height: 64rpx; line-height: 64rpx; - font-size: 26rpx; + font-size: 30rpx; margin: 28rpx auto 0; padding: 0; border-radius: 8rpx; @@ -370,4 +1434,444 @@ export default { .retry-btn::after { border: none; } + +/* ===== 打包工作区:左右面板 ===== */ +.pack-layout { + flex: 1; + min-height: 0; + display: flex; + gap: 24rpx; +} + +.pack-left { + flex: 7; + min-width: 0; + display: flex; + flex-direction: column; + gap: 24rpx; +} + +.pack-right { + flex: 3; + min-width: 0; + display: flex; + flex-direction: column; + gap: 24rpx; +} + +.pack-card { + background-color: #fff; + border-radius: 16rpx; + padding: 28rpx 32rpx; + box-sizing: border-box; + display: flex; + flex-direction: column; +} + +.pack-card-title { + font-size: 32rpx; + font-weight: 600; + color: #333; + margin-bottom: 16rpx; +} + +/* 搜索输入框 */ +.pack-search { + background-color: #fff; + border-radius: 16rpx; + padding: 20rpx 24rpx; + box-sizing: border-box; +} + +.pack-search-input { + height: 64rpx; + line-height: 64rpx; + font-size: 32rpx; + color: #333; +} + +/* 波次 */ +.pack-wave { + flex-direction: column; + gap: 20rpx; +} + +.pack-wave-head { + display: flex; + align-items: center; +} + +.pack-wave-head .pack-card-title { + margin-bottom: 0; +} + +.pack-wave-no { + font-size: 50rpx; + font-weight: 600; + color: #2f7dff; + margin-left: 12rpx; +} + +.pack-wave-count { + font-size: 50rpx; + color: #888; + margin-left: auto; +} + +/* 货主 / 包材 / 商品总数 */ +.pack-meta-line { + display: flex; + align-items: flex-start; + gap: 48rpx; +} + +.pack-meta-item { + display: flex; + flex-direction: row; + align-items: center; + gap: 12rpx; + min-width: 0; +} + +.pack-meta-label { + font-size: 28rpx; + color: #888; +} + +.pack-meta-value { + font-size: 45rpx; + color: #333; + font-weight: 600; + word-break: break-all; +} + +/* 商品明细 */ +.pack-detail { + flex: 1; + min-height: 0; +} + +.pack-detail-body { + flex: 1; + min-height: 0; + display: flex; + flex-direction: column; +} + +.pack-empty { + flex: 1; + min-height: 200rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 30rpx; + color: #bbb; +} + +.pack-detail-scroll { + flex: 1; + min-height: 0; +} + +.pack-detail-head, +.pack-detail-row { + display: flex; + align-items: center; + padding: 14rpx 0; + border-bottom: 1rpx solid #f4f4f4; +} + +.pack-detail-head { + color: #888; + font-size: 28rpx; +} + +.pack-detail-col { + font-size: 30rpx; + color: #333; +} + +.pack-detail-col--name { + flex: 3; +} + +.pack-detail-col--barcode { + flex: 2; +} + +.pack-detail-col--qty { + flex: 1; + text-align: center; +} + +/* 今日打包 */ +.pack-today-stats { + display: flex; + align-items: center; + justify-content: space-around; + padding: 16rpx 0; +} + +.pack-stat { + display: flex; + flex-direction: column; + align-items: center; +} + +.pack-stat-num { + font-size: 50rpx; + font-weight: 700; + color: #2f7dff; +} + +.pack-stat-label { + font-size: 28rpx; + color: #888; + margin-top: 8rpx; +} + +/* 扫描记录 */ +.pack-records { + flex: 1; + min-height: 0; +} + +.pack-records-body { + flex: 1; + min-height: 0; + display: flex; + flex-direction: column; +} + +.pack-records-scroll { + flex: 1; + min-height: 0; +} + +.pack-record-item { + display: flex; + align-items: center; + justify-content: space-between; + padding: 14rpx 0; + border-bottom: 1rpx solid #f4f4f4; +} + +.pack-record-text { + font-size: 30rpx; + color: #333; +} + +.pack-record-time { + font-size: 28rpx; + color: #aaa; +} + +/* 隐藏扫码捕获输入框(真机 WebView 保持聚焦派发按键) */ +.scan-hidden-input { + position: absolute; + width: 1px; + height: 1px; + opacity: 0; + left: -9999px; + top: 0; +} + +/* 顶栏按钮区 */ +.topbar-actions { + display: flex; + align-items: center; +} + +.operator-btn { + min-width: 160rpx; + height: 60rpx; + line-height: 60rpx; + font-size: 30rpx; + margin: 0 16rpx 0 0; + padding: 0 24rpx; + border-radius: 8rpx; + color: #fff; + background-color: #909399; + border: 1rpx solid #909399; +} + +.operator-btn::after { + border: none; +} + +.operator-btn--bound { + color: #fff; + background-color: #2fbf71; + border-color: #2fbf71; +} + +/* 绑定操作员弹窗 */ +.op-mask { + position: fixed; + left: 0; + top: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, 0.45); + display: flex; + align-items: center; + justify-content: center; + z-index: 999; +} + +.op-dialog { + width: 560rpx; + background-color: #fff; + border-radius: 16rpx; + padding: 32rpx; + box-sizing: border-box; +} + +.op-dialog-head { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 24rpx; +} + +.op-dialog-title { + font-size: 36rpx; + font-weight: 600; + color: #333; +} + +.op-dialog-close { + font-size: 44rpx; + color: #aaa; + line-height: 1; + padding: 0 8rpx; +} + +.op-dialog-body { + display: flex; + flex-direction: column; + gap: 24rpx; +} + +.op-bound-row { + display: flex; + align-items: center; + justify-content: space-between; + padding: 20rpx 24rpx; + background-color: #f7f9fc; + border-radius: 12rpx; +} + +.op-bound-label { + font-size: 30rpx; + color: #888; +} + +.op-bound-name { + font-size: 34rpx; + font-weight: 600; + color: #333; +} + +.op-scan-row { + background-color: #f7f9fc; + border-radius: 12rpx; + padding: 20rpx 24rpx; +} + +.op-scan-input { + height: 60rpx; + line-height: 60rpx; + font-size: 32rpx; + color: #333; +} + +.op-result { + padding: 20rpx 24rpx; + background-color: #eef5ff; + border-radius: 12rpx; + display: flex; + align-items: center; + justify-content: space-between; +} + +.op-result--empty { + background-color: #fdeaea; +} + +.op-result-label { + font-size: 28rpx; + color: #888; +} + +.op-result-name { + font-size: 34rpx; + font-weight: 600; + color: #333; +} + +.op-result--empty .op-result-name { + font-size: 30rpx; + font-weight: 400; + color: #e64340; +} + +.op-dialog-footer { + margin-top: 32rpx; + display: flex; + justify-content: flex-end; +} + +.op-btn { + height: 64rpx; + line-height: 64rpx; + font-size: 30rpx; + padding: 0 40rpx; + margin: 0; + border-radius: 8rpx; + border: none; +} + +.op-btn::after { + border: none; +} + +.op-btn--primary { + color: #fff; + background-color: #2f7dff; +} + +.op-btn--danger { + color: #fff; + background-color: #e64340; +} + +.op-btn--cancel { + color: #666; + background-color: #f2f2f2; +} + +.op-btn[disabled] { + opacity: 0.5; +} + +/* 移除操作员确认弹窗 */ +.op-dialog--confirm { + width: 520rpx; +} + +.op-confirm-content { + font-size: 40rpx; + color: #333; + line-height: 1.6; + padding: 16rpx 8rpx; + text-align: center; +} + +.op-confirm-footer { + margin-top: 32rpx; + display: flex; + justify-content: flex-end; + gap: 16rpx; +}