diff --git a/src/router/index.js b/src/router/index.js
index 1d923a4..597ca1c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -79,7 +79,7 @@ const globalRoutes = [
{ path: "/outsourcingPickingDetail/:outsourcingNo", name: "outsourcingPickingDetail", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
// 委外退料
- { path: "/outsourcingReturn", name: "outsourcingReturn", component: resolve => require(["@/views/modules/outsourcing-return/index.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+ { path: "/outsourcingReturn", name: "outsourcingReturn", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturn.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
{ path: "/outsourcingReturnPDAList/:orderNo/:partNo/:unissureQty/:itemNo", name: "outsourcingReturnPDAList", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturnPDAList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
{ path: "/outsourcingReturnPDAIssueList/:outsourcingOrderNo/:material", name: "outsourcingReturnPDAIssueList", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
diff --git a/src/views/modules/outsourcing-return/index.vue b/src/views/modules/outsourcing-return/outsourcingReturn.vue
similarity index 96%
rename from src/views/modules/outsourcing-return/index.vue
rename to src/views/modules/outsourcing-return/outsourcingReturn.vue
index 7a2a1a4..66ab67e 100644
--- a/src/views/modules/outsourcing-return/index.vue
+++ b/src/views/modules/outsourcing-return/outsourcingReturn.vue
@@ -68,7 +68,7 @@
@click="goToDetail(material)"
>
- 物料编码:{{ material.componentPartNo }} 行号:{{ material.lineNo }}
+ 物料编码:{{ material.componentPartNo }} 料行号:{{ material.lineItemNo }}
{{ material.componentPartDescription }}
@@ -199,7 +199,8 @@ export default {
let params = {
outsourcingNo:order.orderNo,
site:this.$store.state.user.site,
- lineNo: order.lineNo
+ lineNo: order.lineNo,
+ releaseNo: order.releaseNo,
}
getOutsourcingReturnOrderLineInfo(params).then(({ data }) => {
@@ -222,7 +223,7 @@ export default {
},
goToDetail(item) {
- const returnableQty = item.inventoryQty - (item.invQtyToReceive || 0);
+ const returnableQty = item.qtyRequired - (item.reservedQty || 0);
if (returnableQty <= 0) {
this.$message.warning('该物料已无可退数量');
return;
@@ -232,9 +233,13 @@ export default {
name: 'outsourcingReturnPDAList',
params: {
orderNo: item.orderNo,
- partNo: item.partNo,
+ partNo: item.componentPartNo,
unissureQty: returnableQty,
- itemNo: item.lineNo,
+ itemNo: {
+ lineNo: item.lineNo,
+ lineItemNo: item.lineItemNo,
+ releaseNo: item.releaseNo,
+ }
},
});
},
diff --git a/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue b/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue
index 56fbc39..ebf3829 100644
--- a/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue
+++ b/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue
@@ -11,22 +11,10 @@
-
+
-
+
{{ "移除" }}
{{ "添加" }}
@@ -34,22 +22,19 @@
-
+
- {{
- orderInfo.type === "outsourcingOrder" ? "委外订单号" : "退料申请单号"
+ {{
+ orderInfo.type === "outsourcingOrder" ? "委外单号" : "退料申请单号"
}}:{{ orderInfo.orderNo }} 批次号:{{ batchNo }}
- {{ orderInfo.type === "outsourcingOrder" ? "关联单号" : "关联委外订单" }}:{{
+ {{ orderInfo.type === "outsourcingOrder" ? "关联单号" : "关联委外订单" }}:{{
orderInfo.transactionId
- }}
+ }}
{{ orderInfo.partNo }}
@@ -82,9 +67,7 @@
退料信息确认
- 物料清单
+ 物料清单
@@ -92,25 +75,21 @@
-
+
{{ index+1 }}
-
{{ label.labelCode }}
+
{{ label.labelCode }}
{{ label.locationId }}
-
- {{ label.quantity }}
-
-
+
+ {{ label.quantity }}
+
+
@@ -119,25 +98,16 @@
-
-
-
- 确定退料
-
-
-
-
+
+
+
+ 确定退料
+
+
+
+
@@ -164,11 +134,7 @@
-
+
{{ index + 1 }}
{{ item.materialCode || item.partNo }}
@@ -194,128 +160,110 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+