Prechádzať zdrojové kódy

fixed: TASK4177 新增样式(前端也要处理)

Tony Kang 3 rokov pred
rodič
commit
d81c61d156

+ 106 - 0
app/const/report_defined_properties.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Created by Tony on 2019/12/26.
  */
@@ -655,6 +657,110 @@ module.exports = {
                 },
             ],
         }, {
+            ID: 'Label_TopCover',
+            CfgDispName: '上包围',
+            border_style: [
+                {
+                    Color: 'BLACK',
+                    Position: 'Left',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Right',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Top',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Bottom',
+                    DashStyle: 'SOLID',
+                    LineWeight: '0',
+                },
+            ],
+        }, {
+            ID: 'Label_BottomCover',
+            CfgDispName: '下包围',
+            border_style: [
+                {
+                    Color: 'BLACK',
+                    Position: 'Left',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Right',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Top',
+                    DashStyle: 'SOLID',
+                    LineWeight: '0',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Bottom',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                },
+            ],
+        }, {
+            ID: 'Label_LeftCover',
+            CfgDispName: '左包围',
+            border_style: [
+                {
+                    Color: 'BLACK',
+                    Position: 'Left',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Right',
+                    DashStyle: 'SOLID',
+                    LineWeight: '0',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Top',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Bottom',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                },
+            ],
+        }, {
+            ID: 'Label_RightCover',
+            CfgDispName: '右包围',
+            border_style: [
+                {
+                    Color: 'BLACK',
+                    Position: 'Left',
+                    DashStyle: 'SOLID',
+                    LineWeight: '0',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Right',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Top',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                }, {
+                    Color: 'BLACK',
+                    Position: 'Bottom',
+                    DashStyle: 'SOLID',
+                    LineWeight: '1',
+                },
+            ],
+        }, {
             ID: 'BORDER_ALL_AROUND',
             CfgDispName: '报表边框',
             border_style: [

+ 2 - 2
app/public/report/js/rpt_signature.js

@@ -496,14 +496,14 @@ let rptSignatureHelper = {
         rptSignatureHelper.resetSignAudit();
         if (current_stage_status === 3) {
             //1. 重刷page
-            let hasStamp = false;
+            // let hasStamp = false;
             for (const page of zTreeOprObj.currentRptPageRst.items) {
                 if (page.signature_cells) {
                     for (let cIdx = page.signature_cells.length - 1; cIdx >= 0; cIdx--) {
                         const sCell = page.signature_cells[cIdx];
                         if (sCell.isStamp) {
                             page.signature_cells.splice(cIdx);
-                            hasStamp = true;
+                            // hasStamp = true;
                         } else if (sCell.hasOwnProperty('pre_path')) {
                             sCell.path = sCell.pre_path;
                             delete sCell.pre_path;