Commit 85d0ce3a by Sxy

fix: 隔绝产品

parent 94a14b38
...@@ -40,7 +40,7 @@ class DeliverybillDao extends Dao { ...@@ -40,7 +40,7 @@ class DeliverybillDao extends Dao {
//不是来自平台前端查询 //不是来自平台前端查询
if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) { if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) {
qc.where.product_code = qc.where.product_code || { qc.where.product_code = qc.where.product_code || {
[this.db.Op.notIn]: ["ICP", "EDI", "ICPANNUALREPORT", "EDIANNUALREPORT"] [this.db.Op.notIn]: ["ICP", "EDI", "ICPANNUALREPORT", "EDIANNUALREPORT", "bookkeeping"]
} }
if (qobj.bizpath && qobj.bizpath != "") { if (qobj.bizpath && qobj.bizpath != "") {
if (qobj.bizpath.indexOf("myDeliver") > 0) {//说明是从商机列表过来的 if (qobj.bizpath.indexOf("myDeliver") > 0) {//说明是从商机列表过来的
...@@ -87,7 +87,7 @@ class DeliverybillDao extends Dao { ...@@ -87,7 +87,7 @@ class DeliverybillDao extends Dao {
/*更新业务员/交付员信息*/ /*更新业务员/交付员信息*/
async updateSalesmanInfoByDeliverCode(qobj, t) { async updateSalesmanInfoByDeliverCode(qobj, t) {
var setobj = {}; var setobj = {};
if(qobj.type == "salesman") { if (qobj.type == "salesman") {
if (qobj.salesmanId && qobj.salesmanId != 'undefined') { if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
setobj.salesman_id = qobj.salesmanId; setobj.salesman_id = qobj.salesmanId;
}; };
...@@ -98,7 +98,7 @@ class DeliverybillDao extends Dao { ...@@ -98,7 +98,7 @@ class DeliverybillDao extends Dao {
setobj.salesman_opcode = qobj.salesmanOpcode; setobj.salesman_opcode = qobj.salesmanOpcode;
}; };
} }
if(qobj.type == "deliverman") { if (qobj.type == "deliverman") {
if (qobj.deliverymanId && qobj.deliverymanId != 'undefined') { if (qobj.deliverymanId && qobj.deliverymanId != 'undefined') {
setobj.delivery_man_id = qobj.deliverymanId; setobj.delivery_man_id = qobj.deliverymanId;
}; };
...@@ -182,7 +182,7 @@ class DeliverybillDao extends Dao { ...@@ -182,7 +182,7 @@ class DeliverybillDao extends Dao {
if (qobj.clerkName && qobj.clerkName != 'undefined') { if (qobj.clerkName && qobj.clerkName != 'undefined') {
obj.delivery_man_name = qobj.clerkName; obj.delivery_man_name = qobj.clerkName;
} }
if (qobj.salesmanName && qobj.salesmanName != undefined){ if (qobj.salesmanName && qobj.salesmanName != undefined) {
obj.salesman_name = qobj.salesmanName; obj.salesman_name = qobj.salesmanName;
} }
if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') { if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment