n20-common-lib 2.8.0 → 2.8.2

package/package.json

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

package/src/components/ApprovalCard/index.vue

@@ -48,8 +48,10 @@
               >
                 <span class="worker-icon n20-icon-user"></span>{{ item.assignee }}
               </div>
+              <div v-if="item.result !==1">{{  item.appOrPc ==="1"? 'PC端审批':'App端审批'}}</div>
             </div>
           </div>
+
           <div v-if="item.ccUserName" class="n20-description-c m-t">{{ '抄送人：' | $lc }}{{ item.ccUserName }}</div>
           <div v-if="item.addTaskName" class="n20-description-c m-t">
             {{ '加签审批人：' | $lc }}{{ item.addTaskName }}
@@ -297,7 +299,7 @@ export default {
   },
  async created() {
     if (this.procInstId) {
-     const data =await this.getProcInstData(this.procInstId)
+     const data =await this.getProcInstData('580fc97d76024fc8a6faadba5c1456e9'||this.procInstId)
       this.approvalData.push(...data)
     }
   },
@@ -332,7 +334,8 @@ export default {
          ccUserName: item.ccUserName, // 抄送人
          addTaskName: item.addTaskName, // 加签审批人
          memberName: item.memberName, // 审批人单位
-         subProcInitId:item.subProcInitId // 子流程id
+         subProcInitId:item.subProcInitId, // 子流程id
+         appOrPc:item.appOrPc // 终端标识 1 PC 2 APP
        }
        let resultName = item.optResult || ''
        resultName = resultName.split('-')

package/src/index.js

@@ -135,6 +135,9 @@ import { convert } from './utils/amountInWords.js'
 /** 国际化 */
 import i18n, { $l } from './utils/i18n'
 
+/** 全局指令 */
+import fitlers from './fitlers'
+
 /** 修正ElementUI的问题 */
 import repairEl from './utils/repairElementUI'
 
@@ -234,6 +237,11 @@ const install = function (Vue, opts = { prefix: 'Cl', i18nConfig: {} }) {
     Vue.component(name, component)
   })
 
+
+  Object.keys(fitlers).forEach((key) => {
+    Vue.filter(key+'Format', fitlers[key])
+  })
+
   Vue.use(HoverTooltip)
   Vue.use(TitleDirective)
   Vue.use(VDrag)

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

@@ -136,8 +136,8 @@ export async function getCertInfo(dn) {
     IWSASkfGetCertList(
       process.env.VUE_APP_NetSign_ARG || window.VUE_APP_NetSign_ARG || 'ShuttleCsp11_3000GM.dll',
       (CertListData, errorCode) => {
-        if (errorCode !== '0' && errorCode !== 0) {
-          Message.error(codeDate[errorCode])
+        if (errorCode) {
+          Message.error(codeDate[errorCode] || errorCode)
           reject()
         } else {
           const checkRes = verifyDn(CertListData, dn)