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

app/controller/report_archive_controller.js

@@ -249,15 +249,15 @@ module.exports = app => {
                     throw '上传文件失败';
                 }
                 // 判断是否存在已签名文档，存在则删除文档并删除签名记录
-                // const pdfMsg = await ctx.oss.head('archive/sign/' + orgName + '.PDF');
-                // if (pdfMsg && pdfMsg.res.status === 200) {
-                //     const oss_reuslt = await ctx.oss.delete('archive/sign/' + fileName);
-                //     if (oss_reuslt && oss_reuslt.res && oss_reuslt.res.status === 204) {
-                //         const delSign_result = await ctx.service.netcasignLog.removeSign(orgName);
-                //     } else {
-                //         throw '删除已签文档失败';
-                //     }
-                // }
+                const pdfMsg = await ctx.curl(signConst.path.oss + '/sign/' + orgName + '.PDF');
+                if (pdfMsg && pdfMsg.status === 200) {
+                    const oss_reuslt = await ctx.oss.delete('archive/sign/' + fileName);
+                    if (oss_reuslt && oss_reuslt.res && oss_reuslt.res.status === 204) {
+                        const delSign_result = await ctx.service.netcasignLog.removeSign(orgName);
+                    } else {
+                        throw '删除已签文档失败';
+                    }
+                }
 
                 const updateDate = new Date();
                 const montStr = (updateDate.getMonth() + 1) < 10 ? ('0' + (updateDate.getMonth() + 1)) : ((updateDate.getMonth() + 1));

app/public/js/ledger.js

@@ -1608,7 +1608,7 @@ $(document).ready(function() {
                 const node = SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet());
                 return readOnly || !node
                     || (node.children && node.children.length > 0)
-                    || (!_.isNil(node.b_code) && node.b_code !== '');
+                    || !ledgerTree.isLeafXmj(node);
             },
             callback: function (key, opt) {
                 tenderSelect.showSelect(SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet()));

app/public/js/revise.js

@@ -1288,7 +1288,7 @@ $(document).ready(() => {
             icon: 'fa-link',
             disabled: function (key, opt) {
                 const node = SpreadJsObj.getSelectObject(billsSheet);
-                return readOnly || !node || (!_.isNil(node.b_code) && node.b_code !== '');
+                return readOnly || !node || !billsTree.isLeafXmj(node);
             },
             callback: function (key, opt) {
                 tenderSelect.showSelect(SpreadJsObj.getSelectObject(billsSheet));

app/public/js/stage.js

@@ -1552,7 +1552,7 @@ $(document).ready(() => {
                 icon: 'fa-link',
                 disabled: function (key, opt) {
                     const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
-                    return readOnly || !node || (!_.isNil(node.b_code) && node.b_code !== '');
+                    return readOnly || !node || !stageTree.isLeafXmj(node);
                 },
                 callback: function (key, opt) {
                     tenderSelect.showSelect(SpreadJsObj.getSelectObject(slSpread.getActiveSheet()));