Merge branch 'xiaozy_产品列表' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into lixuan

src/views/product/components/add.vue

@@ -110,7 +110,10 @@ export default {
       refineryList: [],
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
-        autocompleteKey: "refineryName",
+        autocompleteKey: {
+          key: "refineryName",
+          enableMark: "ENABLE",
+        },
         labelKey: "refineryName",
         valueKey: "id",
         placeholder: "炼厂名称",

src/views/product/components/adjust.vue

@@ -27,7 +27,7 @@
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="controlWindows.adjust = false">取 消</el-button>
+      <el-button @click="closeWindow">取 消</el-button>
       <el-button type="primary" @click="submit">确 定</el-button>
     </span>
   </el-dialog>
@@ -67,8 +67,8 @@ export default {
       });
     },
     closeWindow() {
-      this.form = {};
       this.$emit("closeWindow");
+      this.form = {};
       this.$nextTick(() => {
         this.$refs.form.clearValidate();
         this.controlWindows.adjust = false;