sql sync

app/controller/report_controller.js

@@ -353,7 +353,7 @@ module.exports = app => {
                 const paymentDetail_id = ctx.params.did;
                 // 支付审批: ctx.params.did 是 zh_payment_detail表的id, 通过这个did在 zh_payment_detail_audit表里找审核信息(td_id = ctx.params.did)
                 //          没有计量期的概念！！！
-                const paymentAuditorList = await ctx.service.paymentDetailAudit.getAuditors(paymentDetail_id);
+                // const paymentAuditorList = await ctx.service.paymentDetailAudit.getAuditors(paymentDetail_id);
                 const tender = ctx.paymentTender;
                 const { treeNodes, commonArrs, custCfg } = await this._createNodes(ctx, sourceTypeConst.sourceType.payment_safe, tender.pid);
                 const stageList = [];
@@ -379,7 +379,7 @@ module.exports = app => {
                 const categoryData = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
                 // 获取用户权限
                 const accountInfo = await this.ctx.service.projectAccount.getDataById(this.ctx.session.sessionUser.accountId);
-                const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
+                // const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
                 // 获取用户可查看的标段
                 // ...
                 const tenderList = [];
@@ -519,7 +519,7 @@ module.exports = app => {
                 const categoryData = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
                 // 获取用户权限
                 const accountInfo = await this.ctx.service.projectAccount.getDataById(this.ctx.session.sessionUser.accountId);
-                const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
+                // const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
                 // 获取用户可查看的标段
                 // ...
                 const tenderList = [];
@@ -634,7 +634,7 @@ module.exports = app => {
                 const pid = ctx.session.sessionProject.id;
                 const budget_id = -1;
                 const sp_id = -1;
-                const { treeNodes, custCfg } = await this._createNodes(ctx, source_type, tenderId);
+                const { treeNodes, custCfg } = await this._createNodes(ctx, source_type, pid);
                 const sorts = ctx.query.sort ? ctx.query.sort : 0;
                 const orders = ctx.query.order ? ctx.query.order : 0;
                 const state = ctx.session.sessionProject.page_show.openChangeState && ctx.query.state ? parseInt(ctx.query.state) : 0;
@@ -662,7 +662,7 @@ module.exports = app => {
                 const categoryData = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
                 // 获取用户权限
                 const accountInfo = await this.ctx.service.projectAccount.getDataById(this.ctx.session.sessionUser.accountId);
-                const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
+                // const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
                 // 获取用户可查看的标段
                 // ...
                 const tenderList = [];

app/public/report/js/rpt_archive.js

@@ -76,7 +76,7 @@ let rptArchiveObj = {
         rptArchiveObj._iniArchiveItemForDeleteShow();
     },
     toggleBtn: function (enabled) {
-        if (current_stage_status === 3 && enabled) {
+        if (getStageStatus() === 3 && enabled) {
             $('#btnArchiveRpt').removeAttr('disabled');
             $('#btnArchiveList').removeAttr('disabled');
             $('#btnBatchArchiveRpt').removeAttr('disabled');

app/public/report/js/rpt_main.js

@@ -1408,7 +1408,7 @@ function getStageStatus() {
     if (ppStatus === 3) {
         return ppStatus
     } else {
-        if (STAGE_ID === -200) return 3
+        if ([-200, -300].includes(STAGE_ID)) return 3
         else return current_stage_status;
     }
 }

sql/update.sql

@@ -10,3 +10,7 @@ CREATE TABLE `zh_change_settle_list`  (
   `amount` decimal(30, 8) NULL DEFAULT NULL COMMENT '终审数量',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT = '变更已结算清单表（用于修订和重审时生成，防止已结算变更清单被删除）';
+
+ALTER TABLE `zh_rpt_archive_encryption` 
+ADD COLUMN `business_id` VARCHAR(45) NULL COMMENT '有其他业务情况，统一在这里标识(类uuid)，要结合stage_id来看，如stage_id > 0，则是标段和期，< 0则是其他业务，如 -300 -> 变更令；-301 - 变更方案；-302 - 变更立项 -303 - 变更申请' AFTER `stage_id`,
+ADD COLUMN `tender_id` INT(11) NULL AFTER `business_id`;