公司签章比例处理

app/public/report/js/rpt_signature.js

@@ -1081,17 +1081,21 @@ function _resetStampArea(ctrl, stampCell, roleRelItem) {
             std_stamp_size_height = parseFloat(roleRelItem.stampFeature.ImageHeight.value);
             if (roleRelItem.stampFeature.ImageWidth.value !== roleRelItem.stampFeature.ImageHeight.value) {
                 //设置比例
-                if (roleRelItem.stampFeature.ImageWidth.value > roleRelItem.stampFeature.ImageHeight.value) {
-                    heightRate = roleRelItem.stampFeature.ImageHeight.value / roleRelItem.stampFeature.ImageWidth.value;
+                if (std_stamp_size_width > std_stamp_size_height) {
+                    heightRate = std_stamp_size_height / std_stamp_size_width;
                 } else {
-                    widthRate = roleRelItem.stampFeature.ImageWidth.value / roleRelItem.stampFeature.ImageHeight.value;
+                    widthRate = std_stamp_size_width / std_stamp_size_height;
                 }
             }
             if (std_stamp_size_width > STD_STAMP_SIZE_WIDTH || std_stamp_size_height > STD_STAMP_SIZE_HEIGHT) {
-                //
+                std_stamp_size_width = Math.min(std_stamp_size_width, STD_STAMP_SIZE_WIDTH);
+                std_stamp_size_height = Math.min(std_stamp_size_height, STD_STAMP_SIZE_HEIGHT);
+                if (widthRate === 1) {
+                    std_stamp_size_height = std_stamp_size_height * heightRate;
+                } else {
+                    std_stamp_size_width = std_stamp_size_width * widthRate;
+                }
             }
-            std_stamp_size_width = Math.min(std_stamp_size_width, STD_STAMP_SIZE_WIDTH);
-            std_stamp_size_height = Math.min(std_stamp_size_height, STD_STAMP_SIZE_HEIGHT);
         }
         switch (ctrl[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_HORIZON]]) {
             case JV.OUTPUT_ALIGN.H[JV.H_ALIGN_IDX_LEFT]: