n20-common-lib 2.2.33 → 2.2.35
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 +1 -1
- package/src/components/ApprovalButtons/index.vue +6 -6
- package/src/components/ApprovalCard/index.vue +9 -5
- package/src/components/Layout/SubContent/index.vue +1 -1
- package/src/components/Layout/index.vue +1 -1
- package/src/components/Layout/indexN.vue +1 -1
- package/src/components/LoginSetting/setItem.vue +1 -1
- package/style/index.css +3 -3
- package/theme/blue.css +2 -2
- package/theme/cctcRed.css +2 -2
- package/theme/green.css +2 -2
- package/theme/lightBlue.css +2 -2
- package/theme/orange.css +2 -2
- package/theme/purple.css +2 -2
- package/theme/red.css +2 -2
- package/theme/yellow.css +2 -2
package/package.json
CHANGED
|
@@ -362,14 +362,14 @@ export default {
|
|
|
362
362
|
}
|
|
363
363
|
},
|
|
364
364
|
addErrFn() {
|
|
365
|
-
this.addMsg = '审批方式不能为空'
|
|
365
|
+
this.addMsg = $lc('审批方式不能为空')
|
|
366
366
|
setTimeout(() => {
|
|
367
367
|
this.addMsg = undefined
|
|
368
368
|
}, 1000)
|
|
369
369
|
},
|
|
370
370
|
errMsgFn(str = '') {
|
|
371
371
|
this.$refs['msg-input'].focus()
|
|
372
|
-
this.errMsg = str + '操作，意见不能为空'
|
|
372
|
+
this.errMsg = str + $lc('操作，意见不能为空')
|
|
373
373
|
setTimeout(() => {
|
|
374
374
|
this.errMsg = undefined
|
|
375
375
|
}, 1000)
|
|
@@ -386,7 +386,7 @@ export default {
|
|
|
386
386
|
// 驳回
|
|
387
387
|
rejectFn() {
|
|
388
388
|
if (!this.messageC) {
|
|
389
|
-
return this.errMsgFn('驳回')
|
|
389
|
+
return this.errMsgFn($lc('驳回'))
|
|
390
390
|
}
|
|
391
391
|
this.beforeFn(this.beforeReject, () => {
|
|
392
392
|
axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
|
|
@@ -396,7 +396,7 @@ export default {
|
|
|
396
396
|
},
|
|
397
397
|
rejectToB() {
|
|
398
398
|
if (!this.messageC) {
|
|
399
|
-
return this.errMsgFn('驳回')
|
|
399
|
+
return this.errMsgFn($lc('驳回'))
|
|
400
400
|
}
|
|
401
401
|
this.rejectToV = true
|
|
402
402
|
},
|
|
@@ -415,7 +415,7 @@ export default {
|
|
|
415
415
|
// 驳回到上一步
|
|
416
416
|
rejectPreFn(list) {
|
|
417
417
|
if (!this.messageC) {
|
|
418
|
-
return this.errMsgFn('驳回')
|
|
418
|
+
return this.errMsgFn($lc('驳回'))
|
|
419
419
|
}
|
|
420
420
|
this.beforeFn(this.beforeRejectPre, () => {
|
|
421
421
|
axios.post('/bems/activiti/admin/todo/rejectpre', this.getParam()).then(({ data }) => {
|
|
@@ -450,7 +450,7 @@ export default {
|
|
|
450
450
|
// 作废
|
|
451
451
|
discardFn() {
|
|
452
452
|
if (!this.messageC) {
|
|
453
|
-
return this.errMsgFn('作废')
|
|
453
|
+
return this.errMsgFn($lc('作废'))
|
|
454
454
|
}
|
|
455
455
|
this.beforeFn(this.beforeDiscard, () => {
|
|
456
456
|
axios.post('/bems/activiti/admin/todo/cancle', this.getParam()).then(({ data }) => {
|
|
@@ -18,20 +18,24 @@
|
|
|
18
18
|
</div>
|
|
19
19
|
<div v-else class="flex-box">
|
|
20
20
|
<div class="result-left-name" :class="item | typeF(status, 'color-')">{{ $lc(item.resultName) }}</div>
|
|
21
|
-
<div
|
|
21
|
+
<div
|
|
22
|
+
v-title="item.assignee"
|
|
23
|
+
class="flex-box flex-item n20-worker m-r-s text-ellipsis"
|
|
24
|
+
:show-overflow-tooltip="true"
|
|
25
|
+
>
|
|
22
26
|
<div
|
|
23
27
|
v-title="item.memberName"
|
|
24
28
|
:show-overflow-tooltip="true"
|
|
25
|
-
class="n20-worker m-r-s text-ellipsis"
|
|
26
|
-
style="
|
|
29
|
+
class="flex-item n20-worker m-r-s text-ellipsis"
|
|
30
|
+
style="width: 250px"
|
|
27
31
|
>
|
|
28
32
|
{{ item.memberName }}
|
|
29
33
|
</div>
|
|
30
34
|
<div
|
|
31
35
|
v-title="item.roleName"
|
|
32
|
-
class="n20-worker text-ellipsis"
|
|
36
|
+
class="flex-item n20-worker text-ellipsis"
|
|
33
37
|
:show-overflow-tooltip="true"
|
|
34
|
-
style="
|
|
38
|
+
style="width: 250px"
|
|
35
39
|
>
|
|
36
40
|
{{ item.roleName }}
|
|
37
41
|
</div>
|
|
@@ -16,7 +16,7 @@ export default {
|
|
|
16
16
|
filters: {
|
|
17
17
|
keyF({ path, query = {} }) {
|
|
18
18
|
path = path.replace(/^\//, routerBase)
|
|
19
|
-
return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
|
|
19
|
+
return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + (window._tab_route_key[path] || 0)
|
|
20
20
|
}
|
|
21
21
|
},
|
|
22
22
|
props: {
|
|
@@ -51,7 +51,7 @@ export default {
|
|
|
51
51
|
},
|
|
52
52
|
filters: {
|
|
53
53
|
keyF({ path, query = {} }) {
|
|
54
|
-
return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
|
|
54
|
+
return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + (window._tab_route_key[path] || 0)
|
|
55
55
|
}
|
|
56
56
|
},
|
|
57
57
|
props: {
|
|
@@ -51,7 +51,7 @@ export default {
|
|
|
51
51
|
},
|
|
52
52
|
filters: {
|
|
53
53
|
keyF({ path, query = {} }) {
|
|
54
|
-
return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
|
|
54
|
+
return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + (window._tab_route_key[path] || 0)
|
|
55
55
|
}
|
|
56
56
|
},
|
|
57
57
|
props: {
|