From 6bb2d1285ceca9567e259b59f4f18d249436ebb2 Mon Sep 17 00:00:00 2001 From: sheng <905537351@qq.com> Date: Mon, 22 Jun 2026 16:01:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=89=98=E7=9B=98=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增计划与生产托盘登录 V2 页面 - 新增托盘登录接口、旧路径路由和中英文文案 - 更新迁移任务列表中的托盘登录状态 --- docs/迁移任务列表.md | 6 +- .../planning-production/tray-registration.js | 51 ++ src/locales/en.json | 67 ++ src/locales/zh-chs.json | 67 ++ src/router/modules/planning-production.js | 6 + .../tray-registration/index.vue | 695 ++++++++++++++++++ 6 files changed, 889 insertions(+), 3 deletions(-) create mode 100644 src/api/planning-production/tray-registration.js create mode 100644 src/views/planning-production/production-monitoring/tray-registration/index.vue diff --git a/docs/迁移任务列表.md b/docs/迁移任务列表.md index 4e889ba7..a74ea810 100644 --- a/docs/迁移任务列表.md +++ b/docs/迁移任务列表.md @@ -3,8 +3,8 @@ > 根据 `后台Webman界面截图对照表.md` 生成。状态以当前 V2 项目中已落地的页面目录为准。 - 总功能数:79 -- 已迁移:24 -- 未迁移:55 +- 已迁移:25 +- 未迁移:54 | 状态 | 一级模块 | 二级模块 | 三级模块 | 功能说明 | V2 目标路径 | |:---:|---|---|---|---|---| @@ -50,7 +50,7 @@ | ⬜ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 物料监控 (Material Monitoring) | 物料监控 | 待确认 | | ⬜ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 电池复投管理 (Rework Management) | 返工管理 | 待确认 | | ✅ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 托盘管理 (Tray Management) | 托盘管理 | `src/views/planning-production/production-monitoring/tray-management/` | -| ⬜ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 托盘登录 (Tray Registration) | 托盘登记 | 待确认 | +| ✅ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 托盘登录 (Tray Registration) | 托盘登记 | `src/views/planning-production/production-monitoring/tray-registration/` | | ✅ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 设备监控 (Equipment Monitoring) | 设备监控 | `src/views/planning-production/production-monitoring/equipment-monitoring/` | | ✅ | 计划与生产 (Planning & Production) | 生产监控 (Production Monitoring) | 电池工序管理 (Process Execution) | 工序管理 | `src/views/planning-production/production-monitoring/process-execution/` | | ⬜ | 质量管理 (Quality Management) | 过程控制 (Process Control) | 检验类别管理 (Inspection Type Management) | | 待确认 | diff --git a/src/api/planning-production/tray-registration.js b/src/api/planning-production/tray-registration.js new file mode 100644 index 00000000..16e60873 --- /dev/null +++ b/src/api/planning-production/tray-registration.js @@ -0,0 +1,51 @@ +import { request } from '@/api/_service' + +const BASE = 'planning_production/produce/tray_login/' + +function apiParams (method, data = {}) { + return { + method, + platform: 'background', + ...data + } +} + +export function getBatchAll (data) { + return request({ + url: BASE + 'all', + method: 'get', + params: apiParams('planning_production_produce_traylogin_all', data) + }) +} + +export function getBatchTrayFormatAll (data) { + return request({ + url: BASE + 'trayformat_all', + method: 'get', + params: apiParams('planning_production_produce_trayformat_all', data) + }) +} + +export function createBatchTrayFormat (data) { + return request({ + url: BASE + 'create', + method: 'get', + params: apiParams('planning_production_produce_trayformat_create', data) + }) +} + +export function deleteBatchTrayFormat (data) { + return request({ + url: BASE + 'delete', + method: 'get', + params: apiParams('planning_production_produce_trayformat_delete', data) + }) +} + +export function checkBatteryid (data) { + return request({ + url: BASE + 'check_batteryid', + method: 'get', + params: apiParams('planning_production_produce_trayformat_check_batteryid', data) + }) +} diff --git a/src/locales/en.json b/src/locales/en.json index c4f32711..b912b28b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1010,6 +1010,73 @@ "exception": "Exception", "offline": "Offline", "idle": "Waiting for Material" + }, + "tray_registration": { + "query": "Search", + "reset": "Reset", + "login": "Register", + "tray_unbind": "Unbind Tray", + "tray_stop": "Stop Tray", + "add": "Add", + "delete": "Delete", + "confirm": "Confirm", + "cancel": "Cancel", + "prompt": "Notice", + "data_table": "Data Table", + "process_channel": "Channel", + "battery_id": "Battery ID", + "previous_batch": "Previous Batch", + "previous_tray": "Previous Tray", + "completed_process": "Completed Process", + "tray_barcode_format": "Tray Barcode Format", + "battery_barcode_format": "Battery Barcode Format", + "tray_battery_count": "Tray Capacity", + "operation": "Actions", + "batch_no": "Batch No.", + "enter_batch_no": "Enter batch number", + "tray_code": "Tray Code", + "enter_tray_code": "Enter tray code", + "battery_code": "Battery Code", + "enter_battery_code": "Enter battery code", + "tray_code_format": "Tray Code Format", + "battery_code_format": "Battery Code Format", + "tray_battery_format_edit": "Tray & Battery Format Editor", + "format_dialog_title": "Tray & Battery Format", + "submit_login": "Submit Registration", + "add_format_title": "Add Format", + "format_error": "Invalid format", + "process_flow_name": "Process Flow Name", + "format_error_exclamation": "Invalid format!", + "insert_duplicate_battery": "Duplicate battery", + "delete_confirm": "Delete this format?", + "delete_success": "Deleted successfully", + "add_tray_format": "Add tray format", + "add_battery_format": "Add battery format", + "add_battery_count": "Add battery count", + "tray_unbind_desc": "Note: unbinding deactivates the tray, but batteries remain activated.", + "tray_unbind_success": "Tray unbound successfully", + "tray_stop_desc": "Note: stopping deactivates both tray and batteries.", + "tray_stop_success": "Tray stopped successfully", + "enter_tray_no": "Enter tray number", + "batch_create_time": "Batch Create Time", + "tray_load_battery_count": "Loaded Count", + "batch_deactivate": "Batch Deactivate", + "please_enter_tray_code": "Please enter tray code", + "upload_success": "Upload successful", + "no_batch_no": "No batch number", + "has_active_battery_login_forbidden": "Cannot register: contains activated batteries.", + "select_battery_to_deactivate": "Select batteries to deactivate", + "battery_deactivate": "Battery Deactivation", + "batch_battery_deactivate_success": "Batch deactivation successful", + "channel": "Channel:", + "select_format": "Select format", + "select_format_first": "Select tray and battery format first", + "activation_status": "Activation Status", + "activated": "Activated", + "not_activated": "Not Activated", + "operation_success": "Operation successful", + "operation_failed": "Operation failed", + "format_rule": "Format rule: fixed characters are literal; use * for variable characters, e.g. A** or ******." } }, "alert_center": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index 3827fcde..30dc618a 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -1010,6 +1010,73 @@ "exception": "异常中", "offline": "离线中", "idle": "待料中" + }, + "tray_registration": { + "query": "查询", + "reset": "重置", + "login": "登录", + "tray_unbind": "托盘解绑", + "tray_stop": "托盘停止", + "add": "新增", + "delete": "删除", + "confirm": "确定", + "cancel": "取消", + "prompt": "提示", + "data_table": "数据表", + "process_channel": "通道", + "battery_id": "电池ID", + "previous_batch": "上一个批次", + "previous_tray": "上一个托盘", + "completed_process": "电池已完成工序", + "tray_barcode_format": "托盘条码格式", + "battery_barcode_format": "电池条码格式", + "tray_battery_count": "托盘装载电池数量", + "operation": "操作", + "batch_no": "批次号", + "enter_batch_no": "请输入批次号", + "tray_code": "托盘编码", + "enter_tray_code": "请输入托盘编码", + "battery_code": "电池编码", + "enter_battery_code": "请输入电池编码", + "tray_code_format": "托盘编码格式", + "battery_code_format": "电池编码格式", + "tray_battery_format_edit": "托盘与电池格式编辑", + "format_dialog_title": "托盘与电池格式", + "submit_login": "提交登录", + "add_format_title": "新增格式", + "format_error": "格式不对", + "process_flow_name": "工艺流程名称", + "format_error_exclamation": "格式不对!", + "insert_duplicate_battery": "插入重复电池", + "delete_confirm": "删除这条格式?", + "delete_success": "删除成功", + "add_tray_format": "请添加托盘格式", + "add_battery_format": "请添加电池格式", + "add_battery_count": "请添加电池数量", + "tray_unbind_desc": "说明:托盘解绑后,该托盘的状态是取消激活的,与它装载的电池还是激活状态", + "tray_unbind_success": "托盘解绑成功", + "tray_stop_desc": "说明:托盘停止后,该托盘和它装载的电池会一同取消激活", + "tray_stop_success": "托盘停止成功", + "enter_tray_no": "请输入托盘号", + "batch_create_time": "批次创建时间", + "tray_load_battery_count": "装载电池数量", + "batch_deactivate": "批量取消激活", + "please_enter_tray_code": "请填写托盘编码", + "upload_success": "上传成功", + "no_batch_no": "没有批次号", + "has_active_battery_login_forbidden": "有电池属于激活状态,无法登录", + "select_battery_to_deactivate": "请选择需要取消激活的电池", + "battery_deactivate": "电池取消激活", + "batch_battery_deactivate_success": "批量取消电池激活成功", + "channel": "通道:", + "select_format": "请选择格式", + "select_format_first": "请先选择托盘与电池格式", + "activation_status": "激活状态", + "activated": "已激活", + "not_activated": "未激活", + "operation_success": "操作成功", + "operation_failed": "操作失败", + "format_rule": "格式规则:固定字符直接填写,可变字符使用 * 代替,例如 A** 或 ******。" } }, "alert_center": { diff --git a/src/router/modules/planning-production.js b/src/router/modules/planning-production.js index 45595d98..c3505678 100644 --- a/src/router/modules/planning-production.js +++ b/src/router/modules/planning-production.js @@ -44,6 +44,12 @@ export default { meta: { ...meta, cache: true, title: '托盘管理' }, component: _import('planning-production/production-monitoring/tray-management') }, + { + path: 'produce/monitor/tray_login', + name: `${pre}monitor-tray_login`, + meta: { ...meta, cache: true, title: '托盘登录' }, + component: _import('planning-production/production-monitoring/tray-registration') + }, { path: 'produce/monitor/device', name: `${pre}monitor-device`, diff --git a/src/views/planning-production/production-monitoring/tray-registration/index.vue b/src/views/planning-production/production-monitoring/tray-registration/index.vue new file mode 100644 index 00000000..9e9e488d --- /dev/null +++ b/src/views/planning-production/production-monitoring/tray-registration/index.vue @@ -0,0 +1,695 @@ + + + + +