diff --git a/src/router/index.js b/src/router/index.js index ec9e003..cccc6d3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -34,7 +34,7 @@ const globalRoutes = [ // handlingunit {path: "/handlingunit",name: "handlingunit", component: resolve => require(["@/views/modules/handling-unit/handling-unit-management.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 生产发料 - {path: "/productionissue",name: "productionissue", component: resolve => require(["@/views/modules/production-issue/production-issue-pda.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/productionissue",name: "productionissue", component: resolve => require(["@/views/modules/production-issue/productionIssuePda.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, //生产退料 {path: "/productionreturn",name: "productionreturn", component: resolve => require(["@/views/modules/production-issue/productionReturnPDA.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: '/production-issue/pick/:orderNo', diff --git a/src/views/modules/outsourcing-issue/DirectIssue.vue b/src/views/modules/outsourcing-issue/DirectIssue.vue new file mode 100644 index 0000000..0bd9409 --- /dev/null +++ b/src/views/modules/outsourcing-issue/DirectIssue.vue @@ -0,0 +1,350 @@ + + + \ No newline at end of file diff --git a/src/views/modules/outsourcing-issue/MoveIssue.vue b/src/views/modules/outsourcing-issue/MoveIssue.vue new file mode 100644 index 0000000..7159009 --- /dev/null +++ b/src/views/modules/outsourcing-issue/MoveIssue.vue @@ -0,0 +1,50 @@ + + + \ No newline at end of file diff --git a/src/views/modules/outsourcing-issue/PickingIssue.vue b/src/views/modules/outsourcing-issue/PickingIssue.vue new file mode 100644 index 0000000..4eb7ed4 --- /dev/null +++ b/src/views/modules/outsourcing-issue/PickingIssue.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/src/views/modules/outsourcing-issue/ReturnIssue.vue b/src/views/modules/outsourcing-issue/ReturnIssue.vue new file mode 100644 index 0000000..6b90b66 --- /dev/null +++ b/src/views/modules/outsourcing-issue/ReturnIssue.vue @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/src/views/modules/outsourcing-issue/index.vue b/src/views/modules/outsourcing-issue/index.vue index 9a86d9f..8e3825c 100644 --- a/src/views/modules/outsourcing-issue/index.vue +++ b/src/views/modules/outsourcing-issue/index.vue @@ -1,280 +1,141 @@ \ No newline at end of file diff --git a/src/views/modules/production-issue/production-issue-pda.vue b/src/views/modules/production-issue/productionIssuePda.vue similarity index 96% rename from src/views/modules/production-issue/production-issue-pda.vue rename to src/views/modules/production-issue/productionIssuePda.vue index 3b26a32..6ed77d4 100644 --- a/src/views/modules/production-issue/production-issue-pda.vue +++ b/src/views/modules/production-issue/productionIssuePda.vue @@ -454,7 +454,7 @@ export default { // 直接发料相关方法 async loadWorkOrderMaterials() { if (!this.directIssueForm.workOrderNo) { - this.showMessage('请输入工单号', 'error') + this.$message.error('请输入工单号', 'error') return } @@ -523,7 +523,7 @@ export default { const response = await directIssue(issueData) - if (response.code === 0) { + if (response.data.code === 0) { this.showMessage('发料成功', 'success') // 刷新物料列表 await this.loadWorkOrderMaterials() @@ -533,7 +533,7 @@ export default { this.labelInfo = null this.issueQty = null } else { - this.showMessage(response.msg, 'error') + this.showMessage(response.data.msg, 'error') } } catch (error) { this.showMessage('发料失败', 'error') @@ -558,13 +558,13 @@ export default { notifyNo: this.requestIssueForm.notifyNo }) - if (response.code === 0) { - this.requestMaterials = response.materials || [] + if (response.data.code === 0) { + this.requestMaterials = response.data.materials || [] if (this.requestMaterials.length === 0) { this.showMessage('该申请单没有物料需求', 'warning') } } else { - this.showMessage(response.msg, 'error') + this.showMessage(response.data.msg, 'error') } } catch (error) { this.showMessage('加载申请单物料失败', 'error') @@ -616,7 +616,7 @@ export default { const response = await requestIssue(issueData) - if (response.code === 0) { + if (response.data.code === 0) { this.showMessage('发料成功,已同步到IFS', 'success') // 刷新物料列表 await this.loadRequestMaterials() @@ -626,7 +626,7 @@ export default { this.labelInfo = null this.issueQty = null } else { - this.showMessage(response.msg, 'error') + this.showMessage(response.data.msg, 'error') } } catch (error) { this.showMessage('发料失败', 'error') @@ -651,16 +651,16 @@ export default { palletType: 'PALLET' }) - if (response.code === 0) { + if (response.data.code === 0) { this.currentPallet = { - palletId: response.palletId, + palletId: response.data.palletId, notifyNo: this.palletForm.notifyNo, scannedUnits: [], unitCount: 0 } - this.showMessage('托盘创建成功: ' + response.palletId, 'success') + this.showMessage('托盘创建成功: ' + response.data.palletId, 'success') } else { - this.showMessage(response.msg, 'error') + this.showMessage(response.data.msg, 'error') } } catch (error) { this.showMessage('创建托盘失败', 'error') @@ -691,13 +691,13 @@ export default { scannedUnits: [this.scannedUnit] }) - if (response.code === 0) { + if (response.data.code === 0) { this.currentPallet.scannedUnits.push(this.scannedUnit) this.currentPallet.unitCount = this.currentPallet.scannedUnits.length this.showMessage('绑定成功', 'success') this.scannedUnit = '' } else { - this.showMessage(response.msg, 'error') + this.showMessage(response.data.msg, 'error') } } catch (error) { this.showMessage('绑定失败', 'error') @@ -722,10 +722,10 @@ export default { printerName: this.palletForm.printerName }) - if (response.code === 0) { + if (response.data.code === 0) { this.showMessage('标签打印成功', 'success') } else { - this.showMessage(response.msg, 'error') + this.showMessage(response.data.msg, 'error') } } catch (error) { this.showMessage('打印失败', 'error') @@ -750,8 +750,8 @@ export default { scannedLabel: this.scannedLabel }) - if (response.code === 0 && response.labelInfo) { - this.labelInfo = response.labelInfo + if (response.data.code === 0 && response.data.labelInfo) { + this.labelInfo = response.data.labelInfo this.issueQty = null // 重置发料数量 this.showMessage('标签解析成功', 'success') } else {