Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/material_exponent.js

@@ -234,7 +234,7 @@ module.exports = app => {
                 const calc = this._.find(calcBase, function(item) {
                     return bq.code === item.code;
                 });
-                const oldcalc = old_ex_calc ? this._.find(JSON.parse(old_ex_calc), function(item) {
+                const oldcalc = old_ex_calc ? this._.find(old_ex_calc, function(item) {
                     return bq.code === item.code;
                 }) : null;
                 bq.value = calc.value;

sql/update.sql

@@ -31,7 +31,7 @@ ADD COLUMN `tid`  int(11) NULL COMMENT '标段id' AFTER `add_sid`;
 Update zh_stage_jgcl LEFT JOIN zh_stage ON zh_stage_jgcl.sid = zh_stage.id Set zh_stage_jgcl.tid = zh_stage.tid
 
 -- 指数调差
-ALTER TABLE `zh_material` ADD `ex_tp` DECIMAL(30,8) NULL DEFAULT NULL COMMENT '指数本期金额' AFTER `pre_tp`, ADD `ex_pre_tp` DECIMAL(30,8) NULL DEFAULT NULL COMMENT '指数截止上期金额' AFTER `ex_tp`, ADD `ex_expr` VARCHAR(3000) NULL DEFAULT NULL COMMENT '指数调差结果公式' AFTER `ex_pre_tp`, ADD `ex_base_selested` VARCHAR(255) NULL DEFAULT NULL COMMENT '已选调差基数值' AFTER `ex_expr`;
+ALTER TABLE `zh_material` ADD `ex_tp` DECIMAL(30,8) NULL DEFAULT NULL COMMENT '指数本期金额' AFTER `pre_tp`, ADD `ex_pre_tp` DECIMAL(30,8) NULL DEFAULT NULL COMMENT '指数截止上期金额' AFTER `ex_tp`, ADD `ex_expr` VARCHAR(5000) NULL DEFAULT NULL COMMENT '指数调差结果公式' AFTER `ex_pre_tp`, ADD `ex_calc` VARCHAR(1000) NULL DEFAULT NULL COMMENT '调差基数值json' AFTER `ex_expr`;
 
 CREATE TABLE `zh_material_exponent` (
   `id` int(11) NOT NULL AUTO_INCREMENT,