diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue
index f4178ed..b07fab7 100644
--- a/src/views/productionManagement/blbWorkOrder/components/glass.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue
@@ -96,6 +96,14 @@
v-if="isPriorityOpen"
@closeDialog="closeDialog"
>
+
+
+
@@ -107,6 +115,7 @@ import abnormalDialog from './abnormalDialog.vue';
import productionMonitoringDialog from '../../components/productionMonitoringDialog.vue';
import { getList } from '@/api/productionManagement/sinTerWorkOrder';
+import workRate from '@/views/workRate/index.vue';
export default {
components: {
@@ -115,9 +124,11 @@ export default {
closedDialog,
abnormalDialog,
productionMonitoringDialog,
+ workRate
},
data() {
return {
+ isWorkRateOpen:false,
itemData: [], //存数据
isPriorityOpen: false,
showAbnormal: false,
@@ -486,6 +497,16 @@ export default {
},
mounted() {},
methods: {
+ // 关闭弹窗
+ closeDialog() {
+ this.isWorkRateOpen=false
+ this.monitorDialog = false;
+ this.showBatches = false;
+ this.showClose = false;
+ this.showAbnormal = false;
+ this.isPriorityOpen = false;
+ this.onLoad(this.page, this.query);
+ },
printCraftCard_new(row){
window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER+'?woId='+row.woId);
},
@@ -517,7 +538,7 @@ export default {
// 生产监控
clickProduction(row) {
this.rowItem = row;
- this.monitorDialog = true;
+ this.isWorkRateOpen = true;
},
// 打印标签
handlePrintTags() {
@@ -543,15 +564,6 @@ export default {
this.itemData = [row];
this.showAbnormal = true;
},
- // 关闭弹窗
- closeDialog() {
- this.monitorDialog = false;
- this.showBatches = false;
- this.showClose = false;
- this.showAbnormal = false;
- this.isPriorityOpen = false;
- this.onLoad(this.page, this.query);
- },
currentChange(currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page, this.query);
diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue
index 35a6c56..9752279 100644
--- a/src/views/productionManagement/blbWorkOrder/components/others.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/others.vue
@@ -96,6 +96,14 @@
v-if="isPriorityOpen"
@closeDialog="closeDialog"
>
+
+
+
@@ -107,6 +115,7 @@ import abnormalDialog from './abnormalDialog.vue';
import productionMonitoringDialog from '../../components/productionMonitoringDialog.vue';
import { getList } from '@/api/productionManagement/sinTerWorkOrder';
+import workRate from '@/views/workRate/index.vue';
export default {
components: {
@@ -115,9 +124,11 @@ export default {
closedDialog,
abnormalDialog,
productionMonitoringDialog,
+ workRate
},
data() {
return {
+ isWorkRateOpen:false,
itemData: [], //存数据
isPriorityOpen: false,
showAbnormal: false,
@@ -519,7 +530,7 @@ export default {
// 生产监控
clickProduction(row) {
this.rowItem = row;
- this.monitorDialog = true;
+ this.isWorkRateOpen = true;
},
// 打印标签
handlePrintTags() {
@@ -547,6 +558,7 @@ export default {
},
// 关闭弹窗
closeDialog() {
+ this.isWorkRateOpen=false
this.monitorDialog = false;
this.showBatches = false;
this.showClose = false;