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

packages/wxwork/AppMassNotification/components/Add.vue

@@ -74,7 +74,7 @@
           <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.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item>
             </ai-wrapper>
 
             <ai-wrapper v-for="item in data.fileList" :key="item.id">
@@ -170,6 +170,15 @@ export default {
     }
     this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("")
   },
+  filters: {
+    format(val) {
+      if(val == 1) {
+        return '居民'
+      } else if(val == 2) {
+        return '居民群'
+      }
+    }
+  },
   methods: {
     handleAreaSelect(v) {
       this.areaName = v?.[0]?.label