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

app/public/report/js/jpc_output.js

@@ -422,7 +422,7 @@ let JpcCanvasOutput = {
             ctx.translate(0.5,0.5);
             let style = styles[cell[JV.PROP_STYLE]];
             // 印章的cell表框都要去掉
-            if(cell.path) style =  'Default_None';
+            if(cell.path&&cell.signType) style =  'Default_None';
             if (style) {
                 let isNeedMergeBand = private_chkIfInMergedBand(mergedBand, cell);
                 private_drawLine(cell, ctx, style, JV.PROP_TOP, [JV.PROP_LEFT, JV.PROP_TOP],[JV.PROP_RIGHT, JV.PROP_TOP], mergedBand, styles, isNeedMergeBand);