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

src/components/autocomplete/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <el-autocomplete
+    v-model="text"
+    :fetch-suggestions="querySearchAsync"
+    :value-key="config.valueKey"
+    :placeholder="config.placeholder"
+    clearable
+    @select="selectAutocomplete"
+    @clear="params[config.querykey] = ''"
+  ></el-autocomplete>
+</template>
+
+<script>
+export default {
+  props: {
+    params: Object,
+    config: Object,
+    // config: {
+    //   serveTarget: {}, // 接口
+    //   autocomplateKey: "", //远程搜索接口参数名
+    //   querykey: "", //查询接口参数名
+    // },
+  },
+  data() {
+    return {
+      text: "",
+    };
+  },
+  created() {
+    console.log("params", this.params);
+  },
+  methods: {
+    // 远程搜索
+    querySearchAsync(queryString, cb) {
+      if (queryString) {
+        let params = {};
+        params[this.config.autocompleteKey] = queryString;
+        this.config.serveTarget(params).then((res) => {
+          let timeInstance = setTimeout(() => {
+            clearTimeout(timeInstance);
+            if (res.data.length) {
+              cb(res.data);
+            } else cb([]);
+          }, 1000 * Math.random());
+        });
+      } else cb([]);
+    },
+    selectAutocomplete(item) {
+      this.params[this.config.querykey] = item.id;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/utils/directive.js

@@ -1,9 +1,7 @@
 import Vue from "vue";
 
-Vue.directive("checkNum", {
+const handle = (e, vNode) => {
-  update(el, binding, vNode) {
+  let val = e.target.value;
-    if (el.children.length) {
-      let val = el.children[0].value;
   let qualifiedNum = val
     .replace(/[^\d.]/g, "")
     .replace(/^\./g, "")
@@ -13,6 +11,18 @@ Vue.directive("checkNum", {
     .replace(/\./g, "")
     .replace("$#$", ".");
   vNode.componentInstance.$emit("input", qualifiedNum);
+};
+
+Vue.directive("checkNum", {
+  bind(el, binding, vNode) {
+    if (!el.children.length) {
+      return;
     }
+    el.children[0].addEventListener("keyup", (e) => {
+      handle(e, vNode);
+    });
+  },
+  unbind(el) {
+    el.children[0].removeEventListener("keyup");
   },
 });

src/views/product/components/add.vue

@@ -27,14 +27,16 @@
           </el-select>
         </el-form-item>
         <el-form-item label="炼厂名称" prop="refineryId">
-          <el-select v-model="form.refineryId" placeholder="请选择炼厂">
+          <!-- <el-autocomplete
-            <el-option
+            label
-              v-for="(item, index) in refineryList"
+            v-model="form.refineryId"
-              :key="index"
+            :fetch-suggestions="querySearchAsync"
-              :label="item.refineryName"
+            value-key="refineryName"
-              :value="item.id"
+            value="id"
-            ></el-option>
+            placeholder="请选择炼厂"
-          </el-select>
+          ></el-autocomplete> -->
+
+          <autocomplete :params="form" :config="configAutocomplete" />
         </el-form-item>
         <el-form-item label="所属炼厂库名" prop="belongLibrary">
           <el-input
@@ -88,15 +90,31 @@
 
 <script>
 import serve from "api/product.js";
-import refineryServe from "api/refineryInfo.js";
+import refineryInfoServe from "api/refineryInfo.js";
+
+import autocomplete from "components/autocomplete/index.vue";
 export default {
+  components: {
+    autocomplete,
+  },
   props: {
     controlWindows: Object,
   },
   data() {
+    let validatorRefineryId = (rule, value, callback) => {
+      if (this.form.refineryId) callback();
+      else callback("请选择炼厂");
+    };
     return {
       form: {},
       refineryList: [],
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocomplateKey: "refineryName",
+        valueKey: "refineryName",
+        placeholder: "炼厂名称",
+        querykey: "refineryId",
+      },
       productTypeList: [
         {
           label: "0#柴",
@@ -120,35 +138,32 @@ export default {
           { required: true, message: "请输入产品名称", trigger: "blur" },
         ],
         productType: [
-          { required: true, message: "请选择产品类型", trigger: "blur" },
+          { required: true, message: "请选择产品类型", trigger: "change" },
         ],
         refineryId: [
-          { required: true, message: "请选择炼厂", trigger: "blur" },
+          { required: true, validator: validatorRefineryId, trigger: "change" },
         ],
         belongLibrary: [
           { required: true, message: "请输入所属炼厂库名", trigger: "blur" },
         ],
         floorPrice: [
-          { required: true, message: "请输入所属炼厂库名", trigger: "blur" },
+          { required: true, message: "请输入成本价", trigger: "blur" },
         ],
         salePrice2company: [
-          { required: true, message: "请输入所属炼厂库名", trigger: "blur" },
+          { required: true, message: "请输入企业销售价", trigger: "blur" },
         ],
         salePrice2personal: [
-          { required: true, message: "请输入所属炼厂库名", trigger: "blur" },
+          { required: true, message: "请输入个人销售价", trigger: "blur" },
         ],
         measurement: [
           { required: true, message: "请输入计量单位", trigger: "blur" },
         ],
         enableMark: [
-          { required: true, message: "请选择启用状态", trigger: "blur" },
+          { required: true, message: "请选择启用状态", trigger: "change" },
         ],
       },
     };
   },
-  created() {
-    this.findByEntity();
-  },
   methods: {
     openDrawer() {
       let { id } = this.controlWindows.addInfo;
@@ -159,6 +174,7 @@ export default {
       }
     },
     submit() {
+      console.log("this.form", this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           this.judgeInterface(this.form).then((res) => {
@@ -176,17 +192,34 @@ export default {
       else return serve.save(form);
     },
     //炼厂list
-    findByEntity() {
+    // findByEntity() {
-      refineryServe.findByEntity().then((res) => {
+    //   refineryServe.findByEntity().then((res) => {
-        this.refineryList = res.data;
+    //     this.refineryList = res.data;
-      });
+    //   });
-    },
+    // },
+    // 远程搜索
+    // querySearchAsync(queryString, cb) {
+    //   if (queryString) {
+    //     refineryServe
+    //       .findByEntity({ refineryName: queryString })
+    //       .then((res) => {
+    //         let timeInstance = setTimeout(() => {
+    //           clearTimeout(timeInstance);
+    //           if (res.data.length) {
+    //             cb(res.data);
+    //           } else cb([]);
+    //         }, 1000 * Math.random());
+    //       });
+    //   } else cb([]);
+    // },
     closeWindow() {
       this.$emit("closeWindow");
-      this.$refs.form.clearValidate();
       this.form = {};
       this.controlWindows.addInfo = {};
+      this.$nextTick(() => {
+        this.$refs.form.clearValidate();
         this.controlWindows.add = false;
+      });
     },
   },
 };
@@ -197,7 +230,8 @@ export default {
   padding: 20px;
   .el-input,
   .el-select,
-  .el-textarea {
+  .el-textarea,
+  .el-autocomplete {
     width: 300px;
   }
 }

src/views/product/components/adjust.vue

@@ -69,8 +69,10 @@ export default {
     closeWindow() {
       this.form = {};
       this.$emit("closeWindow");
+      this.$nextTick(() => {
         this.$refs.form.clearValidate();
         this.controlWindows.adjust = false;
+      });
     },
   },
 };

src/views/product/components/batch.vue

@@ -42,7 +42,7 @@ export default {
       form: {},
       rules: {
         enableMark: [
-          { required: true, message: "请选择修改状态", trigger: "blur" },
+          { required: true, message: "请选择修改状态", trigger: "change" },
         ],
       },
     };
@@ -68,8 +68,10 @@ export default {
       this.list = [];
       this.form = {};
       this.$emit("closeWindow");
+      this.$nextTick(() => {
         this.$refs.form.clearValidate();
         this.controlWindows.batch = false;
+      });
     },
   },
 };

src/views/product/components/create.vue

@@ -25,14 +25,16 @@
           ></el-input> -->
         </el-form-item>
         <el-form-item label="炼厂名称" prop="refineryId">
-          <el-select v-model="form.refineryId" filterable reserve-keyword remote :remote-method="refineryData" placeholder="请选择炼厂">
+          <!-- <el-autocomplete
-            <el-option
+            label
-              v-for="(item, index) in refineryList"
+            v-model="form.refineryId"
-              :key="index"
+            :fetch-suggestions="querySearchAsync"
-              :label="item.refineryName"
+            value-key="refineryName"
-              :value="item.id"
+            value="id"
-            ></el-option>
+            placeholder="炼厂名称"
-          </el-select>
+          ></el-autocomplete> -->
+
+          <autocomplete :params="form" :config="configAutocomplete" />
         </el-form-item>
         <el-form-item label="产品类型" prop="productType">
           <el-select v-model="form.productType" filterable reserve-keyword remote :remote-method="productData" placeholder="请选择产品类型">
@@ -85,17 +87,33 @@
 
 <script>
 import serve from "api/product.js";
-import refineryServe from "api/refineryInfo.js";
+import refineryInfoServe from "api/refineryInfo.js";
+
+import autocomplete from "components/autocomplete/index.vue";
 export default {
+  components: {
+    autocomplete,
+  },
   props: {
     controlWindows: Object,
     // refineryTypeEnum: Array,
   },
   data() {
+    let validatorRefineryId = (rule, value, callback) => {
+      if (this.form.refineryId) callback();
+      else callback("请选择炼厂");
+    };
     return {
       customList:[],
       form: {},
       refineryList: [],
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocomplateKey: "refineryName",
+        valueKey: "refineryName",
+        placeholder: "炼厂名称",
+        querykey: "refineryId",
+      },
       productTypeList: [
         {
           label: "0#柴",
@@ -119,20 +137,17 @@ export default {
           { required: true, message: "请输入产品名称", trigger: "blur" },
         ],
         refineryId: [
-          { required: true, message: "请选择炼厂", trigger: "blur" },
+          { required: true, validator: validatorRefineryId, trigger: "change" },
         ],
         enableMark: [
-          { required: true, message: "请选择启用状态", trigger: "blur" },
+          { required: true, message: "请选择启用状态", trigger: "change" },
         ],
         productType: [
-          { required: true, message: "请选择产品类型", trigger: "blur" },
+          { required: true, message: "请选择产品类型", trigger: "change" },
         ],
       },
     };
   },
-  created() {
-    // this.findByEntity();
-  },
   methods: {
     //搜索炼厂
     refineryData(value){
@@ -182,6 +197,21 @@ export default {
     //     this.refineryList = res.data;
     //   });
     // },
+    // 远程搜索
+    // querySearchAsync(queryString, cb) {
+    //   if (queryString) {
+    //     refineryServe
+    //       .findByEntity({ refineryName: queryString })
+    //       .then((res) => {
+    //         let timeInstance = setTimeout(() => {
+    //           clearTimeout(timeInstance);
+    //           if (res.data.length) {
+    //             cb(res.data);
+    //           } else cb([]);
+    //         }, 1000 * Math.random());
+    //       });
+    //   } else cb([]);
+    // },
     closeWindow() {
       this.$emit("closeWindow");
       this.form = {};
@@ -197,7 +227,8 @@ export default {
   padding: 20px;
   .el-input,
   .el-select,
-  .el-textarea {
+  .el-textarea,
+  .el-autocomplete {
     width: 300px;
   }
 }

src/views/product/index.vue

@@ -7,19 +7,19 @@
         placeholder="产品名称"
         clearable
       ></el-input>
-      <el-select
+
-        v-model="parameter.params.refineryId"
+      <autocomplete :params="parameter.params" :config="configAutocomplete" />
+
+      <!-- <el-autocomplete
+        v-model="parameter.params.refineryName"
+        :fetch-suggestions="querySearchAsync"
+        @select="selectAutocomplete"
+        value-key="refineryName"
         placeholder="炼厂名称"
         clearable
-      >
+        @clear="parameter.params.refineryId = ''"
-        <el-option
+      ></el-autocomplete> -->
-          v-for="item in refineryList"
+
-          :key="item.id"
-          :label="item.refineryName"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
       <el-input
         v-model="parameter.params.belongLibrary"
         placeholder="所处炼厂库"
@@ -198,7 +198,7 @@
 
 <script>
 import serve from "api/product.js";
-import refineryServe from "api/refineryInfo.js";
+import refineryInfoServe from "api/refineryInfo.js";
 
 import add from "./components/add.vue";
 import create from "./components/create.vue";
@@ -206,6 +206,7 @@ import record from "./components/record.vue";
 import batch from "./components/batch.vue";
 import adjust from "./components/adjust.vue";
 
+import autocomplete from "components/autocomplete/index.vue";
 import pagination from "components/pagination/index.vue";
 import generalDetails from "components/generalDetails/index.vue";
 
@@ -221,6 +222,13 @@ export default {
         batch: false,
         adjust: false,
       },
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocomplateKey: "refineryName",
+        valueKey: "refineryName",
+        placeholder: "炼厂名称",
+        querykey: "refineryId",
+      },
       refineryList: [],
       multipleRowList: [],
       tableHeight: 0,
@@ -263,6 +271,7 @@ export default {
     adjust,
 
     pagination,
+    autocomplete,
     generalDetails,
   },
   mounted() {
@@ -275,7 +284,6 @@ export default {
     );
   },
   created() {
-    this.findByEntity();
     this.getByPage();
   },
   methods: {
@@ -294,12 +302,25 @@ export default {
         this.parameter.total = res.data.totalCount;
       });
     },
-    //炼厂list
+    // 远程搜索
-    findByEntity() {
+    // querySearchAsync(queryString, cb) {
-      refineryServe.findByEntity().then((res) => {
+    //   if (queryString) {
-        this.refineryList = res.data;
+    //     refineryServe
-      });
+    //       .findByEntity({ refineryName: queryString })
-    },
+    //       .then((res) => {
+    //         let timeInstance = setTimeout(() => {
+    //           clearTimeout(timeInstance);
+    //           if (res.data.length) {
+    //             console.log(res.data);
+    //             cb(res.data);
+    //           } else cb([]);
+    //         }, 1000 * Math.random());
+    //       });
+    //   } else cb([]);
+    // },
+    // selectAutocomplete(item) {
+    //   this.parameter.params.refineryId = item.id;
+    // },
     //新增
     addition() {
       this.controlWindows.addInfo.title = "产品新增";
@@ -328,10 +349,6 @@ export default {
           title: "产品修改",
           ...row,
         };
-        console.log(
-          "this.controlWindows.addInfo",
-          this.controlWindows.addInfo.floorPrice
-        );
         this.controlWindows.add = true;
       }
     },
@@ -403,6 +420,9 @@ export default {
       width: 183px;
       height: 40px;
     }
+    .el-autocomplete + .el-input,
+    .el-input + .el-autocomplete,
+    .el-autocomplete + .el-select,
     .el-input + .el-input,
     .el-input + .el-select,
     .el-select + .el-select,
@@ -439,10 +459,6 @@ export default {
       margin-bottom: 20px;
       border-radius: 10px 10px 0px 0px;
     }
-    // .el-link,
-    // .el-dropdown {
-    //   margin-right: 10px;
-    // }
 
     .el-dropdown-link {
       margin-right: 10px;

src/views/refineryAccount/components/add.vue

@@ -27,20 +27,16 @@
           </el-select>
         </el-form-item>
         <el-form-item label="炼厂名称" prop="refineryId">
-          <el-select
+          <!-- <el-autocomplete
-            class="mr20"
+            label
             v-model="form.refineryId"
+            :fetch-suggestions="querySearchAsync"
+            value-key="refineryName"
+            value="id"
             placeholder="请选择炼厂"
-            clearable
+          ></el-autocomplete> -->
-          >
+
-            <el-option
+          <autocomplete :params="form" :config="configAutocomplete" />
-              v-for="item in refineryList"
-              :key="item.id"
-              :label="item.refineryName"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
         </el-form-item>
       </el-form>
     </div>
@@ -54,15 +50,31 @@
 <script>
 import refineryInfoServe from "api/refineryInfo.js";
 import serve from "api/refineryAccount.js";
+
+import autocomplete from "components/autocomplete/index.vue";
 export default {
+  components: {
+    autocomplete,
+  },
   props: {
     controlWindows: Object,
     refineryAccountTypeEnum: Array,
   },
   data() {
+    let validatorRefineryId = (rule, value, callback) => {
+      if (this.form.refineryId) callback();
+      else callback("请选择炼厂");
+    };
     return {
       form: {},
       refineryList: [],
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocomplateKey: "refineryName",
+        valueKey: "refineryName",
+        placeholder: "炼厂名称",
+        querykey: "refineryId",
+      },
       rules: {
         accountName: [
           { required: true, message: "请输入账户名称", trigger: "blur" },
@@ -71,15 +83,13 @@ export default {
           { required: true, message: "请输入账户名称", trigger: "blur" },
         ],
         refineryId: [
-          { required: true, message: "请选择炼厂", trigger: "change" },
+          { required: true, validator: validatorRefineryId, trigger: "change" },
         ],
       },
     };
   },
   methods: {
-    openDrawer() {
+    openDrawer() {},
-      this.findByEntity();
-    },
     submit() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -97,22 +107,39 @@ export default {
       if (id) return serve.update(form);
       else return serve.save(form);
     },
-    //炼厂list
+    // //炼厂list
-    findByEntity() {
+    // findByEntity() {
-      refineryInfoServe.findByEntity().then((res) => {
+    //   refineryInfoServe.findByEntity().then((res) => {
-        this.refineryList = res.data;
+    //     this.refineryList = res.data;
-        let { id } = this.controlWindows.addInfo;
+    //     let { id } = this.controlWindows.addInfo;
-        if (id) {
+    //     if (id) {
-          this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
+    //       this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
-        }
+    //     }
-      });
+    //   });
-    },
+    // },
+    //远程搜索
+    // querySearchAsync(queryString, cb) {
+    //   if (queryString) {
+    //     refineryInfoServe
+    //       .findByEntity({ refineryName: queryString })
+    //       .then((res) => {
+    //         let timeInstance = setTimeout(() => {
+    //           clearTimeout(timeInstance);
+    //           if (res.data.length) {
+    //             cb(res.data);
+    //           } else cb([]);
+    //         }, 1000 * Math.random());
+    //       });
+    //   } else cb([]);
+    // },
     closeWindow() {
       this.$emit("closeWindow");
       this.form = {};
       this.controlWindows.addInfo = {};
+      this.$nextTick(() => {
         this.$refs.form.clearValidate();
         this.controlWindows.add = false;
+      });
     },
   },
 };
@@ -123,7 +150,8 @@ export default {
   padding: 20px;
   .el-input,
   .el-select,
-  .el-textarea {
+  .el-textarea,
+  .el-autocomplete {
     width: 300px;
   }
 }

src/views/refineryAccount/index.vue

@@ -1,20 +1,18 @@
 <template>
   <div class="order">
     <div class="frame">
-      <el-select
+      <!-- <el-autocomplete
         class="mr20"
+        label
         v-model="parameter.params.id"
+        :fetch-suggestions="querySearchAsync"
+        value-key="refineryName"
+        value="id"
         placeholder="炼厂名称"
-        clearable
+      ></el-autocomplete> -->
-      >
+
-        <el-option
+      <autocomplete :params="parameter.params" :config="configAutocomplete" />
-          v-for="item in refineryList"
+
-          :key="item.id"
-          :label="item.refineryName"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
       <el-select
         v-model="parameter.params.refineryType"
         placeholder="炼厂类型"
@@ -141,11 +139,18 @@ import serve from "api/refineryAccount.js";
 import add from "./components/add.vue";
 
 import pagination from "components/pagination/index.vue";
+import autocomplete from "components/autocomplete/index.vue";
 import generalDetails from "components/generalDetails/index.vue";
 
 import { refineryTypeEnum, refineryAccountTypeEnum } from "utils/dataType.js";
 
 export default {
+  components: {
+    add,
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
   data() {
     return {
       refineryTypeEnum: refineryTypeEnum,
@@ -155,6 +160,13 @@ export default {
         addInfo: {},
         detail: false,
       },
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocomplateKey: "refineryName",
+        valueKey: "refineryName",
+        placeholder: "炼厂名称",
+        querykey: "refineryId",
+      },
       refineryList: [],
       tableHeight: 0,
       tableData: [],
@@ -183,11 +195,7 @@ export default {
       ],
     };
   },
-  components: {
+
-    add,
-    pagination,
-    generalDetails,
-  },
   mounted() {
     this.$nextTick(() => {
       this.heightHandle();
@@ -198,7 +206,6 @@ export default {
     );
   },
   created() {
-    this.findByEntity();
     this.getByPage();
   },
   methods: {
@@ -214,11 +221,26 @@ export default {
       });
     },
     //炼厂list
-    findByEntity() {
+    // findByEntity() {
-      refineryInfoServe.findByEntity().then((res) => {
+    //   refineryInfoServe.findByEntity().then((res) => {
-        this.refineryList = res.data;
+    //     this.refineryList = res.data;
-      });
+    //   });
-    },
+    // },
+    //远程搜索
+    // querySearchAsync(queryString, cb) {
+    //   if (queryString) {
+    //     refineryInfoServe
+    //       .findByEntity({ refineryName: queryString })
+    //       .then((res) => {
+    //         let timeInstance = setTimeout(() => {
+    //           clearTimeout(timeInstance);
+    //           if (res.data.length) {
+    //             cb(res.data);
+    //           } else cb([]);
+    //         }, 1000 * Math.random());
+    //       });
+    //   } else cb([]);
+    // },
     //新增
     addition() {
       this.controlWindows.addInfo.title = "账户新增";
@@ -276,6 +298,7 @@ export default {
       width: 183px;
       height: 40px;
     }
+    .el-autocomplete + .el-select,
     .el-input + .el-input,
     .el-input + .el-select,
     .el-select + .el-select,

src/views/refineryInfo/components/add.vue

@@ -74,13 +74,13 @@ export default {
           { required: true, message: "请输入炼厂名称", trigger: "blur" },
         ],
         refineryType: [
-          { required: true, message: "请选择炼厂类型", trigger: "blur" },
+          { required: true, message: "请选择炼厂类型", trigger: "change" },
         ],
         enableMark: [
-          { required: true, message: "请选择启用状态", trigger: "blur" },
+          { required: true, message: "请选择启用状态", trigger: "change" },
         ],
         refineryLevel: [
-          { required: true, message: "请选择炼厂等级", trigger: "blur" },
+          { required: true, message: "请选择炼厂等级", trigger: "change" },
         ],
         address: [
           { required: true, message: "请输入炼厂地址", trigger: "blur" },
@@ -117,8 +117,10 @@ export default {
       this.$emit("closeWindow");
       this.form = {};
       this.controlWindows.addInfo = {};
+      this.$nextTick(() => {
         this.$refs.form.clearValidate();
         this.controlWindows.add = false;
+      });
     },
   },
 };

src/views/refineryInfo/index.vue

@@ -1,20 +1,18 @@
 <template>
   <div class="order">
     <div class="frame">
-      <el-select
+      <!-- <el-autocomplete
         class="mr20"
+        label
         v-model="parameter.params.id"
+        :fetch-suggestions="querySearchAsync"
+        value-key="refineryName"
+        value="id"
         placeholder="炼厂名称"
-        clearable
+      ></el-autocomplete> -->
-      >
+
-        <el-option
+      <autocomplete :params="parameter.params" :config="configAutocomplete" />
-          v-for="item in refineryList"
+
-          :key="item.id"
-          :label="item.refineryName"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
       <el-select
         v-model="parameter.params.refineryType"
         placeholder="炼厂类型"
@@ -169,11 +167,18 @@ import serve from "api/refineryInfo.js";
 import add from "./components/add.vue";
 
 import pagination from "components/pagination/index.vue";
+import autocomplete from "components/autocomplete/index.vue";
 import generalDetails from "components/generalDetails/index.vue";
 
 import { refineryTypeEnum } from "utils/dataType.js";
 
 export default {
+  components: {
+    add,
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
   data() {
     return {
       refineryTypeEnum: refineryTypeEnum,
@@ -182,7 +187,13 @@ export default {
         addInfo: {},
         detail: false,
       },
-
+      configAutocomplete: {
+        serveTarget: serve.findByEntity,
+        autocomplateKey: "refineryName",
+        valueKey: "refineryName",
+        placeholder: "炼厂名称",
+        querykey: "refineryId",
+      },
       refineryList: [],
       tableHeight: 0,
       tableData: [],
@@ -212,11 +223,7 @@ export default {
       ],
     };
   },
-  components: {
+
-    add,
-    pagination,
-    generalDetails,
-  },
   mounted() {
     this.$nextTick(() => {
       this.heightHandle();
@@ -227,7 +234,6 @@ export default {
     );
   },
   created() {
-    this.findByEntity();
     this.getByPage();
   },
   methods: {
@@ -242,12 +248,19 @@ export default {
         this.parameter.total = res.data.totalCount;
       });
     },
-    //炼厂list
+    //远程搜索
-    findByEntity() {
+    // querySearchAsync(queryString, cb) {
-      serve.findByEntity().then((res) => {
+    //   if (queryString) {
-        this.refineryList = res.data;
+    //     serve.findByEntity({ refineryName: queryString }).then((res) => {
-      });
+    //       let timeInstance = setTimeout(() => {
-    },
+    //         clearTimeout(timeInstance);
+    //         if (res.data.length) {
+    //           cb(res.data);
+    //         } else cb([]);
+    //       }, 1000 * Math.random());
+    //     });
+    //   } else cb([]);
+    // },
     //新增
     addition() {
       this.controlWindows.addInfo.title = "炼厂入驻";
@@ -328,6 +341,7 @@ export default {
       width: 183px;
       height: 40px;
     }
+    .el-autocomplete + .el-select,
     .el-input + .el-input,
     .el-input + .el-select,
     .el-select + .el-select,

vue.config.js

@@ -29,7 +29,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://3816t6291y.oicp.vip`,
         // target: 'https://6l438d1757.zicp.fun',
-        target: "http://192.168.110.10:38080",
+        target: "http://192.168.110.230:38080",
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",