n20-common-lib 1.3.158 → 1.3.160

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "1.3.158",
3
+ "version": "1.3.160",
4
4
  "private": false,
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -252,7 +252,7 @@ export default {
252
252
  methods: {
253
253
  // 跳转打主数据人员页面
254
254
  goMdmUser() {
255
- linkPush('/mdm/personnel')
255
+ // linkPush('/mdm/personnel')
256
256
  },
257
257
  setUserVisible(v) {
258
258
  if (v) {
@@ -168,6 +168,10 @@ export default {
168
168
  otherName: {
169
169
  type: String,
170
170
  default: ''
171
+ },
172
+ asyncRelaNos: {
173
+ type: Boolean,
174
+ default: false
171
175
  }
172
176
  },
173
177
  data() {
@@ -280,7 +284,7 @@ export default {
280
284
  this.$refs['login-form'].validate((valid) => {
281
285
  if (!valid) return false
282
286
  auth.removeToken()
283
- if(this.beforeLogin){
287
+ if (this.beforeLogin) {
284
288
  this.beforeLogin().then(() => {
285
289
  this.theType === 'account' && this.passwordLogin()
286
290
  this.theType === 'pthon' && this.phoneLogin()
@@ -291,7 +295,6 @@ export default {
291
295
  this.theType === 'pthon' && this.phoneLogin()
292
296
  this.theType === 'accountPthon' && this.accountPthonLogin()
293
297
  }
294
-
295
298
  })
296
299
  },
297
300
  // 获取加密参数
@@ -534,6 +537,11 @@ export default {
534
537
  },
535
538
  // 新增不同单位对应不同角色,具有不同权限
536
539
  getCltRelaNos() {
540
+ if (this.asyncRelaNos) {
541
+ sessionStorage.setItem('cltrelaNos', '{}')
542
+ return Promise.resolve()
543
+ }
544
+
537
545
  this.loadingAdd()
538
546
  let pro = new Promise((resolve) => {
539
547
  axios
@@ -1,9 +1,11 @@
1
1
  <template>
2
2
  <div v-if="alV" v-loading="alV" class="login-wrap">
3
- <loginForm :beforeLogin="beforeLogin"
3
+ <loginForm
4
4
  ref="login-form"
5
+ :before-login="beforeLogin"
5
6
  :login-types="loginTypes"
6
7
  :login-then="loginThen"
8
+ :async-rela-nos="asyncRelaNos"
7
9
  class="login-form"
8
10
  style="display: none"
9
11
  />
@@ -17,10 +19,11 @@
17
19
  <!-- eslint-disable-next-line vue/no-v-html -->
18
20
  <div doc="登录页标语" v-html="loginSloganHtml"></div>
19
21
  <loginForm
20
- :beforeLogin="beforeLogin"
21
22
  v-if="operateType === 'login'"
23
+ :before-login="beforeLogin"
22
24
  :login-types="loginTypes"
23
25
  :login-then="loginThen"
26
+ :async-rela-nos="asyncRelaNos"
24
27
  class="login-form"
25
28
  @changType="getChangetype"
26
29
  >
@@ -77,11 +80,15 @@ export default {
77
80
  },
78
81
  beforeLogin: {
79
82
  type: Function,
80
- default:undefined
83
+ default: undefined
81
84
  },
82
85
  autoLoginDate: {
83
86
  type: Object,
84
87
  default: undefined
88
+ },
89
+ asyncRelaNos: {
90
+ type: Boolean,
91
+ default: false
85
92
  }
86
93
  },
87
94
  data() {
package/src/index.js CHANGED
@@ -95,6 +95,7 @@ import forEachs from './utils/forEachs'
95
95
  import list2tree from './utils/list2tree'
96
96
  import { has as isHas } from './directives/VHas/index.js'
97
97
  import { hasG as isHasG } from './directives/VHas/index.js'
98
+ import asyncGetRelaNos from './utils/asyncGetRelanos'
98
99
 
99
100
  /** 国际化 */
100
101
  import i18n, { $l } from './utils/i18n'
@@ -223,6 +224,7 @@ export {
223
224
  isHasG,
224
225
  dayjs,
225
226
  numerify,
227
+ asyncGetRelaNos,
226
228
  $l,
227
229
  // 组件
228
230
  ContentLoading,
@@ -0,0 +1,36 @@
1
+ import axios from './axios'
2
+
3
+ // 按需/按模块 加载权限
4
+ async function asyncGetRelaNos(appNo, rns) {
5
+ let uno = sessionStorage.getItem('userNo')
6
+
7
+ let { data } = await axios.post('/bems/prod_1.0/user/api/userController/qryBusyInfoNo?r=' + Math.random(), {
8
+ uno: uno,
9
+ appNo: appNo,
10
+ relaNos: rns
11
+ })
12
+
13
+ let ssRelaNos = JSON.parse(sessionStorage.getItem('relaNos'))
14
+ let ssCltrelaNos = JSON.parse(sessionStorage.getItem('cltrelaNos'))
15
+
16
+ let relaNos = []
17
+ data.forEach((el) => {
18
+ ssCltrelaNos[el.cltNo] || (ssCltrelaNos[el.cltNo] = [])
19
+
20
+ relaNos.push(...el.relaNos)
21
+ ssCltrelaNos[el.cltNo].push(...el.relaNos)
22
+ })
23
+ relaNos = Array.from(new Set(relaNos))
24
+
25
+ let rnObj = ssRelaNos.find((el) => el.appNo === appNo)
26
+ if (rnObj) {
27
+ rnObj.relaNos = relaNos
28
+ } else {
29
+ ssRelaNos.push({ appNo: appNo || 'null', relaNos: relaNos })
30
+ }
31
+
32
+ sessionStorage.setItem('relaNos', JSON.stringify(ssRelaNos))
33
+ sessionStorage.setItem('cltrelaNos', JSON.stringify(ssCltrelaNos))
34
+ }
35
+
36
+ export default asyncGetRelaNos