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

app/controller/report_archive_controller.js

@@ -246,6 +246,7 @@ module.exports = app => {
             postBody.data = archiveList;
             postBody.encryptionData = archiveEncryptionList;
             postBody.rpt_tpl_data = treeNodes;
+            postBody.stgId = stgId;
             // postBody.cust_tpl_data = rpt_tpl_items;
             // postBody.cust_select_keys = cust_select_keys;
             // postBody.cust_cfg = JSON.stringify(custCfg);
@@ -637,6 +638,7 @@ module.exports = app => {
                             break;
                         }
                     }
+                    // contentArr 为空时，应该移除当前条
                     rst = await ctx.service.rptArchive.updateArchive(orgArchiveList[0].id, prjId, stgId, orgArchiveList[0].tender_id, bzId, contentArr);
                 }
             } catch (err) {

app/service/rpt_archive.js

@@ -53,7 +53,7 @@ module.exports = app => {
                 value: `"${bzId}"`,
                 operate: '=',
             });
-            this.sqlBuilder.columns = ['id', 'prj_id', 'stage_id', 'content'];
+            // this.sqlBuilder.columns = ['id', 'prj_id', 'stage_id', 'content'];
             const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
             const rstList = await this.db.query(sql, sqlParam);
             return rstList;
@@ -76,7 +76,10 @@ module.exports = app => {
             // this.sqlBuilder.columns = ['id', 'prj_id', 'stage_id', 'tender_id', 'content'];
             const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
             const rstList = await this.db.query(sql, sqlParam);
-            return rstList;
+            // 去除content为空或者为[]的
+            return this._.filter(rstList, function(item) {
+                return item.content !== null && item.content !== '[]';
+            });
         }
 
         async getPrjStgArchive(prjId, stgId) {

app/service/rpt_archive_encryption.js

@@ -53,7 +53,7 @@ module.exports = app => {
                 value: `"${bzId}"`,
                 operate: '=',
             });
-            this.sqlBuilder.columns = ['id', 'prj_id', 'stage_id', 'content'];
+            // this.sqlBuilder.columns = ['id', 'prj_id', 'stage_id', 'content'];
             const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
             const rstList = await this.db.query(sql, sqlParam);
             return rstList;

app/view/report/index_archive.ejs

@@ -204,6 +204,7 @@
     const oss_path = JSON.parse('<%- JSON.stringify(ossPath) %>');
     let business_type = 'stage';
     let CHANGE_LIST = [], current_change_id = -1, current_change_code = '';
+    let CHANGE_ID = -1, BUSINESS_ID = -1;
 
     const FOLDER_SEPERATER = '->';
 
@@ -372,6 +373,8 @@
         // alert('you are selecting: ' + ele.innerText);
         current_change_id = ele.attributes.change_id.value;
         current_change_code = ele.attributes.change_code.value;
+        CHANGE_ID = ele.attributes.change_id.value;
+        BUSINESS_ID = ele.attributes.change_id.value;
         buildChangeSelection();
         //还有必要触发归档报表刷新！
         //rptArchiveObj.onClick(null, null, rptArchiveObj.currentNode);
@@ -476,11 +479,17 @@
            $('#select-item').siblings('button').text($(this).text());
            const type = $(this).data('type');
            business_type = type;
+           CHANGE_ID = -1;
+           BUSINESS_ID = -1;
            if (type === 'stage') {
                $('#divSelectableStages').show();
                $('#divSelectableChanges').hide();
+               current_stage_order = STAGE_LIST[i - 1].order;
+               const info = _.find(STAGE_LIST, { order: current_stage_order });
+               current_stage_id = info ? info.id : STAGE_LIST[i -1].id;
+               current_stage_order = info ? info.order : STAGE_LIST[i - 1].order;
                // 下列树结构重新加载
-//还有必要触发归档报表刷新！
+               //还有必要触发归档报表刷新！
                //rptArchiveObj.onClick(null, null, rptArchiveObj.currentNode);
                const params = {prjId: PROJECT_ID, stgId: current_stage_id};
                $.bootstrapLoading.start();
@@ -517,12 +526,15 @@
                        ARCHIVE_LIST = result.data;
                        ARCHIVE_ENCRYPTION_LIST = result.encryptionData;
                        CHANGE_LIST = result.changes;
-                       current_change_id = CHANGE_LIST.length > 0 ? CHANGE_LIST[0].cid || CHANGE_LIST[0].id : -1;
+                       current_change_id = CHANGE_LIST.length > 0 ? CHANGE_LIST[0].id : -1;
                        current_change_code = CHANGE_LIST.length > 0 ? CHANGE_LIST[0].code : '';
                        TOP_TREE_NODES = JSON.parse(JSON.stringify(result.rpt_tpl_data));
+                       CHANGE_ID = CHANGE_LIST.length > 0 ? CHANGE_LIST[0].id : -1;
+                       BUSINESS_ID = CHANGE_LIST.length > 0 ? CHANGE_LIST[0].id : -1;
                        buildTplTree();
                        rptArchiveObj.iniPage();
                        buildChangeSelection();
+                       current_stage_id = result.stgId;
                    }, function(err){
                        $.bootstrapLoading.end();
                    }, function(ex){