tj

igirl-channel/app/base/db/metadata/apps/platform.js

@@ -57,7 +57,7 @@ module.exports = {
             //附件类型
             "stuff_type": { "csty": "彩色图样", "wts": "委托书", "gzwts": "盖章委托书", "ty": "图样", "sywj": "声音文件", "smwj": "说明文件" },
             //来源类型
-            "source_type": { "childorders": "子订单","expensevoucher": "费用单" },
+            "source_type": { "childorders": "子订单", "expensevoucher": "费用单" },
             //审核状态
             "audit_status": { "dsh": "待审核", "btg": "不通过", "tg": "通过" },
             //收款类型
@@ -65,7 +65,7 @@ module.exports = {
             //退款类型
             "refund_type": { "tk": "退款", "ptdtk": "平台代退款" },
             //费用类型
-            "expense_type": { "gf": "官费", "sxf": "手续费", "tax": "税金", "salary": "薪酬", "sale": "销售费用", "mag": "管理费用", "channelSettleProfit": "订单渠道分润结算" },
+            "expense_type": { "gf": "官费", "tax": "税金", "channelSettleProfit": "订单渠道分润结算" },
             //凭单类型
             "direction_type": { "sr": "收", "zc": "支" },
             "push_return_type": { "0": "推送失败", "1": "推送成功" },

igirl-channel/app/base/db/models/dbcpay/expensevoucher.js

@@ -5,30 +5,9 @@ module.exports = (db, DataTypes) => {//费用单：
   return db.define("expensevoucher", {
     uapp_id: DataTypes.INTEGER,      //  
     sourceOrderNo: DataTypes.STRING(64),   // 来源单号 
-    
-    // //费用表引用帐户信息
-    // this.db.models.expensevoucher.belongsTo(this.db.models.moneyaccount, { constraints: false, });
-    // //费用表引用用户信息
-    // this.db.models.expensevoucher.belongsTo(this.db.models.user, { as: 'createuser', constraints: false, });
-    // this.db.models.expensevoucher.belongsTo(this.db.models.user, { as: 'updateuser', constraints: false, });
-
-
-    //基类 code: 费用单号（自动生成）
-    //基类 name:  ---暂时没有用
-    //基类 creator: 创建者
-    //基类 updator:/更新者
-    //基类 auditor: 审核者
-    //基类 opNotes: 操作备注
-    //基类 auditStatusName: //审核状态名称
-    //基类 auditStatus: //审核状态:ENUM=audit_status，"dsh": "待审核", "btg": "不通过", "tg": "通过"
-    //基类 sourceTypeName: //来源类型名称
-    //基类 sourceType: //来源类型:ENUM=source_type，"order": "订单","expensevoucher": "费用单","receiptvoucher": "收款单", "trademark": "商标单" 
-    //基类 sourceOrderNo: DataTypes.STRING,//来源单号（如：订单号等）
-    busPayOrderCode: DataTypes.STRING(100),//业务支付订单号
-    payOrderNo: DataTypes.STRING, //支付凭证流水单号，如：微信支付凭证单号
-    certifyFileUrl: DataTypes.STRING(500), //证明文件Url
+    childOrderNo: DataTypes.STRING(64),//  子订单号  
     expenseTypeName: DataTypes.STRING,
-    expenseType: {//收款类型，gf: 官费, sxf: 手续费, tax: 税金, salary: 薪酬, sale: 销售费用, mag: 管理费用, channelSettleProfit: 订单渠道分润结算
+    expenseType: {//收款类型，gf: 官费, tax: 税金, channelSettleProfit: 订单渠道分润结算
       type: DataTypes.ENUM,
       values: Object.keys(uiconfig.config.pdict.expense_type),
       set: function (val) {

igirl-channel/app/base/db/models/dbcpay/moneyjourney.js

@@ -36,19 +36,6 @@ module.exports = (db, DataTypes) => {
         this.setDataValue("sourceTypeName", uiconfig.config.pdict.source_type[val]);
       }
     },
-    auditStatusName: {
-      type: DataTypes.STRING(50),
-      defaultValue: "待审核",
-    },
-    auditStatus: {//审核状态"dsh": "待审核", "btg": "不通过", "tg": "通过"
-      type: DataTypes.ENUM,
-      values: Object.keys(uiconfig.config.pdict.audit_status),
-      set: function (val) {
-        this.setDataValue("auditStatus", val);
-        this.setDataValue("auditStatusName", uiconfig.config.pdict.audit_status[val]);
-      },
-      defaultValue: "dsh",
-    },
     notes: DataTypes.STRING,//备注
     opNotes: DataTypes.STRING,//操作备注
   }, {

igirl-channel/app/base/db/models/dbcpay/orderreceiptvoucher.js

@@ -18,20 +18,7 @@ module.exports = (db, DataTypes) => {
     },
     accountTypeName: {//帐户类型名称
       type: DataTypes.STRING,
-    },
-    auditStatusName: {
-      type: DataTypes.STRING(50),
-      defaultValue: "待审核",
-    },
-    auditStatus: {//审核状态"dsh": "待审核", "btg": "不通过", "tg": "通过"
-      type: DataTypes.ENUM,
-      values: Object.keys(uiconfig.config.pdict.audit_status),
-      set: function (val) {
-        this.setDataValue("auditStatus", val);
-        this.setDataValue("auditStatusName", uiconfig.config.pdict.audit_status[val]);
-      },
-      defaultValue: "dsh",
-    },    
+    }, 
     payDate: DataTypes.DATE,//支付时间
     totalSum: DataTypes.DECIMAL(12, 3),//订单总额（平台费用+服务费+官费+发票税费+个人利润+平台利润）
     certifyFileUrl: DataTypes.STRING(500), //证明文件Url

igirl-channel/app/base/db/models/dbcpay/orderrefundvoucher.js

@@ -19,19 +19,6 @@ module.exports = (db, DataTypes) => {
     accountTypeName: {//帐户类型名称
       type: DataTypes.STRING,
     },
-    auditStatusName: {
-      type: DataTypes.STRING(50),
-      defaultValue: "待审核",
-    },
-    auditStatus: {//审核状态"dsh": "待审核", "btg": "不通过", "tg": "通过"
-      type: DataTypes.ENUM,
-      values: Object.keys(uiconfig.config.pdict.audit_status),
-      set: function (val) {
-        this.setDataValue("auditStatus", val);
-        this.setDataValue("auditStatusName", uiconfig.config.pdict.audit_status[val]);
-      },
-      defaultValue: "dsh",
-    },
     payDate: DataTypes.DATE,//支付时间
     totalSum: DataTypes.DECIMAL(12, 3),//订单总额（平台费用+服务费+官费+发票税费+个人利润+平台利润）
     certifyFileUrl: DataTypes.STRING(500), //证明文件Url