diff --git a/src/api/inbound.js b/src/api/inbound.js index 6b4292a..b5a9dd6 100644 --- a/src/api/inbound.js +++ b/src/api/inbound.js @@ -46,4 +46,10 @@ export const getScannedLabelList = data => createAPI(`inbound/getScannedLabelLis * 获取物料可用库存 * @param {Object} data - 查询参数 {site, notifyNo, notifyType, orderNo, orderLineNo, partNo, warehouseId} */ -export const getInventoryStock = data => createAPI(`inbound/getInventoryStock`, 'post', data) \ No newline at end of file +export const getInventoryStock = data => createAPI(`inbound/getInventoryStock`, 'post', data) + +/** + * 获取采购入库通知单明细列表（小卡片） + * @param {Object} data - 查询参数 {site, buNo, orderNo} + */ +export const getInboundNotificationDetails = data => createAPI(`inbound/getInboundNotificationDetails`, 'post', data) \ No newline at end of file diff --git a/src/views/modules/purchase-inbound/inboundStorage.vue b/src/views/modules/purchase-inbound/inboundStorage.vue index 763eb92..9be62cf 100644 --- a/src/views/modules/purchase-inbound/inboundStorage.vue +++ b/src/views/modules/purchase-inbound/inboundStorage.vue @@ -38,8 +38,18 @@
- 入库单号 - {{ materialInfo.inboundNo }} +
+ 入库单号 + {{ materialInfo.inboundNo }} +
+
+ 关联单号 + {{ materialInfo.relatedOrderNo || '-' }} +
+
+ 行号 + {{ materialInfo.relatedOrderLineNo || '-' }} +
@@ -57,7 +67,7 @@
批次号
-
{{ materialInfo.batchNo }}
+
{{ materialInfo.batchNo || '-' }}
检验日期
@@ -279,6 +289,8 @@ export default { labelList: [], inboundNo: '', partNo: '', + relatedOrderNo: '', + relatedOrderLineNo: '', showLocationDialog: false, locationCode: '', showMaterialDialog: false, @@ -325,7 +337,9 @@ export default { site: this.materialInfo.site, buNo: this.materialInfo.buNo, operationType: 'I', // I表示添加 - warehouseId: getCurrentWarehouse() // 当前仓库 + warehouseId: getCurrentWarehouse(), // 当前仓库 + relatedOrderNo: this.relatedOrderNo, + relatedOrderLineNo: this.relatedOrderLineNo }; validateLabelWithInbound(params).then(({ data }) => { @@ -350,7 +364,9 @@ export default { site: this.materialInfo.site, buNo: this.materialInfo.buNo, operationType: 'D', // D表示移除 - warehouseId: getCurrentWarehouse() // 当前仓库 + warehouseId: getCurrentWarehouse(), // 当前仓库 + relatedOrderNo: this.relatedOrderNo, + relatedOrderLineNo: this.relatedOrderLineNo }; validateLabelWithInbound(params).then(({ data }) => { @@ -403,7 +419,9 @@ export default { site: this.materialInfo.site, buNo: this.materialInfo.buNo, inboundNo: this.inboundNo, - locationCode: this.locationCode.trim() + locationCode: this.locationCode.trim(), + relatedOrderNo: this.relatedOrderNo, + relatedOrderLineNo: this.relatedOrderLineNo }; confirmInboundStorage(params).then(({ data }) => { if (data && data.code === 0) { @@ -568,7 +586,9 @@ export default { partNo: this.partNo, buNo: this.buNo, warehouseId: getCurrentWarehouse(), - site:localStorage.getItem('site'), + site: localStorage.getItem('site'), + relatedOrderNo: this.relatedOrderNo, + relatedOrderLineNo: this.relatedOrderLineNo }; getInboundDetails(params).then(({ data }) => { @@ -620,6 +640,10 @@ export default { // 获取路由参数 this.inboundNo = this.$route.params.inboundNo; this.buNo = this.$route.params.buNo; + this.relatedOrderNo = this.$route.params.relatedOrderNo || ''; + this.relatedOrderLineNo = this.$route.params.relatedOrderLineNo || ''; + this.partNo = this.$route.params.partNo || ''; + if (!this.inboundNo || !this.buNo) { this.$message.error('参数错误'); this.$router.back(); @@ -806,23 +830,39 @@ export default { /* 卡片标题 */ .card-title { + display: flex; + justify-content: space-between; + align-items: flex-end; margin-bottom: 16px; + gap: 8px; +} + +.title-item { + display: flex; + flex-direction: column; + flex: 1; +} + +.title-item:first-child { + flex: 1.5; } .title-label { font-size: 11px; color: #999; - display: block; - margin-bottom: 6px; - font-weight: normal; + margin-bottom: 4px; + white-space: nowrap; } .title-value { - font-size: 18px; + font-size: 13px; font-weight: bold; color: #333; - line-height: 1.2; - margin-left: 20px; + word-break: break-all; +} + +.title-item:first-child .title-value { + font-size: 15px; } /* 卡片详情 */ diff --git a/src/views/modules/purchase-inbound/qualifiedStorage.vue b/src/views/modules/purchase-inbound/qualifiedStorage.vue index 572ccb3..61a99b1 100644 --- a/src/views/modules/purchase-inbound/qualifiedStorage.vue +++ b/src/views/modules/purchase-inbound/qualifiedStorage.vue @@ -22,7 +22,7 @@ />
- +
- 入库单号 - {{ item.inboundNo }} +
+ 入库单号 + {{ item.inboundNo }} +
+
+ 关联单号 + {{ item.relatedOrderNo || '-' }} +
+
+ 行号 + {{ item.relatedOrderLineNo || '-' }} +
@@ -50,7 +60,7 @@
批次号
-
{{ item.batchNo }}
+
{{ item.batchNo || '-' }}
检验日期
@@ -168,7 +178,9 @@ export default { name: 'inboundStorage', params: { buNo: item.buNo, - inboundNo: item.inboundNo + inboundNo: item.inboundNo, + relatedOrderNo: item.relatedOrderNo, + relatedOrderLineNo: item.relatedOrderLineNo } }); } @@ -234,35 +246,6 @@ export default { background: white; } -.search-box { - position: relative; - display: flex; - align-items: center; - background: #f8f9fa; - border: 1px solid #e0e0e0; - border-radius: 8px; - padding: 0 12px; -} - -.search-icon { - color: #999; - font-size: 16px; - margin-right: 8px; -} - -.search-box input { - flex: 1; - border: none; - background: transparent; - padding: 12px 0; - font-size: 14px; - outline: none; -} - -.search-box input::placeholder { - color: #999; -} - /* 内容区域 */ .content-area { flex: 1; @@ -292,21 +275,39 @@ export default { /* 卡片标题 */ .card-title { + display: flex; + justify-content: space-between; + align-items: flex-end; margin-bottom: 12px; + gap: 8px; +} + +.title-item { + display: flex; + flex-direction: column; + flex: 1; +} + +.title-item:first-child { + flex: 1.5; } .title-label { - font-size: 12px; - color: #666; - display: block; + font-size: 11px; + color: #999; margin-bottom: 4px; + white-space: nowrap; } .title-value { - font-size: 16px; + font-size: 13px; font-weight: bold; color: #333; - margin-left: 20px; + word-break: break-all; +} + +.title-item:first-child .title-value { + font-size: 15px; } /* 卡片详情 */