@toolspack/ttd-common 0.4.6 → 0.4.8

package/src/packages/ukey/WzhSign.vue

@@ -119,13 +119,13 @@ export default {
         if (!InfoContent) {
           const errorDesc = this.CryptoAgent.GetLastErrorDesc()
           alert(errorDesc)
-          return
+          return false
         }
         return InfoContent
       } catch (e) {
         console.log('GetCertInfoOnClick-WzhSign: ', e)
         const errorDesc = this.CryptoAgent.GetLastErrorDesc()
-        alert(errorDesc)
+        alert(errorDesc + e)
       }
     },
     SelectCertificateOnClick(serialNo = '') {
@@ -145,21 +145,24 @@ export default {
           const errorDesc = this.CryptoAgent.GetLastErrorDesc();
           console.log('wzh SelectCertResult 不存在', errorDesc)
           alert(errorDesc);
-          return;
+          return false;
         }
         console.log('wzh SelectCertResult', bSelectCertResult)
         return true
       } catch (e) {
         const errorDesc2 = this.CryptoAgent.GetLastErrorDesc();
         console.log('wzh SelectCertResult catch error: ', errorDesc2)
-        alert(errorDesc2);
+        alert(errorDesc2 + e);
         return false
       }
     },
     getHashValue(label, fileOss, sealImage) {
       const CertContent = this.CryptoAgent.GetSignCertInfo('CertContent');
       this.$emit('getImg', sealImage)
-
+      if (!CertContent) {
+        alert('获取证书公钥失败！')
+        return Promise.reject()
+      }
       if (fileOss.bucketName && fileOss.objectKey) {
         return this.api.getSignHash({
           jsonData: {
@@ -187,7 +190,6 @@ export default {
       try {
         let sourceHashData = ''
         const { code, data } = await this.getHashValue(item, fileItem, image);
-        console.log('getSignHashValue', data)
         if (code === 0) {
           if (`${data.bean.code}` === '200') { sourceHashData = data.bean.pdfHash }
         }
@@ -209,11 +211,12 @@ export default {
       } catch (e) {
         const errorDesc2 = this.CryptoAgent.GetLastErrorDesc();
         console.log('getSignHashValue', e)
-        alert(errorDesc2);
+        alert(errorDesc2 + e);
       }
     },
     async signFileKeyImage(item, fileItem, image) {
       const res = await this.getSignHashValue(item, fileItem, image)
+      let errorMsg = '计算Hash 失败！'
       if (res) {
         const { data, code } = await this.api.mergeHash({
           jsonData: {
@@ -226,38 +229,42 @@ export default {
           },
         })
         // 此方法 code 不能完全说明正确，调用失败code 也是0
-        if (code === 0 && data.bean.url) {
-          return data.bean
+        if (code === 0) {
+          if (data.bean.url) {
+            return data.bean
+          }
+          errorMsg = data.bean.msg
+        } else {
+          errorMsg = data.msg
         }
       }
-      this.$message.error('计算Hash 失败！')
+      this.$message.error(errorMsg || 'error计算Hash失败！')
       return false
     },
     // fileOss: 为文件对象 {obje}
     //  isOffset: 修正印章的位置，印章加时间后需要向下修正
-    async multipleSign(labels, fileOss, serialNo, image, isOffset = 26) {
-      console.log('multipleSign  循环签的begin ', serialNo)
+    async multipleSign(labels, fileOss, serialNo, image, isOffset = 18) {
       const serialNoBegin = this.CryptoAgent.GetSignCertInfo('SerialNumber');
-      console.log('serialNoBegin', serialNoBegin)
       let result = ''
+      if (!image) {
+        alert('印章图片缺失！')
+        return false
+      }
 
       for (let index = 0; index < labels.length; index++) {
         const item = getUrl(labels[index])
         // 此处for循环多个文件时候以前签署，所以提示无意义
         // const message = `签署 [${text}] 位于第${label.pageIndex}页的位置，[总共:${index + 1}/${labels.length}个位置]`
-        if (isOffset !== null && isOffset !== false) {
-          // 印章统一向下便宜30像素
+        if (typeof isOffset === 'number') {
+          // 印章统一向下偏移
           item.Y -= isOffset
         }
         if (index > 0) {
-          console.log('无需重新验签：index=', index)
           const serialNoAgain = this.CryptoAgent.GetSignCertInfo('SerialNumber');
-          console.log('本次获得的序列号serialNoAgain：', serialNoAgain)
           if (serialNoBegin !== serialNoAgain) {
             alert('签署过程中，请不要更换ukey!')
             return false
           }
-          console.log('resutl=', result)
           // 这里签署第二个章，需要在第一个签好的文件上签署 所以用result中是文件
           if (result) {
             // eslint-disable-next-line
@@ -266,7 +273,6 @@ export default {
 
           console.log(`iterateSign 签章结果${index}---result----`, result)
         } else {
-          console.log('第一个章，不用验签', index)
           // eslint-disable-next-line
           result = await this.signFileKeyImage((item), fileOss, image)
           console.log('第一个章 签章结果', result)
@@ -283,7 +289,7 @@ export default {
 .CryptoAgent-wrapper {
   height: 0;
   width: 0;
-  position: absoute;
+  position: absolute;
   left: -5000px;
 }
 </style>>