From 440ec7a2eb3c835446b80654ba4e042b37df94cb Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 17 Nov 2022 09:49:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E5=BC=82=E5=B8=B8-=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=88=86=E5=8D=B7=202022=E5=B9=B411=E6=9C=8817?= =?UTF-8?q?=E6=97=A5=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/produce_report_normal.js | 3 + .../yieldReport/com_produce_report_normal.vue | 76 ++++++++++++++++++- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index 6b1cafb..7fadeea 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/src/api/yieldReport/produce_report_normal.js @@ -83,3 +83,6 @@ export const getScheduleShiftData = data => createAPI('schedule/getScheduleShift //查询打印的数据 export const getSfdcFlowLabelData = data => createAPI('scheduling/getSfdcFlowLabelData', 'POST', data) + +// 材料异常 创建分卷 +export const rollSplit = data => createAPI('schedule/rollSplit', 'POST', data) diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 570b06b..6bc1d74 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -452,7 +452,7 @@ {{ buttons.otherOperation }} - + + + +
+ + {{ labels.rollSplit }} + + + {{ labels.scannerMaterial }} + +
+ {{ '材料异常处理' }} + +
+
@@ -613,8 +636,11 @@ import { finishMaterialWithNoRemainder,/*执行材料结束使用 且无剩余 */ switchrollReverse, getSfdcFlowLabelData, + rollSplit } from "@/api/yieldReport/produce_report_normal.js"; - +import { + getUserSpecialSecurity, +} from '@/api/yieldReport/produce_order.js' /*打印标签专用的js*/ import { printSfdcLabel, @@ -657,6 +683,8 @@ export default { data() { return { titleCon: '', + popoverFlag2: false, + rollSplitButton: false, // 拆分卷是否可用 showDefault: false, popoverFlag: false, showNotOverFlag: false, @@ -3440,6 +3468,48 @@ export default { notOverFinishRoll,/*异常下级报工*/ }, methods: { + + // 获取特殊权限 + getUserSpecialSecurity() { + let data = { + userSpecialSecurityNo: 240, + username: this.$store.state.user.name + } + getUserSpecialSecurity(data).then(({data}) => { + if (data.userSpecialSecurity == 'Y') { + this.rollSplitButton = false + } else { + this.rollSplitButton = true + } + }) + }, + rollSplit() { + // 取消收藏 + this.$confirm(`确实要创建一个异常卷?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let dto = { + site: this.$store.state.user.site, + orderNo: this.scheduleData.orderNo, + itemNo: this.scheduleData.itemNo, + seqNo: this.scheduleData.seqNo, + userId: this.$store.state.user.name, + } + rollSplit(dto).then(({data}) => { + if (data && data.code == 0) { + this.$message.success(data.msg) + } else { + this.$message.warning(data.msg) + } + }) + }) + + }, + scannerMaterial(row) { + + }, // 不良记录 sfdcDefectListSummaries(param) { const {columns, data} = param; @@ -3675,6 +3745,8 @@ export default { this.activeTable = 'sfdc_time'; //刷新当前派工单的信息 this.refreshPageData(); + // 操作权限 + this.getUserSpecialSecurity(); }, //刷新页面的数据