kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-06-27 08:55:21 +08:00
parent 3e466e01cb 47b681c99d
commit 54127cc668
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/wxwork/AppMassNotification/components/Add.vue
View File

@@ -37,7 +37,7 @@
</el-form-item>
<el-form-item label="标签选择" style="width: 100%" v-if="form.messageSource == 2">
<!-- <el-form-item label="标签选择" style="width: 100%" v-if="form.messageSource == 2">
<div class="tags" v-for="items in subTags" :key="items.id">
<div class="tag_title">{{ items.name }}</div>
<div class="tag_item">
@@ -46,7 +46,7 @@
</el-checkbox-group>
</div>
</div>
</el-form-item>
</el-form-item> -->
</el-form>
</template>
</ai-card>
@@ -93,8 +93,8 @@
<template #content>
<ai-wrapper>
<ai-info-item label="创建者" :value="data.userName" isLine></ai-info-item>
<ai-info-item label="发送类型" :value="data.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item>
<ai-info-item label="发送时间" :value="data.sendTime" isLine v-if="data.messageSource == 1"></ai-info-item>
<!-- <ai-info-item label="发送类型" :value="data.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item> -->
<!-- <ai-info-item label="发送时间" :value="data.sendTime" isLine v-if="data.messageSource == 1"></ai-info-item> -->
</ai-wrapper>
<ai-wrapper v-for="item in data.fileList" :key="item.id">

2
packages/wxwork/AppMassNotification/components/List.vue
View File

@@ -78,7 +78,7 @@ export default {
}
return [
// { prop: "fileList", label: '消息类型', align: "center", width: "250px", formart: v => v?.map(e=> conType[e.contentType]).toString() },
{ prop: "fileList", label: '消息类容', align: "center", width: "250px", formart: v => v?.filter(e=> e.contentType == 'text')[0].content },
{ prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e=> e.contentType == 'text')[0].content },
// { prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e => e.contentType == 'text')[0].content},
// { slot: 'type' },
{ prop: "messageSource", label: '消息类型', align: "center", formart: v => v==1? '居民': '居民群'},