refactor:将所有ES Module更改为CommonJS

logs/online_logs.js

@@ -6,7 +6,7 @@ module.exports = {
 };
 
 let mongoose = require("mongoose");
-import moment from "moment";
+const moment = require('moment');
 let logs_model = mongoose.model("online_logs");
 
 async function saveOnlineTime(req) {

modules/all_models/bills_template_items.js

@@ -1,7 +1,7 @@
 /**
  * Created by zhang on 2018/7/13.
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 let Schema = mongoose.Schema;
 
 let collectionName = 'std_bills_template_items';

modules/all_models/compilation.js

@@ -5,7 +5,7 @@
  * @date 2017/7/28
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'compilation';

modules/all_models/compleGlj_section.js

@@ -8,7 +8,7 @@
  * @version
  */
 
-import mongoose from 'mongoose';
+const mongoose = require('mongoose');
 
 const Schema = mongoose.Schema;
 const compleGljSection = new Schema({

modules/all_models/compleGlj_sectionTemplate.js

@@ -15,7 +15,7 @@
  *
  * */
 
-import mongoose from 'mongoose';
+const mongoose = require('mongoose');
 
 const Schema = mongoose.Schema;
 const compleGljSectionTemp = new Schema({

modules/all_models/compleRation_coe.js

@@ -13,7 +13,7 @@
 * 用户ID与费用定额ID绑定子目换算
 * */
 
-import mongoose from 'mongoose';
+const mongoose = require('mongoose');
 const deleteSchema = require('../all_schemas/delete_schema');
 const Schema = mongoose.Schema;
 const coeSchema = new Schema({

modules/all_models/comple_section_template.js

@@ -15,7 +15,7 @@
 *
 * */
 
-import mongoose from 'mongoose';
+const mongoose = require('mongoose');
 
 const Schema = mongoose.Schema;
 const compleRationSectionTemp = new Schema({

modules/all_models/config_material_list.js

@@ -4,7 +4,7 @@
 /**
  * Created by zhang on 2019/3/18.
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let evaluateSchema = {

modules/all_models/counter.js

@@ -5,7 +5,7 @@
  * @date 2017/6/29
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'counter';

modules/all_models/engineering_lib.js

@@ -5,7 +5,7 @@
  * @date 2017/8/31
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'engineering_lib';

modules/all_models/import_logs.js

@@ -1,7 +1,7 @@
 /**
  * Created by zhang on 2019/12/27.
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'import_logs';

modules/all_models/installation_fee.js

@@ -1,7 +1,7 @@
 /**
  * Created by Zhong on 2017/9/13.
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 let Schema = mongoose.Schema;
 
 //安装增加费-费用规则

modules/all_models/log.js

@@ -5,7 +5,7 @@
  * @date 2017/7/27
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'log';

modules/all_models/message.js

@@ -5,7 +5,7 @@
  * @date 2017/9/21
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'message';

modules/all_models/mix_ratio.js

@@ -5,7 +5,7 @@
  * @date 2017/7/12
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'mix_ratio';

modules/all_models/project_glj.js

@@ -8,7 +8,7 @@
  * @date 2017/6/29
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'glj_list';

modules/all_models/rpt_cfg.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2017/6/14.
  * 把报表相关的配置（字体、边框、格式等都放在一条记录中，方便整理，毕竟用户的报表格式基本是固定的，无需怎样调整）
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 let Schema = mongoose.Schema;
 let FormatSchema = new Schema({
     "ID" : String,

modules/all_models/rpt_customize_cfg.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2018/4/18.
  * 用户自定义报表输出格式(如字体，边距，竖线，窄体，小数补0等)
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 let Schema = mongoose.Schema;
 let CustomizeCfgSchema = new Schema({
     userId: String,

modules/all_models/rpt_mapping_field.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2017/7/11.
  * 为后台报表模板选择指标用
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 let MapFieldSchema = new mongoose.Schema({
     "fieldMapGrpName" : String,
     "Name": String,

modules/all_models/rpt_template.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2016/12/23.
  * 仅仅是存放报表模板的地方，由谁来引用是TreeNodeSchema的事情
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 let Schema = mongoose.Schema;
 let RptTemplateSchema = new Schema({
     "ID" : Number,

modules/all_models/rpt_tpl_data_demo.js

@@ -1,7 +1,7 @@
 /**
  * Created by Tony on 2016/12/28.
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 // let dbm = require("../../../config/db/db_manager");
 // let smartcostdb = dbm.getCfgConnection("scConstruct");
 let Schema = mongoose.Schema;

modules/all_models/setting.js

@@ -5,7 +5,7 @@
  * @date 2017/7/27
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'setting';

modules/all_models/std_mix_ratio.js

@@ -5,7 +5,7 @@
  * @date 2017/7/7
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'std_mix_ratio';

modules/all_models/tpl_tree_node.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2017/5/31.
  * 不同的用户会有一套自己的模板结构列表
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 let Schema = mongoose.Schema;
 // let TreeNodeSchema = new Schema({
 //     ID:Number,

modules/all_models/unit_price.js

@@ -5,7 +5,7 @@
  * @date 2017/6/29
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 let Schema = mongoose.Schema;
 let collectionName = 'unit_price';

modules/all_models/unit_price_file.js

@@ -5,7 +5,7 @@
  * @date 2017/6/29
  * @version
  */
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 let deleteSchema = require('../all_schemas/delete_schema');
 let Schema = mongoose.Schema;
 let collectionName = 'unit_price_file';

modules/bills_lib/controllers/bills_permissionController.js

@@ -2,9 +2,9 @@
  * Created by Zhong on 2017/8/2.
  */
 let billsController = require("./bills_lib_controllers");
-import baseController from "../../common/base/base_controller";
+const BaseController = require('../../common/base/base_controller');
 
-class billsPermContr extends baseController{
+class BillsPermContr extends BaseController{
     getCurrentUniqId(req, res){
         billsController.getCurrentUniqId(req, res);
     }
@@ -62,4 +62,4 @@ class billsPermContr extends baseController{
 
 }
 
-export default billsPermContr;
+module.exports = BillsPermContr;

modules/bills_lib/controllers/items_permissionController.js

@@ -3,9 +3,9 @@
  */
 
 let billsController = require("./bills_lib_controllers");
-import baseController from "../../common/base/base_controller";
+const BaseController = require('../../common/base/base_controller');
 
-class itemsPermContr extends baseController{
+class ItemsPermContr extends BaseController{
 
     getItemCharacter(req, res){
         billsController.getItemCharacter(req, res);
@@ -36,4 +36,4 @@ class itemsPermContr extends baseController{
     }
 }
 
-export default itemsPermContr;
+module.exports = ItemsPermContr;

modules/bills_lib/controllers/jobs_permissionController.js

@@ -3,9 +3,9 @@
  */
 
 let billsController = require("./bills_lib_controllers");
-import baseController from "../../common/base/base_controller";
+const BaseController = require('../../common/base/base_controller');
 
-class jobsPermContr extends baseController{
+class JobsPermContr extends BaseController{
 
     getJobContent(req, res){
         billsController.getJobContent(req, res);
@@ -30,4 +30,4 @@ class jobsPermContr extends baseController{
     }
 }
 
-export default jobsPermContr;
+module.exports = JobsPermContr;

modules/bills_lib/controllers/stdBillsLib_permissionController.js

@@ -2,13 +2,13 @@
  * Created by Zhong on 2017/8/2.
  */
 let billsController = require("./bills_lib_controllers");
-import baseController from "../../common/base/base_controller";
-import CompilationModel from "../../users/models/compilation_model";
+const BaseController = require('../../common/base/base_controller');
+const CompilationModel = require('../../users/models/compilation_model');
 
 let callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});
 }
-class billsLibPermContr extends baseController{
+class BillsLibPermContr extends BaseController{
     async getCompilationList(req, res){
         try{
             let compilationModel = new CompilationModel(), rst = [];
@@ -52,5 +52,5 @@ class billsLibPermContr extends baseController{
 
 }
 
-export default billsLibPermContr;
+module.exports = BillsLibPermContr;
 

modules/bills_lib/controllers/views_permissionController.js

@@ -2,9 +2,9 @@
  * 清单编辑器页面权限管理和session校验
  * Created by Zhong on 2017/8/2.
  */
-import baseController from "../../common/base/base_controller";
+const baseController = require('../../common/base/base_controller');
 
-class viewsPermContr extends baseController{
+class ViewsPermContr extends baseController{
     redirectStdBillsMain(req, res){
         res.render("maintain/bills_lib/html/main.html",
             {userAccount: req.session.managerData.username,
@@ -24,4 +24,4 @@ class viewsPermContr extends baseController{
     }
 }
 
-export default viewsPermContr;
+module.exports = ViewsPermContr;

modules/bills_lib/routes/bills_lib_routes.js

@@ -3,11 +3,11 @@
  */
 let express = require("express");
 let billsRouter =express.Router();
-import ViewsPermContr from "../controllers/views_permissionController";
-import BillsLibPermContr from "../controllers/stdBillsLib_permissionController";
-import BillsPermContr from "../controllers/bills_permissionController";
-import JobsPermContr from "../controllers/jobs_permissionController";
-import ItemsPermContr from "../controllers/items_permissionController";
+const ViewsPermContr = require('../controllers/views_permissionController');
+const BillsLibPermContr = require('../controllers/stdBillsLib_permissionController');
+const BillsPermContr = require('../controllers/bills_permissionController');
+const JobsPermContr = require('../controllers/jobs_permissionController');
+const ItemsPermContr = require('../controllers/items_permissionController');
 let viewsContr = new ViewsPermContr();
 let billsLibContr = new BillsLibPermContr();
 let billsContr = new BillsPermContr();

modules/common/base/base_controller.js

@@ -5,9 +5,9 @@
  * @date 2017/6/29
  * @version
  */
-import Moment from "moment";
-import Url from "url";
-import UserMessageModel from "../../users/models/user_message_model";
+const Moment = require('moment');
+const Url = require('url');
+const UserMessageModel = require('../../users/models/user_message_model');
 
 class BaseController {
 
@@ -68,4 +68,4 @@ class BaseController {
     }
 }
 
-export default BaseController;
+module.exports = BaseController;

modules/common/base/base_model.js

@@ -5,9 +5,9 @@
  * @date 2017/6/22
  * @version
  */
-import MongooseHelper from "../helper/mongoose_helper";
-let mongoose = require('mongoose');
-let counterModel =  mongoose.model('counter');
+const MongooseHelper = require('../helper/mongoose_helper');
+const mongoose = require('mongoose');
+let counterModel = mongoose.model('counter');
 
 class BaseModel {
 
@@ -165,4 +165,4 @@ class BaseModel {
 
 }
 
-export default BaseModel;
+module.exports = BaseModel;

modules/common/const/engineering.js

@@ -52,4 +52,7 @@ const engineeringList = [
     {name: "安装修缮工程", value: engineering.BUILD_IN_REPAIR},
 ];
 
-export {engineering as default, engineeringList as List};
+module.exports = {
+    engineering,
+    List: engineeringList,
+};

modules/common/const/glj_type_const.js

@@ -38,4 +38,4 @@ const gljType = {
     GENERAL_RISK_FEE: 8                         // 一般风险费
 };
 
-export default gljType;
+module.exports = gljType;

modules/common/const/log_type_const.js

@@ -11,4 +11,4 @@ const logType = {
     LOGIN_LOG: 1
 };
 
-export default logType;
+module.exports = logType;

modules/common/const/setting_type_const.js

@@ -10,4 +10,4 @@ let settingType = {
     PREFERENCE: 1
 };
 
-export default settingType;
+module.exports = settingType;

modules/common/helper/mongoose_helper.js

@@ -5,7 +5,7 @@
  * @date 2017/5/22.
  */
 
-import mongoose from "mongoose";
+const mongoose = require('mongoose');
 
 class MongooseHelper {
 
@@ -230,4 +230,4 @@ class MongooseHelper {
 
 }
 
-export default MongooseHelper;
+module.exports = MongooseHelper;

modules/common/std/std_glj_lib_glj_list_model.js

@@ -5,8 +5,8 @@
  * @date 2017/7/11
  * @version
  */
-import mongoose from "mongoose";
-import BaseModel from "../base/base_model";
+const mongoose = require("mongoose");
+const BaseModel = require("../base/base_model");
 
 class STDGLJLibGLJListModel extends BaseModel {
 
@@ -92,4 +92,4 @@ class STDGLJLibGLJListModel extends BaseModel {
 
 }
 
-export default STDGLJLibGLJListModel;
+module.exports = STDGLJLibGLJListModel;

modules/common/std/std_mix_ratio_model.js

@@ -5,8 +5,8 @@
  * @date 2017/7/10
  * @version
  */
-import mongoose from "mongoose";
-import BaseModel from "../base/base_model";
+const mongoose = require("mongoose");
+const BaseModel = require("../base/base_model");
 
 class STDMixRatioModel extends BaseModel {
 

modules/complementary_glj_lib/controllers/gljController.js

@@ -1,10 +1,10 @@
 /**
  * Created by Zhong on 2017/8/22.
  */
-import BaseController from "../../common/base/base_controller";
-import stdgljutil  from "../../../public/cache/std_glj_type_util";
-import GljDao from "../models/gljModel";
-import EngineeringLibModel from "../../users/models/engineering_lib_model";
+const BaseController = require("../../common/base/base_controller");
+const stdgljutil = require("../../../public/cache/std_glj_type_util");
+const GljDao = require("../models/gljModel");
+const EngineeringLibModel = require("../../users/models/engineering_lib_model");
 let config = require("../../../config/config.js");
 
 let gljDao = new GljDao();
@@ -144,4 +144,4 @@ class GljController extends BaseController{
     }
 }
 
-export default GljController;
+module.exports = GljController;

modules/complementary_glj_lib/models/gljModel.js

@@ -7,9 +7,9 @@ const stdGljModel = mongoose.model('std_glj_lib_gljList');
 const gljClassModel = mongoose.model('std_glj_lib_gljClass');
 const compleClassModel = mongoose.model('complementary_glj_section');
 const _ = require('lodash');
-import counter from "../../../public/counter/counter";
-import async from "async";
-import STDGLJLibGLJListModel from "../../common/std/std_glj_lib_glj_list_model";
+const counter = require("../../../public/counter/counter");
+const async = require("async");
+const STDGLJLibGLJListModel = require("../../common/std/std_glj_lib_glj_list_model");
 const libType = {
     stdGLJ: 1,
     complementaryGLJs: 2
@@ -424,5 +424,5 @@ class GljDao {
     }
 }
 
-export default GljDao;
+module.exports = GljDao;
 

modules/complementary_glj_lib/routes/routes.js

@@ -2,9 +2,9 @@
  * Created by Zhong on 2017/8/22.
  */
 
-import express from "express";
-import GljController from "../controllers/gljController";
-import CompleRationController from '../../complementary_ration_lib/controllers/compleRationController';
+const express = require("express");
+const GljController = require("../controllers/gljController");
+const CompleRationController = require('../../complementary_ration_lib/controllers/compleRationController');
 
 let router = express.Router();
 let gljController = new GljController();

modules/complementary_ration_lib/controllers/compleRationController.js

@@ -2,8 +2,8 @@
  * Created by Zhong on 2017/12/21.
  */
 
-import BaseController from '../../common/base/base_controller';
-import CompleRationDao from '../models/compleRationModel';
+const BaseController = require('../../common/base/base_controller');
+const CompleRationDao = require('../models/compleRationModel');
 
 let compleRationDao = new CompleRationDao();
 let coeListDAO = require('../../ration_repository/models/coe');
@@ -181,4 +181,4 @@ class CompleRationController extends BaseController{
     }
 }
 
-export default CompleRationController;
+module.exports = CompleRationController;

modules/complementary_ration_lib/controllers/compleSectionTreeController.js

@@ -2,8 +2,8 @@
  * Created by Zhong on 2017/12/21.
  */
 
-import BaseController from '../../common/base/base_controller';
-import SectionTreeDao from '../models/sectionTreeModel';
+const BaseController = require('../../common/base/base_controller');
+const SectionTreeDao = require('../models/sectionTreeModel');
 
 let sectionTreeDao = new SectionTreeDao();
 let callback = function (req, res, err, msg, data) {
@@ -33,4 +33,4 @@ class CompleSectionTreeController extends BaseController{
     }
 }
 
-export default CompleSectionTreeController;
+module.exports = CompleSectionTreeController;

modules/complementary_ration_lib/controllers/compleViewController.js

@@ -2,12 +2,12 @@
  * Created by Zhong on 2017/12/22.
  */
 
-import BaseController from '../../common/base/base_controller';
-import CompleViewModel from '../models/compleViewModel';
-import EngineeringLibModel from "../../users/models/engineering_lib_model";
+const BaseController = require('../../common/base/base_controller');
+const CompleViewModel = require('../models/compleViewModel');
+const EngineeringLibModel = require("../../users/models/engineering_lib_model");
 let config = require("../../../config/config.js");
 let compleViewModel = new CompleViewModel();
-import CompleRationDao from '../models/compleRationModel';
+const CompleRationDao = require('../models/compleRationModel');
 const compleRationDao = new CompleRationDao();
 let callback = function (req, res, err, msg, data) {
     res.json({error: err, message: msg, data: data});
@@ -133,4 +133,4 @@ class CompleViewController extends BaseController{
     }
 }
 
-export default CompleViewController;
+module.exports = CompleViewController;

modules/complementary_ration_lib/controllers/searchController.js

@@ -2,8 +2,8 @@
  * Created by Zhong on 2018/1/9.
  */
 
-import BaseController from '../../common/base/base_controller';
-import SearchDao from '../models/searchModel';
+const BaseController = require('../../common/base/base_controller');
+const SearchDao = require('../models/searchModel');
 
 let searchDao = new SearchDao();
 let callback = function (req, res, err, message, data) {
@@ -26,4 +26,4 @@ class SearchController extends BaseController{
     }
 }
 
-export default SearchController;
+module.exports = SearchController;

modules/complementary_ration_lib/models/compleRationModel.js

@@ -10,11 +10,11 @@ const complementaryGljModel = mongoose.model('complementary_glj_lib');
 const stdGljModel = mongoose.model('std_glj_lib_gljList');
 const stdgljutil = require('../../../public/cache/std_glj_type_util');
 const installFacade = require('../facades/compleInstallFacade');
-import async from 'async';
+const async = require('async');
 let stdRationModel = require ('../../ration_repository/models/ration_item').Model;
-import SectionTreeDao from '../models/sectionTreeModel';
+const SectionTreeDao = require('../models/sectionTreeModel');
 const sectionTreeDao = new SectionTreeDao();
-import GljDao from "../../complementary_glj_lib/models/gljModel";
+const GljDao = require("../../complementary_glj_lib/models/gljModel");
 const gljDao = new GljDao();
 let counter = require('../../../public/counter/counter');
 const scMathUtil = require('../../../public/scMathUtil').getUtil();
@@ -545,4 +545,4 @@ function isDef(v){
     return v !== undefined && v !== null;
 }
 
-export default CompleRatoinDao;
+module.exports = CompleRatoinDao;

modules/complementary_ration_lib/models/compleViewModel.js

@@ -26,4 +26,4 @@ class CompleViewModel {
     }
 }
 
-export default CompleViewModel;
+module.exports = CompleViewModel;

modules/complementary_ration_lib/models/searchModel.js

@@ -242,4 +242,4 @@ function isDef(v){
     return v !== undefined && v !== null;
 }
 
-export default SearchDao;
+module.exports = SearchDao;

modules/complementary_ration_lib/models/sectionTreeModel.js

@@ -148,4 +148,4 @@ class SectionTreeDao {
     }
 }
 
-export default SectionTreeDao;
+module.exports = SectionTreeDao;

modules/complementary_ration_lib/routes/routes.js

@@ -2,12 +2,12 @@
  * Created by Zhong on 2017/12/21.
  */
 
-import express from 'express';
-import CompleViewController from '../controllers/compleViewController';
-import CompleSectionTreeController from '../controllers/compleSectionTreeController';
-import CompleRationController from '../controllers/compleRationController';
-import GljController from '../../complementary_glj_lib/controllers/gljController';
-import SearchController from '../controllers/searchController'
+const express = require('express');
+const CompleViewController = require('../controllers/compleViewController');
+const CompleSectionTreeController = require('../controllers/compleSectionTreeController');
+const CompleRationController = require('../controllers/compleRationController');
+const GljController = require('../../complementary_glj_lib/controllers/gljController');
+const SearchController = require('../controllers/searchController');
 
 let router = express.Router();
 let compleViewController = new CompleViewController();

modules/glj/controllers/glj_controller.js

@@ -5,12 +5,12 @@
  * @date 2017/6/22
  * @version
  */
-import BaseController from "../../common/base/base_controller";
-import GLJTypeConst from "../../common/const/glj_type_const";
-import GLJListModel from "../models/glj_list_model";
-import UnitPriceModel from "../models/unit_price_model";
-import MixRatioModel from "../models/mix_ratio_model";
-import UnitPriceFileModel from "../models/unit_price_file_model";
+const BaseController = require("../../common/base/base_controller");
+const GLJTypeConst = require("../../common/const/glj_type_const");
+const GLJListModel = require("../models/glj_list_model");
+const UnitPriceModel = require("../models/unit_price_model");
+const MixRatioModel = require("../models/mix_ratio_model");
+const UnitPriceFileModel = require("../models/unit_price_file_model");
 let logger = require("../../../logs/log_helper").logger;
 let consts = require('../../main/models/project_consts');
 let glj_type_util = require('../../../public/cache/std_glj_type_util');
@@ -794,7 +794,6 @@ async function getGLJListByProjectID(projectId){
                 usedUnitPriceInfo.id = tmp.property.unitPriceFile.id;
             }
         }
-        responseData.data.gljList = gljList;
         // 先获取对应标段的项目工料机数据
         let gljListModel = new GLJListModel();
         let [gljList, mixRatioConnectData,mixRationMap,unitPriceMap] = await gljListModel.getListByProjectId(projectId, unitPriceFileId);
@@ -820,4 +819,4 @@ async function getGLJListByProjectID(projectId){
     return responseData;
 }
 
-export default GLJController;
+module.exports = GLJController;

modules/glj/facade/glj_facade.js

@@ -8,9 +8,9 @@ module.exports={ //先导出后require可以解决循环引用问题
 
 const mongoose = require('mongoose');
 const ProjectModel = require('../../pm/models/project_model').project;
-import UnitPriceFileModel from "../models/unit_price_file_model";
-import UnitPriceModel from "../models/unit_price_model";
-import MixRatioModel from "../models/mix_ratio_model";
+const UnitPriceFileModel = require("../models/unit_price_file_model");
+const UnitPriceModel = require("../models/unit_price_model");
+const MixRatioModel = require("../models/mix_ratio_model");
 let evaluateListModel = mongoose.model("evaluate_list");
 let bidEvaluationMode = mongoose.model("bid_evaluation_list");
 let contractorListModel = mongoose.model("contractor_list");

modules/glj/models/counter_model.js

@@ -5,8 +5,8 @@
  * @date 2017/6/23
  * @version
  */
-import BaseModel from "../../common/base/base_model";
-import mongoose from "mongoose";
+const BaseModel = require("../../common/base/base_model");
+const mongoose = require("mongoose");
 
 class CounterModel extends BaseModel {
 
@@ -51,4 +51,4 @@ class CounterModel extends BaseModel {
 
 }
 
-export default CounterModel;
+module.exports = CounterModel;

modules/glj/models/glj_list_model.js

@@ -5,18 +5,18 @@
  * @date 2017/6/22
  * @version
  */
-import mongoose from "mongoose";
-import BaseModel from "../../common/base/base_model";
-import CounterModel from "./counter_model";
-import UnitPriceModel from "./unit_price_model";
-import UnitPriceFileModel from "./unit_price_file_model";
-import GLJTypeConst from "../../common/const/glj_type_const";
-import STDGLJLibGLJListModel from "../../common/std/std_glj_lib_glj_list_model";
-import MixRatioModel from "./mix_ratio_model";
-import GljModel from "../../complementary_glj_lib/models/gljModel";
+const mongoose = require("mongoose");
+const BaseModel = require("../../common/base/base_model");
+const CounterModel = require("./counter_model");
+const UnitPriceModel = require("./unit_price_model");
+const UnitPriceFileModel = require("./unit_price_file_model");
+const GLJTypeConst = require("../../common/const/glj_type_const");
+const STDGLJLibGLJListModel = require("../../common/std/std_glj_lib_glj_list_model");
+const MixRatioModel = require("./mix_ratio_model");
+const GljModel = require("../../complementary_glj_lib/models/gljModel");
 const ProjectModel = require('../../pm/models/project_model').project;
 const scMathUtil = require('../../../public/scMathUtil').getUtil();
-import unitPriceFacade from "../../unit_price_file/facade/unit_price_facade";
+const unitPriceFacade = require("../../unit_price_file/facade/unit_price_facade");
 let gljCollectionName = 'glj_list';
 let GLJSchemas = mongoose.model(gljCollectionName);
 let _ = require("lodash");
@@ -884,4 +884,4 @@ class GLJListModel extends BaseModel {
 
 }
 
-export default GLJListModel;
+module.exports = GLJListModel;

modules/glj/models/mix_ratio_model.js

@@ -5,9 +5,9 @@
  * @date 2017/7/12
  * @version
  */
-import mongoose from "mongoose";
-import BaseModel from "../../common/base/base_model";
-import CounterModel from "./counter_model"
+const mongoose = require("mongoose");
+const BaseModel = require("../../common/base/base_model");
+const CounterModel = require("./counter_model");
 let collectionName = 'mix_ratio';
 
 class MixRatioModel extends BaseModel {
@@ -115,4 +115,4 @@ class MixRatioModel extends BaseModel {
     }
 }
 
-export default MixRatioModel;
+module.exports = MixRatioModel;

modules/glj/models/unit_price_file_model.js

@@ -5,9 +5,9 @@
  * @date 2017/7/5
  * @version
  */
-import mongoose from "mongoose";
-import BaseModel from "../../common/base/base_model";
-import CounterModel from "./counter_model";
+const mongoose = require("mongoose");
+const BaseModel = require("../../common/base/base_model");
+const CounterModel = require("./counter_model");
 let collectionName = 'unit_price_file';
 let Projects = mongoose.model('projects');
 class UnitPriceFileModel extends BaseModel {
@@ -162,4 +162,4 @@ class UnitPriceFileModel extends BaseModel {
     }
 }
 
-export default UnitPriceFileModel;
+module.exports = UnitPriceFileModel;

modules/glj/models/unit_price_model.js

@@ -5,12 +5,12 @@
  * @date 2017/6/30
  * @version
  */
-import mongoose from "mongoose";
-import BaseModel from "../../common/base/base_model"
-import GLJTypeConst from "../../common/const/glj_type_const"
-import CounterModel from "./counter_model"
-import MixRatioModel from "./mix_ratio_model";
-import _ from "lodash";
+const mongoose = require("mongoose");
+const BaseModel = require("../../common/base/base_model");
+const GLJTypeConst = require("../../common/const/glj_type_const");
+const CounterModel = require("./counter_model");
+const MixRatioModel = require("./mix_ratio_model");
+const _ = require("lodash");
 const scMathUtil = require('../../../public/scMathUtil').getUtil();
 let collectionName = 'unit_price';
 let decimal_facade = require('../../main/facade/decimal_facade');
@@ -448,4 +448,4 @@ class UnitPriceModel extends BaseModel {
 
 }
 
-export default UnitPriceModel;
+module.exports = UnitPriceModel;

modules/glj/routes/glj_router.js

@@ -5,8 +5,8 @@
  * @date 2017/6/22
  * @version
  */
-import Express from "express";
-import GLJController from "../controllers/glj_controller";
+const Express = require("express");
+const GLJController = require("../controllers/glj_controller");
 
 module.exports = function (app) {
 const router = Express.Router();

modules/main/controllers/ration_controller.js

@@ -8,7 +8,7 @@ let ration_facade = require('../facade/ration_facade');
 let bill_facade = require('../facade/bill_facade');
 let project_facade = require("../facade/project_facade");
 let logger = require("../../../logs/log_helper").logger;
-import GLJController from "../../glj/controllers/glj_controller";
+const GLJController = require("../../glj/controllers/glj_controller");
 let controller = {
     insertGLJAsRation:async function (req){
         let data = req.body.data;

modules/main/facade/bill_facade.js

@@ -19,9 +19,9 @@ let bill_Model = require('../models/bills').model;
 let billsLibDao = require("../../bills_lib/models/bills_lib_interfaces");
 
 
-import GLJController from "../../glj/controllers/glj_controller";
+const GLJController = require("../../glj/controllers/glj_controller");
 
-import GLJListModel from '../../glj/models/glj_list_model';
+const GLJListModel = require('../../glj/models/glj_list_model');
 let _ = require("lodash");
 module.exports={
     getSectionInfo : async function (data) {

modules/main/facade/project_facade.js

@@ -35,7 +35,7 @@ let glj_calculate_facade = require("../../ration_glj/facade/glj_calculate_facade
 const uuidV1 = require('uuid/v1');
 const gljUtil = require('../../../public/gljUtil');
 let stdColSettingModel = mongoose.model('std_main_col_lib');
-import GLJListModel from "../../glj/models/glj_list_model";
+const GLJListModel = require("../../glj/models/glj_list_model");
 let economicLib = mongoose.model('std_economic_lib');
 let engineerFeatureLib = mongoose.model('std_engineer_feature_lib');
 let engineerInfoLib = mongoose.model('std_engineer_info_lib');

modules/main/facade/ration_facade.js

@@ -16,8 +16,8 @@ module.exports = {
 
 
 let mongoose = require('mongoose');
-import SearchDao from '../../complementary_ration_lib/models/searchModel';
-import GLJListModel from "../../glj/models/glj_list_model";
+const SearchDao = require('../../complementary_ration_lib/models/searchModel');
+const GLJListModel = require("../../glj/models/glj_list_model");
 const scMathUtil = require('../../../public/scMathUtil').getUtil();
 let ration_glj_facade = require("../../ration_glj/facade/ration_glj_facade");
 let glj_calculate_facade = require("../../ration_glj/facade/glj_calculate_facade");

modules/main/middleware/index.js

@@ -12,7 +12,7 @@ const mongoose = require("mongoose");
 const rationModel = mongoose.model("ration");
 const pmFacade = require('../../pm/facade/pm_facade');
 const online_logs = require('../../../logs/online_logs');
-import UserModel from '../../../modules/users/models/user_model';
+const UserModel = require('../../../modules/users/models/user_model');
 
 async function rationNumberChecking(req, res, next) {
     if(req.session.systemSetting){

modules/main/models/project.js

@@ -15,7 +15,7 @@ let projSetting = require('./proj_setting_model');
 // let volumePriceData = require('../../volume_price/models/volume_price_model');
 var labour_coe_facade = require('../facade/labour_coe_facade');
 var calc_program_facade = require('../facade/calc_program_facade');
-import GLJController from "../../glj/controllers/glj_controller";
+const GLJController = require("../../glj/controllers/glj_controller");
 let installation_facade = require('../facade/installation_facade');
 let evaluate_facade = require('../facade/evaluate_facade');
 let bid_facade = require('../facade/bid_facade');
@@ -24,7 +24,7 @@ let pmController = require('../../pm/controllers/pm_controller');
 
 
 const ProjectModel = require('../../pm/models/project_model').project;
-import GLJListModel from "../../glj/models/glj_list_model";
+const GLJListModel = require("../../glj/models/glj_list_model");
 
 var consts = require('./project_consts');
 var projectConsts = consts.projectConst;
@@ -126,6 +126,7 @@ Project.prototype.getData = function(projectID, callback, isReport, userID){
             callback(0, '', results)
         }
         else{
+            console.log(err);
             callback(1, 'load project failed', null)
         }
     });

modules/main/routes/main_route.js

@@ -3,13 +3,13 @@
  */
 
 
-import BaseController from "../../common/base/base_controller";
+const BaseController = require("../../common/base/base_controller");
 const projectModel = require("../../pm/models/project_model");
 const pmFacade = require('../../pm/facade/pm_facade');
 const systemSettingModel = require('../../system_setting/model/index');
 let config = require("../../../config/config.js");
-import OptionsDao from '../../options/models/optionsModel';
-import optionSetting from '../../options/models/optionTypes';
+const OptionsDao = require('../../options/models/optionsModel');
+const optionSetting = require('../../options/models/optionTypes');
 const regionMap = {
     '重庆定额(2018)': '重庆市',
     '广东定额(2018)': '广东省'

modules/options/controllers/optionsController.js

@@ -2,9 +2,9 @@
  * Created by Zhong on 2017/9/28.
  */
 
-import BaseController from '../../common/base/base_controller';
-import OptionsDao from '../models/optionsModel';
-import optionSetting from '../models/optionTypes';
+const BaseController = require('../../common/base/base_controller');
+const OptionsDao = require('../models/optionsModel');
+const optionSetting = require('../models/optionTypes');
 
 let optionsDao = new OptionsDao();
 class OptionController extends BaseController {
@@ -141,4 +141,4 @@ class OptionController extends BaseController {
     }
 }*/
 
-export default OptionController;
+module.exports = OptionController;

modules/options/models/optionTypes.js

@@ -76,4 +76,4 @@ const optionSetting = {
     }
 };
 
-export default optionSetting;
+module.exports = optionSetting;

modules/options/models/optionsModel.js

@@ -28,4 +28,4 @@ class OptionsDao {
     }
 }
 
-export default OptionsDao;
+module.exports = OptionsDao;

modules/options/routes/routes.js

@@ -1,8 +1,8 @@
 /**
  * Created by Zhong on 2017/9/28.
  */
-import express from 'express';
-import OptionsController from '../controllers/optionsController';
+const express = require('express');
+const OptionsController = require('../controllers/optionsController');
 
 let router = express.Router();
 let optionsController = new OptionsController();

modules/pm/controllers/new_proj_controller.js

@@ -11,8 +11,8 @@ const mongoose = require('mongoose');
 let mainColLibModel = mongoose.model('std_main_col_lib');
 const billsUtil = require('../../../public/billsUtil');
 
-import BillsTemplateModel from "../models/templates/bills_template_model";
-import EngineeringLibModel from "../../users/models/engineering_lib_model";
+const BillsTemplateModel = require("../models/templates/bills_template_model");
+const EngineeringLibModel = require("../../users/models/engineering_lib_model");
 
 module.exports = {
     copyTemplateData: async function (property, newProjID, callback) {

modules/pm/controllers/pm_controller.js

@@ -1,10 +1,10 @@
 /**
  * Created by Mai on 2017/1/18.
  */
-import UnitPriceFileModel from "../../glj/models/unit_price_file_model";
-import moment from 'moment';
-import CompilationModel from "../../users/models/compilation_model";
-import UserModel from "../../users/models/user_model";
+const UnitPriceFileModel = require("../../glj/models/unit_price_file_model");
+const moment = require('moment');
+const CompilationModel = require("../../users/models/compilation_model");
+const UserModel = require("../../users/models/user_model");
 const userModelObj = new UserModel();
 let mongoose = require('mongoose');
 let ProjectsData = require('../models/project_model').project;
@@ -27,7 +27,7 @@ const optionModel = mongoose.model('options');
 const stdBillsGuidanceLibModel = mongoose.model('std_billsGuidance_lib');
 const fs = require('fs');
 const _ = require('lodash');
-import SectionTreeDao from '../../complementary_ration_lib/models/sectionTreeModel';
+const SectionTreeDao = require('../../complementary_ration_lib/models/sectionTreeModel');
 const uuidV1 = require('uuid/v1');
 let sectionTreeDao = new SectionTreeDao();
 let consts = require('../../main/models/project_consts');

modules/pm/facade/pm_facade.js

@@ -94,7 +94,6 @@ let basicInfoModel = mongoose.model('std_basic_info_lib');
 let projectFeatureModel = mongoose.model('std_project_feature_lib');
 let stdRationItemModel = mongoose.model('std_ration_lib_ration_items');
 let stdGljItemModel = mongoose.model('std_glj_lib_gljList');
-import BillsTemplateModel from "../models/templates/bills_template_model";
 let evaluateListModel = mongoose.model("evaluate_list");
 let bidListModel = mongoose.model("bid_evaluation_list");
 let contractorListModel = mongoose.model("contractor_list");
@@ -106,23 +105,23 @@ let welcomeModel = mongoose.model("welcome_setting");
 
 let scMathUtil = require('../../../public/scMathUtil').getUtil();
 let counter = require('../../../public/counter/counter');
-import SectionTreeDao from '../../complementary_ration_lib/models/sectionTreeModel';
+const SectionTreeDao = require('../../complementary_ration_lib/models/sectionTreeModel');
 let sectionTreeDao = new SectionTreeDao();
-import CounterModel from "../../glj/models/counter_model";
-import moment from 'moment-timezone';
+const CounterModel = require("../../glj/models/counter_model");
+const moment = require('moment-timezone');
 const { fixedFlag, SharePermissionChangeType } = require('../../../public/common_constants');
 const notDeleted = [{deleteInfo: null}, {'deleteInfo.deleted': false}];
-import {
+const {
     defaultDecimal,
     billsQuantityDecimal,
     displaySetting,
     calcOptions,
     tenderSetting
-} from '../models/project_property_template';
+} = require('../models/project_property_template');
 let labourCoeFacade = require('../../main/facade/labour_coe_facade');
 let calcProgramFacade = require('../../main/facade/calc_program_facade');
 let mainColLibModel = mongoose.model('std_main_col_lib');
-import EngineeringLibModel from "../../users/models/engineering_lib_model";
+const EngineeringLibModel = require("../../users/models/engineering_lib_model");
 let installationFacade = require('../../main/facade/installation_facade');
 let cipher = require('../../../public/cipher');
 let index = require("../../system_setting/model/index");

modules/pm/models/project_model.js

@@ -17,21 +17,18 @@ module.exports ={    project: new ProjectsDAO(),
     fileType: fileType
 };
 
-import mongoose from 'mongoose';
-import async_c from 'async';
-import UnitPriceFileModel from "../../glj/models/unit_price_file_model";
+const mongoose = require('mongoose');
+const async_c = require('async');
+const UnitPriceFileModel = require("../../glj/models/unit_price_file_model");
 let UnitPriceFiles = mongoose.model('unit_price_file');
-import {
+const {
     defaultDecimal,
     billsQuantityDecimal,
-    basicInformation,
-    projectFeature,
     displaySetting,
     calcOptions,
     tenderSetting
-} from './project_property_template';
-import optionSetting from '../../options/models/optionTypes';
-const { fixedFlag } = require('../../../public/common_constants');
+} = require('./project_property_template');
+const optionSetting = require('../../options/models/optionTypes');
 let FeeRateFiles = mongoose.model('fee_rate_file');
 let counter = require("../../../public/counter/counter.js");
 

modules/pm/models/project_property_template.js

@@ -4,138 +4,146 @@
 
 //默认的小数位数,用于定义用户可编辑的字段（入库），用户不可编辑的字段在前端defaultDecima._def中定义即可
 const defaultDecimal = {
-    bills: {unitPrice: 2, totalPrice: 2},
-    ration: {quantity: 4, unitPrice: 2, totalPrice: 2},
-    glj: {quantity: 4, unitPriceHasMix: 2, unitPrice: 3},
+    bills: { unitPrice: 2, totalPrice: 2 },
+    ration: { quantity: 4, unitPrice: 2, totalPrice: 2 },
+    glj: { quantity: 4, unitPriceHasMix: 2, unitPrice: 3 },
     feeRate: 3,
     quantity_detail: 4,
-    material:5,//三材系数
+    material: 5,//三材系数
     process: 6
 };
 const displaySetting = {
-    autoHeight:true,
-    billsAutoHeight:true,
-    rationAutoHeight:true,
-    disPlayMainMaterial:false
+    autoHeight: true,
+    billsAutoHeight: true,
+    rationAutoHeight: true,
+    disPlayMainMaterial: false
 };
 
 const tenderSetting = {
-    gljPriceTenderCoe:1, //工料机单价调整系数
-    calcPriceOption:'coeBase'//根据调整系数计算报价
+    gljPriceTenderCoe: 1, //工料机单价调整系数
+    calcPriceOption: 'coeBase'//根据调整系数计算报价
 };
 
-const calcOptions={
-    calc_main:false,
-    calc_add:true,
-    calc_est:true
+const calcOptions = {
+    calc_main: false,
+    calc_add: true,
+    calc_est: true
 }
 /*
 * 单位工程清单工程量精度模板
 * */
 const billsQuantityDecimal = [
-    {unit: '其他未列单位', decimal: 2},
-    {unit: 't', decimal: 3},
-    {unit: '吨', decimal: 3},
-    {unit: 'km', decimal: 3},
-    {unit: '千米', decimal: 3},
-    {unit: 'm', decimal: 2},
-    {unit: '米', decimal: 2},
-    {unit: 'm2', decimal: 2},
-    {unit: '平方米', decimal: 2},
-    {unit: 'm3', decimal: 2},
-    {unit: '立方米', decimal: 2},
-    {unit: 'kg', decimal: 2},
-    {unit: '千克', decimal: 2},
-    {unit: '公斤', decimal: 2},
-    {unit: '元', decimal: 2},
-    {unit: '工日', decimal: 0},
-    {unit: '台班', decimal: 0},
-    {unit: '个', decimal: 0},
-    {unit: '件', decimal: 0},
-    {unit: '根', decimal: 0},
-    {unit: '组', decimal: 0},
-    {unit: '宗', decimal: 0},
-    {unit: '付', decimal: 0},
-    {unit: '处', decimal: 0},
-    {unit: '系统', decimal: 0},
-    {unit: '部', decimal: 0},
-    {unit: '台', decimal: 0},
-    {unit: '辆', decimal: 0},
-    {unit: '套', decimal: 0},
-    {unit: '株', decimal: 0},
-    {unit: '从', decimal: 0},
-    {unit: '缸', decimal: 0},
-    {unit: '支', decimal: 0},
-    {unit: '只', decimal: 0},
-    {unit: '块', decimal: 0},
-    {unit: '座', decimal: 0},
-    {unit: '对', decimal: 0},
-    {unit: '份', decimal: 0},
-    {unit: '樘', decimal: 0},
-    {unit: '攒', decimal: 0},
-    {unit: '榀', decimal: 0}
+    { unit: '其他未列单位', decimal: 2 },
+    { unit: 't', decimal: 3 },
+    { unit: '吨', decimal: 3 },
+    { unit: 'km', decimal: 3 },
+    { unit: '千米', decimal: 3 },
+    { unit: 'm', decimal: 2 },
+    { unit: '米', decimal: 2 },
+    { unit: 'm2', decimal: 2 },
+    { unit: '平方米', decimal: 2 },
+    { unit: 'm3', decimal: 2 },
+    { unit: '立方米', decimal: 2 },
+    { unit: 'kg', decimal: 2 },
+    { unit: '千克', decimal: 2 },
+    { unit: '公斤', decimal: 2 },
+    { unit: '元', decimal: 2 },
+    { unit: '工日', decimal: 0 },
+    { unit: '台班', decimal: 0 },
+    { unit: '个', decimal: 0 },
+    { unit: '件', decimal: 0 },
+    { unit: '根', decimal: 0 },
+    { unit: '组', decimal: 0 },
+    { unit: '宗', decimal: 0 },
+    { unit: '付', decimal: 0 },
+    { unit: '处', decimal: 0 },
+    { unit: '系统', decimal: 0 },
+    { unit: '部', decimal: 0 },
+    { unit: '台', decimal: 0 },
+    { unit: '辆', decimal: 0 },
+    { unit: '套', decimal: 0 },
+    { unit: '株', decimal: 0 },
+    { unit: '从', decimal: 0 },
+    { unit: '缸', decimal: 0 },
+    { unit: '支', decimal: 0 },
+    { unit: '只', decimal: 0 },
+    { unit: '块', decimal: 0 },
+    { unit: '座', decimal: 0 },
+    { unit: '对', decimal: 0 },
+    { unit: '份', decimal: 0 },
+    { unit: '樘', decimal: 0 },
+    { unit: '攒', decimal: 0 },
+    { unit: '榀', decimal: 0 }
 ];
 
 //项目属性基本信息
 const basicInformation = [
-    {dispName: '基本信息', key: 'basicInfo', items: [
-        {dispName: '合同号', key: 'contractNum', value: ''},
-        {dispName: '建设地点', key: 'constructionPlace', value: ''},
-        {dispName: '质量标准', key: 'qualityStandard', value: ''},
-        {dispName: '工程类别', key: 'projectCategory', value: ''},
-        {dispName: '建设日期', key: 'constructionDate', value: ''},
-        {dispName: '工程规模', key: 'projectScale', value: ''},
-        {dispName: '总建筑面积(m2)', key: 'grossArea', value: ''},
-        {dispName: '建设单位', key: 'constructionUnit', value: ''},
-        {dispName: '设计单位', key: 'designUnit', value: ''},
-        {dispName: '施工单位', key: 'buildingUnit', value: ''},
-        {dispName: '监理单位', key: 'supervisingUnit', value: ''},
-        {dispName: '审核单位', key: 'auditUnit', value: ''},
-        {dispName: '建设单位审核人', key: 'constructionUnitAudit', value: ''},
-        {dispName: '设计单位负责人', key: 'designUnitPrincipal', value: ''},
-        {dispName: '施工单位编制人', key: 'buildingUnitAuthor', value: ''},
-        {dispName: '监理单位审核人', key: 'supervisingUnitAuditor', value: ''},
-        {dispName: '审核单位审核人', key: 'auditUnitAuditor', value: ''},
-        {dispName: '编制时间', key: 'establishDate', value: ''}
-    ]},
-    {dispName: '招标信息', key: 'biddingInfo', items: [
-        {dispName: '招标人', key: 'bidInviter', value: ''},
-        {dispName: '法定代表人或其他授权人', key: 'representative', value: ''},
-        {dispName: '造价工程师', key: 'costEngineer', value: ''}
-    ]},
-    {dispName: '投标信息', key: 'bidInfo', items: [
-        {dispName: '投标人', key: 'bidder', value: ''},
-        {dispName: '法定代表人或其授权人', key: 'representative', value: ''},
-        {dispName: '造价工程师', key: 'costEngineer', value: ''}
-    ]},
-    {dispName: '工程造价咨询信息', key: 'engineeringCostConsultationInfo', items: [
-        {dispName: '工程造价咨询人', key: 'consultant', value: ''},
-        {dispName: '法定代表人或其授权人', key: 'representative', value: ''},
-        {dispName: '造价工程师', key: 'costEngineer', value: ''}
-    ]}
+    {
+        dispName: '基本信息', key: 'basicInfo', items: [
+            { dispName: '合同号', key: 'contractNum', value: '' },
+            { dispName: '建设地点', key: 'constructionPlace', value: '' },
+            { dispName: '质量标准', key: 'qualityStandard', value: '' },
+            { dispName: '工程类别', key: 'projectCategory', value: '' },
+            { dispName: '建设日期', key: 'constructionDate', value: '' },
+            { dispName: '工程规模', key: 'projectScale', value: '' },
+            { dispName: '总建筑面积(m2)', key: 'grossArea', value: '' },
+            { dispName: '建设单位', key: 'constructionUnit', value: '' },
+            { dispName: '设计单位', key: 'designUnit', value: '' },
+            { dispName: '施工单位', key: 'buildingUnit', value: '' },
+            { dispName: '监理单位', key: 'supervisingUnit', value: '' },
+            { dispName: '审核单位', key: 'auditUnit', value: '' },
+            { dispName: '建设单位审核人', key: 'constructionUnitAudit', value: '' },
+            { dispName: '设计单位负责人', key: 'designUnitPrincipal', value: '' },
+            { dispName: '施工单位编制人', key: 'buildingUnitAuthor', value: '' },
+            { dispName: '监理单位审核人', key: 'supervisingUnitAuditor', value: '' },
+            { dispName: '审核单位审核人', key: 'auditUnitAuditor', value: '' },
+            { dispName: '编制时间', key: 'establishDate', value: '' }
+        ]
+    },
+    {
+        dispName: '招标信息', key: 'biddingInfo', items: [
+            { dispName: '招标人', key: 'bidInviter', value: '' },
+            { dispName: '法定代表人或其他授权人', key: 'representative', value: '' },
+            { dispName: '造价工程师', key: 'costEngineer', value: '' }
+        ]
+    },
+    {
+        dispName: '投标信息', key: 'bidInfo', items: [
+            { dispName: '投标人', key: 'bidder', value: '' },
+            { dispName: '法定代表人或其授权人', key: 'representative', value: '' },
+            { dispName: '造价工程师', key: 'costEngineer', value: '' }
+        ]
+    },
+    {
+        dispName: '工程造价咨询信息', key: 'engineeringCostConsultationInfo', items: [
+            { dispName: '工程造价咨询人', key: 'consultant', value: '' },
+            { dispName: '法定代表人或其授权人', key: 'representative', value: '' },
+            { dispName: '造价工程师', key: 'costEngineer', value: '' }
+        ]
+    }
 ];
 
 const projectFeature = [
-    {dispName: '工程专业', key: 'engineering', value: ''},//只读，用户新建单位工程时选择的值
-    {dispName: '工程类型', key: 'projType', value: ''},
-    {dispName: '结构类型', key: 'structureType', value: ''},
-    {dispName: '基础类型', key: 'baseType', value: ''},
-    {dispName: '建筑特征', key: 'buildingFeature', value: ''},
-    {dispName: '建筑面积(m2)', key: 'buildingArea', value: ''},
-    {dispName: '其中地下室建筑面积(m2)', key: 'basementBuildingArea', value: ''},
-    {dispName: '总层数', key: 'totalFloors', value: ''},
-    {dispName: '地下室层数(+/-0.00以下)', key: 'basementFloors', value: ''},
-    {dispName: '建筑层数(+/-0.00以下)', key: 'buildingFloors', value: ''},
-    {dispName: '建筑物总高度(m)', key: 'buildingHeight', value: ''},
-    {dispName: '地下室总高度(m)', key: 'basementHeight', value: ''},
-    {dispName: '首层高度(m)', key: 'firstFloorHeight', value: ''},
-    {dispName: '裙楼高度(m)', key: 'podiumBuildingHeight', value: ''},
-    {dispName: '标准层高度(m)', key: 'standardFloorHeight', value: ''},
-    {dispName: '基础材料及装饰', key: 'baseMaterial', value: ''},
-    {dispName: '楼地面材料及装饰', key: 'flooringMaterial', value: ''},
-    {dispName: '外墙材料及装饰', key: 'exteriorWallMaterial', value: ''},
-    {dispName: '屋面材料及装饰', key: 'roofingMaterial', value: ''},
-    {dispName: '门窗材料及装饰', key: 'doorsWindowsMaterial', value: ''}
+    { dispName: '工程专业', key: 'engineering', value: '' },//只读，用户新建单位工程时选择的值
+    { dispName: '工程类型', key: 'projType', value: '' },
+    { dispName: '结构类型', key: 'structureType', value: '' },
+    { dispName: '基础类型', key: 'baseType', value: '' },
+    { dispName: '建筑特征', key: 'buildingFeature', value: '' },
+    { dispName: '建筑面积(m2)', key: 'buildingArea', value: '' },
+    { dispName: '其中地下室建筑面积(m2)', key: 'basementBuildingArea', value: '' },
+    { dispName: '总层数', key: 'totalFloors', value: '' },
+    { dispName: '地下室层数(+/-0.00以下)', key: 'basementFloors', value: '' },
+    { dispName: '建筑层数(+/-0.00以下)', key: 'buildingFloors', value: '' },
+    { dispName: '建筑物总高度(m)', key: 'buildingHeight', value: '' },
+    { dispName: '地下室总高度(m)', key: 'basementHeight', value: '' },
+    { dispName: '首层高度(m)', key: 'firstFloorHeight', value: '' },
+    { dispName: '裙楼高度(m)', key: 'podiumBuildingHeight', value: '' },
+    { dispName: '标准层高度(m)', key: 'standardFloorHeight', value: '' },
+    { dispName: '基础材料及装饰', key: 'baseMaterial', value: '' },
+    { dispName: '楼地面材料及装饰', key: 'flooringMaterial', value: '' },
+    { dispName: '外墙材料及装饰', key: 'exteriorWallMaterial', value: '' },
+    { dispName: '屋面材料及装饰', key: 'roofingMaterial', value: '' },
+    { dispName: '门窗材料及装饰', key: 'doorsWindowsMaterial', value: '' }
 ];
 
-export {defaultDecimal, billsQuantityDecimal, basicInformation, projectFeature,displaySetting,calcOptions,tenderSetting};
+module.exports = { defaultDecimal, billsQuantityDecimal, basicInformation, projectFeature, displaySetting, calcOptions, tenderSetting };

modules/pm/models/templates/bills_template_model.js

@@ -2,7 +2,7 @@
  * Created by Mai on 2017/4/14.
  * 清单模板，新建项目使用
  */
-import BaseModel from "../../../common/base/base_model";
+const BaseModel = require("../../../common/base/base_model");
 const mongoose = require('mongoose');
 const BillsTemplateSchema = mongoose.model('std_bills_template_items');
 
@@ -74,4 +74,4 @@ class BillsTemplateModel extends BaseModel {
     }
 };
 
-export default BillsTemplateModel;
+module.exports = BillsTemplateModel;

modules/pm/routes/pm_route.js

@@ -2,7 +2,7 @@
  * pm: project management
  * Created by Mai on 2017/3/8.
  */
-import BaseController from "../../common/base/base_controller";
+const BaseController = require("../../common/base/base_controller");
 let express = require('express');
 let pmController = require('./../controllers/pm_controller');
 const baseController = new BaseController();

modules/ration_glj/controllers/ration_glj_controller.js

@@ -3,7 +3,7 @@
  */
 let mongoose = require("mongoose")
 let ration_glj_facade = require('../facade/ration_glj_facade')
-import EngineeringLibModel from "../../users/models/engineering_lib_model";
+const EngineeringLibModel = require("../../users/models/engineering_lib_model");
 let logger = require("../../../logs/log_helper").logger;
 const { COMPILATION, COMPLEMENTARY_LIB } = require('../../../public/common_constants');
 

modules/ration_glj/facade/ration_glj_facade.js

@@ -37,7 +37,7 @@ let consts = require('../../main/models/project_consts')
 let commonConsts = consts.commonConst;
 let _ = require("lodash");
 let ration_glj = mongoose.model('ration_glj');
-import GLJListModel from '../../glj/models/glj_list_model';
+const GLJListModel = require('../../glj/models/glj_list_model');
 let std_glj_lib_gljList_model = mongoose.model('std_glj_lib_gljList');
 let async_n = require("async");
 let ration = mongoose.model('ration');
@@ -49,10 +49,10 @@ let glj_type_util = require('../../../public/cache/std_glj_type_util');
 let quantity_detail_facade = require('../../main/facade/quantity_detail_facade');
 let ration_installation_facade = require('../../main/facade/ration_installation_facade');
 let logger = require("../../../logs/log_helper").logger;
-import stdgljutil  from "../../../public/cache/std_glj_type_util";
-import EngineeringLibModel from "../../users/models/engineering_lib_model";
-import GljDao from "../../complementary_glj_lib/models/gljModel";
-import gljType from "../../common/const/glj_type_const.js";
+const stdgljutil  = require("../../../public/cache/std_glj_type_util");
+const EngineeringLibModel = require("../../users/models/engineering_lib_model");
+const GljDao = require("../../complementary_glj_lib/models/gljModel");
+const gljType = require("../../common/const/glj_type_const.js");
 const complementaryGljModel = mongoose.model('complementary_glj_lib');
 const stdGljModel = mongoose.model('std_glj_lib_gljList');
 const gljClassModel = mongoose.model('std_glj_lib_gljClass');

modules/reports/controllers/rpt_cfg_controller.js

@@ -2,8 +2,8 @@
  * Created by Tony on 2017/7/5.
  */
 
-import mongoose from "mongoose";
-import rpt_util from "../util/rpt_util";
+const mongoose = require("mongoose");
+const rpt_util = require("../util/rpt_util");
 let Rpt_Map_Fld_Mdl = mongoose.model('rpt_mapping_field');
 
 

modules/reports/controllers/rpt_controller.js

@@ -2,27 +2,27 @@
  * Created by Tony on 2017/3/13.
  */
 
-import mongoose from "mongoose";
-import async from "async";
+const mongoose = require("mongoose");
+const async = require("async");
 
-import JV from "../rpt_component/jpc_value_define";
+const JV = require("../rpt_component/jpc_value_define");
 
 let Template = mongoose.model('rpt_templates');
 let rptTplDataFacade = require("../facade/rpt_tpl_data_facade");
 let fsUtil = require("../../../public/fsUtil");
 let pm_facade = require('../../../modules/pm/facade/pm_facade');
 
-import rptTplFacade from "../facade/rpt_template_facade";
-import demoTemplateFacade from "../facade/rpt_tpl_data_demo_facade";
+const rptTplFacade = require("../facade/rpt_template_facade");
+const demoTemplateFacade = require("../facade/rpt_tpl_data_demo_facade");
 
-import JpcEx from "../rpt_component/jpc_ex";
-import rptUtil from "../util/rpt_util";
-import rpt_xl_util from "../util/rpt_excel_util";
-import rpt_pdf_util from "../util/rpt_pdf_util";
-import rpt_svg_util from "../util/rpt_svg_util";
-import fs from "fs";
-import strUtil from "../../../public/stringUtil";
-import rptDataExtractor from "../util/rpt_construct_data_util";
+const JpcEx = require("../rpt_component/jpc_ex");
+const rptUtil = require("../util/rpt_util");
+const rpt_xl_util = require("../util/rpt_excel_util");
+const rpt_pdf_util = require("../util/rpt_pdf_util");
+const rpt_svg_util = require("../util/rpt_svg_util");
+const fs = require("fs");
+const strUtil = require("../../../public/stringUtil");
+const rptDataExtractor = require("../util/rpt_construct_data_util");
 //统一回调函数
 let callback = function(req, res, err, data){
     if(err){

modules/reports/controllers/rpt_tpl_controller.js

@@ -2,19 +2,19 @@
  * Created by Tony on 2017/6/1.
  */
 
-import mongoose from "mongoose";
+const mongoose = require("mongoose");
 
-import async from "async";
-import counter from "../../../public/counter/counter";
+const async = require("async");
+const counter = require("../../../public/counter/counter");
 
 let RptTplModel = mongoose.model('rpt_templates');
 let TreeNodeModel = mongoose.model('rpt_tpl_tree');
 
 let rptCustCfgFacade = require("../facade/rpt_cust_cfg_facade");
 
-import JV from "../rpt_component/jpc_value_define";
-import rttFacade from "../facade/rpt_tpl_tree_node_facade";
-import CompilationModel from "../../users/models/compilation_model";
+const JV = require("../rpt_component/jpc_value_define");
+const rttFacade = require("../facade/rpt_tpl_tree_node_facade");
+const CompilationModel = require("../../users/models/compilation_model");
 
 //统一回调函数
 let callback = function(req, res, err, message, data){
@@ -397,4 +397,4 @@ function copyRptCfg(src, dest) {
     }
 }
 
-export default mExport;
+module.exports = mExport;

modules/reports/facade/rpt_cust_cfg_facade.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2018/4/18.
  */
 
-import mongoose from "mongoose";
+const mongoose = require("mongoose");
 let rpt_customize_cfg_mdl = mongoose.model("rpt_customize_cfg");
 
 module.exports = {

modules/reports/facade/rpt_template_facade.js

@@ -1,7 +1,7 @@
 /**
  * Created by Tony on 2017/8/9.
  */
-import mongoose from "mongoose";
+const mongoose = require("mongoose");
 let rpt_tpl_mdl = mongoose.model("rpt_templates");
 
 module.exports = {

modules/reports/facade/rpt_tpl_data_demo_facade.js

@@ -1,7 +1,7 @@
 /**
  * Created by Tony on 2017/8/9.
  */
-import mongoose from "mongoose";
+const mongoose = require("mongoose");
 let rpt_tpl_data_demo_mdl = mongoose.model("rpt_temp_tpl_data");
 
 module.exports = {

modules/reports/facade/rpt_tpl_data_facade.js

@@ -2,7 +2,6 @@
  * Created by Tony on 2017/8/9.
  */
 
-// import mongoose from "mongoose";
 // let consts = require('../../../modules/main/models/project_consts');
 // let projectConst = consts.projectConst;
 let prjMdl = require('../../../modules/pm/models/project_model');

modules/reports/facade/rpt_tpl_tree_node_facade.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2017/9/14.
  */
 
-import mongoose from "mongoose";
+const mongoose = require("mongoose");
 
 let rpt_tpl_tree_mdl = mongoose.model("rpt_tpl_tree");
 
@@ -82,4 +82,4 @@ let expObj = {
     findTplTreeByCompilation:   findTplTreeByCompilation
 };
 
-export {expObj as default};
+module.exports = expObj;

modules/reports/routes/report_router.js

@@ -2,9 +2,9 @@
  * Created by Tony on 2017/3/13.
  */
 
-import express from "express";
+const express = require("express");
 let rptRouter = express.Router();
-import reportController from "./../controllers/rpt_controller";
+const reportController = require("./../controllers/rpt_controller");
 
 module.exports =function (app) {
     app.get('/report',  function(req, res) {

modules/reports/routes/rpt_tpl_router.js

@@ -1,7 +1,7 @@
-import express from "express";
+const express = require("express");
 let rptTplRouter = express.Router();
-import reportTplController from "./../controllers/rpt_tpl_controller";
-import reportCfgController from "./../controllers/rpt_cfg_controller";
+const reportTplController = require("./../controllers/rpt_tpl_controller");
+const reportCfgController = require("./../controllers/rpt_cfg_controller");
 
 module.exports = function (app) {
     app.get('/rpt_tpl',  function(req, res) {

modules/reports/routes/rpt_tpl_router_fe.js

@@ -2,9 +2,9 @@
  * Created by Tony on 2017/6/26.
  * 报表模板路由 - 前台专用（无任何update）
  */
-import express from "express";
+const express = require("express");
 let rptTplRouter = express.Router();
-import reportTplController from "./../controllers/rpt_tpl_controller";
+const reportTplController = require("./../controllers/rpt_tpl_controller");
 
 module.exports = function (app) {
     app.get('/rpt_print',  function(req, res) {

modules/reports/rpt_component/jpc_ex.js

@@ -381,4 +381,4 @@ JpcExSrv.prototype.createNew = function(){
     return JpcResult;
 };
 
-export default new JpcExSrv();
+module.exports = new JpcExSrv();

modules/reports/rpt_component/jpc_value_define.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+const fs = require('fs');
 
 function getValDefine() {
     let tmpRst = null;

modules/reports/util/rpt_construct_data_util.js

@@ -1691,4 +1691,4 @@ function replaceActDataArr(dtObj, newArr) {
     }
 }
 
-export default Rpt_Data_Extractor;
+module.exports = Rpt_Data_Extractor;

modules/reports/util/rpt_tmp_file_sweep.js

@@ -50,4 +50,4 @@ let jobObj = {
     }
 };
 
-export default jobObj;
+module.exports = { rptCronJob: jobObj };

modules/std_billsGuidance_lib/controllers/libController.js

@@ -7,7 +7,7 @@
  * @date 2018/5/29
  * @version
  */
-import BaseController from '../../common/base/base_controller';
+const BaseController = require('../../common/base/base_controller');
 const _ = require('lodash');
 const billsGuidanceFacade = require('../facade/facades');
 let callback = function (req, res, err, msg, data) {
@@ -62,4 +62,4 @@ class BillsGuideLibController extends BaseController{
     }
 }
 
-export default BillsGuideLibController;
+module.exports = BillsGuideLibController;

modules/std_billsGuidance_lib/controllers/viewController.js

@@ -7,7 +7,7 @@
  * @date 2018/5/29
  * @version
  */
-import BaseController from "../../common/base/base_controller";
+const BaseController = require("../../common/base/base_controller");
 
 class ViewsController extends BaseController{
     redirectMain(req, res){
@@ -24,4 +24,4 @@ class ViewsController extends BaseController{
     }
 }
 
-export default ViewsController;
+module.exports = ViewsController;

modules/std_billsGuidance_lib/facade/facades.js

@@ -7,16 +7,11 @@
  * @date 2018/6/1
  * @version
  */
-import mongoose from 'mongoose';
-import CompilationModel from "../../users/models/compilation_model";
-import moment from 'moment';
-const uuidV1 = require('uuid/v1');
-const billsLibModel = mongoose.model('std_bills_lib_list');
+const mongoose = require('mongoose');
 const billsGuideLibModel = mongoose.model('std_billsGuidance_lib');
 const billsGuideItemsModel = mongoose.model('std_billsGuidance_items');
 const stdBillsLibModel = mongoose.model('std_bills_lib_list');
 const stdBillsModel = mongoose.model('std_bills_lib_bills');
-const stdBillsJobsModel = mongoose.model('std_bills_lib_jobContent');
 const stdRationModel = mongoose.model('std_ration_lib_ration_items');
 const _ = require('lodash');