diff --git a/src/api/yieldReport/produce_order.js b/src/api/yieldReport/produce_order.js index 37cef00..930f56f 100644 --- a/src/api/yieldReport/produce_order.js +++ b/src/api/yieldReport/produce_order.js @@ -19,3 +19,14 @@ export const getUserSpecialSecurity = data => createAPI('schedule/getUserSpecial export const closeOrOpenProduceOrder = data => createAPI('schedule/closeOrOpenProduceOrder', 'POST', data) // 暂停/重开 export const pauseOrOpenProduceOrder = data => createAPI('schedule/pauseOrOpenProduceOrder', 'POST', data) +// 确认/取消 生产订单已排产 +export const costRollUpProduceOrder = data => createAPI('schedule/costRollUpProduceOrder', 'POST', data) +// 确认/取消 刀模已发 +export const manualProduceOrder = data => createAPI('schedule/manualProduceOrder', 'POST', data) +// 确认/取消 印版已发 +export const repairSOFlagProduceOrder = data => createAPI('schedule/repairSOFlagProduceOrder', 'POST', data) + +// 取消所有派工单操作 +export const workbenchCancelallops = data => createAPI('schedule/workbenchCancelallops', 'POST', data) +// 创建重检派工单 +export const soscheduleNewReinspectjob = data => createAPI('schedule/soscheduleNewReinspectjob', 'POST', data) diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue index 99aa5e3..76d7df6 100644 --- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue +++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue @@ -1638,6 +1638,17 @@ ], } }, + watch: { + $route:{ + handler: function(val, oldVal){ + this.$router.onReady(() => { + this.modelData.orderNo = this.$route.query.order + }) + }, + // 深度观察监听 + deep: true + } + }, mounted() { this.$nextTick(() => { this.height = window.innerHeight - 255; @@ -1895,7 +1906,9 @@ // 导出 end }, created() { - + this.$router.onReady(() => { + this.modelData.orderNo = this.$route.query.order + }) } } diff --git a/src/views/modules/yieldReport/com_create_recheck.vue b/src/views/modules/yieldReport/com_create_recheck.vue new file mode 100644 index 0000000..d4cc4c2 --- /dev/null +++ b/src/views/modules/yieldReport/com_create_recheck.vue @@ -0,0 +1,219 @@ + + + + + diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 0130f85..3af4636 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -78,20 +78,50 @@ + + + 主菜单 - 生产订单 + 生产订单 + +
关闭 - 打开 + 打开 + +
暂停 重新开工 +
+ 创建重检派工单 + +
+ 取消所有派工单操作 + +
+ 生产已排料 + + + 取消生产已排料 + +
+ 刀模已发 + + 取消刀模已发 + +
+ 印版已发 + + 取消印版已发 + +
@@ -155,6 +185,8 @@ + + @@ -165,7 +197,11 @@ import { reportCheck, getUserSpecialSecurity, closeOrOpenProduceOrder, - pauseOrOpenProduceOrder + pauseOrOpenProduceOrder, + costRollUpProduceOrder, + manualProduceOrder, + repairSOFlagProduceOrder, + workbenchCancelallops } from '@/api/yieldReport/produce_order.js'; /*引入组件*/ @@ -175,6 +211,7 @@ import comFinishSchedule from "./com_finish_schedule";/*结束派工的组件*/ import fqcProduceReportNormal from "./otherReport/fqc_produce_report_normal";/*结束派工的组件*/ import reworkInspectReport from "./otherReport/rework_inspect_report";/*结束派工的组件*/ import fqcSplitRollReport from "./otherReport/fqc_split_roll_report";/*结束派工的组件*/ +import createRecheck from './com_create_recheck' export default { data() { @@ -993,7 +1030,15 @@ export default { openButton: true, closedButton: true, pauseButton: true, - openReverseButton: true + openReverseButton: true, + costRollUpFlagButton: true, + canceledCostRollUpFlagButton: false, + manualFlagButton: false, + canceledManualFlagButton: false, + repairSOFlagButton: false, + canceledRepairSOFlagButton: false, + canceledAllPrdButton: false, + createRecheckButton: false, } } }, @@ -1004,6 +1049,7 @@ export default { fqcProduceReportNormal, /*FQC报工*/ reworkInspectReport, /*返工重建*/ fqcSplitRollReport, /*FQC分卷*/ + createRecheck /*创建重检派工单*/ }, mounted() { this.$nextTick(() => { @@ -1018,11 +1064,15 @@ export default { this.menuButton.openButton = true this.menuButton.closedButton = true this.menuButton.pauseButton = true - this.menuButton.openReverseButton = true + this.menuButton.costRollUpFlagButton = true + this.menuButton.canceledCostRollUpFlagButton = true + this.menuButton.manualFlagButton = true + this.menuButton.canceledManualFlagButton = true + this.menuButton.repairSOFlagButton = true + this.menuButton.canceledRepairSOFlagButton = true } else { // 前往生产订单按钮 this.menuButton.prdButton = false - // 关闭按钮 if (this.currentRow.closedFlag == 'N') { let data = { @@ -1042,7 +1092,6 @@ export default { // 打开按钮 if (this.currentRow.closedFlag == 'Y') { - this.menuButton.closedButton = true let data = { userSpecialSecurityNo: 231, username: this.$store.state.user.name, @@ -1054,6 +1103,8 @@ export default { this.menuButton.openButton = true } }) + } else { + this.menuButton.openButton = true } // 暂停 if (this.currentRow.closedFlag == 'N' && this.currentRow.parkFlag == 'N') { @@ -1065,6 +1116,108 @@ export default { this.menuButton.openReverseButton = false this.menuButton.pauseButton = true } + // 生产排料 + if (this.currentRow.costRollUpFlag == 'N') { + // 获取特殊权限 + let data = { + userSpecialSecurityNo: 238, + username: this.$store.state.user.name, + } + getUserSpecialSecurity(data).then(({data}) => { + if (data.userSpecialSecurity == 'Y') { + this.menuButton.costRollUpFlagButton = false + } else { + this.menuButton.costRollUpFlagButton = true + } + }) + } else { + this.menuButton.costRollUpFlagButton = true + } + // 取消生产排料 + if (this.currentRow.costRollUpFlag == 'Y') { + // 获取特殊权限 + let data = { + userSpecialSecurityNo: 238, + username: this.$store.state.user.name, + } + getUserSpecialSecurity(data).then(({data}) => { + if (data.userSpecialSecurity == 'Y') { + this.menuButton.canceledCostRollUpFlagButton = false + } else { + this.menuButton.canceledCostRollUpFlagButton = true + } + }) + } else { + this.menuButton.canceledCostRollUpFlagButton = true + } + // 刀模已发 确认 + if (this.currentRow.manualFlag == 'N') { + // 获取特殊权限 + let data = { + userSpecialSecurityNo: 258, + username: this.$store.state.user.name, + } + getUserSpecialSecurity(data).then(({data}) => { + if (data.userSpecialSecurity == 'Y') { + this.menuButton.manualFlagButton = false + } else { + this.menuButton.manualFlagButton = true + } + }) + } else { + this.menuButton.manualFlagButton = true + } + // 刀模已发 取消 + if (this.currentRow.manualFlag == 'Y') { + // 获取特殊权限 + let canceledAllPrdData = { + userSpecialSecurityNo: 259, + username: this.$store.state.user.name, + } + getUserSpecialSecurity(data).then(({data}) => { + if (data.userSpecialSecurity == 'Y') { + this.menuButton.canceledManualFlagButton = false + } else { + this.menuButton.canceledManualFlagButton = true + } + }) + } else { + this.menuButton.canceledManualFlagButton = true + } + // 印版已发 确认 + if (this.currentRow.repairSOFlag == 'N') { + // 获取特殊权限 + let data = { + userSpecialSecurityNo: 259, + username: this.$store.state.user.name, + } + getUserSpecialSecurity(data).then(({data}) => { + if (data.userSpecialSecurity == 'Y') { + this.menuButton.repairSOFlagButton = false + } else { + this.menuButton.repairSOFlagButton = true + } + }) + } else { + this.menuButton.repairSOFlagButton = true + } + // 印版已发 取消 + if (this.currentRow.repairSOFlag == 'Y') { + // 获取特殊权限 + let data = { + userSpecialSecurityNo: 259, + username: this.$store.state.user.name, + } + getUserSpecialSecurity(data).then(({data}) => { + if (data.userSpecialSecurity == 'Y') { + this.menuButton.canceledRepairSOFlagButton = false + } else { + this.menuButton.canceledRepairSOFlagButton = true + } + }) + } else { + this.menuButton.canceledRepairSOFlagButton = true + } } }, @@ -1077,7 +1230,12 @@ export default { this.$message.error('请先选择派工单!'); return false; } - this.$router.push('/shopOrder-shopOrder/shopOrder', this.currentRow.orderNo) + this.$router.push({ + path: '/shopOrder-shopOrder/shopOrder', + query: { + order: this.currentRow.orderNo + } + }) } // 关闭 if ('1' == val) { @@ -1179,6 +1337,181 @@ export default { }) }); } + // 创建重检派工单 + if ('5' == val) { + this.$nextTick(() => { + this.$refs.createRecheck.init(this.currentRow); + }); + } + // 取消所有派工单操作 + if ('6' == val) { + //调用提示的方法 + this.$confirm(` 确定取消所有派工单操作`, `生产已排料`, { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let data = { + orderNo: this.currentRow.orderNo, + itemNo: this.currentRow.itemNo, + site: this.currentRow.site, + seqNo: this.currentRow.seqNo, + } + workbenchCancelallops(data).then(({data}) => { + if (data.code == 0) { + this.$message.success(data.msg) + } else { + this.$message.warning(data.msg) + } + }) + }) + } + // 生产已排料 确认 + if ('7' == val) { + //调用提示的方法 + this.$confirm(` 确定该订单的料已排`, `生产已排料`, { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let data = { + username: this.$store.state.user.name, + orderNo: this.currentRow.orderNo, + costRollUpFlag: 'Y', + site: this.currentRow.site, + orderChangeStatus: "订单已排料", + } + costRollUpProduceOrder(data).then(({data}) => { + if (data.code == 0) { + this.$message.success(data.msg) + } else { + this.$message.warning(data.msg) + } + }) + + }) + } + // 生产已排料 取消 + if ('8' == val) { + //调用提示的方法 + this.$confirm(` 确定要撤销该订单的排料？`, `撤销订单排料`, { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let data = { + username: this.$store.state.user.name, + orderNo: this.currentRow.orderNo, + costRollUpFlag: 'N', + site: this.currentRow.site, + orderChangeStatus: "撤销订单排料", + } + costRollUpProduceOrder(data).then(({data}) => { + if (data.code == 0) { + this.$message.success(data.msg) + } else { + this.$message.warning(data.msg) + } + }) + + }) + } + // 刀模 确认 + if ('9' == val) { + this.$confirm(` 确定该订单的刀模已发？`, `刀模已发`, { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let data = { + username: this.$store.state.user.name, + orderNo: this.currentRow.orderNo, + manualFlag: 'Y', + site: this.currentRow.site, + orderChangeStatus: "订单刀模已发", + } + manualProduceOrder(data).then(({data}) => { + if (data.code == 0) { + this.$message.success(data.msg) + } else { + this.$message.warning(data.msg) + } + }) + + }) + } + // 刀模 取消 + if ('10' == val) { + this.$confirm(` 确定要撤销该订单的刀模已发？`, `刀模已发`, { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let data = { + username: this.$store.state.user.name, + orderNo: this.currentRow.orderNo, + manualFlag: 'N', + site: this.currentRow.site, + orderChangeStatus: "撤销订单刀模已发", + } + manualProduceOrder(data).then(({data}) => { + if (data.code == 0) { + this.$message.success(data.msg) + } else { + this.$message.warning(data.msg) + } + }) + + }) + } + // 印版已发 + if ('11' == val) { + this.$confirm(` 确定该订单的印版已发？`, `印版已发`, { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let data = { + username: this.$store.state.user.name, + orderNo: this.currentRow.orderNo, + repairSOFlag: 'Y', + site: this.currentRow.site, + orderChangeStatus: "订单印版已发", + } + repairSOFlagProduceOrder(data).then(({data}) => { + if (data.code == 0) { + this.$message.success(data.msg) + } else { + this.$message.warning(data.msg) + } + }) + + }) + } + // 印版已发 取消 + if ('12' == val) { + this.$confirm(` 确定要撤销该订单的印版已发？`, `订单印版`, { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let data = { + username: this.$store.state.user.name, + orderNo: this.currentRow.orderNo, + repairSOFlag: 'N', + site: this.currentRow.site, + orderChangeStatus: "订单印版已发", + } + repairSOFlagProduceOrder(data).then(({data}) => { + if (data.code == 0) { + this.$message.success(data.msg) + } else { + this.$message.warning(data.msg) + } + }) + + }) + } }, // FQC 报工 fqcReportModal() { @@ -1502,5 +1835,15 @@ div.customer-el-card-blue { font-size: 12px; } +.el-dropdown-menu--medium .el-dropdown-menu__item { + line-height: 18px; + padding: 0 17px; + font-size: 12px; +} + +hr { + margin-top: 0px; +} + /*控制上下间距*/