n20-common-lib 2.9.107 → 2.9.109
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
|
@@ -2,22 +2,41 @@
|
|
|
2
2
|
<template>
|
|
3
3
|
<div class="n20-approve-wrap">
|
|
4
4
|
<el-timeline :reverse="true">
|
|
5
|
-
<el-timeline-item
|
|
5
|
+
<el-timeline-item
|
|
6
|
+
v-for="(item, i) in approvalData"
|
|
7
|
+
:key="i"
|
|
8
|
+
:type="item | typeF(status)"
|
|
9
|
+
:hide-timestamp="true"
|
|
10
|
+
>
|
|
6
11
|
<div class="n20-time">
|
|
7
12
|
<div>{{ item.endTime | dataF }}</div>
|
|
8
13
|
<div>{{ item.endTime | timeF }}</div>
|
|
9
14
|
</div>
|
|
10
15
|
<div>
|
|
11
16
|
<div v-if="item.result === 0" class="flex-box flex-v">
|
|
12
|
-
<div
|
|
17
|
+
<div
|
|
18
|
+
v-title="item.assignee"
|
|
19
|
+
class="w-full n20-worker p-r-s text-ellipsis"
|
|
20
|
+
:show-overflow-tooltip="true"
|
|
21
|
+
>
|
|
13
22
|
{{ $lc(item.assignee) }}
|
|
14
23
|
</div>
|
|
15
24
|
</div>
|
|
16
25
|
<div v-if="item.result === 5" class="flex-box">
|
|
17
|
-
<div
|
|
26
|
+
<div
|
|
27
|
+
class="result-left-name"
|
|
28
|
+
:class="item | typeF(status, 'color-')"
|
|
29
|
+
>
|
|
30
|
+
{{ $lc(item.resultName) }}
|
|
31
|
+
</div>
|
|
18
32
|
</div>
|
|
19
33
|
<div v-else class="flex-box">
|
|
20
|
-
<div
|
|
34
|
+
<div
|
|
35
|
+
class="result-left-name"
|
|
36
|
+
:class="item | typeF(status, 'color-')"
|
|
37
|
+
>
|
|
38
|
+
{{ $lc(item.resultName) }}
|
|
39
|
+
</div>
|
|
21
40
|
<div
|
|
22
41
|
v-title="item.assignee"
|
|
23
42
|
class="flex-box flex-item n20-worker m-r-s text-ellipsis"
|
|
@@ -54,12 +73,24 @@
|
|
|
54
73
|
style="width: 180px"
|
|
55
74
|
:show-overflow-tooltip="true"
|
|
56
75
|
>
|
|
57
|
-
<span class="worker-icon n20-icon-user"></span
|
|
76
|
+
<span class="worker-icon n20-icon-user"></span
|
|
77
|
+
>{{ item.assignee }}
|
|
58
78
|
</div>
|
|
59
79
|
<div
|
|
60
|
-
v-if="
|
|
80
|
+
v-if="
|
|
81
|
+
item.result !== 0 &&
|
|
82
|
+
item.appOrPc !== null &&
|
|
83
|
+
item.appOrPc !== '' &&
|
|
84
|
+
item.appOrPc !== undefined
|
|
85
|
+
"
|
|
61
86
|
>
|
|
62
|
-
{{
|
|
87
|
+
{{
|
|
88
|
+
item.appOrPc === '1'
|
|
89
|
+
? 'PC端审批'
|
|
90
|
+
: item.appOrPc === '2'
|
|
91
|
+
? '外部系统审批'
|
|
92
|
+
: 'App端审批' | $lc
|
|
93
|
+
}}
|
|
63
94
|
</div>
|
|
64
95
|
<div v-if="item.showConnect === '1'" class="m-l-s">
|
|
65
96
|
<span class="pointer color-ccc f-s-s" @click="seeDetail(item)"
|
|
@@ -69,17 +100,30 @@
|
|
|
69
100
|
</div>
|
|
70
101
|
</div>
|
|
71
102
|
|
|
72
|
-
<div v-if="item.ccUserName" class="n20-description-c m-t">
|
|
103
|
+
<div v-if="item.ccUserName" class="n20-description-c m-t">
|
|
104
|
+
{{ '抄送人：' | $lc }}{{ item.ccUserName }}
|
|
105
|
+
</div>
|
|
73
106
|
<div class="n20-description-c m-t flex-box flex-v">
|
|
74
|
-
<el-tag
|
|
75
|
-
item.addTaskTag
|
|
76
|
-
|
|
77
|
-
|
|
107
|
+
<el-tag
|
|
108
|
+
v-if="item.addTaskTag"
|
|
109
|
+
class="m-r-s"
|
|
110
|
+
effect="plain"
|
|
111
|
+
type="info"
|
|
112
|
+
>{{ item.addTaskTag | remarkF(remarkOpt) }}</el-tag
|
|
113
|
+
>
|
|
114
|
+
<span v-if="item.addTaskName"
|
|
115
|
+
>{{ '加签审批人：' | $lc }}{{ item.addTaskName }}</span
|
|
116
|
+
>
|
|
78
117
|
</div>
|
|
79
118
|
|
|
80
119
|
<template v-if="item.resultName !== '撤回' || showCtdMsg">
|
|
81
|
-
<div
|
|
82
|
-
|
|
120
|
+
<div
|
|
121
|
+
v-if="item.subProcInitId"
|
|
122
|
+
class="n20-description-c n20-description-bgc m-t p-a-s"
|
|
123
|
+
>
|
|
124
|
+
<span
|
|
125
|
+
class="color-primary pointer"
|
|
126
|
+
@click="seeApproveChild(item.subProcInitId)"
|
|
83
127
|
>{{ item.suggestion }}<i class="n20-icon-shouqizhedie f-s-m"></i
|
|
84
128
|
></span>
|
|
85
129
|
|
|
@@ -106,12 +150,18 @@
|
|
|
106
150
|
</div>
|
|
107
151
|
</div>
|
|
108
152
|
<div v-if="row.result === 5" class="flex-box">
|
|
109
|
-
<div
|
|
153
|
+
<div
|
|
154
|
+
class="result-left-name"
|
|
155
|
+
:class="row | typeF(status, 'color-')"
|
|
156
|
+
>
|
|
110
157
|
{{ $lc(row.resultName) }}
|
|
111
158
|
</div>
|
|
112
159
|
</div>
|
|
113
160
|
<div v-else class="flex-box">
|
|
114
|
-
<div
|
|
161
|
+
<div
|
|
162
|
+
class="result-left-name"
|
|
163
|
+
:class="row | typeF(status, 'color-')"
|
|
164
|
+
>
|
|
115
165
|
{{ $lc(row.resultName) }}
|
|
116
166
|
</div>
|
|
117
167
|
<div
|
|
@@ -150,7 +200,8 @@
|
|
|
150
200
|
style="width: 180px"
|
|
151
201
|
:show-overflow-tooltip="true"
|
|
152
202
|
>
|
|
153
|
-
<span class="worker-icon n20-icon-user"></span
|
|
203
|
+
<span class="worker-icon n20-icon-user"></span
|
|
204
|
+
>{{ row.assignee }}
|
|
154
205
|
</div>
|
|
155
206
|
</div>
|
|
156
207
|
</div>
|
|
@@ -161,23 +212,38 @@
|
|
|
161
212
|
{{ '加签审批人：' | $lc }}{{ row.addTaskName }}
|
|
162
213
|
</div>
|
|
163
214
|
<div v-if="row.resultName !== '撤回' || showCtdMsg">
|
|
164
|
-
<div
|
|
165
|
-
|
|
215
|
+
<div
|
|
216
|
+
v-if="row.suggestion"
|
|
217
|
+
class="n20-description-c n20-description-bgc m-t p-a-s"
|
|
218
|
+
>
|
|
219
|
+
<span v-if="row.result !== status.waiting">{{
|
|
220
|
+
'审批意见：' | $lc
|
|
221
|
+
}}</span>
|
|
166
222
|
<span>{{ row.suggestion }} </span>
|
|
167
223
|
</div>
|
|
168
224
|
<div
|
|
169
|
-
v-if="
|
|
225
|
+
v-if="
|
|
226
|
+
row.flowHistoryCfgs && row.flowHistoryCfgs.length
|
|
227
|
+
"
|
|
170
228
|
class="n20-description-c m-t p-a-s"
|
|
171
229
|
>
|
|
172
230
|
<span
|
|
173
231
|
v-if="row.result !== status.waiting"
|
|
174
232
|
class="color-primary pointer"
|
|
175
|
-
@click="
|
|
176
|
-
|
|
233
|
+
@click="
|
|
234
|
+
showFlowHistoryChild = !showFlowHistoryChild
|
|
235
|
+
"
|
|
236
|
+
>{{ '审查意见：' | $lc }}
|
|
237
|
+
<i class="n20-icon-shouqizhedie f-s-m"></i
|
|
177
238
|
></span>
|
|
178
|
-
<div
|
|
239
|
+
<div
|
|
240
|
+
v-show="showFlowHistoryChild"
|
|
241
|
+
class="n20-description-bgc p-a-s"
|
|
242
|
+
>
|
|
179
243
|
<div v-for="(s, i) in row.flowHistoryCfgs" :key="i">
|
|
180
|
-
{{ s.cfgName }}：{{
|
|
244
|
+
{{ s.cfgName }}：{{
|
|
245
|
+
s.cfgText ? s.cfgText : s.cfgVal
|
|
246
|
+
}}
|
|
181
247
|
</div>
|
|
182
248
|
</div>
|
|
183
249
|
</div>
|
|
@@ -187,25 +253,43 @@
|
|
|
187
253
|
</el-timeline>
|
|
188
254
|
</div>
|
|
189
255
|
</div>
|
|
190
|
-
<div
|
|
191
|
-
|
|
256
|
+
<div
|
|
257
|
+
v-if="!item.subProcInitId && item.suggestion"
|
|
258
|
+
class="n20-description-c n20-description-bgc m-t p-a-s"
|
|
259
|
+
>
|
|
260
|
+
<span v-if="item.result !== status.waiting">{{
|
|
261
|
+
'审批意见：' | $lc
|
|
262
|
+
}}</span>
|
|
192
263
|
<span>{{ item.suggestion }} </span>
|
|
193
264
|
</div>
|
|
194
|
-
<div
|
|
265
|
+
<div
|
|
266
|
+
v-if="item.flowHistoryCfgs && item.flowHistoryCfgs.length"
|
|
267
|
+
class="n20-description-c m-t p-a-s"
|
|
268
|
+
>
|
|
195
269
|
<span
|
|
196
270
|
v-if="item.result !== status.waiting"
|
|
197
271
|
class="color-primary pointer"
|
|
198
272
|
@click="showFlowHistory = !showFlowHistory"
|
|
199
|
-
>{{ '审查意见：' | $lc
|
|
273
|
+
>{{ '审查意见：' | $lc
|
|
274
|
+
}}<i class="n20-icon-shouqizhedie f-s-m"></i
|
|
200
275
|
></span>
|
|
201
276
|
<div v-show="showFlowHistory" class="n20-description-bgc p-a-s">
|
|
202
|
-
<div
|
|
203
|
-
|
|
277
|
+
<div
|
|
278
|
+
v-for="(s, i) in item.flowHistoryCfgs"
|
|
279
|
+
:key="i"
|
|
280
|
+
class="p-b-s"
|
|
281
|
+
>
|
|
282
|
+
<div>
|
|
283
|
+
{{ s.cfgName }}：{{ s.cfgText ? s.cfgText : s.cfgVal }}
|
|
284
|
+
</div>
|
|
204
285
|
<div>{{ s.cfgRemark }}</div>
|
|
205
286
|
</div>
|
|
206
287
|
</div>
|
|
207
288
|
</div>
|
|
208
|
-
<div
|
|
289
|
+
<div
|
|
290
|
+
v-if="item.flowHisFileList"
|
|
291
|
+
class="n20-description-c n20-description-bgc m-t p-a-s"
|
|
292
|
+
>
|
|
209
293
|
<span>{{ '附件信息' | $lc }}：</span>
|
|
210
294
|
<div class="flex-box">
|
|
211
295
|
<div
|
|
@@ -228,11 +312,21 @@
|
|
|
228
312
|
@close="closeSee"
|
|
229
313
|
>
|
|
230
314
|
<span class="file-upload-table_preview-pn">
|
|
231
|
-
<el-button plain size="mini" @click="downFile(seeRow)"
|
|
315
|
+
<el-button plain size="mini" @click="downFile(seeRow)"
|
|
316
|
+
>下载</el-button
|
|
317
|
+
>
|
|
232
318
|
</span>
|
|
233
319
|
<div v-if="visibleP" class="p-a" style="height: 82vh">
|
|
234
|
-
<ViewerImg
|
|
235
|
-
|
|
320
|
+
<ViewerImg
|
|
321
|
+
v-if="imgType.test(previewName)"
|
|
322
|
+
:options="viewerOptions"
|
|
323
|
+
style="height: 100%"
|
|
324
|
+
>
|
|
325
|
+
<img
|
|
326
|
+
:src="previewUrl"
|
|
327
|
+
:alt="previewName"
|
|
328
|
+
style="display: none"
|
|
329
|
+
/>
|
|
236
330
|
</ViewerImg>
|
|
237
331
|
<component
|
|
238
332
|
:is="previewSameOrg ? 'object' : 'div'"
|
|
@@ -242,10 +336,15 @@
|
|
|
242
336
|
style="width: 100%; height: 100%"
|
|
243
337
|
>
|
|
244
338
|
<div class="flex-column flex-c flex-v" style="height: 100%">
|
|
245
|
-
<i
|
|
339
|
+
<i
|
|
340
|
+
class="el-icon-s-release"
|
|
341
|
+
style="font-size: 60px; color: #999"
|
|
342
|
+
></i>
|
|
246
343
|
<span style="margin-top: 16px">
|
|
247
344
|
{{ '不支持在线预览，请' | $lc
|
|
248
|
-
}}<el-link type="primary" @click="downFile(seeRow)">{{
|
|
345
|
+
}}<el-link type="primary" @click="downFile(seeRow)">{{
|
|
346
|
+
'下载' | $lc
|
|
347
|
+
}}</el-link
|
|
249
348
|
>{{ '到本地查看' | $lc }}
|
|
250
349
|
</span>
|
|
251
350
|
</div>
|
|
@@ -269,7 +368,9 @@ import importG from '../../utils/importGlobal.js'
|
|
|
269
368
|
import { linkPush } from '../../utils/urlToGo.js'
|
|
270
369
|
import Dialog from '../Dialog/index.vue'
|
|
271
370
|
const ViewerImg = async function () {
|
|
272
|
-
let { component } = await importG('v-viewer', () =>
|
|
371
|
+
let { component } = await importG('v-viewer', () =>
|
|
372
|
+
import(/*webpackChunkName: "v-viewer"*/ 'v-viewer')
|
|
373
|
+
)
|
|
273
374
|
return component
|
|
274
375
|
}
|
|
275
376
|
if (!window._approvalExtend) window._approvalExtend = {}
|
|
@@ -372,7 +473,8 @@ export default {
|
|
|
372
473
|
showChildTimeline: false,
|
|
373
474
|
approvalChildrenData: [],
|
|
374
475
|
// 显示撤回意见,默认不显示
|
|
375
|
-
showCtdMsg:
|
|
476
|
+
showCtdMsg:
|
|
477
|
+
window._approvalExtend['card.countermand.suggestion'] === true,
|
|
376
478
|
visibleP: false,
|
|
377
479
|
previewUrl: '',
|
|
378
480
|
imgType: /\.(jpg|png|gif|svg)$/i,
|
|
@@ -392,7 +494,11 @@ export default {
|
|
|
392
494
|
},
|
|
393
495
|
methods: {
|
|
394
496
|
async seeDetail(item) {
|
|
395
|
-
const { appUrl = {} } = await getJsonc(
|
|
497
|
+
const { appUrl = {} } = await getJsonc(
|
|
498
|
+
'activiti/server-config.jsonc',
|
|
499
|
+
null,
|
|
500
|
+
true
|
|
501
|
+
)
|
|
396
502
|
if (appUrl[item._details.appNo]) {
|
|
397
503
|
let path = appUrl[item._details.appNo] + '/' + item._details.typeCode
|
|
398
504
|
linkPush(path, {
|
|
@@ -474,7 +580,10 @@ export default {
|
|
|
474
580
|
},
|
|
475
581
|
// 获取数据字典加签备注
|
|
476
582
|
async getMdmDataDoc() {
|
|
477
|
-
const { code, data } = await axios.get(
|
|
583
|
+
const { code, data } = await axios.get(
|
|
584
|
+
`/bems/1.0/mdmDataDoc?t=${Math.random()}`,
|
|
585
|
+
{ typeCode: 'ADD_TASK_TAG' }
|
|
586
|
+
)
|
|
478
587
|
if (code === 200) {
|
|
479
588
|
this.remarkOpt = data || []
|
|
480
589
|
}
|
|
@@ -492,22 +601,15 @@ export default {
|
|
|
492
601
|
this.visibleP = false
|
|
493
602
|
},
|
|
494
603
|
async downFile(row) {
|
|
495
|
-
const blob = await axios.get(
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
aDom.click()
|
|
505
|
-
|
|
506
|
-
this.$nextTick(() => {
|
|
507
|
-
aDom = undefined
|
|
508
|
-
url && URL.revokeObjectURL(url)
|
|
509
|
-
})
|
|
510
|
-
}
|
|
604
|
+
const blob = await axios.get(
|
|
605
|
+
`/api/neams/eamsbaserecord/download/${row.beid}`,
|
|
606
|
+
null,
|
|
607
|
+
{
|
|
608
|
+
responseType: 'blob',
|
|
609
|
+
loading: false
|
|
610
|
+
}
|
|
611
|
+
)
|
|
612
|
+
this.$downloadBlob(blob, blob.name)
|
|
511
613
|
}
|
|
512
614
|
}
|
|
513
615
|
}
|
|
@@ -70,7 +70,16 @@ function getUserCert(uno) {
|
|
|
70
70
|
* 参数七：私钥是否可导出,”true”/”false”
|
|
71
71
|
* 参数八：是否启用增强密钥保护,”true”/”false”
|
|
72
72
|
*/
|
|
73
|
-
const res = IWSA_rsa_csp_genContainerP10(
|
|
73
|
+
const res = IWSA_rsa_csp_genContainerP10(
|
|
74
|
+
'true',
|
|
75
|
+
alg,
|
|
76
|
+
'',
|
|
77
|
+
'',
|
|
78
|
+
'',
|
|
79
|
+
'',
|
|
80
|
+
'false',
|
|
81
|
+
'false'
|
|
82
|
+
)
|
|
74
83
|
if (res[0] === '0') {
|
|
75
84
|
let dto = {
|
|
76
85
|
...data,
|