From cebe4ce80fdd9c7134547161b8ec2cee1e930e6c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 13 Jul 2022 08:34:41 +0800
Subject: [PATCH 1/2] bug

---
 project/xiushan/apps/creditReport/AppCreditReport/home.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/xiushan/apps/creditReport/AppCreditReport/home.vue b/project/xiushan/apps/creditReport/AppCreditReport/home.vue
index ae7b3aac..e84a8dc6 100644
--- a/project/xiushan/apps/creditReport/AppCreditReport/home.vue
+++ b/project/xiushan/apps/creditReport/AppCreditReport/home.vue
@@ -108,6 +108,7 @@ export default {
 
 <style lang="scss" scoped>
 .home {
+  height: 100%;
   ::v-deep .el-input-group__prepend {
     width: 100px;
   }

From fb8ea2a195b27b259db5b47d85e555df3ee269a1 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 13 Jul 2022 09:13:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/Announce/AppAnnounce/AppAnnounce.vue |  69 ++
 .../Announce/AppAnnounce/components/Add.vue   | 196 ++++
 .../AppAnnounce/components/Detail.vue         | 196 ++++
 .../Announce/AppAnnounce/components/List.vue  | 991 ++++++++++++++++++
 .../AppAnnounceStatistics.vue                 |  29 +
 5 files changed, 1481 insertions(+)
 create mode 100644 project/sass/apps/Announce/AppAnnounce/AppAnnounce.vue
 create mode 100644 project/sass/apps/Announce/AppAnnounce/components/Add.vue
 create mode 100644 project/sass/apps/Announce/AppAnnounce/components/Detail.vue
 create mode 100644 project/sass/apps/Announce/AppAnnounce/components/List.vue
 create mode 100644 project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue

diff --git a/project/sass/apps/Announce/AppAnnounce/AppAnnounce.vue b/project/sass/apps/Announce/AppAnnounce/AppAnnounce.vue
new file mode 100644
index 00000000..aef4e713
--- /dev/null
+++ b/project/sass/apps/Announce/AppAnnounce/AppAnnounce.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="AppAnnounce">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List'
+  import Add from './components/Add'
+  import Detail from './components/Detail'
+
+  export default {
+    name: 'AppAnnounce',
+    label: '群发居民群',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    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
+        }
+
+        if (data.type === 'list') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .AppAnnounce {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/project/sass/apps/Announce/AppAnnounce/components/Add.vue b/project/sass/apps/Announce/AppAnnounce/components/Add.vue
new file mode 100644
index 00000000..d13bd75a
--- /dev/null
+++ b/project/sass/apps/Announce/AppAnnounce/components/Add.vue
@@ -0,0 +1,196 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title :title="id ? '编辑成员' : '添加成员'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <el-form ref="form" :model="form" label-width="110px" label-position="right">
+      <ai-card title="个人信息">
+        <template #content>
+          <div class="ai-form">
+            <el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
+              <el-input size="small" placeholder="请输入姓名" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="账号" prop="id" :rules="[{ required: true, message: '请输入账号', trigger: 'blur' }]">
+              <el-input size="small" :disabled="!!id" placeholder="成员唯一标识，设定以后不支持修改" v-model="form.id"></el-input>
+            </el-form-item>
+            <el-form-item label="手机号" prop="mobile" :rules="[{ required: true, validator: validatorPhone, trigger: 'blur' }]">
+              <el-input size="small" placeholder="请输入手机号" v-model="form.mobile"></el-input>
+            </el-form-item>
+            <el-form-item label="性别" prop="gender">
+              <el-radio-group v-model="form.gender">
+                <el-radio label="1">男</el-radio>
+                <el-radio label="2">女</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="座机" prop="telephone">
+              <el-input size="small" placeholder="请输入座机" v-model="form.telephone"></el-input>
+            </el-form-item>
+            <el-form-item label="邮箱" prop="email">
+              <el-input size="small" placeholder="请输入邮箱" v-model="form.email"></el-input>
+            </el-form-item>
+            <el-form-item label="地址" style="width: 100%;" prop="address">
+              <el-input size="small" style="width: 100%;" placeholder="请输入地址" v-model="form.address"></el-input>
+            </el-form-item>
+          </div>
+        </template>
+      </ai-card>
+      <ai-card title="组织信息">
+        <template #content>
+          <el-form-item label="部门" prop="departmentName" style="width: 100%;" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
+            <el-input size="small" placeholder="请选择..." disabled v-model="form.departmentName">
+              <ai-user-get slot="append" isStrictly :instance="instance" @change="onChange" v-model="department" isChooseUnit>
+                <el-button type="info">选择</el-button>
+              </ai-user-get>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="标签" style="width: 100%;" prop="tags">
+            <el-select size="small" v-model="form.tagIds" multiple placeholder="请选择标签">
+              <el-option
+                v-for="item in tagsList"
+                :key="item.id"
+                :label="item.tagname"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="职务" prop="position">
+            <el-input size="small" placeholder="请输入职务" v-model="form.position"></el-input>
+          </el-form-item>
+        </template>
+      </ai-card>
+      </el-form>
+    </template>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="confirm">提交</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Add',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      const validatorPhone = function (rule, value, callback) {
+        if (value === '') {
+          callback(new Error('请输入手机号'))
+        } else if (!/^1\d{10}$/.test(value)) {
+          callback(new Error('手机号格式错误'))
+        } else {
+          callback()
+        }
+      }
+      return {
+        info: {},
+        department: [],
+        validatorPhone: validatorPhone,
+        form: {
+          position: '',
+          name: '',
+          email: '',
+          telephone: '',
+          gender: '',
+          mobile: '',
+          departmentName: '',
+          departmentIds: [],
+          tagIds: [],
+          id: ''
+        },
+        id: '',
+        tagsList: []
+      }
+    },
+
+    created () {
+      this.getTags()
+
+      if (this.params && this.params.departmentId && !this.params.id) {
+        this.department = [{
+          id: String(this.params.departmentId),
+          name: this.params.departmentName
+        }]
+        this.form.departmentIds = [this.params.departmentId]
+        this.form.departmentName = this.params.departmentName
+      }
+
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/wxcp/wxuser/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = {
+              ...res.data,
+              departmentName: res.data.departmentNames,
+              tagIds: res.data.tags.map(v => v.id),
+              departmentIds: res.data.departmentIdsStr.split(',')
+            }
+          }
+        })
+      },
+
+      onChange (e) {
+        if (e.length) {
+          this.form.departmentIds = e.map(v => v.id)
+          this.form.departmentName = e.map(v => v.name).join(',')
+        } else {
+          this.form.departmentIds = ''
+          this.form.departmentName = ''
+        }
+      },
+
+      getTags () {
+        this.instance.post(`/app/wxcp/wxtag/listAll`).then(res => {
+          if (res.code == 0) {
+            this.tagsList = res.data
+          }
+        })
+      },
+
+      onClose () {
+        this.form.explain = ''
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const api = this.id ? '/app/wxcp/wxuser/update' : '/app/wxcp/wxuser/add'
+            this.instance.post(api, {
+              ...this.form
+            }).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">
+</style>
diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
new file mode 100644
index 00000000..af3d4758
--- /dev/null
+++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
@@ -0,0 +1,196 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title :title="id ? '编辑成员' : '添加成员'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <el-form ref="form" :model="form" label-width="110px" label-position="right">
+      <ai-card title="个人信息">
+        <template #content>
+          <div class="ai-form">
+            <el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
+              <el-input size="small" placeholder="请输入姓名" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="账号" prop="id" :rules="[{ required: true, message: '请输入账号', trigger: 'blur' }]">
+              <el-input size="small" :disabled="!!id" placeholder="成员唯一标识，设定以后不支持修改" v-model="form.id"></el-input>
+            </el-form-item>
+            <el-form-item label="手机号" prop="mobile" :rules="[{ required: true, validator: validatorPhone, trigger: 'blur' }]">
+              <el-input size="small" placeholder="请输入手机号" v-model="form.mobile"></el-input>
+            </el-form-item>
+            <el-form-item label="性别" prop="gender">
+              <el-radio-group v-model="form.gender">
+                <el-radio label="1">男</el-radio>
+                <el-radio label="2">女</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="座机" prop="telephone">
+              <el-input size="small" placeholder="请输入座机" v-model="form.telephone"></el-input>
+            </el-form-item>
+            <el-form-item label="邮箱" prop="email">
+              <el-input size="small" placeholder="请输入邮箱" v-model="form.email"></el-input>
+            </el-form-item>
+            <el-form-item label="地址" style="width: 100%;" prop="address">
+              <el-input size="small" style="width: 100%;" placeholder="请输入地址" v-model="form.address"></el-input>
+            </el-form-item>
+          </div>
+        </template>
+      </ai-card>
+      <ai-card title="组织信息">
+        <template #content>
+          <el-form-item label="部门" prop="departmentName" style="width: 100%;" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
+            <el-input size="small" placeholder="请选择..." disabled v-model="form.departmentName">
+              <ai-user-get slot="append" isStrictly :instance="instance" @change="onChange" v-model="department" isChooseUnit>
+                <el-button type="info">选择</el-button>
+              </ai-user-get>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="标签" style="width: 100%;" prop="tags">
+            <el-select size="small" v-model="form.tagIds" multiple placeholder="请选择标签">
+              <el-option
+                v-for="item in tagsList"
+                :key="item.id"
+                :label="item.tagname"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="职务" prop="position">
+            <el-input size="small" placeholder="请输入职务" v-model="form.position"></el-input>
+          </el-form-item>
+        </template>
+      </ai-card>
+      </el-form>
+    </template>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="confirm">提交</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      const validatorPhone = function (rule, value, callback) {
+        if (value === '') {
+          callback(new Error('请输入手机号'))
+        } else if (!/^1\d{10}$/.test(value)) {
+          callback(new Error('手机号格式错误'))
+        } else {
+          callback()
+        }
+      }
+      return {
+        info: {},
+        department: [],
+        validatorPhone: validatorPhone,
+        form: {
+          position: '',
+          name: '',
+          email: '',
+          telephone: '',
+          gender: '',
+          mobile: '',
+          departmentName: '',
+          departmentIds: [],
+          tagIds: [],
+          id: ''
+        },
+        id: '',
+        tagsList: []
+      }
+    },
+
+    created () {
+      this.getTags()
+
+      if (this.params && this.params.departmentId && !this.params.id) {
+        this.department = [{
+          id: String(this.params.departmentId),
+          name: this.params.departmentName
+        }]
+        this.form.departmentIds = [this.params.departmentId]
+        this.form.departmentName = this.params.departmentName
+      }
+
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/wxcp/wxuser/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = {
+              ...res.data,
+              departmentName: res.data.departmentNames,
+              tagIds: res.data.tags.map(v => v.id),
+              departmentIds: res.data.departmentIdsStr.split(',')
+            }
+          }
+        })
+      },
+
+      onChange (e) {
+        if (e.length) {
+          this.form.departmentIds = e.map(v => v.id)
+          this.form.departmentName = e.map(v => v.name).join(',')
+        } else {
+          this.form.departmentIds = ''
+          this.form.departmentName = ''
+        }
+      },
+
+      getTags () {
+        this.instance.post(`/app/wxcp/wxtag/listAll`).then(res => {
+          if (res.code == 0) {
+            this.tagsList = res.data
+          }
+        })
+      },
+
+      onClose () {
+        this.form.explain = ''
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const api = this.id ? '/app/wxcp/wxuser/update' : '/app/wxcp/wxuser/add'
+            this.instance.post(api, {
+              ...this.form
+            }).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">
+</style>
diff --git a/project/sass/apps/Announce/AppAnnounce/components/List.vue b/project/sass/apps/Announce/AppAnnounce/components/List.vue
new file mode 100644
index 00000000..1a0867da
--- /dev/null
+++ b/project/sass/apps/Announce/AppAnnounce/components/List.vue
@@ -0,0 +1,991 @@
+<template>
+  <ai-list class="addressBook">
+    <template slot="title">
+      <ai-title title="通讯录管理" isShowBottomBorder></ai-title>
+    </template>
+    <template #left>
+      <div class="addressBook-left">
+        <div class="addressBook-left__title">
+          <h2 @click="tabIndex = 0, search.current = 1, getList()" :class="[tabIndex === 0 ? 'tab-active' : '']">
+            组织架构</h2>
+          <h2 @click="tabIndex = 1, search.current = 1, getList()" :class="[tabIndex === 1 ? 'tab-active' : '']">标签</h2>
+        </div>
+        <div class="addressBook-left__list--title" v-if="tabIndex === 0">
+          <el-input
+              size="mini"
+              placeholder="请输入部门名称"
+              v-model="unitName"
+              suffix-icon="iconfont iconSearch">
+          </el-input>
+        </div>
+        <div class="addressBook-left__list--title" v-if="tabIndex === 1">
+          <el-button size="mini" icon="iconfont iconAdd" @click="isShowTags = true">添加标签</el-button>
+          <el-input
+              class="addressBook-left__list--search"
+              size="mini"
+              clearable
+              style="width: 154px;"
+              placeholder="请输入标签名称"
+              v-model="tagName"
+              suffix-icon="iconfont iconSearch">
+          </el-input>
+        </div>
+        <div class="addressBook-left__list--wrapper">
+          <div class="addressBook-left__list" v-show="tabIndex === 0">
+            <el-tree
+                :filter-node-method="filterNode"
+                ref="tree"
+                :props="defaultProps"
+                node-key="id"
+                :data="unitList"
+                highlight-current
+                @node-contextmenu="nodeContextmenu"
+                :current-node-key="search.departmentId"
+                :default-expanded-keys="defaultExpanded"
+                :default-checked-keys="defaultChecked"
+                @current-change="onTreeChange">
+              <template v-slot="{ node, data }">
+                <ai-open-data type="departmentName" :openid="data.id"/>
+              </template>
+            </el-tree>
+            <ul
+                v-if="isShowMenu"
+                class="el-dropdown-menu el-popper"
+                :style="{top: menuInfo.y + 'px', left: menuInfo.x + 'px', position: 'fixed', zIndex: 2023}"
+                x-placement="top-end">
+              <li class="el-dropdown-menu__item" @click="handleTreeCommand('add', menuInfo.node)">添加子部门</li>
+              <li class="el-dropdown-menu__item" @click="handleTreeCommand('edit', menuInfo.node)">修改名称</li>
+              <li class="el-dropdown-menu__item" @click="handleTreeCommand('remove', menuInfo.node)">删除</li>
+              <li class="el-dropdown-menu__item" :class="[!menuInfo.node.i ? 'is-disabled' : '']"
+                  @click="handleTreeCommand('top', menuInfo.node)">上移
+              </li>
+              <li
+                  class="el-dropdown-menu__item"
+                  :class="[(menuInfo.node.i === menuInfo.node.len - 1) || (!menuInfo.node.i && menuInfo.node.i !== 0) ? 'is-disabled' : '']"
+                  @click="handleTreeCommand('bottom', menuInfo.node)">下移
+              </li>
+            </ul>
+          </div>
+          <div class="addressBook-left__list" v-show="tabIndex === 1">
+            <div class="addressBook-left__tags">
+              <div
+                  @click="changeTag(index)"
+                  class="addressBook-left__tags--item"
+                  :class="[currIndex === index ? 'addressBook-left__tags--item-active' : '']"
+                  v-for="(item, index) in tagsList" :key="index">
+                <span>{{ item.tagname }}</span>
+                <el-dropdown @command="e => handleCommand(e, item)">
+                  <i class="iconfont iconmore"></i>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="edit">编辑</el-dropdown-item>
+                    <el-dropdown-item command="remove">删除</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" v-if="tabIndex === 0" @click="toAdd('')">添加成员
+          </el-button>
+          <ai-import :instance="instance" :dict="dict" v-if="tabIndex === 0" type="wxcp/wxuser" name="通讯录管理"
+                     :importParams="{departmentId:search.departmentId}"/>
+          <el-button size="small" icon="iconfont iconUpdate_Files" v-if="tabIndex === 0" :loading="btnLoading"
+                     @click="syncMembers">同步数据
+          </el-button>
+          <ai-user-get refs="addTags" :instance="instance" v-model="users" @change="onChooseUser"
+                              :disabled="currIndex < 0" v-if="tabIndex === 1" sass>
+            <el-button size="small" :disabled="currIndex < 0" type="primary" icon="iconfont iconAdd">添加成员</el-button>
+          </ai-user-get>
+        </template>
+        <template slot="right">
+          <el-input
+              v-model="search.name"
+              size="small"
+              v-throttle="() => {search.current = 1, getList()}"
+              placeholder="请输入成员姓名、手机号或标签名称"
+              clearable
+              @clear="search.current = 1, search.name = '', getList()"
+              suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          v-loading="loading"
+          style="margin-top: 6px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @handleSelectionChange="handleSelectionChange"
+          @getList="getList">
+        <el-table-column slot="avatar" label="" align="right" width="100px">
+          <template slot-scope="{ row }">
+            <img class="table-avatar" :src="row.avatar || 'https://cdn.cunwuyun.cn/dvcp/h5/defaultAvatar.png'">
+          </template>
+        </el-table-column>
+        <el-table-column slot="username" label="姓名">
+          <template slot-scope="{ row }">
+            <ai-open-data style="height: 20px" type="userName" :openid="row.name"/>
+          </template>
+        </el-table-column>
+        <el-table-column slot="tags" label="标签" align="left">
+          <template slot-scope="{ row }">
+            <div class="table-tags" v-if="row.tagNames">
+              <el-tag type="info" v-for="(item, index) in row.tagNames.split('、')" size="small" :key="index">{{
+                  item
+                }}
+              </el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toAdd(row.id)" v-show="tabIndex === 0">编辑</el-button>
+              <el-button type="text" @click="remove(row.id)" v-show="tabIndex === 0">删除</el-button>
+              <el-button type="text" @click="removeTags(row.id)" v-show="tabIndex === 1">移除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+        <div slot="paginationBtns" class="addressBook-table__btns">
+          <span style="margin-right: 8px;" @click="removeAll">{{ tabIndex === 0 ? '批量删除' : '批量移除' }}</span>
+          <ai-user-get :instance="instance" v-model="department" sass @change="onDepartment"
+                              v-if="tabIndex === 0">
+            <span>批量导出</span>
+          </ai-user-get>
+        </div>
+      </ai-table>
+      <ai-dialog
+          :visible.sync="isShowTags"
+          width="590px"
+          :title="tagId ? '编辑标签' : '添加标签'"
+          @close="onClose"
+          @onConfirm="onFormConfirm">
+        <el-form ref="tagForm" :model="tagForm" label-width="110px" label-position="right">
+          <el-form-item label="标签名称" prop="tagname" :rules="[{ required: true, message: '请输入标签名称', trigger: 'blur' }]">
+            <el-input size="small" placeholder="请输入标签名称" v-model="tagForm.tagname"></el-input>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+      <ai-dialog
+          :visible.sync="isShowDepart"
+          width="590px"
+          :title="departId ? '修改名称' : '添加部门'"
+          @close="onClose"
+          @onConfirm="onDepartConfirm">
+        <el-form ref="departForm" :model="departForm" label-width="110px" label-position="right">
+          <el-form-item label="部门名称" prop="name" :rules="[{ required: true, message: '请输入部门名称', trigger: 'blur' }]">
+            <el-input size="small" placeholder="请输入部门名称" v-model="departForm.name"></el-input>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'List',
+
+  props: {
+    instance: Function,
+    dict: Object
+  },
+
+  data() {
+    return {
+      users: [],
+      isShowMenu: false,
+      department: [],
+      btnLoading: false,
+      menuInfo: {
+        x: '',
+        y: '',
+        node: {}
+      },
+      search: {
+        current: 1,
+        size: 10,
+        title: '',
+        tagname: '',
+        name: '',
+        tagIds: '',
+        departmentId: ''
+      },
+      tagForm: {
+        tagname: ''
+      },
+      isShowDepart: false,
+      departForm: {
+        name: ''
+      },
+      loading: false,
+      isShowTags: false,
+      defaultChecked: [],
+      defaultExpanded: [],
+      tabIndex: 0,
+      currIndex: -1,
+      areaList: [],
+      total: 0,
+      colConfigs: [
+        {type: 'selection', label: ''},
+        {slot: 'avatar', label: ''},
+        {slot: 'username'},
+        {prop: 'position', label: '职务'},
+        // {prop: 'departmentNames', label: '部门'},
+        {prop: 'mobile', label: '手机号'},
+        {slot: 'tags', label: '标签'},
+        {prop: 'status', label: '账号状态', align: 'center', formart: v => v === 1 ? '已激活' : '未激活'}
+      ],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      unitName: '',
+      rootId: '',
+      unitList: [],
+      tagsList: [],
+      tagName: '',
+      sourceTagList: [],
+      tableData: [],
+      tagId: '',
+      departmentName: '',
+      departId: '',
+      ids: ''
+    }
+  },
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  watch: {
+    unitName(val) {
+      this.$refs.tree.filter(val)
+    },
+
+    tagName(val) {
+      if (!val) {
+        this.tagsList = this.sourceTagList
+      }
+
+      this.tagsList = this.sourceTagList.filter(v => v.tagname.indexOf(val) > -1)
+    }
+  },
+
+  created() {
+    this.getTree()
+    this.getList()
+    this.getTags()
+    document.querySelector('html').addEventListener('click', this.bindEvent)
+  },
+  methods: {
+    changeTag(index) {
+      this.currIndex = index
+      this.search.current = 1
+      this.$nextTick(() => {
+        this.getList()
+      })
+    },
+
+    bindEvent() {
+      this.isShowMenu = false
+    },
+
+    nodeContextmenu(e, node) {
+      this.isShowMenu = true
+      this.menuInfo = {
+        x: e.x + 16,
+        y: e.y + 6,
+        node
+      }
+    },
+    removeTags(id) {
+      if (this.currIndex < 0) {
+        return this.$message.error('请选择标签')
+      }
+
+      this.$confirm('确定移除该成员？').then(() => {
+        this.instance.post(`/app/wxcp/wxtag/removeTag?userIds=${id}&tagId=${this.tagsList[this.currIndex].id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('移除成功!')
+            this.search.current = 1
+
+            this.getList()
+          }
+        })
+      })
+    },
+
+    onDepartment(e) {
+      if (!e.length) {
+        return this.$message.error('请选择部门')
+      }
+      const ids = e.map(v => v.id).join(',')
+
+      this.department = []
+      this.instance.post(`/app/wxcp/wxuser/export?departmentId=${ids}`, null, {
+        responseType: 'blob'
+      }).then(res => {
+        if (res?.type == "application/json") {
+          let reader = new FileReader()
+          reader.readAsText(res, "utf-8")
+          reader.onload = e => {
+            if (e.target.readyState === 2) {
+              let ret = JSON.parse(e.target.result)
+              if (ret?.code == 0) {
+                this.$message.success(ret.msg)
+              } else this.$message.error(ret.msg)
+            }
+          }
+        } else {
+          const link = document.createElement('a')
+          let blob = new Blob([res], {type: res.type})
+          link.style.display = 'none'
+          link.href = URL.createObjectURL(blob)
+          link.setAttribute('download', `${e[0].name}.xls`)
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link)
+          this.$message.success('导出成功！')
+        }
+      })
+    },
+
+    onChooseUser(e) {
+      if (!e.length) {
+        return this.$message.error('请选择成员')
+      }
+
+      this.instance.post(`/app/wxcp/wxtag/markTag`, null, {
+        params: {
+          tagId: this.tagsList[this.currIndex].id,
+          userIds: e.map(v => v.id).join(',')
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.getList()
+          this.users = []
+          this.search.current = 1
+          this.$refs.addTags.reset()
+        } else {
+          this.users = []
+        }
+      }).catch(() => {
+        this.users = []
+      })
+    },
+
+    handleTreeCommand(e, item) {
+      this.isShowMenu = false
+
+      if (e === 'add') {
+        this.departForm.parentid = item.id
+        this.departId = ''
+        this.isShowDepart = true
+      } else if (e === 'edit') {
+        this.departForm = {
+          ...item
+        }
+
+        this.departId = item.id
+        this.isShowDepart = true
+      } else if (e === 'top') {
+        if (!item.i) {
+          return false
+        }
+
+        this.moveDepart(item.id, 0)
+      } else if (e === 'bottom') {
+        if ((item.i === item.len - 1) || (!item.i && item.i !== 0)) {
+          return false
+        }
+
+        this.moveDepart(item.id, 1)
+      } else if (e === 'remove') {
+        this.removeDepart(item.id, item.parentid)
+      }
+    },
+
+    removeDepart(id, parentid) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/wxcp/wxdepartment/delete?id=${id}`).then(res => {
+          if (res.code == 0) {
+            this.defaultChecked = [parentid]
+            this.$message.success('删除成功！')
+            this.getTree()
+          }
+        })
+      })
+    },
+
+    moveDepart(id, type) {
+      this.instance.post(`/app/wxcp/wxdepartment/move?id=${id}&type=${type}`).then(res => {
+        if (res.code == 0) {
+          this.defaultChecked = [id]
+          this.getTree()
+          this.$message.success(type === 0 ? '上移成功' : '下移成功')
+        }
+      })
+    },
+
+    onDepartConfirm() {
+      this.$refs.departForm.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/app/wxcp/wxdepartment/addOrUpdate`, {
+            ...this.departForm,
+            departId: this.departId
+          }).then(res => {
+            if (res.code == 0) {
+              this.defaultChecked = [this.departForm.parentid]
+              this.isShowDepart = false
+              this.getTree()
+              this.$message.success(this.departId ? '编辑成功' : '新增成功')
+            }
+          })
+        }
+      })
+    },
+
+    onFormConfirm() {
+      this.$refs.tagForm.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/app/wxcp/wxtag/addOrUpdate`, {
+            ...this.tagForm
+          }).then(res => {
+            if (res.code == 0) {
+              this.isShowTags = false
+              this.getTags()
+              this.$message.success(this.tagId ? '编辑成功' : '新增成功')
+            }
+          })
+        }
+      })
+    },
+
+    handleCommand(e, item) {
+      if (e === 'edit') {
+        this.tagId = item.id
+        this.tagForm = {
+          ...item
+        }
+
+        this.isShowTags = true
+      } else {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/wxcp/wxtag/delete?id=${item.id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getTags()
+            }
+          })
+        })
+      }
+    },
+
+    onClose() {
+      this.tagId = ''
+      this.tagForm.tagname = ''
+      this.departForm.name = ''
+      this.departId = ''
+      this.departForm.nameEn = ''
+      this.departForm.parentid = ''
+      this.departForm.showIndex = ''
+    },
+
+    syncMembers() {
+      if (!this.search.departmentId) {
+        return this.$message.error('请选择部门')
+      }
+
+      this.btnLoading = true
+
+      this.instance.post(`/app/wxcp/wxdepartment/syncDepart`).then(res => {
+        if (res.code == 0) {
+          this.instance.post(`/app/wxcp/wxdepartment/syncUser?departmentId=${this.search.departmentId}`, null, {
+            timeout: 1000000
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('同步成功')
+              this.getList()
+              this.getTree()
+            }
+
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+
+      }).catch(() => {
+        this.btnLoading = false
+      })
+    },
+
+    getTags() {
+      this.instance.post(`/app/wxcp/wxtag/listAll`).then(res => {
+        if (res.code == 0) {
+          this.sourceTagList = res.data.length ? JSON.parse(JSON.stringify(res.data)) : []
+          this.tagsList = res.data
+        }
+      })
+    },
+
+    onSwitchChange(id) {
+      this.instance.post(`/app/wxcp/wxuser/enable?id=${id}`).then(res => {
+        if (res.code == 0) {
+          this.getList()
+        }
+      })
+    },
+
+    onTreeChange(e) {
+      this.departmentName = e.name
+      this.search.departmentId = e.id || ''
+      this.search.current = 1
+      this.isShowMenu = false
+
+      this.$nextTick(() => {
+        this.getList()
+      })
+    },
+
+    getList() {
+      this.loading = true
+      this.instance.post(`/app/wxcp/wxuser/list`, null, {
+        params: {
+          ...this.search,
+          departmentId: this.tabIndex === 0 ? this.search.departmentId : '',
+          tagIds: this.tabIndex === 1 ? (this.currIndex >= 0 ? this.tagsList[this.currIndex].id : '') : '',
+          listType: this.tabIndex
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+
+          this.$nextTick(() => {
+            this.loading = false
+            this.$initWxOpenData()
+          })
+        } else {
+          this.loading = false
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+
+    removeAll() {
+      if (!this.ids) return
+
+      if (this.tabIndex === 1) {
+        this.removeTags(this.ids)
+      } else {
+        this.remove(this.ids)
+      }
+    },
+
+    handleSelectionChange(e) {
+      this.ids = e.map(v => v.id).join(',')
+    },
+
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+
+    changeTab(id, index) {
+      this.currIndex = index
+      this.search.areaId = id
+
+      this.$nextTick(() => {
+        this.getList()
+      })
+    },
+
+    getTree() {
+      let {unitName} = this
+      this.instance.post(`/app/wxcp/wxdepartment/listAll`, null, {
+        params: {unitName}
+      }).then(res => {
+        if (res?.data) {
+          let parent = res.data.map(v => {
+            v.label = v.name
+            v.children = []
+            return v
+          }).filter(e => !e.parentid)[0]
+          this.defaultExpanded = [parent.id]
+          this.defaultChecked = [parent.id]
+          this.search.departmentId = parent.id
+          this.departmentName = parent.name
+          this.addChild(parent, res.data)
+          this.unitList = [parent]
+          this.$nextTick(() => {
+            this.$refs.tree.setCurrentKey(parent.id)
+          })
+        }
+      })
+    },
+
+    addChild(parent, list) {
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].parentid === parent.id) {
+          list[i].i = parent.children.length
+          parent.children.push(list[i])
+        }
+      }
+
+      if (parent.children.length) {
+        parent.children.forEach(v => {
+          v.len = parent.children.length
+        })
+      }
+
+      if (list.length > 0) {
+        parent['children'].map(v => this.addChild(v, list))
+      }
+    },
+
+    formatList(list) {
+      var arr = []
+      for (let item of list) {
+        if (item.childrenUser && item.childrenUser.length) {
+          delete item.childrenUser
+        }
+
+        if (item.childrenDept && item.childrenDept.length) {
+          this.formatList(item.childrenDept)
+        }
+
+        arr.push(item)
+      }
+
+      return arr
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/wxcp/wxuser/delete?id=${id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('删除成功！')
+            this.getList()
+          }
+        })
+      })
+    },
+
+    toAdd(id) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          id: id || '',
+          departmentId: this.search.departmentId || '',
+          departmentName: this.departmentName || ''
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.addressBook {
+  .addressBook-table__btns {
+    display: flex;
+    align-items: center;
+  }
+
+
+  .table-tags {
+    .el-tag {
+      margin-right: 8px;
+      margin-bottom: 8px;
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
+
+  .import-wrapper {
+    & > h2 {
+      margin-bottom: 8px;
+      font-size: 16px;
+      color: #222222;
+      font-weight: Bold;
+    }
+
+    .import-wrapper__tips {
+      line-height: 1;
+      margin-bottom: 24px;
+
+      div {
+        display: flex;
+        margin-bottom: 8px;
+        color: #222222;
+        font-size: 14px;
+
+        span {
+          cursor: pointer;
+          color: #2266FF;
+
+          &:hover {
+            opacity: 0.8;
+            text-decoration: underline;
+          }
+        }
+      }
+    }
+
+    .import-files {
+      i {
+        display: block;
+        margin-top: 8px;
+      }
+    }
+
+    i {
+      color: #999999;
+      font-size: 12px;
+      font-style: normal;
+    }
+  }
+
+  .tree-container {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    height: 100%;
+
+    .tree-name {
+      padding-right: 30px;
+    }
+
+    i {
+      position: absolute;
+      top: 50%;
+      right: 8px;
+      transform: translateY(-50%);
+      padding-right: 8px;
+      font-weight: normal;
+      color: #fff;
+    }
+  }
+
+  .el-tag {
+    margin-right: 8px;
+    border: 1px solid #D0D4DC;
+    background: #F3F4F7;
+    border-radius: 4px;
+    font-size: 13px;
+    color: #222222;
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+
+  .table-avatar {
+    width: 40px;
+    height: 40px;
+    margin-top: 3px;
+    border-radius: 2px;
+    border: 1px solid #CCCCCC;
+  }
+
+  .el-button--mini, .el-button--mini.is-round {
+    height: 28px;
+    line-height: 28px;
+    padding: 0;
+    font-size: 12px;
+
+    ::v-deep span {
+      margin-left: 0;
+    }
+  }
+
+  .addressBook-left__list--title {
+    display: flex;
+    align-items: center;
+    margin: 8px 8px 0;
+
+    .addressBook-left__list--search {
+      flex: 1;
+
+      ::v-deep input {
+        width: 100%;
+      }
+    }
+
+    .el-button {
+      width: 84px;
+      flex-shrink: 1;
+      margin-right: 8px;
+    }
+  }
+
+  .addressBook-left {
+    width: 100%;
+    height: auto;
+    background: #FAFAFB;
+
+    .addressBook-left__title {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      height: 40px;
+      background: #ffffff;
+
+      h2 {
+        flex: 1;
+        height: 100%;
+        line-height: 40px;
+        color: #222;
+        font-size: 14px;
+        text-align: center;
+        cursor: pointer;
+        border-bottom: 2px solid transparent;
+
+        &.tab-active {
+          color: #2266FF;
+          border-bottom: 2px solid #2266FF;
+        }
+      }
+    }
+
+    // ::-webkit-scrollbar {
+    //   width: 1px;
+    // }
+
+    .addressBook-left__list--wrapper {
+      height: calc(100% - 68px);
+      padding: 8px;
+    }
+
+    .addressBook-left__list {
+      width: 100%;
+      height: 100%;
+      overflow: auto;
+
+      ::v-deep .el-tree {
+        width: fit-content;
+        min-width: 100%;
+      }
+
+      ::v-deep .el-scrollbar__wrap {
+        margin-bottom: 0 !important;
+        overflow-x: hidden;
+
+        .el-scrollbar__view {
+          width: fit-content;
+          min-width: 100%;
+        }
+      }
+
+      .addressBook-left__tags--item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 40px;
+        padding: 0 8px 0 16px;
+        cursor: pointer;
+        color: #222222;
+
+        &.addressBook-left__tags--item-active, &:hover {
+          background: #E8EFFF;
+          color: #2266FF;
+
+          i, span {
+            color: #2266FF;
+          }
+        }
+
+        span {
+          font-size: 14px;
+        }
+
+        i {
+          cursor: pointer;
+          color: #8e9ebf;
+          font-size: 16px;
+        }
+      }
+
+      span {
+        color: #222222;
+        font-size: 14px;
+      }
+
+      ::v-deep .el-tree {
+        background: transparent;
+
+        .el-tree-node__expand-icon.is-leaf {
+          color: transparent !important;
+        }
+
+        .el-tree-node__content > .el-tree-node__expand-icon {
+          padding: 4px;
+        }
+
+        .el-tree-node__content {
+          height: 32px;
+        }
+
+        .el-tree__empty-text {
+          color: #222;
+          font-size: 14px;
+        }
+
+        .el-tree-node__children .el-tree-node__content {
+          height: 32px;
+        }
+
+        .el-tree-node__content:hover {
+          background: #E8EFFF;
+          color: #222222;
+          border-radius: 2px;
+        }
+
+        .is-current > .el-tree-node__content {
+          &:hover {
+            background: #2266FF;
+            color: #fff;
+          }
+
+          background: #2266FF;
+
+          span {
+            color: #fff;
+          }
+        }
+      }
+    }
+  }
+
+  ::v-deep .ai-list__content--right {
+    flex: 1;
+    min-width: 0;
+    margin-left: 1px;
+    box-shadow: none;
+
+    .ai-list__content--right-wrapper {
+      width: 100%;
+    }
+  }
+
+  ::v-deep ai-open-data {
+  }
+
+}
+</style>
diff --git a/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue b/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
new file mode 100644
index 00000000..41e18ae9
--- /dev/null
+++ b/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
@@ -0,0 +1,29 @@
+<template>
+  <div class="AppAnnounceStatistics">
+
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'AppAnnounceStatistics',
+
+    label: '协同宣发统计',
+
+    data () {
+      return {
+
+      }
+    },
+
+    methods: {
+
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .AppAnnounceStatistics {
+    height: 100%;
+  }
+</style>