n20-common-lib 2.4.34 → 2.4.36-repair

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.
Files changed (4) hide show
  1. package/package.json +2 -2
  2. package/src/components/ApprovalButtons/showAppOpi.vue +38 -23
  3. package/src/components/Layout/HeaderWrap/index.vue +12 -7
  4. package/src/components/Layout/HeaderWrap/indexN.vue +13 -8
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.4.34",
3
+ "version": "2.4.36-repair",
4
4
  "private": false,
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -114,4 +114,4 @@
114
114
  "last 2 versions",
115
115
  "not dead"
116
116
  ]
117
- }
117
+ }
package/src/components/ApprovalButtons/showAppOpi.vue CHANGED
@@ -9,65 +9,80 @@
9
9
  :placeholder="'请选择审批意见' | $lc"
10
10
  @change="changeFn"
11
11
  >
12
- <el-option v-for="(item, i) in approveMsgList" :key="i" :label="item.suggestion" :value="item.suggestion" />
12
+ <el-option
13
+ v-for="(item, i) in approveMsgList"
14
+ :key="i"
15
+ :label="item.suggestion"
16
+ :value="item.suggestion"
17
+ />
13
18
  </el-select>
14
19
  </div>
15
20
  </template>
16
21
 
17
22
  <script>
18
23
  // import { $lc } from '../../utils/i18n/index'
19
- import axios from '../../utils/axios'
24
+ import axios from "../../utils/axios";
20
25
  export default {
21
26
  props: {
22
27
  taskId: {
23
28
  type: [String, Number],
24
- default: ''
29
+ default: "",
25
30
  },
26
31
  message: {
27
32
  type: String,
28
- default: ''
33
+ default: "",
29
34
  },
30
35
  andUser: {
31
36
  type: Boolean,
32
- default: false
33
- }
37
+ default: false,
38
+ },
34
39
  },
35
40
  data() {
36
41
  return {
37
42
  approveMsgSlt: [],
38
43
  approveMsgList: [],
39
- multiple: false
40
- }
44
+ multiple: false,
45
+ };
41
46
  },
42
47
  mounted() {
43
- this.getData()
44
- this.getIsMultiple()
48
+ this.getData();
49
+ this.getIsMultiple();
45
50
  },
46
51
  methods: {
47
52
  // 审批意见选择是否单选,1是 0 否
48
53
  getIsMultiple() {
49
- axios.get(`/bems/activiti/actAppOpi/queryAppOpiAndUser`).then(({ msg }) => {
50
- this.multiple = msg === '0'
51
- })
54
+ axios
55
+ .get(`/bems/activiti/actAppOpi/queryAppOpiAndUser`, null, {
56
+ noMsg: true,
57
+ })
58
+ .then(({ msg }) => {
59
+ this.multiple = msg === "0";
60
+ });
52
61
  },
53
62
  getData() {
54
63
  if (this.andUser) {
55
- axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser').then(({ data }) => {
56
- this.approveMsgList = data || []
57
- })
64
+ axios
65
+ .post("/bems/activiti/actAppOpi/queryAppOpiAndUser", null, {
66
+ noMsg: true,
67
+ })
68
+ .then(({ data }) => {
69
+ this.approveMsgList = data || [];
70
+ });
58
71
  } else {
59
- axios.post('/bems/activiti/actAppOpi/queryAppOpi').then(({ data }) => {
60
- this.approveMsgList = data.list || []
61
- })
72
+ axios
73
+ .post("/bems/activiti/actAppOpi/queryAppOpi", null, { noMsg: true })
74
+ .then(({ data }) => {
75
+ this.approveMsgList = data.list || [];
76
+ });
62
77
  }
63
78
  },
64
79
  changeFn() {
65
80
  // if (this.approveMsgSlt?.length) {
66
- this.$emit('update:message', this.approveMsgSlt.join('\n'))
81
+ this.$emit("update:message", this.approveMsgSlt.join("\n"));
67
82
  // }
68
- }
69
- }
70
- }
83
+ },
84
+ },
85
+ };
71
86
  </script>
72
87
 
73
88
  <style>
package/src/components/Layout/HeaderWrap/index.vue CHANGED
@@ -426,14 +426,19 @@ export default {
426
426
  })
427
427
  },
428
428
  logoutA() {
429
- axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
430
- if (this.afterLogout) {
431
- let After = this.afterLogout()
432
- After.then && After.then(auth.removeToken())
433
- } else {
429
+ axios
430
+ .delete('/bems/prod_1.0/uas/api/authorization/logout', {}, { noMsg: true })
431
+ .then(() => {
432
+ if (this.afterLogout) {
433
+ let After = this.afterLogout()
434
+ After.then && After.then(auth.removeToken())
435
+ } else {
436
+ auth.removeToken()
437
+ }
438
+ })
439
+ .catch(() => {
434
440
  auth.removeToken()
435
- }
436
- })
441
+ })
437
442
  },
438
443
  // 检查是否代理中
439
444
  async getProxyAuthIing() {
package/src/components/Layout/HeaderWrap/indexN.vue CHANGED
@@ -188,7 +188,7 @@
188
188
  </div>
189
189
  <el-dropdown-menu slot="dropdown">
190
190
  <el-dropdown-item v-for="item in systemList" :key="item.id" @click.native="clickSystem(item)">
191
- <span>{{ item.systemName | $lc }}</span>
191
+ <span>{{ item.systemName }}</span>
192
192
  </el-dropdown-item>
193
193
  </el-dropdown-menu>
194
194
  </el-dropdown>
@@ -570,14 +570,19 @@ export default {
570
570
  })
571
571
  },
572
572
  logoutA() {
573
- axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
574
- if (this.afterLogout) {
575
- let After = this.afterLogout()
576
- After.then && After.then(auth.removeToken())
577
- } else {
573
+ axios
574
+ .delete('/bems/prod_1.0/uas/api/authorization/logout', {}, { noMsg: true })
575
+ .then(() => {
576
+ if (this.afterLogout) {
577
+ let After = this.afterLogout()
578
+ After.then && After.then(auth.removeToken())
579
+ } else {
580
+ auth.removeToken()
581
+ }
582
+ })
583
+ .catch(() => {
578
584
  auth.removeToken()
579
- }
580
- })
585
+ })
581
586
  },
582
587
  // 检查是否代理中
583
588
  async getProxyAuthIing() {