n20-common-lib 2.1.35 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.1.35",
+  "version": "2.2.1",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/ApprovalButtons/index.vue

@@ -52,7 +52,14 @@
           />
         </el-form-item>
         <template v-if="taskId && showBtn">
-          <show-app-opi class="flex-1 m-l-s" :task-id="taskId" :message.sync="messageC" style="width: 20%" />
+          <show-app-opi
+            v-if="opiAndUser || authList.includes('showAppOpi')"
+            class="flex-1 m-l-s"
+            :task-id="taskId"
+            :message.sync="messageC"
+            :and-user="opiAndUser"
+            style="width: 20%"
+          />
           <show-other-att
             v-if="authList.includes('showOtherAtt')"
             class="flex-1 m-l"
@@ -122,6 +129,11 @@ import CarboncopyProp from './setCarboncopyProp.vue'
 import RejectToProp from './setRejectToProp.vue'
 import ShowAppOpi from './showAppOpi.vue'
 import ShowOtherAtt from './showOtherAttr.vue'
+// window._approvalExtend = { 'addtask.chdUserInfo.extend': {}, 'appOpi.queryAppOpiAndUser.exist': undefined, 'card.countermand.suggestion': false }
+if (!window._approvalExtend) window._approvalExtend = {}
+if (!window._approvalExtend['addtask.chdUserInfo.extend']) {
+  window._approvalExtend['addtask.chdUserInfo.extend'] = window._isAddtask_get_userlist_extend_data_ || {}
+}
 
 export default {
   name: 'ApprovalButtons',
@@ -190,6 +202,7 @@ export default {
       rejectToV: false,
       approvalToV: false,
       showApprovalTo: false,
+      opiAndUser: false,
       otherAtt: {}
     }
   },
@@ -208,19 +221,11 @@ export default {
     }
   },
   created() {
-    this.taskId = this.$route.query.taskId
+    this.taskId = this.$route.query.taskId || this.$route.params.taskId
     this.showBtn = this.$route.query.habtn !== 'true'
     this.getBtns()
-    if (this.showBtn && this.$route.query.state === '2') {
-      axios
-        .get(`/bems/activiti/sample/getTaskMoveVos/${this.$route.query.taskId}/1`, null, {
-          loading: false,
-          noMsg: true
-        })
-        .then(() => {
-          this.showApprovalTo = true
-        })
-    }
+    this.getShowApprovalTo()
+    this.getHasQueryAppOpiAndUser()
   },
   methods: {
     // 换回到发起页
@@ -255,6 +260,34 @@ export default {
           this.authList = this.btnList
         })
     },
+    // 获取是否显示驳回至按钮
+    getShowApprovalTo() {
+      if (this.showBtn && this.$route.query.state === '2') {
+        axios
+          .get(`/bems/activiti/sample/getTaskMoveVos/${this.$route.query.taskId}/1`, null, {
+            loading: false,
+            noMsg: true
+          })
+          .then(() => {
+            this.showApprovalTo = true
+          })
+      }
+    },
+    // 刺探审批意见接口是否存在
+    getHasQueryAppOpiAndUser() {
+      if (this.showBtn && window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] === undefined) {
+        axios
+          .post('/bems/activiti/actAppOpi/queryAppOpiAndUser', null, { loading: false, noMsg: true })
+          .then(() => {
+            this.opiAndUser = window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] = true
+          })
+          .catch(() => {
+            window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] = false
+          })
+      } else {
+        this.opiAndUser = window._approvalExtend['appOpi.queryAppOpiAndUser.exist']
+      }
+    },
     // 获取提交参数
     getParam() {
       let { typeCode, taskId, groupNo, isAgentcy } = this.$route.query

package/src/components/ApprovalButtons/setCarboncopyProp.vue

@@ -118,8 +118,8 @@ export default {
   },
   methods: {
     getList() {
-      if (this.type === 'addtask' && window._isAddtask_get_userlist_extend_data_) {
-        this.searchObj = Object.assign(this.searchObj, window._isAddtask_get_userlist_extend_data_)
+      if (this.type === 'addtask') {
+        this.searchObj = Object.assign(this.searchObj, window._approvalExtend['addtask.chdUserInfo.extend'])
       }
       axios
         .post('/bems/activiti/online/chdUserInfo', {

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -26,6 +26,10 @@ export default {
     message: {
       type: String,
       default: ''
+    },
+    andUser: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -39,9 +43,15 @@ export default {
   },
   methods: {
     getData() {
-      axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser').then(({ data }) => {
-        this.approveMsgList = data || []
-      })
+      if (this.andUser) {
+        axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser').then(({ data }) => {
+          this.approveMsgList = data || []
+        })
+      } else {
+        axios.post('/bems/activiti/actAppOpi/queryAppOpi').then(({ data }) => {
+          this.approveMsgList = data.list || []
+        })
+      }
     },
     changeFn() {
       // if (this.approveMsgSlt?.length) {

package/src/components/ApprovalButtons/showOtherAttr.vue

@@ -45,7 +45,7 @@ export default {
             console.warn(other.otherattjson, '配置的不对')
           }
           if (!Array.isArray(this.otherattjson)) {
-            this.otherattjson = [{ name: 'aa', value: '01' }]
+            this.otherattjson = []
           }
         }
       })

package/src/components/ApprovalCard/index.vue

@@ -50,10 +50,12 @@
           <div v-if="item.addTaskName" class="n20-description-c m-t">
             {{ '加签审批人：' | $lc }}{{ item.addTaskName }}
           </div>
-          <div v-if="item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
-            <span v-if="item.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
-            <span v-if="item.suggestion">{{ item.suggestion }}</span>
-          </div>
+          <template v-if="item.resultName !== '撤回' || showCtdMsg">
+            <div v-if="item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
+              <span v-if="item.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
+              <span>{{ item.suggestion }}</span>
+            </div>
+          </template>
         </div>
       </el-timeline-item>
     </el-timeline>
@@ -63,6 +65,8 @@
 <script>
 import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
+if (!window._approvalExtend) window._approvalExtend = {}
+
 export default {
   name: 'ApprovalCard',
   filters: {
@@ -119,6 +123,12 @@ export default {
       default: undefined
     }
   },
+  data() {
+    return {
+      // 显示撤回意见,默认不显示
+      showCtdMsg: window._approvalExtend['card.countermand.suggestion'] === true
+    }
+  },
   created() {
     if (this.procInstId) {
       axios
@@ -141,7 +151,6 @@ export default {
             resultName = resultName.split('-')
             resultName = resultName[resultName.length - 1]
             _item.resultName = resultName === $lc('推进') ? $lc('批准') : resultName
-            console.log(item, 99)
             if (item.taskName === $lc('开始')) {
               _item.result = 1
             } else if (_item.resultName === $lc('加签推进')) {

package/src/components/ApprovalRecord/index-zjk.vue

@@ -1,16 +1,32 @@
 /* 审批记录 */
 <template>
   <div>
-    <expandableWrap :title="'审批记录' | $lc" :show-expand="false">
+    <expandableWrap :title="'审批记录' | $lc" :show-expand="false" :icon="false">
       <template slot="tips">
         <el-button plain size="mini" :disabled="false" @click="cardV = true">{{ '审批进度查看' | $lc }}</el-button>
         <el-button plain size="mini" :disabled="false" @click="imgV = true">{{ '流程图查看' | $lc }}</el-button>
       </template>
     </expandableWrap>
-    <el-dialog :title="'审批记录' | $lc" :visible.sync="cardV" width="1100px" class="p-a-0" append-to-body top="10vh">
+    <el-dialog
+      v-drag
+      :title="'审批记录' | $lc"
+      :visible.sync="cardV"
+      width="1100px"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
       <approvalCard class="p-a" :proc-inst-id="$route.query.processInstanceId" style="height: 70vh; overflow: auto" />
     </el-dialog>
-    <el-dialog :title="'查看流程' | $lc" :visible.sync="imgV" width="1100px" class="p-a-0" append-to-body top="10vh">
+    <el-dialog
+      v-drag
+      :title="'查看流程' | $lc"
+      :visible.sync="imgV"
+      width="1100px"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
       <approvalImg
         class="text-c p-a"
         :proc-inst-id="$route.query.processInstanceId"

package/src/components/ApprovalRecord/index.vue

@@ -1,16 +1,32 @@
 /* 审批记录 */
 <template>
   <div>
-    <expandableWrap :title="'审批记录' | $lc" :show-expand="false">
+    <expandableWrap :title="'审批记录' | $lc" :show-expand="false" :icon="false">
       <template slot="tips">
         <el-button plain size="mini" :disabled="false" @click="cardV = true">{{ '审批进度查看' | $lc }}</el-button>
         <el-button plain size="mini" :disabled="false" @click="imgV = true">{{ '流程图查看' | $lc }}</el-button>
       </template>
     </expandableWrap>
-    <el-dialog :title="'审批记录' | $lc" :visible.sync="cardV" width="80%" class="p-a-0" append-to-body top="10vh">
+    <el-dialog
+      v-drag
+      :title="'审批记录' | $lc"
+      :visible.sync="cardV"
+      width="80%"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
       <approvalCard class="p-a" :proc-inst-id="$route.query.processInstanceId" style="height: 70vh; overflow: auto" />
     </el-dialog>
-    <el-dialog :title="'查看流程' | $lc" :visible.sync="imgV" width="80%" class="p-a-0" append-to-body top="10vh">
+    <el-dialog
+      v-drag
+      :title="'查看流程' | $lc"
+      :visible.sync="imgV"
+      width="80%"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
       <approvalImg
         class="text-c p-a"
         :proc-inst-id="$route.query.processInstanceId"

package/src/components/Layout/HeaderWrap/index.vue

@@ -25,7 +25,7 @@
     <slot name="header-ectad">
       <sapn v-if="ectad" class="f-s-s">
         <span class="m-r-ss">
-          {{ '用户' | $lc }}: <span class="color-666">{{ userInfo.userName }}</span>
+          {{ '用户' | $lc }}: <span class="color-666">{{ userInfo.userName || userNo }}</span>
         </span>
         <span class="m-r-ss b-center">
           {{ '角色' | $lc }}:
@@ -82,7 +82,7 @@
 
       <el-dropdown-menu slot="dropdown">
         <div class="user-info-name flex-box p-l p-r p-t-s p-b-s" style="max-width: 300px">
-          <span :class="{ pointer: customOpt.userMd }" @click="goMdmUser">{{ userInfo.userName }}</span>
+          <span :class="{ pointer: customOpt.userMd }" @click="goMdmUser">{{ userInfo.userName || userNo }}</span>
           <div class="flex-column flex-l">
             <span
               v-title="userInfo.companyName"

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

@@ -171,13 +171,16 @@ function verifyDn(dnList, dn) {
   let checkRes = ''
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
 
+  let isIn = false
   dnList.find((C) => {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (!dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
-      checkRes = 'checkRes'
-      return true
+    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      return (isIn = true)
     }
   })
+  if (!isIn) {
+    checkRes = 'checkRes'
+  }
 
   return checkRes
 }

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

@@ -171,13 +171,16 @@ function verifyDn(dnList, dn) {
   let checkRes = ''
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
 
+  let isIn = false
   dnList.find((C) => {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (!dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
-      checkRes = 'checkRes'
-      return true
+    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      return (isIn = true)
     }
   })
+  if (!isIn) {
+    checkRes = 'checkRes'
+  }
 
   return checkRes
 }

package/src/plugins/Sign/sign.js

@@ -126,14 +126,16 @@ function verifyDn(dnList, dn) {
   let checkRes = ''
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
 
+  let isIn = false
   dnList.find((C) => {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-
-    if (!dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
-      checkRes = 'checkRes'
-      return true
+    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      return (isIn = true)
     }
   })
+  if (!isIn) {
+    checkRes = 'checkRes'
+  }
 
   return checkRes
 }