Merge branch 'tx-fi-tax' of gitlab.gongsibao.com:jiangyong/zhichan into tx-fi-tax

tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js

@@ -90,6 +90,20 @@ class DeliverybillDao extends Dao {
       delete qc.where.deliveryNumber;
     }
 
+    if (qc.where.deliveryStatus) {
+      filters.push({
+        delivery_status: qc.where.deliveryStatus
+      });
+      delete qc.where.deliveryStatus;
+    }
+
+    if (qc.where.setupStatus) {
+      filters.push({
+        v_setup_status: qc.where.setupStatus
+      });
+      delete qc.where.setupStatus;
+    }
+
     qc.where["$and"] = filters;
     return qw;
   }

tx-fi-tax/app/base/db/models/delivery/delivery_bill.js

@@ -22,6 +22,10 @@ module.exports = (db, DataTypes) => {
       allowNull: true,
       type: DataTypes.STRING
     },
+    company_name: { // 公司名称-虚拟字段
+      allowNull: true,
+      type: DataTypes.STRING
+    },
     v_coname: { // 联系人-虚拟字段
       allowNull: true,
       type: DataTypes.STRING
@@ -30,6 +34,10 @@ module.exports = (db, DataTypes) => {
       allowNull: true,
       type: DataTypes.STRING
     },
+    v_setup_status: {// 公司名称-建账状态
+      allowNull: true,
+      type: DataTypes.STRING
+    },
     demand_code: {// 商机编号
       allowNull: true,
       type: DataTypes.STRING
@@ -62,14 +70,14 @@ module.exports = (db, DataTypes) => {
       allowNull: false,
       type: DataTypes.STRING
     },
-    master_source_number:{//主订单号
+    master_source_number: {//主订单号
       allowNull: true,
       type: DataTypes.STRING
     },
     settle_status: {// 服务单流转状态
       allowNull: false,
       type: DataTypes.STRING,
-      defaultValue:'waittosettle'
+      defaultValue: 'waittosettle'
     },
     selling_price: {//售价
       allowNull: true,

tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js

@@ -92,7 +92,7 @@ class DeliverybillService extends ServiceBase {
             deliveryId: deliverData.id,                     // id
             deliveryNumber: deliverData.delivery_code,      // 交付单编号        
             companyName: deliverData.delivery_info.companyName,// 企业名称
-            uscc: deliverData.delivery_info.uscc,   //统一信用代码
+            uscc: deliverData.delivery_info.creditCode,   //统一信用代码
             taxpayerType: delivery_info.taxpayerType, //纳税人类型 1 一般；2 小规模
             //会计准侧
             companyBizType: delivery_info.companyBizType,// 公司类型  1-商贸型；2-服务型；3-特殊行业；4-其他