From 1c3044add3f8d07033fa0d9e2a5ac0bf5ec52380 Mon Sep 17 00:00:00 2001
From: slyang <cug199161@163.com>
Date: Sun, 9 Jan 2022 14:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yxDistributor.js       |  7 ++++
 src/views/shop/order/index.vue | 59 ++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/src/api/yxDistributor.js b/src/api/yxDistributor.js
index d33da19..a5f6754 100644
--- a/src/api/yxDistributor.js
+++ b/src/api/yxDistributor.js
@@ -29,3 +29,10 @@ export function getInfo(id) {
     method: 'get'
   })
 }
+
+export function queryDistributorList() {
+  return request({
+    url: 'api/distributorList',
+    method: 'get'
+  })
+}
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index 7300d87..f68f173 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -32,6 +32,11 @@
       <div class="head-container">
         <el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="addOrder()">新增</el-button>
         <!-- 搜索 -->
+<!--        <el-input v-model="distributorId" clearable placeholder="经销商名称" style="width: 200px;" class="filter-item">
+          <el-autocomplete v-model="distributorID"  placeholder="经销商名称"  :trigger-on-focus="false" :fetch-suggestions="querySearchAsync" @select="handleSelect">
+          </el-autocomplete>
+        </el-input>-->
+        <el-autocomplete v-model="distributorId" clearable placeholder="经销商名称" class="filter-item" :trigger-on-focus="true" :fetch-suggestions="querySearchAsync" @select="handleSelect" />
         <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item"
                   @keyup.enter.native="toQuery"/>
         <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
@@ -100,6 +105,11 @@
             <span>{{ scope.row.userDTO.nickname }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="distributorName" label="经销商名称">
+          <template slot-scope="scope">
+            <span>{{ scope.row.distributorName }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="cartInfoList" width="370" label="商品信息">
           <template slot-scope="scope">
             <!-- <div v-for="(item,index) in scope.row.cartInfoList"
@@ -355,6 +365,7 @@ import ePrint from "./print";
 import editSkuPrice from "./skupriceform"
 import {formatTime} from "@/utils/index";
 import {gett} from "@/api/visits";
+import {queryDistributorList} from "../../../api/yxDistributor";
 
 export default {
   components: {eForm, eDetail, eRefund, editOrder, eRemark, ePrint, addOrder, editSkuPrice},
@@ -365,6 +376,8 @@ export default {
       status: '-9',
       orderType: '0',
       createTime: '',
+      distributorList: [],
+      distributorId:'',
       checkList: [],
       printChecked: false,
       batchHandle: '',
@@ -416,9 +429,54 @@ export default {
     this.$nextTick(() => {
       this.init();
       this.getCaculateInfo();
+      this.getDistributorInfo();
     })
   },
   methods: {
+    getDistributorInfo() {
+      queryDistributorList().then(async res => {
+        let data = res.distributorList;
+        if(data) {
+          this.distributorList = res.distributorList;
+        }
+      }).catch(res => {
+        return this.$message({
+          message:res.msg,
+          type: 'error'
+        });
+      })
+    },
+    querySearchAsync(queryString, cb) {
+      debugger
+      //在这里为这个数组中每一个对象加一个value字段, 因为autocomplete只识别value字段并在下拉列中显示，所以我从新封装了
+      let distributorList = this.distributorList;
+      // console.log(productList)
+
+      let programList = [];
+      for(let i=0;i<this.distributorList.length;i++){
+        programList.push({'value':distributorList[i].distributorId +'--'+distributorList[i].distributorName})
+      }
+      // console.log(programList.values())
+      let results = queryString ? programList.filter(this.createStateFilter(queryString)) : programList;
+      //基本思路就是实现一个过滤器，过滤存在你输入字段的所有数据。
+      clearTimeout(this.timeout);
+      this.timeout = setTimeout(() => {
+        cb(results);
+      }, 1000 * Math.random());
+    },
+    createStateFilter(queryString) {
+      return (product) => {
+        return (product.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1);
+      };
+    },
+    handleSelect(item) {
+      this.distributorId = item.value
+      /*var strs= new Array();
+      strs = item.value.split("--")
+      this.distributorId = strs[0]*/
+    },
+
+
     toDetailURL(id) {
       this.$router.push({path: '/order/detail/' + id})
     },
@@ -439,6 +497,7 @@ export default {
         orderStatus: this.status,
         orderType: this.orderType,
         createTime: this.createTime,
+        distributorId: this.distributorId,
         listContent: this.listContent
       }
       const query = this.query
-- 
Gitee