Merge branch 'tx-fi-tax' of gitlab.gongsibao.com:jiangyong/zhichan into tx-fi-tax

tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js

@@ -62,9 +62,34 @@ class DeliverybillDao extends Dao {
 
 
 
 
     /**
     /**
-     * 筛选 条件  TODO: 筛选功能字段
-     * company_name、v_coname、v_cophone
+     * 筛选 条件 
+     * company_name、v_coname、v_cophone、delivery_code
      */
      */
+    if (qc.where.companyName) {
+      filters.push({
+        company_name: qc.where.companyName
+      });
+      delete qc.where.companyName;
+    }
+    if (qc.where.contactsName) {
+      filters.push({
+        v_coname: qc.where.contactsName
+      });
+      delete qc.where.contactsName;
+    }
+    if (qc.where.contactsPhone) {
+      filters.push({
+        v_cophone: qc.where.contactsPhone
+      });
+      delete qc.where.contactsPhone;
+    }
+    if (qc.where.deliveryNumber) {
+      filters.push({
+        delivery_code: qc.where.deliveryNumber
+      });
+      delete qc.where.deliveryNumber;
+    }
+
     qc.where["$and"] = filters;
     qc.where["$and"] = filters;
     return qw;
     return qw;
   }
   }