diff --git a/src/views/modules/production-issue/directIssue.vue b/src/views/modules/production-issue/directIssue.vue index 48463bc..077eb9f 100644 --- a/src/views/modules/production-issue/directIssue.vue +++ b/src/views/modules/production-issue/directIssue.vue @@ -42,15 +42,15 @@
计划数量
-
{{ workOrder.qtyComplete }}
+
{{ workOrder.lotSize }}
状态
-
{{ workOrder.status || "进行中" }}
+
{{ workOrder.status}}
单位
-
{{ workOrder.uom || "个" }}
+
{{ workOrder.uom}}
@@ -262,7 +262,7 @@ export default { name: "directIssueDetail", query: { workOrderNo: this.selectedWorkOrder.orderNo, - partNo: material.componentPartNo, + partNo: material.componentPartNo, itemNo: material.lineItemNo, releaseNo: this.selectedWorkOrder.releaseNo, sequenceNo: this.selectedWorkOrder.sequenceNo, @@ -795,4 +795,4 @@ export default { flex: 1.5; } } - \ No newline at end of file + diff --git a/src/views/modules/recv/qualifiedStorage.vue b/src/views/modules/recv/qualifiedStorage.vue index a70917a..836c80a 100644 --- a/src/views/modules/recv/qualifiedStorage.vue +++ b/src/views/modules/recv/qualifiedStorage.vue @@ -157,9 +157,9 @@ {{ label.partNo }} - + - {{ label.partDesc }} + {{ label.partDesc }} @@ -174,7 +174,7 @@ - {{ label.qty }} {{ label.unit || '个' }} + {{ label.qty }} {{ label.unit}} @@ -682,6 +682,26 @@ export default { font-size: 16px; } +/* 物料描述样式 - 防止重叠 */ +.description-col { + margin-bottom: 15px !important; +} + +.part-description { + word-wrap: break-word; + word-break: break-all; + line-height: 1.8; + display: block; + max-width: 100%; + margin-bottom: 10px; + padding-bottom: 5px; +} + +/* 确保物料描述的form-item有足够间距 */ +.description-col .el-form-item { + margin-bottom: 15px !important; +} + /* 搜索容器 */ .search-container { padding: 12px 16px; diff --git a/src/views/modules/recv/unqualifiedProcess.vue b/src/views/modules/recv/unqualifiedProcess.vue index 4cd0dbd..f8e3525 100644 --- a/src/views/modules/recv/unqualifiedProcess.vue +++ b/src/views/modules/recv/unqualifiedProcess.vue @@ -86,7 +86,7 @@ {{ label.partNo }} - {{ label.qty }} {{ label.unit || '个' }} + {{ label.qty }} {{ label.unit}} {{ label.partDesc }} @@ -234,7 +234,10 @@ export default { this.$message.warning('该HandlingUnit已扫描,请勿重复扫描'); return; } - + if (huInfo.inStockFlag !== 'X') { + this.$message.error('HandlingUnit不是未入库状态,无法处理'); + return; + } // 校验HU是否属于当前单据 if (huInfo.site !== localStorage.getItem('site')) { this.$message.error('HandlingUnit站点不匹配');