|
@@ -26,9 +26,15 @@
|
26
|
26
|
<text class="name ellipsis">延期处理:{{currentLogOverTime(data.currentLog)}}</text>
|
27
|
27
|
</view>
|
28
|
28
|
<view class="body_item_content_p">
|
29
|
|
- <text class="name" v-if="data.assigneeName">处理人:{{data.assigneeName}}</text>
|
30
|
|
- <text class="name" v-else-if="data.candidateGroupsName">处理组:{{data.candidateGroupsName}}</text>
|
31
|
|
- <text class="name" v-else></text>
|
|
29
|
+ <text class="name" v-if="data.assigneeName">
|
|
30
|
+ 处理人:{{data.assigneeName}}<template v-if="computedSynergetic(data.synergetic)">,{{computedSynergetic(data.synergetic)}}</template>
|
|
31
|
+ </text>
|
|
32
|
+ <text class="name" v-else-if="data.candidateGroupsName">
|
|
33
|
+ 处理组:{{data.candidateGroupsName}}<template v-if="computedSynergetic(data.synergetic)">,{{computedSynergetic(data.synergetic)}}</template>
|
|
34
|
+ </text>
|
|
35
|
+ <text class="name" v-else>
|
|
36
|
+ <template v-if="computedSynergetic(data.synergetic)">,{{computedSynergetic(data.synergetic)}}</template>
|
|
37
|
+ </text>
|
32
|
38
|
<view class="icon_all" @click.stop="attachmentClick(data)">
|
33
|
39
|
<uni-icons type="mic-filled" class="mic-filled" :size="22" color="#949494" v-if="data.callID"></uni-icons>
|
34
|
40
|
<uni-icons type="image-filled" class="image-filled" :size="22" color="#949494" v-if="data.reqAttachment"></uni-icons>
|
|
@@ -105,6 +111,11 @@
|
105
|
111
|
return data.state.value === 'pending' && (inUser || inGroup) && qiangdan.value;
|
106
|
112
|
})
|
107
|
113
|
|
|
114
|
+ // 转换协同人
|
|
115
|
+ const computedSynergetic = computed(() => (synergetic) => {
|
|
116
|
+ return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join(',') : ''
|
|
117
|
+ })
|
|
118
|
+
|
108
|
119
|
// 数据
|
109
|
120
|
const dataInfo = reactive({
|
110
|
121
|
tabs: [{id: 0, name: '全部', value: 'all', num: ''}],
|
|
@@ -282,7 +293,7 @@
|
282
|
293
|
if(dataInfo.evtFilter && dataInfo.evtFilter.category && dataInfo.evtFilter.category.id){
|
283
|
294
|
postData.incident.levelCategory = { id: dataInfo.evtFilter.category.id };
|
284
|
295
|
}
|
285
|
|
-
|
|
296
|
+
|
286
|
297
|
if(dataInfo.evtFilter && Array.isArray(dataInfo.evtFilter.acceptDate) && dataInfo.evtFilter.acceptDate.length){
|
287
|
298
|
postData.incident.acceptDate = format(startOfDay(new Date(dataInfo.evtFilter.acceptDate[0])), 'yyyy-MM-dd HH:mm:ss');
|
288
|
299
|
postData.incident.acceptDateEnd = format(endOfDay(dataInfo.evtFilter.acceptDate[1]), 'yyyy-MM-dd HH:mm:ss');
|
|
@@ -351,7 +362,7 @@
|
351
|
362
|
// 缓存的搜索条件
|
352
|
363
|
Object.assign(dataInfo, incidentListSearchStore.incidentListSearch.data);
|
353
|
364
|
}
|
354
|
|
-
|
|
365
|
+
|
355
|
366
|
for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
|
356
|
367
|
if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_assign") {
|
357
|
368
|
assignFlag.value = true;
|
|
@@ -362,11 +373,11 @@
|
362
|
373
|
}
|
363
|
374
|
getTabs();
|
364
|
375
|
}
|
365
|
|
-
|
|
376
|
+
|
366
|
377
|
onLoad((option) => {
|
367
|
378
|
onLoadFn();
|
368
|
379
|
})
|
369
|
|
-
|
|
380
|
+
|
370
|
381
|
onTabItemTap(e => {
|
371
|
382
|
onLoadFn();
|
372
|
383
|
})
|