From 41dc57f1ac3a11f884efddf35215c1a95d3782db Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 11 Mar 2022 13:48:07 +0800
Subject: [PATCH 1/9] BUG 28163

---
 packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue b/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
index c85c744e..4206cd26 100644
--- a/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
+++ b/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
@@ -14,10 +14,9 @@
               v-model="search.title"
               class="search-input"
               size="small"
-              @keyup.enter.native="search.title = 1, search.title, getList()"
               placeholder="请输入课程主题"
               clearable
-              @clear="search.current = 1, search.title = '', getList()"
+              @change="search.current=1, getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
           </template>

From fcb6bbf9569c270108ab1a099ce760fa1dc7945e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 10:43:58 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=8C=96=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiushan/apps/AppUserInfo/AppUserInfo.vue  | 195 ++++++++++++++++++
 project/xiushan/core.import.json              |   1 -
 2 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 project/xiushan/apps/AppUserInfo/AppUserInfo.vue

diff --git a/project/xiushan/apps/AppUserInfo/AppUserInfo.vue b/project/xiushan/apps/AppUserInfo/AppUserInfo.vue
new file mode 100644
index 00000000..40e00038
--- /dev/null
+++ b/project/xiushan/apps/AppUserInfo/AppUserInfo.vue
@@ -0,0 +1,195 @@
+<template>
+  <section class="AppUserInfo">
+    <ai-detail>
+      <ai-title slot="title" title="个人中心" isShowBottomBorder/>
+      <template #content>
+        <ai-card title="个人资料">
+          <template #right>
+            <span style="color:#999" v-text="'（如需修改基本信息，请联系管理员）'"/>
+          </template>
+          <template #content>
+            <el-row type="flex" justify="space-between">
+              <ai-wrapper>
+                <ai-info-item label="姓名" :value="user.info.name"/>
+                <ai-info-item label="手机号码" :value="user.info.phone"/>
+                <ai-info-item label="角色" :value="user.info.roleName"/>
+                <ai-info-item label="部门" :value="user.info.departName"/>
+                <ai-info-item label="职位" :value="user.info.position"/>
+              </ai-wrapper>
+              <ai-avatar :value="user.info.avatar" :editable="false"/>
+            </el-row>
+          </template>
+        </ai-card>
+        <ai-card title="数据权限">
+          <template #right>
+            <span style="color:#999" v-text="'（如需修改基本信息，请联系管理员）'"/>
+          </template>
+          <template #content>
+            <ai-wrapper>
+              <ai-info-item label="所属地区" :value="areaName" isLine/>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="密码设置">
+          <template #right>
+            <el-button type="text" @click="submitForm">保存</el-button>
+          </template>
+          <template #content>
+            <el-form :model="form" ref="ruleForm" :rules="rules" label-width="100px" size="small">
+              <el-form-item label="绑定手机：" prop="phone">
+                <el-row type="flex" align="middle">
+                  <span>{{ user.info.phone }}</span>
+                  <el-button type="primary" style="margin-left: 8px" @click="getCode(user.info.phone,true)"
+                             :disabled="codeBtn">获取验证码
+                    <span v-if="num>0&&codeBtn" style="color:red;">({{ num }}s)</span>
+                  </el-button>
+                </el-row>
+              </el-form-item>
+              <el-form-item label="验证码：" prop="code">
+                <el-input v-model.trim="form.code" clearable placeholder="请输入短信验证码"/>
+                <el-input style="position: fixed; bottom: -9999px"></el-input>
+              </el-form-item>
+              <el-form-item label="新密码：" prop="pass">
+                <el-input type="password" auto-complete="new-password" v-model.trim="form.pass" clearable
+                          placeholder="8-16位，需要包含字母和数字及特殊字符(~!@#$%^&*,.?_-)"
+                          show-password/>
+              </el-form-item>
+              <el-form-item label="确认密码：" prop="checkPass">
+                <el-input type="password" auto-complete="new-password" placeholder="再次输入密码"
+                          v-model.trim="form.checkPass" clearable
+                          show-password/>
+              </el-form-item>
+            </el-form>
+          </template>
+        </ai-card>
+      </template>
+    </ai-detail>
+  </section>
+</template>
+
+<script>
+import {mapMutations, mapState} from "vuex";
+
+export default {
+  name: "AppUserInfo",
+  label: "个人中心(秀山版本)",
+  props: {
+    instance: Function,
+  },
+  computed: {
+    ...mapState(['user']),
+    rules() {
+      const validatePass = (rule, value, callback) => {
+        const reg = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*,.?_-])[\da-zA-Z~!@#$%^&*,.?_-]{8,16}$/;
+        if (!reg.test(value)) {
+          callback(new Error('数字和字母及特殊字符(~!@#$%^&*,.?_-)组合,长度8到16位'));
+        } else {
+          if (this.form.checkPass !== '') {
+            this.$refs.ruleForm.validateField('checkPass');
+          }
+          callback();
+        }
+      }
+      return {
+        currentPass: [
+          {required: true, message: '请填写当前密码', trigger: 'blur'}
+        ],
+        code: [
+          {required: true, message: '请填写验证码', trigger: 'blur'}
+        ],
+        pass: [
+          {validator: validatePass, trigger: 'blur', required: true}
+        ],
+        checkPass: [
+          {
+            validator: (r, v, cb) => v ? v != this.form.pass ? cb('两次输入密码不一致') : cb() : cb('请再次输入密码'),
+            trigger: 'blur',
+            required: true
+          }
+        ],
+      }
+    },
+    areaName(){
+      return this.user?.info?.areaList?.join("")
+    }
+  },
+  data() {
+    return {
+      form: {},
+      timer: null,
+      codeBtn: false,
+      num: 60,
+    }
+  },
+  methods: {
+    ...mapMutations(['SignOut']),
+    getCode(phone, flag) {
+      const TEL_REGEXP = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/;
+      if (TEL_REGEXP.test(phone)) {
+        this.instance.post(`/admin/user/checkPhone`, null, {
+          params: {phone, flag}
+        }).then(res => {
+          if (res.code == 0) {
+            this.$message.success("请查看手机短信!");
+            this.timer = setInterval(() => {
+              if (this.num > 0) {
+                this.codeBtn = true;
+                this.num--;
+              } else if (this.num == 0) {
+                this.codeBtn = false;
+                this.num = 60;
+                clearInterval(this.timer);
+
+              }
+            }, 1000)
+
+          } else {
+            this.$message.error("验证码发送失败!");
+          }
+
+        })
+
+
+      } else {
+        this.$message.error("手机号格式错误!");
+      }
+
+    },
+    submitForm() {
+      this.$refs.ruleForm.validate(v => {
+        if (v) {
+          let {pass: newPwd, code} = this.form
+          this.instance.post(`/admin/user/update-pwd`, null, {
+            params: {
+              phone: this.user.info.phone,
+              newPwd, code
+            }
+          }).then(res => {
+            if (res?.code == 0) {
+              this.$confirm("村微提醒您，更换密码成功！", {
+                showCancelButton: false
+              }).then(() => this.SignOut()).catch(() => 0)
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppUserInfo {
+  height: 100%;
+
+  ::v-deep .ai-list__content--wrapper {
+    flex-direction: column;
+  }
+
+  ::v-deep .el-input__inner {
+
+    -webkit-text-security: disc !important;
+
+  }
+}
+</style>
diff --git a/project/xiushan/core.import.json b/project/xiushan/core.import.json
index 49a031d0..d974af81 100644
--- a/project/xiushan/core.import.json
+++ b/project/xiushan/core.import.json
@@ -1,6 +1,5 @@
 {
   "AppDictionary": "数据字典",
-  "AppUserInfo": "个人中心",
   "AppRightsManager": "权限管理",
   "AppAccountRole": "账号角色",
   "AppMenuManager": "菜单管理"

From 66fad244d9e22259bcb34d90040d2f6c947c6061 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 11:38:06 +0800
Subject: [PATCH 3/9] =?UTF-8?q?oms=E6=8E=A5=E5=85=A53.0=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/router/axios.js                      |   3 +
 package.json                                  |   3 +-
 project/oms/apps.import.json                  |   3 +
 .../oms/apps/AppArticles/components/Add.vue   | 232 ++++++++++
 .../apps/AppArticles/components/Detail.vue    |  77 ++++
 .../oms/apps/AppArticles/components/Event.vue | 292 ++++++++++++
 .../oms/apps/AppCompany/components/List.vue   | 223 ++++++++++
 .../apps/AppCompany/components/Statistics.vue | 364 +++++++++++++++
 .../AppCorpStatistics/AppCorpStatistics.vue   | 273 ++++++++++++
 project/oms/apps/AppLicense/AppLicense.vue    | 178 ++++++++
 .../AppRoleRightsManager.vue                  | 416 ++++++++++++++++++
 .../apps/AppRoleRightsManager/rightsAdd.vue   | 190 ++++++++
 .../apps/AppRoleRightsManager/rightsGraph.vue | 192 ++++++++
 project/oms/apps/AppSaas/AppSaas.vue          | 197 +++++++++
 project/oms/core.import.json                  |   8 +
 project/oms/package.json                      |  15 +
 vue.config.js                                 |   7 +-
 17 files changed, 2666 insertions(+), 7 deletions(-)
 create mode 100644 project/oms/apps.import.json
 create mode 100644 project/oms/apps/AppArticles/components/Add.vue
 create mode 100644 project/oms/apps/AppArticles/components/Detail.vue
 create mode 100644 project/oms/apps/AppArticles/components/Event.vue
 create mode 100644 project/oms/apps/AppCompany/components/List.vue
 create mode 100644 project/oms/apps/AppCompany/components/Statistics.vue
 create mode 100644 project/oms/apps/AppCorpStatistics/AppCorpStatistics.vue
 create mode 100644 project/oms/apps/AppLicense/AppLicense.vue
 create mode 100644 project/oms/apps/AppRoleRightsManager/AppRoleRightsManager.vue
 create mode 100644 project/oms/apps/AppRoleRightsManager/rightsAdd.vue
 create mode 100644 project/oms/apps/AppRoleRightsManager/rightsGraph.vue
 create mode 100644 project/oms/apps/AppSaas/AppSaas.vue
 create mode 100644 project/oms/core.import.json
 create mode 100644 project/oms/package.json

diff --git a/examples/router/axios.js b/examples/router/axios.js
index af136165..09c44703 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -12,6 +12,9 @@ instance.interceptors.request.use(config => {
   if (/\/xiushan/.test(location.pathname)) {
     config.baseURL = "/xsjr"
     config.url = config.url.replace(/(app|auth|admin)\//, "")
+  }else if (/project\/oms/.test(location.pathname)) {
+    config.baseURL = "/omsapi"
+    config.url = config.url.replace(/(app|auth|admin)\//, "")
   }
   if (!config.withoutToken && localStorage.getItem("ui-token")) {
     config.headers['Authorization'] = ["Bearer", localStorage.getItem("ui-token")].join(" ")
diff --git a/package.json b/package.json
index 922dd7e9..3c70065a 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
   "main": "lib/cw-webapps.common.js",
   "scripts": {
     "serve": "vue-cli-service serve",
-    "serve:oms": "npx cross-env NODE_ENV=oms vue-cli-service serve",
     "build": "vue-cli-service build",
     "lib": "vue-cli-service build --no-clean --target lib --dest lib packages/index.js&&npm unpublish --force&&npm publish",
     "lib:core": "vue-cli-service build --target lib --dest core/dist core/index.js --name vc-app-core&&npm unpublish --force&&npm publish",
@@ -92,4 +91,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
\ No newline at end of file
+}
diff --git a/project/oms/apps.import.json b/project/oms/apps.import.json
new file mode 100644
index 00000000..b4629da9
--- /dev/null
+++ b/project/oms/apps.import.json
@@ -0,0 +1,3 @@
+{
+  "AppForm": "配置表单"
+}
diff --git a/project/oms/apps/AppArticles/components/Add.vue b/project/oms/apps/AppArticles/components/Add.vue
new file mode 100644
index 00000000..3e2ebafb
--- /dev/null
+++ b/project/oms/apps/AppArticles/components/Add.vue
@@ -0,0 +1,232 @@
+<template>
+  <ai-detail showFooter class="add-detail">
+    <template slot="title">
+      <ai-title :title="params.id ? '编辑村务公开' : '添加村务公开'" :isShowBack="true" @onBackClick="onBack"
+                :isShowBottomBorder="true"></ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基础信息">
+        <template #content>
+          <el-form :model="form" label-width="120px" ref="form">
+            <el-form-item label="类型" prop="type" :rules="[{required: true, message: '请选择类型', trigger: 'change'}]">
+              <el-select size="small" placeholder="请选择" v-model="form.type" style="width: 240px;" clearable>
+                <el-option
+                    v-for="(item,i) in dict.getDict('villInfoType')" :key="i"
+                    :label="item.dictName"
+                    :value="item.dictValue">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="标题" prop="title" :rules="[{required: true, message: '请输入标题', trigger: 'blur'}]">
+              <el-input type="textarea" :rows="2" v-model="form.title" clearable placeholder="请输入..." maxlength="100"
+                        show-word-limit></el-input>
+            </el-form-item>
+            <el-form-item label="正文" prop="content" :rules="[{required: true, message: '请输入正文', trigger: 'blur'}]">
+              <ai-editor v-model="form.content" :instance="instance"/>
+            </el-form-item>
+            <!-- <el-form-item label="缩略图" prop="thumbUrl" :rules="[{required: true, message: '请上次缩略图', trigger: 'change'}]">
+              <ai-uploader
+                :isShowTip="true"
+                :instance="instance"
+                v-model="form.thumbUrl"
+                :limit="1"
+                :cropOps="cropOps"
+                is-crop>
+              <template slot="tips">最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png<br/>格式图片比例：1.6：1</template>
+            </ai-uploader>
+           </el-form-item> -->
+          </el-form>
+        </template>
+      </ai-card>
+    </template>
+    <template slot="footer" class="footer">
+      <el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
+      <el-button type="primary" size="small" @click="onSubmit()">保存</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'Add',
+
+  props: {
+    dict: Object,
+    params: Object,
+    instance: Function,
+    areaId: String
+  },
+
+  data() {
+    return {
+      form: {
+        title: '',
+        type: '',
+        content: '',
+        fileIds: [],
+        thumbUrl: []
+      },
+      fileList: [],
+      isDetail: true,
+      cropOps: {
+        width: "336px",
+        height: "210px"
+      }
+    }
+  },
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  created() {
+    if (this.params && this.params.id) {
+      this.getInfo()
+    }
+  },
+
+  methods: {
+    onBack() {
+      this.cancel()
+    },
+
+    getInfo() {
+      this.instance.post(`/appvillageinfo/queryDetailById?id=${this.params.id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...res.data
+          }
+          this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+          this.fileList = res.data.files || []
+        }
+      })
+    },
+
+    onSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/appvillageinfo/addOrUpdate`, {
+            ...this.form,
+            fileIds: this.fileList.map(v => v.id),
+            thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
+              url: this.form.thumbUrl[0].url
+            }]) : ''
+          }).then(res => {
+            if (res.code === 0) {
+              this.$message.success(`${this.params.id ? '编辑成功' : '提交成功'}`)
+              setTimeout(() => {
+                this.cancel(true)
+              }, 800)
+            }
+          })
+        }
+      })
+    },
+
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'list',
+        isRefresh: !!isRefresh
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.add-detail {
+  height: 100%;
+  overflow: hidden;
+  background: #F2F4F6 !important;
+
+  .map-wrapper {
+    position: relative;
+    width: 100%;
+    height: 400px;
+
+    .search-input {
+      position: absolute;
+      top: 20px;
+      left: 20px;
+      z-index: 1111;
+      width: 220px !important;
+      height: 32px !important;
+    }
+
+    #map {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 11;
+      width: 100%;
+      height: 400px;
+    }
+  }
+
+  ::v-deep .el-form-item__content {
+    margin-left: 140px !important;
+  }
+
+  .add-detail__form {
+    display: flex;
+    justify-content: space-between;
+
+    .el-input {
+      width: 328px;
+    }
+  }
+
+  .add-form {
+    &:first-child {
+      margin-bottom: 20px;
+    }
+  }
+
+  .add-form__item, .add-detail__form {
+    display: flex;
+    align-items: center;
+    padding: 0 90px 0 50px;
+  }
+
+  ::v-deep .ai-detail__footer {
+    background: #fff !important;
+  }
+
+  ::v-deep .ai-detail {
+    div {
+      box-sizing: border-box;
+    }
+  }
+
+  ::v-deep .ai-detail__content--active {
+    padding: 20px;
+    box-sizing: border-box;
+
+    .ai-detail__content--wrapper {
+      width: 100%;
+    }
+
+    .aibar {
+      padding: 0 16px;
+    }
+
+    .add-form {
+      background: #fff;
+    }
+  }
+
+  ::v-deep .ai-wrapper {
+    align-items: inherit !important;
+  }
+
+  .footer-btn {
+    width: 92px;
+  }
+
+  el-form {
+    padding-bottom: 80px;
+  }
+}
+</style>
diff --git a/project/oms/apps/AppArticles/components/Detail.vue b/project/oms/apps/AppArticles/components/Detail.vue
new file mode 100644
index 00000000..c1e445db
--- /dev/null
+++ b/project/oms/apps/AppArticles/components/Detail.vue
@@ -0,0 +1,77 @@
+<template>
+  <ai-detail class="event-detail">
+    <template #title>
+      <ai-title title="村务公开详情" :isShowBack="true" @onBackClick="onBack" isShowBottomBorder>
+      </ai-title>
+    </template>
+    <template #content>
+      <ai-card :title="info.title" titlePosition="center">
+        <template #title>
+          <h2>{{ info.title }}</h2>
+          <p class="subTitle">{{ info.createDate }} {{ info.unitName || '-' }}</p>
+        </template>
+        <template #content>
+          <img class="cover" :src="info.thumbUrl[0].url" v-if="info.thumbUrl && info.thumbUrl.length">
+          <ai-article :value="info.content"></ai-article>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {}
+      }
+    },
+
+    mounted () {
+      this.getInfo()
+    },
+
+    methods: {
+      getInfo () {
+        this.instance.post(`/appvillageinfo/queryDetailById?id=${this.params.id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            if (res.data.thumbUrl) {
+              this.info.thumbUrl = JSON.parse(res.data.thumbUrl)
+            }
+          }
+        })
+      },
+
+      onBack () {
+        this.$emit('change', {
+          type: 'list'
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .cover {
+    display: block;
+    width: 300px;
+    height: 140px;
+    margin: 20px auto;
+  }
+
+  .subTitle {
+    text-align: center;
+    font-size: 12px;
+    font-weight: normal;
+  }
+</style>
diff --git a/project/oms/apps/AppArticles/components/Event.vue b/project/oms/apps/AppArticles/components/Event.vue
new file mode 100644
index 00000000..bce67543
--- /dev/null
+++ b/project/oms/apps/AppArticles/components/Event.vue
@@ -0,0 +1,292 @@
+<template>
+  <section class="event">
+    <ai-list>
+      <ai-title  slot="title" title="村务公开" isShowBottomBorder></ai-title>
+      <template slot="content">
+        <ai-search-bar>
+          <template slot="left">
+            <el-button icon="iconfont iconAdd" type="primary" size="small" @click="add">添加</el-button>
+          </template>
+          <template slot="right">
+            <el-input
+              placeholder="请输入标题"
+              size="small"
+              clearable
+              v-model="search.title"
+              @keyup.enter.native="search.current = 1, getList()"
+              @clear="search.current = 1, search.title = '', getList()"
+              suffix-icon="iconfont iconSearch" />
+          </template>
+        </ai-search-bar>
+        <div class="ai-table">
+          <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
+            <el-table-column slot="options" label="操作" align="center" width="250" fixed="right">
+              <template slot-scope="{ row }" class="fs-14">
+                <div class="table-options">
+                  <el-button
+                    type="text"
+                    @click="publish(row)"
+                    title="发布">
+                     发布
+                  </el-button>
+                  <el-button
+                    type="text"
+                    title="详情"
+                    @click="toDetail(row.id)">
+                    详情
+                  </el-button>
+                  <el-button
+                    type="text"
+                    title="编辑"
+                    @click="toAdd(row.id)">
+                    编辑
+                  </el-button>
+                  <el-button
+                    @click="remove(row.id)"
+                    type="text"
+                    title="删除">
+                    删除
+                  </el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </ai-table>
+        </div>
+      </template>
+    </ai-list>
+    <ai-dialog title="请选择发布平台企业" :visible.sync="dialog" width="600px"  @onConfirm="saveSaas">
+      <el-form ref="saasForm" :model="dialogForm" size="small" label-width="120px">
+        <el-form-item required label="saas平台" prop="saasId" :rules="[{required: true, message: '请选择saas平台'}]">
+          <el-select v-model="dialogForm.saasId" placeholder="请选择saas平台" style="width:100%;" @change="getCompanyList">
+            <el-option
+              v-for="item in saasList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item required label="saas企业" prop="corpId" :rules="[{required: true, message: '请选择saas企业'}]">
+          <el-select v-model="dialogForm.corpId" placeholder="请选择saas企业" style="width:100%;" @change="selectCompany">
+            <el-option
+              v-for="item in companyList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item required label="地区" prop="areaId" :rules="[{required: true, message: '请选择发布地区'}]">
+          <ai-area-get :instance="instance" v-model="dialogForm.areaId" :root="rootId" :name.sync="dialogForm.areaName" />
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+
+  export default {
+    name: 'event',
+
+    props: {
+      instance: Function,
+      dict: Object,
+    },
+
+    computed: {
+      ...mapState(['user']),
+      colConfigs() {
+        return [
+          { prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v) },
+          { prop: 'title', label: '标题', align: 'left' },
+          { prop: 'createDate', label: '创建时间', dateFormart: 'YYYY-MM-DD', align: 'center' },
+          { prop: 'createUser', label: '发布人', align: 'center' },
+          { slot: 'options', label: '操作' }
+        ]
+      }
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          title: ''
+        },
+        total: 0,
+        ids: [],
+        tableData: [],
+        dialog: false,
+        dialogForm: {},
+        saasList: [],
+        companyList: [],
+        rootId: ''
+      }
+    },
+    mounted () {
+      this.dict.load('villInfoType').then(() => {
+        this.getList()
+        this.getsaasList()
+      })
+    },
+
+    methods: {
+      getsaasList() {
+        this.instance.post("/appSaas/page", null, {
+          params: {size: 10000}
+        }).then(res => {
+          if (res?.data) {
+            this.saasList = res.data?.records
+          }
+        })
+      },
+
+      getCompanyList() {
+        this.instance.post("/appCorp/page", null, {
+          params: {saasId:this.dialogForm.saasId, size: 10000}
+        }).then(res => {
+          if (res?.data) {
+            this.companyList = res.data.records
+            this.rootId = ''
+            this.dialogForm.areaId = ''
+            this.corpId = ''
+          }
+        })
+      },
+
+      selectCompany() {
+        this.companyList.map(item => {
+          if(item.id == this.dialogForm.corpId) {
+            this.rootId = item.areaId
+            this.dialogForm.areaId = item.areaId
+          }
+        })
+      },
+
+      getList () {
+        this.instance.post(`/appvillageinfo/list`, null, {
+          params: {
+            ...this.search,
+            areaId: this.areaId
+          }
+        }).then(res => {
+          if (res.data) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      publish (params) {
+        this.dialogForm.id = params.id
+        this.dialog = true
+      },
+
+      toAdd (id) {
+        this.$emit('change', {
+          type: 'add',
+          params: {
+            id
+          }
+        })
+      },
+
+      add () {
+        this.$emit('change', {
+          type: 'add',
+          params: {
+            id: ''
+          }
+        })
+      },
+
+      toEdit (id) {
+        this.$emit('change', {
+          type: 'add',
+          params: {
+            type: 'ReportAdd',
+            id
+          }
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'detail',
+          params: {
+            type: 'eventDetail',
+            id
+          }
+        })
+      },
+
+      remove (id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appvillageinfo/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      saveSaas() {
+        this.$refs.saasForm.validate(v => {
+          if (v) {
+            this.instance.post(`/appvillageinfo/sync?corpId=${this.dialogForm.corpId}&id=${this.dialogForm.id}&areaId=${this.dialogForm.areaId}`).then(res => {
+              if (res?.code == 0) {
+                this.dialog = false;
+                this.$message.success("发布成功")
+                this.dialogForm = {}
+              } else {
+                this.$message.error(res?.msg)
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .event {
+    height: 100%;
+    ::v-deep th {
+      font-weight: bold!important;
+    }
+    ::v-deep .table-options{
+      span{
+        font-size: 14px!important;
+      }
+    }
+  }
+  .table-btn {
+    margin-right: 16px;
+    font-size: 14px;
+    color: #2266FF;
+    cursor: pointer;
+
+    &:hover {
+      opacity: 0.6;
+    }
+
+    &:last-child {
+      margin-right: 0;
+    }
+
+    &:last-child:hover {
+      color: #f46;
+      opacity: 1;
+    }
+  }
+</style>
diff --git a/project/oms/apps/AppCompany/components/List.vue b/project/oms/apps/AppCompany/components/List.vue
new file mode 100644
index 00000000..37999c0e
--- /dev/null
+++ b/project/oms/apps/AppCompany/components/List.vue
@@ -0,0 +1,223 @@
+<template>
+  <section class="list">
+    <ai-list>
+      <ai-title slot="title" title="企业管理" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-select v-model="search.saasId" size="small" placeholder="请选择saas平台" @change="getDataInit">
+              <el-option
+                v-for="item in saasList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </template>
+        </ai-search-bar>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="dialogForm = {}, dialog=true">添加</el-button>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="企业名称" v-model="search.name" clearable @change="getDataInit"/>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict"
+                  @selection-change="v=>ids=v.filter(e=>e.id).map(e=>e.id)">
+          <el-table-column slot="options" align="center" label="操作" fixed="right" width="240px">
+            <div class="table-options" slot-scope="{ row }">
+              <el-button type="text" @click="handleEnter(row.accessUrl)">打开</el-button>
+              <el-button type="text" @click="handleSync(row.corpId)">同步</el-button>
+              <el-button type="text" @click="toStatistics(row)">统计</el-button>
+              <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+            </div>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog :title="dialogTitle" :visible.sync="dialog" width="600px"  @onConfirm="saveSaas">
+      <el-form ref="saasForm" :model="dialogForm" :rules="rules" size="small" label-width="120px">
+        <el-form-item required label="名称" prop="name">
+          <el-input v-model.trim="dialogForm.name" placeholder="请输入saas企业名称" clearable :maxLength="50"/>
+        </el-form-item>
+        <el-form-item required label="saas平台" prop="saasId">
+          <el-select v-model="dialogForm.saasId" placeholder="请选择saas平台" style="width:100%;">
+            <el-option
+              v-for="item in saasList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item required label="地区" prop="areaId" :rules="[{required: true, message: '请选择发布地区'}]">
+          <ai-area-get :instance="instance" v-model="dialogForm.areaId" :name.sync="dialogForm.areaName" />
+        </el-form-item>
+        <el-form-item required label="企业CORP_ID" prop="corpId" :rules="[{required: true, message: '请输入企业CORP_ID'}]">
+          <el-input v-model.trim="dialogForm.corpId" placeholder="请输入企业CORP_ID" clearable  :maxLength="50"/>
+        </el-form-item>
+        <el-form-item label="AGENT_ID" prop="corpAgentId">
+          <el-input v-model.trim="dialogForm.corpAgentId" placeholder="请输入企业AGENT_ID" clearable  :maxLength="50"/>
+        </el-form-item>
+        <el-form-item label="CORP_SECRET" prop="corpSecret">
+          <el-input v-model.trim="dialogForm.corpSecret" placeholder="请输入企业CORP_SECRET" clearable  :maxLength="50"/>
+        </el-form-item>
+        <el-form-item label="企业通讯录SECRET" prop="corpAddressBookSecret">
+          <el-input v-model.trim="dialogForm.corpAddressBookSecret" placeholder="请输入企业通讯录SECRET" clearable  :maxLength="50"/>
+        </el-form-item>
+        <el-form-item label="访问地址" prop="accessUrl" :rules="[{required: true, message: '请输入访问地址'}]">
+          <el-input v-model.trim="dialogForm.accessUrl" placeholder="请输入访问地址" clearable
+                    :maxLength="255"/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+
+export default {
+  name: "list",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    isEdit() {
+      return !!this.dialogForm.id
+    },
+    dialogTitle() {
+      return this.isEdit ? '修改saas企业' : '添加saas企业'
+    },
+    colConfigs() {
+      return [
+        {label: "名称", prop: "name"},
+        {label: "saas平台", prop: "saasName", align: 'center'},
+        {label: "地区", prop: "areaName", align: 'center'},
+        {label: "企业CORP_ID", prop: "corpId", align: 'center'},
+        {label: "访问地址", prop: "accessUrl"},
+        {label: "创建时间", prop: "createTime"},
+        {slot: "options"}
+      ]
+    },
+    rules() {
+      return {
+        name: [{required: true, message: "请输入saas企业名称"}],
+        saasId: [{required: true, message: "请选择saas平台"}],
+      }
+    },
+    updateRules() {
+      return {
+        password: [{required: true, message: "请输入平台密码"}]
+      }
+    }
+  },
+  data() {
+    return {
+      page: {current: 1, size: 10, total: 0},
+      dialog: false,
+      dialogForm: {},
+      tableData: [],
+      search: {name: "", saasId: ''},
+      ids: [],
+      saasList: []
+    }
+  },
+  methods: {
+    getsaasList() {
+      this.instance.post("/appSaas/page", null, {
+        params: {size: 10000}
+      }).then(res => {
+        if (res?.data) {
+          this.saasList = res.data?.records
+        }
+      })
+    },
+    getDataInit() {
+      this.page.current = 1
+      this.getTableData()
+    },
+    getTableData() {
+      this.instance.post("/appCorp/page", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    // 新增/修改
+    saveSaas() {
+      this.$refs.saasForm.validate(v => {
+        if (v) {
+          this.saasList.map(item => {
+            if(item.id == this.dialogForm.saasId) {
+              this.dialogForm.saasName = item.name
+            }
+          })
+          this.instance.post("/appCorp/addOrUpdate", this.dialogForm).then(res => {
+            if (res?.code == 0) {
+              this.dialog = false;
+              this.$message.success("保存成功")
+              this.getTableData();
+            } else {
+              this.$message.error(res?.msg)
+            }
+          })
+        }
+      })
+    },
+    handleEdit(row) {
+      this.dialogForm = row
+      this.dialog = true
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该Saas信息?").then(() => {
+        this.instance.post("/appCorp/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.getTableData();
+            this.$message.success("删除成功!");
+          }
+        })
+      }).catch(() => 0)
+    },
+    handleSync(corpId) {
+      this.$confirm("是否确定同步该企业数据?").then(() => {
+        this.instance.post("/appCorpStat/syncData?corpId="+corpId, null, {}).then(res => {
+          if (res?.code == 0) {
+            this.getTableData();
+            this.$message.success("同步成功!");
+          }
+        })
+      }).catch(() => 0)
+    },
+    handleEnter(accessUrl) {
+      window.open(accessUrl, "_blank");
+    },
+    toStatistics(item) {
+      this.$emit('change', {
+        type: 'Statistics',
+        params: item
+      })
+    },
+  },
+  created() {
+    this.getsaasList()
+    this.getTableData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.list {
+  height: 100%;
+
+}
+</style>
diff --git a/project/oms/apps/AppCompany/components/Statistics.vue b/project/oms/apps/AppCompany/components/Statistics.vue
new file mode 100644
index 00000000..9fc3b3e9
--- /dev/null
+++ b/project/oms/apps/AppCompany/components/Statistics.vue
@@ -0,0 +1,364 @@
+<template>
+  <ai-detail class="Statistics">
+    <template #title>
+      <ai-title title="企业统计" :isShowBack="true" @onBackClick="onBack" isShowBottomBorder>
+      </ai-title>
+    </template>
+    <template #content>
+      <ai-card title="基本信息">
+        <template #content>
+          <el-row :gutter="20">
+            <el-col :span="5">
+              <div class="title">群总数</div>
+              <div class="num">{{info.groupCount}}</div>
+            </el-col>
+            <el-col :span="5">
+              <div class="title">成员总数</div>
+              <div class="num">{{info.userCount}}</div>
+            </el-col>
+            <el-col :span="5">
+              <div class="title">成员活跃总数</div>
+              <div class="num">{{info.activeCount}}</div>
+            </el-col>
+            <el-col :span="5">
+              <div class="title">居民总人数</div>
+              <div class="num">{{info.residentCount}}</div>
+            </el-col>
+            <el-col :span="4">
+              <div class="title">群成员总数</div>
+              <div class="num">{{info.groupuserCount}}</div>
+            </el-col>
+          </el-row>
+        </template>
+      </ai-card>
+      <ai-card title="统计信息" class="chart-content">
+        <template #title>
+          <div class="tabs">
+            <div class="item" v-for="(item, index) in tabs" :key="index" :class="index == activeIndex ? 'active' : ''" @click="tabClick(index)">{{item}}</div>
+          </div>
+        </template>
+        <template #content>
+          <div class="echart" id="echart" v-if="activeIndex != 2 && activeIndex != 3"></div>
+          <div class="table" v-else-if="activeIndex == 2">
+            <ai-search-bar>
+              <template slot="right">
+                <el-input
+                  v-model="innerMemberId"
+                  size="small"
+                  placeholder="输入群成员ID"
+                  @keyup.enter.native="(page.current = 1), getTableData()"
+                  clearable
+                  prefix-icon="iconfont iconSearch"
+                />
+                <el-button
+                  type="primary"
+                  icon="iconfont iconSearch"
+                  size="small"
+                  @click="(page.current = 1), getTableData()"
+                  >查询
+                </el-button>
+                <el-button
+                  icon="el-icon-refresh-right"
+                  size="small"
+                  @click="resetSearch"
+                  >重置</el-button
+                >
+              </template>
+            </ai-search-bar>
+            <ai-table :tableData="gropList" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+              @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+              <!-- <el-table-column slot="options" align="center" label="操作" fixed="right" width="240px">
+                <div class="table-options" slot-scope="{ row }">
+                  <el-button type="text">打开</el-button>
+                </div>
+              </el-table-column> -->
+            </ai-table>
+          </div>
+          <div class="table" v-else-if="activeIndex == 3">
+            <ai-table :tableData="userList" :total="userPage.total" :current.sync="userPage.current" :size.sync="userPage.size"
+              @getList="getUserTableData" :col-configs="userColConfigs" :dict="dict">
+              <!-- <el-table-column slot="options" align="center" label="操作" fixed="right" width="240px">
+                <div class="table-options" slot-scope="{ row }">
+                  <el-button type="text">打开</el-button>
+                </div>
+              </el-table-column> -->
+            </ai-table>
+          </div>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  import * as echarts from 'echarts'
+  export default {
+    name: 'Statistics',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {},
+        activeIndex: 0,
+        tabs: ['概览', '群统计',  '群列表', '成员与好友统计'],
+        listData: [],
+        pieData: [],
+        myChart: null,
+        gropList: [],
+        page: {current: 1, size: 10, total: 0},
+        innerMemberId: '',
+        userList: [],
+        userPage: {current: 1, size: 10, total: 0}
+      }
+    },
+    computed: { 
+      colConfigs() {
+        return [
+          {label: "群名", prop: "name", width:200},
+          {label: "创建时间", prop: "createTime", align: 'center', width:150},
+          {label: "群成员数", prop: "memberCount", align: 'center', width:100},
+          {label: "群主ID", prop: "owner", align: 'center', width:150},
+          {label: "群公告", prop: "notice"},
+        ]
+      },
+      userColConfigs() {
+        return [
+          {label: "部门", prop: "departmentName"},
+          {label: "姓名", prop: "name", align: 'center'},
+          {label: "添加好友人数", prop: "residentCount", align: 'center'}
+        ]
+      }
+    },
+
+    mounted() {
+      this.getInfo()
+      this.getTableData()
+      this.getUserTableData()
+    },
+
+    methods: {
+      chartInit() {
+        var option = {}
+        if(this.activeIndex != 1) {
+          option = {
+            tooltip: {
+              trigger: 'axis'
+            },
+            legend: {
+              data: ['群总数', '成员总数', '成员活跃总数', '居民总人数', '群成员总数']
+            },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: {
+              type: 'category',
+              data: this.listData[5],
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: '群总数',
+                type: 'line',
+                data: this.listData[0]
+              },
+              {
+                name: '成员总数',
+                type: 'line',
+                data: this.listData[1]
+              },
+              {
+                name: '成员活跃总数',
+                type: 'line',
+                data: this.listData[2]
+              },
+              {
+                name: '居民总人数',
+                type: 'line',
+                data: this.listData[3]
+              },
+              {
+                name: '群成员总数',
+                type: 'line',
+                data: this.listData[4]
+              },
+            ]
+          };
+        }else {
+          option = {
+            tooltip: {
+              trigger: 'item'
+            },
+            legend: {
+              orient: 'vertical',
+              left: 'left'
+            },
+            series: [
+              {
+                type: 'pie',
+                radius: '50%',
+                data: this.pieData,
+                emphasis: {
+                  itemStyle: {
+                    shadowBlur: 10,
+                    shadowOffsetX: 0,
+                    shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
+              }
+            ]
+          };
+        }
+        this.myChart.setOption(option);
+      },
+      getInfo() {
+        this.myChart = echarts.init(document.getElementById("echart"));
+        this.instance.post(`/appCorpStat/getLatestInfo?corpId=${this.params.corpId}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.getCharInfo()
+          }
+        })
+      },
+      getCharInfo() {
+        this.instance.post(`/appCorpStat/getLatestThreeMonthStat?corpId=${this.params.corpId}`).then(res => {
+          if (res.code === 0) {
+            if(res.data && res.data.length) {
+              this.listData = []
+              this.listData[0] =  res.data.map(v => v.groupCount)
+              this.listData[1] =  res.data.map(v => v.userCount)
+              this.listData[2] =  res.data.map(v => v.activeCount)
+              this.listData[3] =  res.data.map(v => v.residentCount)
+              this.listData[4] =  res.data.map(v => v.groupuserCount)
+              this.listData[5] = res.data.map(v => v.statDate)
+              this.chartInit()
+            }
+          }
+        })
+
+        this.instance.post(`/wxcp/wxgroup/groupStatistic?corpId=${this.params.corpId}`).then(res => {
+          if (res.code === 0) {
+            if(res.data) {
+              this.pieData = []
+              Object.getOwnPropertyNames(res.data).forEach((key) => {
+                var e = {
+                  value: res.data[key],
+                  name: key
+                }
+                this.pieData.push(e)
+              });
+            }
+          }
+        })
+      },
+
+      resetSearch() {
+        this.innerMemberId = ''
+        this.page.current = 1
+        this.getTableData()
+      },
+      getTableData() {
+        this.instance.post(`/wxcp/wxgroup/list?corpId=${this.params.corpId}&current=${this.page.current}&size=${this.page.size}&innerMemberId=${this.innerMemberId}`,).then(res => {
+          if (res.code === 0) {
+            if(res.data) {
+              this.gropList = res.data.records
+              this.page.total = res.data.total
+            }
+          }
+        })
+      },
+      getUserTableData() {
+        this.instance.post(`/wxcp/wxuser/userStat?corpId=${this.params.corpId}&current=${this.userPage.current}&size=${this.userPage.size}&mainDepartment=1`,).then(res => {
+          if (res.code === 0) {
+            if(res.data) {
+              this.userList = res.data.records
+              this.userPage.total = res.data.total
+            }
+          }
+        })
+      },
+      onBack () {
+        this.$emit('change', {
+          type: 'list'
+        })
+      },
+      tabClick(index) {
+        this.activeIndex = index
+        this.myChart.dispose()
+        if(index != 2 && index != 3) {
+          this.$nextTick(() => {
+            this.myChart = echarts.init(document.getElementById("echart"));
+            this.chartInit()
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .cover {
+    display: block;
+    width: 300px;
+    height: 140px;
+    margin: 20px auto;
+  }
+
+  .subTitle {
+    text-align: center;
+    font-size: 12px;
+    font-weight: normal;
+  }
+  .title{
+    line-height: 60px;
+    font-size: 18px;
+    text-align: center;
+    color: #666;
+  }
+  .num{
+    font-size: 32px;
+    font-weight: 700;
+    text-align: center;
+    padding-bottom: 20px;
+  }
+  .tabs{
+    .item{
+      display: inline-block;
+      padding: 0 20px;
+      line-height: 54px;
+      cursor: pointer;
+    }
+    .active{
+      color: #26f;
+      border-bottom: 2px solid #26f;
+    }
+  }
+  .chart-content{
+    height: calc(100% - 240px);
+    ::v-deep .ai-card__body{
+       height: calc(100% - 70px);
+    }
+    .echart{
+      width: 100%;
+      height: 100%;
+    }
+    .table{
+      width: 100%;
+      height: 100%;
+      overflow-y: scroll;
+    }
+  }
+  ::v-deep .ai-detail__content--wrapper{
+    height: 100%;
+  }
+</style>
diff --git a/project/oms/apps/AppCorpStatistics/AppCorpStatistics.vue b/project/oms/apps/AppCorpStatistics/AppCorpStatistics.vue
new file mode 100644
index 00000000..c93eea97
--- /dev/null
+++ b/project/oms/apps/AppCorpStatistics/AppCorpStatistics.vue
@@ -0,0 +1,273 @@
+<template>
+  <section class="AppCorpStatistics">
+    <ai-detail>
+      <!-- 标题 -->
+      <ai-title slot="title" title="企微统计" isShowBottomBorder />
+      <template #content>
+        <ai-tree-menu title="企微统计">
+          <el-tree
+            @node-click="nodeClick"
+            :props="props"
+            :load="loadNode"
+            lazy
+            :expand-on-click-node="false"
+          >
+          </el-tree>
+        </ai-tree-menu>
+
+        <div class="flex">
+          <el-row :gutter="20" class="el-row">
+            <el-col :span="5">
+              <div class="title">群总数</div>
+              <div class="num">{{info.groupCount}}</div>
+            </el-col>
+            <el-col :span="5">
+              <div class="title">成员总数</div>
+              <div class="num">{{info.userCount}}</div>
+            </el-col>
+            <el-col :span="5">
+              <div class="title">成员活跃总数</div>
+              <div class="num">{{info.activeCount}}</div>
+            </el-col>
+            <el-col :span="5">
+              <div class="title">居民总人数</div>
+              <div class="num">{{info.residentCount}}</div>
+            </el-col>
+            <el-col :span="4">
+              <div class="title">群成员总数</div>
+              <div class="num">{{info.groupuserCount}}</div>
+            </el-col>
+          </el-row>
+          <div class="table">
+            <ai-search-bar>
+              <template slot="right">
+                <el-input
+                  v-model="name"
+                  size="small"
+                  placeholder="输入企微名称"
+                  @keyup.enter.native="(page.current = 1), getTableData()"
+                  clearable
+                  prefix-icon="iconfont iconSearch"
+                />
+                <el-button
+                  type="primary"
+                  icon="iconfont iconSearch"
+                  size="small"
+                  @click="(page.current = 1), getTableData()"
+                  >查询
+                </el-button>
+                <el-button
+                  icon="el-icon-refresh-right"
+                  size="small"
+                  @click="resetSearch"
+                  >重置</el-button
+                >
+              </template>
+            </ai-search-bar>
+            <ai-table :tableData="gropList" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+              @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+            </ai-table>
+          </div>
+        </div>
+      </template>
+    </ai-detail>
+  </section>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'AppCorpStatistics',
+  label: 'saas企微统计',
+  props: {
+    dict: Object,
+    instance: Function,
+    params: Object,
+  },
+
+  data() {
+    return {
+      props: {
+        label: 'name',
+        children: 'zones',
+        isLeaf: 'leaf'
+      },
+      corpTotal: 0,
+      info: {},
+      gropList: [],
+      page: {current: 1, size: 10, total: 0},
+      areaId: '',
+      name: ''
+    }
+  },
+
+  computed: {
+    ...mapState(['user']),
+
+    colConfigs() {
+      return [
+        {label: "企微名称", prop: "name", align: 'center', width:250},
+        {label: "地区", prop: "areaName", align: 'center', width:150},
+        {label: "创建时间", prop: "createTime", align: 'center', width:200},
+        {label: 'CORP_ID', prop: "corpId"}
+      ]
+    }
+  },
+
+  mounted() {
+    this.getInfo()
+    this.getTableData()
+  },
+
+  methods: {
+    loadNode(node, resolve) {
+      if (node.level == 0) {
+        this.instance.post(`/appCorpStat/getCorpStatTotal`).then((res) => {
+          if (res.data) {
+            return resolve([{ name: `全国  (${res.data})`}]);
+          }
+        })
+
+        return false
+      }
+
+      var areaId = node.data.id
+
+      if(node.level == 1) {  //全国
+        areaId = ''
+      }
+      this.instance.post(`/appCorpStat/getCorpStatByArea?areaId=${areaId}`).then((res) => {
+        if (res.data) {
+          res.data.map((item) => {
+            item.name = item.name + `(${item.total})`
+          })
+          resolve(res.data)
+        }
+      })
+    },
+
+    nodeClick(list, node) {
+      if(node.data.id) {
+        this.areaId = node.data.id
+        this.page.current = 1
+      }else {
+        this.areaId = ''
+      }
+      this.getInfo()
+      this.getTableData()
+    },
+
+    resetSearch() {
+      this.name = ''
+      this.page.current = 1
+      this.getTableData()
+    },
+
+    getInfo() {
+      this.info = {}
+      this.instance.post(`/appCorpStat/getLatestInfo?areaId=${this.areaId}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+        }
+      })
+    },
+
+    getTableData() {
+      this.gropList = []
+      this.page.total = 0
+      this.instance.post(`/appCorp/page?areaId=${this.areaId}&current=${this.page.current}&size=${this.page.size}&name=${this.name}`,).then(res => {
+        if (res.code === 0) {
+          if(res.data) {
+            this.gropList = res.data.records
+            this.page.total = res.data.total
+          }
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppCorpStatistics {
+  height: 100%;
+
+  .ai-detail {
+    ::v-deep .ai-detail__content {
+      .ai-detail__content--wrapper {
+        display: flex;
+        justify-content: space-between;
+        height: 100%;
+        max-width: 100%;
+        padding: 15px;
+
+        .AiTreeMenu {
+          width: 22%;
+        }
+
+        .flex {
+          width: 78%;
+          margin-left: 10px;
+          padding: 15px;
+          background-color: #fff;
+          overflow-y: scroll;
+
+          .ai-search-ba {
+            margin-top: 10px;
+          }
+
+          .ai-table {
+            margin-top: 0 !important;
+          }
+        }
+      }
+    }
+  }
+
+  ::v-deep .el-tree {
+    .el-tree-node__content {
+      display: inline-flex;
+      min-width: 100%;
+
+      &:hover {
+        background: #e8efff;
+        color: #222222;
+        border-radius: 2px;
+      }
+    }
+
+    .is-current > .el-tree-node__content {
+      background: #2266ff;
+
+      &:hover {
+        background: #2266ff;
+        color: #fff;
+      }
+
+      span {
+        color: #fff;
+        font-weight: bold;
+      }
+    }
+  }
+}
+
+.title{
+  line-height: 60px;
+  font-size: 18px;
+  text-align: center;
+  color: #666;
+}
+.num{
+  font-size: 32px;
+  font-weight: 700;
+  text-align: center;
+  padding-bottom: 20px;
+}
+
+.el-row{
+  background-color: #eee;
+  margin: 0 0 16px!important;
+}
+</style>
diff --git a/project/oms/apps/AppLicense/AppLicense.vue b/project/oms/apps/AppLicense/AppLicense.vue
new file mode 100644
index 00000000..1dbf6c4e
--- /dev/null
+++ b/project/oms/apps/AppLicense/AppLicense.vue
@@ -0,0 +1,178 @@
+<template>
+  <section class="AppLicense">
+    <ai-list>
+      <ai-title slot="title" title="证书管理" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="dialogForm={},dialog=true">添加</el-button>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="搜索证书名称" v-model="search.condition" clearable
+                      @change="page.current=1,getTableData()"/>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict"
+                  @selection-change="v=>ids=v.filter(e=>e.id).map(e=>e.id)">
+          <el-table-column slot="options" align="center" label="操作" fixed="right" width="160px">
+            <el-row type="flex" justify="center" align="middle" slot-scope="{row}">
+              <el-button type="text" @click="handleDownload(row.id)">下载</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+            </el-row>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <!--添加证书-->
+    <ai-dialog :title="dialogTitle" :visible.sync="dialog" width="600px"
+               @onConfirm="saveLicense">
+      <el-form ref="licenseForm" :model="dialogForm" :rules="rules" size="small"
+               label-width="120px">
+        <el-form-item required label="证书名称" prop="name">
+          <el-input v-model.trim="dialogForm.name" placeholder="请输入证书名称" clearable
+                    :maxLength="100"/>
+        </el-form-item>
+        <el-form-item label="主板序列号" prop="mainBoard">
+          <el-input v-model.trim="dialogForm.mainBoard" placeholder="请输入主板序列号" clearable
+                    :maxLength="50"/>
+        </el-form-item>
+        <el-form-item required label="CPU" prop="cpu">
+          <el-input v-model.trim="dialogForm.cpu" placeholder="请输入CPU信息" clearable
+                    :maxLength="50"/>
+        </el-form-item>
+        <el-form-item required label="MAC地址" prop="mac">
+          <el-input v-model.trim="dialogForm.mac" placeholder="请输入MAC地址" clearable
+                    :maxLength="100"/>
+        </el-form-item>
+        <el-form-item label="IP地址" prop="ipAddress">
+          <el-input v-model.trim="dialogForm.ipAddress" placeholder="请输入IP地址" clearable
+                    :maxLength="100"/>
+        </el-form-item>
+        <el-form-item label="过期日期" prop="expireDate">
+          <el-input v-model.trim="dialogForm.expireDate" placeholder="请输入过期日期" clearable
+                    :maxLength="20"/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+
+export default {
+  name: "AppLicense",
+  label: "证书管理",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    isEdit() {
+      return !!this.dialogForm.id
+    },
+    dialogTitle() {
+      return this.isEdit ? '修改证书' : '添加证书'
+    },
+    colConfigs() {
+      return [
+        {label: "证书名称", prop: "name"},
+        {label: "CPU", prop: "cpu", align: 'center'},
+        {label: "MAC地址", prop: "mac"},
+        {label: "主板序列号", prop: "mainBoard"},
+        {label: "IP地址", prop: "ipAddress"},
+        {label: "过期日期", prop: "expireDate"},
+        {label: "创建时间", prop: "createTime"},
+        {slot: "options"}
+      ]
+    },
+    rules() {
+      return {
+        name: [{required: true, message: "请输入证书名称"}],
+        cpu: [{required: true, message: "请输入CPU信息"}],
+        mac: [{required: true, message: "请输入MAC地址"}],
+        mainBoard: [{required: true, message: "请输入主板序列号"}],
+        ipAddress: [{required: true, message: "请输入IP地址"}],
+        expireDate: [{required: true, message: "请选择过期日期"}]
+      }
+    }
+  },
+  data() {
+    return {
+      page: {current: 1, size: 10, total: 0},
+      dialog: false,
+      dialogForm: {},
+      tableData: [],
+      search: {condition: ""},
+      ids: []
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/sysLicense/page", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    // 新增/修改
+    saveLicense() {
+      this.$refs.licenseForm.validate(v => {
+        if (v) {
+          this.instance.post("/sysLicense/save", this.dialogForm).then(res => {
+            if (res?.code == 0) {
+              this.dialog = false;
+              this.$message.success("保存成功")
+              this.getTableData();
+            } else {
+              this.$message.error(res?.msg)
+            }
+          })
+        }
+      })
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该证书信息?").then(() => {
+        this.instance.post("/sysLicense/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.getTableData();
+            this.$message.success("删除成功!");
+          }
+        })
+      }).catch(() => 0)
+    },
+    handleDownload(id) {
+      this.instance.post("/sysLicense/create?id="+id, null, {responseType: 'blob'}).then(res => {
+        const link = document.createElement('a')
+        console.log(res.type)
+        let blob = new Blob([res], {type: res.type})
+        link.style.display = 'none'
+        link.href = URL.createObjectURL(blob)
+        link.setAttribute('download', 'license.lic')
+        document.body.appendChild(link)
+        link.click()
+        document.body.removeChild(link)
+
+      }).catch(() => {
+        this.$message.error("证书生成失败!");
+      })
+    }
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppLicense {
+  height: 100%;
+
+}
+</style>
diff --git a/project/oms/apps/AppRoleRightsManager/AppRoleRightsManager.vue b/project/oms/apps/AppRoleRightsManager/AppRoleRightsManager.vue
new file mode 100644
index 00000000..87b68366
--- /dev/null
+++ b/project/oms/apps/AppRoleRightsManager/AppRoleRightsManager.vue
@@ -0,0 +1,416 @@
+<template>
+  <section class="AppRoleRightsManager">
+    <ai-list v-if="!showDetail">
+      <ai-title slot="title" title="角色管理" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #right>
+            <el-input
+                size="small"
+                v-model="search.roleName"
+                placeholder="角色名称"
+                clearable
+                @change="searchList()"
+                suffix-icon="iconfont iconSearch"/>
+          </template>
+        </ai-search-bar>
+        <ai-search-bar>
+          <template #left>
+            <el-button size="small" type="primary" icon="iconfont iconAdd"
+                       @click="$router.push({hash:'#add'})"
+                       v-if="$permissions('admin_sysapprole_add')">
+              添加
+            </el-button>
+            <el-button
+                size="small"
+                icon="iconfont iconDelete"
+                :disabled="!multipleSelection.length"
+                class="del-btn-list"
+                @click="deleteApp('all')"
+                v-if="$permissions('admin_sysapprole_del')"
+            >删除
+            </el-button>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="adminList" :colConfigs="colConfigs" :total="total" :current.sync="page.pageNum"
+                  :size.sync="page.pageSize"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict"
+                  @selection-change="v=>multipleSelection=v">
+          <el-table-column label="角色用户" slot="users" align="center">
+            <template slot-scope="scope">
+              <el-tooltip
+                  effect="light"
+                  placement="top"
+                  :disabled="scope.row.users.length <= 2"
+                  content="更多角色用户请点击详情按钮">
+              <span v-if="scope.row.users.length">
+                {{
+                  scope.row.users
+                  .slice(0, 2)
+                  .map((e) => e.name + "(" + e.phone + ")")
+                  .join(";")
+                }}
+                <span v-if="scope.row.users.length > 2">...</span>
+              </span>
+                <span v-else>-</span>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column slot="options" label="操作" fixed="right" align="center">
+            <template slot-scope="{row}">
+              <el-button type="text" @click="beforeCopy(row)" v-if="$permissions('admin_sysapprole_edit')">复制
+              </el-button>
+              <el-button type="text" @click="viewApp(row)" v-if="$permissions('admin_sysapprole_detail')">详情
+              </el-button>
+              <el-button type="text" @click="openRightsGraph(row)" v-if="$permissions('admin_sysapprole_detail')">关系图
+              </el-button>
+              <el-button type="text" @click="toAddAppRole(row)" v-if="$permissions('admin_sysapprole_edit')">编辑
+              </el-button>
+              <el-button type="text" @click="deleteApp(row)" v-if="$permissions('admin_sysapprole_del')">删除</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+        <ai-dialog
+            title="应用角色详情"
+            :visible.sync="viewShow"
+            width="600px"
+            customFooter>
+          <ai-card title="基本信息">
+            <template #content>
+              <ai-wrapper>
+                <ai-info-item label="应用角色名称" :value="viewInfo.name" isLine/>
+              </ai-wrapper>
+            </template>
+          </ai-card>
+          <ai-card title="权限信息">
+            <template #content>
+              <div style="margin-bottom: 16px" v-text="roleList.map(e => e.name).join('、')"/>
+            </template>
+          </ai-card>
+          <ai-card title="角色账号">
+            <template #right>
+              <span style="text-align: right; color: #999">
+                共<span style="color: #26f" v-text="userList.length"/>个账号
+              </span>
+            </template>
+            <template #content>
+              <div class="datail-table-body" v-if="userList.length">
+                <div class="datail-item" v-for="(item, index) in userList" :key="index">
+                  <span class="item-name">{{ item.name }}</span>
+                  <span style="color: #999">{{ item.phone }}</span>
+                </div>
+              </div>
+            </template>
+          </ai-card>
+          <template #footer>
+            <el-button
+                type="primary"
+                @click="toAddAppRole(viewInfo)"
+                v-if="$permissions('admin_sysapprole_edit')"
+            >编辑角色
+            </el-button>
+          </template>
+        </ai-dialog>
+        <ai-dialog title="权限关系图" :visible.sync="rightsGraph" class="rightsGraphDialog" customFooter>
+          <rights-graph :instance="instance" :dict="dict" :app="selectApp"/>
+          <el-button slot="footer" @click="rightsGraph=false">关闭</el-button>
+        </ai-dialog>
+        <!--复制角色-->
+        <el-dialog
+            class="editStyle"
+            :visible.sync="copyDialog"
+            width="520px"
+            @close="dataInit()"
+            title="复制角色">
+          <el-form :model="form" label-width="80px">
+            <el-form-item label="角色名" :rules="[{ required: true, message: '', trigger: 'blur' }]">
+              <el-input
+                  v-model="editName"
+                  placeholder="请输入..."
+                  size="small"
+                  clearable
+              />
+            </el-form-item>
+          </el-form>
+          <div slot="footer" style="text-align: center">
+            <el-button
+                style="width: 92px"
+                size="small"
+                @click="copyDialog = false"
+            >取消
+            </el-button
+            >
+            <el-button
+                style="width: 92px"
+                size="small"
+                type="primary"
+                @click="copyFn()"
+                :disabled="!editName"
+            >
+              确认
+            </el-button>
+          </div>
+        </el-dialog>
+      </template>
+    </ai-list>
+    <rights-add v-else :instance="instance" :dict="dict" :permissions="permissions"/>
+  </section>
+</template>
+
+<script>
+import RightsAdd from "./rightsAdd";
+import RightsGraph from "./rightsGraph";
+
+export default {
+  name: "AppRoleRightsManager",
+  components: {RightsGraph, RightsAdd},
+  label: "权限管理(运营平台版)",
+  provide() {
+    return {
+      top: this
+    }
+  },
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    actions: {
+      default: () => ({
+        list: '/admin/role/page',
+        apps: '/admin/role/list-all',
+        delete: '/admin/role/del',
+        detail: '/admin/role/queryById-checked',
+        modify: '/admin/role/modify',
+      })
+    }
+  },
+  computed: {
+    colConfigs() {
+      return [
+        {type: "selection"},
+        {label: "角色名", prop: "name", width: '100px'},
+        {label: "用户数量", prop: "roleCount", align: 'center', width: '80px'},
+        {slot: "users"},
+        {slot: "options"}
+      ]
+    },
+    showDetail() {
+      return this.$route.hash == "#add"
+    }
+  },
+  data() {
+    return {
+      page: {pageNum: 1, pageSize: 10},
+      search: {roleName: ''},
+      adminList: [], //列表数据
+      total: 0,
+      multipleSelection: [],
+      delShow: false,
+      delParams: "",
+      delIds: [],
+      viewShow: false,
+      viewInfo: {},
+      roleList: [], //详情权限列表
+      row: {},
+      copyDialog: false,
+      titleDel: "",
+      form: {},
+      editName: "",
+      userList: [],
+      rightsGraph: false,
+      selectApp: {}
+    };
+  },
+  created() {
+    this.getTableData();
+  },
+  methods: {
+    //查询table列表
+    getTableData() {
+      this.adminList = [];
+      this.instance.post(this.actions.list, null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.total = res.data.total;
+          this.adminList = res.data.records;
+        }
+      })
+    },
+    //查询
+    searchList() {
+      this.page.pageNum = 1;
+      this.getTableData();
+    },
+    //添加按钮
+    toAddAppRole(item) {
+      this.$router.push({
+        hash: "#add",
+        query: {
+          id: item.id,
+          name: item.name
+        },
+      });
+    },
+    //删除
+    deleteApp(e) {
+      if (e == "all") {
+        this.multipleSelection.map((item) => {
+          this.delIds.push(item.id);
+        });
+        this.delParams = `ids=${this.delIds}`;
+        this.titleDel = "确定要执行删除操作吗？";
+      } else {
+        this.delParams = `ids=${e.id}`;
+        this.titleDel = "确定需要删除该角色吗？";
+      }
+      this.$confirm(this.titleDel, {
+        type: "error",
+      }).then(() => {
+        this.instance.post(`${this.actions.delete}?${this.delParams}`).then(res => {
+          if (res?.msg == "success") {
+            this.getTableData();
+          } else {
+            this.$message.error(res.msg);
+          }
+        });
+      }).catch(() => 0);
+    },
+    //查看信息
+    viewApp(e) {
+      this.userList = e.users;
+      this.viewInfo = e;
+      this.viewShow = true;
+      this.getRowInfo(this.viewInfo.appId, this.viewInfo.id);
+    },
+    //查询 row 信息
+    getRowInfo(appId, id) {
+      this.roleList = [];
+      this.instance.post(`${this.actions.detail}?id=${appId}&roleId=${id}`)
+      .then(res => {
+        if (res?.data) {
+          this.roleList = res.data.filter(e => e.checked)
+        }
+      })
+    },
+    //复制
+    beforeCopy(row) {
+      this.row = row;
+      this.copyDialog = true;
+      this.getRowInfo(this.row.appId, this.row.id);
+    },
+    //确认复制
+    copyFn() {
+      let crr = [];
+      let appRoleList = this.roleList;
+      for (let i = 0; i < appRoleList.length; i++) {
+        if (appRoleList[i].checked) {
+          crr.push(appRoleList[i].id);
+          if (appRoleList[i].list.length) {
+            for (let j = 0; j < appRoleList[i].list.length; j++) {
+              if (appRoleList[i].list[j].checked) {
+                crr.push(appRoleList[i].list[j].id);
+              }
+            }
+          }
+        }
+      }
+      this.instance.post(`${this.actions.modify}?menus=${crr}`, null, {
+        params: {
+          roleName: this.editName,
+          appId: this.row.appId,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.$message({message: "复制成功", type: "success"});
+          this.copyDialog = false;
+          this.searchList()
+        }
+      });
+    },
+    dataInit() {
+      this.multipleSelection = [];
+      this.row = {};
+    },
+    openRightsGraph(row) {
+      this.rightsGraph = true
+      this.selectApp = row
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppRoleRightsManager {
+  height: 100%;
+
+
+  ::v-deep .ai-dialog {
+    .ai-card {
+      box-shadow: none;
+      border: 1px solid #eee;
+
+      .aibar {
+        height: 40px;
+        background: #f3f6f9;
+      }
+
+      .ai-card__body {
+        padding: 0 16px;
+      }
+    }
+  }
+
+  ::v-deep .rightsGraphDialog {
+    .el-dialog__body {
+      padding: 0;
+    }
+
+    .ai-dialog__content {
+      padding-bottom: 0;
+    }
+  }
+
+  ::v-deep .datail-table-body {
+    width: 100%;
+    height: auto;
+    margin-bottom: 16px;
+    display: flex;
+    flex-wrap: wrap;
+
+    .datail-item {
+      flex-shrink: 0;
+      width: 50%;
+      height: 24px;
+      line-height: 24px;
+
+      span {
+        display: inline-block;
+        font-size: 12px;
+      }
+
+      .item-name {
+        width: 102px;
+        padding-left: 16px;
+        color: #333;
+      }
+    }
+
+    .datail-item:nth-of-type(2n - 1) {
+      border-right: 1px solid rgba(208, 212, 220, 1);
+      width: calc(50% - 1px);
+    }
+  }
+
+  .padd-l0 {
+    padding-left: 0 !important;
+  }
+
+  .pad-l16 {
+    padding-left: 16px;
+  }
+
+
+}
+</style>
diff --git a/project/oms/apps/AppRoleRightsManager/rightsAdd.vue b/project/oms/apps/AppRoleRightsManager/rightsAdd.vue
new file mode 100644
index 00000000..c22c76a7
--- /dev/null
+++ b/project/oms/apps/AppRoleRightsManager/rightsAdd.vue
@@ -0,0 +1,190 @@
+<template>
+  <ai-detail class="rightsAdd">
+    <ai-title :title="addTitle" slot="title" isShowBottomBorder isShowBack @onBackClick="back"/>
+    <template #content>
+      <el-form size="small" ref="rightsForm" :model="form" label-width="120px" :rules="rules">
+        <ai-card title="基本信息">
+          <template #content>
+            <el-form-item label="应用角色名称" prop="roleName">
+              <el-input v-model="form.roleName" placeholder="请输入应用角色名称" clearable/>
+            </el-form-item>
+          </template>
+        </ai-card>
+        <ai-card title="权限信息">
+          <template #content>
+            <el-form-item label="权限列表" prop="menus">
+              <div class="roleList">
+                <el-input v-model="filterText" placeholder="请输入..." clearable suffix-icon="iconfont iconSearch"
+                          @change="$refs.tree.filter(filterText)" :validate-event="false"/>
+                <div class="tree_list">
+                  <el-tree class="filter-tree" ref="roleTree"
+                           :data="roleList"
+                           show-checkbox
+                           :props="defaultProps"
+                           default-expand-all
+                           :check-strictly="false"
+                           node-key="id"
+                           :default-checked-keys="form.menus"
+                           :filter-node-method="filterNode"
+                           @check="handleMenusSelect"/>
+                </div>
+              </div>
+            </el-form-item>
+          </template>
+        </ai-card>
+      </el-form>
+    </template>
+    <template #footer>
+      <el-button @click="back()">取消</el-button>
+      <el-button type="primary" @click="confirm">保存</el-button>
+    </template>
+  </ai-detail>
+</template>
+<script>
+
+export default {
+  name: "rightsAdd",
+  inject: ['top'],
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {
+      form: {},
+      roleName: '',
+      id: '',
+      appList: [],
+      roleList: [],
+      defaultProps: {
+        children: 'list',
+        label: 'name'
+      },
+      treeList: [],
+      filterText: '',
+      msgTitle: '添加'
+    }
+  },
+  created() {
+    if (this.isEdit) {
+      let {id, name: roleName} = this.$route.query
+      this.form = {menus: [], id, roleName}
+      this.msgTitle = '编辑'
+    }
+    this.getPermissions()
+  },
+  computed: {
+    isEdit() {
+      return this.$route.query.id
+    },
+    addTitle() {
+      return this.isEdit ? '编辑应用角色' : '新增应用角色'
+    },
+    rules() {
+      return {
+        roleName: {required: true, message: '请输入应用角色名称'},
+        menus: {required: true, message: '请选择权限列表内容'},
+      }
+    }
+  },
+  methods: {
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
+    //应用名称选择 获取权限列表
+    getId(data) {
+      if (data.list.length) {
+        data.list.forEach(item => {
+          this.getId(item)
+        })
+      } else {
+        if (data.checked) {
+          this.form.menus?.push(data.id)
+        }
+      }
+    },
+    getPermissions() {
+      this.filterText = ''
+      let {id: roleId} = this.form
+      this.instance.post(this.top.actions.detail, null, {
+        params: {roleId}
+      }).then(res => {
+        if (res?.data) {
+          this.roleList = res.data;
+          if (this.isEdit) {
+            this.roleList.forEach(e => this.getId(e))
+          }
+          this.roleList = this.roleList.filter(item => !(item.component && item.isApp == 0 && item.isMenu == 0))
+        }
+      })
+    },
+    handleMenusSelect(node, selected) {
+      this.$set(this.form, 'menus', [...selected?.checkedKeys])
+      this.$refs.rightsForm.validateField('menus')
+    },
+    //保存提交
+    confirm() {
+      this.$refs.rightsForm.validate(v => {
+        if (v) {
+          let menus = [this.$refs.roleTree?.getHalfCheckedKeys(), this.$refs.roleTree?.getCheckedKeys()]?.flat()?.toString()
+          this.instance.post(this.top.actions.modify, null, {
+            params: {...this.form, menus}
+          }).then(res => {
+            if (res?.msg == "success") {
+              this.$message.success(`${this.msgTitle}应用角色成功`)
+              this.back()
+              this.top.searchList()
+            }
+          })
+        }
+      })
+    },
+    //取消 返回
+    back() {
+      this.$router.push({})
+    }
+  },
+}
+</script>
+<style lang="scss" scoped>
+.rightsAdd {
+  width: 100%;
+  height: 100%;
+  position: relative;
+
+  .el-form-item {
+    .el-select {
+      width: 100%;
+    }
+
+    &.is-error {
+      .roleList {
+        border-color: #f46;
+      }
+    }
+  }
+
+  .roleList {
+    background-color: #fcfcfc;
+    border-radius: 2px;
+    border: solid 1px #d0d4dc;
+    padding: 8px;
+
+    .input {
+      display: flex;
+      justify-content: space-between;
+      padding: 5px;
+      margin: 0;
+    }
+
+    .tree_list {
+      padding: 5px;
+      height: 370px;
+      overflow: auto;
+    }
+  }
+
+}
+</style>
diff --git a/project/oms/apps/AppRoleRightsManager/rightsGraph.vue b/project/oms/apps/AppRoleRightsManager/rightsGraph.vue
new file mode 100644
index 00000000..f25b62c2
--- /dev/null
+++ b/project/oms/apps/AppRoleRightsManager/rightsGraph.vue
@@ -0,0 +1,192 @@
+<template>
+  <section class="rightsGraph">
+    <div id="RightGraph"/>
+  </section>
+</template>
+
+<script>
+import * as echarts from "echarts";
+
+export default {
+  name: "rightsGraph",
+  inject: ['top'],
+  props: {
+    instance: Function,
+    dict: Object,
+    app: Object
+  },
+  computed: {
+    graphData() {
+      let data = [...this.users, ...this.nodes].map(e => {
+        if (e.x) {
+          return e
+        } else return {...e, ...this.renderPosition(e)}
+      })
+      return [
+        {
+          data,
+          links: this.links,
+          categories: data.map(e => e.category).flat().map(name => ({name}))
+        }
+      ]
+    }
+  },
+  data() {
+    return {
+      graph: null,
+      nodes: [],
+      links: [],
+      users: []
+    }
+  },
+  watch: {
+    graphData: {
+      deep: true, handler() {
+        this.refreshGraph()
+      }
+    }
+  },
+  methods: {
+    initGraph() {
+      let dom = document.querySelector("#RightGraph")
+      if (dom) {
+        this.graph = echarts.init(dom)
+        this.graph.setOption({
+          tooltip: {},
+          series: [
+            {
+              type: 'graph',
+              layout: 'none',
+              roam: true,
+              label: {
+                show: true,
+                position: 'right',
+                formatter: '{b}'
+              },
+              labelLayout: {
+                hideOverlap: true,
+              },
+              scaleLimit: {
+                min: 0.4,
+                max: 4
+              },
+              lineStyle: {
+                color: 'target',
+                curveness: 0.1
+              },
+              emphasis: {
+                focus: 'adjacency',
+                lineStyle: {
+                  width: 5
+                }
+              }
+            }
+          ]
+        })
+        this.graph.on('click', this.handleNodeClick)
+      }
+    },
+    refreshGraph() {
+      this.graph?.setOption({
+        series: this.graphData
+      })
+    },
+    getAppRoles(role) {
+      if (role) {
+        this.nodes.push({...role, category: '应用角色', value: "应用角色", symbolSize: 15})
+      } else this.instance.post(this.top.actions.list, null, {
+        params: {pageSize: 999}
+      }).then(res => {
+        if (res?.data) {
+          res.data.records.map(e => {
+            this.getUsers(e.users, e.id)
+            this.nodes.push({...e, category: '应用角色', value: "应用角色"})
+          })
+        }
+      })
+    },
+    getUsers(pending, source) {
+      pending?.map(e => {
+        if (!this.users.some(u => u.id == e.phone)) {
+          this.users.push({id: e.phone, name: e.name, symbolSize: 5, category: '用户', value: "用户"})
+        }
+        this.links.push({source, target: e.phone})
+      })
+    },
+    getPermissions({id: roleId, name: category, dataIndex}) {
+      const addNodes = (list, source, category, pos) => {
+        list?.map(e => {
+          let node = {
+            ...e,
+            symbolSize: 5,
+            category,
+            value: e.list?.length > 0 ? "应用" : "权限",
+          }
+          node = {...node, ...this.renderPosition(pos || node)}
+          this.nodes.splice(dataIndex, 0, node)
+          if (e.checked == 1) {
+            this.links.push({source, target: e.id})
+          }
+          addNodes(e.list, e.id, e.label, node)
+        })
+      }
+      roleId && this.instance.post(this.top.actions.detail, null, {
+        params: {roleId}
+      }).then(res => {
+        if (res?.data) {
+          addNodes(res.data, roleId, category)
+        }
+      })
+    },
+    handleNodeClick(v) {
+      let {data: role, dataIndex} = v
+      if (!this.nodes.some(e => e.category == role?.name)) {
+        role && this.getPermissions({...role, dataIndex})
+      }
+    },
+    renderPosition(node) {
+      node = JSON.parse(JSON.stringify(node))
+      let pos = {x: 0, y: 0}
+      if (node?.x) {
+        pos.x = Math.max(this.graph?.getWidth() / 3 * 2, node.x) + 100 + Math.random() * 50
+        pos.y = node.y + Math.random() * 100 - 50
+      } else if (node.value == '应用角色') {
+        pos.x = this.graph?.getWidth() / 3 - 200 + Math.random() * 200
+        pos.y = this.graph?.getHeight() / 2 - 100 + Math.random() * 200
+      } else if (node.value == '应用') {
+        pos.x = this.graph?.getWidth() / 3 * 2 - 100 + Math.random() * 100
+        pos.y = Math.random() * this.graph?.getHeight()
+      } else if (node.value == '用户') {
+        pos.x = Math.random() * 50
+        pos.y = Math.random() * this.graph?.getHeight()
+      } else {
+        pos.x = this.graph?.getWidth() - 100 + Math.random() * 100
+        pos.y = Math.random() * this.graph?.getHeight()
+      }
+      return pos
+    }
+  },
+  created() {
+    this.getAppRoles(this.app)
+    this.getUsers(this.app.users, this.app.id)
+    this.getPermissions(this.app)
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initGraph()
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.rightsGraph {
+  height: 100%;
+
+  ::v-deep #RightGraph {
+    width: 100%;
+    height: 100%;
+    min-height: 500px;
+  }
+}
+</style>
diff --git a/project/oms/apps/AppSaas/AppSaas.vue b/project/oms/apps/AppSaas/AppSaas.vue
new file mode 100644
index 00000000..c99843b5
--- /dev/null
+++ b/project/oms/apps/AppSaas/AppSaas.vue
@@ -0,0 +1,197 @@
+<template>
+  <section class="AppSaas">
+    <ai-list>
+      <ai-title slot="title" title="平台配置" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="dialogForm = {}, dialog=true">添加</el-button>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="搜索名称" v-model="search.condition" clearable
+                      @change="page.current=1,getTableData()"/>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict"
+                  @selection-change="v=>ids=v.filter(e=>e.id).map(e=>e.id)">
+          <el-table-column slot="options" align="center" label="操作" fixed="right" width="240px">
+            <el-row type="flex" justify="center" align="middle" slot-scope="{row}">
+              <el-button type="text" @click="handleEnter(row.accessUrl)">打开</el-button>
+              <el-button type="text" @click="handleUpdate(row)">修改</el-button>
+              <el-button type="text" @click="handleUpdatePwd(row)">修改密码</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+            </el-row>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <!--添加SAAS平台-->
+    <ai-dialog :title="dialogTitle" :visible.sync="dialog" width="600px"
+               @onConfirm="saveSaas">
+      <el-form ref="saasForm" :model="dialogForm" :rules="rules" size="small"
+               label-width="120px">
+        <el-form-item required label="名称" prop="name">
+          <el-input v-model.trim="dialogForm.name" placeholder="请输入SaaS平台名称" clearable
+                    :maxLength="50"/>
+        </el-form-item>
+        <el-form-item required label="账号" prop="username">
+          <el-input v-model.trim="dialogForm.username" placeholder="请输入平台账号" clearable
+                    :maxLength="50"/>
+        </el-form-item>
+        <el-form-item required label="密码" prop="password" v-if="!isEdit" :rules="[{required: true, message: '请输入平台密码'}]">
+          <el-input v-model.trim="dialogForm.password" placeholder="请输入平台密码" clearable
+                    :maxLength="100"/>
+        </el-form-item>
+        <el-form-item label="访问地址" prop="accessUrl">
+          <el-input v-model.trim="dialogForm.accessUrl" placeholder="请输入访问地址" clearable
+                    :maxLength="255"/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+    <!--修改密码-->
+    <ai-dialog title="修改密码" :visible.sync="updateDialog" width="600px"
+               @onConfirm="updatePwd">
+      <el-form ref="updatePwdForm" :model="updatePwdForm" :rules="updateRules" size="small"
+               label-width="120px">
+        <el-form-item required label="密码" prop="password">
+          <el-input v-model.trim="updatePwdForm.password" placeholder="请输入平台密码" clearable
+                    :maxLength="100"/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+
+export default {
+  name: "AppSaas",
+  label: "Saas平台管理",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    isEdit() {
+      return !!this.dialogForm.id
+    },
+    dialogTitle() {
+      return this.isEdit ? '修改SaaS平台' : '添加SaaS平台'
+    },
+    colConfigs() {
+      return [
+        {label: "名称", prop: "name"},
+        {label: "账号", prop: "username", align: 'center'},
+        {label: "访问地址", prop: "accessUrl"},
+        {label: "创建时间", prop: "createTime"},
+        {slot: "options"}
+      ]
+    },
+    rules() {
+      return {
+        name: [{required: true, message: "请输入SaaS平台名称"}],
+        username: [{required: true, message: "请输入平台账号"}],
+        accessUrl: [{required: true, message: "请输入访问地址"}]
+      }
+    },
+    updateRules() {
+      return {
+        password: [{required: true, message: "请输入平台密码"}]
+      }
+    }
+  },
+  data() {
+    return {
+      page: {current: 1, size: 10, total: 0},
+      dialog: false,
+      updateDialog: false,
+      dialogForm: {},
+      updatePwdForm: {password: ''},
+      tableData: [],
+      search: {condition: ""},
+      ids: [],
+      currentSaas: ''
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/appSaas/page", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    // 新增/修改
+    saveSaas() {
+      this.$refs.saasForm.validate(v => {
+        if (v) {
+          this.instance.post("/appSaas/addOrUpdate", this.dialogForm).then(res => {
+            if (res?.code == 0) {
+              this.dialog = false;
+              this.$message.success("保存成功")
+              this.getTableData();
+            } else {
+              this.$message.error(res?.msg)
+            }
+          })
+        }
+      })
+    },
+    // 新增/修改
+    updatePwd() {
+      this.$refs.updatePwdForm.validate(v => {
+        if (v) {
+          this.updatePwdForm.id = this.currentSaas.id
+          this.instance.post("/appSaas/updatePwd", null, {params: this.updatePwdForm}).then(res => {
+            if (res?.code == 0) {
+              this.updateDialog = false;
+              this.$message.success("密码修改成功")
+            } else {
+              this.$message.error(res?.msg)
+            }
+          })
+        }
+      })
+    },
+    handleUpdatePwd(row) {
+      this.currentSaas = row
+      this.updatePwdForm.password = ''
+      this.updateDialog = true
+    },
+    handleUpdate(row) {
+      this.dialogForm = row
+      this.dialog = true
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该Saas信息?").then(() => {
+        this.instance.post("/appSaas/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.getTableData();
+            this.$message.success("删除成功!");
+          }
+        })
+      }).catch(() => 0)
+    },
+    handleEnter(accessUrl) {
+      window.open(accessUrl, "_blank");
+    }
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppSaas {
+  height: 100%;
+
+}
+</style>
diff --git a/project/oms/core.import.json b/project/oms/core.import.json
new file mode 100644
index 00000000..ac27eb29
--- /dev/null
+++ b/project/oms/core.import.json
@@ -0,0 +1,8 @@
+{
+  "AppDictionary": "数据字典",
+  "AppRightsManager": "权限管理",
+  "AppMenuManager": "菜单管理",
+  "AppSystemAccount": "账号管理",
+  "AppQyWxConfig": "企业微信配置",
+  "AppUserInfo": "个人中心"
+}
diff --git a/project/oms/package.json b/project/oms/package.json
new file mode 100644
index 00000000..80a4397c
--- /dev/null
+++ b/project/oms/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "dvcp-oms",
+  "description": "运营中心分包",
+  "version": "2.0.0",
+  "main": "dist/dvcp-oms.common.js",
+  "files": [
+    "dist"
+  ],
+  "publishConfig": {
+    "registry": "http://192.168.1.87:4873/"
+  },
+  "dependencies": {
+    "dvcp-ui": "^1.42.2"
+  }
+}
diff --git a/vue.config.js b/vue.config.js
index 2094746a..4c62f6b4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -71,15 +71,12 @@ module.exports = {
           '^/lan': '/'
         }
       },
-      '/oms': {
+      '/omsapi': {
         target: 'http://192.168.1.87:19898',
         changeOrigin: true,
         pathRewrite: {
           //地址重写
-          '^/oms/app/': '/',
-          '^/oms/auth/': '/',
-          '^/oms/admin/': '/',
-          '^/oms': '/'
+          '^/omsapi': '/'
         }
       },
       '/xsjr': {

From f2508c58235a398875d088db183897b8634f2b97 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 12:07:48 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppCompany/AppCompany.vue    |  35 ++
 .../oms/apps/AppCompany/components/List.vue   |  39 +-
 .../apps/AppCompany/components/Statistics.vue | 550 +++++++++---------
 3 files changed, 337 insertions(+), 287 deletions(-)
 create mode 100644 project/oms/apps/AppCompany/AppCompany.vue

diff --git a/project/oms/apps/AppCompany/AppCompany.vue b/project/oms/apps/AppCompany/AppCompany.vue
new file mode 100644
index 00000000..7606c893
--- /dev/null
+++ b/project/oms/apps/AppCompany/AppCompany.vue
@@ -0,0 +1,35 @@
+<template>
+  <section class="AppCompany">
+    <component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
+  </section>
+</template>
+
+<script>
+
+import List from "./components/List";
+import Sta from "./components/Statistics";
+
+export default {
+  name: "AppCompany",
+  label: "企业管理",
+  components: {List, Sta},
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentComponent() {
+      return this.$route.hash == "#sta" ? Sta : List
+    }
+  },
+  created() {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppCompany {
+  height: 100%;
+}
+</style>
diff --git a/project/oms/apps/AppCompany/components/List.vue b/project/oms/apps/AppCompany/components/List.vue
index 37999c0e..d4bd515d 100644
--- a/project/oms/apps/AppCompany/components/List.vue
+++ b/project/oms/apps/AppCompany/components/List.vue
@@ -7,10 +7,10 @@
           <template #left>
             <el-select v-model="search.saasId" size="small" placeholder="请选择saas平台" @change="getDataInit">
               <el-option
-                v-for="item in saasList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.id">
+                  v-for="item in saasList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.id">
               </el-option>
             </el-select>
           </template>
@@ -38,7 +38,7 @@
         </ai-table>
       </template>
     </ai-list>
-    <ai-dialog :title="dialogTitle" :visible.sync="dialog" width="600px"  @onConfirm="saveSaas">
+    <ai-dialog :title="dialogTitle" :visible.sync="dialog" width="600px" @onConfirm="saveSaas">
       <el-form ref="saasForm" :model="dialogForm" :rules="rules" size="small" label-width="120px">
         <el-form-item required label="名称" prop="name">
           <el-input v-model.trim="dialogForm.name" placeholder="请输入saas企业名称" clearable :maxLength="50"/>
@@ -46,27 +46,28 @@
         <el-form-item required label="saas平台" prop="saasId">
           <el-select v-model="dialogForm.saasId" placeholder="请选择saas平台" style="width:100%;">
             <el-option
-              v-for="item in saasList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.id">
+                v-for="item in saasList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item required label="地区" prop="areaId" :rules="[{required: true, message: '请选择发布地区'}]">
-          <ai-area-get :instance="instance" v-model="dialogForm.areaId" :name.sync="dialogForm.areaName" />
+          <ai-area-get :instance="instance" v-model="dialogForm.areaId" :name.sync="dialogForm.areaName"/>
         </el-form-item>
         <el-form-item required label="企业CORP_ID" prop="corpId" :rules="[{required: true, message: '请输入企业CORP_ID'}]">
-          <el-input v-model.trim="dialogForm.corpId" placeholder="请输入企业CORP_ID" clearable  :maxLength="50"/>
+          <el-input v-model.trim="dialogForm.corpId" placeholder="请输入企业CORP_ID" clearable :maxLength="50"/>
         </el-form-item>
         <el-form-item label="AGENT_ID" prop="corpAgentId">
-          <el-input v-model.trim="dialogForm.corpAgentId" placeholder="请输入企业AGENT_ID" clearable  :maxLength="50"/>
+          <el-input v-model.trim="dialogForm.corpAgentId" placeholder="请输入企业AGENT_ID" clearable :maxLength="50"/>
         </el-form-item>
         <el-form-item label="CORP_SECRET" prop="corpSecret">
-          <el-input v-model.trim="dialogForm.corpSecret" placeholder="请输入企业CORP_SECRET" clearable  :maxLength="50"/>
+          <el-input v-model.trim="dialogForm.corpSecret" placeholder="请输入企业CORP_SECRET" clearable :maxLength="50"/>
         </el-form-item>
         <el-form-item label="企业通讯录SECRET" prop="corpAddressBookSecret">
-          <el-input v-model.trim="dialogForm.corpAddressBookSecret" placeholder="请输入企业通讯录SECRET" clearable  :maxLength="50"/>
+          <el-input v-model.trim="dialogForm.corpAddressBookSecret" placeholder="请输入企业通讯录SECRET" clearable
+                    :maxLength="50"/>
         </el-form-item>
         <el-form-item label="访问地址" prop="accessUrl" :rules="[{required: true, message: '请输入访问地址'}]">
           <el-input v-model.trim="dialogForm.accessUrl" placeholder="请输入访问地址" clearable
@@ -156,7 +157,7 @@ export default {
       this.$refs.saasForm.validate(v => {
         if (v) {
           this.saasList.map(item => {
-            if(item.id == this.dialogForm.saasId) {
+            if (item.id == this.dialogForm.saasId) {
               this.dialogForm.saasName = item.name
             }
           })
@@ -190,7 +191,7 @@ export default {
     },
     handleSync(corpId) {
       this.$confirm("是否确定同步该企业数据?").then(() => {
-        this.instance.post("/appCorpStat/syncData?corpId="+corpId, null, {}).then(res => {
+        this.instance.post("/appCorpStat/syncData?corpId=" + corpId, null, {}).then(res => {
           if (res?.code == 0) {
             this.getTableData();
             this.$message.success("同步成功!");
@@ -202,10 +203,8 @@ export default {
       window.open(accessUrl, "_blank");
     },
     toStatistics(item) {
-      this.$emit('change', {
-        type: 'Statistics',
-        params: item
-      })
+      let {corpId} = item
+      this.$router.push({query: {corpId}, hash: "#sta"})
     },
   },
   created() {
diff --git a/project/oms/apps/AppCompany/components/Statistics.vue b/project/oms/apps/AppCompany/components/Statistics.vue
index 9fc3b3e9..b10e11d0 100644
--- a/project/oms/apps/AppCompany/components/Statistics.vue
+++ b/project/oms/apps/AppCompany/components/Statistics.vue
@@ -10,23 +10,23 @@
           <el-row :gutter="20">
             <el-col :span="5">
               <div class="title">群总数</div>
-              <div class="num">{{info.groupCount}}</div>
+              <div class="num">{{ info.groupCount }}</div>
             </el-col>
             <el-col :span="5">
               <div class="title">成员总数</div>
-              <div class="num">{{info.userCount}}</div>
+              <div class="num">{{ info.userCount }}</div>
             </el-col>
             <el-col :span="5">
               <div class="title">成员活跃总数</div>
-              <div class="num">{{info.activeCount}}</div>
+              <div class="num">{{ info.activeCount }}</div>
             </el-col>
             <el-col :span="5">
               <div class="title">居民总人数</div>
-              <div class="num">{{info.residentCount}}</div>
+              <div class="num">{{ info.residentCount }}</div>
             </el-col>
             <el-col :span="4">
               <div class="title">群成员总数</div>
-              <div class="num">{{info.groupuserCount}}</div>
+              <div class="num">{{ info.groupuserCount }}</div>
             </el-col>
           </el-row>
         </template>
@@ -34,7 +34,9 @@
       <ai-card title="统计信息" class="chart-content">
         <template #title>
           <div class="tabs">
-            <div class="item" v-for="(item, index) in tabs" :key="index" :class="index == activeIndex ? 'active' : ''" @click="tabClick(index)">{{item}}</div>
+            <div class="item" v-for="(item, index) in tabs" :key="index" :class="index == activeIndex ? 'active' : ''"
+                 @click="tabClick(index)">{{ item }}
+            </div>
           </div>
         </template>
         <template #content>
@@ -43,30 +45,31 @@
             <ai-search-bar>
               <template slot="right">
                 <el-input
-                  v-model="innerMemberId"
-                  size="small"
-                  placeholder="输入群成员ID"
-                  @keyup.enter.native="(page.current = 1), getTableData()"
-                  clearable
-                  prefix-icon="iconfont iconSearch"
+                    v-model="innerMemberId"
+                    size="small"
+                    placeholder="输入群成员ID"
+                    @keyup.enter.native="(page.current = 1), getTableData()"
+                    clearable
+                    prefix-icon="iconfont iconSearch"
                 />
                 <el-button
-                  type="primary"
-                  icon="iconfont iconSearch"
-                  size="small"
-                  @click="(page.current = 1), getTableData()"
-                  >查询
+                    type="primary"
+                    icon="iconfont iconSearch"
+                    size="small"
+                    @click="(page.current = 1), getTableData()"
+                >查询
                 </el-button>
                 <el-button
-                  icon="el-icon-refresh-right"
-                  size="small"
-                  @click="resetSearch"
-                  >重置</el-button
+                    icon="el-icon-refresh-right"
+                    size="small"
+                    @click="resetSearch"
+                >重置
+                </el-button
                 >
               </template>
             </ai-search-bar>
             <ai-table :tableData="gropList" :total="page.total" :current.sync="page.current" :size.sync="page.size"
-              @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+                      @getList="getTableData" :col-configs="colConfigs" :dict="dict">
               <!-- <el-table-column slot="options" align="center" label="操作" fixed="right" width="240px">
                 <div class="table-options" slot-scope="{ row }">
                   <el-button type="text">打开</el-button>
@@ -75,8 +78,9 @@
             </ai-table>
           </div>
           <div class="table" v-else-if="activeIndex == 3">
-            <ai-table :tableData="userList" :total="userPage.total" :current.sync="userPage.current" :size.sync="userPage.size"
-              @getList="getUserTableData" :col-configs="userColConfigs" :dict="dict">
+            <ai-table :tableData="userList" :total="userPage.total" :current.sync="userPage.current"
+                      :size.sync="userPage.size"
+                      @getList="getUserTableData" :col-configs="userColConfigs" :dict="dict">
               <!-- <el-table-column slot="options" align="center" label="操作" fixed="right" width="240px">
                 <div class="table-options" slot-scope="{ row }">
                   <el-button type="text">打开</el-button>
@@ -91,274 +95,286 @@
 </template>
 
 <script>
-  import * as echarts from 'echarts'
-  export default {
-    name: 'Statistics',
+import * as echarts from 'echarts'
 
-    props: {
-      instance: Function,
-      dict: Object,
-      permissions: Function,
-      params: Object
-    },
+export default {
+  name: 'Statistics',
 
-    data () {
-      return {
-        info: {},
-        activeIndex: 0,
-        tabs: ['概览', '群统计',  '群列表', '成员与好友统计'],
-        listData: [],
-        pieData: [],
-        myChart: null,
-        gropList: [],
-        page: {current: 1, size: 10, total: 0},
-        innerMemberId: '',
-        userList: [],
-        userPage: {current: 1, size: 10, total: 0}
-      }
-    },
-    computed: { 
-      colConfigs() {
-        return [
-          {label: "群名", prop: "name", width:200},
-          {label: "创建时间", prop: "createTime", align: 'center', width:150},
-          {label: "群成员数", prop: "memberCount", align: 'center', width:100},
-          {label: "群主ID", prop: "owner", align: 'center', width:150},
-          {label: "群公告", prop: "notice"},
-        ]
-      },
-      userColConfigs() {
-        return [
-          {label: "部门", prop: "departmentName"},
-          {label: "姓名", prop: "name", align: 'center'},
-          {label: "添加好友人数", prop: "residentCount", align: 'center'}
-        ]
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+  },
 
-    mounted() {
-      this.getInfo()
-      this.getTableData()
-      this.getUserTableData()
+  data() {
+    return {
+      info: {},
+      activeIndex: 0,
+      tabs: ['概览', '群统计', '群列表', '成员与好友统计'],
+      listData: [],
+      pieData: [],
+      myChart: null,
+      gropList: [],
+      page: {current: 1, size: 10, total: 0},
+      innerMemberId: '',
+      userList: [],
+      userPage: {current: 1, size: 10, total: 0}
+    }
+  },
+  computed: {
+    colConfigs() {
+      return [
+        {label: "群名", prop: "name", width: 200},
+        {label: "创建时间", prop: "createTime", align: 'center', width: 150},
+        {label: "群成员数", prop: "memberCount", align: 'center', width: 100},
+        {label: "群主ID", prop: "owner", align: 'center', width: 150},
+        {label: "群公告", prop: "notice"},
+      ]
     },
+    userColConfigs() {
+      return [
+        {label: "部门", prop: "departmentName"},
+        {label: "姓名", prop: "name", align: 'center'},
+        {label: "添加好友人数", prop: "residentCount", align: 'center'}
+      ]
+    },
+    params() {
+      return this.$route.query || {}
+    }
+  },
 
-    methods: {
-      chartInit() {
-        var option = {}
-        if(this.activeIndex != 1) {
-          option = {
-            tooltip: {
-              trigger: 'axis'
+  created() {
+    this.getTableData()
+    this.getUserTableData()
+  },
+  mounted() {
+    this.getInfo()
+  },
+
+  methods: {
+    chartInit() {
+      var option = {}
+      if (this.activeIndex != 1) {
+        option = {
+          tooltip: {
+            trigger: 'axis'
+          },
+          legend: {
+            data: ['群总数', '成员总数', '成员活跃总数', '居民总人数', '群成员总数']
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'category',
+            data: this.listData[5],
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: [
+            {
+              name: '群总数',
+              type: 'line',
+              data: this.listData[0]
             },
-            legend: {
-              data: ['群总数', '成员总数', '成员活跃总数', '居民总人数', '群成员总数']
+            {
+              name: '成员总数',
+              type: 'line',
+              data: this.listData[1]
             },
-            grid: {
-              left: '3%',
-              right: '4%',
-              bottom: '3%',
-              containLabel: true
+            {
+              name: '成员活跃总数',
+              type: 'line',
+              data: this.listData[2]
             },
-            xAxis: {
-              type: 'category',
-              data: this.listData[5],
+            {
+              name: '居民总人数',
+              type: 'line',
+              data: this.listData[3]
             },
-            yAxis: {
-              type: 'value'
+            {
+              name: '群成员总数',
+              type: 'line',
+              data: this.listData[4]
             },
-            series: [
-              {
-                name: '群总数',
-                type: 'line',
-                data: this.listData[0]
-              },
-              {
-                name: '成员总数',
-                type: 'line',
-                data: this.listData[1]
-              },
-              {
-                name: '成员活跃总数',
-                type: 'line',
-                data: this.listData[2]
-              },
-              {
-                name: '居民总人数',
-                type: 'line',
-                data: this.listData[3]
-              },
-              {
-                name: '群成员总数',
-                type: 'line',
-                data: this.listData[4]
-              },
-            ]
-          };
-        }else {
-          option = {
-            tooltip: {
-              trigger: 'item'
-            },
-            legend: {
-              orient: 'vertical',
-              left: 'left'
-            },
-            series: [
-              {
-                type: 'pie',
-                radius: '50%',
-                data: this.pieData,
-                emphasis: {
-                  itemStyle: {
-                    shadowBlur: 10,
-                    shadowOffsetX: 0,
-                    shadowColor: 'rgba(0, 0, 0, 0.5)'
-                  }
+          ]
+        };
+      } else {
+        option = {
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            orient: 'vertical',
+            left: 'left'
+          },
+          series: [
+            {
+              type: 'pie',
+              radius: '50%',
+              data: this.pieData,
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
                 }
               }
-            ]
-          };
+            }
+          ]
+        };
+      }
+      this.myChart.setOption(option);
+    },
+    getInfo() {
+      this.myChart = echarts.init(document.getElementById("echart"));
+      this.instance.post(`/appCorpStat/getLatestInfo?corpId=${this.params.corpId}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+          this.getCharInfo()
         }
-        this.myChart.setOption(option);
-      },
-      getInfo() {
-        this.myChart = echarts.init(document.getElementById("echart"));
-        this.instance.post(`/appCorpStat/getLatestInfo?corpId=${this.params.corpId}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            this.getCharInfo()
-          }
-        })
-      },
-      getCharInfo() {
-        this.instance.post(`/appCorpStat/getLatestThreeMonthStat?corpId=${this.params.corpId}`).then(res => {
-          if (res.code === 0) {
-            if(res.data && res.data.length) {
-              this.listData = []
-              this.listData[0] =  res.data.map(v => v.groupCount)
-              this.listData[1] =  res.data.map(v => v.userCount)
-              this.listData[2] =  res.data.map(v => v.activeCount)
-              this.listData[3] =  res.data.map(v => v.residentCount)
-              this.listData[4] =  res.data.map(v => v.groupuserCount)
-              this.listData[5] = res.data.map(v => v.statDate)
-              this.chartInit()
-            }
-          }
-        })
-
-        this.instance.post(`/wxcp/wxgroup/groupStatistic?corpId=${this.params.corpId}`).then(res => {
-          if (res.code === 0) {
-            if(res.data) {
-              this.pieData = []
-              Object.getOwnPropertyNames(res.data).forEach((key) => {
-                var e = {
-                  value: res.data[key],
-                  name: key
-                }
-                this.pieData.push(e)
-              });
-            }
-          }
-        })
-      },
-
-      resetSearch() {
-        this.innerMemberId = ''
-        this.page.current = 1
-        this.getTableData()
-      },
-      getTableData() {
-        this.instance.post(`/wxcp/wxgroup/list?corpId=${this.params.corpId}&current=${this.page.current}&size=${this.page.size}&innerMemberId=${this.innerMemberId}`,).then(res => {
-          if (res.code === 0) {
-            if(res.data) {
-              this.gropList = res.data.records
-              this.page.total = res.data.total
-            }
-          }
-        })
-      },
-      getUserTableData() {
-        this.instance.post(`/wxcp/wxuser/userStat?corpId=${this.params.corpId}&current=${this.userPage.current}&size=${this.userPage.size}&mainDepartment=1`,).then(res => {
-          if (res.code === 0) {
-            if(res.data) {
-              this.userList = res.data.records
-              this.userPage.total = res.data.total
-            }
-          }
-        })
-      },
-      onBack () {
-        this.$emit('change', {
-          type: 'list'
-        })
-      },
-      tabClick(index) {
-        this.activeIndex = index
-        this.myChart.dispose()
-        if(index != 2 && index != 3) {
-          this.$nextTick(() => {
-            this.myChart = echarts.init(document.getElementById("echart"));
+      })
+    },
+    getCharInfo() {
+      this.instance.post(`/appCorpStat/getLatestThreeMonthStat?corpId=${this.params.corpId}`).then(res => {
+        if (res.code === 0) {
+          if (res.data && res.data.length) {
+            this.listData = []
+            this.listData[0] = res.data.map(v => v.groupCount)
+            this.listData[1] = res.data.map(v => v.userCount)
+            this.listData[2] = res.data.map(v => v.activeCount)
+            this.listData[3] = res.data.map(v => v.residentCount)
+            this.listData[4] = res.data.map(v => v.groupuserCount)
+            this.listData[5] = res.data.map(v => v.statDate)
             this.chartInit()
-          })
+          }
         }
+      })
+
+      this.instance.post(`/wxcp/wxgroup/groupStatistic?corpId=${this.params.corpId}`).then(res => {
+        if (res.code === 0) {
+          if (res.data) {
+            this.pieData = []
+            Object.getOwnPropertyNames(res.data).forEach((key) => {
+              var e = {
+                value: res.data[key],
+                name: key
+              }
+              this.pieData.push(e)
+            });
+          }
+        }
+      })
+    },
+
+    resetSearch() {
+      this.innerMemberId = ''
+      this.page.current = 1
+      this.getTableData()
+    },
+    getTableData() {
+      this.instance.post(`/wxcp/wxgroup/list?corpId=${this.params.corpId}&current=${this.page.current}&size=${this.page.size}&innerMemberId=${this.innerMemberId}`,).then(res => {
+        if (res.code === 0) {
+          if (res.data) {
+            this.gropList = res.data.records
+            this.page.total = res.data.total
+          }
+        }
+      })
+    },
+    getUserTableData() {
+      this.instance.post(`/wxcp/wxuser/userStat?corpId=${this.params.corpId}&current=${this.userPage.current}&size=${this.userPage.size}&mainDepartment=1`,).then(res => {
+        if (res.code === 0) {
+          if (res.data) {
+            this.userList = res.data.records
+            this.userPage.total = res.data.total
+          }
+        }
+      })
+    },
+    onBack() {
+      this.$router.push({})
+    },
+    tabClick(index) {
+      this.activeIndex = index
+      this.myChart.dispose()
+      if (index != 2 && index != 3) {
+        this.$nextTick(() => {
+          this.myChart = echarts.init(document.getElementById("echart"));
+          this.chartInit()
+        })
       }
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
-  .cover {
-    display: block;
-    width: 300px;
-    height: 140px;
-    margin: 20px auto;
+.cover {
+  display: block;
+  width: 300px;
+  height: 140px;
+  margin: 20px auto;
+}
+
+.subTitle {
+  text-align: center;
+  font-size: 12px;
+  font-weight: normal;
+}
+
+.title {
+  line-height: 60px;
+  font-size: 18px;
+  text-align: center;
+  color: #666;
+}
+
+.num {
+  font-size: 32px;
+  font-weight: 700;
+  text-align: center;
+  padding-bottom: 20px;
+}
+
+.tabs {
+  .item {
+    display: inline-block;
+    padding: 0 20px;
+    line-height: 54px;
+    cursor: pointer;
   }
 
-  .subTitle {
-    text-align: center;
-    font-size: 12px;
-    font-weight: normal;
+  .active {
+    color: #26f;
+    border-bottom: 2px solid #26f;
   }
-  .title{
-    line-height: 60px;
-    font-size: 18px;
-    text-align: center;
-    color: #666;
+}
+
+.chart-content {
+  height: calc(100% - 240px);
+
+  ::v-deep .ai-card__body {
+    height: calc(100% - 70px);
   }
-  .num{
-    font-size: 32px;
-    font-weight: 700;
-    text-align: center;
-    padding-bottom: 20px;
-  }
-  .tabs{
-    .item{
-      display: inline-block;
-      padding: 0 20px;
-      line-height: 54px;
-      cursor: pointer;
-    }
-    .active{
-      color: #26f;
-      border-bottom: 2px solid #26f;
-    }
-  }
-  .chart-content{
-    height: calc(100% - 240px);
-    ::v-deep .ai-card__body{
-       height: calc(100% - 70px);
-    }
-    .echart{
-      width: 100%;
-      height: 100%;
-    }
-    .table{
-      width: 100%;
-      height: 100%;
-      overflow-y: scroll;
-    }
-  }
-  ::v-deep .ai-detail__content--wrapper{
+
+  .echart {
+    width: 100%;
     height: 100%;
   }
+
+  .table {
+    width: 100%;
+    height: 100%;
+    overflow-y: scroll;
+  }
+}
+
+::v-deep .ai-detail__content--wrapper {
+  height: 100%;
+}
 </style>

From edf03dbb5d4f92835599ad8d6e9eb97d6cdda3a6 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 12:21:24 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=91=E5=8A=A1?=
 =?UTF-8?q?=E5=85=AC=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppArticles/AppArticles.vue  |  33 ++
 .../oms/apps/AppArticles/components/Add.vue   |  15 +-
 .../apps/AppArticles/components/Detail.vue    |  88 ++--
 .../oms/apps/AppArticles/components/Event.vue | 407 +++++++++---------
 4 files changed, 274 insertions(+), 269 deletions(-)
 create mode 100644 project/oms/apps/AppArticles/AppArticles.vue

diff --git a/project/oms/apps/AppArticles/AppArticles.vue b/project/oms/apps/AppArticles/AppArticles.vue
new file mode 100644
index 00000000..8e8fbb2a
--- /dev/null
+++ b/project/oms/apps/AppArticles/AppArticles.vue
@@ -0,0 +1,33 @@
+<template>
+  <section class="AppArticles">
+    <component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
+  </section>
+</template>
+
+<script>
+import Add from "./components/Add";
+import Detail from "./components/Detail";
+import Event from "./components/Event";
+
+export default {
+  name: "AppArticles",
+  label: "村务公开(运营版)",
+  components: {Event, Detail, Add},
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentComponent() {
+      return this.$route.hash == "#add" ? Add :
+          !!this.$route.query?.id ? Detail : Event
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppArticles {
+}
+</style>
diff --git a/project/oms/apps/AppArticles/components/Add.vue b/project/oms/apps/AppArticles/components/Add.vue
index 3e2ebafb..d9f9c3bc 100644
--- a/project/oms/apps/AppArticles/components/Add.vue
+++ b/project/oms/apps/AppArticles/components/Add.vue
@@ -54,7 +54,6 @@ export default {
 
   props: {
     dict: Object,
-    params: Object,
     instance: Function,
     areaId: String
   },
@@ -78,7 +77,10 @@ export default {
   },
 
   computed: {
-    ...mapState(['user'])
+    ...mapState(['user']),
+    params() {
+      return this.$route.query
+    }
   },
 
   created() {
@@ -89,7 +91,7 @@ export default {
 
   methods: {
     onBack() {
-      this.cancel()
+      this.$router.push({})
     },
 
     getInfo() {
@@ -124,13 +126,6 @@ export default {
         }
       })
     },
-
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'list',
-        isRefresh: !!isRefresh
-      })
-    }
   }
 }
 </script>
diff --git a/project/oms/apps/AppArticles/components/Detail.vue b/project/oms/apps/AppArticles/components/Detail.vue
index c1e445db..a1a550bf 100644
--- a/project/oms/apps/AppArticles/components/Detail.vue
+++ b/project/oms/apps/AppArticles/components/Detail.vue
@@ -20,58 +20,58 @@
 </template>
 
 <script>
-  export default {
-    name: 'detail',
+export default {
+  name: 'detail',
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+  },
 
-    props: {
-      instance: Function,
-      dict: Object,
-      permissions: Function,
-      params: Object
-    },
+  data() {
+    return {
+      info: {}
+    }
+  },
+  computed: {
+    params() {
+      return this.$route.query
+    }
+  },
+  mounted() {
+    this.getInfo()
+  },
 
-    data () {
-      return {
-        info: {}
-      }
-    },
-
-    mounted () {
-      this.getInfo()
-    },
-
-    methods: {
-      getInfo () {
-        this.instance.post(`/appvillageinfo/queryDetailById?id=${this.params.id}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            if (res.data.thumbUrl) {
-              this.info.thumbUrl = JSON.parse(res.data.thumbUrl)
-            }
+  methods: {
+    getInfo() {
+      this.instance.post(`/appvillageinfo/queryDetailById?id=${this.params.id}`).then(res => {
+        if (res?.data) {
+          this.info = res.data
+          if (res.data.thumbUrl) {
+            this.info.thumbUrl = JSON.parse(res.data.thumbUrl)
           }
-        })
-      },
+        }
+      })
+    },
 
-      onBack () {
-        this.$emit('change', {
-          type: 'list'
-        })
-      }
+    onBack() {
+      this.$router.push({})
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
-  .cover {
-    display: block;
-    width: 300px;
-    height: 140px;
-    margin: 20px auto;
-  }
+.cover {
+  display: block;
+  width: 300px;
+  height: 140px;
+  margin: 20px auto;
+}
 
-  .subTitle {
-    text-align: center;
-    font-size: 12px;
-    font-weight: normal;
-  }
+.subTitle {
+  text-align: center;
+  font-size: 12px;
+  font-weight: normal;
+}
 </style>
diff --git a/project/oms/apps/AppArticles/components/Event.vue b/project/oms/apps/AppArticles/components/Event.vue
index bce67543..bde7c754 100644
--- a/project/oms/apps/AppArticles/components/Event.vue
+++ b/project/oms/apps/AppArticles/components/Event.vue
@@ -1,56 +1,56 @@
 <template>
   <section class="event">
     <ai-list>
-      <ai-title  slot="title" title="村务公开" isShowBottomBorder></ai-title>
+      <ai-title slot="title" title="村务公开" isShowBottomBorder></ai-title>
       <template slot="content">
         <ai-search-bar>
           <template slot="left">
-            <el-button icon="iconfont iconAdd" type="primary" size="small" @click="add">添加</el-button>
+            <el-button icon="iconfont iconAdd" type="primary" size="small" @click="toAdd">添加</el-button>
           </template>
           <template slot="right">
             <el-input
-              placeholder="请输入标题"
-              size="small"
-              clearable
-              v-model="search.title"
-              @keyup.enter.native="search.current = 1, getList()"
-              @clear="search.current = 1, search.title = '', getList()"
-              suffix-icon="iconfont iconSearch" />
+                placeholder="请输入标题"
+                size="small"
+                clearable
+                v-model="search.title"
+                @keyup.enter.native="search.current = 1, getList()"
+                @clear="search.current = 1, search.title = '', getList()"
+                suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
         <div class="ai-table">
           <ai-table
-            :tableData="tableData"
-            :col-configs="colConfigs"
-            :total="total"
-            :current.sync="search.current"
-            :size.sync="search.size"
-            @getList="getList">
+              :tableData="tableData"
+              :col-configs="colConfigs"
+              :total="total"
+              :current.sync="search.current"
+              :size.sync="search.size"
+              @getList="getList">
             <el-table-column slot="options" label="操作" align="center" width="250" fixed="right">
               <template slot-scope="{ row }" class="fs-14">
                 <div class="table-options">
                   <el-button
-                    type="text"
-                    @click="publish(row)"
-                    title="发布">
-                     发布
+                      type="text"
+                      @click="publish(row)"
+                      title="发布">
+                    发布
                   </el-button>
                   <el-button
-                    type="text"
-                    title="详情"
-                    @click="toDetail(row.id)">
+                      type="text"
+                      title="详情"
+                      @click="toDetail(row.id)">
                     详情
                   </el-button>
                   <el-button
-                    type="text"
-                    title="编辑"
-                    @click="toAdd(row.id)">
+                      type="text"
+                      title="编辑"
+                      @click="toEdit(row.id)">
                     编辑
                   </el-button>
                   <el-button
-                    @click="remove(row.id)"
-                    type="text"
-                    title="删除">
+                      @click="remove(row.id)"
+                      type="text"
+                      title="删除">
                     删除
                   </el-button>
                 </div>
@@ -60,30 +60,31 @@
         </div>
       </template>
     </ai-list>
-    <ai-dialog title="请选择发布平台企业" :visible.sync="dialog" width="600px"  @onConfirm="saveSaas">
+    <ai-dialog title="请选择发布平台企业" :visible.sync="dialog" width="600px" @onConfirm="saveSaas">
       <el-form ref="saasForm" :model="dialogForm" size="small" label-width="120px">
         <el-form-item required label="saas平台" prop="saasId" :rules="[{required: true, message: '请选择saas平台'}]">
           <el-select v-model="dialogForm.saasId" placeholder="请选择saas平台" style="width:100%;" @change="getCompanyList">
             <el-option
-              v-for="item in saasList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.id">
+                v-for="item in saasList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item required label="saas企业" prop="corpId" :rules="[{required: true, message: '请选择saas企业'}]">
           <el-select v-model="dialogForm.corpId" placeholder="请选择saas企业" style="width:100%;" @change="selectCompany">
             <el-option
-              v-for="item in companyList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.id">
+                v-for="item in companyList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item required label="地区" prop="areaId" :rules="[{required: true, message: '请选择发布地区'}]">
-          <ai-area-get :instance="instance" v-model="dialogForm.areaId" :root="rootId" :name.sync="dialogForm.areaName" />
+          <ai-area-get :instance="instance" v-model="dialogForm.areaId" :root="rootId"
+                       :name.sync="dialogForm.areaName"/>
         </el-form-item>
       </el-form>
     </ai-dialog>
@@ -91,202 +92,178 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 
-  export default {
-    name: 'event',
+export default {
+  name: 'event',
 
-    props: {
-      instance: Function,
-      dict: Object,
-    },
+  props: {
+    instance: Function,
+    dict: Object,
+  },
 
-    computed: {
-      ...mapState(['user']),
-      colConfigs() {
-        return [
-          { prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v) },
-          { prop: 'title', label: '标题', align: 'left' },
-          { prop: 'createDate', label: '创建时间', dateFormart: 'YYYY-MM-DD', align: 'center' },
-          { prop: 'createUser', label: '发布人', align: 'center' },
-          { slot: 'options', label: '操作' }
-        ]
-      }
-    },
+  computed: {
+    ...mapState(['user']),
+    colConfigs() {
+      return [
+        {prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v)},
+        {prop: 'title', label: '标题', align: 'left'},
+        {prop: 'createDate', label: '创建时间', dateFormart: 'YYYY-MM-DD', align: 'center'},
+        {prop: 'createUser', label: '发布人', align: 'center'},
+        {slot: 'options', label: '操作'}
+      ]
+    }
+  },
 
-    data () {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          title: ''
-        },
-        total: 0,
-        ids: [],
-        tableData: [],
-        dialog: false,
-        dialogForm: {},
-        saasList: [],
-        companyList: [],
-        rootId: ''
-      }
-    },
-    mounted () {
-      this.dict.load('villInfoType').then(() => {
-        this.getList()
-        this.getsaasList()
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        title: ''
+      },
+      total: 0,
+      ids: [],
+      tableData: [],
+      dialog: false,
+      dialogForm: {},
+      saasList: [],
+      companyList: [],
+      rootId: ''
+    }
+  },
+  mounted() {
+    this.dict.load('villInfoType').then(() => {
+      this.getList()
+      this.getsaasList()
+    })
+  },
+
+  methods: {
+    getsaasList() {
+      this.instance.post("/appSaas/page", null, {
+        params: {size: 10000}
+      }).then(res => {
+        if (res?.data) {
+          this.saasList = res.data?.records
+        }
       })
     },
 
-    methods: {
-      getsaasList() {
-        this.instance.post("/appSaas/page", null, {
-          params: {size: 10000}
-        }).then(res => {
-          if (res?.data) {
-            this.saasList = res.data?.records
+    getCompanyList() {
+      this.instance.post("/appCorp/page", null, {
+        params: {saasId: this.dialogForm.saasId, size: 10000}
+      }).then(res => {
+        if (res?.data) {
+          this.companyList = res.data.records
+          this.rootId = ''
+          this.dialogForm.areaId = ''
+          this.corpId = ''
+        }
+      })
+    },
+
+    selectCompany() {
+      this.companyList.map(item => {
+        if (item.id == this.dialogForm.corpId) {
+          this.rootId = item.areaId
+          this.dialogForm.areaId = item.areaId
+        }
+      })
+    },
+
+    getList() {
+      this.instance.post(`/appvillageinfo/list`, null, {
+        params: {
+          ...this.search,
+          areaId: this.areaId
+        }
+      }).then(res => {
+        if (res.data) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
+
+    publish(params) {
+      this.dialogForm.id = params.id
+      this.dialog = true
+    },
+
+    toAdd() {
+      this.$router.push({hash: "#add"})
+    },
+    toEdit(id) {
+      this.$router.push({hash: "#add", query: {id}})
+    },
+
+    toDetail(id) {
+      this.$router.push({query: {id}})
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appvillageinfo/delete?ids=${id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('删除成功！')
+            this.getList()
           }
         })
-      },
+      })
+    },
 
-      getCompanyList() {
-        this.instance.post("/appCorp/page", null, {
-          params: {saasId:this.dialogForm.saasId, size: 10000}
-        }).then(res => {
-          if (res?.data) {
-            this.companyList = res.data.records
-            this.rootId = ''
-            this.dialogForm.areaId = ''
-            this.corpId = ''
-          }
-        })
-      },
-
-      selectCompany() {
-        this.companyList.map(item => {
-          if(item.id == this.dialogForm.corpId) {
-            this.rootId = item.areaId
-            this.dialogForm.areaId = item.areaId
-          }
-        })
-      },
-
-      getList () {
-        this.instance.post(`/appvillageinfo/list`, null, {
-          params: {
-            ...this.search,
-            areaId: this.areaId
-          }
-        }).then(res => {
-          if (res.data) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
-
-      publish (params) {
-        this.dialogForm.id = params.id
-        this.dialog = true
-      },
-
-      toAdd (id) {
-        this.$emit('change', {
-          type: 'add',
-          params: {
-            id
-          }
-        })
-      },
-
-      add () {
-        this.$emit('change', {
-          type: 'add',
-          params: {
-            id: ''
-          }
-        })
-      },
-
-      toEdit (id) {
-        this.$emit('change', {
-          type: 'add',
-          params: {
-            type: 'ReportAdd',
-            id
-          }
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'detail',
-          params: {
-            type: 'eventDetail',
-            id
-          }
-        })
-      },
-
-      remove (id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appvillageinfo/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
+    saveSaas() {
+      this.$refs.saasForm.validate(v => {
+        if (v) {
+          this.instance.post(`/appvillageinfo/sync?corpId=${this.dialogForm.corpId}&id=${this.dialogForm.id}&areaId=${this.dialogForm.areaId}`).then(res => {
+            if (res?.code == 0) {
+              this.dialog = false;
+              this.$message.success("发布成功")
+              this.dialogForm = {}
+            } else {
+              this.$message.error(res?.msg)
             }
           })
-        })
-      },
-
-      saveSaas() {
-        this.$refs.saasForm.validate(v => {
-          if (v) {
-            this.instance.post(`/appvillageinfo/sync?corpId=${this.dialogForm.corpId}&id=${this.dialogForm.id}&areaId=${this.dialogForm.areaId}`).then(res => {
-              if (res?.code == 0) {
-                this.dialog = false;
-                this.$message.success("发布成功")
-                this.dialogForm = {}
-              } else {
-                this.$message.error(res?.msg)
-              }
-            })
-          }
-        })
-      },
-    }
+        }
+      })
+    },
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .event {
-    height: 100%;
-    ::v-deep th {
-      font-weight: bold!important;
-    }
-    ::v-deep .table-options{
-      span{
-        font-size: 14px!important;
-      }
+.event {
+  height: 100%;
+
+  ::v-deep th {
+    font-weight: bold !important;
+  }
+
+  ::v-deep .table-options {
+    span {
+      font-size: 14px !important;
     }
   }
-  .table-btn {
-    margin-right: 16px;
-    font-size: 14px;
-    color: #2266FF;
-    cursor: pointer;
+}
 
-    &:hover {
-      opacity: 0.6;
-    }
+.table-btn {
+  margin-right: 16px;
+  font-size: 14px;
+  color: #2266FF;
+  cursor: pointer;
 
-    &:last-child {
-      margin-right: 0;
-    }
-
-    &:last-child:hover {
-      color: #f46;
-      opacity: 1;
-    }
+  &:hover {
+    opacity: 0.6;
   }
+
+  &:last-child {
+    margin-right: 0;
+  }
+
+  &:last-child:hover {
+    color: #f46;
+    opacity: 1;
+  }
+}
 </style>

From dcbe39d228a46dedb6735c65cb97a0f48eaade1b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 12:22:56 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=8E=A5=E5=85=A5=20=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppFeedback/AppFeedback.vue  |  66 +++++++++
 .../apps/AppFeedback/components/Detail.vue    |  74 ++++++++++
 .../oms/apps/AppFeedback/components/List.vue  | 126 ++++++++++++++++++
 3 files changed, 266 insertions(+)
 create mode 100644 project/oms/apps/AppFeedback/AppFeedback.vue
 create mode 100644 project/oms/apps/AppFeedback/components/Detail.vue
 create mode 100644 project/oms/apps/AppFeedback/components/List.vue

diff --git a/project/oms/apps/AppFeedback/AppFeedback.vue b/project/oms/apps/AppFeedback/AppFeedback.vue
new file mode 100644
index 00000000..615a4d67
--- /dev/null
+++ b/project/oms/apps/AppFeedback/AppFeedback.vue
@@ -0,0 +1,66 @@
+<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>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List'
+  import Detail from './components/Detail'
+
+  export default {
+    name: 'AppFeedback',
+    label: '意见反馈',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        include: []
+      }
+    },
+
+    components: {
+      List,
+      Detail
+    },
+
+    mounted () {
+    },
+
+    methods: {
+      onChange (data) {
+        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()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .doc-circulation {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/project/oms/apps/AppFeedback/components/Detail.vue b/project/oms/apps/AppFeedback/components/Detail.vue
new file mode 100644
index 00000000..dd8b1d80
--- /dev/null
+++ b/project/oms/apps/AppFeedback/components/Detail.vue
@@ -0,0 +1,74 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <ai-wrapper>
+            <ai-info-item label="意见详情" isLine :value="info.opinion"></ai-info-item>
+            <ai-info-item label="联系人" isLine :value="info.contacts"></ai-info-item>
+            <ai-info-item label="联系方式" isLine :value="info.phone"></ai-info-item>
+            <ai-info-item label="反馈平台" isLine :value="info.sourceHost"></ai-info-item>
+            <ai-info-item label="图片" isLine>
+              <ai-uploader v-model="info.images" disabled :instance="instance" :limit="9"></ai-uploader>
+            </ai-info-item>
+          </ai-wrapper>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {},
+        id: ''
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/appfeedback/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.info.images = res.data.pictureUrl ? res.data.pictureUrl.split(',').map(v => {
+              return {
+                url: v
+              }
+            }) : []
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/project/oms/apps/AppFeedback/components/List.vue b/project/oms/apps/AppFeedback/components/List.vue
new file mode 100644
index 00000000..d264b1ea
--- /dev/null
+++ b/project/oms/apps/AppFeedback/components/List.vue
@@ -0,0 +1,126 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title title="意见反馈" isShowBottomBorder></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template slot="right">
+          <el-input
+            v-model="search.opinion"
+            class="search-input"
+            size="small"
+            @keyup.enter.native="search.current = 1, getList()"
+            placeholder="内容描述/上报人"
+            clearable
+            @change="getList"
+            @clear="search.current = 1, search.opinion = '', 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">
+        <el-table-column slot="tags" label="标签">
+          <template slot-scope="{ row }">
+            <div class="table-tags">
+              <el-tag type="info" v-for="(item, index) in row.tags" size="small" :key="index">{{ item }}</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+          <div class="table-options" slot-scope="{ row }">
+            <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+            <el-button type="text" @click="remove(row.id)">删除</el-button>
+          </div>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          opinion: ''
+        },
+        currIndex: -1,
+        areaList: [],
+        total: 10,
+        colConfigs: [
+          {prop: 'opinion', label: '内容描述', align: 'left'},
+          {prop: 'contacts', label: '上报人', align: 'center' },
+          {prop: 'phone', label: '联系方式', align: 'center'},
+          {prop: 'sourceHost', label: '平台', align: 'center' },
+          {prop: 'createTime', label: '发布时间', align: 'center' },
+          {slot: 'options', label: '操作'}
+        ],
+        tableData: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    mounted() {
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/appfeedback/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/appfeedback/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>

From cb2aa2c46a53ab49641a04396927da95ad24cd64 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 15:25:07 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 -
 .../apps/AppMassMessage/AppMassMessage.vue    |  35 ++++++
 .../xiushan/apps/AppMassMessage/mmDetail.vue  | 110 ++++++++++++++++++
 .../xiushan/apps/AppMassMessage/mmList.vue    |  96 +++++++++++++++
 4 files changed, 241 insertions(+), 1 deletion(-)
 create mode 100644 project/xiushan/apps/AppMassMessage/AppMassMessage.vue
 create mode 100644 project/xiushan/apps/AppMassMessage/mmDetail.vue
 create mode 100644 project/xiushan/apps/AppMassMessage/mmList.vue

diff --git a/package.json b/package.json
index 3c70065a..02b0a1bc 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
   "main": "lib/cw-webapps.common.js",
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
     "lib": "vue-cli-service build --no-clean --target lib --dest lib packages/index.js&&npm unpublish --force&&npm publish",
     "lib:core": "vue-cli-service build --target lib --dest core/dist core/index.js --name vc-app-core&&npm unpublish --force&&npm publish",
     "lib:project": "node project/build.js",
diff --git a/project/xiushan/apps/AppMassMessage/AppMassMessage.vue b/project/xiushan/apps/AppMassMessage/AppMassMessage.vue
new file mode 100644
index 00000000..11b270f3
--- /dev/null
+++ b/project/xiushan/apps/AppMassMessage/AppMassMessage.vue
@@ -0,0 +1,35 @@
+<template>
+  <section class="AppMassMessage">
+    <component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
+  </section>
+</template>
+
+<script>
+
+import PumDetail from "./mmDetail";
+import PumList from "./mmList";
+
+export default {
+  name: "AppMassMessage",
+  components: {PumList, PumDetail},
+  label: "群众留言",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentComponent() {
+      return !!this.$route.query.id ? PumDetail : PumList
+    }
+  },
+  created() {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppMassMessage {
+  height: 100%;
+}
+</style>
diff --git a/project/xiushan/apps/AppMassMessage/mmDetail.vue b/project/xiushan/apps/AppMassMessage/mmDetail.vue
new file mode 100644
index 00000000..89a003bf
--- /dev/null
+++ b/project/xiushan/apps/AppMassMessage/mmDetail.vue
@@ -0,0 +1,110 @@
+<template>
+  <section class="mmDetail">
+    <ai-detail>
+      <ai-title slot="title" title="留言详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
+        <template #rightBtn>
+          <el-button type="primary">回复留言</el-button>
+          <el-button>关闭留言</el-button>
+        </template>
+      </ai-title>
+      <template #content>
+        <el-form size="small">
+          <ai-card class="header">
+            <template #title>
+              <b v-text="detail.title||'标题'"/>
+              <el-row type="flex">
+                <el-form-item label="留言编号">{{ detail.createTime || "-" }}</el-form-item>
+                <el-form-item label="留言时间">{{ detail.createTime || "-" }}</el-form-item>
+                <el-form-item label="留言人">{{ detail.createUserName || "-" }}</el-form-item>
+              </el-row>
+              <ai-icon type="svg" :icon="statusImages[detail.status||0]"/>
+            </template>
+            <template #content>
+              <div v-html="detail.content"/>
+            </template>
+          </ai-card>
+          <ai-card title="沟通记录">
+            <template #content>
+
+            </template>
+          </ai-card>
+        </el-form>
+      </template>
+    </ai-detail>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "mmDetail",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    statusImages() {
+      return {
+        0: "iconno_response",
+        1: "iconreplied",
+        2: "iconfinished"
+      }
+    }
+  },
+  data() {
+    return {
+      detail: {},
+    }
+  },
+  methods: {
+    getDetail() {
+      let {id} = this.$route.query
+      this.instance.post("/appportaluserenterprise/queryDetailById", null, {
+        params: {id}
+      }).then(res => {
+        if (res?.data) {
+          this.detail = res.data
+        }
+      })
+    },
+  },
+  created() {
+    this.getDetail()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.mmDetail {
+  height: 100%;
+
+  ::v-deep.header {
+    position: relative;
+
+    .el-form-item {
+      width: 33%;
+    }
+
+    .aibar {
+      height: auto;
+
+      .aibar-left {
+        width: 100%;
+        font-weight: normal;
+      }
+
+      b {
+        line-height: 56px;
+      }
+    }
+
+    .AiIcon {
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      width: 80px;
+      height: 80px;
+    }
+  }
+}
+</style>
diff --git a/project/xiushan/apps/AppMassMessage/mmList.vue b/project/xiushan/apps/AppMassMessage/mmList.vue
new file mode 100644
index 00000000..f1b327e1
--- /dev/null
+++ b/project/xiushan/apps/AppMassMessage/mmList.vue
@@ -0,0 +1,96 @@
+<template>
+  <section class="mmList">
+    <ai-list>
+      <ai-title slot="title" title="群众留言" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <ai-select v-model="search.type" placeholder="留言状态"/>
+            <ai-select v-model="search.type" placeholder="留言类型"/>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="搜索企业名称、法人姓名、登录账号" v-model="search.enterpriseName" clearable
+                      @change="page.current=1,getTableData()"/>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="options" label="操作" fixed="right" align="center">
+            <template slot-scope="{row}">
+              <el-button v-if="row.status==0" type="text" @click="handleEnable(row)">公示</el-button>
+              <el-button v-else-if="row.status==1" type="text" @click="handleEnable(row)">取消公示</el-button>
+              <el-button type="text" @click="showDetail(row.id)">详情</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "mmList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  data() {
+    return {
+      search: {name: ""},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      colConfigs: [
+        {label: "标题", prop: "enterpriseName"},
+        {label: "类型", prop: "enterpriseType", dict: "enterpriseType"},
+        {label: "内容", prop: "content"},
+        {label: "留言人", prop: "createUserName"},
+        {label: "留言提交时间", prop: "createTime"},
+        {label: "最后回复时间", prop: "loginAccount"},
+        {slot: "options"}
+      ]
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/appportaluserenterprise/list", null, {
+        params: {...this.page, ...this.search, status: 1}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    showDetail(id) {
+      this.$router.push({query: {id}})
+    },
+    handleEnable(row) {
+      let status = (Number(row.status) + 1) % 2
+      this.$confirm(`是否要${this.dict.getLabel('portalUserStatus', status)}留言?`).then(() => {
+        this.instance.post("/appportaluser/addOrUpdate", {...row, status}).then(res => {
+          if (res?.code == 0) {
+            this.$message.success(this.dict.getLabel('portalUserStatus', status) + "成功!")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    },
+  },
+  created() {
+    this.getTableData()
+    this.search.areaId = this.user.info.areaId
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.mmList {
+}
+</style>

From c41730e9a4cd577fba41207204aee81ef3be437d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 16:17:59 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=B1=B1=E4=B8=9C=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88=E5=90=88=E5=B9=B6=E8=87=B3?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=89=88=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/meta/AppResident/AppResident.vue     |    8 +-
 .../meta}/AppResident/auditList.vue           |    0
 .../meta}/AppResident/audtiDetail.vue         |    0
 project/shandong10086/apps.import.json        |    3 +-
 .../apps/shandong/AppResident/AppResident.vue |  195 ---
 .../apps/shandong/AppResident/listTpl.vue     |  352 ------
 .../shandong/AppResident/localResident.vue    | 1123 -----------------
 .../shandong/AppResident/mobileResident.vue   | 1116 ----------------
 .../apps/shandong/AppResident/residentSta.vue |  445 -------
 9 files changed, 7 insertions(+), 3235 deletions(-)
 rename {project/shandong10086/apps/shandong => packages/meta}/AppResident/auditList.vue (100%)
 rename {project/shandong10086/apps/shandong => packages/meta}/AppResident/audtiDetail.vue (100%)
 delete mode 100644 project/shandong10086/apps/shandong/AppResident/AppResident.vue
 delete mode 100644 project/shandong10086/apps/shandong/AppResident/listTpl.vue
 delete mode 100644 project/shandong10086/apps/shandong/AppResident/localResident.vue
 delete mode 100644 project/shandong10086/apps/shandong/AppResident/mobileResident.vue
 delete mode 100644 project/shandong10086/apps/shandong/AppResident/residentSta.vue

diff --git a/packages/meta/AppResident/AppResident.vue b/packages/meta/AppResident/AppResident.vue
index 1ef46b3e..4c9d8b6e 100644
--- a/packages/meta/AppResident/AppResident.vue
+++ b/packages/meta/AppResident/AppResident.vue
@@ -6,7 +6,7 @@
       <template #tabs>
         <el-tabs v-model="activeName">
           <el-tab-pane v-for="op in tabs" :key="op.value" :name="op.value" :label="op.label">
-            <component v-if="op.value==activeName" :is="op.comp" :areaId="areaId" :active="activeName"/>
+            <component v-if="op.value==activeName" :is="op.comp" :areaId="areaId" :active="activeName" :instance="instance" :dict="dict" />
           </el-tab-pane>
         </el-tabs>
       </template>
@@ -20,7 +20,8 @@ import localResident from "./localResident";
 import ListTpl from "./listTpl";
 import MobileResident from "./mobileResident";
 import ResidentSta from "./residentSta";
-
+import auditList from "./auditList";
+import auditDetail from "./audtiDetail";
 export default {
   name: "AppResident",
   label: "居民档案",
@@ -34,7 +35,7 @@ export default {
       resident: this
     }
   },
-  components: {ResidentSta, MobileResident, ListTpl, localResident},
+  components: {ResidentSta, MobileResident, ListTpl, localResident, auditList, audtiDetail: auditDetail},
   computed: {
     ...mapState(["user"]),
     tabs() {
@@ -50,6 +51,7 @@ export default {
           detail: details[e.dictName]
         })),
         {label: "居民统计", value: "3", comp: ResidentSta},
+        {label: "居民档案审核", value: "4", comp: auditList, detail: auditDetail}
       ]
     },
     hideLevel() {
diff --git a/project/shandong10086/apps/shandong/AppResident/auditList.vue b/packages/meta/AppResident/auditList.vue
similarity index 100%
rename from project/shandong10086/apps/shandong/AppResident/auditList.vue
rename to packages/meta/AppResident/auditList.vue
diff --git a/project/shandong10086/apps/shandong/AppResident/audtiDetail.vue b/packages/meta/AppResident/audtiDetail.vue
similarity index 100%
rename from project/shandong10086/apps/shandong/AppResident/audtiDetail.vue
rename to packages/meta/AppResident/audtiDetail.vue
diff --git a/project/shandong10086/apps.import.json b/project/shandong10086/apps.import.json
index db63642f..2663100d 100644
--- a/project/shandong10086/apps.import.json
+++ b/project/shandong10086/apps.import.json
@@ -30,5 +30,6 @@
   "AppPartyOrganization": "党组织管理",
   "AppPartyMember": "党员管理",
   "AppLicence": "产品许可",
-  "AppContentManage": "内容中心"
+  "AppContentManage": "内容中心",
+  "AppResident": "居民档案"
 }
diff --git a/project/shandong10086/apps/shandong/AppResident/AppResident.vue b/project/shandong10086/apps/shandong/AppResident/AppResident.vue
deleted file mode 100644
index 4c9d8b6e..00000000
--- a/project/shandong10086/apps/shandong/AppResident/AppResident.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <section class="AppResident">
-    <ai-list v-if="!showDetail" isTabs>
-      <ai-title slot="title" title="居民档案" :instance="instance" :hideLevel="hideLevel-1" isShowArea
-                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">
-            <component v-if="op.value==activeName" :is="op.comp" :areaId="areaId" :active="activeName" :instance="instance" :dict="dict" />
-          </el-tab-pane>
-        </el-tabs>
-      </template>
-    </ai-list>
-    <component v-else :is="detailComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
-  </section>
-</template>
-<script>
-import {mapState} from "vuex";
-import localResident from "./localResident";
-import ListTpl from "./listTpl";
-import MobileResident from "./mobileResident";
-import ResidentSta from "./residentSta";
-import auditList from "./auditList";
-import auditDetail from "./audtiDetail";
-export default {
-  name: "AppResident",
-  label: "居民档案",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-  },
-  provide() {
-    return {
-      resident: this
-    }
-  },
-  components: {ResidentSta, MobileResident, ListTpl, localResident, auditList, audtiDetail: auditDetail},
-  computed: {
-    ...mapState(["user"]),
-    tabs() {
-      let details = {
-        "本地居民": localResident,
-        "流动人员": MobileResident,
-      }
-      return [
-        ...this.dict.getDict('residentType').map(e => ({
-          label: e.dictName,
-          value: e.dictValue,
-          comp: ListTpl,
-          detail: details[e.dictName]
-        })),
-        {label: "居民统计", value: "3", comp: ResidentSta},
-        {label: "居民档案审核", value: "4", comp: auditList, detail: auditDetail}
-      ]
-    },
-    hideLevel() {
-      return this.user.info.areaList?.length || 0
-    },
-    showDetail() {
-      this.activeName = this.activeName || this.$route.query?.type || 0
-      return !!this.$route.query?.type || !!this.$route.query?.id
-    },
-    detailComponent() {
-      return this.tabs.find(e => e.value == this.activeName)?.detail || ""
-    }
-  },
-  data() {
-    return {
-      areaId: '',
-      activeName: "0",
-    }
-  },
-  created() {
-    this.activeName = this.$route.query?.type
-    this.areaId = JSON.parse(JSON.stringify(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",
-        "livePeriod",
-        "language",
-        "nationality");
-  },
-}
-</script>
-<style lang="scss" scoped>
-.AppResident {
-  width: 100%;
-  height: 100%;
-  background: rgba(243, 246, 249, 1);
-
-  .iconfont {
-    cursor: pointer;
-  }
-
-  .tab-content-box {
-    padding: 16px 0;
-    width: 100%;
-    box-sizing: border-box;
-    background-color: #f3f6f9;
-    overflow-y: auto;
-  }
-
-  .list {
-    box-sizing: border-box;
-    background-color: #fff;
-    border-radius: 4px;
-    border: solid 1px #d8e0e8;
-    padding: 16px;
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-
-    .searchBar {
-      padding: 8px 0;
-
-      .el-col {
-        margin-bottom: 8px;
-
-        span {
-          display: inline-block;
-          width: 100px;
-          height: 30px;
-          line-height: 30px;
-          text-align: center;
-          font-size: 14px;
-          background-color: #f5f5f5;
-          border-radius: 2px;
-          border: solid 1px #d0d4dc;
-          border-right: none;
-          margin: 0;
-        }
-      }
-    }
-
-    .addClass {
-      height: 64px;
-    }
-  }
-
-  .dataStatistic {
-    width: 100%;
-    margin-top: 16px;
-    padding: 0 16px 16px 16px;
-    box-sizing: border-box;
-
-    .above {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      .data-item {
-        width: 32%;
-        height: 380px;
-        background: rgba(255, 255, 255, 1);
-        border-radius: 4px;
-        padding: 16px;
-        box-sizing: border-box;
-        position: relative;
-
-        p {
-          position: absolute;
-          right: 16px;
-          top: 16px;
-          font-size: 14px;
-          font-weight: bold;
-
-          span:nth-of-type(1) {
-            color: #999999;
-          }
-
-          span:nth-of-type(2) {
-            color: #333333;
-          }
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/project/shandong10086/apps/shandong/AppResident/listTpl.vue b/project/shandong10086/apps/shandong/AppResident/listTpl.vue
deleted file mode 100644
index b8569198..00000000
--- a/project/shandong10086/apps/shandong/AppResident/listTpl.vue
+++ /dev/null
@@ -1,352 +0,0 @@
-<template>
-  <section class="listTpl">
-    <ai-list isTabs>
-      <template #content>
-        <ai-search-bar>
-          <template #left>
-            <ai-select placeholder="档案状态" v-model="search.fileStatus"
-                       :selectList="resident.dict.getDict('fileStatus')"
-                       @change="page.current=1,refreshTable()"/>
-            <ai-select placeholder="性别" v-model="search.sex"
-                       :selectList="resident.dict.getDict('sex')"
-                       @change="page.current=1,refreshTable()"/>
-            <ai-select placeholder="文化程度" v-model="search.education"
-                       :selectList="resident.dict.getDict('education')"
-                       @change="page.current=1,refreshTable()"/>
-            <ai-select placeholder="婚姻状况" v-model="search.maritalStatus"
-                       :selectList="resident.dict.getDict('maritalStatus')"
-                       @change="page.current=1,refreshTable()"/>
-            <ai-select placeholder="民族" v-model="search.nation"
-                       :selectList="resident.dict.getDict('nation')"
-                       @change="page.current=1,refreshTable()"/>
-            <el-date-picker
-                value-format="yyyy-MM-dd HH:mm:ss"
-                v-model="search.birthStart"
-                style="width:250px;border-radius:0;"
-                type="date"
-                size="small"
-                unlink-panels
-                placeholder="选择出生开始日期"
-                @change="page.current=1,refreshTable()"
-            />
-            <el-date-picker
-                value-format="yyyy-MM-dd HH:mm:ss"
-                v-model="search.birthEnd"
-                style="width:250px;border-radius:0;"
-                type="date"
-                size="small"
-                placeholder="选择出生结束日期"
-                unlink-panels
-                @change="page.current=1,refreshTable()"
-            />
-            <el-select
-                v-model="search.politicsStatus"
-                placeholder="政治面貌"
-                size="small"
-                @change="page.current=1,refreshTable()"
-                clearable
-            >
-              <el-option
-                  v-for="(item,i) in resident.dict.getDict('politicsStatus')"
-                  :key="i"
-                  :label="item.dictName"
-                  :value="item.dictValue"
-              ></el-option>
-            </el-select>
-            <el-select
-                v-model="search.householdName"
-                placeholder="是否户主"
-                size="small"
-                @change="page.current=1,refreshTable()"
-                clearable
-            >
-              <el-option
-                  v-for="(item,i) in resident.dict.getDict('householdName')"
-                  :key="i"
-                  :label="item.dictName"
-                  :value="item.dictValue"
-              ></el-option>
-            </el-select>
-            <el-select
-                v-model="search.faithType"
-                placeholder="宗教信仰"
-                @change="page.current=1,refreshTable()"
-                size="small"
-                clearable
-            >
-              <el-option
-                  v-for="(item,i) in resident.dict.getDict('faithType')"
-                  :key="i"
-                  :label="item.dictName"
-                  :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </template>
-          <template #right>
-            <el-input
-                size="small"
-                v-model="search.con"
-                placeholder="姓名/身份证/联系方式"
-                @keyup.enter.native="search.current = 1, refreshTable()"
-                @clear="search.current = 1, refreshTable()"
-                clearable
-                suffix-icon="iconfont iconSearch"/>
-          </template>
-        </ai-search-bar>
-        <ai-search-bar>
-          <template #left>
-            <el-button
-                size="small"
-                type="primary"
-                icon="iconfont iconAdd"
-                @click="gotoAdd()"
-                v-if="$permissions('app_appresident_edit')">
-              添加
-            </el-button>
-            <el-button
-                size="small"
-                icon="iconfont iconDelete"
-                :disabled="multipleSelection.length<=0"
-                @click="beforeDelete()"
-                v-if="$permissions('app_appresident_del')">
-              删除
-            </el-button>
-          </template>
-          <template #right>
-            <ai-import :instance="resident.instance" :dict="resident.dict" type="appresident" name="居民档案"
-                       :importParams="{residentType: active}" @success="refreshTable()">
-              <el-button icon="iconfont iconImport">导入</el-button>
-            </ai-import>
-            <ai-download :instance="resident.instance" :params="params" url="/app/appresident/export"
-                         fileName="居民档案"/>
-          </template>
-        </ai-search-bar>
-
-        <ai-table :tableData="tableData" :col-configs="colConfigs" :dict="resident.dict"
-                  :total="page.total" :current.sync="page.current" :size.sync="page.size"
-                  @getList="refreshTable"
-                  @selection-change="handleSelectionChange">
-          <el-table-column slot="idNumber" label="身份证号" show-overflow-tooltip align="center">
-            <template slot-scope="{row}">
-              <ai-id mode="show" v-model="row.idNumber" :showEyes="false"/>
-            </template>
-          </el-table-column>
-          <el-table-column slot="fileStatus" label="档案状态" show-overflow-tooltip align="center">
-            <template slot-scope="scope">
-              <span v-if="scope.row.fileStatus==0" style="color:rgba(46,162,34,1);">正常</span>
-              <span v-if="scope.row.fileStatus==1" style="color:rgba(153,153,153,1);">已注销</span>
-            </template>
-          </el-table-column>
-          <el-table-column slot="options" label="操作" show-overflow-tooltip align="center">
-            <template slot-scope="scope">
-              <div class="table-options">
-                <el-button
-                    title="详情"
-                    type="text"
-                    v-if="$permissions('app_appresident_detail')"
-                    @click="detailShow(scope.row)">
-                  详情
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </ai-table>
-      </template>
-    </ai-list>
-  </section>
-</template>
-
-<script>
-import {mapState} from "vuex";
-
-export default {
-  name: "listTpl",
-  inject: ['resident'],
-  props: {
-    areaId: {default: ""},
-    active: {default: ""},//人员类型
-  },
-  computed: {
-    ...mapState(["user"]),
-    params() {
-      let params = {
-        residentType: this.active
-      }
-      //导出搜索条件
-      if (this.deleteIds.length) {
-        params = {
-          ...params,
-          areaId: this.areaId,
-          ids: this.deleteIds
-        }
-      } else {
-        params = {
-          areaId: this.areaId,
-          ...params,
-          ...this.search
-        }
-      }
-      return params
-    },
-    colConfigs() {
-      return [
-        {type: "selection"},
-        {label: "姓名", prop: "name", align: "center"},
-        {label: "性别", prop: "sex", dict: 'sex', align: "center"},
-        {slot: "idNumber"},
-        {label: "年龄", prop: "age", align: "center"},
-        {label: "民族", prop: "nation", align: "center", dict: "nation"},
-        {label: "文化程度", prop: "education", align: "center", dict: "education"},
-        {label: "政治面貌", prop: "politicsStatus", align: "center", dict: "politicsStatus"},
-        {slot: "fileStatus"},
-        {slot: "options"}
-      ]
-    }
-  },
-  watch: {
-    areaId(v) {
-      v && this.refreshTable()
-    }
-  },
-  data() {
-    return {
-      page: {current: 1, size: 10, total: 0},
-      search: {
-        fileStatus: "",
-        sex: "",
-        nation: "",
-        education: "",
-        politicsStatus: "",
-        birthStart: "",
-        birthEnd: "",
-        faithType: "",
-        householdName: "",
-        con: "",
-        maritalStatus: ""
-      },
-      style: {},
-      tableData: [],
-      multipleSelection: [],
-      deleteIds: [],
-    };
-  },
-  methods: {
-    handleClick() {
-      this.tableData = [];
-      this.multipleSelection = [];
-      this.searchInit()
-    },
-    searchInit() {
-      let tempAreaId = this.search.areaId;
-      this.search = {
-        fileStatus: "",
-        sex: "",
-        nation: "",
-        education: "",
-        politicsStatus: "",
-        birth: [],
-        faithType: "",
-        householdName: "",
-        areaId: "",
-        con: "",
-        maritalStatus: ""
-      };
-      this.search.areaId = tempAreaId;
-      this.page = {current: 1, size: 10, total: 0};
-      this.refreshTable()
-    },
-    handleSelectionChange(val) {
-      this.deleteIds = [];
-      this.multipleSelection = val;
-      this.multipleSelection.forEach(e => {
-        this.deleteIds.push(e.id);
-      });
-    },
-    exportrExcle() {
-      if (this.deleteIds.length == 0) {
-        if (this.search.birth) {
-          this.search.birth = this.search.birth.join(",");
-        }
-        this.resident.instance
-        .post(`/app/appresident/exportAll`, null, {
-          params: {
-            ...this.search,
-            ...this.page
-          }
-        })
-        .then(res => {
-          if (res && res.code == 0) {
-            this.$message.success(res.data);
-            if (typeof this.search.birth == "string") {
-              this.search.birth = this.search.birth.split(",");
-            }
-          }
-        });
-      } else {
-        this.resident.instance.post(`/app/appresident/exportByIds`, {
-          ids: this.deleteIds,
-          areaId: this.user.info.areaId
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$message.success(res.data);
-          }
-        });
-      }
-    },
-    handleSizeChange(val) {
-      this.page.size = val;
-      this.refreshTable()
-    },
-    detailShow(row) {
-      this.$router.push({query: {type: this.active, id: row.id}})
-    },
-    gotoAdd() {
-      this.$router.push({query: {type: this.active}})
-    },
-    refreshTable() {
-      this.resident.instance.post(`/app/appresident/list`, null, {
-        params: {...this.search, ...this.page, areaId: this.areaId, residentType: this.active}
-      }).then(res => {
-        if (res?.data) {
-          this.tableData = res.data.records
-          this.page.total = res.data.total
-        }
-      })
-    },
-    beforeDelete() {
-      this.$confirm("确定要执行删除操作吗？", {type: "error"})
-      .then(() => {
-        this.deletePersonFn();
-        this.deleteIds = [];
-      })
-      .catch(() => {
-      });
-    },
-    deletePersonFn() {
-      this.resident.instance.post(`/app/appresident/deleteBody`, {
-        ids: this.deleteIds
-      }).then(res => {
-        if (res && res.code == 0) {
-          this.$message.success("删除成功");
-          if (
-              this.page.current == Math.ceil(this.page.total / this.page.size)
-          ) {
-            this.page.total = this.page.total - this.deleteIds.length;
-            this.page.current = Math.ceil(this.page.total / this.page.size);
-          }
-          this.refreshTable();
-        }
-      })
-    },
-  },
-  created() {
-    this.refreshTable()
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.listTpl {
-  height: 100%;
-}
-</style>
diff --git a/project/shandong10086/apps/shandong/AppResident/localResident.vue b/project/shandong10086/apps/shandong/AppResident/localResident.vue
deleted file mode 100644
index 27905ac4..00000000
--- a/project/shandong10086/apps/shandong/AppResident/localResident.vue
+++ /dev/null
@@ -1,1123 +0,0 @@
-<template>
-  <section class="addAborigines">
-    <ai-detail>
-      <ai-title slot="title" :title="showDetail?'本地居民信息':'添加本地居民'" isShowBack @onBackClick="$router.push({query:{}})"
-                isShowBottomBorder>
-        <template v-if="showDetail" #rightBtn>
-          <el-button @click="beforeWriteOff()" icon="el-icon-switch-button" v-if="baseInfo.fileStatus==0">注销档案
-          </el-button>
-          <el-button icon="iconfont iconDelete" @click="handleDelete()" v-if="$permissions('app_appresident_del')">
-            删除人员
-          </el-button>
-        </template>
-      </ai-title>
-      <template #content>
-        <el-form class="content-right" :model="baseInfo" ref="ruleForm" :rules="rules" label-width="130px"
-                 label-position="right" size="small">
-
-          <ai-card title="基本信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit1=true;"
-                    v-if="!showEdit1"
-                >&nbsp;修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit1=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit1"
-              >取消
-              </el-button>
-              <el-button type="text" v-if="showEdit1" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit1">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="姓名：" prop="name">
-                    <el-input
-                        v-model="baseInfo.name"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入姓名"
-                        v-if="showEdit1"
-                        :disabled="!!showDetail"
-                    ></el-input>
-                    <!-- <p v-else>{{baseInfo.name||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="身份证号：" prop="idNumber">
-                    <el-input
-                        v-model="baseInfo.idNumber"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入身份证号"
-                        v-if="showEdit1"
-                        :maxlength="18"
-                        @input="idChange"
-                        :disabled="!!showDetail"
-                    />
-                    <!-- <p v-else>
-                        <ai-id mode="show" v-model="baseInfo.idNumber" right-btn></ai-id>
-                    </p>-->
-                  </el-form-item>
-                  <el-form-item label="性别：" prop="sex">
-                    <el-select v-model="baseInfo.sex"
-                               placeholder="请选择"
-                               disabled
-                               clearable>
-                      <el-option
-                          v-for="(item,i) in dict.getDict('sex')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>
-                        {{dict.getLabel('sex',baseInfo.sex)||'-'}}
-                    </p>-->
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="个人照片：" prop="photo">
-                    <!-- <div class="pictrue">
-                        <img :src="imgUrl" alt="" title=""></img>
-                        <el-upload
-                            v-if="showEdit1"
-                            class="upload-demo"
-                            action
-                            multiple
-                            accept=".png,.jpg"
-                            :http-request="uploadFile"
-                            :show-file-list="false"
-                            :on-change="handleChange"
-                            :file-list="fileList"
-                            >
-                            <el-button >上传照片</el-button>
-                            <div slot="tip" class="el-upload__tip">
-                                    图片大小不能超过2M
-                    </div>
-                        </el-upload>
-                    </div>-->
-                    <ai-avatar :instance="instance" v-if="showEdit1" v-model="baseInfo.photo"/>
-                    <ai-avatar v-model="baseInfo.photo" v-else :editable="false"/>
-                    <!--<ai-avatar :instance="instance" v-model="baseInfo.photo"/>-->
-                  </el-form-item>
-                </div>
-              </div>
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="出生日期：" prop="birthday">
-                    <el-date-picker
-                        v-if="showEdit1"
-                        disabled
-                        :editable="false"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        format="yyyy-MM-dd"
-                        v-model="birthday"
-                        type="date"
-
-                        placeholder="选择日期"
-                    ></el-date-picker>
-                    <!-- <p v-else>{{birthday?birthday.substring(0, 10):"-"}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="文化程度：" prop="education">
-                    <el-select
-                        v-model="baseInfo.education"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('education')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('education',baseInfo.education)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="政治面貌：" prop="politicsStatus">
-                    <el-select
-                        v-model="baseInfo.politicsStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('politicsStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('politicsStatus',baseInfo.politicsStatus)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="职业：" prop="job">
-                    <el-select
-                        v-model="baseInfo.job"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('job')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('job',baseInfo.job)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="宗教信仰：" prop="faithType">
-                    <el-select
-                        v-model="baseInfo.faithType"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('faithType')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('faithType',baseInfo.faithType)||'-'}}</p> -->
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="年龄：" prop="age">
-                    <el-input
-                        disabled
-                        v-model="baseInfo.age"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入年龄"
-                        v-if="showEdit1"
-                        type="number"
-                        @mousewheel.native.prevent
-                    ></el-input>
-                    <!-- <p v-else>{{baseInfo.age}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="民族：" prop="nation">
-                    <el-select
-                        v-model="baseInfo.nation"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('nation')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('nation',baseInfo.nation)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="婚姻状况：" prop="maritalStatus">
-                    <el-select
-                        v-model="baseInfo.maritalStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('maritalStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('maritalStatus',baseInfo.maritalStatus)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="兵役状况：" prop="militaryStatus">
-                    <el-select
-                        v-model="baseInfo.militaryStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('militaryStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('militaryStatus',baseInfo.militaryStatus)||'-'}}</p> -->
-                  </el-form-item>
-                </div>
-              </div>
-              <div class="areaList">
-                <el-form-item label="籍贯：" prop=" birthplaceAreaId">
-                  <ai-area-select
-                      clearable
-                      always-show
-                      :instance="instance"
-                      v-if="showEdit1"
-                      v-model="baseInfo.birthplaceAreaId"
-                      :areaLevel="3"
-                  ></ai-area-select>
-                  <!-- <p v-if="!showEdit1">{{baseInfo.birthplaceAreaName||'-'}}</p> -->
-                </el-form-item>
-              </div>
-            </div>
-            <div slot="content" v-else>
-              <el-row type="flex">
-                <div class="detail-info fill">
-                  <h3 class="name">{{ baseInfo.name || '-' }}</h3>
-                  <div class="detail-left fill">
-                    <div class="info">
-                      <span class="label">性别：</span>
-                      <span class="value">{{ dict.getLabel('sex', baseInfo.sex) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">出生日期：</span>
-                      <span class="value">{{ birthday ? birthday.substring(0, 10) : '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">籍贯：</span>
-                      <span class="value">{{ baseInfo.birthplaceAreaName || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">文化程度：</span>
-                      <span class="value">{{ dict.getLabel('education', baseInfo.education) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">政治面貌：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('politicsStatus', baseInfo.politicsStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">宗教信仰：</span>
-                      <span class="value">{{ dict.getLabel('faithType', baseInfo.faithType) || '-' }}</span>
-                    </div>
-                  </div>
-                  <div class="detail-right fill">
-                    <div class="info">
-                      <span class="label">身份证号：</span>
-                      <span class="value">
-                        <ai-id mode="show" v-model="baseInfo.idNumber" right-btn class="line-center"></ai-id>
-                      </span>
-                    </div>
-                    <div class="info">
-                      <span class="label">年龄：</span>
-                      <span class="value">{{ baseInfo.age }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">民族：</span>
-                      <span class="value">{{ dict.getLabel('nation', baseInfo.nation) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">婚姻状况：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('maritalStatus', baseInfo.maritalStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">兵役状况：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('militaryStatus', baseInfo.militaryStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">职业：</span>
-                      <span class="value">{{ dict.getLabel('job', baseInfo.job) || '-' }}</span>
-                    </div>
-                  </div>
-                </div>
-                <ai-avatar v-model="baseInfo.photo" :editable="false"/>
-              </el-row>
-            </div>
-          </ai-card>
-
-          <ai-card title="联络信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit2=true;"
-                    v-if="!showEdit2">
-                  修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit2=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit2">
-                取消
-              </el-button>
-              <el-button type="text" v-if="showEdit2" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit2">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="联系方式：" prop="phone">
-                    <el-input v-model="baseInfo.phone" size="small" placeholder="请输入联系方式" v-if="showEdit2"
-                              :maxlength="11"/>
-                  </el-form-item>
-                </div>
-              </div>
-              <el-form-item label="现住址：" prop="currentAreaId">
-                <ai-area-select clearable always-show :instance="instance" :disabled-level="disabledLevel" v-model="baseInfo.currentAreaId"
-                                :valueLevel="4"/>
-                <el-form-item>
-                  <el-input v-model="baseInfo.currentAddress" placeholder="详细地址" clearable/>
-                </el-form-item>
-              </el-form-item>
-            </div>
-            <div slot="content" v-else style="margin-top: 16px;margin-bottom:24px">
-              <div class="info" style="margin-bottom:8px">
-                <span class="label">联系方式：</span>
-                <span class="value">{{ baseInfo.phone || '-' }}</span>
-              </div>
-              <div class="info">
-                <span class="label">现住址：</span>
-                <span class="value">{{ baseInfo.currentAreaName + baseInfo.currentAddress || "-" }}</span>
-              </div>
-            </div>
-          </ai-card>
-
-          <ai-card title="户籍信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit3=true;"
-                    v-if="!showEdit3"
-                >&nbsp;修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit3=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit3"
-              >取消
-              </el-button>
-              <el-button type="text" v-if="showEdit3" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit3">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="是否户主：" prop="householdName">
-                    <el-select v-model="baseInfo.householdName" placeholder="请选择"
-                               @change="householdRelationChange" clearable>
-                      <el-option v-for="(item,i) in dict.getDict('householdName')"
-                                 :label="item.dictName" :key="i" :value="item.dictValue"/>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="与户主关系：" prop="householdRelation" v-if="baseInfo.householdName==0">
-                    <el-select v-model="baseInfo.householdRelation" placeholder="请选择" v-if="showEdit3" clearable>
-                      <el-option v-for="(item,i) in dict.getDict('householdRelation')"
-                                 :label="item.dictName" :key="i" :value="item.dictValue"/>
-                    </el-select>
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="户主身份证号：" prop="householdIdNumber" v-if="baseInfo.householdName==0">
-                    <el-input v-model="baseInfo.householdIdNumber" placeholder="请输入户主身份证号" :maxlength="18" clearable/>
-                  </el-form-item>
-                </div>
-              </div>
-              <el-form-item label="户籍地：" prop="householdAreaId">
-                <ai-area-select clearable always-show :instance="instance" v-if="showEdit3"
-                                v-model="baseInfo.householdAreaId" :disabled-level="disabledLevel" :valueLevel="4"/>
-                <el-form-item v-if="baseInfo.householdAreaId">
-                  <el-input v-model="baseInfo.householdAddress" placeholder="详细地址" clearable/>
-                </el-form-item>
-              </el-form-item>
-            </div>
-            <div slot="content" v-else style="margin-top: 16px;margin-bottom:24px">
-              <div class="detail-info">
-                <div class="detail-left fill">
-                  <div class="info">
-                    <span class="label">是否户主：</span>
-                    <span class="value">{{ dict.getLabel('householdName', baseInfo.householdName) || '-' }}</span>
-                  </div>
-                </div>
-                <div class="info fill" v-if="baseInfo.householdName==0">
-                  <span class="label">与户主关系：</span>
-                  <span class="value">{{ dict.getLabel('householdRelation', baseInfo.householdRelation) || '-' }}</span>
-                </div>
-                <div class="info fill" v-if="baseInfo.householdName==0">
-                  <span class="label">户主身份证号：</span>
-                  <span class="value">
-                        <ai-id mode="show" v-model="baseInfo.householdIdNumber" right-btn></ai-id>
-                      </span>
-                </div>
-              </div>
-              <div class="detail-info-p info">
-                <span class="label">户籍地：</span>
-                <span class="value">
-                  {{ baseInfo.householdAreaName + (baseInfo.householdAddress ? baseInfo.householdAddress : "") }}
-                </span>
-              </div>
-            </div>
-          </ai-card>
-
-          <ai-card title="家庭成员" v-if="showDetail">
-            <div slot="content" v-if="showDetail">
-              <el-table
-                  border
-                  ref="multipleTable"
-                  :data="family"
-                  style="margin-top:8px;"
-
-                  header-cell-class-name="table-header"
-                  tooltip-effect="light"
-                  row-class-name="table-row"
-                  cell-class-name="table-cell"
-              >
-                <el-table-column align="center" prop="name" label="与户主关系">
-                  <template slot-scope="scope">
-                      <span>{{
-                          scope.row.householdRelation ? dict.getLabel('householdRelation', scope.row.householdRelation) : "户主"
-                        }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="name" label="姓名" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="idNumber" label="性别" align="center" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span>{{ parseInt(scope.row.idNumber.substr(16, 1)) % 2 == 1 ? '男' : '女' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="age" label="年龄" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column
-                    prop="idNumber"
-                    label="身份证号"
-                    align="center"
-                    width="200"
-                    show-overflow-tooltip>
-                  <template slot-scope="{row}">
-                    <ai-id mode="show" v-model="row.idNumber" :showEyes="false"/>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="address" label="操作" align="center" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <el-button icon="iconfont iconShow" title="查看详情" class="dict-list-operation"
-                               @click="showFamily(scope.row)" type="text"/>
-                  </template>
-                </el-table-column>
-                <div slot="empty" class="no-data" style="height:160px;"/>
-              </el-table>
-            </div>
-          </ai-card>
-        </el-form>
-      </template>
-      <template v-if="!showDetail" #footer>
-        <el-button @click="cancelFn()">取消</el-button>
-        <el-button type="primary" @click="saveFrom('ruleForm','goBack')">保存</el-button>
-      </template>
-    </ai-detail>
-
-    <el-dialog class="deleteStyle" :visible.sync="familyDialog" width="720px" title="家庭成员信息" top="30vh">
-      <el-row type="flex" justify="space-between">
-        <ul>
-          <li>
-            <span>姓名：</span>
-            <p>{{ familyInfo.name }}</p>
-          </li>
-          <li>
-            <span>身份证号：</span>
-            <p>
-              <ai-id mode="show" v-model="familyInfo.idNumber" right-btn class="line-center"></ai-id>
-            </p>
-          </li>
-          <li>
-            <span>性别：</span>
-            <p>{{ dict.getLabel('sex', familyInfo.sex) }}</p>
-          </li>
-          <li>
-            <span>年龄：</span>
-            <p>{{ familyInfo.age }}</p>
-          </li>
-          <li>
-            <span>联系方式：</span>
-            <p>{{ familyInfo.phone }}</p>
-          </li>
-          <li>
-            <span>民族：</span>
-            <p>{{ dict.getLabel('nation', familyInfo.nation) }}</p>
-          </li>
-          <li>
-            <span>籍贯：</span>
-            <p>{{ familyInfo.birthplaceAreaName }}</p>
-          </li>
-          <li>
-            <span>文化程度：</span>
-            <p>{{ dict.getLabel('education', familyInfo.education) }}</p>
-          </li>
-          <li>
-            <span>婚姻状况：</span>
-            <p>{{ dict.getLabel('maritalStatus', familyInfo.maritalStatus) }}</p>
-          </li>
-          <li>
-            <span>政治面貌：</span>
-            <p>{{ dict.getLabel('politicsStatus', familyInfo.politicsStatus) }}</p>
-          </li>
-          <li>
-            <span>兵役状况：</span>
-            <p>{{ dict.getLabel('militaryStatus', familyInfo.militaryStatus) }}</p>
-          </li>
-          <li>
-            <span>宗教信仰：</span>
-            <p>{{ dict.getLabel('faithType', familyInfo.faithType) }}</p>
-          </li>
-          <li>
-            <span>职业：</span>
-            <p>{{ dict.getLabel('job', familyInfo.job) }}</p>
-          </li>
-          <li style="width:100%;">
-            <span>现住址：</span>
-            <p>{{ familyInfo.currentAreaName + familyInfo.currentAddress }}</p>
-          </li>
-        </ul>
-        <div class="img_block">
-          <ai-avatar v-model="familyInfo.imgUrl" :editable="false"/>
-        </div>
-      </el-row>
-      <div slot="footer" style="text-align: center;">
-        <el-button style="width:92px" size="small" @click="familyDialog = false">关闭
-        </el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="档案注销"
-               class="deleteStyle"
-               :visible.sync="writeoffDialog"
-               width="700px" top="25vh"
-               @close="familyInit()"
-               :close-on-click-modal="false">
-      <el-form :model="writeInfo" ref="writeInfo" label-width="100px" size="small">
-        <el-form-item label="姓名：">{{ baseInfo.name }}</el-form-item>
-        <el-form-item label="身份证号：">
-          <ai-id mode="show" v-model="baseInfo.idNumber" right-btn/>
-        </el-form-item>
-        <el-form-item label="注销原因：" prop="logoutReason" autocomplete="off"
-                      :rules="{required: true, message: '注销原因不能为空', trigger: 'change'}">
-          <el-select v-model="writeInfo.logoutReason" placeholder="请选择">
-            <el-option v-for="(item,i) in dict.getDict('logoutReason')"
-                       :label="item.dictName"
-                       :key="i" :value="item.dictValue"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="操作说明：" prop="logoutDescription" :rules="{ required: true, message: '操作说明不能为空'}">
-          <el-input type="textarea" v-model="writeInfo.logoutDescription" :rows="4"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" style="text-align: center;">
-        <el-button
-            style="width:92px"
-            size="small"
-            class="delete-btn"
-            @click="writeoffDialog=false,$refs.writeInfo.resetFields();"
-        >取消
-        </el-button>
-        <el-button
-            style="width:92px"
-            size="small"
-            type="primary"
-            @click="submitForm('writeInfo')"
-        >确认
-        </el-button>
-      </div>
-    </el-dialog>
-  </section>
-</template>
-<script>
-import {mapState} from "vuex";
-
-export default {
-  name: "addAborigines",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    detail: Object,
-    active: String
-  },
-  data() {
-    let IdNumberPass = (rule, value, callback) => {
-      if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
-          callback();
-        } else {
-          callback(new Error("身份证号格式错误"));
-        }
-      } else {
-        callback(new Error("请输入身份证号"));
-      }
-    };
-    return {
-      buildingCascader: true,
-      houseCascader: true,
-      navId: 0,
-      baseInfo: {
-        registerStatus: "",
-        tips: [],
-        age: "",
-        birthplaceAreaId: "",
-        currentAddress: "",
-        currentAreaId: "",
-        education: "",
-        faithType: "",
-        fileStatus: "",
-        householdAddress: "",
-        householdAreaId: "",
-        householdIdNumber: "",
-        householdName: "",
-        householdRelation: "",
-        id: "",
-        idNumber: "",
-        job: "",
-        logoutDescription: "",
-        logoutReason: "",
-        logoutTime: "",
-        logoutUserId: "",
-        maritalStatus: "",
-        militaryStatus: "",
-        name: "",
-        nation: "",
-        phone: "",
-        photo: "",
-        politicsStatus: "",
-        sex: ""
-      },
-      family: [],
-      familyDialog: false,
-      familyInfo: {},
-      writeoffDialog: false,
-      writeInfo: {
-        id: "",
-        logoutReason: "",
-        logoutDescription: "",
-        fileStatus: "1"
-      },
-      birthday: "",
-      rules: {
-        name: [{required: true, message: "请输入姓名", trigger: "blur"}],
-        idNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
-        ],
-        sex: [{required: true, message: "请选择性别", trigger: "blur"}],
-        currentAreaId: [{message: "请选择现住址", required: true, trigger: "blur"},
-          {
-            validator: (r, v, cb) => {
-              if (/.+0{3}$/.test(v)) {
-                cb("现住址必须选到村级")
-              } else cb()
-            }, trigger: "blur"
-          }],
-        currentAddress: [{message: "请选择现住址详细地址", required: true}],
-        householdAreaId: [
-          {message: "户籍地必须选到村级", required: true,trigger: "blur"},
-          {
-            validator: (r, v, cb) => {
-              if (/.+0{3}$/.test(v)) {
-                cb("户籍地必须选到村级")
-              } else cb()
-            },trigger: "blur"
-          }
-        ],
-        householdName: [
-          {required: true, message: "请选择是否户主", trigger: "change"}
-        ],
-        householdRelation: [
-          {required: true, message: "请选择与户主关系", trigger: "change"}
-        ],
-        householdIdNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
-        ],
-        householdAddress: [
-          {required: true, message: "请选择户籍地详细地址", trigger: "blur"}
-        ]
-      },
-      imgUrl: "",
-      fileList: [],
-      showEdit1: false,
-      showEdit2: false,
-      showEdit3: false,
-      showEdit4: false,
-      disabledLevel: 0
-    };
-  },
-  computed: {
-    ...mapState(["user"]),
-    showDetail() {
-      return !!this.$route.query?.id
-    },
-    navList() {
-      return [
-        {name: "本地居民信息", id: "1"},
-        {name: "变更记录", id: "2"}
-      ]
-    },
-    tipOps() {
-      return this.dict.getDict("residentTipType") || []
-    }
-  },
-  methods: {
-    uploadFile(file) {
-      const isLt2M = file.file.size / 1024 / 1024 < 2;
-      if (!isLt2M) {
-        this.$message.warning("头像大小不能超过 2MB!");
-        return;
-      }
-      let formData = new FormData();
-      formData.append("file", file.file);
-      this.instance.post(`/admin/file/add`, formData, {withCredentials: false})
-      .then(res => {
-        if (res && res.code == 0) {
-          let imgInfo = res.data[0].split(";");
-          this.imgUrl = imgInfo[0];
-          this.baseInfo.photo = res.data[0];
-        }
-      });
-    },
-    handleChange(file, fileList) {
-      this.fileList = fileList;
-    },
-    householdRelationChange() {
-      this.baseInfo.householdIdNumber = "";
-      this.baseInfo.householdRelation = "";
-    },
-    saveFrom(formName, type) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.saveFromFn(type);
-        }
-      });
-    },
-    cancelFn() {
-      this.$refs.ruleForm?.resetFields()
-      this.$router.push({query: {}});
-    },
-    submitForm(formName) {
-      this.writeInfo.id = this.baseInfo.id;
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.instance.post(`/app/appresident/addOrUpdate`, {
-            ...this.writeInfo
-          }).then(res => {
-            if (res && res.code == 0) {
-              this.$message.success("注销成功");
-              this.writeoffDialog = false;
-              this.$router.push({query: {}});
-            }
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    familyInit() {
-      Object.keys(this.writeInfo).forEach(e => {
-        this.writeInfo[e] = "";
-      });
-      this.$refs.writeInfo.resetFields();
-    },
-    saveFromFn(type) {
-      let {currentHouseList, householdHouseList, tips} = this.baseInfo
-      this.instance.post(`/app/appresident/addOrUpdate`, {
-        residentType: this.$route.query.type,
-        ...this.baseInfo,
-        currentHouseList: currentHouseList?.join("|"),
-        householdHouseList: householdHouseList?.join("|"),
-        tips: tips?.join("|")
-      }).then(res => {
-        if (res?.code == 0) {
-          this.$message.success("保存成功");
-          if (type) {
-            this.$router.push({query: {}})
-          } else {
-            this.editInit();
-          }
-        }
-      });
-    },
-    editInit() {
-      this.showEdit1 = false;
-      this.showEdit2 = false;
-      this.showEdit3 = false;
-      this.showEdit4 = false;
-      this.searchDetail(this.baseInfo.id);
-    },
-    searchDetail(id, type) {
-      this.instance.post(`/app/appresident/detail`, null, {
-        params: {id}
-      }).then(res => {
-        if (res?.data) {
-          let {currentHouseList, householdHouseList, tips} = res.data.resident
-          this.baseInfo = {
-            ...res.data.resident,
-            currentHouseList: currentHouseList?.split("|"),
-            householdHouseList: householdHouseList?.split("|"),
-            tips: tips ? tips.split("|") : [],
-          };
-          this.family = res.data.family;
-          this.IdCard(this.baseInfo.idNumber);
-          if (type == "family") {
-            this.familyDialog = false;
-          }
-        }
-      });
-    },
-    showFamily(row) {
-      this.familyInfo = row;
-      if (this.familyInfo.photo) {
-        this.familyInfo.imgUrl = this.familyInfo.photo.split(";")[0];
-      } else {
-        this.familyInfo.imgUrl = "";
-      }
-      this.familyDialog = true;
-    },
-    beforeWriteOff() {
-      this.writeoffDialog = true;
-    },
-    handleDelete() {
-      this.$confirm("删掉档案后，\n" +
-          `<span class="username">${this.baseInfo.name}</span>` +
-          "        的历史相关信息可能无法追溯查看，是否确定删除该人员档案？", {
-        title: "档案删除"
-      }).then(() => {
-        this.instance.post(`/app/appresident/delete?ids=${this.baseInfo.id}`).then(res => {
-          if (res && res.code == 0) {
-            this.$message.success("删除成功");
-            this.$router.push({query: {}});
-          }
-        });
-      }).catch(() => 0)
-    },
-    idChange(val) {
-      if (val.length == 18) {
-        this.IdCard(val);
-      }
-    },
-    IdCard(UUserCard) {
-      if (UUserCard) {
-        let arr = [];
-        //获取出生日期
-        let birth =
-            UUserCard.substring(6, 10) +
-            "-" +
-            UUserCard.substring(10, 12) +
-            "-" +
-            UUserCard.substring(12, 14) +
-            " 00:00:00";
-        arr.push(birth);
-
-        if (parseInt(UUserCard.substr(16, 1)) % 2 == 1) {
-          //男
-          arr.push("1");
-        } else {
-          //女
-          arr.push("0");
-        }
-        //获取年龄
-        const myDate = new Date();
-        const month = myDate.getMonth() + 1;
-        const day = myDate.getDate();
-        let age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
-        if (
-            UUserCard.substring(10, 12) < month ||
-            (UUserCard.substring(10, 12) == month &&
-                UUserCard.substring(12, 14) <= day)
-        ) {
-          age++;
-        }
-        arr.push(age);
-        this.baseInfo.sex = arr[1];
-        this.baseInfo.age = arr[2];
-        this.birthday = arr[0];
-      }
-    }
-  },
-  created() {
-    this.disabledLevel = this.user.info.areaMap[this.user.info.areaId].length;
-    if (!this.showDetail) {
-      this.showEdit1 = true;
-      this.showEdit2 = true;
-      this.showEdit3 = true;
-      this.showEdit4 = true;
-      this.baseInfo.householdAreaId = JSON.parse(JSON.stringify(this.user.info.areaId))
-      this.baseInfo.currentAreaId = JSON.parse(JSON.stringify(this.user.info.areaId))
-      this.$nextTick(() => this.$refs.ruleForm?.resetFields())
-    } else {
-      this.searchDetail(this.$route.query.id);
-    }
-  }
-};
-</script>
-<style lang="scss" scoped>
-.addAborigines {
-  height: 100%;
-  font-size: 14px;
-
-  .el-form-item {
-    margin-bottom: 10px;
-
-    .el-form-item {
-      margin-top: 10px;
-    }
-
-    .el-cascader, .el-select, .el-date-editor {
-      width: 100%;
-    }
-  }
-
-  ::v-deep .el-form-item__error {
-    position: static;
-  }
-
-  ::v-deep .content-right {
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-    padding-bottom: 80px;
-
-    .ailist-title {
-      padding: 0;
-    }
-
-    .above {
-      width: 100%;
-      overflow: hidden;
-
-      .left {
-        width: 380px;
-        float: left;
-      }
-
-      .right {
-        width: 380px;
-        float: left;
-
-        .pictrue {
-          display: flex;
-          height: 120px;
-
-          img {
-            width: 104px;
-            height: 120px;
-            border-radius: 2px;
-            border: solid 1px #d0d4dc;
-          }
-
-          .upload-demo {
-            padding: 0 15px;
-          }
-
-          .el-button {
-            width: 104px;
-            height: 32px;
-            background-color: #ffffff;
-            border-radius: 2px;
-            border: solid 1px #8899bb;
-          }
-        }
-      }
-    }
-  }
-
-  ul {
-    flex: 1;
-    min-width: 0;
-    display: flex;
-    flex-wrap: wrap;
-    padding: 0;
-    margin: 0;
-
-    li {
-      display: flex;
-      align-items: center;
-      min-height: 32px;
-      width: 50%;
-
-      span {
-        flex-shrink: 0;
-      }
-
-      p {
-        margin: 0
-      }
-    }
-  }
-
-  .img_block {
-    flex-shrink: 0;
-  }
-
-  .detail-info {
-    display: flex;
-    flex-wrap: wrap;
-
-    h3 {
-      width: 100%;
-      flex-shrink: 0
-    }
-
-  }
-
-  .info {
-    display: flex;
-    align-items: center;
-    line-height: 1.4;
-    margin-bottom: 16px;
-
-    .label {
-      flex-shrink: 0;
-      width: 100px;
-      margin-right: 40px;
-      text-align: right;
-      color: #888;
-      font-size: 14px;
-    }
-
-    .value {
-      color: #222;
-      font-size: 14px;
-      word-break: break-all;
-    }
-  }
-
-  .fill {
-    flex: 1;
-    min-width: 50%;
-  }
-
-  .el-checkbox-group {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-
-    .el-checkbox {
-      margin: 0 !important;
-      display: flex;
-      align-items: center;
-
-      ::v-deep .el-checkbox__label {
-        font-size: 14px;
-      }
-    }
-  }
-
-  .tags {
-    gap: 10px;
-    flex-wrap: wrap;
-  }
-}
-</style>
diff --git a/project/shandong10086/apps/shandong/AppResident/mobileResident.vue b/project/shandong10086/apps/shandong/AppResident/mobileResident.vue
deleted file mode 100644
index 072c409c..00000000
--- a/project/shandong10086/apps/shandong/AppResident/mobileResident.vue
+++ /dev/null
@@ -1,1116 +0,0 @@
-<template>
-  <section class="mobileResident">
-    <ai-detail>
-      <ai-title slot="title" :title="showDetail?'流动人口信息':'添加流动人口'" isShowBack @onBackClick="$router.push({query:{}})"
-                isShowBottomBorder>
-        <template v-if="showDetail" #rightBtn>
-          <el-button @click="beforeWriteOff()" icon="el-icon-switch-button" v-if="baseInfo.fileStatus==0">注销档案
-          </el-button>
-          <el-button icon="iconfont iconDelete" @click="handleDelete()" v-if="$permissions('app_appresident_del')">
-            删除人员
-          </el-button>
-        </template>
-      </ai-title>
-      <template #content>
-        <el-form class="content-right" :model="baseInfo" ref="ruleForm" :rules="rules" label-width="130px"
-                 label-position="right" size="small">
-          <ai-card title="基本信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit1=true;"
-                    v-if="!showEdit1"
-                >&nbsp;修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit1=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit1"
-              >取消
-              </el-button>
-              <el-button type="text" v-if="showEdit1" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit1">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="姓名：" prop="name">
-                    <el-input
-                        v-model="baseInfo.name"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入姓名"
-                        v-if="showEdit1"
-                        :disabled="!!showDetail"
-                    ></el-input>
-                    <!-- <p v-else>{{baseInfo.name||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="身份证号：" prop="idNumber">
-                    <el-input
-                        v-model="baseInfo.idNumber"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入身份证号"
-                        v-if="showEdit1"
-                        :maxlength="18"
-                        @input="idChange"
-                        :disabled="!!showDetail"
-                    />
-                    <!-- <p v-else>
-                        <ai-id mode="show" v-model="baseInfo.idNumber" right-btn></ai-id>
-                    </p>-->
-                  </el-form-item>
-                  <el-form-item label="性别：" prop="sex">
-                    <el-select v-model="baseInfo.sex"
-                               placeholder="请选择"
-                               disabled
-                               clearable>
-                      <el-option
-                          v-for="(item,i) in dict.getDict('sex')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>
-                        {{dict.getLabel('sex',baseInfo.sex)||'-'}}
-                    </p>-->
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="个人照片：" prop="photo">
-                    <!-- <div class="pictrue">
-                        <img :src="imgUrl" alt="" title=""></img>
-                        <el-upload
-                            v-if="showEdit1"
-                            class="upload-demo"
-                            action
-                            multiple
-                            accept=".png,.jpg"
-                            :http-request="uploadFile"
-                            :show-file-list="false"
-                            :on-change="handleChange"
-                            :file-list="fileList"
-                            >
-                            <el-button >上传照片</el-button>
-                            <div slot="tip" class="el-upload__tip">
-                                    图片大小不能超过2M
-                    </div>
-                        </el-upload>
-                    </div>-->
-                    <ai-avatar :instance="instance" v-if="showEdit1" v-model="baseInfo.photo"/>
-                    <ai-avatar v-model="baseInfo.photo" v-else :editable="false"/>
-                    <!--<ai-avatar :instance="instance" v-model="baseInfo.photo"/>-->
-                  </el-form-item>
-                </div>
-              </div>
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="出生日期：" prop="birthday">
-                    <el-date-picker
-                        v-if="showEdit1"
-                        disabled
-                        :editable="false"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        format="yyyy-MM-dd"
-                        v-model="birthday"
-                        type="date"
-
-                        placeholder="选择日期"
-                    ></el-date-picker>
-                    <!-- <p v-else>{{birthday?birthday.substring(0, 10):"-"}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="文化程度：" prop="education">
-                    <el-select
-                        v-model="baseInfo.education"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('education')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('education',baseInfo.education)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="政治面貌：" prop="politicsStatus">
-                    <el-select
-                        v-model="baseInfo.politicsStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('politicsStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('politicsStatus',baseInfo.politicsStatus)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="职业：" prop="job">
-                    <el-select
-                        v-model="baseInfo.job"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('job')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('job',baseInfo.job)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="宗教信仰：" prop="faithType">
-                    <el-select
-                        v-model="baseInfo.faithType"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('faithType')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('faithType',baseInfo.faithType)||'-'}}</p> -->
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="年龄：" prop="age">
-                    <el-input
-                        disabled
-                        v-model="baseInfo.age"
-                        autocomplete="off"
-                        size="small"
-                        placeholder="请输入年龄"
-                        v-if="showEdit1"
-                        type="number"
-                        @mousewheel.native.prevent
-                    ></el-input>
-                    <!-- <p v-else>{{baseInfo.age}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="民族：" prop="nation">
-                    <el-select
-                        v-model="baseInfo.nation"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('nation')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('nation',baseInfo.nation)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="婚姻状况：" prop="maritalStatus">
-                    <el-select
-                        v-model="baseInfo.maritalStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('maritalStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('maritalStatus',baseInfo.maritalStatus)||'-'}}</p> -->
-                  </el-form-item>
-                  <el-form-item label="兵役状况：" prop="militaryStatus">
-                    <el-select
-                        v-model="baseInfo.militaryStatus"
-                        placeholder="请选择"
-
-                        v-if="showEdit1"
-                        clearable
-                    >
-                      <el-option
-                          v-for="(item,i) in dict.getDict('militaryStatus')"
-                          :label="item.dictName"
-                          :key="i"
-                          :value="item.dictValue"
-                      ></el-option>
-                    </el-select>
-                    <!-- <p v-else>{{dict.getLabel('militaryStatus',baseInfo.militaryStatus)||'-'}}</p> -->
-                  </el-form-item>
-                </div>
-              </div>
-              <div class="areaList">
-                <el-form-item label="籍贯：" prop=" birthplaceAreaId">
-                  <ai-area-select
-                      clearable
-                      always-show
-                      :instance="instance"
-                      v-if="showEdit1"
-                      v-model="baseInfo.birthplaceAreaId"
-                      :areaLevel="3"
-                  ></ai-area-select>
-                  <!-- <p v-if="!showEdit1">{{baseInfo.birthplaceAreaName||'-'}}</p> -->
-                </el-form-item>
-              </div>
-            </div>
-            <div slot="content" v-else>
-              <el-row type="flex">
-                <div class="detail-info fill">
-                  <h3 class="name">{{ baseInfo.name || '-' }}</h3>
-                  <div class="detail-left fill">
-                    <div class="info">
-                      <span class="label">性别：</span>
-                      <span class="value">{{ dict.getLabel('sex', baseInfo.sex) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">出生日期：</span>
-                      <span class="value">{{ birthday ? birthday.substring(0, 10) : '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">籍贯：</span>
-                      <span class="value">{{ baseInfo.birthplaceAreaName || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">文化程度：</span>
-                      <span class="value">{{ dict.getLabel('education', baseInfo.education) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">政治面貌：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('politicsStatus', baseInfo.politicsStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">宗教信仰：</span>
-                      <span class="value">{{ dict.getLabel('faithType', baseInfo.faithType) || '-' }}</span>
-                    </div>
-                  </div>
-                  <div class="detail-right fill">
-                    <div class="info">
-                      <span class="label">身份证号：</span>
-                      <span class="value">
-                        <ai-id mode="show" v-model="baseInfo.idNumber" right-btn class="line-center"></ai-id>
-                      </span>
-                    </div>
-                    <div class="info">
-                      <span class="label">年龄：</span>
-                      <span class="value">{{ baseInfo.age }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">民族：</span>
-                      <span class="value">{{ dict.getLabel('nation', baseInfo.nation) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">婚姻状况：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('maritalStatus', baseInfo.maritalStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">兵役状况：</span>
-                      <span
-                          class="value"
-                      >{{ dict.getLabel('militaryStatus', baseInfo.militaryStatus) || '-' }}</span>
-                    </div>
-                    <div class="info">
-                      <span class="label">职业：</span>
-                      <span class="value">{{ dict.getLabel('job', baseInfo.job) || '-' }}</span>
-                    </div>
-                  </div>
-                </div>
-                <ai-avatar v-model="baseInfo.photo" :editable="false"/>
-              </el-row>
-            </div>
-          </ai-card>
-          <ai-card title="联络信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit2=true;"
-                    v-if="!showEdit2">
-                  修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit2=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit2">
-                取消
-              </el-button>
-              <el-button type="text" v-if="showEdit2" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit2">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="联系方式：" prop="phone">
-                    <el-input v-model="baseInfo.phone" size="small" placeholder="请输入联系方式" v-if="showEdit2"
-                              :maxlength="11"/>
-                  </el-form-item>
-                </div>
-              </div>
-              <el-form-item label="现住址：" prop="currentAreaId">
-                <ai-area-select clearable always-show :instance="instance" :disabled-level="disabledLevel" v-model="baseInfo.currentAreaId"
-                                :valueLevel="4"/>
-                <el-form-item>
-                  <el-input v-model="baseInfo.currentAddress" placeholder="详细地址" clearable/>
-                </el-form-item>
-              </el-form-item>
-            </div>
-            <div slot="content" v-else style="margin-top: 16px;margin-bottom:24px">
-              <div class="info" style="margin-bottom:8px">
-                <span class="label">联系方式：</span>
-                <span class="value">{{ baseInfo.phone || '-' }}</span>
-              </div>
-              <div class="info">
-                <span class="label">现住址：</span>
-                <span class="value">{{ baseInfo.currentAreaName + baseInfo.currentAddress || "-" }}</span>
-              </div>
-            </div>
-          </ai-card>
-          <ai-card title="户籍信息">
-            <template v-if="showDetail" #right>
-              <template v-if="$permissions('app_appresident_edit')">
-                <el-button
-                    type="text"
-                    class="iconfont iconEdit"
-                    @click="editInit(),showEdit3=true;"
-                    v-if="!showEdit3"
-                >&nbsp;修改
-                </el-button>
-              </template>
-              <el-button
-                  type="text"
-                  @click="showEdit3=false,searchDetail(baseInfo.id)"
-                  v-if="showEdit3"
-              >取消
-              </el-button>
-              <el-button type="text" v-if="showEdit3" @click="saveFrom('ruleForm')">保存</el-button>
-            </template>
-            <div slot="content" v-if="showEdit3">
-              <div class="above">
-                <div class="left">
-                  <el-form-item label="是否户主：" prop="householdName">
-                    <el-select v-model="baseInfo.householdName" placeholder="请选择"
-                               @change="householdRelationChange" clearable>
-                      <el-option v-for="(item,i) in dict.getDict('householdName')"
-                                 :label="item.dictName" :key="i" :value="item.dictValue"/>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="与户主关系：" prop="householdRelation" v-if="baseInfo.householdName==0">
-                    <el-select v-model="baseInfo.householdRelation" placeholder="请选择" v-if="showEdit3" clearable>
-                      <el-option v-for="(item,i) in dict.getDict('householdRelation')"
-                                 :label="item.dictName" :key="i" :value="item.dictValue"/>
-                    </el-select>
-                  </el-form-item>
-                </div>
-                <div class="right">
-                  <el-form-item label="户主身份证号：" prop="householdIdNumber" v-if="baseInfo.householdName==0">
-                    <el-input v-model="baseInfo.householdIdNumber" placeholder="请输入户主身份证号" :maxlength="18" clearable/>
-                  </el-form-item>
-                </div>
-              </div>
-              <el-form-item label="户籍地：" prop="householdAreaId">
-                <ai-area-select clearable always-show :instance="instance" v-if="showEdit3"
-                                v-model="baseInfo.householdAreaId" :valueLevel="4"/>
-                <el-form-item v-if="baseInfo.householdAreaId">
-                  <el-input v-model="baseInfo.householdAddress" placeholder="详细地址" clearable/>
-                </el-form-item>
-              </el-form-item>
-            </div>
-            <div slot="content" v-else style="margin-top: 16px;margin-bottom:24px">
-              <div class="detail-info">
-                <div class="detail-left fill">
-                  <div class="info">
-                    <span class="label">是否户主：</span>
-                    <span class="value">{{ dict.getLabel('householdName', baseInfo.householdName) || '-' }}</span>
-                  </div>
-                </div>
-                <div class="info fill" v-if="baseInfo.householdName==0">
-                  <span class="label">与户主关系：</span>
-                  <span class="value">{{ dict.getLabel('householdRelation', baseInfo.householdRelation) || '-' }}</span>
-                </div>
-                <div class="info fill" v-if="baseInfo.householdName==0">
-                  <span class="label">户主身份证号：</span>
-                  <span class="value">
-                        <ai-id mode="show" v-model="baseInfo.householdIdNumber" right-btn></ai-id>
-                      </span>
-                </div>
-              </div>
-              <div class="detail-info-p info">
-                <span class="label">户籍地：</span>
-                <span class="value">
-                  {{ baseInfo.householdAreaName + (baseInfo.householdAddress ? baseInfo.householdAddress : "") }}
-                </span>
-              </div>
-            </div>
-          </ai-card>
-          <ai-card title="家庭成员" v-if="showDetail">
-            <div slot="content" v-if="showDetail">
-              <el-table
-                  border
-                  ref="multipleTable"
-                  :data="family"
-                  style="margin-top:8px;"
-
-                  header-cell-class-name="table-header"
-                  tooltip-effect="light"
-                  row-class-name="table-row"
-                  cell-class-name="table-cell"
-              >
-                <el-table-column align="center" prop="name" label="与户主关系">
-                  <template slot-scope="scope">
-                      <span>{{
-                          scope.row.householdRelation ? dict.getLabel('householdRelation', scope.row.householdRelation) : "户主"
-                        }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="name" label="姓名" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="idNumber" label="性别" align="center" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <span>{{ parseInt(scope.row.idNumber.substr(16, 1)) % 2 == 1 ? '男' : '女' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="age" label="年龄" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column
-                    prop="idNumber"
-                    label="身份证号"
-                    align="center"
-                    width="200"
-                    show-overflow-tooltip>
-                  <template slot-scope="{row}">
-                    <ai-id mode="show" v-model="row.idNumber" :showEyes="false"/>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="address" label="操作" align="center" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <el-button icon="iconfont iconShow" title="查看详情" class="dict-list-operation"
-                               @click="showFamily(scope.row)" type="text"/>
-                  </template>
-                </el-table-column>
-                <div slot="empty" class="no-data" style="height:160px;"/>
-              </el-table>
-            </div>
-          </ai-card>
-        </el-form>
-      </template>
-      <template v-if="!showDetail" #footer>
-        <el-button @click="cancelFn()">取消</el-button>
-        <el-button type="primary" @click="saveFrom('ruleForm','goBack')">保存</el-button>
-      </template>
-    </ai-detail>
-    <el-dialog class="deleteStyle" :visible.sync="familyDialog" width="720px" title="家庭成员信息" top="30vh">
-      <el-row type="flex" justify="space-between">
-        <ul>
-          <li>
-            <span>姓名：</span>
-            <p>{{ familyInfo.name }}</p>
-          </li>
-          <li>
-            <span>身份证号：</span>
-            <p>
-              <ai-id mode="show" v-model="familyInfo.idNumber" right-btn class="line-center"></ai-id>
-            </p>
-          </li>
-          <li>
-            <span>性别：</span>
-            <p>{{ dict.getLabel('sex', familyInfo.sex) }}</p>
-          </li>
-          <li>
-            <span>年龄：</span>
-            <p>{{ familyInfo.age }}</p>
-          </li>
-          <li>
-            <span>联系方式：</span>
-            <p>{{ familyInfo.phone }}</p>
-          </li>
-          <li>
-            <span>民族：</span>
-            <p>{{ dict.getLabel('nation', familyInfo.nation) }}</p>
-          </li>
-          <li>
-            <span>籍贯：</span>
-            <p>{{ familyInfo.birthplaceAreaName }}</p>
-          </li>
-          <li>
-            <span>文化程度：</span>
-            <p>{{ dict.getLabel('education', familyInfo.education) }}</p>
-          </li>
-          <li>
-            <span>婚姻状况：</span>
-            <p>{{ dict.getLabel('maritalStatus', familyInfo.maritalStatus) }}</p>
-          </li>
-          <li>
-            <span>政治面貌：</span>
-            <p>{{ dict.getLabel('politicsStatus', familyInfo.politicsStatus) }}</p>
-          </li>
-          <li>
-            <span>兵役状况：</span>
-            <p>{{ dict.getLabel('militaryStatus', familyInfo.militaryStatus) }}</p>
-          </li>
-          <li>
-            <span>宗教信仰：</span>
-            <p>{{ dict.getLabel('faithType', familyInfo.faithType) }}</p>
-          </li>
-          <li>
-            <span>职业：</span>
-            <p>{{ dict.getLabel('job', familyInfo.job) }}</p>
-          </li>
-          <li style="width:100%;">
-            <span>现住址：</span>
-            <p>{{ familyInfo.currentAreaName + familyInfo.currentAddress }}</p>
-          </li>
-        </ul>
-        <div class="img_block">
-          <ai-avatar v-model="familyInfo.imgUrl" :editable="false"/>
-        </div>
-      </el-row>
-      <div slot="footer" style="text-align: center;">
-        <el-button style="width:92px" size="small" @click="familyDialog = false">关闭</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="档案注销"
-               class="deleteStyle"
-               :visible.sync="writeoffDialog"
-               width="700px" top="25vh"
-               @close="familyInit()"
-               :close-on-click-modal="false">
-      <el-form :model="writeInfo" ref="writeInfo" label-width="100px" size="small">
-        <el-form-item label="姓名：">{{ baseInfo.name }}</el-form-item>
-        <el-form-item label="身份证号：">
-          <ai-id mode="show" v-model="baseInfo.idNumber" right-btn/>
-        </el-form-item>
-        <el-form-item label="注销原因：" prop="logoutReason" autocomplete="off"
-                      :rules="{required: true, message: '注销原因不能为空', trigger: 'change'}">
-          <el-select v-model="writeInfo.logoutReason" placeholder="请选择">
-            <el-option v-for="(item,i) in dict.getDict('logoutReason')"
-                       :label="item.dictName"
-                       :key="i" :value="item.dictValue"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="操作说明：" prop="logoutDescription" :rules="{ required: true, message: '操作说明不能为空'}">
-          <el-input type="textarea" v-model="writeInfo.logoutDescription" :rows="4"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" style="text-align: center;">
-        <el-button
-            style="width:92px"
-            size="small"
-            class="delete-btn"
-            @click="writeoffDialog=false,$refs.writeInfo.resetFields();"
-        >取消
-        </el-button>
-        <el-button
-            style="width:92px"
-            size="small"
-            type="primary"
-            @click="submitForm('writeInfo')"
-        >确认
-        </el-button>
-      </div>
-    </el-dialog>
-  </section>
-</template>
-<script>
-import {mapState} from "vuex";
-
-export default {
-  name: "mobileResident",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    detail: Object,
-  },
-  data() {
-    let IdNumberPass = (rule, value, callback) => {
-      if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
-          callback();
-        } else {
-          callback(new Error("身份证号格式错误"));
-        }
-      } else {
-        callback(new Error("请输入身份证号"));
-      }
-    };
-    return {
-      buildingCascader: true,
-      houseCascader: true,
-      navId: 0,
-      baseInfo: {
-        registerStatus: "",
-        tips: [],
-        age: "",
-        birthplaceAreaId: "",
-        currentAddress: "",
-        currentAreaId: "",
-        education: "",
-        faithType: "",
-        fileStatus: "",
-        householdAddress: "",
-        householdAreaId: "",
-        householdIdNumber: "",
-        householdName: "",
-        householdRelation: "",
-        id: "",
-        idNumber: "",
-        job: "",
-        logoutDescription: "",
-        logoutReason: "",
-        logoutTime: "",
-        logoutUserId: "",
-        maritalStatus: "",
-        militaryStatus: "",
-        name: "",
-        nation: "",
-        phone: "",
-        photo: "",
-        politicsStatus: "",
-        sex: ""
-      },
-      family: [],
-      familyDialog: false,
-      familyInfo: {},
-      writeoffDialog: false,
-      writeInfo: {
-        id: "",
-        logoutReason: "",
-        logoutDescription: "",
-        fileStatus: "1"
-      },
-      disabledLevel: 0,
-      birthday: "",
-      rules: {
-        name: [{required: true, message: "请输入姓名", trigger: "blur"}],
-        idNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
-        ],
-        sex: [{required: true, message: "请选择性别", trigger: "blur"}],
-        currentAreaId: [{message: "请选择现住址", required: true, trigger: "blur"},
-          {
-            validator: (r, v, cb) => {
-              if (/.+0{3}$/.test(v)) {
-                cb("现住址必须选到村级")
-              } else cb()
-            }, trigger: "blur"
-          }],
-        currentAddress: [{message: "请选择现住址详细地址", required: true}],
-        householdAreaId: [
-          {message: "户籍地必须选到村级", required: true, trigger: "blur"},
-          {
-            validator: (r, v, cb) => {
-              if (/.+0{3}$/.test(v)) {
-                cb("户籍地必须选到村级")
-              } else cb()
-            }, trigger: "blur"
-          }
-        ],
-        householdName: [
-          {required: true, message: "请选择是否户主", trigger: "change"}
-        ],
-        householdRelation: [
-          {required: true, message: "请选择与户主关系", trigger: "change"}
-        ],
-        householdIdNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
-        ],
-        householdAddress: [
-          {required: true, message: "请选择户籍地详细地址", trigger: "blur"}
-        ]
-      },
-      imgUrl: "",
-      fileList: [],
-      showEdit1: false,
-      showEdit2: false,
-      showEdit3: false,
-      showEdit4: false,
-    };
-  },
-  computed: {
-    ...mapState(["user"]),
-    showDetail() {
-      return !!this.$route.query?.id
-    },
-    navList() {
-      return [
-        {name: "流动人口信息", id: "1"},
-        {name: "变更记录", id: "2"}
-      ]
-    },
-    tipOps() {
-      return this.dict.getDict("residentTipType") || []
-    }
-  },
-  methods: {
-    uploadFile(file) {
-      const isLt2M = file.file.size / 1024 / 1024 < 2;
-      if (!isLt2M) {
-        this.$message.warning("头像大小不能超过 2MB!");
-        return;
-      }
-      let formData = new FormData();
-      formData.append("file", file.file);
-      this.instance.post(`/admin/file/add`, formData, {withCredentials: false})
-      .then(res => {
-        if (res && res.code == 0) {
-          let imgInfo = res.data[0].split(";");
-          this.imgUrl = imgInfo[0];
-          this.baseInfo.photo = res.data[0];
-        }
-      });
-    },
-    handleChange(file, fileList) {
-      this.fileList = fileList;
-    },
-    householdRelationChange() {
-      this.baseInfo.householdIdNumber = "";
-      this.baseInfo.householdRelation = "";
-    },
-    saveFrom(formName, type) {
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.saveFromFn(type);
-        }
-      });
-    },
-    cancelFn() {
-      this.$refs.ruleForm?.resetFields()
-      this.$router.push({query: {}});
-    },
-    submitForm(formName) {
-      this.writeInfo.id = this.baseInfo.id;
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.instance.post(`/app/appresident/addOrUpdate`, {
-            ...this.writeInfo
-          }).then(res => {
-            if (res && res.code == 0) {
-              this.$message.success("注销成功");
-              this.writeoffDialog = false;
-              this.$router.push({query: {}});
-            }
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    familyInit() {
-      Object.keys(this.writeInfo).forEach(e => {
-        this.writeInfo[e] = "";
-      });
-      this.$refs.writeInfo.resetFields();
-    },
-    saveFromFn(type) {
-      let {currentHouseList, householdHouseList, tips} = this.baseInfo
-      this.instance.post(`/app/appresident/addOrUpdate`, {
-        residentType: this.$route.query.type,
-        ...this.baseInfo,
-        currentHouseList: currentHouseList?.join("|"),
-        householdHouseList: householdHouseList?.join("|"),
-        tips: tips?.join("|"),
-      }).then(res => {
-        if (res?.code == 0) {
-          this.$message.success("保存成功");
-          if (type) {
-            this.$router.push({query: {}})
-          } else {
-            this.editInit();
-          }
-        }
-      });
-    },
-    editInit() {
-      this.showEdit1 = false;
-      this.showEdit2 = false;
-      this.showEdit3 = false;
-      this.showEdit4 = false;
-      this.searchDetail(this.baseInfo.id);
-    },
-    searchDetail(id, type) {
-      this.instance.post(`/app/appresident/detail`, null, {
-        params: {id}
-      }).then(res => {
-        if (res?.data) {
-          let {currentHouseList, householdHouseList, tips} = res.data.resident
-          this.baseInfo = {
-            ...res.data.resident,
-            currentHouseList: currentHouseList?.split("|"),
-            householdHouseList: householdHouseList?.split("|"),
-            tips: tips ? tips.split("|") : [],
-          };
-          this.family = res.data.family;
-          this.IdCard(this.baseInfo.idNumber);
-          if (type == "family") {
-            this.familyDialog = false;
-          }
-        }
-      });
-    },
-    showFamily(row) {
-      this.familyInfo = row;
-      if (this.familyInfo.photo) {
-        this.familyInfo.imgUrl = this.familyInfo.photo.split(";")[0];
-      } else {
-        this.familyInfo.imgUrl = "";
-      }
-      this.familyDialog = true;
-    },
-    beforeWriteOff() {
-      this.writeoffDialog = true;
-    },
-    handleDelete() {
-      this.$confirm("删掉档案后，\n" +
-          `<span class="username">${this.baseInfo.name}</span>` +
-          "        的历史相关信息可能无法追溯查看，是否确定删除该人员档案？", {
-        title: "档案删除"
-      }).then(() => {
-        this.instance.post(`/app/appresident/delete?ids=${this.baseInfo.id}`).then(res => {
-          if (res && res.code == 0) {
-            this.$message.success("删除成功");
-            this.$router.push({query: {}});
-          }
-        });
-      }).catch(() => 0)
-    },
-    idChange(val) {
-      if (val.length == 18) {
-        this.IdCard(val);
-      }
-    },
-    IdCard(UUserCard) {
-      if (UUserCard) {
-        let arr = [];
-        //获取出生日期
-        let birth =
-            UUserCard.substring(6, 10) +
-            "-" +
-            UUserCard.substring(10, 12) +
-            "-" +
-            UUserCard.substring(12, 14) +
-            " 00:00:00";
-        arr.push(birth);
-
-        if (parseInt(UUserCard.substr(16, 1)) % 2 == 1) {
-          //男
-          arr.push("1");
-        } else {
-          //女
-          arr.push("0");
-        }
-        //获取年龄
-        const myDate = new Date();
-        const month = myDate.getMonth() + 1;
-        const day = myDate.getDate();
-        let age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
-        if (
-            UUserCard.substring(10, 12) < month ||
-            (UUserCard.substring(10, 12) == month &&
-                UUserCard.substring(12, 14) <= day)
-        ) {
-          age++;
-        }
-        arr.push(age);
-        this.baseInfo.sex = arr[1];
-        this.baseInfo.age = arr[2];
-        this.birthday = arr[0];
-      }
-    }
-  },
-  created() {
-    this.disabledLevel = this.user.info.areaMap[this.user.info.areaId].length;
-    if (!this.showDetail) {
-      this.showEdit1 = true;
-      this.showEdit2 = true;
-      this.showEdit3 = true;
-      this.showEdit4 = true;
-      this.baseInfo.householdAreaId = JSON.parse(JSON.stringify(this.user.info.areaId))
-      this.baseInfo.currentAreaId = JSON.parse(JSON.stringify(this.user.info.areaId))
-      this.$nextTick(() => this.$refs.ruleForm?.resetFields())
-    } else {
-      this.searchDetail(this.$route.query.id);
-    }
-  }
-};
-</script>
-<style lang="scss" scoped>
-.mobileResident {
-  height: 100%;
-  font-size: 14px;
-
-  .el-form-item {
-    margin-bottom: 10px;
-
-    .el-form-item {
-      margin-top: 10px;
-    }
-
-    .el-cascader, .el-select, .el-date-editor {
-      width: 100%;
-    }
-  }
-
-  ::v-deep .el-form-item__error {
-    position: static;
-  }
-
-  ::v-deep .content-right {
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-    padding-bottom: 80px;
-
-    .ailist-title {
-      padding: 0;
-    }
-
-    .above {
-      width: 100%;
-      overflow: hidden;
-
-      .left {
-        width: 380px;
-        float: left;
-      }
-
-      .right {
-        width: 380px;
-        float: left;
-
-        .pictrue {
-          display: flex;
-          height: 120px;
-
-          img {
-            width: 104px;
-            height: 120px;
-            border-radius: 2px;
-            border: solid 1px #d0d4dc;
-          }
-
-          .upload-demo {
-            padding: 0 15px;
-          }
-
-          .el-button {
-            width: 104px;
-            height: 32px;
-            background-color: #ffffff;
-            border-radius: 2px;
-            border: solid 1px #8899bb;
-          }
-        }
-      }
-    }
-  }
-
-  ul {
-    flex: 1;
-    min-width: 0;
-    display: flex;
-    flex-wrap: wrap;
-    padding: 0;
-    margin: 0;
-
-    li {
-      display: flex;
-      align-items: center;
-      min-height: 32px;
-      width: 50%;
-
-      span {
-        flex-shrink: 0;
-      }
-
-      p {
-        margin: 0
-      }
-    }
-  }
-
-  .img_block {
-    flex-shrink: 0;
-  }
-
-  .detail-info {
-    display: flex;
-    flex-wrap: wrap;
-
-    h3 {
-      width: 100%;
-      flex-shrink: 0
-    }
-
-  }
-
-  .info {
-    display: flex;
-    align-items: center;
-    line-height: 1.4;
-    margin-bottom: 16px;
-
-    .label {
-      flex-shrink: 0;
-      width: 100px;
-      margin-right: 40px;
-      text-align: right;
-      color: #888;
-      font-size: 14px;
-    }
-
-    .value {
-      color: #222;
-      font-size: 14px;
-      word-break: break-all;
-    }
-  }
-
-  .fill {
-    flex: 1;
-    min-width: 50%;
-  }
-
-  .el-checkbox-group {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-
-    .el-checkbox {
-      margin: 0 !important;
-      display: flex;
-      align-items: center;
-
-      ::v-deep .el-checkbox__label {
-        font-size: 14px;
-      }
-    }
-  }
-
-  .tags {
-    gap: 10px;
-    flex-wrap: wrap;
-  }
-}
-</style>
diff --git a/project/shandong10086/apps/shandong/AppResident/residentSta.vue b/project/shandong10086/apps/shandong/AppResident/residentSta.vue
deleted file mode 100644
index 3de0971a..00000000
--- a/project/shandong10086/apps/shandong/AppResident/residentSta.vue
+++ /dev/null
@@ -1,445 +0,0 @@
-<template>
-  <section class="residentSta">
-    <div class="dataStatistic">
-      <div class="above">
-        <div class="data-item">
-          <div id="LocalResident" v-if="showStatis"/>
-          <ai-empty v-else/>
-          <h5 v-if="LocalResidentData">
-            更新时间:{{ statisticData.更新时间 }}
-          </h5>
-        </div>
-        <div class="data-item" style="width:66%;">
-          <div id="ResidentDistribution" v-if="showStatis"/>
-          <ai-empty v-else/>
-        </div>
-      </div>
-      <div class="above" style="margin-top:24px;">
-        <div class="data-item">
-          <div id="SexRatio" v-if="showStatis"/>
-          <ai-empty v-else/>
-          <div rightTop><i v-html="'有效数据:'"/> {{ LocalResidentData }}</div>
-        </div>
-        <div class="data-item">
-          <div id="MaritalSta" v-if="showStatis"/>
-          <ai-empty v-else/>
-          <div rightTop><i v-html="'有效数据:'"/>{{ LocalResidentData }}</div>
-        </div>
-        <div class="data-item">
-          <div id="AgeDistribution" v-if="showStatis"/>
-          <ai-empty v-else/>
-          <div rightTop><i v-html="'有效数据:'"/>{{ LocalResidentData }}</div>
-        </div>
-      </div>
-    </div>
-  </section>
-</template>
-
-<script>
-import * as echarts from 'echarts'
-
-export default {
-  name: "residentSta",
-  inject: ['resident'],
-  props: {
-    areaId: String
-  },
-  computed: {
-    LocalResidentData() {
-      return this.statisticData?.总人数 || 0
-    },
-    AgeDistributionData() {
-      return this.statisticData?.年龄层次 || []
-    },
-    MaritalStaData() {
-      return this.statisticData?.婚姻状况 || []
-    },
-    SexRatioData() {
-      return this.statisticData?.男女比例 || []
-    },
-    ResidentDistributionData() {
-      return this.statisticData?.人口分布 || []
-    }
-  },
-  data() {
-    return {
-      statisticData: {},
-      showStatis: true,
-    }
-  },
-  watch: {
-    areaId(v) {
-      v && this.getStaData()
-    }
-  },
-  methods: {
-    getStaData() {
-      this.resident.instance.post(`/app/appresident/queryCustInfoByAreaId`, null, {
-        params: {
-          areaId: this.areaId
-        }
-      }).then(res => {
-        if (res?.data) {
-          this.statisticData = res.data;
-          this.showStatis = this.LocalResidentData > 0;
-          this.showLocalResident();
-          this.showSexRatio();
-          this.showAgeDistribution();
-          this.showResidentDistribution();
-          this.showMaritalSta();
-        }
-      })
-    },
-    showAgeDistribution() {
-      //年龄分布
-      let myChart = echarts.init(document.getElementById("AgeDistribution"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      myChart.setOption({
-        title: {
-          text: "年龄层次统计",
-          subtext: "",
-          x: "left"
-        },
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-        legend: {
-          orient: "vertical",
-          bottom: "bottom",
-          data: this.AgeDistributionData.map(e => e.v1)
-        },
-        series: [
-          {
-            name: "年龄层次统计",
-            type: "pie",
-            radius: ["40%", "55%"],
-            center: ["50%", "50%"],
-            data: this.AgeDistributionData.map(e => ({value: e.v2 * 1, name: e.v1})),
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
-              },
-              normal: {
-                color: function (params) {
-                  //自定义颜色
-                  var colorList = [
-                    "#FB3C3C",
-                    "#fc5947",
-                    "#81E84F",
-                    "#3C76FF",
-                    "#6995FF",
-                    "#FFD500",
-                    "#FEF517",
-                    "#B1E598",
-                    "#81E84F",
-                    "#B1E598",
-                    "#FEBB8E"
-                  ];
-                  return colorList[params.dataIndex];
-                }
-              }
-            }
-          }
-        ]
-      });
-    },
-    showLocalResident() {
-      //本地居民
-      let myChart = echarts.init(document.getElementById("LocalResident"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      let option = {
-        title: {
-          text: "本地居民",
-          subtext: "",
-          x: "left"
-        },
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b}: {c} ({d}%)"
-        },
-        series: [
-          {
-            name: "本地居民",
-            type: "pie",
-            radius: ["50%", "65%"],
-            avoidLabelOverlap: false,
-            label: {
-              normal: {
-                show: true,
-                position: "center",
-                textStyle: {
-                  fontSize: "40",
-                  fontWeight: "normal",
-                  color: "#333333"
-                }
-              },
-              emphasis: {
-                show: true,
-                textStyle: {
-                  fontSize: "40",
-                  fontWeight: "normal",
-                  color: "#333333"
-                }
-              }
-            },
-            labelLine: {
-              normal: {
-                show: false
-              }
-            },
-            data: [{value: this.LocalResidentData, name: this.LocalResidentData}],
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
-              },
-              normal: {
-                color: function (params) {
-                  //自定义颜色
-                  var colorList = ["#5088FF"];
-                  return colorList[params.dataIndex];
-                }
-              }
-            }
-          }
-        ]
-      };
-      myChart.setOption(option);
-    },
-    showMaritalSta() {
-      //婚姻状况
-      let myChart = echarts.init(document.getElementById("MaritalSta"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      let option = {
-        color: [
-          "#FB3C3C",
-          "#FC5947",
-          "#FE8B3F",
-          "#3C76FF",
-          "#6995FF",
-          "#FFD500",
-          "#FEF517",
-          "#B1E598",
-          "#81E84F",
-          "#B1E598",
-          "#FEBB8E"
-        ],
-        backgroundColor: "#FFFFFF",
-        title: {
-          text: "婚姻状况统计",
-          x: "left"
-        },
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-        legend: {
-          orient: "vertical",
-          bottom: "bottom",
-          width: "auto",
-          height: 50,
-          data: this.MaritalStaData.map(e => e.v1)
-        },
-        series: [
-          {
-            name: "婚姻状况",
-            type: "pie",
-            radius: ["40%", "55%"],
-            center: ["50%", "50%"],
-            data: this.MaritalStaData.map(e => ({value: e.v2 * 1, name: e.v1})),
-          }
-        ]
-      };
-      myChart.setOption(option);
-    },
-    showResidentDistribution() {
-      //人口分布/居民分布
-      let myChart = echarts.init(document.getElementById("ResidentDistribution"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      let option = {
-        title: {
-          text: "人口分布统计",
-          subtext: "",
-          x: "left"
-        },
-        color: ["#5088FF"],
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
-          },
-          formatter: "{a} <br/>{b} : {c} "
-        },
-        grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true
-        },
-        xAxis: [
-          {
-            type: "category",
-            data: this.ResidentDistributionData.map(e => e.name),
-            axisTick: {
-              alignWithLabel: true
-            }
-          }
-        ],
-        yAxis: [
-          {
-            type: "value"
-          }
-        ],
-        dataZoom: [
-          {
-            id: "dataZoomX",
-            type: "slider",
-            xAxisIndex: [0],
-            filterMode: "filter"
-          }
-        ],
-        series: [
-          {
-            name: "人口数量",
-            type: "bar",
-            barWidth: "16",
-            data: this.ResidentDistributionData.map(e => e.v1)
-          }
-        ]
-      };
-      myChart.setOption(option);
-    },
-    showSexRatio() {
-      //男女比例
-      let myChart = echarts.init(document.getElementById("SexRatio"));
-      if (!this.showStatis) {
-        return myChart.dispose();
-      }
-      myChart.setOption({
-        title: {
-          text: "男女比例统计",
-          subtext: "",
-          x: "left"
-        },
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-        legend: {
-          orient: "vertical",
-          bottom: "bottom",
-          data: this.SexRatioData.map(e => e.v1)
-        },
-        series: [
-          {
-            name: "男女比例",
-            type: "pie",
-            radius: ["40%", "55%"],
-            center: ["50%", "50%"],
-            data: this.SexRatioData.map(e => ({value: e.v2 * 1, name: e.v1})),
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
-              },
-              normal: {
-                color: function (params) {
-                  //自定义颜色
-                  let colorList = [
-                    "#FB3C3C",
-                    "#3C76FF",
-                    "#3C76FF",
-                    "#FC5947",
-                    "#6995FF",
-                    "#FB3C3C",
-                    "#FE8B3F",
-                    "#B1E598",
-                    "#81E84F",
-                    "#FEBB8E"
-                  ];
-                  return colorList[params.dataIndex];
-                }
-              }
-            }
-          }
-        ]
-      });
-    },
-  },
-  created() {
-    this.getStaData()
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.residentSta {
-  height: 100%;
-
-  .dataStatistic {
-    width: 100%;
-    height: 100%;
-    overflow-y: auto;
-    padding: 16px 0;
-    box-sizing: border-box;
-
-    .above {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      .data-item {
-        width: 32%;
-        height: 380px;
-        background: rgba(255, 255, 255, 1);
-        border-radius: 4px;
-        padding: 16px;
-        box-sizing: border-box;
-        position: relative;
-
-        div[rightTop] {
-          position: absolute;
-          right: 16px;
-          top: 16px;
-          font-size: 14px;
-          font-weight: bold;
-          color: #333;
-
-          & > i {
-            font-style: normal;
-            color: #999;
-          }
-        }
-
-        & > h5 {
-          width: 100%;
-          color: #999;
-          text-align: center;
-          position: absolute;
-          bottom: 0;
-        }
-      }
-    }
-  }
-
-  #LocalResident, #MaritalSta, #ResidentDistribution, #SexRatio, #AgeDistribution {
-    width: 100%;
-    height: 95%
-  }
-}
-</style>

From c3be9537bd9b38987b8cacb300d39504a87c2c66 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 17:24:28 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B1=8F=E8=94=BD?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88=E5=AF=BC=E5=87=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/meta/AppResident/AppResident.vue | 4 +++-
 packages/meta/AppResident/listTpl.vue     | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/meta/AppResident/AppResident.vue b/packages/meta/AppResident/AppResident.vue
index 4c9d8b6e..4bc6f930 100644
--- a/packages/meta/AppResident/AppResident.vue
+++ b/packages/meta/AppResident/AppResident.vue
@@ -6,7 +6,8 @@
       <template #tabs>
         <el-tabs v-model="activeName">
           <el-tab-pane v-for="op in tabs" :key="op.value" :name="op.value" :label="op.label">
-            <component v-if="op.value==activeName" :is="op.comp" :areaId="areaId" :active="activeName" :instance="instance" :dict="dict" />
+            <component v-if="op.value==activeName" :is="op.comp" :areaId="areaId" :active="activeName"
+                       :instance="instance" :dict="dict" :permissions="permissions"/>
           </el-tab-pane>
         </el-tabs>
       </template>
@@ -22,6 +23,7 @@ import MobileResident from "./mobileResident";
 import ResidentSta from "./residentSta";
 import auditList from "./auditList";
 import auditDetail from "./audtiDetail";
+
 export default {
   name: "AppResident",
   label: "居民档案",
diff --git a/packages/meta/AppResident/listTpl.vue b/packages/meta/AppResident/listTpl.vue
index b8569198..8c4bd61c 100644
--- a/packages/meta/AppResident/listTpl.vue
+++ b/packages/meta/AppResident/listTpl.vue
@@ -100,7 +100,7 @@
                 type="primary"
                 icon="iconfont iconAdd"
                 @click="gotoAdd()"
-                v-if="$permissions('app_appresident_edit')">
+                v-if="permissions('app_appresident_edit')">
               添加
             </el-button>
             <el-button
@@ -108,7 +108,7 @@
                 icon="iconfont iconDelete"
                 :disabled="multipleSelection.length<=0"
                 @click="beforeDelete()"
-                v-if="$permissions('app_appresident_del')">
+                v-if="permissions('app_appresident_del')">
               删除
             </el-button>
           </template>
@@ -118,7 +118,7 @@
               <el-button icon="iconfont iconImport">导入</el-button>
             </ai-import>
             <ai-download :instance="resident.instance" :params="params" url="/app/appresident/export"
-                         fileName="居民档案"/>
+                         fileName="居民档案" v-if="permissions('app_appresident_export')"/>
           </template>
         </ai-search-bar>
 
@@ -164,7 +164,8 @@ export default {
   inject: ['resident'],
   props: {
     areaId: {default: ""},
-    active: {default: ""},//人员类型
+    active: {default: ""},//人员类型,
+    permissions: Function
   },
   computed: {
     ...mapState(["user"]),