Merge remote-tracking branch 'origin/master'

src/views/technology/process/single.vue

@@ -5,6 +5,7 @@
     :modal= false
     width="1100px"
     center
+    :before-close="cancelEquipmentForm"
   >
     <el-row :gutter="20">
       <!--分类数据-->
@@ -78,7 +79,7 @@
     </el-row>
     <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitEquipmentForm">确 定</el-button>
-        <el-button @click="showFlag=false">取 消</el-button>
+        <el-button @click="cancelEquipmentForm">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -187,21 +188,22 @@ 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() {
+        handleQuery() {
-      this.queryParams.pageNum = 1;
+          this.queryParams.pageNum = 1;
-      this.getList();
+           this.getList();
-    },
+        },
 
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.equipmentTypeCode = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -263,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;
+    }
   }
 };
 </script>

src/views/technology/recipe/single.vue

@@ -5,6 +5,7 @@
     :modal= false
     width="1100px"
     center
+    :before-close="cancelEquipmentForm"
   >
     <el-row :gutter="20">
       <!--分类数据-->
@@ -78,7 +79,7 @@
     </el-row>
     <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitEquipmentForm">确 定</el-button>
-        <el-button @click="showFlag=false">取 消</el-button>
+        <el-button @click="cancelEquipmentForm">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -187,21 +188,22 @@ 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() {
+        handleQuery() {
-      this.queryParams.pageNum = 1;
+          this.queryParams.pageNum = 1;
-      this.getList();
+           this.getList();
-    },
+        },
 
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.equipmentTypeCode = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -263,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;
+    }
   }
 };
 </script>