Skip to content

Z
zhichan
Commit e35c04c2 by 王勇飞
Options

gyq

parent 930f495f
Showing with 29 additions and 4 deletions
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
...@@ -36,9 +36,12 @@ class BizOptCtl extends CtlBase { ...@@ -36,9 +36,12 @@ class BizOptCtl extends CtlBase {
robj.id = element.id;//数据的id robj.id = element.id;//数据的id
robj.demand_code = element.demand_code;//商机编号 robj.demand_code = element.demand_code;//商机编号
robj.source = element.source_name;//商机来源 robj.source = element.source_name;//商机来源
// robj.source_name = element.source_name;//商机来源-jiansuo
robj.business_type = element.business_type;//商机类型 robj.business_type = element.business_type;//商机类型
robj.business_info_person = element.business_info.contactsName;//联系人 robj.business_info_person = element.business_info.contactsName;//联系人
robj.v_coname = element.v_coname;//联系人-shousuo
robj.business_info_phone = element.business_info.contactsPhone;//联系电话 robj.business_info_phone = element.business_info.contactsPhone;//联系电话
robj.v_cophone = element.v_cophone;//联系电话-shousuo
robj.business_status = element.business_status;//商机当前状态 robj.business_status = element.business_status;//商机当前状态
if (element.business_info.serviceName && element.business_info.serviceName != 'undefined'){ if (element.business_info.serviceName && element.business_info.serviceName != 'undefined'){
robj.serviceName = element.business_info.serviceName;//服务地区 robj.serviceName = element.business_info.serviceName;//服务地区
...@@ -131,7 +134,7 @@ class BizOptCtl extends CtlBase { ...@@ -131,7 +134,7 @@ class BizOptCtl extends CtlBase {
try { try {
await this.service.updateStatusByDemandCode(pobj); await this.service.updateStatusByDemandCode(pobj);
await this.schemeService.updateStatusByDemandCode(pobj);//同时更新方案的状态 await this.schemeService.updateStatusByDemandCode(pobj);//同时更新方案的状态
var res = this.service.findInfoByDemandCode(pobj); var res = await this.service.findInfoByDemandCode(pobj);
if (res && res != 'undefined') { if (res && res != 'undefined') {
var logInfo = { var logInfo = {
"flowType": "BIZ", "flowType": "BIZ",
......
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
...@@ -38,9 +38,11 @@ class DeliverybillCtl extends CtlBase { ...@@ -38,9 +38,11 @@ class DeliverybillCtl extends CtlBase {
let robj = {}; let robj = {};
robj.id = element.id;//数据的id robj.id = element.id;//数据的id
robj.deliverNumber = element.delivery_code;//交付单编号 robj.deliverNumber = element.delivery_code;//交付单编号
robj.delivery_code = element.delivery_code;//交付单编号-shousuo
robj.businessName = element.product_name;//产品名称 robj.businessName = element.product_name;//产品名称
robj.businessType = element.product_code;//产品编码 robj.businessType = element.product_code;//产品编码
robj.product_code = element.product_code;//产品编码 robj.product_name = element.product_name;//产品名称-shousuo
robj.product_code = element.product_code;//产品编码-shousuo
robj.sourceName = element.source_name;//渠道来源 robj.sourceName = element.source_name;//渠道来源
robj.source_name = element.source_name;//渠道来源--前端服务 robj.source_name = element.source_name;//渠道来源--前端服务
robj.channelNumber = element.source_number;//渠道编码 robj.channelNumber = element.source_number;//渠道编码
...@@ -82,13 +84,17 @@ class DeliverybillCtl extends CtlBase { ...@@ -82,13 +84,17 @@ class DeliverybillCtl extends CtlBase {
robj.relatedProducts = '无'; robj.relatedProducts = '无';
}; };
robj.payAmount = this.FenToYuan(element.selling_price);//交付单金额 robj.payAmount = this.FenToYuan(element.selling_price);//交付单金额
robj.selling_price = this.FenToYuan(element.selling_price);//交付单金额-shousuo
robj.deliverStatus = element.delivery_status;//交付单状态 robj.deliverStatus = element.delivery_status;//交付单状态
robj.delivery_status = element.delivery_status;//交付单状态 robj.delivery_status = element.delivery_status;//交付单状态-shousuo
robj.contactsName = robj.baseInfo.contactsName;//联系人 robj.contactsName = robj.baseInfo.contactsName;//联系人
robj.contactsPhone = robj.baseInfo.contactsPhone;//联系电话 robj.contactsPhone = robj.baseInfo.contactsPhone;//联系电话
robj.v_coname = element.v_coname;//联系人-shousuo
robj.v_cophone = element.v_cophone;//联系电话-shousuo
robj.clerkName = element.salesman_name;//业务员名称 robj.clerkName = element.salesman_name;//业务员名称
robj.clerkPhone = element.salesman_phone;//业务员电话 robj.clerkPhone = element.salesman_phone;//业务员电话
robj.createdTime = this.timeFormat(element.created_at);//交付单创建时间 robj.createdTime = this.timeFormat(element.created_at);//交付单创建时间
robj.created_at = this.timeFormat(element.created_at);//交付单创建时间-shousuo
rarr.push(robj); rarr.push(robj);
}); });
rs.results.rows = rarr; rs.results.rows = rarr;
...@@ -365,7 +371,7 @@ class DeliverybillCtl extends CtlBase { ...@@ -365,7 +371,7 @@ class DeliverybillCtl extends CtlBase {
} }
if (j.status == 1 && j1status == 1) { if (j.status == 1 && j1status == 1) {
await this.service.updateStatusByDeliverCode(pobj); await this.service.updateStatusByDeliverCode(pobj);
var pInfo = this.service.findInfoByDeliverCode(pobj); var pInfo = await this.service.findInfoByDeliverCode(pobj);
if (pInfo) { if (pInfo) {
var logInfo = { var logInfo = {
"flowType": "DELIVERY", "flowType": "DELIVERY",
......
ic-deliver/app/base/db/models/delivery/business_opportunity.js
...@@ -22,6 +22,14 @@ module.exports = (db, DataTypes) => { ...@@ -22,6 +22,14 @@ module.exports = (db, DataTypes) => {
allowNull: false, allowNull: false,
type: DataTypes.JSON type: DataTypes.JSON
}, },
v_coname: { // 联系人-虚拟字段
allowNull: true,
type: DataTypes.STRING
},
v_cophone: { // 联系电话-虚拟字段
allowNull: true,
type: DataTypes.STRING
},
source_number: { // 来源单号 （下单时产生的编号) source_number: { // 来源单号 （下单时产生的编号)
allowNull: true, allowNull: true,
type: DataTypes.STRING type: DataTypes.STRING
......
ic-deliver/app/base/db/models/delivery/delivery_bill.js
...@@ -22,6 +22,14 @@ module.exports = (db, DataTypes) => { ...@@ -22,6 +22,14 @@ module.exports = (db, DataTypes) => {
allowNull: true, allowNull: true,
type: DataTypes.STRING type: DataTypes.STRING
}, },
v_coname: { // 联系人-虚拟字段
allowNull: true,
type: DataTypes.STRING
},
v_cophone: { // 联系电话-虚拟字段
allowNull: true,
type: DataTypes.STRING
},
demand_code: {// 商机编号 demand_code: {// 商机编号
allowNull: true, allowNull: true,
type: DataTypes.STRING type: DataTypes.STRING
......
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