Commit History

Author SHA1 Message Date
  zhangweicheng 2d379675a0 fixed conflict 8 years ago
  zhangweicheng 9e82a4cfa8 Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost 8 years ago
  zhangweicheng ec0f14fadc add log4js 8 years ago
  Chenshilong 960370916d Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost 8 years ago
  Chenshilong c3847b1407 基于计算程序模板的用户自定义公式解析。 8 years ago
  zhongzewei 5433983c7c 特征及内容debug 8 years ago
  zhongzewei 759651143e 特征及内容debug 8 years ago
  zhongzewei e3ca428608 Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost 8 years ago
  zhongzewei e4e6134841 特征及内容 8 years ago
  Chenshilong 323ee91f6f 用户公式解析。 8 years ago
  olym 23514e0159 Merge branch 'master' into olym 8 years ago
  olym 885f89c65e 前台编办结构根据后台更改 8 years ago
  MaiXinRong 0196419173 main, unit column 8 years ago
  zhongzewei b3dfa64e91 内容及特征 8 years ago
  TonyKang 3455c78c32 sync code supplement 8 years ago
  TonyKang edf679eae2 Merge branch 'master' of http://192.168.1.12:3000/SmartCost/ConstructionCost 8 years ago
  TonyKang 325533eadd code sync for Excel output all-in-one-book 8 years ago
  MaiXinRong e97275775a new tender, change to new bills template 8 years ago
  zhongzewei fed8a134e1 补充工料机复选框debug 8 years ago
  zhangweicheng c443bf0c5a Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost 8 years ago
  zhangweicheng f7975b5da6 fixed error 8 years ago
  olym d74fc4ed01 新增单位工程时工程专业的关联显示 8 years ago
  Chenshilong 5266cd9d59 Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost 8 years ago
  Chenshilong 5a9e017e67 1、经测试中文能作为对象属性名,于是:计算基数也加入预编译。 8 years ago
  zhangweicheng f532839624 update db config 8 years ago
  zhongzewei d112a1c7ba 补充工料机debug 8 years ago
  caiaolin 0c70e530b6 Merge branch 'master' into olym 8 years ago
  caiaolin adade6cb80 修改项目管理中同级操作 8 years ago
  zhangweicheng 6ce11f8a21 update config 8 years ago
  zhongzewei e7a2ad21e7 set to qa 8 years ago