diff --git a/src/api/other-transaction/scrap.js b/src/api/other-transaction/scrap.js new file mode 100644 index 0000000..c7a2a47 --- /dev/null +++ b/src/api/other-transaction/scrap.js @@ -0,0 +1,7 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 扫描报废标签 +export const scanScrapLabel = data => createAPI(`scrap/scanScrapLabel`,'POST',data) + +// 确认报废 +export const confirmScrap = data => createAPI(`scrap/confirmScrap`,'POST',data) diff --git a/src/api/other-transaction/transit.js b/src/api/other-transaction/transit.js new file mode 100644 index 0000000..3c6c3aa --- /dev/null +++ b/src/api/other-transaction/transit.js @@ -0,0 +1,10 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 获取移库记录 +export const getTransitRecord = data => createAPI(`transit/getTransitRecord`,'POST',data) + +// 扫描移库标签 +export const scanTransitLabel = data => createAPI(`transit/scanTransitLabel`,'POST',data) + +// 确认移库接收 +export const confirmTransitReceive = data => createAPI(`transit/confirmTransitReceive`,'POST',data) diff --git a/src/router/index.js b/src/router/index.js index 3e99e42..2e65ac7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -70,6 +70,8 @@ const globalRoutes = [ // 其他出入库 {path: "/otherinout",name: "otherinout", component: resolve => require(["@/views/modules/other-transaction/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/receiveFromTransit",name: "receiveFromTransit", component: resolve => require(["@/views/modules/other-transaction/receiveFromTransit.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/scrap",name: "scrap", component: resolve => require(["@/views/modules/other-transaction/scrap.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // Material Requisition {path: "/mrissue",name: "mrissue", component: resolve => require(["@/views/modules/mr-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, diff --git a/src/views/modules/other-transaction/execute.vue b/src/views/modules/other-transaction/execute.vue deleted file mode 100644 index 025c187..0000000 --- a/src/views/modules/other-transaction/execute.vue +++ /dev/null @@ -1,389 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/modules/other-transaction/index.vue b/src/views/modules/other-transaction/index.vue index 1956bd5..4df05f5 100644 --- a/src/views/modules/other-transaction/index.vue +++ b/src/views/modules/other-transaction/index.vue @@ -1,313 +1,203 @@ - diff --git a/src/views/modules/other-transaction/receiveFromTransit.vue b/src/views/modules/other-transaction/receiveFromTransit.vue new file mode 100644 index 0000000..30ebe47 --- /dev/null +++ b/src/views/modules/other-transaction/receiveFromTransit.vue @@ -0,0 +1,651 @@ + + + + + diff --git a/src/views/modules/other-transaction/scrap.vue b/src/views/modules/other-transaction/scrap.vue new file mode 100644 index 0000000..ee9e14a --- /dev/null +++ b/src/views/modules/other-transaction/scrap.vue @@ -0,0 +1,539 @@ + + + + + diff --git a/src/views/modules/sales-return/sales-return-inbound.vue b/src/views/modules/sales-return/sales-return-inbound.vue index f2e8ef7..5e7689d 100644 --- a/src/views/modules/sales-return/sales-return-inbound.vue +++ b/src/views/modules/sales-return/sales-return-inbound.vue @@ -1,29 +1,44 @@