gyq

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

@@ -51,6 +51,7 @@ class BizOptCtl extends CtlBase {
         robj.servicerName = element.facilitator_name;
         robj.servicerName = element.facilitator_name;
         robj.facilitator_name = element.facilitator_name;
         robj.facilitator_name = element.facilitator_name;
         robj.sourceName = element.source_name;//渠道来源
         robj.sourceName = element.source_name;//渠道来源
+        robj.source_name = element.source_name;//渠道来源--前端服务
 
 
         robj.salesman_name=element.salesman_name
         robj.salesman_name=element.salesman_name
         robj.salesman_phone=element.salesman_phone
         robj.salesman_phone=element.salesman_phone

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

@@ -33,6 +33,7 @@ class DeliverybillCtl extends CtlBase {
       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;
+      console.log("-----------------------------------------" +JSON.stringify(results));
       results.forEach(element => {
       results.forEach(element => {
         let robj = {};
         let robj = {};
         robj.id = element.id;//数据的id
         robj.id = element.id;//数据的id
@@ -50,6 +51,13 @@ class DeliverybillCtl extends CtlBase {
         }
         }
         robj.baseInfo = element.delivery_info;//交付单详情
         robj.baseInfo = element.delivery_info;//交付单详情
         robj.payStatus = element.delivery_info.payStatus;//交付状态
         robj.payStatus = element.delivery_info.payStatus;//交付状态
+        if (element.pay_status && element.pay_status != 'undefined'){
+          robj.pay_status = element.pay_status;//交付状态---前端服务
+        }
+        else{
+          robj.pay_status = "";//交付状态---前端服务
+        }
+       
         robj.costPrice = this.FenToYuan(element.cost_price);//成本
         robj.costPrice = this.FenToYuan(element.cost_price);//成本
         robj.settle_status = element.settle_status;
         robj.settle_status = element.settle_status;
         robj.settlebill = element.settlebill;
         robj.settlebill = element.settlebill;
@@ -884,16 +892,16 @@ class DeliverybillCtl extends CtlBase {
 }
 }
 module.exports = DeliverybillCtl;
 module.exports = DeliverybillCtl;
 
 
-//var task = new DeliverybillCtl();
-// var d = new Date("2020-06-05");
-// console.log("dddddddddddd:" + d);
-// var oneYear = task.oneYearPast(d,1);
-// var ss = moment();
-// var diff = task.diffDays(ss,oneYear);
-// console.log(oneYear);
-// console.log(diff);
+//  var task = new DeliverybillCtl();
+// // var d = new Date("2020-06-05");
+// // console.log("dddddddddddd:" + d);
+// // var oneYear = task.oneYearPast(d,1);
+// // var ss = moment();
+// // var diff = task.diffDays(ss,oneYear);
+// // console.log(oneYear);
+// // console.log(diff);
 // var obj={"d":{"deliverNumber":"1111111"}};
 // var obj={"d":{"deliverNumber":"1111111"}};
-// task.findZipUrlByDeliverCode(obj,{},{}).then(d=>{
+// task.findAndCountAll(obj,{},{}).then(d=>{
 //   console.log(d);
 //   console.log(d);
 //   //console.log(d[0].analyse);
 //   //console.log(d[0].analyse);
 
 

ic-deliver/app/base/db/models/delivery/delivery_bill.js

@@ -18,6 +18,10 @@ module.exports = (db, DataTypes) => {
       allowNull: true,
       allowNull: true,
       type: DataTypes.STRING
       type: DataTypes.STRING
     },
     },
+    pay_status: { // 交付状态-虚拟字段
+      allowNull: true,
+      type: DataTypes.STRING
+    },
     demand_code: {// 商机编号
     demand_code: {// 商机编号
       allowNull: true,
       allowNull: true,
       type: DataTypes.STRING
       type: DataTypes.STRING