diff --git a/src/api/production/production-return2.js b/src/api/production/production-return2.js new file mode 100644 index 0000000..ecf150f --- /dev/null +++ b/src/api/production/production-return2.js @@ -0,0 +1,12 @@ + +import { createAPI } from "@/utils/httpRequest.js"; + +export const getQualifiedReturnList = data => createAPI(`productionReturn/getQualifiedReturnList`, 'post', data) + +export const getReturnDetails = data => createAPI(`productionReturn/getReturnDetails`, 'post', data) + +export const validateLabelWithReturn = data => createAPI(`productionReturn/validateLabelWithReturn`, 'post', data) + +export const confirmReturnStorage = data => createAPI(`productionReturn/confirmReturnStorage`, 'post', data) + +export const getMaterialList = data => createAPI(`productionReturn/getMaterialList`, 'post', data) diff --git a/src/router/index.js b/src/router/index.js index c8398de..90078d3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -62,6 +62,20 @@ const globalRoutes = [ component: resolve => require(["@/views/modules/production/productionInboundStorage.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + // 生产退仓 + { + path: "/productionReturn", name: "productionReturn", + component: resolve => require(["@/views/modules/production/production-return.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } + }, + { + path: "/productionQualifiedReturn", name: "productionQualifiedReturn", + component: resolve => require(["@/views/modules/production/productionQualifiedReturn.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } + }, + { + path: "/productionReturnStorage/:buNo/:inboundNo", name: "productionReturnStorage", + component: resolve => require(["@/views/modules/production/productionReturnStorage.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } + }, + // 销售出库 { path: "/salesOutbound", name: "salesOutbound", diff --git a/src/views/main.vue b/src/views/main.vue index 08b6751..95391c0 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -45,8 +45,8 @@
采购入库
- -
+
+
@@ -231,6 +231,7 @@ export default { closeWarehouseDropdown() { this.showWarehouseDropdown = false; }, + // 选择仓库 selectWarehouse(warehouse) { this.selectedWarehouse = warehouse.warehouseid; @@ -239,6 +240,7 @@ export default { this.showWarehouseDropdown = false; this.$message.success(`已切换到仓库：${warehouse.warehousename}`); }, + // 检查是否已选择仓库 checkWarehouseSelection() { if (!this.selectedWarehouse) { @@ -247,6 +249,7 @@ export default { } return true; }, + // 带仓库检查的路由跳转 navigateWithWarehouseCheck(routeName) { if (this.checkWarehouseSelection()) { @@ -261,7 +264,6 @@ export default { message: `${featureName}正在开发中，敬请期待...`, duration: 8000 // 停留 5 秒 }); - }, // 退出 diff --git a/src/views/modules/production/production-return.vue b/src/views/modules/production/production-return.vue new file mode 100644 index 0000000..fa3263a --- /dev/null +++ b/src/views/modules/production/production-return.vue @@ -0,0 +1,166 @@ + + + + + diff --git a/src/views/modules/production/productionQualifiedReturn.vue b/src/views/modules/production/productionQualifiedReturn.vue new file mode 100644 index 0000000..58de124 --- /dev/null +++ b/src/views/modules/production/productionQualifiedReturn.vue @@ -0,0 +1,424 @@ + + + + + diff --git a/src/views/modules/production/productionReturnStorage.vue b/src/views/modules/production/productionReturnStorage.vue new file mode 100644 index 0000000..39f83c6 --- /dev/null +++ b/src/views/modules/production/productionReturnStorage.vue @@ -0,0 +1,1325 @@ + + + + +