diff --git a/src/api/po/po.js b/src/api/po/po.js index 11bddab..10cbbe8 100644 --- a/src/api/po/po.js +++ b/src/api/po/po.js @@ -28,5 +28,17 @@ export const getInboundHistory = data => createAPI(`inspection/getInboundHistory // 确认不合格处理 export const confirmUnqualifiedProcess = data => createAPI(`inspection/confirmUnqualifiedProcess`,'post',data) +// 确认其它入库 +export const confirmOtherInbound = data => createAPI(`other/confirmOtherInbound`,'post',data) + +// 获取其它入库历史 +export const getOtherInboundHistory = data => createAPI(`other/getOtherInboundHistory`,'post',data) + +// 确认其它出库 +export const confirmOtherOutbound = data => createAPI(`other/confirmOtherOutbound`,'post',data) + +// 获取其它出库历史 +export const getOtherOutboundHistory = data => createAPI(`other/getOtherOutboundHistory`,'post',data) + // 打印标签 export const printLabel = data => createAPI('/label/setting/printLabel','post',data) diff --git a/src/router/index.js b/src/router/index.js index 6f0cd32..820917c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,6 +87,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}}, + {path: "/other-inbound",name: "other-inbound", component: resolve => require(["@/views/modules/other-transaction/other-inbound.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, +{path: "/other-outbound",name: "other-outbound", component: resolve => require(["@/views/modules/other-transaction/other-outbound.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/index.vue b/src/views/modules/other-transaction/index.vue index fa33da9..6117224 100644 --- a/src/views/modules/other-transaction/index.vue +++ b/src/views/modules/other-transaction/index.vue @@ -53,17 +53,17 @@ export default { disabled: false, }, { - icon: "records", + icon: "add-o", label: "其它入库", - iconClass: "qualified", - to: "", + iconClass: "other-inbound", + to: "other-inbound", disabled: false, }, { - icon: "records", - label: "其他出库", - iconClass: "qualified", - to: "", + icon: "minus", + label: "其它出库", + iconClass: "other-outbound", + to: "other-outbound", disabled: false, }, { @@ -81,7 +81,11 @@ export default { if (btn.disabled) { this.$message.warning("正在开发中,敬请期待..."); } else { - this.$router.push(btn.to); + if (btn.to) { + this.$router.push(btn.to); + } else { + this.$message.warning("正在开发中,敬请期待..."); + } } }, }, @@ -191,6 +195,16 @@ export default { background: linear-gradient(135deg, #17b3a3 0%, #1dc5ef 100%); } +.menu-icon.other-inbound { + background: linear-gradient(135deg, #52c41a 0%, #73d13d 100%); + box-shadow: 0 4px 8px rgba(82, 196, 26, 0.3); +} + +.menu-icon.other-outbound { + background: linear-gradient(135deg, #fa8c16 0%, #ffa940 100%); + box-shadow: 0 4px 8px rgba(250, 140, 22, 0.3); +} + .menu-text { font-size: 10px; color: #333; diff --git a/src/views/modules/other-transaction/other-inbound.vue b/src/views/modules/other-transaction/other-inbound.vue new file mode 100644 index 0000000..09ba41e --- /dev/null +++ b/src/views/modules/other-transaction/other-inbound.vue @@ -0,0 +1,677 @@ + + + + + diff --git a/src/views/modules/other-transaction/other-outbound.vue b/src/views/modules/other-transaction/other-outbound.vue new file mode 100644 index 0000000..af77de3 --- /dev/null +++ b/src/views/modules/other-transaction/other-outbound.vue @@ -0,0 +1,623 @@ + + + + +