订单列表高级搜索 各个条件联调

src/components/SearchGoods.vue

@@ -178,14 +178,24 @@ export default {
       let _this = this
       const companyList = []
       _this.consignor.forEach(item => {
+        console.log(item)
         const removeItem = {
-          'beforeP': 'erp_test_shaphar',
+          'beforeP': item.db_source,
           'middleP': process.env.appRealDb,
-          'afterP': '200',
-          'saler': '22998'
+          'afterP': this.supplier.org,
+          'saler': item.erpUserid
         }
         companyList.push(removeItem)
       })
+      // _this.consignor.forEach(item => {
+      //   const removeItem = {
+      //     'beforeP': 'erp_test_shaphar',
+      //     'middleP': process.env.appRealDb,
+      //     'afterP': '200',
+      //     'saler': '22998'
+      //   }
+      //   companyList.push(removeItem)
+      // })
       let data = {
         'goods': _this.keywords,
         'list': companyList,

src/components/SearchInClient.vue

@@ -188,13 +188,22 @@ export default {
       const companyList = []
       _this.consignor.forEach(item => {
         const removeItem = {
-          'beforeP': 'erp_test_shaphar',
+          'beforeP': item.db_source,
           'middleP': process.env.appRealDb,
-          'afterP': '508',
-          'saler': '23528'
+          'afterP': this.supplier.org,
+          'saler': item.erpUserid
         }
         companyList.push(removeItem)
       })
+      // _this.consignor.forEach(item => {
+      //   const removeItem = {
+      //     'beforeP': 'erp_test_shaphar',
+      //     'middleP': process.env.appRealDb,
+      //     'afterP': '508',
+      //     'saler': '23528'
+      //   }
+      //   companyList.push(removeItem)
+      // })
       let data = {
         'customer': _this.keywords,
         'list': companyList,

src/components/SearchInConsignor.vue

@@ -135,7 +135,6 @@ export default {
   methods: {
     /// 标题拼接 <!-- 药厂码/（SAP码）名称 -->
     titleInitial(model) {
-      // let titleStr = model.comGoodsId + '/(' + model.goodsOpcode + ')' + model.goodsName + '/' + model.goodsDesc + '/' + model.partyName + '/' + model.packageNum + '/' + model.unitName
       return model.companyname + '/(' + model.erp_userid[0] + ')'
     },
     onSearch () {
@@ -216,10 +215,11 @@ export default {
             this.postDataList = []
           }
           if (this.isRefreshing) {
-            this.postDataList = rt.data.list
-          }
-          else if (!!rt.data.list || rt.data.list.length > 0) {
-            this.postDataList = this.postDataList.concat(rt.data.list)
+            console.log('111111')
+            this.postDataList = this.postDataListAction(rt.data.list)
+          } else if (rt.data.list || rt.data.list.length > 0) {
+            this.postDataList = this.postDataList.concat(this.postDataListAction(rt.data.list))
+            console.log('222222')
           }
           // _this.postDataListSetAction(rt.data)
           // 重置刷新提示
@@ -256,6 +256,26 @@ export default {
         return true
       }
       return false
+    },
+    postDataListAction(httpList) {
+      const array = []
+      httpList.forEach(item => {
+        const removeItem = item
+        removeItem.erpUserid = item.erp_userid[0]
+        array.push(removeItem)
+      })
+      // let array = []
+      // for (let i = 0; i < httpList.length; i++) {
+      //   let item = httpList[i]
+      //   for (let index = 0; index < item.erp_userid.length; index++) {
+      //     let userid = item.erp_userid[index]
+      //     let model = item
+      //     model.erpUserid = userid
+      //     model.cellId = item.id + userid
+      //     array.push(model)
+      //   }
+      // }
+      return httpList
     }
   }
 }

src/components/SearchInSupplier.vue

@@ -173,33 +173,36 @@ export default {
       const companyList = []
       _this.consignor.forEach(item => {
         const removeItem = {
-          'length': '100',
+          'length': this.pageSize,
           'attr': {
               'empid': this.linkInfo.userId + ',1',
-              'userid': '23528',
+              'userid': item.erpUserid,
               'sysname': item.sysname,
               'companyname': item.companyname
           },
           'dbName': '',
-          'start': '1'
+          'start': this.currentPage
         }
         companyList.push(removeItem)
       })
       let data = {
-        'list': [
-          {
-            'length': '100',
-            'attr': {
-                'empid': '199476,1',
-                'userid': '23528',
-                'sysname': 'ERP',
-                'companyname': '上药控股有限公司'
-            },
-            'dbName': '',
-            'start': '1'
-          }
-        ]
+        'list': companyList
       }
+      // let data = {
+      //   'list': [
+      //     {
+      //       'length': '100',
+      //       'attr': {
+      //           'empid': '199476,1',
+      //           'userid': '23528',
+      //           'sysname': 'ERP',
+      //           'companyname': '上药控股有限公司'
+      //       },
+      //       'dbName': '',
+      //       'start': '1'
+      //     }
+      //   ]
+      // }
       getEmployeeOrgQueryList(data).then(rt => {
         if (rt.code === 200) {
           if (_this.currentPage === 1) {
@@ -218,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('列表获取失败')