高级搜索 各个条件与订单列表查询

src/components/SearchGoods.vue

@@ -178,7 +178,7 @@ export default {
       let _this = this
       const companyList = []
       _this.consignor.forEach(item => {
-        console.log(item)
+        // console.log(item)
         const removeItem = {
           'beforeP': item.db_source,
           'middleP': process.env.appRealDb,
@@ -243,39 +243,6 @@ export default {
         _this.finished = true
       })
     },
-    // 数据处理
-    postDataListSetAction(array) {
-      array.forEach((res)=>{
-            this.postDataList.push({
-              assigneeFactoryId: res.assigneeFactoryId,
-              catagory: res.catagory,
-              comGoodsFormId: res.comGoodsFormId,
-              comGoodsId: res.comGoodsId,
-              comGoodsVarietyId: res.comGoodsVarietyId,
-              comUnitId: res.comUnitId,
-              defaultExpireDate: res.defaultExpireDate,
-              factoryId: res.factoryId,
-              goodsDesc: res.goodsDesc,
-              goodsName: res.goodsName,
-              goodsOpcode: res.goodsOpcode,
-              goodsSpell: res.goodsSpell,
-              goodsStatus: res.goodsStatus,
-              midPacknum: res.midPacknum,
-              packageNum: res.packageNum,
-              partyName: res.partyName,
-              partyName1: res.partyName1,
-              partyOpcode: res.partyOpcode,
-              productLocation: res.productLocation,
-              unitName: res.unitName,
-              goodsForm: res.goodsForm,
-              partyOpcode1: res.partyOpcode1,
-              priceCode: res.priceCode,
-              retailPrice: res.retailPrice,
-              taxRate: res.taxRate,
-              varietyName: res.varietyName,
-              })
-          })
-    },
     /// 判断数值是否为空
     isJudgeStrNull(val) {
       if (val !== null && val !== undefined && val !== '') {

src/components/SearchInConsignor.vue

@@ -215,11 +215,11 @@ export default {
             this.postDataList = []
           }
           if (this.isRefreshing) {
-            console.log('111111')
+            // 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')
+            // console.log('222222')
           }
           // _this.postDataListSetAction(rt.data)
           // 重置刷新提示

src/views/myOrder/components/HighSearch.vue

@@ -24,8 +24,8 @@
           </div>
           <div class="high-info" @click="showPost('orderNo')">
             <div class="title font-bold font-16">请输入订单号</div>
-            <div :class="isSelectConsignorSupplier === true ? 'nom input': 'select input'" :contenteditable="isSelectConsignorSupplier === true ? 'true': 'false'" class="inputInfo" placeholder="请输入订单号">{{moreSearchInfo.orderNo}}</div>
-            <!-- <input :class="isSelectConsignorSupplier === true ? 'nom input': 'select input'" :disabled="isSelectConsignorSupplier" v-model="moreSearchInfo.orderNo" placeholder="请输入订单号" class="input" type="text"> -->
+            <!-- <div :class="isSelectConsignorSupplier === true ? 'nom input': 'select input'" :contenteditable="isSelectConsignorSupplier === true ? 'true': 'false'" class="inputInfo" placeholder="请输入订单号">{{moreSearchInfo.orderNo}}</div> -->
+            <input :class="isSelectConsignorSupplier === true ? 'nom input': 'select input'" :disabled="!isSelectConsignorSupplier" v-model="moreSearchInfo.orderNo" placeholder="请输入订单号" class="input" type="text">
           </div>
           <div class="high-info" @click="showPost('goods')">
             <div class="title font-bold font-16">商品</div>
@@ -274,6 +274,7 @@ export default {
         this.$toast('请先供应商！')
         return
       }
+      // console.log(this.moreSearchInfo)
       this.moreSearchShow = false
       this.$emit('onsearch', this.moreSearchInfo)
     },
@@ -325,7 +326,7 @@ export default {
       window.history.pushState(null, null, document.URL);
     },
     postConfirm(data) {
-      console.log(data)
+      // console.log(data)
       switch (true) {
         case data.page === 'supplier':
           this.moreSearchInfo.supplier = data.value

src/views/myOrder/myOrderList.vue

@@ -140,7 +140,7 @@ export default {
   },
   watch: {
     moreSearchModel(val) {
-      thid.moreSearchInfo = val
+      this.moreSearchInfo = val
     }
   },
   methods: {
@@ -202,9 +202,8 @@ export default {
         ] // 供应商(部门)编码
       }
       let dict = {
-        'list': [
-          data
-        ],
+        'list': this.setMoreSearchInfoAction(),
+        // 'list': [data],
         'endDate': _this.moreSearchInfo.time.end,  // 结束时间
         'startDate': _this.moreSearchInfo.time.start, // 开始时间
         'pageNum': _this.currentPage,
@@ -242,6 +241,60 @@ export default {
         _this.error = true
         _this.finished = true
       })
+    },
+    // 高级搜索条件
+    setMoreSearchInfoAction () {
+      let _this = this
+      const dataList = []
+      console.log(_this.moreSearchInfo)
+      _this.moreSearchInfo.consignor.forEach(item => {
+        const model = {
+          'businessType': '',
+          'clientID': this.getArray(_this.moreSearchInfo.client.comPartyId), // 客户编码
+          'endDate': _this.moreSearchInfo.time.end,  // 结束时间
+          'startDate': _this.moreSearchInfo.time.start, // 开始时间
+          'goodsCode': !_this.moreSearchInfo.goods.goodsOpcode ? '':_this.moreSearchInfo.goods.goodsOpcode, // 商品代码
+          'goodsDesc': '', // 商品描述
+          'goodsId': !_this.moreSearchInfo.goods.comGoodsId ? '':_this.moreSearchInfo.goods.comGoodsId, // 商品ID
+          'goodsName': '', // 商品名称
+          'goodsSpec': '', // 商品规格
+          'isDelivered': '', // 是否配送 TRUE是/FALSE
+          'isInvoice': '', // 是否开票 TURE 是 FALSE 否
+          'isWeb': '', // 是否网单 TURE 是FALSE 否
+          'manufacturer': '', // 生产企业
+          'mdmClientCode': '', // 主数据客户编码
+          'order': '',
+          'orderId': '', // 订单ID
+          'orderNo': !_this.moreSearchInfo.orderNo ? '':_this.moreSearchInfo.orderNo, // 订单号
+          // 订单状态ERP 100 已开单110 已取消180 已完（销退）WMS200 待出库210 拣配中220 已出库TMS300 调度中310 运输中400 已签收410 签收执420 拒收
+          'orderStatusCode': _this.orderTypeCode,
+          'orderType': 'SALE', // 订单类型 正常销售SALE销售退货SALE_RTN
+          'pageNum': _this.currentPage,
+          'pageSize': _this.pageSize,
+          'shippingAdress': '', // 送货地址
+          'sort': '',
+          'sourceDb': !item.ownerid ? '':item.ownerid, // 数据来源
+          'sourceOrderNo': '', // 来源订单号(网上订单号)
+          'sourceSystem': '', // 订单来源 来源订单号和订单来源必须同时不为空
+          'supplierId': this.getArray(_this.moreSearchInfo.supplier.org) // 供应商(部门)编码
+        }
+        dataList.push(model)
+      })
+      console.log(dataList)
+      return dataList
+    },
+    getArray (value) {
+      if (this.isJudgeStrNull(value)) {
+        return [value]
+      }
+      return []
+    },
+    /// 判断数值是否为空
+    isJudgeStrNull(val) {
+      if (val !== null && val !== undefined && val !== '') {
+        return true
+      }
+      return false
     }
   }
 }