fix

2022-08-19 09:00:10 +08:00
parent 583b210687
commit 79bfd71a8e
21 changed files with 1231 additions and 532 deletions
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
@@ -120,10 +120,10 @@ export default {
      this.getDetail()
      this.getIntegralChange()
      this.getEventSummary()
-      let timeSta = dayjs().format('YYYY-MM-DD')
-      let timeEnd = dayjs().subtract(29, 'day').format('YYYY-MM-DD')
-      this.startPla = timeSta
-      this.endPla = timeEnd
+      let nowTime = dayjs().format('YYYY-MM-DD')
+      let timeAgo = dayjs().subtract(29, 'day').format('YYYY-MM-DD')
+      this.startPla = timeAgo
+      this.endPla = nowTime
    })
    
  },
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -18,7 +18,7 @@
            </ai-download>
          </template>
        </ai-search-bar>
-        <ai-table :tableData="tableData" :total="page.total" :current.sync="current" :size.sync="page.size"
+        <ai-table :tableData="tableData" :total="total" :current.sync="current" :size.sync="size"
                  @getList="getTableData()" :col-configs="colConfigs" :dict="dict" @sort-change="changeTableSort">

          
@@ -90,7 +90,8 @@ export default {
      },
      girdIdList: [],
      tableData: [],
-      page: {size: 10, total: 0},
+      size: 10, 
+      total: 0,
      current: 1,
      girdList: [],
      form: {
@@ -144,14 +145,15 @@ export default {
    getTableData() {
      this.instance.post(`/app/appintegraluser/integralManager`,null,{
        params: {
-          ...this.page,
          ...this.search,
          current: this.current,
+          size: this.size,
+          total: this.total
        }
      }).then(res => {
        if(res?.data) {
          this.tableData = res.data.records
-          this.page.total = res.data.total
+          this.total = res.data.total
        }
      })
    },
--- a/packages/meta/AppResident/AppResident.vue
+++ b/packages/meta/AppResident/AppResident.vue
@@ -1,8 +1,7 @@
 <template>
  <section class="AppResident">
    <ai-list v-if="!showDetail" isTabs>
-      <ai-title slot="title" title="居民档案" :instance="instance" :hideLevel="hideLevel-1" isShowArea
-                v-model="areaId"/>
+      <ai-title slot="title" title="居民档案" :instance="instance" :hideLevel="hideLevel-1" :isShowArea="permissions('app_datastatistics')" v-model="areaId"/>
      <template #tabs>
        <el-tabs v-model="activeName">
          <el-tab-pane v-for="op in tabs" :key="op.value" :name="op.value" :label="op.label">
@@ -67,14 +66,14 @@ export default {
          comp: ResidentList,
          detail: ResidentDetail
        })),
-        {label: "居民统计", value: "3", comp: ResidentSta},
+        {label: "居民统计", value: "3", comp: ResidentSta, permit: "app_datastatistics"},
        {label: "居民档案审核", value: "4", comp: auditList, detail: auditDetail, permit: "app_appresident_examine"}
      ].filter(e => !e.permit || this.permissions(e.permit))
    }
  },
  created() {
    this.activeName = this.$route.query?.type
-    this.areaId = this.$copy(this.user.info.areaId)
+    this.areaId = this.permissions("app_datastatistics") ? this.$copy(this.user.info.areaId) : ""
    this.dict.load('residentType', "sex", "faithType", "fileStatus", "legality", "education", "maritalStatus",
        "politicsStatus", "householdName", "nation", "liveReason", "certificateType", "job", "militaryStatus",
        "householdRelation", "logoutReason", "nation", "registerStatus", "residentTipType", "liveCategory",
--- a/packages/publicity/AppVillageIntroduction/AppVillageIntroduction.vue
+++ b/packages/publicity/AppVillageIntroduction/AppVillageIntroduction.vue
@@ -1,73 +1,71 @@
 <template>
  <div class="doc-circulation ailist-wrapper">
    <keep-alive :include="['List']">
-      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+      <component ref="component" :is="component" @change="onChange" :params="params" v-bind="$props"/>
    </keep-alive>
  </div>
 </template>

 <script>
-  import List from './components/List'
-  import Add from './components/Add'
-  import Detail from './components/Detail'
+import List from './components/List'
+import Add from './components/Add'
+import Detail from './components/Detail'

-  export default {
-    name: 'AppVillageIntroduction',
-    label: '本村简介',
+export default {
+  name: 'AppVillageIntroduction',
+  label: '本村简介',
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: {default: "本村简介"}
+  },
+  data() {
+    return {
+      component: 'List',
+      params: {},
+      include: []
+    }
+  },
+  components: {
+    Add,
+    List,
+    Detail
+  },

-    props: {
-      instance: Function,
-      dict: Object
-    },
+  mounted() {
+  },

-    data () {
-      return {
-        component: 'List',
-        params: {},
-        include: []
+  methods: {
+    onChange(data) {
+      if (data.type === 'Add') {
+        this.component = 'Add'
+        this.params = data.params
      }
-    },

-    components: {
-      Add,
-      List,
-      Detail
-    },
+      if (data.type === 'Detail') {
+        this.component = 'Detail'
+        this.params = data.params
+      }

-    mounted () {
-    },
+      if (data.type === 'list') {
+        this.component = 'List'
+        this.params = data.params

-    methods: {
-      onChange (data) {
-        if (data.type === 'Add') {
-          this.component = 'Add'
-          this.params = data.params
-        }
-
-        if (data.type === 'Detail') {
-          this.component = 'Detail'
-          this.params = data.params
-        }
-
-        if (data.type === 'list') {
-          this.component = 'List'
-          this.params = data.params
-
-          this.$nextTick(() => {
-            if (data.isRefresh) {
-              this.$refs.component.getList()
-            }
-          })
-        }
+        this.$nextTick(() => {
+          if (data.isRefresh) {
+            this.$refs.component.getList()
+          }
+        })
      }
    }
  }
+}
 </script>

 <style lang="scss">
-  .doc-circulation {
-    height: 100%;
-    background: #F3F6F9;
-    overflow: auto;
-  }
+.doc-circulation {
+  height: 100%;
+  background: #F3F6F9;
+  overflow: auto;
+}
 </style>
--- a/packages/publicity/AppVillageIntroduction/components/Add.vue
+++ b/packages/publicity/AppVillageIntroduction/components/Add.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-detail>
    <template slot="title">
-      <ai-title :title="params.id ? '编辑本村简介' : '添加本村简介'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
      </ai-title>
    </template>
    <template slot="content">
@@ -19,12 +19,12 @@
            </el-form-item>
            <el-form-item label="缩略图" prop="thumbUrl">
              <ai-uploader
-                :instance="instance"
-                isShowTip
-                v-model="form.thumbUrl"
-                :limit="1"
-                :cropOps="cropOps"
-                is-crop>
+                  :instance="instance"
+                  isShowTip
+                  v-model="form.thumbUrl"
+                  :limit="1"
+                  :cropOps="cropOps"
+                  is-crop>
                <template slot="tips">
                  <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
                  <p>图片比例：1.6：1</p>
@@ -43,89 +43,91 @@
 </template>

 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'Add',
+import {mapState} from 'vuex'

-    props: {
-      instance: Function,
-      dict: Object,
-      params: Object
-    },
+export default {
+  name: 'Add',

-    data () {
-      return {
-        info: {},
-        form: {
-          title: '',
-          content: '',
-          areaId: '',
-          createUnitName: '',
-          createUserName: '',
-          status: '',
-          thumbUrl: []
-        },
-        cropOps: {
-          width: "336px",
-          height: "210px"
-        },
-        id: ''
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object,
+    params: Object,
+    menuName: String
+  },

-    computed: {
-      ...mapState(['user'])
-    },
-
-    created () {
-      this.form.areaId = this.user.info.areaId
-      this.disabledLevel = this.user.info.areaList.length
-      if (this.params && this.params.id) {
-        this.id = this.params.id
-        this.getInfo(this.params.id)
-      }
-    },
-
-    methods: {
-      getInfo (id) {
-        this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form = res.data
-            this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
-          }
-        })
+  data() {
+    return {
+      info: {},
+      form: {
+        title: '',
+        content: '',
+        areaId: '',
+        createUnitName: '',
+        createUserName: '',
+        status: '',
+        thumbUrl: []
      },
-
-      confirm () {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
-              ...this.form,
-              type: 0,
-              createUserName: this.user.info.name,
-              thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
-                url: this.form.thumbUrl[0].url
-              }]) : ''
-            }).then(res => {
-              if (res.code == 0) {
-                this.$message.success('提交成功')
-                setTimeout(() => {
-                  this.cancel(true)
-                }, 600)
-              }
-            })
-          }
-        })
+      cropOps: {
+        width: "336px",
+        height: "210px"
      },
+      id: ''
+    }
+  },

-      cancel (isRefresh) {
-        this.$emit('change', {
-          type: 'list',
-          isRefresh: !!isRefresh
-        })
-      }
+  computed: {
+    ...mapState(['user']),
+    pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
+  },
+  created() {
+    this.form.areaId = this.user.info.areaId
+    this.disabledLevel = this.user.info.areaList.length
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+      this.getInfo(this.params.id)
+    }
+  },
+
+  methods: {
+    getInfo(id) {
+      this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = res.data
+          this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+        }
+      })
+    },
+
+    confirm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
+            ...this.form,
+            type: 0,
+            createUserName: this.user.info.name,
+            thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
+              url: this.form.thumbUrl[0].url
+            }]) : ''
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('提交成功')
+              setTimeout(() => {
+                this.cancel(true)
+              }, 600)
+            }
+          })
+        }
+      })
+    },
+
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'list',
+        isRefresh: !!isRefresh
+      })
    }
  }
+}
 </script>

 <style scoped lang="scss">
--- a/packages/publicity/AppVillageIntroduction/components/List.vue
+++ b/packages/publicity/AppVillageIntroduction/components/List.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-list class="notice">
    <template slot="title">
-      <ai-title title="本村简介" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
+      <ai-title :title="menuName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
    </template>
    <template slot="content">
      <ai-search-bar class="search-bar">
@@ -57,9 +57,9 @@

    props: {
      instance: Function,
-      dict: Object
+      dict: Object,
+      menuName:String
    },
-
    data() {
      return {
        search: {
--- a/packages/publicity/AppVillageRegulations/AppVillageRegulations.vue
+++ b/packages/publicity/AppVillageRegulations/AppVillageRegulations.vue
@@ -1,73 +1,74 @@
 <template>
  <div class="doc-circulation ailist-wrapper">
    <keep-alive :include="['List']">
-      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+      <component ref="component" :is="component" @change="onChange" :params="params" v-bind="$props"/>
    </keep-alive>
  </div>
 </template>

 <script>
-  import List from './components/List'
-  import Add from './components/Add'
-  import Detail from './components/Detail'
+import List from './components/List'
+import Add from './components/Add'
+import Detail from './components/Detail'

-  export default {
-    name: 'AppVillageRegulations',
-    label: '村规民约',
+export default {
+  name: 'AppVillageRegulations',
+  label: '村规民约',

-    props: {
-      instance: Function,
-      dict: Object
-    },
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: {default: "村规民约"}
+  },

-    data () {
-      return {
-        component: 'List',
-        params: {},
-        include: []
+  data() {
+    return {
+      component: 'List',
+      params: {},
+      include: []
+    }
+  },
+
+  components: {
+    Add,
+    List,
+    Detail
+  },
+
+  mounted() {
+  },
+
+  methods: {
+    onChange(data) {
+      if (data.type === 'Add') {
+        this.component = 'Add'
+        this.params = data.params
      }
-    },

-    components: {
-      Add,
-      List,
-      Detail
-    },
+      if (data.type === 'Detail') {
+        this.component = 'Detail'
+        this.params = data.params
+      }

-    mounted () {
-    },
+      if (data.type === 'list') {
+        this.component = 'List'
+        this.params = data.params

-    methods: {
-      onChange (data) {
-        if (data.type === 'Add') {
-          this.component = 'Add'
-          this.params = data.params
-        }
-
-        if (data.type === 'Detail') {
-          this.component = 'Detail'
-          this.params = data.params
-        }
-
-        if (data.type === 'list') {
-          this.component = 'List'
-          this.params = data.params
-
-          this.$nextTick(() => {
-            if (data.isRefresh) {
-              this.$refs.component.getList()
-            }
-          })
-        }
+        this.$nextTick(() => {
+          if (data.isRefresh) {
+            this.$refs.component.getList()
+          }
+        })
      }
    }
  }
+}
 </script>

 <style lang="scss">
-  .doc-circulation {
-    height: 100%;
-    background: #F3F6F9;
-    overflow: auto;
-  }
+.doc-circulation {
+  height: 100%;
+  background: #F3F6F9;
+  overflow: auto;
+}
 </style>
--- a/packages/publicity/AppVillageRegulations/components/Add.vue
+++ b/packages/publicity/AppVillageRegulations/components/Add.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-detail>
    <template slot="title">
-      <ai-title :title="params.id ? '编辑村规民约' : '添加村规民约'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
      </ai-title>
    </template>
    <template slot="content">
@@ -50,7 +50,8 @@
    props: {
      instance: Function,
      dict: Object,
-      params: Object
+      params: Object,
+      menuName: String
    },

    data () {
@@ -74,7 +75,8 @@
    },

    computed: {
-      ...mapState(['user'])
+      ...mapState(['user']),
+      pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
    },

    created () {
--- a/packages/publicity/AppVillageRegulations/components/List.vue
+++ b/packages/publicity/AppVillageRegulations/components/List.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-list class="notice">
    <template slot="title">
-      <ai-title title="村规民约" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
+      <ai-title :title="menuName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
    </template>
    <template slot="content">
      <ai-search-bar class="search-bar">
@@ -10,25 +10,25 @@
        </template>
        <template #right>
          <el-input
-            v-model="search.title"
-            class="search-input"
-            size="small"
-            v-throttle="() => {search.current=1,getList()}"
-            placeholder="请输入标题"
-            clearable
-            @clear="search.current = 1, search.title = '', getList()"
-            suffix-icon="iconfont iconSearch">
+              v-model="search.title"
+              class="search-input"
+              size="small"
+              v-throttle="() => {search.current=1,getList()}"
+              placeholder="请输入标题"
+              clearable
+              @clear="search.current = 1, search.title = '', getList()"
+              suffix-icon="iconfont iconSearch">
          </el-input>
        </template>
      </ai-search-bar>
      <ai-table
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="total"
-        style="margin-top: 6px;"
-        :current.sync="search.current"
-        :size.sync="search.size"
-        @getList="getList">
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          style="margin-top: 6px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
        <el-table-column slot="tags" label="标签">
          <template slot-scope="{ row }">
            <div class="table-tags">
@@ -51,101 +51,103 @@
 </template>

 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'List',
+import {mapState} from 'vuex'

-    props: {
-      instance: Function,
-      dict: Object
+export default {
+  name: 'List',
+
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: String
+  },
+
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        title: '',
+        areaId: ''
+      },
+      currIndex: -1,
+      areaList: [],
+      total: 10,
+      colConfigs: [
+        {prop: 'title', label: '标题', align: 'left', width: '200px'},
+        {prop: 'areaName', label: '地区', align: 'center'},
+        {prop: 'status', label: '发布状态', align: 'center', formart: v => v === '1' ? '已发布' : '未发布'},
+        {prop: 'createUserName', label: '发布人', align: 'center'},
+        {prop: 'createDate', label: '发布时间', align: 'center'},
+        {slot: 'options', label: '操作', align: 'center'}
+      ],
+      areaName: '',
+      unitName: '',
+      tableData: []
+    }
+  },
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  mounted() {
+    this.search.areaId = this.user.info.areaId
+    this.getList()
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appcountrysidetourism/list`, null, {
+        params: {
+          type: 4,
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
    },

-    data() {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          title: '',
-          areaId: ''
-        },
-        currIndex: -1,
-        areaList: [],
-        total: 10,
-        colConfigs: [
-          { prop: 'title',  label: '标题', align: 'left', width: '200px' },
-          { prop: 'areaName', label: '地区', align: 'center' },
-          { prop: 'status', label: '发布状态', align: 'center', formart: v => v === '1' ? '已发布' : '未发布' },
-          { prop: 'createUserName', label: '发布人', align: 'center' },
-          { prop: 'createDate', label: '发布时间', align: 'center' },
-          { slot: 'options', label: '操作', align: 'center' }
-        ],
-        areaName: '',
-        unitName: '',
-        tableData: []
-      }
-    },
-
-    computed: {
-      ...mapState(['user'])
-    },
-
-    mounted() {
-      this.search.areaId = this.user.info.areaId
-      this.getList()
-    },
-
-    methods: {
-      getList() {
-        this.instance.post(`/app/appcountrysidetourism/list`, null, {
-          params: {
-            type: 4,
-            ...this.search
+    changeStatus(item) {
+      let title = item.status == '1' ? '是否要取消发布?' : '是否要发布?';
+      this.$confirm(title, {type: 'warning'}).then(() => {
+        item.status = item.status == '1' ? '0' : '1'
+        this.instance.post('/app/appcountrysidetourism/addOrUpdate', item).then(res => {
+          if (res && res.code == 0) {
+            title == '是否要发布?' ? this.$message.success('发布成功') : this.$message.success('取消发布成功')
+            this.getList()
          }
-        }).then(res => {
+        })
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appcountrysidetourism/delete?ids=${id}`).then(res => {
          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
+            this.$message.success('删除成功！')
+            this.getList()
          }
        })
-      },
+      })
+    },

-      changeStatus (item) {
-        let title = item.status == '1' ? '是否要取消发布?' : '是否要发布?';
-        this.$confirm(title, {type: 'warning'}).then(() => {
-          item.status = item.status == '1' ? '0' : '1'
-          this.instance.post('/app/appcountrysidetourism/addOrUpdate', item).then(res => {
-            if (res && res.code == 0) {
-              title == '是否要发布?' ? this.$message.success('发布成功') : this.$message.success('取消发布成功')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appcountrysidetourism/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toAdd(id) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            id: id || ''
-          }
-        })
-      }
+    toAdd(id) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          id: id || ''
+        }
+      })
    }
  }
+}
 </script>

 <style lang="scss" scoped>
-  .notice {
-  }
+.notice {
+}
 </style>
--- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
@@ -34,12 +34,7 @@
                    <div class="AppAnnounceDetail-select">
                      <el-input size="small" class="AppAnnounceDetail-select__input" placeholder="请选择..." disabled v-model="form.wxGroupsName"></el-input>
                      <div class="select-left" v-if="form.wxGroups.length">
-                        <span v-for="(item, index) in form.wxGroups" :key="index" v-if="index < 9">
-                          <ai-open-data
-                            type="userName"
-                            :openid="item.groupOwnerId">
-                            </ai-open-data>
-                        </span>
+                        <span v-for="(item, index) in form.wxGroups" :key="index" v-if="index < 9">{{ item.groupOwnerName }}</span>
                        <em v-if="form.wxGroups.length > 9">等{{ form.wxGroups.length }}个</em>
                      </div>
                      <i v-if="!form.wxGroups.length">请选择</i>
@@ -150,18 +145,16 @@
                  </el-switch>
                </el-form-item>
                <el-form-item v-if="form.enableExamine === '1'" label="审批人员" prop="examines" style="width: 100%;" :rules="[{ required: true, message: '请选择审批人员', trigger: 'change' }]">
-                  <ai-user-get :instance="instance" v-model="form.examines" @change="onUserChange">
+                  <ai-wechat-selecter :instance="instance" v-model="form.examines" @change="onUserChange">
                    <div class="AppAnnounceDetail-select">
                      <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName"></el-input>
                      <div class="select-left" v-if="form.examines.length">
-                        <span v-for="(item, index) in form.examines" :key="index">
-                          <ai-open-data type="userName" :openid="item.wxOpenUserId"></ai-open-data>
-                        </span>
+                        <span v-for="(item, index) in form.examines" :key="index">{{ item.name }}</span>
                      </div>
                      <i v-if="!form.examines.length">请选择</i>
                        <div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
                    </div>
-                  </ai-user-get>
+                  </ai-wechat-selecter>
                </el-form-item>
              </div>
            </template>
@@ -249,21 +242,21 @@
          </el-form>
        </ai-dialog>
        <ai-dialog
-            :visible.sync="isShowDate"
-            width="590px"
-            title="定时发送"
-            customFooter>
+          :visible.sync="isShowDate"
+          width="590px"
+          title="定时发送"
+          customFooter>
          <el-form ref="dateForm" :model="dateForm" label-width="130px" label-position="right">
            <div class="ai-form">
              <el-form-item label="定时发送时间" style="width: 100%;" prop="choiceTime" :rules="[{ required: true, message: '请选择定时发送时间', trigger: 'change' }]">
                <el-date-picker
-                    style="width: 100%;"
-                    v-model="dateForm.choiceTime"
-                    type="datetime"
-                    size="small"
-                    :picker-options="pickerOptions"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="请选择定时发送时间">
+                  style="width: 100%;"
+                  v-model="dateForm.choiceTime"
+                  type="datetime"
+                  size="small"
+                  :picker-options="pickerOptions"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择定时发送时间">
                </el-date-picker>
              </el-form-item>
            </div>
@@ -639,7 +632,8 @@ export default {
            examines: this.form.examines.length ? this.form.examines.map(v => {
              return {
                ...v,
-                examineUserId: v.id
+                examineUserId: v.id,
+                examineUserName: v.name
              }
            }) : []
          }).then(res => {
--- a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
@@ -25,15 +25,15 @@
            <ai-info-item label="创建人" isLine>
              <div class="user">
                <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                <span><ai-open-data type="userName" :openid="info.createUserId"></ai-open-data></span>
-                （<span><ai-open-data type="departmentName" :openid="info.createUserDept"></ai-open-data></span>）
+                <span>{{ info.createUserName }}</span>
+                （<span>{{ info.createUserDeptName }}</span>）
              </div>
            </ai-info-item>
            <ai-info-item label="审批人" isLine v-if="info.enableExamine === '1'">
              <div class="user-wrapper">
                <div class="user" v-for="(item, index) in info.examines" :key="index">
                  <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                  <span><ai-open-data type="userName" :openid="item.examineUserId"></ai-open-data></span>
+                  <span>{{ item.examineUserName }}</span>
                </div>
              </div>
            </ai-info-item>
@@ -121,7 +121,7 @@
                    :instance="instance"
                    @pick="e => onUserChange(e, 'search1')" :multiple="false" v-model="user1">
                    <div class="userSelcet">
-                      <span style="color: #606266;" v-if="search1.deptartId"><ai-open-data type="departmentName" :openid="search1.deptartId"></ai-open-data></span>
+                      <span style="color: #606266;" v-if="search1.deptartId">{{ name1 }}</span>
                      <span v-else>部门</span>
                      <i class="el-icon-arrow-up"  v-if="!search1.deptartId"></i>
                      <i class="el-icon-circle-close" v-if="search1.deptartId" @click.stop="user1 = [], search1.deptartId = '', search1.current = 1, getMemberInfo()"></i>
@@ -142,12 +142,8 @@
                <el-table-column slot="user" label="成员" align="left">
                  <template slot-scope="{ row }">
                    <div class="userinfo">
-                      <span>
-                        <ai-open-data type="userName" :openid="row.groupOwnerId"></ai-open-data>
-                      </span>
-                      <span style="color: #999">
-                        <ai-open-data type="departmentName" :openid="row.mainDepartment"></ai-open-data>
-                      </span>
+                      <span>{{ row.groupOwnerName }}</span>
+                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
                    </div>
                  </template>
                </el-table-column>
@@ -195,7 +191,7 @@
                    :instance="instance"
                    @pick="e => onUserChange(e, 'search2')" :multiple="false" v-model="user2">
                    <div class="userSelcet">
-                      <span style="color: #606266;" v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
+                      <span style="color: #606266;" v-if="search2.deptartId">{{ name2 }}</span>
                      <span v-else>部门</span>
                      <i class="el-icon-arrow-up"  v-if="!search2.deptartId"></i>
                      <i class="el-icon-circle-close" v-if="search2.deptartId" @click.stop="user1 = [], search2.deptartId = '', search2.current = 1, getGroupInfo()"></i>
@@ -216,12 +212,8 @@
                <el-table-column slot="user" label="群主" align="center">
                  <template slot-scope="{ row }">
                    <div class="userinfo">
-                      <span>
-                        <ai-open-data type="userName" :openid="row.groupOwnerId"></ai-open-data>
-                      </span>
-                      <span style="color: #999">
-                        <ai-open-data type="departmentName" :openid="row.mainDepartment"></ai-open-data>
-                      </span>
+                      <span>{{ row.groupOwnerName }}</span>
+                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
                    </div>
                  </template>
                </el-table-column>
@@ -276,6 +268,8 @@
        total2: 0,
        user1: [],
        user2: [],
+        name1: '',
+        name2: '',
        radio1: '未执行',
        search1: {
          current: 1,
@@ -300,11 +294,11 @@
        content: '',
        currIndex: 0,
        colConfigs3: [
-          { prop: 'groupOwnerId', label: '群主', openType: 'userName' },
+          { prop: 'groupOwnerName', label: '群主' },
          { prop: 'groupNames', label: '群名称' }
        ],
        colConfigs1: [
-          { slot: 'user', label: '成员', openType: 'userName' },
+          { slot: 'user', label: '成员' },
          { prop: 'groupCount', label: '预计送达居民群', align: 'center' }
        ],
        colConfigs2: [
@@ -352,9 +346,11 @@

      onUserChange (e, search) {
        if (e.length) {
+          search === 'search1' ? this.name1 = e[0].name : this.name2 = e[0].name
          this[search].deptartId = e[0].id
        } else {
          this[search].deptartId = ''
+          search === 'search1' ? this.name1 = '' : this.name2 = ''
        }

        this[search].current = 1
--- a/packages/wxwork/Announce/AppAnnounce/components/List.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/List.vue
@@ -33,14 +33,14 @@
            @change="search.current = 1, getList()"
            placeholder="选择群发结束日期">
          </el-date-picker>
-          <ai-user-get :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+          <ai-wechat-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
            <div class="userSelcet">
-              <span style="color: #606266;" v-if="search.createUserId"><ai-open-data type="userName" :openid="search.createUserId"></ai-open-data></span>
+              <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
              <span v-else>创建人</span>
              <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
-              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', search.current = 1, getList()"></i>
+              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
            </div>
-          </ai-user-get>
+          </ai-wechat-selecter>
        </template>
        <template slot="right">
          <el-input
@@ -66,12 +66,8 @@
        <el-table-column slot="user" width="140px" label="创建人" align="center">
          <template slot-scope="{ row }">
            <div class="userinfo">
-              <span>
-                <ai-open-data type="userName" :openid="row.createUserId"></ai-open-data>
-              </span>
-              <span style="color: #999">
-                <ai-open-data type="departmentName" :openid="row.createUserDept"></ai-open-data>
-              </span>
+              <span>{{ row.createUserName }}</span>
+              <span style="color: #999">{{ row.createUserDeptName }}</span>
            </div>
          </template>
        </el-table-column>
@@ -110,6 +106,7 @@
          startTime: '',
          endTime: ''
        },
+        name: '',
        user: [],
        tableData: [],
        loading: false,
@@ -145,9 +142,11 @@
    methods: {
      onUserChange (e) {
        if (e.length) {
-          this.search.createUserId = e[0].wxOpenUserId
+          this.name = e[0].name
+          this.search.createUserId = e[0].id
        } else {
          this.search.createUserId = ''
+          this.name = ''
        }

        this.search.current = 1