n20-common-lib 1.3.66 → 1.3.67
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
|
@@ -36,7 +36,23 @@
|
|
|
36
36
|
</div>
|
|
37
37
|
<span v-title></span>
|
|
38
38
|
<div ref="msgEl" class="activiti-msg">
|
|
39
|
-
<div>{{ assignee }}</div>
|
|
39
|
+
<div v-if="assignee">{{ assignee }}</div>
|
|
40
|
+
<div v-else-if="assigneeEnd">
|
|
41
|
+
<table cellspacing="0" class="m-t-ss m-b-ss" style="border-collapse: collapse; min-width: 460px">
|
|
42
|
+
<tr>
|
|
43
|
+
<td class="text-c">已审批人</td>
|
|
44
|
+
<td class="text-c">审批类型</td>
|
|
45
|
+
<td class="text-c">审批意见</td>
|
|
46
|
+
<td class="text-c">审批时间</td>
|
|
47
|
+
</tr>
|
|
48
|
+
<tr v-for="(item, i) in assigneeEnd" :key="i">
|
|
49
|
+
<td>{{ item.assignee }}</td>
|
|
50
|
+
<td class="text-c">{{ item.optResult }}</td>
|
|
51
|
+
<td>{{ item.suggestion }}</td>
|
|
52
|
+
<td>{{ item.endTime }}</td>
|
|
53
|
+
</tr>
|
|
54
|
+
</table>
|
|
55
|
+
</div>
|
|
40
56
|
</div>
|
|
41
57
|
</div>
|
|
42
58
|
</template>
|
|
@@ -60,7 +76,8 @@ export default {
|
|
|
60
76
|
this.svgW = undefined
|
|
61
77
|
this.svgC = undefined
|
|
62
78
|
return {
|
|
63
|
-
assignee:
|
|
79
|
+
assignee: undefined,
|
|
80
|
+
assigneeEnd: undefined,
|
|
64
81
|
min: 0.4,
|
|
65
82
|
max: 2,
|
|
66
83
|
step: 0.1,
|
|
@@ -206,11 +223,15 @@ export default {
|
|
|
206
223
|
task.addEventListener('mouseenter', () => {
|
|
207
224
|
if (type === 'pending') {
|
|
208
225
|
this.assignee = list
|
|
226
|
+
this.assigneeEnd = undefined
|
|
209
227
|
} else {
|
|
210
|
-
this.assignee =
|
|
228
|
+
this.assignee = undefined
|
|
229
|
+
this.assigneeEnd = list
|
|
211
230
|
}
|
|
212
231
|
this.$nextTick(() => {
|
|
213
|
-
|
|
232
|
+
setTimeout(() => {
|
|
233
|
+
tipShow(task, this.$refs['msgEl'])
|
|
234
|
+
}, 100)
|
|
214
235
|
})
|
|
215
236
|
})
|
|
216
237
|
task.addEventListener('mouseleave', () => {
|
|
@@ -350,6 +371,11 @@ setRejectLink(from, to) {
|
|
|
350
371
|
.n20-approval-img-por .activiti-msg {
|
|
351
372
|
display: none;
|
|
352
373
|
}
|
|
374
|
+
.activiti-msg th,
|
|
375
|
+
.activiti-msg td {
|
|
376
|
+
padding: 6px 8px;
|
|
377
|
+
border: 1px solid var(--border-color-light);
|
|
378
|
+
}
|
|
353
379
|
.activiti-svg-zoom {
|
|
354
380
|
position: absolute;
|
|
355
381
|
z-index: 9;
|
|
@@ -36,15 +36,21 @@ export default {
|
|
|
36
36
|
isEqual() {
|
|
37
37
|
if (this.value === this.oldValue) {
|
|
38
38
|
return true
|
|
39
|
-
}
|
|
39
|
+
}
|
|
40
|
+
if ((this.value === 0 || this.value === '0') && (this.oldValue === 0 || this.oldValue === '0')) {
|
|
41
|
+
return true
|
|
42
|
+
} else if (!this.value && !this.oldValue) {
|
|
43
|
+
return true
|
|
44
|
+
}
|
|
45
|
+
if (
|
|
40
46
|
Array.isArray(this.value) &&
|
|
41
47
|
Array.isArray(this.oldValue) &&
|
|
42
48
|
this.value.toString() === this.oldValue.toString()
|
|
43
49
|
) {
|
|
44
50
|
return true
|
|
45
|
-
} else {
|
|
46
|
-
return false
|
|
47
51
|
}
|
|
52
|
+
|
|
53
|
+
return false
|
|
48
54
|
},
|
|
49
55
|
tooltipContent() {
|
|
50
56
|
if (!this.tooltip) {
|
|
@@ -96,83 +96,98 @@
|
|
|
96
96
|
</div>
|
|
97
97
|
|
|
98
98
|
<el-table :data="tableData" :row-key="keys.rowKey" @selection-change="(selection) => (selectionList = selection)">
|
|
99
|
-
<slot name="selection-column"
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
99
|
+
<slot name="selection-column">
|
|
100
|
+
<el-table-column type="selection" width="50" align="center" />
|
|
101
|
+
</slot>
|
|
102
|
+
<template v-if="dataPorp.slotHeader">
|
|
103
|
+
<el-table-column
|
|
104
|
+
v-for="item in dataPorp.slotHeader"
|
|
105
|
+
:key="item.prop"
|
|
106
|
+
:label="item.label"
|
|
107
|
+
:prop="item.prop"
|
|
108
|
+
:align="item.align || 'center'"
|
|
109
|
+
:width="item.width || 'auto'"
|
|
110
|
+
:show-overflow-tooltip="item['show-overflow-tooltip']"
|
|
111
|
+
/>
|
|
112
|
+
</template>
|
|
113
|
+
<template v-else>
|
|
114
|
+
<el-table-column label="附件类型" min-width="160">
|
|
115
|
+
<template slot="header" slot-scope="scope">
|
|
116
|
+
<slot name="type-header" :column="scope.column">附件类型</slot>
|
|
117
|
+
</template>
|
|
118
|
+
<template slot-scope="{ row }">
|
|
119
|
+
<slot name="type" :row="row">
|
|
120
|
+
<el-select
|
|
121
|
+
v-model="row[keys.type]"
|
|
122
|
+
:disabled="row['_typeDisabled']"
|
|
123
|
+
placeholder="请选择"
|
|
124
|
+
style="width: 100%"
|
|
125
|
+
>
|
|
126
|
+
<el-option
|
|
127
|
+
v-for="item in typeOptions"
|
|
128
|
+
:key="item.type"
|
|
129
|
+
:disabled="item.disabled"
|
|
130
|
+
:value="item.type"
|
|
131
|
+
:label="item.label"
|
|
132
|
+
/>
|
|
133
|
+
</el-select>
|
|
134
|
+
</slot>
|
|
135
|
+
</template>
|
|
136
|
+
</el-table-column>
|
|
137
|
+
<el-table-column label="附件名称" min-width="160">
|
|
138
|
+
<template slot="header" slot-scope="scope">
|
|
139
|
+
<slot name="name-header" :column="scope.column">附件名称</slot>
|
|
140
|
+
</template>
|
|
141
|
+
<template slot-scope="{ row }">
|
|
142
|
+
<slot name="name" :row="row">
|
|
143
|
+
<el-input v-model="row[keys.name]" placeholder="请输入" />
|
|
144
|
+
</slot>
|
|
145
|
+
</template>
|
|
146
|
+
</el-table-column>
|
|
147
|
+
<el-table-column label="附件上传" min-width="160">
|
|
148
|
+
<template slot="header" slot-scope="scope">
|
|
149
|
+
<slot name="upload-header" :column="scope.column">附件上传</slot>
|
|
150
|
+
</template>
|
|
151
|
+
<template slot-scope="{ row, $index }">
|
|
152
|
+
<slot name="upload" :row="row" :$index="$index">
|
|
153
|
+
<clUpload
|
|
154
|
+
:ref="'upload' + $index"
|
|
155
|
+
class="n20-upload-table-up"
|
|
156
|
+
:file-name="row | fileName(keys.url)"
|
|
157
|
+
:data="row['_fileData'] || fileData"
|
|
158
|
+
:msg-type="null"
|
|
159
|
+
:show-clear="false"
|
|
160
|
+
:action="action"
|
|
161
|
+
:headers="headers"
|
|
162
|
+
:disabled="!row[keys.type]"
|
|
163
|
+
:accept="row[keys.type] | acceptFilter(typeOptions, fileAccept)"
|
|
164
|
+
:size="row[keys.type] | sizeFilter(typeOptions, fileSize)"
|
|
165
|
+
:http-request="uploadHttpRequest ? (options) => uploadHttpRequest(options, row) : undefined"
|
|
166
|
+
:before-upload="(file) => beforeUploadFn(file, row)"
|
|
167
|
+
:on-progress="(event) => onProgressFn(event, row)"
|
|
168
|
+
:on-success="(response, file, fileList) => onSuccessFn(response, file, fileList, row)"
|
|
169
|
+
:on-error="(err, file, fileList) => errorFn(err, file, fileList, row, $index)"
|
|
118
170
|
/>
|
|
119
|
-
</
|
|
120
|
-
</
|
|
121
|
-
</
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
<clUpload
|
|
140
|
-
:ref="'upload' + $index"
|
|
141
|
-
class="n20-upload-table-up"
|
|
142
|
-
:file-name="row | fileName(keys.url)"
|
|
143
|
-
:data="row['_fileData'] || fileData"
|
|
144
|
-
:msg-type="null"
|
|
145
|
-
:show-clear="false"
|
|
146
|
-
:action="action"
|
|
147
|
-
:headers="headers"
|
|
148
|
-
:disabled="!row[keys.type]"
|
|
149
|
-
:accept="row[keys.type] | acceptFilter(typeOptions, fileAccept)"
|
|
150
|
-
:size="row[keys.type] | sizeFilter(typeOptions, fileSize)"
|
|
151
|
-
:http-request="uploadHttpRequest ? (options) => uploadHttpRequest(options, row) : undefined"
|
|
152
|
-
:before-upload="(file) => beforeUploadFn(file, row)"
|
|
153
|
-
:on-progress="(event) => onProgressFn(event, row)"
|
|
154
|
-
:on-success="(response, file, fileList) => onSuccessFn(response, file, fileList, row)"
|
|
155
|
-
:on-error="(err, file, fileList) => errorFn(err, file, fileList, row, $index)"
|
|
156
|
-
/>
|
|
157
|
-
</slot>
|
|
158
|
-
</template>
|
|
159
|
-
</el-table-column>
|
|
160
|
-
<el-table-column label="上传时间" :prop="keys.time" width="170" align="left">
|
|
161
|
-
<template slot="header" slot-scope="scope">
|
|
162
|
-
<slot name="time-header" :column="scope.column">上传时间</slot>
|
|
163
|
-
</template>
|
|
164
|
-
<template slot-scope="{ row }">
|
|
165
|
-
<slot name="time" :row="row">{{ row[keys.time] }}</slot>
|
|
166
|
-
</template>
|
|
167
|
-
</el-table-column>
|
|
168
|
-
<el-table-column label="上传人" :prop="keys.user" width="100">
|
|
169
|
-
<template slot="header" slot-scope="scope">
|
|
170
|
-
<slot name="user-header" :column="scope.column">上传人</slot>
|
|
171
|
-
</template>
|
|
172
|
-
<template slot-scope="{ row }">
|
|
173
|
-
<slot name="user" :row="row">{{ row[keys.user] }}</slot>
|
|
174
|
-
</template>
|
|
175
|
-
</el-table-column>
|
|
171
|
+
</slot>
|
|
172
|
+
</template>
|
|
173
|
+
</el-table-column>
|
|
174
|
+
<el-table-column label="上传时间" :prop="keys.time" width="170" align="left">
|
|
175
|
+
<template slot="header" slot-scope="scope">
|
|
176
|
+
<slot name="time-header" :column="scope.column">上传时间</slot>
|
|
177
|
+
</template>
|
|
178
|
+
<template slot-scope="{ row }">
|
|
179
|
+
<slot name="time" :row="row">{{ row[keys.time] }}</slot>
|
|
180
|
+
</template>
|
|
181
|
+
</el-table-column>
|
|
182
|
+
<el-table-column label="上传人" :prop="keys.user" width="100">
|
|
183
|
+
<template slot="header" slot-scope="scope">
|
|
184
|
+
<slot name="user-header" :column="scope.column">上传人</slot>
|
|
185
|
+
</template>
|
|
186
|
+
<template slot-scope="{ row }">
|
|
187
|
+
<slot name="user" :row="row">{{ row[keys.user] }}</slot>
|
|
188
|
+
</template>
|
|
189
|
+
</el-table-column>
|
|
190
|
+
</template>
|
|
176
191
|
<el-table-column label="上传进度" width="220">
|
|
177
192
|
<template slot="header" slot-scope="scope">
|
|
178
193
|
<slot name="percent-header" :column="scope.column">上传进度</slot>
|