n20-common-lib 2.14.13 → 2.14.15

package/package.json

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

package/src/components/AIButton/index.vue

@@ -26,7 +26,6 @@
 import Dialog from '../Dialog/index.vue'
 import clUpload from '../Upload/index.vue'
 import { dayjs } from 'n20-common-lib'
-
 export default {
   name: 'AiButton',
   components: { Dialog, clUpload },

package/src/components/ApprovalButtons/index.vue

@@ -571,12 +571,16 @@ export default {
         .then(({ opinionRequired }) => {
           this.requiredC = opinionRequired ?? this.required
           // 读取该工作流是否意见必填
-          this.requiredC = this.$route.query.remarkIsMust === '1'
+          if (this.$route.query.remarkIsMust !== undefined) {
+            this.requiredC = this.$route.query.remarkIsMust === '1'
+          }
         })
         .catch(() => {
           this.requiredC = this.required
           // 读取该工作流是否意见必填
-          this.requiredC = this.$route.query.remarkIsMust === '1'
+          if (this.$route.query.remarkIsMust !== undefined) {
+            this.requiredC = this.$route.query.remarkIsMust === '1'
+          }
         })
     },
     getTodoList() {

package/src/components/ApprovalButtons/selectSpr.vue

@@ -11,7 +11,7 @@
         @select="sltChange"
         @select-all="sltChange"
       >
-        <el-table-column header-align="center" align="center" :label="'审批节点' | $lc">
+        <el-table-column header-align="center" align="left" :label="'审批节点' | $lc">
           <template slot-scope="scope">
             <el-radio v-model="nextEgwOutgoingNodeId" :label="scope.row.nodeId" @change="sltChange(scope.row)">{{
               scope.row.nodeName

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

@@ -16,7 +16,10 @@ let {
   IWSA_sm2_skf_importSignX509Cert,
   IWSA_sm2_skf_getApplicationList,
   IWSA_sm2_skf_setDevice,
-  IWSA_sm2_skf_getDeviceList
+  IWSA_sm2_skf_getDeviceList,
+  IWSA_rsa_csp_getCountOfCert,
+  IWSA_rsa_csp_getCertInfo,
+  IWSA_rsa_csp_deleteContainer
 } = new IWSAgent()
 
 IWSASetTimeOut(6000)
@@ -132,7 +135,7 @@ function getUserCert(uno) {
           closeOnClickModal: false,
           inputType: 'password'
         }).then(({ value }) => {
-          const res = IWSA_sm2_skf_genContainerP10(value, '', '', 'true')
+          const res = IWSA_sm2_skf_genContainerP10(value, '', '', 'false')
           if (res[0] === '0') {
             let dto = {
               ...data,
@@ -169,16 +172,64 @@ function getUserCert(uno) {
  * @returns
  */
 export function updateCert(cspName) {
+  let oldContainer = ''
   // 设置提供者  'ArgusKey CSP For BEHFC v1.0'
   IWSA_rsa_csp_setProvider(cspName)
   // 设置同步模式
   IWSASetAsyncMode(false)
   let dn = getDN()
   if (!dn) {
-    return Message.error('未获取到Dn信息')
+    Message.error('未获取到Dn信息')
+    return
+  }
+  //获取当前证书的容器
+  IWSA_rsa_csp_getCountOfCert((res) => {
+    if (res > 0) {
+      for (let i = 0; i < res; i++) {
+        //获取证书详情
+        IWSA_rsa_csp_getCertInfo(i, (res, Provider, Container, certDN) => {
+          if (res == 0 && compareDN(certDN, dn)) {
+            oldContainer = Container
+          }
+        })
+      }
+    }
+  })
+  //生成新容器并下载证书
+  let res = IWSA_rsa_csp_genContainerP10('true', '1024', dn, '', '', '', 'false', 'false')
+  if (res[0] === '0') {
+    axios
+      .post(`/bems/prod_1.0/dssc/sign/getDnCertBase64`, {
+        userDn: dn,
+        p10: res[2]
+      })
+      .then(({ data }) => {
+        if (data) {
+          let list = JSON.parse(data)
+          if (list[0]?.errNum === '0') {
+            let code = IWSA_rsa_csp_importSignP7Cert(res[1], list[0]?.cert)
+            if (code === '0') {
+              //删除旧证书
+              if (oldContainer != '') {
+                IWSA_rsa_csp_deleteContainer(oldContainer)
+              }
+              Message.success('证书导入成功')
+            } else {
+              IWSA_rsa_csp_deleteContainer(res[1])
+              Message.error('证书导入失败，错误码：：' + code)
+            }
+          } else {
+            IWSA_rsa_csp_deleteContainer(res[1])
+            Message.error('证书下载失败，错误码：：' + list[0]?.errNum)
+          }
+        } else {
+          IWSA_rsa_csp_deleteContainer(res[1])
+          Message.error('证书下载服务出错')
+        }
+      })
+  } else {
+    Message.error('容器生成失败，错误码：：' + res[0])
   }
-  let data = IWSA_rsa_csp_genContainerP10('true', '1024', dn, '', '', '', 'false', 'false')
-  GetDateNotAfter(data, dn)
 }
 function GetDateNotAfter(res, dn) {
   if (res[0] === '0') {
@@ -194,3 +245,12 @@ function GetDateNotAfter(res, dn) {
 export function updateCertHG(uno) {
   getUserCert(uno)
 }
+
+function compareDN(dn1, dn2) {
+  let dn1Arr = dn1.split(',').map((c) => c.trim())
+  let dn2Arr = dn2.split(',').map((c) => c.trim())
+  if (dn1Arr.every((dnAttr) => dn2Arr.includes(dnAttr))) {
+    return true
+  }
+  return false
+}