diff --git a/src/views/technology/process/single.vue b/src/views/technology/process/single.vue index 7fe311af..d16f1bfb 100644 --- a/src/views/technology/process/single.vue +++ b/src/views/technology/process/single.vue @@ -5,6 +5,7 @@ :modal= false width="1100px" center + :before-close="cancelEquipmentForm" > @@ -78,7 +79,7 @@ @@ -187,18 +188,18 @@ export default { // 节点单击事件 handleNodeClick(data) { - console.log('id',data.id); + console.log('id',data.id); this.queryParams.equipmentTypeCode = data.equipmentTypeCode; console.log(this.equipmentTypeCode); this.handleQuery(); this.queryParams.equipmentTypeCode = null; }, - /** 搜索按钮操作 */ - handleQuery() { - this.queryParams.pageNum = 1; - this.getList(); - }, + /** 搜索按钮操作 */ + handleQuery() { + this.queryParams.pageNum = 1; + this.getList(); + }, /** 重置按钮操作 */ resetQuery() { @@ -264,9 +265,18 @@ export default { } this.selectedRows = this.queryParams.itemCodeGet; this.$emit('onSelected', this.selectedRows); + this.queryParams.equipmentTypeCode = null; + this.getList(); + console.log('111111',this.queryParams.equipmentTypeCode); this.showFlag = false; this.queryParams.itemCodeGet = ""; }, + cancelEquipmentForm(){ + this.queryParams.equipmentTypeCode = null; + this.getList(); + console.log('111111',this.queryParams.equipmentTypeCode); + this.showFlag = false; + } } }; diff --git a/src/views/technology/recipe/single.vue b/src/views/technology/recipe/single.vue index 7fe311af..d16f1bfb 100644 --- a/src/views/technology/recipe/single.vue +++ b/src/views/technology/recipe/single.vue @@ -5,6 +5,7 @@ :modal= false width="1100px" center + :before-close="cancelEquipmentForm" > @@ -78,7 +79,7 @@ @@ -187,18 +188,18 @@ export default { // 节点单击事件 handleNodeClick(data) { - console.log('id',data.id); + console.log('id',data.id); this.queryParams.equipmentTypeCode = data.equipmentTypeCode; console.log(this.equipmentTypeCode); this.handleQuery(); this.queryParams.equipmentTypeCode = null; }, - /** 搜索按钮操作 */ - handleQuery() { - this.queryParams.pageNum = 1; - this.getList(); - }, + /** 搜索按钮操作 */ + handleQuery() { + this.queryParams.pageNum = 1; + this.getList(); + }, /** 重置按钮操作 */ resetQuery() { @@ -264,9 +265,18 @@ export default { } this.selectedRows = this.queryParams.itemCodeGet; this.$emit('onSelected', this.selectedRows); + this.queryParams.equipmentTypeCode = null; + this.getList(); + console.log('111111',this.queryParams.equipmentTypeCode); this.showFlag = false; this.queryParams.itemCodeGet = ""; }, + cancelEquipmentForm(){ + this.queryParams.equipmentTypeCode = null; + this.getList(); + console.log('111111',this.queryParams.equipmentTypeCode); + this.showFlag = false; + } } };