Merge branch 'ic-deliver' of /Users/feng/feng/gongsibao/zhichan with conflicts.

ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js

@@ -84,18 +84,31 @@ class DeliverybillDao extends Dao {
     return await this.updateByWhere(setobj, whereobj, t);
   }
 
-  /*更新交付人员信息*/
+    /*更新业务员/交付员信息*/
     async updateSalesmanInfoByDeliverCode(qobj, t) {
         var setobj = {};
+        if(qobj.type == "salesman") {
             if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
-      setobj.delivery_man_id = qobj.salesmanId;
+                setobj.salesman_id = qobj.salesmanId;
             };
             if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
-      setobj.delivery_man_name = qobj.salesmanName;
+                setobj.salesman_name = qobj.salesmanName;
             };
             if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
-      setobj.delivery_man_opcode = qobj.salesmanOpcode;
+                setobj.salesman_opcode = qobj.salesmanOpcode;
             };
+        }
+        if(qobj.type == "deliverman") {
+            if (qobj.deliverymanId && qobj.deliverymanId != 'undefined') {
+                setobj.delivery_man_id = qobj.deliverymanId;
+            };
+            if (qobj.deliverymanName && qobj.deliverymanName != 'undefined') {
+                setobj.delivery_man_name = qobj.deliverymanName;
+            };
+            if (qobj.deliverymanOpcode && qobj.deliverymanOpcode != 'undefined') {
+                setobj.delivery_man_opcode = qobj.deliverymanOpcode;
+            };
+        }
         // if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
         //   setobj.salesman_phone = qobj.salesmanPhone;
         // };