From 718d31ac2b6f0c12d1e4f6672ea5ef2d86f0e0d6 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Mon, 28 Mar 2022 10:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E5=8C=85=E8=A3=85=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=20sxm=202022-3-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../otherReport/change_packaging.vue | 3662 +++++++++++++++++
.../modules/yieldReport/produce_order.vue | 284 +-
2 files changed, 3808 insertions(+), 138 deletions(-)
create mode 100644 src/views/modules/yieldReport/otherReport/change_packaging.vue
diff --git a/src/views/modules/yieldReport/otherReport/change_packaging.vue b/src/views/modules/yieldReport/otherReport/change_packaging.vue
new file mode 100644
index 0000000..9800568
--- /dev/null
+++ b/src/views/modules/yieldReport/otherReport/change_packaging.vue
@@ -0,0 +1,3662 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 仅显示当前卷信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -220,6 +220,7 @@ export default {
data() {
return {
height: 800,
+ menuShow:false,
showOperatorFlag: false,
showReportFlag: false,
fqcShowReportFlag: false,
@@ -1065,6 +1066,7 @@ export default {
methods: {
// 控制是否显示功能
menuButtonFlag() {
+ this.menuShow = false
if (JSON.stringify(this.currentRow) == '{}') {
this.menuButton.prdButton = true
this.menuButton.openButton = true
@@ -1079,167 +1081,173 @@ export default {
this.menuButton.canceledAllPrdButton = true
this.menuButton.createRecheckButton = true
} else {
+ let currentRow = null
// 获取订单信息
let searchOrder = {
orderNo: this.currentRow.orderNo,
seqNo: this.currentRow.seqNo,
site: this.currentRow.site,
- searchFlag:true
+ username: this.$store.state.user.name,
+ searchFlag: true
}
- getProduceScheduleList(searchOrder).then(({data}) => {
+ currentRow = getProduceScheduleList(searchOrder).then(({data}) => {
//设置查询数据
- this.currentRow = data.rows[0];
- });
- this.menuButton.canceledAllPrdButton = false
- this.menuButton.createRecheckButton = false
- // 前往生产订单按钮
- this.menuButton.prdButton = false
- // 关闭按钮
- if (this.currentRow.closedFlag == 'N') {
- let data = {
- userSpecialSecurityNo: 230,
- username: this.$store.state.user.name,
+ currentRow = data.rows[0];
+ if (currentRow == null){
+ return;
}
- getUserSpecialSecurity(data).then(({data}) => {
- if (data.userSpecialSecurity == 'Y') {
- this.menuButton.closedButton = false
- } else {
- this.menuButton.closedButton = true
+ this.menuButton.canceledAllPrdButton = false
+ this.menuButton.createRecheckButton = false
+ // 判断是否具有该页面权限
+
+ this.menuButton.prdButton = false
+ // 关闭按钮
+ if (currentRow.closedFlag == 'N') {
+ let data = {
+ userSpecialSecurityNo: 230,
+ username: this.$store.state.user.name,
}
- })
- } else {
- this.menuButton.closedButton = true
- }
- // 打开按钮
- if (this.currentRow.closedFlag == 'Y') {
- let data = {
- userSpecialSecurityNo: 231,
- username: this.$store.state.user.name,
+ getUserSpecialSecurity(data).then(({data}) => {
+ if (data.userSpecialSecurity == 'Y') {
+ this.menuButton.closedButton = false
+ } else {
+ this.menuButton.closedButton = true
+ }
+ })
+ } else {
+ this.menuButton.closedButton = true
}
- getUserSpecialSecurity(data).then(({data}) => {
- if (data.userSpecialSecurity == 'Y') {
- this.menuButton.openButton = false
- } else {
- this.menuButton.openButton = true
+ // 打开按钮
+ if (currentRow.closedFlag == 'Y') {
+ let data = {
+ userSpecialSecurityNo: 231,
+ username: this.$store.state.user.name,
}
- })
- } else {
- this.menuButton.openButton = true
- }
- // 暂停
- if (this.currentRow.closedFlag == 'N' && this.currentRow.parkFlag == 'N') {
- this.menuButton.pauseButton = false
- this.menuButton.openReverseButton = true
- }
- // 重开
- if (this.currentRow.closedFlag == 'N' & this.currentRow.parkFlag == 'Y') {
- 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.openButton = false
+ } else {
+ this.menuButton.openButton = true
+ }
+ })
+ } else {
+ this.menuButton.openButton = true
}
- getUserSpecialSecurity(data).then(({data}) => {
- if (data.userSpecialSecurity == 'Y') {
- this.menuButton.costRollUpFlagButton = false
- } else {
- this.menuButton.costRollUpFlagButton = true
+ // 暂停
+ if (currentRow.closedFlag == 'N' && currentRow.parkFlag == 'N') {
+ this.menuButton.pauseButton = false
+ this.menuButton.openReverseButton = true
+ }
+ // 重开
+ if (currentRow.closedFlag == 'N' & currentRow.parkFlag == 'Y') {
+ menuButton.openReverseButton = false
+ menuButton.pauseButton = true
+ }
+ // 生产排料
+ if (currentRow.costRollUpFlag == 'N') {
+ // 获取特殊权限
+ let data = {
+ userSpecialSecurityNo: 238,
+ username: this.$store.state.user.name,
}
- })
- } 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.costRollUpFlagButton = false
+ } else {
+ this.menuButton.costRollUpFlagButton = true
+ }
+ })
+ } else {
+ this.menuButton.costRollUpFlagButton = true
}
- getUserSpecialSecurity(data).then(({data}) => {
- if (data.userSpecialSecurity == 'Y') {
- this.menuButton.canceledCostRollUpFlagButton = false
- } else {
- this.menuButton.canceledCostRollUpFlagButton = true
+ // 取消生产排料
+ if (currentRow.costRollUpFlag == 'Y') {
+ // 获取特殊权限
+ let data = {
+ userSpecialSecurityNo: 238,
+ username: this.$store.state.user.name,
}
- })
- } 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.canceledCostRollUpFlagButton = false
+ } else {
+ this.menuButton.canceledCostRollUpFlagButton = true
+ }
+ })
+ } else {
+ this.menuButton.canceledCostRollUpFlagButton = true
}
- getUserSpecialSecurity(data).then(({data}) => {
- if (data.userSpecialSecurity == 'Y') {
- this.menuButton.manualFlagButton = false
- } else {
- this.menuButton.manualFlagButton = true
+ // 刀模已发 确认
+ if (currentRow.manualFlag == 'N') {
+ // 获取特殊权限
+ let data = {
+ userSpecialSecurityNo: 258,
+ username: this.$store.state.user.name,
}
- })
- } 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.manualFlagButton = false
+ } else {
+ this.menuButton.manualFlagButton = true
+ }
+ })
+ } else {
+ this.menuButton.manualFlagButton = true
}
- getUserSpecialSecurity(canceledAllPrdData).then(({data}) => {
- if (data.userSpecialSecurity == 'Y') {
- this.menuButton.canceledManualFlagButton = false
- } else {
- this.menuButton.canceledManualFlagButton = true
+ // 刀模已发 取消
+ if (currentRow.manualFlag == 'Y') {
+ // 获取特殊权限
+ let canceledAllPrdData = {
+ userSpecialSecurityNo: 259,
+ username: this.$store.state.user.name,
}
- })
- } else {
- this.menuButton.canceledManualFlagButton = true
- }
- // 印版已发 确认
- if (this.currentRow.repairSOFlag == 'N') {
- // 获取特殊权限
- let data = {
- userSpecialSecurityNo: 259,
- username: this.$store.state.user.name,
+ getUserSpecialSecurity(canceledAllPrdData).then(({data}) => {
+ if (data.userSpecialSecurity == 'Y') {
+ this.menuButton.canceledManualFlagButton = false
+ } else {
+ this.menuButton.canceledManualFlagButton = true
+ }
+ })
+ } else {
+ this.menuButton.canceledManualFlagButton = true
}
- getUserSpecialSecurity(data).then(({data}) => {
- if (data.userSpecialSecurity == 'Y') {
- this.menuButton.repairSOFlagButton = false
- } else {
- this.menuButton.repairSOFlagButton = true
+ // 印版已发 确认
+ if (currentRow.repairSOFlag == 'N') {
+ // 获取特殊权限
+ let data = {
+ userSpecialSecurityNo: 259,
+ username: this.$store.state.user.name,
}
- })
- } 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.repairSOFlagButton = false
+ } else {
+ this.menuButton.repairSOFlagButton = true
+ }
+ })
+ } else {
+ this.menuButton.repairSOFlagButton = true
}
- getUserSpecialSecurity(data).then(({data}) => {
- if (data.userSpecialSecurity == 'Y') {
- this.menuButton.canceledRepairSOFlagButton = false
- } else {
- this.menuButton.canceledRepairSOFlagButton = true
+ // 印版已发 取消
+ if (currentRow.repairSOFlag == 'Y') {
+ // 获取特殊权限
+ let data = {
+ userSpecialSecurityNo: 259,
+ username: this.$store.state.user.name,
}
- })
- } else {
- this.menuButton.canceledRepairSOFlagButton = true
- }
+ getUserSpecialSecurity(data).then(({data}) => {
+ if (data.userSpecialSecurity == 'Y') {
+ this.menuButton.canceledRepairSOFlagButton = false
+ } else {
+ this.menuButton.canceledRepairSOFlagButton = true
+ }
+ })
+ } else {
+ this.menuButton.canceledRepairSOFlagButton = true
+ }
+ this.menuShow=true
+ });
}
-
},
/*区分不同的菜单 调用不同的方法 调用不同的方法*/
handleCommand(val) {