Merge remote-tracking branch 'origin/master'

src/components/SearchInConsignor.vue

@@ -201,7 +201,14 @@ export default {
         'attr': {
             'empid': this.linkInfo.userId
         },
-        'filters': [],
+        'filters': [
+          {
+            key: 'companyname',
+            opt: 'LIKE',
+            type: 'S',
+            value: this.keywords
+          }
+        ],
         'logic': 'or',
         'sort': 'desc',
         'orderby': 'createon',
@@ -211,7 +218,7 @@ export default {
       getConsignorSetList(data).then(rt => {
         if (rt.code === 200) {
           if (_this.currentPage === 1) {
-            // _this.searchNum = getResListNum(rt.msg)
+            _this.searchNum = rt.data.total
             this.postDataList = []
           }
           if (this.isRefreshing) {

src/components/SearchInSupplier.vue

@@ -7,7 +7,7 @@
       get-container="body"
     >
       <div class="title-layout font-bold font-16">供应商</div>
-      <van-search
+      <!-- <van-search
         v-model="keywords"
         placeholder="请输入编码或名称"
         show-action
@@ -15,7 +15,7 @@
       >
         <i slot="left-icon" class="fa fa-search"></i>
         <div slot="action" class="font14" @click="onSearch">搜索</div>
-      </van-search>
+      </van-search> -->
       <search-result :result-num="searchNum"></search-result>
       <div class="w100 listHeight" ref="scrollRef">
         <van-pull-refresh
@@ -206,7 +206,7 @@ export default {
       getEmployeeOrgQueryList(data).then(rt => {
         if (rt.code === 200) {
           if (_this.currentPage === 1) {
-            // _this.searchNum = rt.entity.total + ''
+            _this.searchNum = rt.data.length
             this.postDataList = []
           }
           if (this.isRefreshing) {
@@ -221,12 +221,12 @@ export default {
           // 重置加载更多提示
           _this.loading = false
           // 若当前加载的页数没有满足每页的数量代表完全加载
-          if (rt.data.length < 10) {
+          // if (rt.data.length < 10) {
             _this.finished = true
-          } else {
+          // } else {
             // 加载成功后下一页自增1
             _this.currentPage++
-          }
+          // }
         } else {
           _this.$toast(rt.message)
           // _this.$toast('列表获取失败')

src/views/myOrder/components/HighSearch.vue

@@ -609,7 +609,7 @@ export default {
           border-radius: 5PX;
           border:0.5px solid #eeeeee;
           // background-color: #EFF5F9;
-          -webkit-appearance:none;
+          // -webkit-appearance:none;
           min-height: 35PX;
           line-height: 24px;
           outline: 0;