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

tx-fi-tax/app/base/controller/impl/bizchance/bizoptCtl.js

@@ -35,6 +35,7 @@ class BizOptCtl extends CtlBase {
         delete pobj.search.dateType
         delete pobj.search.dateType
       }
       }
       const rs = await this.service.findAndCountAll(pobj);
       const rs = await this.service.findAndCountAll(pobj);
+      console.log("rs-------------" + rs);
       let rarr = [];
       let rarr = [];
       let results = rs.results.rows;
       let results = rs.results.rows;
       results.forEach(element => {
       results.forEach(element => {
@@ -69,6 +70,7 @@ class BizOptCtl extends CtlBase {
       rs.results.rows = rarr;
       rs.results.rows = rarr;
       return system.getResult(rs);
       return system.getResult(rs);
     } catch (error) {
     } catch (error) {
+      console.log("error------------------------" + error);
       return system.getResultError(error);
       return system.getResultError(error);
     }
     }
   }
   }

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

@@ -19,6 +19,7 @@ class BizoptDao extends Dao {
       }
       }
       //不是来自平台前端查询
       //不是来自平台前端查询
       if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) {
       if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) {
+        console.log("bizpath-------------" + qobj.bizpath);
         qc.where.business_type = qc.where.business_type || {
         qc.where.business_type = qc.where.business_type || {
           [this.db.Op.eq]: "bookkeeping"
           [this.db.Op.eq]: "bookkeeping"
         }
         }

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

@@ -107,7 +107,7 @@ module.exports = (db, DataTypes) => {
       allowNull: true,
       allowNull: true,
       type: DataTypes.STRING
       type: DataTypes.STRING
     },
     },
-    delivery_man_id: {// 交付员id
+    delivery_man_id: {// 交付员idP
       allowNull: true,
       allowNull: true,
       type: DataTypes.STRING
       type: DataTypes.STRING
     },
     },

tx-fi-tax/app/config/settings.js

@@ -20,9 +20,9 @@ var settings = {
   salt: "%iatpD1gcxz7iF#B",
   salt: "%iatpD1gcxz7iF#B",
   defaultpwd: "gsb2020",
   defaultpwd: "gsb2020",
   basepath: path.normalize(path.join(__dirname, '../..')),
   basepath: path.normalize(path.join(__dirname, '../..')),
-  port: process.env.NODE_PORT || 8888,
+  port: process.env.NODE_PORT || 8889,
   logindex: "center_manage",
   logindex: "center_manage",
-  appname: "ic_deliver",
+  appname: "book-deliver",
   kongurl: function () {
   kongurl: function () {
     if (this.env == "localhost") {
     if (this.env == "localhost") {
       var localsettings = require("./localsettings");
       var localsettings = require("./localsettings");