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

src/api/product.js

@@ -39,7 +39,7 @@ const getRefineryCompanyList = (params) => {
 // 下单
 const orderSave = (params) => {
   return request.postJson(
-    "/oil_refinery/xoilRefineryOrder/save",
+    "/oil-refinery/xoilRefineryOrder/save",
     params
   );
 };

src/components/autocomplete/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-autocomplete
+  <!-- <el-autocomplete
     v-model="text"
     :fetch-suggestions="querySearchAsync"
     :value-key="config.valueKey"
@@ -7,7 +7,26 @@
     clearable
     @select="selectAutocomplete"
     @clear="params[config.querykey] = ''"
-  ></el-autocomplete>
+  ></el-autocomplete> -->
+
+  <el-select
+    v-model="params[config.querykey]"
+    filterable
+    remote
+    clearable
+    reserve-keyword
+    :placeholder="config.placeholder"
+    :remote-method="remoteMethod"
+    @clear="list = []"
+  >
+    <el-option
+      v-for="(item, index) in list"
+      :key="item.id + index"
+      :label="item[config.labelKey]"
+      :value="item[config.valueKey]"
+    >
+    </el-option>
+  </el-select>
 </template>
 
 <script>
@@ -17,37 +36,67 @@ export default {
     config: Object,
     // config: {
     //   serveTarget: {}, // 远程搜索接口
-    //   autocomplateKey: "", //远程搜索接口参数名
+    //   autocompleteKey: "", //远程搜索接口参数名
+    //   labelKey: "", //接口返回数据label名
+    //   valueKey: "", //接口返回数据唯一值
     //   querykey: "", //查询接口参数名
     // },
   },
   data() {
     return {
       text: "",
+      list: [],
     };
   },
-  created() {
+  watch: {
-    console.log("params", this.params);
+    "config.echoId": {
+      handler(nval, oval) {
+        if (nval) {
+          console.log(nval);
+          this.remoteMethod(this.config.echoName);
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
     // 远程搜索
-    querySearchAsync(queryString, cb) {
+    remoteMethod(query) {
-      if (queryString) {
+      if (query !== "") {
+        this.loading = true;
         let params = {};
-        params[this.config.autocompleteKey] = queryString;
+        params[this.config.autocompleteKey] = query;
         this.config.serveTarget(params).then((res) => {
           let timeInstance = setTimeout(() => {
+            this.loading = false;
             clearTimeout(timeInstance);
             if (res.data.length) {
-              cb(res.data);
+              this.list = res.data;
-            } else cb([]);
+            } else this.list = [];
           }, 1000 * Math.random());
         });
-      } else cb([]);
+      } else {
-    },
+        this.list = [];
-    selectAutocomplete(item) {
+      }
-      this.params[this.config.querykey] = item.id;
     },
+    // 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>

src/views/product/components/add.vue

@@ -110,10 +110,13 @@ export default {
       refineryList: [],
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
-        autocomplateKey: "refineryName",
+        autocompleteKey: "refineryName",
-        valueKey: "refineryName",
+        labelKey: "refineryName",
+        valueKey: "id",
         placeholder: "炼厂名称",
         querykey: "refineryId",
+        echoId: "",
+        echoName: "",
       },
       productTypeList: [
         {
@@ -170,6 +173,8 @@ export default {
       if (id) {
         //回显
         this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
+        this.configAutocomplete.echoId = id;
+        this.configAutocomplete.echoName = this.form.refineryName;
         console.log("this.form", this.form.floorPrice);
       }
     },

src/views/product/components/create.vue

@@ -37,7 +37,7 @@
           <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="请选择产品类型">
+          <el-select v-model="form.productType" @change="productChange" placeholder="请选择产品类型">
             <el-option
               v-for="(item, index) in productTypeList"
               :key="index"
@@ -47,11 +47,19 @@
           </el-select>
         </el-form-item>
         <el-form-item label="产品名称">
-          <el-input
+          <el-select v-model="form.productId" placeholder="请选择产品类型">
+            <el-option
+              v-for="(item, index) in productNameList"
+              :key="index"
+              :label="item.productName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <!-- <el-input
             maxlength="50"
             v-model="form.productName"
             placeholder="请输入产品名称"
-          ></el-input>
+          ></el-input> -->
         </el-form-item>
         <el-form-item label="销售价">
           <el-input
@@ -98,6 +106,22 @@ export default {
     controlWindows: Object,
     // refineryTypeEnum: Array,
   },
+  watch:{
+    "form.salePrice": {
+      handler(n, o) {
+        if(n){
+          this.form.actAmount = this.form.salePrice*(this.form.preQuantity?this.form.preQuantity:0)
+        }
+      },
+    },
+    "form.preQuantity": {
+      handler(n, o) {
+        if(n){
+          this.form.actAmount = this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)
+        }
+      },
+    }
+  },
   data() {
     let validatorRefineryId = (rule, value, callback) => {
       if (this.form.refineryId) callback();
@@ -105,12 +129,16 @@ export default {
     };
     return {
       customList:[],
-      form: {},
+      form: {
+        actAmount:0
+      },
+      productNameList:[],
       refineryList: [],
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
-        autocomplateKey: "refineryName",
+        autocompleteKey: "refineryName",
-        valueKey: "refineryName",
+        labelKey: "refineryName",
+        valueKey: "id",
         placeholder: "炼厂名称",
         querykey: "refineryId",
       },
@@ -149,21 +177,28 @@ export default {
     };
   },
   methods: {
+    productChange(){
+      this.productData()
+    },
     //搜索炼厂
     refineryData(value){
       if (value) {
         serve.findByEntity({refineryName:value}).then((res) => {
           this.refineryList = res.data;
         });
+        this.productData()
       }
     },
     //搜索产品
-    productData(value){
+    productData(){
-      if (value) {
+      let data = {
-        serve.getRefineryProductList({productType:value}).then((res) => {
+        refineryId:this.form.refineryId,
-          this.customList = res.data;
+        productType:this.form.productType,
-        });
+        enableMark:'ENABLE'
       }
+      serve.getRefineryProductList(data).then((res) => {
+       this.productNameList = res.data;
+      })
     },
     //搜索客户
     customData(value){
@@ -187,9 +222,10 @@ export default {
       });
     },
     judgeInterface(form) {
-      let { id } = this.controlWindows.addInfo;
+      // let { id } = this.controlWindows.addInfo;
-      if (id) return serve.update(form);
+      // if (id) return serve.update(form);
-      else return serve.save(form);
+      // else 
+      return serve.orderSave(form);
     },
     //炼厂list
     // findByEntity() {

src/views/product/index.vue

@@ -224,8 +224,9 @@ export default {
       },
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
-        autocomplateKey: "refineryName",
+        autocompleteKey: "refineryName",
-        valueKey: "refineryName",
+        labelKey: "refineryName",
+        valueKey: "id",
         placeholder: "炼厂名称",
         querykey: "refineryId",
       },

src/views/refineryAccount/components/add.vue

@@ -70,8 +70,9 @@ export default {
       refineryList: [],
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
-        autocomplateKey: "refineryName",
+        autocompleteKey: "refineryName",
-        valueKey: "refineryName",
+        labelKey: "refineryName",
+        valueKey: "id",
         placeholder: "炼厂名称",
         querykey: "refineryId",
       },

src/views/refineryAccount/index.vue

@@ -162,8 +162,9 @@ export default {
       },
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
-        autocomplateKey: "refineryName",
+        autocompleteKey: "refineryName",
-        valueKey: "refineryName",
+        labelKey: "refineryName",
+        valueKey: "id",
         placeholder: "炼厂名称",
         querykey: "refineryId",
       },

src/views/refineryInfo/index.vue

@@ -189,8 +189,9 @@ export default {
       },
       configAutocomplete: {
         serveTarget: serve.findByEntity,
-        autocomplateKey: "refineryName",
+        autocompleteKey: "refineryName",
-        valueKey: "refineryName",
+        labelKey: "refineryName",
+        valueKey: "id",
         placeholder: "炼厂名称",
         querykey: "refineryId",
       },