台账分解，节点类型编辑限制取消

app/public/js/ledger.js

@@ -563,7 +563,6 @@ $(document).ready(function() {
                 }
                 if (col.field === 'node_type' && newValue && newValue !== '0' && newValue !== '19') {
                     const sameNodeType = sortData.find(x => { return x.node_type == newValue; });
-                    console.log(newValue, sameNodeType);
                     if (sameNodeType) {
                         toastr.error('已存在该费用类别，请勿重复选择');
                         SpreadJsObj.reLoadRowData(info.sheet, info.row);
@@ -598,7 +597,6 @@ $(document).ready(function() {
                 } else {
                     data[col.field] = newValue;
                 }
-                if(col.field === 'node_type') console.log(data);
                 // 更新至服务器
                 postData(window.location.pathname + '/update', {postType: 'update', postData: data}, function (result) {
                     const refreshNode = ledgerTree.loadPostData(result);
@@ -992,11 +990,6 @@ $(document).ready(function() {
                 case 'dgn_qty2':
                     info.cancel = !_.isEmpty(node.b_code);
                     break;
-                case 'node_type':
-                    const parent = tree.getParent(node);
-                    const topParent = tree.getTopParent(node);
-                    info.cancel = !parent || !topParent || [1, 5].indexOf(topParent.node_type) < 0;
-                    break;
             }
         },
         sortCode: function (sheet) {
@@ -1084,7 +1077,7 @@ $(document).ready(function() {
     //     {title: 'full_path', colSpan: '1', rowSpan: '2', field: 'full_path', hAlign: 2, width: 60, type: 'Number', readOnly: true},
     //     {title: 'node_type', colSpan: '1', rowSpan: '2', field: 'node_type', hAlign: 2, width: 60, type: 'Number', readOnly: true}
     // );
-    sjsSettingObj.setNodeTypeCol(ledgerSpreadSetting.cols, [{field: 'node_type'}]);
+    sjsSettingObj.setNodeTypeCol(ledgerSpreadSetting.cols, [{ field: 'node_type' }]);
     SpreadJsObj.initSheet(ledgerSpread.getActiveSheet(), ledgerSpreadSetting);
     SpreadJsObj.selChangedRefreshBackColor(ledgerSpread.getActiveSheet());
     // 绑定事件

app/router.js

@@ -474,7 +474,7 @@ module.exports = app => {
     app.post('/tender/report_api/updateArchiveEncryption', sessionAuth, 'reportArchiveController.updateReportArchiveEncryption');
     app.post('/tender/report_api/removeArchiveEncryption', sessionAuth, 'reportArchiveController.removeReportArchiveEncryption');
     app.post('/tender/:id/sendReportFileMsg', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportArchiveController.sendFileMsg');
-    app.get('/tender/:id/measure/stage/:order/sendReportFileMsg', sessionAuth, tenderCheck, uncheckTenderCheck, stageCheck, 'reportArchiveController.sendFileMsg');
+    app.post('/tender/:id/measure/stage/:order/sendReportFileMsg', sessionAuth, tenderCheck, uncheckTenderCheck, stageCheck, 'reportArchiveController.sendFileMsg');
 
     // 电子签名
     app.get('/tender/:id/signReport', sessionAuth, tenderCheck, uncheckTenderCheck, 'reportArchiveController.signReport');

db_script/test_query.js

@@ -11,7 +11,8 @@ const saveJSON = async function(obj, file) {
 };
 
 const loadReportArchiveData = async function() {
-    const tid = 4417, sOrder = 2;
+    //const tid = 4417, sOrder = 2;
+    const tid = 3698, sOrder = 7;
     const stage = await querySql('SELECT * FROM zh_stage where tid = ? and `order` = ?', [tid, sOrder]);
     const rptArchive = await querySql('SELECT * FROM zh_rpt_archive where stage_id = ?', [stage[0].id]);
     for (const ra of rptArchive) {
@@ -22,6 +23,7 @@ const loadReportArchiveData = async function() {
     const rptSign = await querySql('SELECT* FROM zh_rpt_archive_encryption where stage_id = ?', [stage[0].id]);
     for (const rs of rptSign) {
         rs.content = rs.content ? JSON.parse(rs.content) : [];
+        console.log(BaseUtil.getFileName('rptSign.json'));
         await saveJSON(rs, BaseUtil.getFileName('rptSign.json'));
     }
 };