变更方案及申请统一使用规则

app/controller/change_controller.js

@@ -2614,7 +2614,7 @@ module.exports = app => {
                 const renderData = {
                     tender,
                     change: ctx.change,
-                    listRule: ctx.change.list_rule ? JSON.parse(ctx.change.list_rule) : { source: 1, rule: ['unit', 'unit_price'] },
+                    listRule: tender.c_apply_list_rule ? JSON.parse(tender.c_apply_list_rule) : { source: 1, rule: ['unit', 'unit_price'] },
                     changeList,
                     changeConst,
                     auditConst: audit.changeApply,
@@ -2994,7 +2994,7 @@ module.exports = app => {
                         responseData.data = await ctx.service.changeApplyList.getList(ctx.change.id);
                         break;
                     case 'list_rule':
-                        const result = await ctx.service.changeApply.saveInfo(ctx.change.id, { name: 'list_rule', val: data.postData });
+                        const result = await ctx.service.tender.saveTenderData(ctx.tender.id, { c_apply_list_rule: data.postData });
                         if (!result) {
                             throw '修改失败';
                         }
@@ -3232,7 +3232,7 @@ module.exports = app => {
                 const renderData = {
                     tender,
                     change: ctx.change,
-                    listRule: ctx.change.list_rule ? JSON.parse(ctx.change.list_rule) : { source: 1, rule: ['unit', 'unit_price'] },
+                    listRule: tender.c_plan_list_rule ? JSON.parse(tender.c_plan_list_rule) : { source: 1, rule: ['unit', 'unit_price'] },
                     changeList,
                     changeConst,
                     auditConst: audit.changeApply,
@@ -3584,7 +3584,7 @@ module.exports = app => {
                         responseData.data = await ctx.service.changePlanList.getList(ctx.change.id);
                         break;
                     case 'list_rule':
-                        const result = await ctx.service.changePlan.saveInfo(ctx.change.id, { name: 'list_rule', val: data.postData });
+                        const result = await ctx.service.tender.saveTenderData(ctx.tender.id, { c_plan_list_rule: data.postData });
                         if (!result) {
                             throw '修改失败';
                         }

app/service/change_plan.js

@@ -71,7 +71,6 @@ module.exports = app => {
                         change.reason = applyInfo.reason;
                         change.content = applyInfo.content;
                         change.total_price = applyInfo.total_price;
-                        change.list_rule = applyInfo.list_rule;
                     }
                 }
                 const operate = await this.transaction.insert(this.tableName, change);

sql/update.sql

@@ -144,8 +144,7 @@ CREATE TABLE `zh_change_project_xs_audit`  (
 
 ALTER TABLE `zh_change_apply`
 ADD `total_price` DECIMAL(30,8) NULL DEFAULT NULL COMMENT '金额' AFTER `content`,
-ADD `list_rule` VARCHAR(255) NULL DEFAULT NULL AFTER `total_price` COMMENT '原设计数量读取规则',
-ADD `decimal` VARCHAR(255) NULL DEFAULT NULL COMMENT '小数位数设置JSON' AFTER `list_rule`;
+ADD `decimal` VARCHAR(255) NULL DEFAULT NULL COMMENT '小数位数设置JSON' AFTER `total_price`;
 
 DROP TABLE IF EXISTS `zh_change_plan`;
 CREATE TABLE `zh_change_plan`  (
@@ -169,7 +168,6 @@ CREATE TABLE `zh_change_plan`  (
   `content` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL COMMENT '变更内容',
   `memo` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL COMMENT '方案描述',
   `total_price` decimal(30, 8) NULL DEFAULT NULL COMMENT '金额',
-  `list_rule` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '原设计数量读取规则',
   `decimal` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '小数位数设置JSON',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci COMMENT = '变更方案表' ROW_FORMAT = Dynamic;
@@ -233,3 +231,7 @@ CREATE TABLE `zh_change_plan_list`  (
 
 ALTER TABLE `zh_material` ADD `period` VARCHAR(255) NULL DEFAULT NULL COMMENT '调差周期' AFTER `s_order`;
 
+ALTER TABLE `zh_tender`
+ADD `c_apply_list_rule` VARCHAR(255) NULL DEFAULT NULL COMMENT '变更申请统一原设计数量读取规则' AFTER `pos_file`,
+ADD `c_plan_list_rule` VARCHAR(255) NULL DEFAULT NULL COMMENT '变更方案统一原设计数量读取规则' AFTER `c_apply_list_rule`;
+