n20-common-lib 2.3.2 → 2.3.4

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -1,7 +1,7 @@
 /* 审批按钮组 */
 <template>
   <div>
-    <el-form label-position="right" :label-width="_lang === 'zh' ? '5em' : '10em'">
+    <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '6em' : '10em'">
       <div v-if="taskId && showBtn" class="flex-box">
         <el-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
           <el-input
@@ -51,7 +51,7 @@
         </el-form-item>
       </div>
       <div class="flex-box">
-        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" style="width: 70%">
+        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="required" style="width: 70%">
           <el-input
             ref="msg-input"
             v-model="messageC"
@@ -169,6 +169,10 @@ export default {
       type: Object,
       default: () => ({})
     },
+    required: {
+      type: Boolean,
+      default: false
+    },
     signText: {
       type: String,
       default: undefined
@@ -425,6 +429,9 @@ export default {
     },
     // 审批
     approvalFn() {
+      if (this.required && !this.messageC) {
+        return this.errMsgFn($lc('批准'))
+      }
       if (this.addTaskList.length > 0 && !this.addTaskType) {
         return this.addErrFn()
       }

package/src/directives/VHas/index.js

@@ -1,4 +1,4 @@
-import { getRela, getCltRela } from '../../utils/relaNo.js'
+import { getCltRela, getRela, setRela } from '../../utils/relaNo.js'
 import { getItem } from '../../utils/storageEdit'
 
 export function has(vals, clt) {
@@ -6,6 +6,11 @@ export function has(vals, clt) {
   if (clt) {
     relaNos = getCltRela(clt)
   } else {
+    // 判断此处有没有同步更新的标识，有标识代表权限更新过重新再取一次数据
+    let isSync = sessionStorage.getItem('isSync')
+    if (isSync === 'true') {
+      setRela()
+    }
     relaNos = getRela().relaNos
   }
   if (typeof vals === 'string') {

package/src/utils/asyncGetRelaNos.js

@@ -58,6 +58,7 @@ async function asyncGetRelaNos(appNo, rns) {
   let ssRelaNosG = getItem('relaNosGlobal')
   ssRelaNosG.push(...oRelaNos)
   setItem('relaNosGlobal', ssRelaNosG, isSync)
+  isSync && sessionStorage.setItem('isSync', isSync)
 }
 
 export default asyncGetRelaNos