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

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

@@ -84,30 +84,43 @@ class DeliverybillDao extends Dao {
     return await this.updateByWhere(setobj, whereobj, t);
   }
 
-  /*更新交付人员信息*/
-  async updateSalesmanInfoByDeliverCode(qobj, t) {
-    var setobj = {};
-    if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
-      setobj.delivery_man_id = qobj.salesmanId;
-    };
-    if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
-      setobj.delivery_man_name = qobj.salesmanName;
-    };
-    if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
-      setobj.delivery_man_opcode = qobj.salesmanOpcode;
-    };
-    // if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
-    //   setobj.salesman_phone = qobj.salesmanPhone;
-    // };
-    if (qobj.facilitatorId && qobj.facilitatorId != 'undefined') {
-      setobj.facilitator_id = qobj.facilitatorId;
-    };
-    if (qobj.facilitatorName && qobj.facilitatorName != 'undefined') {
-      setobj.facilitator_name = qobj.facilitatorName;
-    };
-    var whereobj = { "delivery_code": qobj.deliverNumber };
-    return await this.updateByWhere(setobj, whereobj, t);
-  }
+    /*更新业务员/交付员信息*/
+    async updateSalesmanInfoByDeliverCode(qobj, t) {
+        var setobj = {};
+        if(qobj.type == "salesman") {
+            if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
+                setobj.salesman_id = qobj.salesmanId;
+            };
+            if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
+                setobj.salesman_name = qobj.salesmanName;
+            };
+            if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
+                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;
+        // };
+        if (qobj.facilitatorId && qobj.facilitatorId != 'undefined') {
+            setobj.facilitator_id = qobj.facilitatorId;
+        };
+        if (qobj.facilitatorName && qobj.facilitatorName != 'undefined') {
+            setobj.facilitator_name = qobj.facilitatorName;
+        };
+        var whereobj = { "delivery_code": qobj.deliverNumber };
+        return await this.updateByWhere(setobj, whereobj, t);
+    }
 
   /*根据交付单更新交付材料信息*/
   async updateInfoByDeliverCode(qobj, t) {//公司注册、云上园区注册时填写交付材料