소스 검색

签名接口顺序

Tony Kang 1 년 전
부모
커밋
ec4e524bda
1개의 변경된 파일7개의 추가작업 그리고 1개의 파일을 삭제
  1. 7 1
      app/public/report/js/rpt_archive.js

+ 7 - 1
app/public/report/js/rpt_archive.js

@@ -447,6 +447,12 @@ let rptArchiveObj = {
         let offsetX = 0, offsetY = 0; //这个跟导出pdf一致,以防万一有变化
         let offsetX = 0, offsetY = 0; //这个跟导出pdf一致,以防万一有变化
         let controls = pageData[JV.NODE_CONTROL_COLLECTION];
         let controls = pageData[JV.NODE_CONTROL_COLLECTION];
         let ptChkHeight = pageSize === 'A4' ? A4_PIXEL_HEIGHT : A3_PIXEL_HEIGHT;
         let ptChkHeight = pageSize === 'A4' ? A4_PIXEL_HEIGHT : A3_PIXEL_HEIGHT;
+        const signatureOrderObj = {};
+        pageData.items[0].signature_cells.forEach(sCell => {
+            if (sCell.hasOwnProperty('Order')) {
+                signatureOrderObj[sCell.signature_name] = sCell.Order + 1;
+            }
+        });
         const _getAreasProperty = (srcArea) => {
         const _getAreasProperty = (srcArea) => {
             const width = (srcArea[JV.IDX_RIGHT] - srcArea[JV.IDX_LEFT]);
             const width = (srcArea[JV.IDX_RIGHT] - srcArea[JV.IDX_LEFT]);
             const height = (srcArea[JV.IDX_BOTTOM] - srcArea[JV.IDX_TOP]);
             const height = (srcArea[JV.IDX_BOTTOM] - srcArea[JV.IDX_TOP]);
@@ -529,7 +535,7 @@ let rptArchiveObj = {
             const areaKey = _areaKeyCache[signType] || 'areas';
             const areaKey = _areaKeyCache[signType] || 'areas';
             if (idx < 0) {
             if (idx < 0) {
                 psInfoStr.push(sCell[signNameKey]);
                 psInfoStr.push(sCell[signNameKey]);
-                let newPsInfo = {'name': sCell[signNameKey], areas: [], company_stamp_areas: [], private_stamp_areas: [], order: psInfoStr.length};
+                let newPsInfo = {'name': sCell[signNameKey], areas: [], company_stamp_areas: [], private_stamp_areas: [], order: signatureOrderObj[sCell[signNameKey]]};
                 const area = _getAreasProperty(actSignArea);
                 const area = _getAreasProperty(actSignArea);
                 area.pages.push(pageIdx + 1);
                 area.pages.push(pageIdx + 1);
                 newPsInfo[areaKey].push(area);
                 newPsInfo[areaKey].push(area);