update

controller/userController.js

@@ -85,9 +85,10 @@ async function login(req, res, next) {
             delete element.menus;
             newRoles.push(element);
         }
+        console.log(menus, "================================")
         user.roles = newRoles || [];
-        let allMenus = await DB.Menu.findAll({where: {del: 0}, raw: true});
-        user.menus = utils.buildTree(allMenus);
+        // let allMenus = await DB.Menu.findAll({where: {del: 0}, raw: true});
+        user.menus = utils.buildTree(menus);
         return res.sendData(user);
     } catch (error) {
         next(error);

db/model/jt/project.js

@@ -152,7 +152,7 @@ const Project = sequelize.define('Project', {
     // gmjjhy: { type: DataTypes.STRING, allowNull: true, comment: "国民经济行业" },
     // sfzzjc: { type: DataTypes.INTEGER, allowNull: true, comment: "是否自主决策",  },
     // cwbblx: { type: DataTypes.STRING, allowNull: true, comment: "财务报表类型", zjType: 'danxuan',  }, 
-    // xmlx: { type: DataTypes.STRING, allowNull: true, comment: "项目类型", zjType: 'danxuan',  }, 
+    xmlx: { type: DataTypes.STRING, allowNull: true, comment: "项目类型", zjType: 'danxuan',  }, 
     // yynxn: { type: DataTypes.STRING, allowNull: true, comment: "运营年限（年）" },
     // zyfzy: { type: DataTypes.STRING, allowNull: true, comment: "主业/非主业", zjType: 'danxuan',  }, 
     // xmhzqn: { type: DataTypes.STRING, allowNull: true, comment: "项目合作期（月）" },

db/model/jt/thYyqtzhs.js

@@ -11,10 +11,86 @@ const ThYyqtzhs = sequelize.define('ThYyqtzhs', {
         primaryKey: true,
         autoIncrement: true
     },
+
+    //以下 项目信息里面取值
     projectName: {
         type: DataTypes.STRING,
         comment: "项目名称",
     },
+    xmgsmc: {
+        type: DataTypes.STRING,
+        comment: "项目公司名称",
+    },
+    tbdwmc: {
+        type: DataTypes.STRING,
+        comment: "填报单位名称",
+    },
+    ssejqy: {
+        type: DataTypes.STRING,
+        comment: "所属二级企业",
+    },
+    xmjd: {
+        type: DataTypes.STRING,
+        comment: "项目阶段",
+    },
+    xmlx: {
+        type: DataTypes.STRING,
+        comment: "项目类别 同等与  项目类型 xmlx",
+    },
+    tzms: {
+        type: DataTypes.STRING,
+        comment: "投资模式分类",
+    },
+    tzhsfs: {
+        type: DataTypes.STRING,
+        comment: "投资回收方式",
+    },
+    xnxmjd: {
+        type: DataTypes.STRING,
+        comment: "下年项目阶段",
+    },
+
+    projectGdxxs: {
+        type: DataTypes.JSON,
+    },
+    //以下 可能跟项目相关 有可能在项目里面取值，需要项目信息齐全并对应上
+
+    tzzejc: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "投资总额-决策值", },
+    wfzbjczejc: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "我方资本金出资额-决策值", },
+    tzzesj: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "投资总额-实际值", },
+    wfzbjczesj: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "我方资本家出资额--实际值", },
+    tzzejhz: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "投资总额-计划值", },
+
+
+    //以下投资回收相关
+    bnwc: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "本年完成 投资回收决策目标值", },
+    jzbnlj: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "截止本年累计", },
+    xynwcs: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "下一年完成数", },
+    bnjh: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "本年计划", },
+    bnwcsjz: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "本年完成--投资回收实际值", },
+    jzbnljsjz: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "截止本年累计--投资回收实际值", },
+    sjyjhcysm: { type: DataTypes.TEXT, comment: "实际与计划差异说明" },
+
+    ljqs: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "累计欠收", },
+    wcl: { type: DataTypes.DECIMAL(5, 2), allowNull: true, comment: "完成率", },
+    czdzywt: { type: DataTypes.TEXT, comment: "存在主要问题" },
+    cqcsjgzkzqk: { type: DataTypes.TEXT, comment: "采取措施及开展情况" },
+    bz: { type: DataTypes.TEXT, comment: "备注" },
+    jhyjcmbcysm: { type: DataTypes.TEXT, comment: "计划与决策目标值差异说明" },
+
+
+    //截至月末累计应收
+    jzymljys: {
+        type: DataTypes.JSON,
+    },
+    //截至月末累计实收
+    jzymljsh: {
+        type: DataTypes.JSON,
+    },
+
+    
+    tzhsjc: {type: DataTypes.JSON,},
+    tzhsjh: {type: DataTypes.JSON,},
 
 
 
@@ -27,7 +103,7 @@ const ThYyqtzhs = sequelize.define('ThYyqtzhs', {
         defaultValue: 0,
         comment: "0 正常 1 删除"
     },
-      creator: {
+    creator: {
         type: DataTypes.INTEGER,
         comment: "创建人"
     },