From 53e1d6bbea91ae96d34c920be99b6bac34598b7d Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Fri, 26 Sep 2025 17:13:03 +0800 Subject: [PATCH] =?UTF-8?q?MR=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mr/mr.js | 8 +- src/router/index.js | 6 +- src/views/modules/mr-issue/mrPicking.vue | 3 + .../modules/mr-issue/mrPickingDetail.vue | 2 +- .../modules/mr-issue/mrPickingReturn.vue | 544 ++++++ .../modules/mr-issue/mrReturnIssueList.vue | 144 ++ .../mr-issue/mrReturnPickingDetail.vue | 1607 +++++++++++++++++ 7 files changed, 2311 insertions(+), 3 deletions(-) create mode 100644 src/views/modules/mr-issue/mrPickingReturn.vue create mode 100644 src/views/modules/mr-issue/mrReturnIssueList.vue create mode 100644 src/views/modules/mr-issue/mrReturnPickingDetail.vue diff --git a/src/api/mr/mr.js b/src/api/mr/mr.js index 82f9e37..a226e4c 100644 --- a/src/api/mr/mr.js +++ b/src/api/mr/mr.js @@ -10,4 +10,10 @@ export const getMrMaterialLines = data => createAPI(`/pda/mr/getMrMaterialLines` export const scanMaterialLabel = data => createAPI(`/pda/mr/scanMaterialLabel`, 'post', data) // 确认MR发料 -export const confirmMrIssue = data => createAPI(`mr/confirmMrIssue`, 'post', data) +export const confirmMrIssue = data => createAPI(`/pda/mr/confirmMrIssue`, 'post', data) + +export const getReturnMrInfo = data => createAPI(`/pda/mr/getReturnMrInfo`, 'post', data) + +export const getMrMaterials = data => createAPI(`/pda/mr/getMrMaterials`, 'post', data) + +export const getIssueForMaterialRequisition = data => createAPI(`/pda/mr/getIssueForMaterialRequisition`, 'post', data) \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 820917c..04abbc0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -94,7 +94,11 @@ const globalRoutes = [ {path: "/mrissue",name: "mrissue", component: resolve => require(["@/views/modules/mr-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/mrPicking",name: "mrPicking", component: resolve => require(["@/views/modules/mr-issue/mrPicking.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/mrPickingDetail/:orderNo/:lineNo/:partNo/:material",name: "mrPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrPickingDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - + + // MR退料 + {path: "/mrPickingReturn", name: "mrPickingReturn", component: resolve => require(["@/views/modules/mr-issue/mrPickingReturn.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + {path: "/mrReturnIssueList", name: "mrReturnIssueList", component: resolve => require(["@/views/modules/mr-issue/mrReturnIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + {path: "/mrReturnPickingDetail/:orderNo/:orderType/:partNo/:transactionId/:quantity/:batchNo", name: "mrReturnPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, // 盘点 {path: "/stocktaking",name: "stocktaking", component: resolve => require(["@/views/modules/inventory/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, diff --git a/src/views/modules/mr-issue/mrPicking.vue b/src/views/modules/mr-issue/mrPicking.vue index 5ca82a1..f99f045 100644 --- a/src/views/modules/mr-issue/mrPicking.vue +++ b/src/views/modules/mr-issue/mrPicking.vue @@ -30,6 +30,9 @@
目的地:{{ item.intDestDesc }}
+
+ 状态:{{ item.statusCode }} +
+
+
+ + MR退料 +
+
+ 首页 +
+
+ + +
+ +
+ + +
+
+
+ MR号:{{ mr.orderNo }}    客户号:{{ mr.intCustomerNo }} + {{ mr.partNo }} +
+ + +
+ 目的地:{{ mr.intDestDesc }} +
+
+ 状态:{{ mr.statusCode }} +
+ + +
+
+ + +
+
+
+ 物料编码:{{ material.partNo }}    行号:{{ material.lineNo + }} +
+ + +
+ {{ material.partDesc }} +
+ +
+
+
退回数量
+
{{ material.qtyReturned }}
+
+
+
已发数量
+
{{ material.qtyIssued || 0 }}
+
+
+
单位
+
{{ material.unitMeas }}
+
+
+
+
+ + +
+ +

该MR暂无材料清单

+
+ + +
+ +

加载中...

+
+ + + + + + diff --git a/src/views/modules/mr-issue/mrReturnIssueList.vue b/src/views/modules/mr-issue/mrReturnIssueList.vue new file mode 100644 index 0000000..1f84e3c --- /dev/null +++ b/src/views/modules/mr-issue/mrReturnIssueList.vue @@ -0,0 +1,144 @@ + + + + + diff --git a/src/views/modules/mr-issue/mrReturnPickingDetail.vue b/src/views/modules/mr-issue/mrReturnPickingDetail.vue new file mode 100644 index 0000000..cfb6564 --- /dev/null +++ b/src/views/modules/mr-issue/mrReturnPickingDetail.vue @@ -0,0 +1,1607 @@ + + + + +