Merge branch 'gsb-ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into gsb-ic-deliver

ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js

@@ -29,6 +29,10 @@ class BizOptCtl extends CtlBase {
         }
         }
         delete pobj.search.dateType
         delete pobj.search.dateType
       }
       }
+      if (pobj.search && pobj.search.sourceName) {
+        pobj.search.source_name=pobj.search.sourceName
+        delete pobj.search.sourceName
+      }
       const rs = await this.service.findAndCountAll(pobj);
       const rs = await this.service.findAndCountAll(pobj);
       let rarr = [];
       let rarr = [];
       let results = rs.results.rows;
       let results = rs.results.rows;

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -30,6 +30,14 @@ class DeliverybillCtl extends CtlBase {
         }
         }
         delete pobj.search.dateType
         delete pobj.search.dateType
       }
       }
+      if (pobj.search && pobj.search.businessType) {
+        pobj.search.product_code=pobj.search.businessType
+        delete pobj.search.businessType
+      }
+      if (pobj.search && pobj.search.sourceName) {
+        pobj.search.source_name=pobj.search.sourceName
+        delete pobj.search.sourceName
+      }
 
 
       const rs = await this.service.findAndCountAll(pobj);
       const rs = await this.service.findAndCountAll(pobj);
       let rarr = [];
       let rarr = [];