From 9172bbe03f85e559b2471411a00d45c559fce18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Fri, 5 Dec 2025 17:19:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor(wms):=20=E6=B8=85=E7=90=86?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除废弃的BOM相关组件和文件 优化仓库组件代码格式和样式 移除注释掉的BOM面板引用 统一表单元素格式 清理冗余样式代码 --- .../src/views/wms/bom/components/BomItem.vue | 263 ------------------ .../src/views/wms/bom/components/BomPanel.vue | 243 ---------------- klp-ui/src/views/wms/bom/index.vue | 0 klp-ui/src/views/wms/coil/abnormalDetail.vue | 16 +- klp-ui/src/views/wms/coil/actflow.vue | 198 +++++-------- klp-ui/src/views/wms/product/semi.vue | 8 +- .../warehouse/components/WarehouseBird.vue | 3 +- .../warehouse/components/WarehouseGrid.vue | 14 - klp-ui/src/views/wms/warehouse/overview.vue | 44 +-- 9 files changed, 89 insertions(+), 700 deletions(-) delete mode 100644 klp-ui/src/views/wms/bom/components/BomItem.vue delete mode 100644 klp-ui/src/views/wms/bom/components/BomPanel.vue delete mode 100644 klp-ui/src/views/wms/bom/index.vue diff --git a/klp-ui/src/views/wms/bom/components/BomItem.vue b/klp-ui/src/views/wms/bom/components/BomItem.vue deleted file mode 100644 index b77245bd..00000000 --- a/klp-ui/src/views/wms/bom/components/BomItem.vue +++ /dev/null @@ -1,263 +0,0 @@ - - - diff --git a/klp-ui/src/views/wms/bom/components/BomPanel.vue b/klp-ui/src/views/wms/bom/components/BomPanel.vue deleted file mode 100644 index 889ede35..00000000 --- a/klp-ui/src/views/wms/bom/components/BomPanel.vue +++ /dev/null @@ -1,243 +0,0 @@ - - - - - \ No newline at end of file diff --git a/klp-ui/src/views/wms/bom/index.vue b/klp-ui/src/views/wms/bom/index.vue deleted file mode 100644 index e69de29b..00000000 diff --git a/klp-ui/src/views/wms/coil/abnormalDetail.vue b/klp-ui/src/views/wms/coil/abnormalDetail.vue index 2196b258..70023236 100644 --- a/klp-ui/src/views/wms/coil/abnormalDetail.vue +++ b/klp-ui/src/views/wms/coil/abnormalDetail.vue @@ -93,8 +93,8 @@ - {{ dict.label }} + {{ + dict.label }} @@ -102,14 +102,14 @@ - {{ dict.label }} + {{ + dict.label }} - {{ dict.label }} + {{ + dict.label }} @@ -127,8 +127,8 @@ - {{ dict.label }} + {{ + dict.label }} diff --git a/klp-ui/src/views/wms/coil/actflow.vue b/klp-ui/src/views/wms/coil/actflow.vue index e3024d16..5b292ee2 100644 --- a/klp-ui/src/views/wms/coil/actflow.vue +++ b/klp-ui/src/views/wms/coil/actflow.vue @@ -3,21 +3,17 @@ - + + + + + + + + + - - - - - - - - 搜索 重置 @@ -27,45 +23,22 @@ - 新增 + 新增 - 删除 + 删除 - 刷新 + 刷新 - + @@ -75,15 +48,15 @@ - + @@ -136,59 +109,27 @@ - + @@ -202,12 +143,8 @@
分条操作
-
+
@@ -218,17 +155,13 @@
- +
其他操作
-
+
@@ -253,7 +186,8 @@ @@ -464,7 +398,7 @@ export default { }).then(() => { this.getList(); this.$message.success('删除成功'); - }).catch(() => {}); + }).catch(() => { }); }, /** 处理操作 - 跳转到对应页面 */ handleProcess(row) { @@ -485,17 +419,17 @@ export default { // 根据操作类型跳转到不同页面 let path = ''; - + // 分条操作:100-199 if (actionType >= 100 && actionType <= 199) { path = '/wms/split'; - } + } // 合卷操作:200-299 else if (actionType == 200) { path = '/wms/merge'; } // 其他操作类型 - else{ + else { path = '/wms/typing'; } @@ -540,7 +474,7 @@ export default { }).then(() => { this.$message.success('操作已取消'); this.getList(); - }).catch(() => {}); + }).catch(() => { }); }, /** 刷新列表 */ handleRefresh() { @@ -552,8 +486,8 @@ export default { // 每30秒自动刷新一次(用于移动端扫码后自动更新列表) this.refreshTimer = setInterval(() => { - // 只在查看待处理状态时自动刷新 - this.getList(); + // 只在查看待处理状态时自动刷新 + this.getList(); }, 30000); }, /** 表格行样式 */ @@ -653,15 +587,15 @@ export default { /* 操作类型卡片样式 */ .action-type-cards { width: 100%; - + .card-section { margin-bottom: 24px; - + &:last-child { margin-bottom: 0; } } - + .section-title { font-size: 14px; font-weight: 600; @@ -670,18 +604,18 @@ export default { padding-left: 8px; border-left: 3px solid #409eff; } - + // 分条操作区域的特殊样式 .card-section:first-child .section-title { border-left-color: #e6a23c; } - + .action-cards-row { display: grid; grid-template-columns: repeat(auto-fill, minmax(220px, 1fr)); gap: 12px; } - + .action-card { min-width: 0; padding: 16px; @@ -693,50 +627,50 @@ export default { display: flex; align-items: center; gap: 12px; - + &:hover { border-color: #409eff; box-shadow: 0 2px 12px 0 rgba(64, 158, 255, 0.15); transform: translateY(-2px); } - + &.active { border-color: #409eff; background: linear-gradient(135deg, #e3f2fd 0%, #f0f7ff 100%); box-shadow: 0 2px 12px 0 rgba(64, 158, 255, 0.3); - + .card-icon { background: linear-gradient(135deg, #409eff 0%, #66b1ff 100%); color: #fff; } - + .card-title { color: #409eff; font-weight: 600; } } - + &.split-card { &.active { background: linear-gradient(135deg, #fff3e0 0%, #fff8f0 100%); border-color: #e6a23c; - + .card-icon { background: linear-gradient(135deg, #e6a23c 0%, #f0ad4e 100%); } - + .card-title { color: #e6a23c; } } - + &:hover { border-color: #e6a23c; box-shadow: 0 2px 12px 0 rgba(230, 162, 60, 0.15); } } } - + .card-icon { width: 48px; height: 48px; @@ -750,11 +684,11 @@ export default { transition: all 0.3s ease; flex-shrink: 0; } - + .card-content { flex: 1; } - + .card-title { font-size: 16px; font-weight: 500; @@ -762,7 +696,7 @@ export default { margin-bottom: 4px; transition: all 0.3s ease; } - + .card-desc { font-size: 13px; color: #909399; diff --git a/klp-ui/src/views/wms/product/semi.vue b/klp-ui/src/views/wms/product/semi.vue index d2f6d62d..2dd6f829 100644 --- a/klp-ui/src/views/wms/product/semi.vue +++ b/klp-ui/src/views/wms/product/semi.vue @@ -259,9 +259,9 @@
- +
@@ -270,7 +270,7 @@ import { listProduct, getProduct, delProduct, addProduct, updateProduct } from " import CategorySelect from '@/components/KLPService/CategorySelect'; import CategoryRenderer from '@/components/KLPService/Renderer/CategoryRenderer.vue'; import UserSelect from '@/components/KLPService/UserSelect'; -import BomPanel from '../bom/components/BomPanel.vue'; +// import BomPanel from '../bom/components/BomPanel.vue'; import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue'; export default { @@ -279,7 +279,7 @@ export default { CategorySelect, CategoryRenderer, UserSelect, - BomPanel, + // BomPanel, BomInfoMini }, dicts: ['common_swicth'], diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue index 4e9c1822..8f7c9947 100644 --- a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue +++ b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue @@ -148,7 +148,7 @@ export default { const layerData = layerMap[layer]; const totalGrid = layerData.maxRow * layerData.maxColumn; layerData.emptyCount = Math.max(0, totalGrid - layerData.warehouses.length); - + // 按行号+列号排序 layerData.warehouses.sort((a, b) => { if (a.parsedInfo.row !== b.parsedInfo.row) { @@ -253,6 +253,7 @@ export default { // 分层容器样式 .layers-container { display: flex; + .layer-section { flex: 1; max-width: 50%; diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue index 4c8cc7f9..896b7e9e 100644 --- a/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue +++ b/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue @@ -8,9 +8,7 @@
-
-
@@ -357,16 +355,4 @@ export default { } } } - -// 弹窗样式优化 -::v-deep(.el-descriptions) { - .el-descriptions-item__label { - font-weight: 500; - color: #606266; - } - - .el-descriptions-item__content { - color: #303133; - } -} \ No newline at end of file diff --git a/klp-ui/src/views/wms/warehouse/overview.vue b/klp-ui/src/views/wms/warehouse/overview.vue index 6336f4cf..0189ada9 100644 --- a/klp-ui/src/views/wms/warehouse/overview.vue +++ b/klp-ui/src/views/wms/warehouse/overview.vue @@ -4,23 +4,15 @@
- +
-
+
@@ -39,16 +31,10 @@
拖动/点击选择网格范围(当前:{{ initForm.rowCount || 0 }}行 × {{ initForm.columnCount || 0 }}列)
-
+
-
@@ -154,7 +140,7 @@ export default { this.rightLoading = true; this.selectedNodeId = node.actualWarehouseId; this.selectedNode = node; - + this.getWarehouseList(node.actualWarehouseId) .finally(() => { this.rightLoading = false; @@ -308,13 +294,6 @@ export default { padding: 16px; box-sizing: border-box; overflow-y: auto; - - .warehouse-tree { - --el-tree-text-color: #303133; - --el-tree-node-hover-bg-color: #e8f4ff; - --el-tree-current-bg-color: #409eff; - --el-tree-current-text-color: #fff; - } } .warehouse-container { @@ -354,7 +333,6 @@ export default { overflow: auto; border: 1px solid #e6e6e6; background: #fafafa; - cursor: crosshair; .grid-selector-row { display: flex; @@ -384,8 +362,4 @@ export default { } } } - -::v-deep(.el-form-item) { - margin-bottom: 16px; -} \ No newline at end of file From 0236637c38e5a7a75fd28a83cd288cd25cd54168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 6 Dec 2025 10:01:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(qc):=20=E6=96=B0=E5=A2=9E=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8F=8A=E7=A9=BF=E6=A2=AD=E6=A1=86=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refactor(warehouse): 优化库位网格布局和响应式设计 fix(wms): 移除异常详情页的路由变化条件判断 style(qc): 统一检查任务对话框宽度为700px feat(qc): 新增检查项模板API及相关页面组件 --- .../src/api/mes/qc/inspectionItemTemplate.js | 55 ++++ .../KLPService/CheckItemSelect/index.vue | 204 +++++++++++--- .../qc/components/CheckItemTransfer/index.vue | 143 ++++++++++ .../src/views/mes/qc/task/pages/auxiliary.vue | 2 +- klp-ui/src/views/mes/qc/task/pages/lab.vue | 2 +- klp-ui/src/views/mes/qc/task/pages/raw.vue | 2 +- .../src/views/mes/qc/task/pages/section.vue | 2 +- klp-ui/src/views/mes/qc/template/index.vue | 254 ++++++++++++++++++ klp-ui/src/views/wms/coil/abnormalDetail.vue | 4 +- .../warehouse/components/WarehouseGrid.vue | 162 +++++------ 10 files changed, 704 insertions(+), 126 deletions(-) create mode 100644 klp-ui/src/api/mes/qc/inspectionItemTemplate.js create mode 100644 klp-ui/src/views/mes/qc/components/CheckItemTransfer/index.vue create mode 100644 klp-ui/src/views/mes/qc/template/index.vue diff --git a/klp-ui/src/api/mes/qc/inspectionItemTemplate.js b/klp-ui/src/api/mes/qc/inspectionItemTemplate.js new file mode 100644 index 00000000..00ec091a --- /dev/null +++ b/klp-ui/src/api/mes/qc/inspectionItemTemplate.js @@ -0,0 +1,55 @@ +import request from '@/utils/request' + +// 查询待检项模板列表 +export function listInspectionItemTemplate(query) { + return request({ + url: '/qc/inspectionItemTemplate/list', + method: 'get', + params: query + }) +} + +// 查询待检项模板详细 +export function getInspectionItemTemplate(templateId) { + return request({ + url: '/qc/inspectionItemTemplate/' + templateId, + method: 'get' + }) +} + +// 新增待检项模板 +export function addInspectionItemTemplate(data) { + return request({ + url: '/qc/inspectionItemTemplate', + method: 'post', + data: data + }) +} + +// 修改待检项模板 +export function updateInspectionItemTemplate(data) { + return request({ + url: '/qc/inspectionItemTemplate', + method: 'put', + data: data + }) +} + +// 删除待检项模板 +export function delInspectionItemTemplate(templateId) { + return request({ + url: '/qc/inspectionItemTemplate/' + templateId, + method: 'delete' + }) +} + +// 查询模版详情 +export function getInfoByInspectionItem(inspectionItemIds) { + return request({ + url: '/qc/inspectionItemTemplate/getInfoByInspectionItem', + method: 'post', + params: { + inspectionItemIds + } + }) +} diff --git a/klp-ui/src/components/KLPService/CheckItemSelect/index.vue b/klp-ui/src/components/KLPService/CheckItemSelect/index.vue index 6e8701b5..1292a080 100644 --- a/klp-ui/src/components/KLPService/CheckItemSelect/index.vue +++ b/klp-ui/src/components/KLPService/CheckItemSelect/index.vue @@ -1,64 +1,182 @@ +.check-item-transfer { + width: 100%; + box-sizing: border-box; +} + +/* 自定义选项样式,确保显示完整 */ +.transfer-option-content { + display: inline-block; + width: 100%; + padding: 2px 0; + box-sizing: border-box; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + \ No newline at end of file diff --git a/klp-ui/src/views/mes/qc/components/CheckItemTransfer/index.vue b/klp-ui/src/views/mes/qc/components/CheckItemTransfer/index.vue new file mode 100644 index 00000000..ade36915 --- /dev/null +++ b/klp-ui/src/views/mes/qc/components/CheckItemTransfer/index.vue @@ -0,0 +1,143 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/mes/qc/task/pages/auxiliary.vue b/klp-ui/src/views/mes/qc/task/pages/auxiliary.vue index 18b11d7e..c66232d3 100644 --- a/klp-ui/src/views/mes/qc/task/pages/auxiliary.vue +++ b/klp-ui/src/views/mes/qc/task/pages/auxiliary.vue @@ -126,7 +126,7 @@
- + diff --git a/klp-ui/src/views/mes/qc/task/pages/lab.vue b/klp-ui/src/views/mes/qc/task/pages/lab.vue index f4da63b4..bf55ca31 100644 --- a/klp-ui/src/views/mes/qc/task/pages/lab.vue +++ b/klp-ui/src/views/mes/qc/task/pages/lab.vue @@ -122,7 +122,7 @@
- + diff --git a/klp-ui/src/views/mes/qc/task/pages/raw.vue b/klp-ui/src/views/mes/qc/task/pages/raw.vue index 26141cf9..90c4e59a 100644 --- a/klp-ui/src/views/mes/qc/task/pages/raw.vue +++ b/klp-ui/src/views/mes/qc/task/pages/raw.vue @@ -128,7 +128,7 @@
- + diff --git a/klp-ui/src/views/mes/qc/task/pages/section.vue b/klp-ui/src/views/mes/qc/task/pages/section.vue index f5e4a007..e67fdd07 100644 --- a/klp-ui/src/views/mes/qc/task/pages/section.vue +++ b/klp-ui/src/views/mes/qc/task/pages/section.vue @@ -122,7 +122,7 @@
- + diff --git a/klp-ui/src/views/mes/qc/template/index.vue b/klp-ui/src/views/mes/qc/template/index.vue new file mode 100644 index 00000000..b2c3ca24 --- /dev/null +++ b/klp-ui/src/views/mes/qc/template/index.vue @@ -0,0 +1,254 @@ + + + diff --git a/klp-ui/src/views/wms/coil/abnormalDetail.vue b/klp-ui/src/views/wms/coil/abnormalDetail.vue index 70023236..9e933ff0 100644 --- a/klp-ui/src/views/wms/coil/abnormalDetail.vue +++ b/klp-ui/src/views/wms/coil/abnormalDetail.vue @@ -198,10 +198,10 @@ export default { watch: { '$route.query.coilId': { handler(newVal, oldVal) { - if (newVal !== oldVal) { + // if (newVal !== oldVal) { this.queryParams.coilId = newVal this.handleQuery() - } + // } }, immediate: true } diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue index 896b7e9e..ed4e4743 100644 --- a/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue +++ b/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue @@ -2,16 +2,15 @@
第{{ layer }}层库位 - {{ isTransposed ? '恢复行列' : '行列转置' }}
-
+
-
+
{{ col }} @@ -27,9 +26,12 @@
- -
+ +
- + {{ currentWarehouse.actualWarehouseCode }} {{ currentWarehouse.actualWarehouseName || '无' }} {{ currentWarehouse.parsedInfo.layer || '未知' }} - {{ isTransposed ? currentWarehouse.parsedInfo.column : currentWarehouse.parsedInfo.row || '未知' }} {{ isTransposed ? currentWarehouse.parsedInfo.row : currentWarehouse.parsedInfo.column || '未知' }} - {{ currentWarehouse.parsedInfo.warehouseFirst || '未知' - }} - {{ currentWarehouse.parsedInfo.warehouseSecond || '未知' - }} + {{ currentWarehouse.parsedInfo.warehouseFirst || '未知' }} + {{ currentWarehouse.parsedInfo.warehouseSecond || '未知' }} {{ currentWarehouse.isEnabled === 1 ? '启用' : '禁用' }} @@ -81,7 +80,6 @@
-