Merge branch 'dev' into uat

app/controller/report_controller.js

@@ -191,7 +191,7 @@ module.exports = app => {
                         reportConst.rptCustomType[JV.NODE_CUS_AUDIT_SELECT], ctx.tender.id, ctx.stage.id);
                     customSelects.stageFlow = await ctx.service.stageAudit.getAuditGroupByListWithOwner(
                         ctx.stage.stage_id, ctx.stage.stage_times);
-                    stageFlow.forEach(x => {
+                    customSelects.stageFlow.forEach(x => {
                         if (!x) return;
                         x.visible = (!ctx.session.sessionUser.is_admin && ctx.session.sessionProject.page_show.individualSign === 1)
                             ? x.aid === ctx.session.sessionUser.accountId : true

app/service/ledger_revise.js

@@ -199,6 +199,7 @@ module.exports = app => {
                     his_id,
                 });
                 await transaction.update(this.ctx.service.ledgerHistory.tableName, { id: his_id, valid: 0 });
+                if (revise.his_id > 0) await transaction.update(this.ctx.service.ledgerHistory.tableName, { id: revise.his_id, valid: 0 });
                 // 投资进度改变状态
                 await transaction.update(this.ctx.service.schedule.tableName, { revising: 0 }, { where: { tid: this.ctx.tender.id } });
                 await transaction.commit();

app/service/revise_audit.js

@@ -511,6 +511,7 @@ module.exports = app => {
                         a.in_time = time;
                     }
                     await transaction.insert(this.tableName, auditors);
+                    await transaction.update(this.ctx.service.ledgerHistory.tableName, { id: revise.his_id, valid: 0 });
 
                     // 短信通知-审批退回提醒功能
                     // 下一人

sql/update.sql

@@ -1,8 +1,7 @@
 ALTER TABLE `zh_change_apply`
 ADD `total_price` DECIMAL(30,8) NULL DEFAULT NULL COMMENT '金额' AFTER `content`,
-ADD `decimal` VARCHAR(255) NULL DEFAULT NULL COMMENT '小数位数设置JSON' AFTER `total_price`;
+ADD `decimal` VARCHAR(1000) NULL DEFAULT NULL COMMENT '小数位数设置JSON' AFTER `total_price`;
 
-DROP TABLE IF EXISTS `zh_change_plan`;
 CREATE TABLE `zh_change_plan`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `tid` int(11) NOT NULL COMMENT '标段id',
@@ -25,14 +24,13 @@ 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 '金额',
-  `decimal` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '小数位数设置JSON',
+  `decimal` varchar(1000) 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;
 
 -- ----------------------------
 -- Table structure for zh_change_plan_attachment
 -- ----------------------------
-DROP TABLE IF EXISTS `zh_change_plan_attachment`;
 CREATE TABLE `zh_change_plan_attachment`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `tid` int(11) NOT NULL COMMENT '标段id',
@@ -51,7 +49,6 @@ CREATE TABLE `zh_change_plan_attachment`  (
 -- ----------------------------
 -- Table structure for zh_change_plan_audit
 -- ----------------------------
-DROP TABLE IF EXISTS `zh_change_plan_audit`;
 CREATE TABLE `zh_change_plan_audit`  (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `tid` int(11) NOT NULL COMMENT '标段id',
@@ -69,7 +66,6 @@ CREATE TABLE `zh_change_plan_audit`  (
 -- ----------------------------
 -- Table structure for zh_change_plan_list
 -- ----------------------------
-DROP TABLE IF EXISTS `zh_change_plan_list`;
 CREATE TABLE `zh_change_plan_list`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `tid` int(11) NOT NULL COMMENT '标段id',
@@ -94,3 +90,16 @@ ADD `c_plan_list_rule` VARCHAR(255) NULL DEFAULT NULL COMMENT '变更方案统
 
 ALTER TABLE `zh_change` ADD `plan_code` VARCHAR(255) NULL DEFAULT NULL COMMENT '变更方案编号' AFTER `name`;
 
+CREATE TABLE `zh_change_apply_list`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tid` int(11) NOT NULL COMMENT '标段id',
+  `caid` int(11) NOT NULL COMMENT '申请id',
+  `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '清单编号',
+  `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '清单名称',
+  `unit` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '单位',
+  `unit_price` decimal(30, 8) NULL DEFAULT NULL COMMENT '单价',
+  `oamount` decimal(30, 8) NULL DEFAULT NULL COMMENT '原数量',
+  `camount` decimal(30, 8) NULL DEFAULT NULL COMMENT '变更数量',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci COMMENT = '变更申请清单表' ROW_FORMAT = Dynamic;
+