n20-common-lib 2.9.13 → 2.9.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.13",
+  "version": "2.9.16",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalButtons/index.vue

@@ -229,6 +229,7 @@
           </div>
         </div>
         <div v-if="promptType === '2'">
+          <el-button type="primary" @click="onContinue" v-if="!!successNum">{{ $l('继续审批') }}</el-button>
           <el-button plain @click="onceCancelFn">{{ $l('取消') }}</el-button>
         </div>
       </span>
@@ -678,6 +679,7 @@ export default {
               break
             case '2':
               this.verifyV = true
+              this.verifyMsg = data
               break
           }
         }

package/src/components/DynamicField/DynamicFieldMixin.js

@@ -33,7 +33,13 @@ const obj = {
           } else {
             msg = '请输入' + item.list[key].label
           }
-          rules[key] = [{ required: item.list[key].requiredFlag, message: msg, trigger: ['submit', 'change'] }]
+          rules[key] = [
+            {
+              required: item.list[key].requiredFlag && item.list[key].type,
+              message: msg,
+              trigger: ['submit', 'change']
+            }
+          ]
         }
       })
       this.rules = { ...this.staticRules, ...rules }

package/src/plugins/Sign/NetV3/index.js

@@ -8,6 +8,7 @@ let {
   IWSASetAsyncMode, // 设置通讯方式 同步/异步
   IWSA_rsa_csp_genContainerP10,
   IWSA_rsa_csp_AdvgenContainerP10,
+  IWSA_rsa_csp_importSignX509Cert,
   IWSA_rsa_csp_AdvImportSignEncCert,
   IWSA_rsa_csp_importSignP7Cert
 } = new IWSAgent()
@@ -47,42 +48,39 @@ function getDnCertBase64(dn, res) {
 }
 
 function getUserCert(uno) {
-  try {
-    axios.post(`/bems/prod_1.0/dssc/sign/updateCert_direct/${uno}`).then(({ code, data }) => {
-      if (code === 200) {
-        // 设置提供者 Microsoft Base Cryptographic Provider v1.0
-        IWSA_rsa_csp_setProvider('Microsoft Base Cryptographic Provider v1.0')
-        // 设置同步模式
-        IWSASetAsyncMode(false)
-        let alg = data.alg === 'RSA_1024' ? '1024' : ata.alg === 'RSA_2048' ? '2048' : '1024'
-        let dn = getDN()
-        let sd = data.sd === 'd'
+  uno = uno || sessionStorage.getItem('userNo')
+  axios.post(`/bems/prod_1.0/dssc/sign/updateCert_direct/${uno}`).then(({ code, data }) => {
+    if (code === 200) {
+      // 设置提供者 Microsoft Base Cryptographic Provider v1.0
+      IWSA_rsa_csp_setProvider('Microsoft Base Cryptographic Provider v1.0')
+      // 设置同步模式
+      IWSASetAsyncMode(false)
+      let alg = data.alg === 'RSA_1024' ? '1024' : data.alg === 'RSA_2048' ? '2048' : '1024'
+      let dn = getDN()
+      let sd = data.sd === 'd'
 
-        const res = IWSA_rsa_csp_genContainerP10(alg, data.subjectDN || dn, sd)
-        if (res[0] === '0') {
-          let dto = {
-            ...data,
-            publicKey: res[1],
-            tmpPubKey: res[2] || ''
-          }
-          axios.post(`/bems/prod_1.0/dssc/sign/getRadsCert`, dto).then(({ code, data }) => {
-            if (code === 200) {
-              const certData = IWSA_rsa_csp_importSignP7Cert(res[1], data.signCer)
-              if (certData[0] === '0') {
-                Message.success('证书导入成功')
-              } else {
-                Message.error('导入证书失败，错误码：：' + certData[0])
-              }
-            }
-          })
-        } else {
-          Message.error('产生 P10失败，错误码：：' + data[0])
+      const res = IWSA_rsa_csp_genContainerP10('true', alg, data.subjectDN || dn, '', '', '', 'false', 'false')
+      if (res[0] === '0') {
+        let dto = {
+          ...data,
+          publicKey: res[2],
+          tmpPubKey: res[1] || ''
         }
+        axios.post(`/bems/prod_1.0/dssc/sign/getRadsCert`, dto).then(({ code, data }) => {
+          if (code === 200) {
+            const certData = IWSA_rsa_csp_importSignX509Cert(res[1], data.signCer)
+            if (certData[0] === '0') {
+              Message.success('证书导入成功')
+            } else {
+              Message.error('导入证书失败，错误码：：' + certData[0])
+            }
+          }
+        })
+      } else {
+        Message.error('产生 P10失败，错误码：：' + data[0])
       }
-    })
-  } catch (error) {
-    console.error(error)
-  }
+    }
+  })
 }
 
 /**

package/src/utils/axios.js

@@ -174,7 +174,6 @@ function request(opt) {
                 res.data = new Blob([res.data], { type: type })
               }
             }
-
             res.data.name = filename
           }
           if (res.data.size === 0) {