diff --git a/core/apps/AppAccount/AppAccount.vue b/core/apps/AppAccount/AppAccount.vue
index adf68ec7..e2932a94 100644
--- a/core/apps/AppAccount/AppAccount.vue
+++ b/core/apps/AppAccount/AppAccount.vue
@@ -13,7 +13,7 @@
           </template>
           <template #right>
             <el-input size="small" placeholder="搜索姓名、手机号" v-model="search.name" clearable
-                      @change="page.current=1,getTableData()"/>
+                      v-throttle="() => {page.current = 1, getTableData()}"/>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
diff --git a/core/apps/AppQyWxConfig/AppQyWxConfig.vue b/core/apps/AppQyWxConfig/AppQyWxConfig.vue
index eb9060ae..d8434bee 100644
--- a/core/apps/AppQyWxConfig/AppQyWxConfig.vue
+++ b/core/apps/AppQyWxConfig/AppQyWxConfig.vue
@@ -9,7 +9,8 @@
           </template>
           <template #right>
             <el-input size="small" placeholder="搜索名称" v-model="search.name" clearable
-                      @change="page.current=1,getTableData()"/>
+            @clear="page.current = 1,search.name = '', getTableData()"
+                      v-throttle="() => {page.current = 1, getTableData()}"/>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -20,6 +21,12 @@
                          active-color="#5088FF" inactive-color="#D0D4DC"></el-switch>
             </template>
           </el-table-column>
+          <el-table-column slot="miniappStatus" align="center" label="状态" width="150">
+            <template v-slot="{ row }">
+              <el-switch v-model="row.miniappStatus" @change="onMiniappStatusChange(row)" active-value="1" inactive-value="0"
+                         active-color="#5088FF" inactive-color="#D0D4DC"></el-switch>
+            </template>
+          </el-table-column>
           <el-table-column slot="options" align="center" label="操作" fixed="right" width="200px">
             <el-row type="flex" justify="center" align="middle" slot-scope="{row}">
               <el-button type="text" @click="detail(row)">详情</el-button>
@@ -90,6 +97,12 @@
             <el-radio label="0">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="小程序状态" prop="miniappStatus">
+          <el-radio-group v-model.trim="dialogForm.miniappStatus">
+            <el-radio label="1">启用</el-radio>
+            <el-radio label="0">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
     </ai-dialog>
 
@@ -164,6 +177,7 @@ export default {
         {prop: "lng", label: "经度", width: 100},
         {prop: "address", label: "中心点", width: 100},
         {slot: "status",},
+        {slot: "miniappStatus",},
         {prop: "createTime", label: "创建时间", width: 150},
         {slot: "options"},
       ]
@@ -181,6 +195,7 @@ export default {
         miniappSecret: [{required: true, message: "请填写小程序SECRET"}],
         dvcpUrl: [{required: true, message: "请填写访问域名"}],
         status: [{required: true, message: "请选择状态", trigger: "change"}],
+        miniappStatus: [{required: true, message: "请选择小程序状态", trigger: "change"}],
         areaId: [{required: true, message: "请选择地区", trigger: "change"}],
         lat: [{required: true, message: "请选择中心点"}],
       }
@@ -271,6 +286,20 @@ export default {
         }
       })
     },
+    onMiniappStatusChange(row) {
+      this.instance.post(`/app/appdvcpconfig/setMiniappStatus`, null, {
+        params: {
+          id: row.id,
+          status: row.miniappStatus
+        }
+      }).then((res) => {
+        if (res.code == 0) {
+          this.$message.success(+row.miniappStatus ? '已启用' : '已禁用');
+          this.getTableData();
+        }
+      })
+    },
+    
     add() {
       this.dialogForm = {};
       this.dialog = true;
diff --git a/core/apps/AppRightsManager/rightsAdd.vue b/core/apps/AppRightsManager/rightsAdd.vue
index f6980d33..d5135d47 100644
--- a/core/apps/AppRightsManager/rightsAdd.vue
+++ b/core/apps/AppRightsManager/rightsAdd.vue
@@ -137,7 +137,7 @@ export default {
           this.instance.post(this.top.actions.modify, null, {
             params: {...this.form, menus}
           }).then(res => {
-            if (res?.msg == "success") {
+            if (res?.code == 0) {
               this.$message.success(`${this.msgTitle}应用角色成功`)
               this.back()
               this.top.searchList()
diff --git a/examples/App.vue b/examples/App.vue
index b9801840..f5f7d01a 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -18,7 +18,7 @@
       <ai-empty v-else>请选择应用</ai-empty>
     </el-row>
     <div v-if="dialog" class="sign-box">
-      <ai-sign style="margin: auto" :instance="$axios" :action="{login:'/auth/oauth/token?corpId=ww596787bb70f08288'}"
+      <ai-sign style="margin: auto" :instance="$axios" :action="{login}"
                visible @login="getToken" :showScanLogin="false"/>
     </div>
     <el-button type="info" v-if="!showTools" class="fixedBtn" @click="showTools=true">显示工具栏</el-button>
@@ -45,6 +45,11 @@ export default {
     },
     selectedApp() {
       return this.$route.matched.length > 0
+    },
+    login() {
+      let url = '/auth/oauth/token';
+      /project\/sass/g.test(location.pathname) && (url += "?corpId=ww596787bb70f08288")
+      return url
     }
   },
   data() {
@@ -70,7 +75,7 @@ export default {
       this.$axios.post("/admin/user/detail-phone").then(res => {
         if (res && res.data) {
           this.$store.commit("setUserInfo", res.data)
-          if (/^\/xiushan/.test(location.pathname)) {
+          if (/^\/project\/xiushan/.test(location.pathname)) {
             this.$store.commit("setFinanceUser")
           }
         }
diff --git a/examples/main.js b/examples/main.js
index 5640e853..de8ecf47 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -2,7 +2,6 @@ import Vue from 'vue';
 import App from './App.vue';
 import ui from 'element-ui';
 import router from './router/router';
-import apps from './entries';
 import axios from './router/axios';
 import utils from './utils';
 import vcUI from 'dvcp-ui';
@@ -14,7 +13,6 @@ import dataV from '@jiaminghi/data-view';
 
 Vue.use(dataV);
 
-Vue.use(apps);
 Vue.use(ui);
 Vue.use(vcUI);
 Vue.use(dvUI);
@@ -25,7 +23,7 @@ Vue.prototype.formatContent = (val) => val.replace(/(\r\n)|(\n)/g, '<br>');
 Object.keys(utils).map((e) => (Vue.prototype[e] = utils[e]));
 utils.$store.init(store);
 new Vue({
-	router,
-	store,
-	render: (h) => h(App)
+  router,
+  store,
+  render: (h) => h(App)
 }).$mount('#app');
diff --git a/examples/router/autoRoutes.js b/examples/router/autoRoutes.js
index 2d75b50c..009c2e02 100644
--- a/examples/router/autoRoutes.js
+++ b/examples/router/autoRoutes.js
@@ -21,8 +21,9 @@ export default {
         let {name, label} = files(path).default,
             addApp = {
               name, label: label || name,
-              path: path.replace(/\.(\/.+\/App.+)\.vue$/, '$1'),
-              entry: 'appEntry'
+              path: path.replace(/\.(\/.+\/App.+)\.vue$/, '/packages$1'),
+              entry: 'appEntry',
+              module: files(path).default
             }
         //命名规范入口文件必须以App开头
         store.commit("addApp", addApp)
@@ -34,8 +35,9 @@ export default {
         let {name, label} = cores(path).default,
             addApp = {
               name, label: label || name,
-              path: path.replace(/\.(\/.+\/App.+)\.vue$/, '$1'),
-              entry: 'appEntry'
+              path: path.replace(/\.(\/.+\/App.+)\.vue$/, '/core$1'),
+              entry: 'appEntry',
+              module: cores(path).default
             }
         //命名规范入口文件必须以App开头
         store.commit("addApp", addApp)
@@ -46,9 +48,10 @@ export default {
       if (project(path).default) {
         let {name, label} = project(path).default,
             addApp = {
-              name, label: label || name,
-              path: path.replace(/\.(\/.+\/App.+)\.vue$/, '$1'),
-              entry: 'appEntry'
+              name: [path.replace(/\.\/([^\/]+)\/.*/, '$1'), name].join("_"), label: label || name,
+              path: path.replace(/\.(\/.+\/App.+)\.vue$/, '/project$1'),
+              entry: 'appEntry',
+              module: project(path).default
             }
         //命名规范入口文件必须以App开头
         store.commit("addApp", addApp)
diff --git a/examples/router/axios.js b/examples/router/axios.js
index b92e5090..09c44703 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -9,9 +9,12 @@ let baseURLs = {
 instance.defaults.baseURL = baseURLs[process.env.NODE_ENV]
 instance.interceptors.request.eject(0);
 instance.interceptors.request.use(config => {
-  if (/^\/xiushan/.test(location.pathname)) {
+  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/examples/views/apps/appEntry.vue b/examples/views/apps/appEntry.vue
index 81d1ca38..542235cf 100644
--- a/examples/views/apps/appEntry.vue
+++ b/examples/views/apps/appEntry.vue
@@ -7,12 +7,16 @@
 
 <script>
 
+import {mapState} from "vuex";
+
 export default {
   name: "appEntry",
   label: "应用库-应用",
   computed: {
+    ...mapState(['apps']),
     app() {
-      return this.$route.name
+      let app = this.apps.find(e => e.name == this.$route.name)
+      return app ? app.module : ""
     }
   }
 }
diff --git a/package.json b/package.json
index f9f463a3..02b0a1bc 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +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",
     "lib:project": "node project/build.js",
@@ -55,6 +53,7 @@
     "image-webpack-loader": "^6.0.0",
     "inquirer": "^6.5.2",
     "node-sass": "npm:sass@^1.43.4",
+    "readline": "^1.3.0",
     "sass-loader": "^7.1.0",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "v-viewer": "^1.6.4",
diff --git a/packages/2.0.5/AppBroadcast/components/List.vue b/packages/2.0.5/AppBroadcast/components/List.vue
index 3ca46b6a..17682cee 100644
--- a/packages/2.0.5/AppBroadcast/components/List.vue
+++ b/packages/2.0.5/AppBroadcast/components/List.vue
@@ -14,7 +14,7 @@
           </template>
           <template slot="right">
             <el-input v-model="search.messageName" size="small" placeholder="媒资名称" clearable
-                      @keyup.enter.native=";(page.current = 1), getList()"
+                      v-throttle="() => {page.current = 1, getList()}"
                       @clear=";(page.current = 1), (search.messageName = ''), getList()"
                       suffix-icon="iconfont iconSearch"/>
           </template>
diff --git a/packages/2.0.5/AppBuildManage/components/BuildMsg.vue b/packages/2.0.5/AppBuildManage/components/BuildMsg.vue
index 3f9d71f4..1bf7a318 100644
--- a/packages/2.0.5/AppBuildManage/components/BuildMsg.vue
+++ b/packages/2.0.5/AppBuildManage/components/BuildMsg.vue
@@ -18,7 +18,7 @@
 
         <template #right>
           <el-input v-model="search.houseCode" size="small" placeholder="请输入户号/户主" clearable
-                    @keyup.enter.native=";(page.current = 1), getList()"
+                    v-throttle="() => {page.current = 1, getList()}"
                     @clear=";(page.current = 1), (search.houseCode = ''), getList()" suffix-icon="iconfont iconSearch"/>
         </template>
       </ai-search-bar>
diff --git a/packages/2.0.5/AppBuildManage/components/List.vue b/packages/2.0.5/AppBuildManage/components/List.vue
index 5ed67d22..e12ca3ec 100644
--- a/packages/2.0.5/AppBuildManage/components/List.vue
+++ b/packages/2.0.5/AppBuildManage/components/List.vue
@@ -17,7 +17,14 @@
 
             <!-- 搜索 -->
             <template slot="right">
-              <el-input v-model="search.managerName" size="small" placeholder="楼栋号/楼长/联系方式" clearable @keyup.enter.native=";(page.current = 1), getList()" @clear=";(page.current = 1), (search.managerName = ''), getList()" suffix-icon="iconfont iconSearch" />
+              <el-input
+                v-model="search.managerName"
+                size="small"
+                placeholder="楼栋号/楼长/联系方式"
+                clearable
+                v-throttle="() => {page.current = 1, getList()}"
+                @clear=";(page.current = 1), (search.managerName = ''), getList()"
+                suffix-icon="iconfont iconSearch" />
             </template>
           </ai-search-bar>
 
diff --git a/packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue b/packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue
index 4926f5d0..4957cb70 100644
--- a/packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue
+++ b/packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue
@@ -13,7 +13,7 @@
           </div>
           <b>{{ item.title }}</b>
           <p>{{ item.description }}</p>
-          <div class="visit-imgs">
+          <div class="visit-imgs" v-if="item.images.length">
             <ai-uploader v-model="item.images" :instance="instance" :limit="9" disabled/>
           </div>
           <div class="visit-status">
@@ -186,6 +186,11 @@ export default {
         font-size: 16px;
       }
 
+      b {
+        display: block;
+        margin-bottom: 6px;
+      }
+
       .visit-item__top {
         display: flex;
         align-items: center;
diff --git a/packages/2.0.5/AppCodeGeneration/components/Add.vue b/packages/2.0.5/AppCodeGeneration/components/Add.vue
index 47291afc..6bb416b8 100644
--- a/packages/2.0.5/AppCodeGeneration/components/Add.vue
+++ b/packages/2.0.5/AppCodeGeneration/components/Add.vue
@@ -1,5 +1,5 @@
 <template>
-  <ai-detail v-if="pageShow">
+  <ai-detail v-if="pageShow" class="add-form">
     <template #title>
       <ai-title :title="params.id ? '编辑'+colData.applicationName : '新增' + colData.applicationName" isShowBottomBorder
                 isShowBack @onBackClick="onBack(true)"></ai-title>
@@ -13,57 +13,82 @@
               <el-form-item :label="item.fieldName" :prop="item.fieldDbName" style="width: 100%">
                 <!-- 字典下拉选择 -->
                 <template v-if="item.type == 'dict'">
-                  <ai-select v-model="formData[item.fieldDbName]" :placeholder="item.fieldName" :selectList="dict.getDict(item.dict)" :disabled="item.disable == 1" />
+                  <ai-select v-model="formData[item.fieldDbName]" :placeholder="item.fieldName" :selectList="dict.getDict(item.dict)" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)" />
                 </template>
                 <!-- 单选radio -->
                 <template v-else-if="item.type == 'radio'">
-                  <el-radio-group v-model="formData[item.fieldDbName]" :disabled="item.disable == 1">
+                  <el-radio-group v-model="formData[item.fieldDbName]" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)">
                     <el-radio :label="item.dictValue" v-for="(item, i) in dict.getDict(item.dict)" :key="i">{{ item.dictName }}</el-radio>
                   </el-radio-group>
                 </template>
                 <!-- 开关onOff -->
                 <template v-else-if="item.type == 'onOff'">
-                  <el-switch v-model="formData[item.fieldDbName]" active-color="#26f" inactive-color="#ddd" active-value="1" inactive-value="0" :disabled="item.disable == 1"></el-switch>
+                  <el-switch v-model="formData[item.fieldDbName]" active-color="#26f" inactive-color="#ddd" active-value="1" inactive-value="0" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)"></el-switch>
                 </template>
                 <!-- 多选checkbox -->
                 <template v-else-if="item.type == 'checkbox'">
-                  <el-checkbox-group v-model="formData[item.fieldDbName]" :disabled="item.disable == 1">
+                  <el-checkbox-group v-model="formData[item.fieldDbName]" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)">
                     <el-checkbox v-for="(item, i) in dict.getDict(item.dict)" :label="item.dictValue" :key="i">
                       {{ item.dictName }}
                     </el-checkbox>
                   </el-checkbox-group>
                 </template>
-                <!-- 身份证输入框 -->
+                <!-- 网格 -->
+                <template v-else-if="item.type === 'gird'">
+                  <el-input disabled :value="girdName" size="small" placeholder="请选择网格">
+                    <template slot="append">
+                      <el-button size="small" @click="showGrid = true, treeObj.checkedKeys = formData[item.fieldDbName] ? [formData[item.fieldDbName]] : [], gridFieldName = item.fieldDbName">选择网格</el-button>
+                    </template>
+                  </el-input>
+                </template>
+                <template v-else-if="item.type === 'resident'">
+                  <el-input
+                    v-model="formData.name"
+                    :placeholder="'请选择'+item.fieldName">
+                    <template slot="append">
+                      <ai-person-select
+                        :instance="instance"
+                        :disabled="!!params.id"
+                        :url="'/app/appresident/list?auditType=1&areaId=' + user.info.areaId"
+                        :isMultiple="false" dialogTitle="选择" @selectPerson="onChange">
+                        <template name="option" v-slot:option="{ item }">
+                          <span class="iconfont iconProlife">{{ item.name }}</span>
+                          <ai-id mode="show" :show-eyes="false" :value="item.idNumber"/>
+                        </template>
+                      </ai-person-select>
+                    </template>
+                  </el-input>
+                </template>
                 <template v-else-if="item.type == 'idNumber'">
-                  <ai-id v-model="formData[item.fieldDbName]" :disabled="item.disable == 1" />
+                  <ai-id v-model="formData[item.fieldDbName]" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)" />
                 </template>
                 <!-- input输入框 -->
                 <template v-else-if="item.type == 'input' || item.type == 'name' || item.type == 'phone'">
-                  <el-input v-model="formData[item.fieldDbName]" :placeholder="'请输入'+item.fieldName" clearable :disabled="item.disable == 1"
+                  <el-input v-model="formData[item.fieldDbName]" :placeholder="'请输入'+item.fieldName" clearable :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)"
                             :maxlength="item.maxLength" show-word-limit></el-input>
                 </template>
                 <!-- number 输入框 -->
                 <template v-else-if="item.type == 'number'">
-                  <el-input-number v-model="formData[item.fieldDbName]" :label="'请输入'+item.fieldName" :disabled="item.disable == 1" :precision="item.decimalPlaces" :max="item.maxValue" :min="item.minValue"></el-input-number>
+                  <el-input-number v-model="formData[item.fieldDbName]" :label="'请输入'+item.fieldName" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)" :precision="item.decimalPlaces" :max="item.maxValue" :min="item.minValue"></el-input-number>
                 </template>
                 <!-- textarea输入框 -->
                 <template v-else-if="item.type == 'textarea' || item.type == 'text'">
-                  <el-input v-model="formData[item.fieldDbName]" :placeholder="'请输入'+item.fieldName" clearable :disabled="item.disable == 1"
+                  <el-input v-model="formData[item.fieldDbName]" :placeholder="'请输入'+item.fieldName" clearable :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)"
                             :maxlength="item.maxLength" type="textarea" show-word-limit :rows="3"></el-input>
                 </template>
                 <!-- 日期选择 -->
                 <template v-else-if="item.type == 'date'">
-                  <el-date-picker v-model="formData[item.fieldDbName]" type="date" placeholder="请选择" :disabled="item.disable == 1"
+                  <el-date-picker style="width: 100%;" v-model="formData[item.fieldDbName]" type="date" placeholder="请选择" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)"
                                   :value-format="item.timePattern"></el-date-picker>
                 </template>
                 <!-- 日期带时分秒选择 -->
                 <template v-else-if="item.type == 'datetime'">
-                  <el-date-picker v-model="formData[item.fieldDbName]" type="datetime" placeholder="选择日期时间" :disabled="item.disable == 1"
+                  <el-date-picker v-model="formData[item.fieldDbName]" type="datetime" placeholder="选择日期时间" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)"
                                   :value-format="item.timePattern"></el-date-picker>
                 </template>
                 <!-- 时间-时分秒选择 -->
                 <template v-else-if="item.type == 'time'">
-                  <el-time-picker v-model="formData[item.fieldDbName]" placeholder="请选择" :disabled="item.disable == 1"
+                  <el-time-picker v-model="formData[item.fieldDbName]" placeholder="请选择" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)"
                                   :value-format="item.timePattern"></el-time-picker>
                 </template>
                 <!-- 附件 -->
@@ -74,11 +99,11 @@
                 </template>
                 <!-- 富文本 -->
                 <template v-else-if="item.type == 'rtf'">
-                  <ai-editor v-model="formData[item.fieldDbName]" :instance="instance"/>
+                  <ai-editor v-model="formData[item.fieldDbName]" :instance="instance" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)"/>
                 </template>
                 <!-- 地区选择 -->
                 <template v-else-if="item.type == 'area'">
-                  <ai-area-get :instance="instance" v-model="formData[item.fieldDbName]" :name.sync="formData[item.fieldDbName +'_name']" :disabled="item.disable == 1"/>
+                  <ai-area-get :instance="instance" v-model="formData[item.fieldDbName]" :name.sync="formData[item.fieldDbName +'_name']" :disabled="item.disable == 1 || !!(formData.resident_id && item.isInit)"/>
                 </template>
                 <!-- 人员选择 -->
                 <div class="especial" v-else-if="item.type == 'user'">
@@ -92,10 +117,31 @@
           </template>
         </ai-card>
       </el-form>
+      <ai-dialog
+        title="选择网格"
+        :visible.sync="showGrid"
+        :destroyOnClose="true"
+        @close="showGrid = false"
+        @onConfirm="getCheckedTree"
+        width="720px">
+        <div class="grid">
+          <el-tree
+            :data="treeObj.treeList"
+            :props="treeObj.defaultProps"
+            node-key="id"
+            ref="tree"
+            :check-strictly="true"
+            show-checkbox
+            :default-checked-keys="treeObj.checkedKeys"
+            default-expand-all
+            @check="onCheckChange">
+          </el-tree>
+        </div>
+      </ai-dialog>
     </template>
     <template #footer>
       <el-button class="delete-btn footer-btn" @click="onBack">取消</el-button>
-      <el-button class="footer-btn" type="primary" @click="submit('formData')">提交</el-button>
+      <el-button class="footer-btn" type="primary" :loading="isLoading" @click="submit('formData')">提交</el-button>
     </template>
   </ai-detail>
 </template>
@@ -115,14 +161,28 @@ export default {
   },
   data() {
     return {
-      formData: {},
+      formData: {
+        age: 2
+      },
       pickerOptions0: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7;
         }
       },
+      isLoading: false,
+      girdName: '',
+      gridFieldName: '',
+      showGrid: false,
       formDataList: [],
-      pageShow: false,
+      pageShow: true,
+      treeObj: {
+        treeList: [],
+        defaultProps: {
+          children: "girdList",
+          label: "girdName",
+        },
+        checkedKeys: [],
+      },
       colData: {},
       areaId: ''
     }
@@ -141,12 +201,77 @@ export default {
     }
   },
   created() {
+    this.getGridList()
     this.getFormData()
     if (this.params.id) {
       this.getDetail()
     } 
   },
   methods: {
+    getGridList() {
+      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+        if (res.code == 0) {
+          this.treeObj.treeList = this.format(res.data)
+          if (this.formData.girdId) {
+            this.$set(this.treeObj, 'checkedKeys', [this.formData.girdId])
+          }
+        }
+      })
+    },
+
+    onChange (e) {
+      this.formData.resident_id = e.id
+      Object.keys(this.formData).forEach(item => {
+        for (var p in e){
+          if (item === p) {
+            this.$set(this.formData, item, e[item])
+          }
+        }
+      })
+
+      const idNumberInfo = this.idCardNoUtil.getIdCardInfo(e.idNumber)
+      this.$set(this.formData, 'birthDate', idNumberInfo.birthday)
+      this.formData.photo = e.photo ? [{
+        url: e.photo
+      }] : []
+    },
+    getCheckedTree() {
+      const gird = this.$refs.tree.getCheckedNodes()
+
+      if (gird.length) {
+        this.girdName = gird[0].girdName
+        this.formData[this.gridFieldName] = gird[0].id
+      } else {
+        this.girdName = ''
+        this.formData[this.gridFieldName] = ''
+      }
+
+      this.showGrid = false
+    },
+
+    onCheckChange (e) {
+      this.$nextTick(() => {
+        this.$refs.tree.getCheckedKeys().forEach(v => {
+          this.$refs.tree.setChecked(v, false)
+        })
+        this.$refs.tree.setChecked(e.id, true)
+      })
+    },
+
+    format (list) {
+      return list.map(item => {
+        if (item.girdLevel !== '2') {
+          item.disabled = true
+        }
+
+        if (item.girdList && item.girdList.length) {
+          item.girdList = this.format(item.girdList)
+        }
+
+        return item
+      })
+    },
+
     initForm(data) {
       this.colData = data
       let dictList = []
@@ -184,6 +309,11 @@ export default {
             colItem.fieldValue = val
           }
 
+        } else if (item.type === 'upload') {
+          colItem = {
+            ...item,
+            fieldValue: []
+          }
         } else if (item.type == 'onOff') {
           colItem = {
             ...item,
@@ -195,8 +325,10 @@ export default {
           colItem = {
             ...item,
             type: item.type,
-            min: item.minValue || '',
-            max: item.maxValue || ''
+            min: item.minValue || 1,
+            max: item.maxValue || 1000000000,
+            minValue: item.minValue || 1,
+            maxValue: item.maxValue || 1000000000
           }
           if (!this.params.id) {
             colItem.fieldValue = Number(item.defaultValue) || 0
@@ -222,7 +354,11 @@ export default {
         }
         // console.log(colItem)
         formList[item.groupIndex]?.push(colItem) || (formList[item.groupIndex] = [colItem])
-        this.$set(this.formData, colItem.fieldDbName, colItem.fieldValue || "")
+        if (item.type === 'number') {
+          this.$set(this.formData, item.fieldDbName, 1)
+        } else {
+          this.$set(this.formData, item.fieldDbName, colItem.fieldValue || '')
+        }
       })
       this.formDataList = Object.values(formList)
 
@@ -240,12 +376,28 @@ export default {
     getDetail() {
       this.instance.post(`/app/appapplicationinfo/queryDetailById?appId=${this.appId}&id=${this.params.id}`).then((res) => {
         if (res?.data) {
-          this.formData = res.data
           this.configs.tableInfos.map((item) => {
+            this.formData[item.fieldDbName] = res.data[item.fieldDbName] || ''
             if(item.type == 'checkbox') {
               var checkList = this.formData[item.fieldDbName]?.split(',')
               this.formData[item.fieldDbName] = checkList
             }
+
+            if (item.type === 'gird' && this.formData[item.fieldDbName]) {
+              this.girdName = res.data[`${item.fieldDbName}_name`]
+            }
+
+            if (item.type === 'upload' && !this.formData[item.fieldDbName]) {
+              this.formData[item.fieldDbName] = []
+            }
+
+            if (item.type === 'upload' && this.formData[item.fieldDbName]) {
+              this.formData[item.fieldDbName] = this.formData[item.fieldDbName].split(',').map(v => {
+                return {
+                  url: v
+                }
+              })
+            }
           })
         }
       })
@@ -258,18 +410,19 @@ export default {
     submit() {
       this.$refs.formData?.validate((valid) => {
         if (valid) {
+          this.isLoading = true
           this.formDataList.map((item) => {
             if (item.length) {
               item.map((items) => {
                 if (items.type == 'checkbox' && this.formData[items.fieldDbName].length) { //多选
                   this.formData[items.fieldDbName] = this.formData[items.fieldDbName]?.toString()
                 }
-                if (items.type == 'upload' && this.formData[items.fieldDbName].length) { //附件 只传id
-                  var files = []
-                  this.formData[items.fieldDbName].map((item) => {
-                    files.push(item.id)
-                  })
-                  this.formData[items.fieldDbName] = files.join(',')
+                if (items.type == 'upload') {
+                  this.formData[items.fieldDbName] = this.formData[items.fieldDbName].map(v => v.url).join(',')
+                }
+
+                if(items.type == 'gird' && this.formData[items.fieldDbName]) {
+                  this.formData[items.fieldDbName] = this.formData[items.fieldDbName] + '_' + this.girdName
                 }
                 if(items.type == 'area' && this.formData[items.fieldDbName]) {
                   var area = []
@@ -284,12 +437,15 @@ export default {
             ...this.formData,
             id: this.params.id || ''
           }).then((res) => {
+            this.isLoading = false
             if (res.code == 0) {
               this.$message.success('提交成功')
               setTimeout(() => {
                 this.onBack(true)
               }, 600)
             }
+          }).catch(() => {
+            this.isLoading = false
           })
         }
       })
@@ -314,6 +470,19 @@ export default {
   vertical-align: top;
 }
 
+.add-form {
+  ::v-deep .AiPersonSelect {
+    .el-button {
+      border-color: transparent;
+    background-color: transparent;
+    color: inherit;
+    border-top: 0;
+    border-bottom: 0;
+    background: transparent;
+    }
+  }
+}
+
 .especial {
   margin-bottom: 12px;
 
diff --git a/packages/2.0.5/AppCodeGeneration/components/Detail.vue b/packages/2.0.5/AppCodeGeneration/components/Detail.vue
index 82e36f08..ceafe23b 100644
--- a/packages/2.0.5/AppCodeGeneration/components/Detail.vue
+++ b/packages/2.0.5/AppCodeGeneration/components/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <ai-detail v-if="pageShow" isHasSidebar>
+  <ai-detail v-loading="pageShow" isHasSidebar>
     <template #title>
       <ai-title :title="colData.applicationName+'详情'" isShowBottomBorder isShowBack @onBackClick="onBack(true)"></ai-title>
     </template>
@@ -7,17 +7,16 @@
       <AiSidebar :tabTitle="tabTitle" v-model="currIndex" v-if="appType"></AiSidebar>
       <ai-card v-show="currIndex === 0" :title="items[0].groupName" v-for="(items, indexs) in formDataList" :key="indexs">
         <template slot="content">
-          <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="1">
-            <div v-for="(item, index) in items" :key="index" :style="item.grid == 0.5 ? 'width: 50%;': 'width: 100%;'" class="form-div">
-              <ai-info-item :label="item.fieldName+ '：'">
-                <span v-if="item.dict && item.type != 'checkbox'">{{$dict.getLabel(item.dict, formData[item.fieldDbName]) || '-'}}</span>
-                <span v-if="!item.dict && item.type != 'rtf' && item.type != 'upload' && item.type != 'area'">{{formData[item.fieldDbName]}}</span>
-                <span v-if="item.type == 'checkbox'">{{formData[item.fieldDbName]}}</span>
-                <span v-if="item.type == 'rtf'" v-html="formData[item.fieldDbName]"></span>
-                <ai-file-list :fileList="formData[item.fieldDbName]" v-if="item.type == 'upload'" :fileOps="{name: 'name', size: 'fileSizeStr'}"></ai-file-list>
-                <span v-if="item.type == 'area'" v-html="formData[item.fieldDbName+'_name']"></span>
-              </ai-info-item>
-            </div>
+          <ai-wrapper>
+            <ai-info-item :label="item.fieldName" v-show="item.type !== 'resident'" v-for="(item, index) in items" :key="index" :isLine="item.grid == 1">
+              <span v-if="item.dict && item.type != 'checkbox'">{{$dict.getLabel(item.dict, formData[item.fieldDbName]) || '-'}}</span>
+              <span v-else-if="item.type == 'checkbox'">{{formData[item.fieldDbName]}}</span>
+              <span v-else-if="item.type == 'rtf'" v-html="formData[item.fieldDbName]"></span>
+              <ai-file-list :fileList="formData[item.fieldDbName]" v-else-if="item.type == 'upload'" :fileOps="{name: 'name', size: 'fileSizeStr'}"></ai-file-list>
+              <span v-else-if="item.type == 'area'">{{ formData[item.fieldDbName + '_name'] }}</span>
+              <span v-else-if="item.type == 'gird'">{{ formData[item.fieldDbName + '_name'] }}</span>
+              <span v-else>{{ formData[item.fieldDbName] || '-' }}</span>
+            </ai-info-item>
           </ai-wrapper>
         </template>
       </ai-card>
@@ -83,7 +82,7 @@
     },
 
     mounted () {
-      this.getFormData()
+      this.pageShow = true
       this.getDetail()
     },
 
@@ -136,7 +135,15 @@
             }
           }
           formList[item.groupIndex]?.push(colItem) || (formList[item.groupIndex] = [colItem])
-          this.$set(this.formData, colItem.fieldDbName, colItem.fieldValue || "")
+          if (item.type === 'upload') {
+            this.$set(this.formData, colItem.fieldDbName, this.formData[colItem.fieldDbName] ? this.formData[colItem.fieldDbName].split(',').map(v => {
+              return {
+                url: v
+              }
+            }) : [])
+          } else {
+            this.$set(this.formData, colItem.fieldDbName, this.formData[colItem.fieldDbName] || "")
+          }
         })
         this.formDataList = Object.values(formList)
 
@@ -157,13 +164,18 @@
         this.instance.post(`/app/appapplicationinfo/queryDetailById?appId=${this.appId}&id=${this.params.id}`).then((res) => {
           if (res?.data) {
             this.formData = res.data
+            this.getFormData()
+
+            this.pageShow = false
           }
+        }).catch(() => {
+          this.pageShow = false
         })
       },
 
       getDictList (listName) {
         this.dict.load(listName.join(',')).then(() => {
-          this.pageShow = true
+          
         })
       },
 
diff --git a/packages/2.0.5/AppCodeGeneration/components/List.vue b/packages/2.0.5/AppCodeGeneration/components/List.vue
index 854ee777..e7a02982 100644
--- a/packages/2.0.5/AppCodeGeneration/components/List.vue
+++ b/packages/2.0.5/AppCodeGeneration/components/List.vue
@@ -33,6 +33,8 @@
         </template>
         <template #right v-if="showRightInput">
           <el-input :placeholder="placeholder" v-model="search.searchParam" size="small"
+                    @keyup.enter.native="$forceUpdate();(page.current = 1), getList()"
+                    @clear="$forceUpdate();(page.current = 1), getList()"
                     @change="$forceUpdate();(page.current = 1), getList()" clearable prefix-icon="iconfont iconSearch"/>
         </template>
       </ai-search-bar>
@@ -67,9 +69,10 @@
             </div>
             <div v-if="item.type == 'rtf'" v-html="row[item.fieldDbName]"></div>
             <div v-if="item.type == 'checkbox'">{{ row[item.fieldDbName] }}</div>
+            <div v-if="item.type == 'gird'">{{ row[item.fieldDbName + '_name'] }}</div>
           </template>
         </el-table-column>
-        <el-table-column slot="options" label="操作" align="center" width="200">
+        <el-table-column slot="options" label="操作" fixed="right" align="center" width="160">
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toDetail(row, 'Detail')">详情</el-button>
diff --git a/packages/2.0.5/AppCommunityManage/components/Add.vue b/packages/2.0.5/AppCommunityManage/components/Add.vue
index 9243858b..fcaf118d 100644
--- a/packages/2.0.5/AppCommunityManage/components/Add.vue
+++ b/packages/2.0.5/AppCommunityManage/components/Add.vue
@@ -42,7 +42,8 @@
         <div class="grid">
           <el-tree :data="treeObj.treeList" :props="treeObj.defaultProps" node-key="id" ref="tree"
                    :check-strictly="true" show-checkbox
-                   :default-checked-keys="treeObj.checkedKeys" default-expand-all highlight-current>
+                   :default-checked-keys="treeObj.checkedKeys" default-expand-all
+            @check="onCheckChange">
           </el-tree>
         </div>
         <div class="dialog-footer" slot="footer">
@@ -120,7 +121,7 @@ export default {
       this.treeObj.checkedKeys = [];
       this.instance.post(`/app/appgirdinfo/listAll`, null, null).then((res) => {
         if (res.code == 0) {
-          this.treeObj.treeList = res.data;
+          this.treeObj.treeList = this.format(res.data)
           if (this.form.girdInfoList.length) {
             this.form.girdInfoList.map((e) => {
               this.treeObj.checkedKeys.push(e.id);
@@ -129,6 +130,29 @@ export default {
         }
       });
     },
+
+    onCheckChange (e) {
+      this.$nextTick(() => {
+        this.$refs.tree.getCheckedKeys().forEach(v => {
+          this.$refs.tree.setChecked(v, false)
+        })
+        this.$refs.tree.setChecked(e.id, true)
+      })
+    },
+
+    format (list) {
+      return list.map(item => {
+        if (item.girdLevel !== '2') {
+          item.disabled = true
+        }
+
+        if (item.girdList && item.girdList.length) {
+          item.girdList = this.format(item.girdList)
+        }
+
+        return item
+      })
+    },
     getCheckedTree() {
       if (this.$refs.tree.getCheckedNodes().length > 1) {
         return this.$message.error('不能绑定多个网格')
diff --git a/packages/2.0.5/AppCommunityManage/components/List.vue b/packages/2.0.5/AppCommunityManage/components/List.vue
index 424ffcf3..b0399ef3 100644
--- a/packages/2.0.5/AppCommunityManage/components/List.vue
+++ b/packages/2.0.5/AppCommunityManage/components/List.vue
@@ -10,7 +10,7 @@
           <el-button :disabled="!ids.length" icon="iconfont iconDelete" size="small" @click="removeAll">删除</el-button>
         </template>
         <template slot="right">
-          <el-input v-model="search.communityName" class="search-input" size="small" @change=";(search.current = 1), getList()" placeholder="小区名称" suffix-icon="iconfont iconSearch" clearable />
+          <el-input @clear=";(search.current = 1), (search.communityName = ''), getList()" v-throttle="() => {search.current=1,getList()}" v-model="search.communityName" class="search-input" size="small" placeholder="小区名称" suffix-icon="iconfont iconSearch" clearable />
         </template>
       </ai-search-bar>
 
diff --git a/packages/2.0.5/AppEquipmentManage/components/List.vue b/packages/2.0.5/AppEquipmentManage/components/List.vue
index 7868bec9..18c63d8b 100644
--- a/packages/2.0.5/AppEquipmentManage/components/List.vue
+++ b/packages/2.0.5/AppEquipmentManage/components/List.vue
@@ -6,7 +6,7 @@
         <ai-search-bar bottomBorder>
           <template slot="right">
             <el-input v-model="search.keyword" size="small" placeholder="设备名称/设备编号" clearable
-                      @keyup.enter.native=";(page.current = 1), getList()"
+                      v-throttle="() => {page.current = 1, getList()}"
                       @clear=";(page.current = 1), (search.keyword = ''), getList()" suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
@@ -23,7 +23,7 @@
             <template slot-scope="{ row }">
               <el-button type="text" @click="close(row.id)">停播</el-button>
               <el-button type="text" @click="bind(row)">绑定行政区划</el-button>
-              <el-button type="text" @click="locate=true">地图标绘</el-button>
+<!--              <el-button type="text" @click="locate=true">地图标绘</el-button>-->
             </template>
           </el-table-column>
         </ai-table>
diff --git a/packages/2.0.5/AppForm/components/Add.vue b/packages/2.0.5/AppForm/components/Add.vue
index 0eb1be6f..466e4248 100644
--- a/packages/2.0.5/AppForm/components/Add.vue
+++ b/packages/2.0.5/AppForm/components/Add.vue
@@ -16,7 +16,7 @@
         </div>
       </div>
       <basic-info ref="basicInfo" v-model="basicInfo" v-show="currIndex === 0" :dict="dict" :instance="instance"></basic-info>
-      <form-layout class="form-config__wrapper" v-model="tableInfos" ref="form" v-show="currIndex === 1" :dict="dict" :instance="instance"></form-layout>
+      <form-layout :appType="basicInfo.appType" :currIndex="currIndex" class="form-config__wrapper" v-model="tableInfos" ref="form" v-show="currIndex === 1" :dict="dict" :instance="instance"></form-layout>
       <form-config
         ref="config"
         :showListFields="showListFields"
@@ -121,7 +121,9 @@
               menuLevel1Name: res.data.menuLevel1Name,
               menuLevel3Name: res.data.menuLevel3Name,
               menuLevel2Name: res.data.menuLevel2Name,
-              appType: res.data.appType
+              appType: res.data.appType,
+              corpId: res.data.corpId,
+              corpName: res.data.corpName
             }
             this.fuzzyQueryFields = res.data.fuzzyQueryFields
             this.tableInfos = res.data.tableInfos
diff --git a/packages/2.0.5/AppForm/components/BasicInfo.vue b/packages/2.0.5/AppForm/components/BasicInfo.vue
index 8393c34a..d49f6b33 100644
--- a/packages/2.0.5/AppForm/components/BasicInfo.vue
+++ b/packages/2.0.5/AppForm/components/BasicInfo.vue
@@ -4,7 +4,7 @@
       <ai-card title="基本信息">
         <template #content>
           <div class="ai-form">
-            <el-form-item label="所属平台" prop="saasPlatformId" style="width: 100%;" :rules="[{ required: false, message: '请选择所属平台', trigger: 'change' }]">
+            <el-form-item label="所属平台" prop="saasPlatformId" style="width: 100%;" :rules="[{ required: true, message: '请选择所属平台', trigger: 'change' }]">
               <el-select
                 size="small"
                 style="width: 100%;"
@@ -20,6 +20,15 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="form.saasPlatformId" style="width: 100%;" label="所属企业" prop="corpId" :rules="[{ required: true, message: '请选择所属企业', trigger: 'change' }]">
+              <ai-select
+                v-model="form.corpId"
+                placeholder="请选择所属企业"
+                clearable
+                @change="onCompanyChange"
+                :selectList="companyList">
+              </ai-select>
+            </el-form-item>
             <el-form-item  style="width: 100%;" label="一级菜单名称" prop="menuLevel1Name" :rules="[{ required: true, message: '请输入一级菜单名称', trigger: 'change' }]">
               <el-input size="small" placeholder="请输入一级菜单名称" :maxlength="8" v-model="form.menuLevel1Name"></el-input>
             </el-form-item>
@@ -68,8 +77,11 @@
           menuLevel1Name: '',
           menuLevel2Name: '',
           menuLevel3Name: '',
-          appType: ''
+          appType: '',
+          corpId: '',
+          corpName: ''
         },
+        companyList: [],
         sassList: []
       }
     },
@@ -77,6 +89,9 @@
     watch: {
       value (v) {
         this.form = JSON.parse(JSON.stringify(v))
+        if (this.form.saasPlatformId) {
+          this.getCompanyList()
+        }
       }
     },
 
@@ -92,6 +107,7 @@
     methods: {
       onChange (e) {
         this.form.saasPlatformName = this.sassList.filter(v => v.id === e)[0].name
+        this.form.saasPlatformId && this.getCompanyList()
       },
 
       validate () {
@@ -103,6 +119,23 @@
         return result 
       },
 
+      onCompanyChange (e) {
+        this.form.corpName = this.companyList.filter(v => v.dictValue === e)[0].dictName
+      },
+
+      getCompanyList () {
+        this.instance.post(`/app/appCorp/page?current=1&size=1000&saasId=${this.form.saasPlatformId}`).then(res => {
+          if (res.data.records.length) {
+            this.companyList = res.data.records.map(v => {
+              return {
+                dictValue: v.corpId,
+                dictName: v.name
+              }
+            })
+          }
+        })
+      },
+
       getSassList () {
         this.instance.post(`/app/appSaas/listAll`).then(res => {
           if (res.data) {
diff --git a/packages/2.0.5/AppForm/components/FormLayout.vue b/packages/2.0.5/AppForm/components/FormLayout.vue
index e64527ab..35cb0c98 100644
--- a/packages/2.0.5/AppForm/components/FormLayout.vue
+++ b/packages/2.0.5/AppForm/components/FormLayout.vue
@@ -51,6 +51,7 @@
                     scroll
                     @end="onElEnd"
                     element="div"
+                    filter=".components-filter"
                     draggable=".components-item"
                     group="componentsGroup"
                     :sort="true">
@@ -58,10 +59,13 @@
                       class="components-item"
                       v-for="(item, i) in group.column"
                       :style="{width: item.grid * 100 + '%'}"
-                      :class="[groupIndex === j && activeIndex === i ? 'active' : '']"
+                      :class="{
+                        'components-filter': item.isInit,
+                        'active': groupIndex === j && activeIndex === i
+                      }"
                       @click.stop="groupIndex = j, activeIndex = i, isGroup = false"
                       :key="i">
-                      <div class="left-item__item--remove" title="删除字段" v-show="groupIndex === j && activeIndex === i" @click.stop="removeItem(j, i)">
+                      <div class="left-item__item--remove" title="删除字段" v-show="!item.isInit && groupIndex === j && activeIndex === i" @click.stop="removeItem(j, i)">
                         <i class="iconfont iconDelete"></i>
                         <span>删除字段</span>
                       </div>
@@ -69,6 +73,16 @@
                         <template v-if="(item.type === 'textarea')">
                           <el-input :disabled="item.disable === '1'" :rows="item.lineNumber" size="small" type="textarea" :placeholder="item.fieldTips" v-model="item.defaultValue"></el-input>
                         </template>
+                        <template v-if="(item.type === 'resident')">
+                          <el-input :disabled="item.disable === '1'" size="small" placeholder="请选择人员" v-model="item.defaultValue">
+                            <template slot="append">选择人员</template>
+                          </el-input>
+                        </template>
+                        <template v-if="(item.type === 'gird')">
+                          <el-input :disabled="item.disable === '1'" size="small" placeholder="请选择网格" v-model="item.defaultValue">
+                            <template slot="append">选择网格</template>
+                          </el-input>
+                        </template>
                         <template v-if="item.type === 'radio'">
                           <el-radio-group v-model="item.defaultValue" :disabled="item.disable === '1'">
                             <el-radio :label="field.label" v-for="(field, index) in item.options" :key="index">{{ field.label }}</el-radio>
@@ -110,11 +124,10 @@
                         <template v-if="item.type === 'area'">
                           <ai-area-get
                             :instance="instance"
-                            always-show
-                          />
+                            always-show />
                         </template>
                         <template v-if="item.type === 'select'">
-                          <el-select :disabled="item.disable === '1'" size="small" :placeholder="item.fieldTips" v-model="item.defaultValue">
+                          <el-select :disabled="item.disable === '1'" style="width: 100%;" size="small" :placeholder="item.fieldTips" v-model="item.defaultValue">
                             <el-option
                               v-for="(filed, index) in item.options"
                               :key="index"
@@ -153,7 +166,7 @@
           <el-input placeholder="请输入分组名称" :maxlength="32" show-word-limit v-model="currTarget.groupName"></el-input>
         </div>
       </div>
-      <div class="layout-right__del" @click="removeGroup" v-if="isGroup && targetList.length > 1">
+      <div class="layout-right__del" @click="removeGroup" v-if="isGroup && targetList.length > 1 && !currTarget.isInit">
         <span>删除分组</span>
       </div>
       <div class="right-item" v-if="activeIndex > -1">
@@ -360,7 +373,9 @@
       params: Object,
       type: String,
       areaId: String,
-      value: Array
+      value: Array,
+      appType: String,
+      currIndex: Number
     },
 
     components: {
@@ -424,6 +439,12 @@
         }
       },
 
+      currIndex (v, oldV) {
+        if (this.appType && !this.value.length && oldV === 0) {
+          this.getInitFileds()
+        }
+      },
+
       activeIndex () {
         if (this.activeIndex > -1 && this.groupIndex > -1 && !this.isGroup) {
           const filed = this.targetList[this.groupIndex].column[this.activeIndex]
@@ -509,6 +530,56 @@
         })
       },
 
+      getInitFileds () {
+        this.instance.post(`/app/appapplicationinfo/queryInitTable?appType=${this.appType}`).then(res => {
+          if (res.code === 0) {
+            let arr = res.data
+            let groups = this.unique(arr.map(v => v.groupName))
+            this.targetList = groups.map(groupName => {
+              const column = arr.filter(v => v.groupName === groupName).map(item => {
+                if (['select', 'checkbox', 'radio'].includes(item.type)) {
+                  item.options = item.selectValues.split('`').map(v => {
+                    return {
+                      label: v,
+                      value: ''
+                    }
+                  })
+                }
+
+                if (item.type === 'checkbox' && item.defaultValue) {
+                  item.defaultValue = item.defaultValue.split('`')
+                }
+
+                if (item.grid) {
+                  item.grid = Number(item.grid)
+                }
+
+                return item
+              })
+
+              return {
+                type: 'group',
+                fieldName: '卡片',
+                fixedLabel: '卡片',
+                icon: 'iconpic',
+                groupName,
+                column: column,
+                isInit: '1'
+              }
+            })
+
+            this.targetList.push({
+              type: 'group',
+              fieldName: '卡片',
+              fixedLabel: '卡片',
+              icon: 'iconpic',
+              groupName: '基础信息',
+              column: []
+            })
+          }
+        })
+      },
+
       onConfirm () {
         let result = []
         this.targetList.forEach((group, i) => {
@@ -517,7 +588,7 @@
               ...item,
               groupIndex: i,
               groupName: group.groupName,
-              fieldDbName: this.isUnique(item.type) ? item.type : `${item.type}${i}${index}`,
+              fieldDbName: item.isInit ? item.fieldDbName : (this.isUnique(item.type) ? item.type : `${item.type}${i}${index}`),
               defaultValue: item.type === 'checkbox' && item.defaultValue ? item.defaultValue.join('`') : item.defaultValue,
               selectValues: item.options ? item.options.map(v => v.label).join('`') : ''
             })
diff --git a/packages/2.0.5/AppForm/components/List.vue b/packages/2.0.5/AppForm/components/List.vue
index 52ca0186..1613d57a 100644
--- a/packages/2.0.5/AppForm/components/List.vue
+++ b/packages/2.0.5/AppForm/components/List.vue
@@ -12,7 +12,7 @@
           <el-input
             v-model="search.applicationName"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入菜单名称"
             clearable
             @clear="search.current = 1, search.applicationName = '', getList()"
diff --git a/packages/2.0.5/AppGridBlock/AppGridBlock.vue b/packages/2.0.5/AppGridBlock/AppGridBlock.vue
index be98134d..5eb35620 100644
--- a/packages/2.0.5/AppGridBlock/AppGridBlock.vue
+++ b/packages/2.0.5/AppGridBlock/AppGridBlock.vue
@@ -57,7 +57,8 @@ export default {
 
         this.$nextTick(() => {
           if (data.isRefresh) {
-            this.$refs.component.getList();
+            this.$refs.component.getList()
+            this.$refs.component.getTreeList()
           }
         });
       }
diff --git a/packages/2.0.5/AppGridBlock/components/list.vue b/packages/2.0.5/AppGridBlock/components/list.vue
index 86048969..3209908c 100644
--- a/packages/2.0.5/AppGridBlock/components/list.vue
+++ b/packages/2.0.5/AppGridBlock/components/list.vue
@@ -38,6 +38,7 @@
               placeholder="输入网格名称"
               @keyup.enter.native="(page.current = 1), getList()"
               clearable
+              v-throttle="() => {page.current = 1, getList()}"
               @clear="(searchObj.girdName = '', page.current = 1), getList()"
               suffix-icon="iconfont iconSearch"
             />
diff --git a/packages/2.0.5/AppGridMember/AppGridMember.vue b/packages/2.0.5/AppGridMember/AppGridMember.vue
index fa9f5d03..ee665370 100644
--- a/packages/2.0.5/AppGridMember/AppGridMember.vue
+++ b/packages/2.0.5/AppGridMember/AppGridMember.vue
@@ -1,79 +1,117 @@
 <template>
-  <div class="AppGridMember">
-    <keep-alive :include="['List']">
-      <component
-        ref="component"
-        :is="component"
-        @change="onChange"
-        :params="params"
-        :instance="instance"
-        :dict="dict"
-      ></component>
-    </keep-alive>
-  </div>
+  <ai-list class="AppGridMember" v-if="!isShowDetail">
+    <template slot="title">
+      <ai-title title="网格员管理" :isShowBottomBorder="false"></ai-title>
+    </template>
+    <template slot="tabs">
+      <el-tabs v-model="currIndex">
+        <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
+          <component :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions"/>
+        </el-tab-pane>
+      </el-tabs>
+    </template>
+  </ai-list>
+  <Add v-else-if="component === 'Add'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Add>
+  <Family v-else-if="component === 'Family'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Family>
+  <ApplyDetail v-else-if="component === 'ApplyDetail'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></ApplyDetail>
+  <ApplyAdd v-else-if="component === 'ApplyAdd'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></ApplyAdd>
 </template>
 
 <script>
-import List from "./components/list";
-import Add from "./components/add";
-import Family from "./components/Family";
+  import List from './components/list'
+  import ApplyList from './components/ApplyList'
+  import Add from './components/add'
+  import ApplyDetail from './components/ApplyDetail'
+  import ApplyAdd from './components/ApplyAdd'
+  import Family from './components/Family'
 
-export default {
-  name: "AppGridMember",
-  label: "网格管理员",
+  export default {
+    name: "AppGridMember",
+    label: "网格管理员",
 
-  props: {
-    instance: Function,
-    dict: Object,
-  },
-
-  data() {
-    return {
-      component: "List",
-      params: {},
-      include: [],
-    };
-  },
-
-  components: {
-    Add,
-    List,
-    Family
-  },
-
-  mounted() {},
-
-  methods: {
-    onChange(data) {
-      if (data.type === "Add") {
-        this.component = "Add";
-        this.params = data.params;
-      }
-
-      if (data.type === "Family") {
-        this.component = "Family"
-        this.params = data.params
-      }
-
-      if (data.type === "list") {
-        this.component = "List";
-        this.params = data.params;
-
-        this.$nextTick(() => {
-          if (data.isRefresh) {
-            this.$refs.component.getList();
-          }
-        });
-      }
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function
     },
-  },
-};
+
+    data() {
+      return {
+        component: "List",
+        params: {},
+        include: [],
+        currIndex: '0',
+        isShowDetail: false
+      };
+    },
+
+      computed: {
+        tabs () {
+          const tabList = [
+            {label: '网格员信息', name: 'List', comp: List, permission: ''},
+            // {label: '申报信息', name: 'ApplyList', comp: ApplyList, permission: ''}
+          ].filter(item => {
+            return true
+          })
+
+          return tabList
+        }
+      },
+
+    components: {
+      Add,
+      List,
+      Family,
+      ApplyList,
+      ApplyDetail,
+      ApplyAdd
+    },
+
+    mounted() {},
+
+    methods: {
+      onChange(data) {
+        if (data.type === "Add") {
+          this.component = "Add"
+          this.isShowDetail = true
+          this.params = data.params
+        }
+
+        if (data.type === "Family") {
+          this.component = "Family"
+          this.isShowDetail = true
+          this.params = data.params
+        }
+        if (data.type === "ApplyDetail") {
+          this.component = "ApplyDetail"
+          this.isShowDetail = true
+          this.params = data.params
+        }
+
+        if (data.type === "ApplyAdd") {
+          this.component = "ApplyAdd"
+          this.isShowDetail = true
+          this.params = data.params
+        }
+
+        if (data.type === "list") {
+          this.component = "List"
+          this.isShowDetail = false
+          this.params = data.params
+        }
+
+        if (data.type === "ApplyList") {
+          this.component = "ApplyList"
+          this.isShowDetail = false
+          this.params = data.params
+        }
+      }
+    }
+  }
 </script>
 
 <style lang="scss">
-.AppGridMember {
-  height: 100%;
-  background: #f3f6f9;
-  overflow: auto;
-}
+  .AppGridMember {
+    height: 100%;
+  }
 </style>
diff --git a/packages/2.0.5/AppGridMember/components/ApplyAdd.vue b/packages/2.0.5/AppGridMember/components/ApplyAdd.vue
new file mode 100644
index 00000000..c2906b86
--- /dev/null
+++ b/packages/2.0.5/AppGridMember/components/ApplyAdd.vue
@@ -0,0 +1,107 @@
+<template>
+  <ai-detail class="content-add">
+    <template slot="title">
+      <ai-title :title="params.id ? '编辑' : '添加'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <el-form class="ai-form" :model="form" label-width="120px" ref="form">
+            <el-form-item label="姓名" style="width: 100%;" prop="name" :rules="[{required: true, message: '请输入姓名', trigger: 'blur'}]">
+              <el-input size="small" v-model="form.name" placeholder="请输入..." :maxlength="20"></el-input>
+            </el-form-item>
+            <el-form-item label="联系电话" style="width: 100%;" prop="phone" :rules="[{required: true, message: '请输入联系电话', trigger: 'blur'}]">
+              <el-input size="small" v-model="form.phone" placeholder="请输入..." :maxlength="11"></el-input>
+            </el-form-item>
+            <el-form-item label="网格名称" style="width: 100%;" prop="girdName" :rules="[{required: true, message: '请输入网格名称', trigger: 'blur'}]">
+              <el-input size="small" v-model="form.girdName" placeholder="请输入..." :maxlength="50"></el-input>
+            </el-form-item>
+          </el-form>
+        </template>
+      </ai-card>
+    </template>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" :loading="isLoading" @click="confirm">提交</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'ApplyAdd',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        form: {
+          name: '',
+          phone: '',
+          gridName: ''
+        },
+        isLoading: false,
+        id: ''
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appcontentinfo/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+          }
+        })
+      },
+
+      onChange () {
+        this.form.files = []
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.isLoading = true
+            this.instance.post(`/app/appgirdmemberapply/addOrUpdate`, {
+              ...this.form,
+              id: this.params.id || ''
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('提交成功')
+                setTimeout(() => {
+                  this.cancel(true)
+                }, 600)
+              } else {
+                this.isLoading = false
+              }
+            }).catch(() => {
+              this.isLoading = false
+            })
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/packages/2.0.5/AppGridMember/components/ApplyDetail.vue b/packages/2.0.5/AppGridMember/components/ApplyDetail.vue
new file mode 100644
index 00000000..e50a258a
--- /dev/null
+++ b/packages/2.0.5/AppGridMember/components/ApplyDetail.vue
@@ -0,0 +1,65 @@
+<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.name"></ai-info-item>
+            <ai-info-item label="联系电话" isLine :value="info.phone"></ai-info-item>
+            <ai-info-item label="网格名称" isLine :value="info.girdName"></ai-info-item>
+          </ai-wrapper>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'ApplyDetail',
+
+    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(`/app/appgirdmemberapply/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'ApplyList',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/packages/2.0.5/AppGridMember/components/ApplyList.vue b/packages/2.0.5/AppGridMember/components/ApplyList.vue
new file mode 100644
index 00000000..ef3a43fd
--- /dev/null
+++ b/packages/2.0.5/AppGridMember/components/ApplyList.vue
@@ -0,0 +1,179 @@
+<template>
+  <ai-list class="list" isTabs>
+    <template slot="content">
+      <ai-search-bar bottomBorder>
+        <template slot="left">
+          <el-button
+            icon="iconfont iconAdd"
+            type="primary"
+            size="small"
+            @click="add('')">添加</el-button>
+          <el-button
+            icon="iconfont iconDelete"
+            @click="deleteById(ids.join(','))"
+            :disabled="!Boolean(ids.length)">
+            删除
+          </el-button>
+          <ai-import :instance="instance" :dict="dict" type="appgirdmemberapply" name="网格员申报" @success="getList()">
+            <el-button icon="iconfont iconImport">导入</el-button>
+          </ai-import>
+        </template>
+        <template slot="right">
+          <el-input
+            v-model="searchObj.name"
+            size="small"
+            placeholder="网格员/责任网格"
+            @keyup.enter.native="(page.current = 1), getList()"
+            clearable
+            @clear="(searchObj.name = '', page.current = 1), getList()"
+            suffix-icon="iconfont iconSearch" />
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="page.total"
+        ref="aitableex"
+        :current.sync="page.current"
+        :size.sync="page.size"
+        @selection-change="(v) => (ids = v.map((e) => e.id))"
+        @getList="getList()">
+        <el-table-column label="操作" slot="options" align="center" fixed="right" width="120">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="deleteById(row.id)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  export default {
+    name: 'ApplyList',
+    label: '网格员管理',
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function,
+    },
+    data() {
+      return {
+        searchObj: {
+          name: "",
+          selectionDate: "",
+        },
+        page: {
+          current: 1,
+          size: 10,
+          total: 0,
+        },
+        goAdd: false,
+        tableData: [],
+        fileList: [],
+        ids: [],
+        detail: {},
+      };
+    },
+    created() {
+      this.dict.load("sex", "girdMemberType", "politicsStatus", "education");
+      this.getList();
+    },
+    computed: {
+      colConfigs() {
+        let _ = this;
+        return [
+          {
+            type: "selection",
+          },
+          {
+            prop: "name",
+            label: "网格员姓名",
+          },
+          {
+            prop: "girdName",
+            align: "left",
+            label: "责任网格",
+          },
+          {
+            prop: "phone",
+            align: "center",
+            label: "联系电话",
+          }
+        ];
+      },
+    },
+    methods: {
+      getList() {
+        this.instance
+          .post("/app/appgirdmemberapply/list", null, {
+            params: {
+              ...this.searchObj,
+              ...this.page,
+            },
+          })
+          .then((res) => {
+            if (res.code == 0) {
+              this.tableData = res.data.records;
+              this.page.total = res.data.total;
+            }
+          });
+      },
+      deleteById(ids) {
+        ids &&
+          this.$confirm("是否要删除该网格员？", {
+            type: "error",
+          })
+            .then(() => {
+              this.instance
+                .post("/app/appgirdmemberapply/delete", null, {
+                  params: { ids },
+                })
+                .then((res) => {
+                  if (res?.code == 0) {
+                    this.$message.success("删除成功!");
+                    this.getList();
+                  }
+                });
+            })
+            .catch(() => {});
+      },
+      add (id) {
+        this.$emit('change', {
+          type: 'ApplyAdd',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'ApplyDetail',
+          params: {
+            id
+          }
+        })
+      },
+
+      handleSelectionChange(val) {
+        this.ids = [];
+        val.map((e) => {
+          this.ids.push(e.id);
+        });
+      },
+      resetSearch() {
+        Object.keys(this.searchObj).map((e) => {
+          this.searchObj[e] = "";
+        });
+        this.getList();
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/packages/2.0.5/AppGridMember/components/Family.vue b/packages/2.0.5/AppGridMember/components/Family.vue
index 98298bed..91b33a2f 100644
--- a/packages/2.0.5/AppGridMember/components/Family.vue
+++ b/packages/2.0.5/AppGridMember/components/Family.vue
@@ -23,7 +23,7 @@
             v-model="search.name"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="姓名/身份证/联系方式"
             clearable
             @clear="search.current = 1, search.name = '', getList()"
diff --git a/packages/2.0.5/AppGridMember/components/list.vue b/packages/2.0.5/AppGridMember/components/list.vue
index 2d3878af..8aebb285 100644
--- a/packages/2.0.5/AppGridMember/components/list.vue
+++ b/packages/2.0.5/AppGridMember/components/list.vue
@@ -1,8 +1,5 @@
 <template>
-  <ai-list class="list">
-    <template slot="title">
-      <ai-title title="网格员管理" :isShowBottomBorder="true"></ai-title>
-    </template>
+  <ai-list class="list" isTabs>
     <template slot="content">
       <ai-search-bar bottomBorder>
         <template slot="left">
@@ -20,6 +17,7 @@
             v-model="searchObj.name"
             size="small"
             placeholder="网格员/责任网格"
+            v-throttle="() => {page.current = 1, getList()}"
             @keyup.enter.native="(page.current = 1), getList()"
             clearable
             @clear="(searchObj.name = '', page.current = 1), getList()"
@@ -56,7 +54,7 @@
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toFamily(row.id)">责任家庭</el-button>
-              <el-button type="text" @click="add(row.id)">查看</el-button>
+              <el-button type="text" @click="add(row.id)">详情</el-button>
               <el-button type="text" @click="deleteById(row.id)">删除</el-button>
             </div>
           </template>
@@ -68,7 +66,7 @@
 
 <script>
 export default {
-  name: "list",
+  name: "List",
   label: "网格员管理",
   props: {
     instance: Function,
diff --git a/packages/2.0.5/AppHomesteadManagement/components/List.vue b/packages/2.0.5/AppHomesteadManagement/components/List.vue
index 43fb30c7..ee6976ec 100644
--- a/packages/2.0.5/AppHomesteadManagement/components/List.vue
+++ b/packages/2.0.5/AppHomesteadManagement/components/List.vue
@@ -12,7 +12,8 @@
 
           <!-- 搜索 -->
           <template slot="right">
-            <el-input v-model="search.name" size="small" placeholder="户主/联系电话" clearable @keyup.enter.native=";(page.current = 1), getList()" @clear=";(page.current = 1), (search.name = ''), getList()" suffix-icon="iconfont iconSearch" />
+            <el-input v-model="search.name" size="small"
+              v-throttle="() => {page.current = 1, getList()}" placeholder="户主/联系电话" clearable @clear=";(page.current = 1), (search.name = ''), getList()" suffix-icon="iconfont iconSearch" />
           </template>
         </ai-search-bar>
 
diff --git a/packages/2.0.5/AppMediaManage/components/List.vue b/packages/2.0.5/AppMediaManage/components/List.vue
index 88c34217..30f9485d 100644
--- a/packages/2.0.5/AppMediaManage/components/List.vue
+++ b/packages/2.0.5/AppMediaManage/components/List.vue
@@ -10,7 +10,7 @@
           </template>
           <template slot="right">
             <el-input v-model="search.name" size="small" placeholder="媒资名称" clearable
-                      @keyup.enter.native=";(page.current = 1), getList()"
+                      v-throttle="() => {page.current = 1, getList()}"
                       @clear=";(page.current = 1), (search.name = ''), getList()" suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
diff --git a/packages/2.0.5/AppMonitoringObject/components/list.vue b/packages/2.0.5/AppMonitoringObject/components/list.vue
index 246a0dc9..bb99b3af 100644
--- a/packages/2.0.5/AppMonitoringObject/components/list.vue
+++ b/packages/2.0.5/AppMonitoringObject/components/list.vue
@@ -19,7 +19,7 @@
               <ai-select v-model="status" placeholder="请选择" clearable :selectList="$dict.getDict('fpStatus')" @change="page.current=1,getTableData()"></ai-select>
             </template>
             <template #right>
-              <el-input placeholder="姓名/身份证/户主联系方式"  v-model="search.name" size="small"  clearable @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
+              <el-input placeholder="姓名/身份证/户主联系方式"  v-model="search.name" size="small" @clear="page.current = 1,search.name = '', getTableData()"  clearable v-throttle="() => {page.current = 1, getTableData()}" suffix-icon="iconfont iconSearch"/>
             </template>
           </ai-search-bar>
           <ai-search-bar>
diff --git a/packages/2.0.5/AppVaccination/AppVaccination.vue b/packages/2.0.5/AppVaccination/AppVaccination.vue
index 9f1d1ad2..255b333d 100644
--- a/packages/2.0.5/AppVaccination/AppVaccination.vue
+++ b/packages/2.0.5/AppVaccination/AppVaccination.vue
@@ -20,7 +20,8 @@
                         v-model="search.name"
                         size="small"
                         clearable
-                        @change="page.current=1,getTableData()"
+                        @clear="page.current = 1,search.name = '', getTableData()"
+                        v-throttle="() => {page.current = 1, getTableData()}"
                         suffix-icon="iconfont iconSearch"/>
             </template>
           </ai-search-bar>
diff --git a/packages/2.0.5/AppVisitVondolence/AppVisitVondolence.vue b/packages/2.0.5/AppVisitVondolence/AppVisitVondolence.vue
new file mode 100644
index 00000000..3af8d982
--- /dev/null
+++ b/packages/2.0.5/AppVisitVondolence/AppVisitVondolence.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="AppVisitVondolence">
+    <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.vue'
+  import Detail from './components/Detail.vue'
+
+  export default {
+    name: 'AppVisitVondolence',
+    label: '走访慰问',
+
+    components: {
+      List,
+      Detail
+    },
+
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {}
+      }
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.isShowDetail = true
+          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" scoped>
+  .AppVisitVondolence {
+    height: 100%;
+  }
+</style>
diff --git a/packages/2.0.5/AppVisitVondolence/components/Detail.vue b/packages/2.0.5/AppVisitVondolence/components/Detail.vue
new file mode 100644
index 00000000..91bf7ce6
--- /dev/null
+++ b/packages/2.0.5/AppVisitVondolence/components/Detail.vue
@@ -0,0 +1,89 @@
+ <template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(true)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <ai-wrapper
+            label-width="120px">
+            <ai-info-item label="标题" :value="info.title" isLine></ai-info-item>
+            <ai-info-item label="描述" isLine :value="info.description"></ai-info-item>
+            <ai-info-item label="图片" isLine :value="info.idNumber">
+              <ai-uploader v-model="info.images" :instance="instance" :limit="9" disabled/>
+            </ai-info-item>
+            <ai-info-item label="慰问对象" :value="info.name"></ai-info-item>
+            <ai-info-item label="对象类型" :value="info.type"></ai-info-item>
+            <ai-info-item label="现实状态" isLine :value="dict.getLabel('visitCondolenceReality', info.reality)"></ai-info-item>
+            <ai-info-item label="走访人" :value="info.createUserName"></ai-info-item>
+            <ai-info-item label="走访时间" :value="info.visitTime"></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 () {
+      this.id = this.params.id
+      this.dict.load(['visitCondolenceReality']).then(() => {
+        this.getDictList()
+      })
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appvisitvondolence/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.info.images = res.data.images ? JSON.parse(res.data.images) : []
+            this.info.type = this.dictList.filter(v => v.dictValue === res.data.applicationId)[0].dictName
+          }
+        })
+      },
+
+      getDictList () {
+        this.instance.post(`/app/appapplicationinfo/queryApplicationListByType`).then(res => {
+          if (res.code == 0) {
+            this.dictList = res.data.map(v => {
+              return {
+                dictValue: v.id,
+                dictName: v.applicationName
+              }
+            })
+            this.getInfo(this.params.id)
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/packages/2.0.5/AppVisitVondolence/components/List.vue b/packages/2.0.5/AppVisitVondolence/components/List.vue
new file mode 100644
index 00000000..8af96c02
--- /dev/null
+++ b/packages/2.0.5/AppVisitVondolence/components/List.vue
@@ -0,0 +1,155 @@
+<template>
+  <ai-list class="list">
+    <ai-title slot="title" title="走访慰问" isShowBottomBorder></ai-title>
+    <template slot="content">
+      <div class="content">
+        <ai-search-bar bottomBorder>
+          <template #left>
+            <ai-select
+              v-model="search.applicationId"
+              clearable
+              placeholder="请选择对象类型"
+              :selectList="dictList"
+              @change="search.current = 1, getList()">
+            </ai-select>
+            <ai-select
+              v-model="search.reality"
+              clearable
+              placeholder="请选择现实状态"
+              :selectList="dict.getDict('visitCondolenceReality')"
+              @change="search.current = 1, getList()">
+            </ai-select>
+          </template>
+          <template #right>
+            <el-input
+              v-model="search.title"
+              size="small"
+              placeholder="标题、慰问对象、走访人"
+              clearable
+              v-throttle="() => {search.current = 1, getList()}"
+              @clear="search.current = 1, search.title = '', getList()"
+              suffix-icon="iconfont iconSearch">
+            </el-input>
+          </template>
+        </ai-search-bar>
+        <ai-table
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          style="margin-top: 16px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
+          <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+                <el-button type="text" @click="remove(row.id)">删除</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </div>
+    </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,
+          title: '',
+          reality: '',
+          menuLevel3Name: ''
+        },
+        dictList: [],
+        info: {},
+        colConfigs: [
+          { prop: 'title', label: '标题' },
+          { prop: 'visitTime', align: 'center', label: '走访时间' },
+          { prop: 'name', align: 'center', label: '慰问对象' },
+          { prop: 'menuLevel3Name', align: 'center', label: '对象类型' },
+          { prop: 'reality', align: 'center', label: '现实状态', formart: v => v ? this.dict.getLabel('visitCondolenceReality', v) : '-' },
+          { prop: 'createUserName', align: 'center', label: '走访人' }
+        ],
+        tableData: [],
+        total: 0
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      this.getDictList()
+      this.dict.load(['visitCondolenceReality']).then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appvisitvondolence/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      getDictList () {
+        this.instance.post(`/app/appapplicationinfo/queryApplicationListByType`).then(res => {
+          if (res.code == 0) {
+            this.dictList = res.data.map(v => {
+              return {
+                dictValue: v.id,
+                dictName: v.applicationName
+              }
+            })
+          }
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appvisitvondolence/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 scoped lang="scss">
+  .list {
+  }
+</style>
diff --git a/packages/3.0.0/AppContentInfo/AppContentInfo.vue b/packages/3.0.0/AppContentInfo/AppContentInfo.vue
index a5d16b3e..0df1c1c0 100644
--- a/packages/3.0.0/AppContentInfo/AppContentInfo.vue
+++ b/packages/3.0.0/AppContentInfo/AppContentInfo.vue
@@ -1,15 +1,26 @@
 <template>
-  <div class="doc-circulation ailist-wrapper">
-    <keep-alive :include="['List']">
-      <component ref="component" :moduleName="moduleName" :moduleId="moduleId" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
-    </keep-alive>
-  </div>
+  <ai-list v-if="!isShowDetail">
+    <template slot="title">
+      <ai-title :title="moduleName" :isShowBottomBorder="false" :isShowArea="true" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
+    </template>
+    <template slot="tabs">
+      <el-tabs v-model="currIndex">
+        <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
+          <component :areaId="areaId" :moduleName="moduleName" :moduleId="moduleId" :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions"/>
+        </el-tab-pane>
+      </el-tabs>
+    </template>
+  </ai-list>
+  <Add v-else-if="component === 'Add'" :moduleName="moduleName" :moduleId="moduleId" :areaId="areaId" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Add>
+  <Detail v-else-if="component === 'Detail'" :moduleName="moduleName" :moduleId="moduleId" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Detail>
 </template>
 
 <script>
   import List from './components/List'
   import Add from './components/Add'
   import Detail from './components/Detail'
+  import Audit from './components/Audit'
+  import { mapState } from 'vuex'
 
   export default {
     name: 'AppContentInfo',
@@ -17,31 +28,48 @@
 
     props: {
       instance: Function,
-      dict: Object
+      dict: Object,
+      permissions: Function
     },
 
     data () {
       return {
+        areaId: '',
         component: 'List',
         params: {},
         moduleId: '',
         include: [],
-        moduleName: ''
+        moduleName: '',
+        tabs: [],
+        currIndex: '0',
+        isShowDetail: false
       }
     },
 
     components: {
       Add,
       List,
+      Audit,
       Detail
     },
 
+    computed: {
+      ...mapState(['user'])
+    },
+
     created () {
       this.moduleId = this.$route.query.moduleId
+      this.areaId = this.user.info.areaId
 
       this.instance.post('/app/appcontentmoduleinfo/queryDetailById?id=' + this.$route.query.moduleId).then(res => {
         if (res.code === 0) {
           this.moduleName = res.data.moduleName
+          this.tabs = [
+            {label: this.moduleName, name: 'List', comp: List, permission: ''},
+            {label: `${this.moduleName}审核`, name: 'Audit', comp: Audit, permission: 'app_appcontentinfo_examine'}
+          ].filter(item => {
+            return item.name !== 'Audit' || (res.data.needExamine === '1' && item.name === 'Audit' && this.permissions(item.permission))
+          })
         }
       })
     },
@@ -51,23 +79,32 @@
         if (data.type === 'Add') {
           this.component = 'Add'
           this.params = data.params
+          this.isShowDetail = true
         }
 
         if (data.type === 'Detail') {
           this.component = 'Detail'
           this.params = data.params
+          this.isShowDetail = true
         }
 
-        if (data.type === 'list') {
+        if (data.type === 'Audit') {
+          this.component = 'Audit'
+          this.params = data.params
+          this.isShowDetail = false
+        }
+
+        if (data.type === 'List') {
           this.component = 'List'
           this.params = data.params
-
-          this.$nextTick(() => {
-            if (data.isRefresh) {
-              this.$refs.component.getList()
-            }
-          })
+          this.isShowDetail = false
         }
+      },
+
+      onAreaChange () {
+        this.$nextTick(() => {
+          this.$refs[this.currIndex][0].getList()
+        })
       }
     }
   }
diff --git a/packages/3.0.0/AppContentInfo/components/Add.vue b/packages/3.0.0/AppContentInfo/components/Add.vue
index 11e7c23c..0f61b87d 100644
--- a/packages/3.0.0/AppContentInfo/components/Add.vue
+++ b/packages/3.0.0/AppContentInfo/components/Add.vue
@@ -100,6 +100,7 @@
       instance: Function,
       dict: Object,
       params: Object,
+      areaId: String,
       moduleName: String
     },
     data () {
@@ -134,7 +135,8 @@
           }
         ],
         isHideCoverimg: false,
-        cateList: []
+        cateList: [],
+        needExamine: '0'
       }
     },
 
@@ -145,7 +147,7 @@
     created () {
       this.getModuleInfo()
       this.getCateList()
-      this.form.areaId = this.user.info.areaId
+      this.form.areaId = this.areaId
       this.disabledLevel = this.user.info.areaList.length
       if (this.params && this.params.id) {
         this.id = this.params.id
@@ -161,7 +163,6 @@
             this.form.pictureUrl = res.data.pictureUrl ? [{
               url: res.data.pictureUrl
             }] : []
-
           }
         })
       },
@@ -170,6 +171,7 @@
         this.instance.post(`/app/appcontentmoduleinfo/queryDetailById?id=${this.$route.query.moduleId}`).then(res => {
           if (res.code === 0) {
             this.isHideCoverimg = res.data.styleType === '0'
+            this.needExamine = res.data.needExamine
           }
         })
       },
@@ -253,7 +255,11 @@
               pictureUrl: this.form.pictureUrl.length ? this.form.pictureUrl[0].url : ''
             }).then(res => {
               if (res.code == 0) {
-                this.$message.success('提交成功')
+                if (this.needExamine === '1') {
+                  this.$message.success('提交成功，等待管理员审核')
+                } else {
+                  this.$message.success('提交成功')
+                }
                 setTimeout(() => {
                   this.cancel(true)
                 }, 600)
@@ -269,7 +275,7 @@
 
       cancel (isRefresh) {
         this.$emit('change', {
-          type: 'list',
+          type: 'List',
           isRefresh: !!isRefresh
         })
       }
diff --git a/packages/3.0.0/AppContentInfo/components/Audit.vue b/packages/3.0.0/AppContentInfo/components/Audit.vue
new file mode 100644
index 00000000..9a9a4956
--- /dev/null
+++ b/packages/3.0.0/AppContentInfo/components/Audit.vue
@@ -0,0 +1,201 @@
+<template>
+  <ai-list class="notice" isTabs>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <ai-select
+            v-model="search.examineStatus"
+            @change="search.current = 1, getList()"
+            placeholder="审核状态"
+            :selectList="dict.getDict('auditStatus')">
+          </ai-select>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.title"
+            class="search-input"
+            size="small"
+            v-throttle="() => {search.current=1,getList()}"
+            placeholder="请输入标题"
+            clearable
+            @clear="search.current = 1, search.title = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </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">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="audit(row.id)">审核</el-button>
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+      <ai-dialog
+        :visible.sync="isShow"
+        width="800px"
+        @close="onClose"
+        title="审核"
+        @onConfirm="onConfirm">
+        <el-form class="ai-form" label-width="120px" :model="form" ref="form">
+          <el-form-item label="是否通过审核" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请选择是否通过审核' }]">
+            <el-radio-group v-model="form.pass" @change="onStatusChange">
+              <el-radio label="0">否</el-radio>
+              <el-radio label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="form.pass === '0'" label="审核意见" prop="opinion" style="width: 100%;" :rules="[{ required: form.pass === '0', message: '请输入审核意见' }]">
+            <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'Audit',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      moduleName: String,
+      areaId: String
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          title: '',
+          examineStatus: ''
+        },
+        form: {
+          opinion: '',
+          pass: ''
+        },
+        id: '',
+        isShow: false,
+        total: 0,
+        colConfigs: [
+          { prop: 'title',  label: '标题', align: 'left', width: '200px' },
+          { prop: 'areaName', label: '地区', align: 'left' },
+          { prop: 'examineStatus', label: '状态', align: 'center', formart: v => this.dict.getLabel('auditStatus', v) },
+          { prop: 'examineOpinion', label: '信息', align: 'center' },
+          { prop: 'createUserName', label: '发布人', align: 'center' },
+          { prop: 'createTime', label: '发布时间', align: 'center' },
+          { slot: 'options', label: '操作', align: 'center' }
+        ],
+        areaName: '',
+        unitName: '',
+        tableData: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      this.dict.load('auditStatus').then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appcontentinfo/list-web`, null, {
+          params: {
+            moduleId: this.$route.query.moduleId,
+            ...this.search,
+            areaId: this.areaId,
+            queryType: 1
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      onStatusChange () {
+        this.form.opinion = ''
+        this.$refs.form.clearValidate()
+      },
+
+      onClose () {
+        this.form.opinion = ''
+        this.form.pass = ''
+      },
+
+      onConfirm () {
+        this.$refs.form.validate(v => {
+          if (v) {
+            this.instance.post('/app/appcontentinfo/examine', null, {
+              params: {
+                ...this.form,
+                id: this.id
+              }
+            }).then(res => {
+              if (res?.code == 0) {
+                this.isShow = false
+                this.getList()
+                this.$message.success('审核成功!')
+              }
+            })
+          }
+        })
+      },
+      
+      audit (id) {
+        this.id = id
+        this.isShow = true
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appcontentinfo/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>
+  .notice {
+  }
+</style>
diff --git a/packages/3.0.0/AppContentInfo/components/Detail.vue b/packages/3.0.0/AppContentInfo/components/Detail.vue
index 7f32cd7b..bea4c46c 100644
--- a/packages/3.0.0/AppContentInfo/components/Detail.vue
+++ b/packages/3.0.0/AppContentInfo/components/Detail.vue
@@ -7,6 +7,35 @@
     <template slot="content">
       <ai-card title="基本信息">
         <template #content>
+          <ai-wrapper
+            label-width="120px">
+            <ai-info-item label="标题" isLine :value="info.title"></ai-info-item>
+            <ai-info-item label="发布地区" isLine :value="info.areaName"></ai-info-item>
+            <ai-info-item label="文章类型" isLine :value="info.contentType === '0' ? '文章' : '视频'"></ai-info-item>
+            <ai-info-item label="分类" isLine :value="info.categoryName"></ai-info-item>
+            <ai-info-item label="正文" v-if="info.contentType === '0'" isLine>
+              <AiArticle :value="info.content"></AiArticle>
+            </ai-info-item>
+            <ai-info-item v-if="info.contentType === '0'" isLine label="封面图片">
+              <ai-uploader
+                :instance="instance"
+                disabled
+                v-model="info.files"
+                :limit="9">
+              </ai-uploader>
+            </ai-info-item>
+            <ai-info-item v-if="info.contentType === '1'" isLine label="封面图片">
+              <video style="width:100%; height:100%; object-fit: fill;" :src="info.files[0].url" controls></video>
+            </ai-info-item>
+            <ai-info-item v-if="info.contentType === '1'" isLine label="视频封面">
+              <ai-uploader
+                :instance="instance"
+                disabled
+                v-model="info.pictureUrl"
+                :limit="1">
+              </ai-uploader>
+            </ai-info-item>
+          </ai-wrapper>
         </template>
       </ai-card>
     </template>
@@ -40,19 +69,19 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appeveryvillagecode/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appcontentinfo/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
-            this.form = res.data
-            this.form.codeUrl = [{
-              url: res.data.codeUrl
-            }]
+            this.info = res.data
+            this.info.pictureUrl = res.data.pictureUrl ? [{
+              url: res.data.pictureUrl
+            }] : []
           }
         })
       },
 
       cancel (isRefresh) {
         this.$emit('change', {
-          type: 'list',
+          type: 'List',
           isRefresh: !!isRefresh
         })
       }
diff --git a/packages/3.0.0/AppContentInfo/components/List.vue b/packages/3.0.0/AppContentInfo/components/List.vue
index 64ff159f..e3b37e4b 100644
--- a/packages/3.0.0/AppContentInfo/components/List.vue
+++ b/packages/3.0.0/AppContentInfo/components/List.vue
@@ -1,8 +1,5 @@
 <template>
-  <ai-list class="notice">
-    <template slot="title">
-      <ai-title :title="moduleName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
-    </template>
+  <ai-list class="notice" isTabs>
     <template slot="content">
       <ai-search-bar class="search-bar">
         <template #left>
@@ -13,7 +10,7 @@
             v-model="search.title"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, search.title, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入标题"
             clearable
             @clear="search.current = 1, search.title = '', getList()"
@@ -36,10 +33,11 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+        <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
           </template>
@@ -57,7 +55,8 @@
     props: {
       instance: Function,
       dict: Object,
-      moduleName: String
+      moduleName: String,
+      areaId: String
     },
 
     data() {
@@ -65,8 +64,7 @@
         search: {
           current: 1,
           size: 10,
-          title: '',
-          areaId: ''
+          title: ''
         },
         currIndex: -1,
         areaList: [],
@@ -90,16 +88,18 @@
     },
 
     created() {
-      this.search.areaId = this.user.info.areaId
-      this.getList()
+      this.dict.load('auditStatus').then(() => {
+        this.getList()
+      })
     },
 
     methods: {
       getList() {
-        this.instance.post(`/app/appcontentinfo/list`, null, {
+        this.instance.post(`/app/appcontentinfo/list-web`, null, {
           params: {
             moduleId: this.$route.query.moduleId,
-            ...this.search
+            ...this.search,
+            areaId: this.areaId
           }
         }).then(res => {
           if (res.code == 0) {
@@ -127,6 +127,15 @@
             id: id || ''
           }
         })
+      },
+
+      toDetail(id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
       }
     }
   }
diff --git a/packages/3.0.0/AppContentManage/components/Add.vue b/packages/3.0.0/AppContentManage/components/Add.vue
index d3749528..d9f4d088 100644
--- a/packages/3.0.0/AppContentManage/components/Add.vue
+++ b/packages/3.0.0/AppContentManage/components/Add.vue
@@ -18,6 +18,12 @@
                 </template>
               </el-input>
             </el-form-item>
+            <el-form-item label="是否审核" style="width: 100%;" prop="needExamine" :rules="[{required: true, message: '请选择是否审核', trigger: 'change'}]">
+              <el-radio-group v-model="form.needExamine">
+                <el-radio label="0">否</el-radio>
+                <el-radio label="1">是</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </el-form>
         </template>
       </ai-card>
@@ -65,7 +71,8 @@
         form: {
           moduleName: '',
           menuId: '',
-          menuName: ''
+          menuName: '',
+          needExamine: '0'
         },
         isShowAdd: false,
         treeData: [],
diff --git a/packages/3.0.0/AppContentManage/components/List.vue b/packages/3.0.0/AppContentManage/components/List.vue
index 4f726b70..4d368bb3 100644
--- a/packages/3.0.0/AppContentManage/components/List.vue
+++ b/packages/3.0.0/AppContentManage/components/List.vue
@@ -17,7 +17,7 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-        <el-table-column slot="options" width="220px" fixed="right" label="操作" align="center">
+        <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
@@ -95,7 +95,8 @@
         colConfigs: [
           { prop: 'moduleName',  label: '模块名称', align: 'left', width: '200px' },
           { prop: 'menuName', label: '关联菜单', align: 'center' },
-          { prop: 'categoryStr', label: '文章分类', align: 'center' }
+          { prop: 'categoryStr', label: '文章分类', align: 'center' },
+          { prop: 'needExamine', label: '是否审核', align: 'center', formart: v => v === '0' ? '否' : '是' }
         ],
         cateColConfigs: [
           {prop: 'categoryName', label: '分类名称', align: 'center'}
diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
index 7544f14b..635fc48c 100644
--- a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
+++ b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
@@ -7,7 +7,7 @@
     <template slot="content">
       <ai-card title="基本信息">
         <template #content>
-          <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
+          <el-form ref="CBookForm" class="ai-form" :model="form" label-width="110px" label-position="right">
             <el-form-item label="地区" style="width: 100%;" prop="codeName">
               <span style="color: #666;">{{ form.areaName }}</span>
             </el-form-item>
@@ -72,13 +72,10 @@
         },
         id: '',
         regPhone,
-        areaList: []
       }
     },
 
     created () {
-      this.getAreaList()
-
       if (this.params && this.params.areaId && !this.params.id) {
         this.form.areaId = this.params.areaId
         this.form.areaName = this.params.areaName
@@ -93,31 +90,18 @@
     methods: {
       getInfo (id) {
         this.instance.post(`/app/appconvenientaddressbook/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
+          if (res?.data) {
             this.form = res.data
           }
         })
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data.map(item => {
-              item.dictName = item.name
-              item.dictValue = item.id
-
-              return item
-            })
-          }
-        })
-      },
-
       onClose () {
         this.form.explain = ''
       },
 
       confirm () {
-        this.$refs.form.validate((valid) => {
+        this.$refs.CBookForm.validate((valid) => {
           if (valid) {
             this.instance.post(`/app/appconvenientaddressbook/addOrUpdate`, {
               ...this.form,
diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
index 4a48d8f4..d5f0dfc4 100644
--- a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
+++ b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
@@ -11,25 +11,25 @@
         <div class="addressBook-left__list">
           <div class="addressBook-left__list--title">
             <el-input
-              class="addressBook-left__list--search"
-              size="mini"
-              clearable
-              placeholder="请输入地区名称"
-              v-model="unitName"
-              suffix-icon="iconfont iconSearch">
+                class="addressBook-left__list--search"
+                size="mini"
+                clearable
+                placeholder="请输入地区名称"
+                v-model="unitName"
+                suffix-icon="iconfont iconSearch">
             </el-input>
           </div>
           <el-tree
-            :filter-node-method="filterNode"
-            ref="tree"
-            :props="defaultProps"
-            node-key="id"
-            :data="areaTree"
-            highlight-current
-            :current-node-key="search.areaId"
-            :default-expanded-keys="defaultExpanded"
-            :default-checked-keys="defaultChecked"
-            @current-change="onTreeChange">
+              :filter-node-method="filterNode"
+              ref="tree"
+              :props="defaultProps"
+              node-key="id"
+              :data="areaTree"
+              highlight-current
+              :current-node-key="search.areaId"
+              :default-expanded-keys="defaultExpanded"
+              :default-checked-keys="defaultChecked"
+              @current-change="onTreeChange">
           </el-tree>
         </div>
       </div>
@@ -37,43 +37,45 @@
     <template slot="content">
       <ai-search-bar class="search-bar">
         <template #left>
-          <el-button size="small" type="primary" :disabled="isShowAdd" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
-          <ai-import :instance="instance" :dict="dict" type="appconvenientaddressbook" name="便民通讯录" @success="getList()">
+          <el-button size="small" type="primary" :disabled="isShowAdd" icon="iconfont iconAdd" @click="toAdd('')">添加
+          </el-button>
+          <ai-import :instance="instance" :dict="dict" type="appconvenientaddressbook" name="便民通讯录"
+                     @success="getList()">
             <el-button icon="iconfont iconImport">导入</el-button>
           </ai-import>
-          <ai-download :instance="instance" url="/app/appconvenientaddressbook/export" :params="search" fileName="便民通讯录" :disabled="tableData.length == 0">
+          <ai-download :instance="instance" url="/app/appconvenientaddressbook/export" :params="search" fileName="便民通讯录"
+                       :disabled="tableData.length == 0">
             <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
           </ai-download>
         </template>
         <template slot="right">
           <el-input
-            v-model="search.name"
-            class="search-input"
-            size="small"
-            @keyup.enter.native="search.current = 1, getList()"
-            placeholder="请输入名称/电话/类型"
-            clearable
-            @change="getList"
-            @clear="search.current = 1, search.name = '', getList()"
-            suffix-icon="iconfont iconSearch">
+              v-model="search.name"
+              class="search-input"
+              size="small"
+              v-throttle="() => {search.current = 1, getList()}"
+              placeholder="请输入名称/电话/类型"
+              clearable
+              @clear="search.current = 1, search.name = '', getList()"
+              suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
       </ai-search-bar>
       <ai-table
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="total"
-        style="margin-top: 6px;"
-        :current.sync="search.current"
-        :size.sync="search.size"
-        @getList="getList">
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          style="margin-top: 6px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
         <el-table-column slot="isPublic" label="是否公开" align="center">
           <template slot-scope="{ row }">
             <el-switch
-              v-model="row.isPublic"
-              active-value="1"
-              @change="e => onChange(row.id, e)"
-              inactive-value="0">
+                v-model="row.isPublic"
+                active-value="1"
+                @change="e => onChange(row.id, e)"
+                inactive-value="0">
             </el-switch>
           </template>
         </el-table-column>
@@ -91,176 +93,165 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'List',
+import {mapState} from 'vuex'
 
-    props: {
-      instance: Function,
-      dict: Object
-    },
+export default {
+  name: 'List',
 
-    data() {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          name: '',
-          areaId: ''
-        },
-        defaultExpanded: [],
-        defaultChecked: [],
-        areaTree: [],
-        defaultProps: {
-          children: 'children',
-          label: 'name'
-        },
-        currIndex: -1,
-        areaList: [],
-        total: 10,
-        colConfigs: [
-          {prop: 'name', label: '名称', align: 'left'},
-          {prop: 'type', label: '类型', align: 'center'},
-          {prop: 'phone', label: '电话', align: 'center'},
-          {prop: 'createTime', align: 'center', label: '创建时间'},
-          {slot: 'isPublic', label: '是否公开', align: 'center'}
-        ],
-        areaName: '',
-        unitName: '',
-        tableData: []
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object
+  },
 
-    computed: {
-      ...mapState(['user']),
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        name: '',
+        areaId: ''
+      },
+      defaultExpanded: [],
+      defaultChecked: [],
+      areaTree: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      currIndex: -1,
+      total: 10,
+      colConfigs: [
+        {prop: 'name', label: '名称', align: 'left'},
+        {prop: 'type', label: '类型', align: 'center'},
+        {prop: 'phone', label: '电话', align: 'center'},
+        {prop: 'createTime', align: 'center', label: '创建时间'},
+        {slot: 'isPublic', label: '是否公开', align: 'center'}
+      ],
+      areaName: '',
+      unitName: '',
+      tableData: []
+    }
+  },
 
-      isShowAdd () {
-        const str = this.search.areaId.substr(this.search.areaId.length - 3)
+  computed: {
+    ...mapState(['user']),
 
-        return false
-      }
-    },
+    isShowAdd() {
+      return false
+    }
+  },
 
-    watch: {
-      unitName (val) {
-        this.$refs.tree.filter(val)
-      }
-    },
+  watch: {
+    unitName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
 
-    mounted() {
-      this.search.areaId = this.user.info.areaId
-      this.areaName = this.user.info.areaName
-      this.getTree()
-      this.getAreaList()
-      this.getList()
+  created() {
+    this.search.areaId = this.user.info.areaId
+    this.areaName = this.user.info.areaName
+    this.getTree()
+    this.getList()
 
-      this.$nextTick(() => {
+    this.$nextTick(() => {
+    })
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appconvenientaddressbook/list`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
       })
     },
 
-    methods: {
-      getList() {
-        this.instance.post(`/app/appconvenientaddressbook/list`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
+    onChange(id) {
+      this.instance.post(`/app/appconvenientaddressbook/enable?id=${id}`).then(res => {
+        if (res.code == 0) {
+          this.$message.success('修改成功')
+          this.getList()
+        }
+      })
+    },
 
-      onChange (id) {
-        this.instance.post(`/app/appconvenientaddressbook/enable?id=${id}`).then(res => {
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+
+    onTreeChange(e) {
+      this.search.areaId = e.id
+      this.areaName = e.name
+      this.search.current = 1
+
+      this.$nextTick(() => {
+        this.getList()
+      })
+    },
+
+    getTree() {
+      this.instance.post(`/admin/area/queryAllArea?id=${this.user.info.areaId}`).then(res => {
+        if (res.code === 0) {
+          let parent = res.data.map(v => {
+            v.label = v.name
+            v.children = []
+
+            return v
+          }).filter(e => !e.parentid)[0]
+          this.defaultExpanded = [parent.id]
+          this.defaultChecked = [parent.id]
+          this.search.areaId = parent.id
+          this.addChild(parent, res.data)
+          this.areaTree = [parent]
+
+          this.$nextTick(() => {
+            this.$refs.tree.setCurrentKey(parent.id)
+          })
+        }
+      })
+    },
+
+    addChild(parent, list) {
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].parentId === parent.id) {
+          parent.children.push(list[i])
+        }
+      }
+
+      if (list.length > 0) {
+        parent['children'].map(v => this.addChild(v, list))
+      }
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appconvenientaddressbook/delete?ids=${id}`).then(res => {
           if (res.code == 0) {
-            this.$message.success('修改成功')
+            this.$message.success('删除成功！')
             this.getList()
           }
         })
-      },
+      })
+    },
 
-      filterNode(value, data) {
-        if (!value) return true
-        return data.name.indexOf(value) !== -1
-      },
-
-      onTreeChange (e) {
-        this.search.areaId = e.id
-        this.areaName = e.name
-        this.search.current = 1
-
-        this.$nextTick(() => {
-          this.getList()
-        })
-      },
-
-      getTree () {
-        this.instance.post(`/admin/area/queryAllArea?id=${this.user.info.areaId}`).then(res => {
-          if (res.code === 0) {
-            let parent = res.data.map(v => {
-              v.label = v.name
-              v.children = []
-
-              return v
-            }).filter(e => !e.parentid)[0]
-            this.defaultExpanded = [parent.id]
-            this.defaultChecked = [parent.id]
-            this.search.areaId = parent.id
-            this.addChild(parent, res.data)
-            this.areaTree = [parent]
-
-            this.$nextTick(() => {
-              this.$refs.tree.setCurrentKey(parent.id)
-            })
-          }
-        })
-      },
-
-      addChild (parent, list) {
-        for (let i = 0; i < list.length; i++) {
-          if (list[i].parentId === parent.id) {
-            parent.children.push(list[i])
-          }
+    toAdd(id) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          areaName: this.areaName,
+          id: id || '',
+          areaId: this.search.areaId
         }
-
-        if (list.length > 0) {
-          parent['children'].map(v => this.addChild(v, list))
-        }
-      },
-
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data
-          }
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appconvenientaddressbook/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toAdd(id) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            areaName: this.areaName,
-            id: id || '',
-            areaId: this.search.areaId
-          }
-        })
-      }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -315,6 +306,7 @@
 
       .addressBook-left__list--search {
         flex: 1;
+
         ::v-deep input {
           width: 100%;
         }
@@ -336,7 +328,7 @@
       background: transparent;
 
       .el-tree-node__expand-icon.is-leaf {
-        color: transparent!important;
+        color: transparent !important;
       }
 
       .el-tree-node__content > .el-tree-node__expand-icon {
@@ -369,7 +361,7 @@
         }
 
         background: #2266FF;
-        
+
         span {
           color: #fff;
         }
diff --git a/packages/3.0.0/AppHealthReport/components/List.vue b/packages/3.0.0/AppHealthReport/components/List.vue
index 2e3c462d..72254f56 100644
--- a/packages/3.0.0/AppHealthReport/components/List.vue
+++ b/packages/3.0.0/AppHealthReport/components/List.vue
@@ -47,7 +47,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
diff --git a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
index 419947bc..8a5dea4e 100644
--- a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
@@ -4,7 +4,8 @@
       <ai-title title="三会一课" isShowBottomBorder slot="title">
         <template #rightBtn>
           <ai-party :instance="instance" v-model="partyId" :topOrgId="topOrgId" :name.sync="partyOrgLabel"
-                    style="display:inline-block" @origin="changeParty" customClicker url="/app/partyOrganization/queryAllChildren">
+                    style="display:inline-block" @origin="changeParty" customClicker
+                    url="/app/partyOrganization/queryAllChildren">
             <el-input size="small" v-model="partyOrgLabel" readonly placeholder="选择党组织">
               <el-row slot="append" type="flex" class="partyPicker">
                 <i class="iconfont icondangyuan"/>
@@ -42,11 +43,7 @@
           </template>
           <template #right>
             <el-input size="small" v-model="search.meetingAgenda" placeholder="会议标题/创建人"
-                      prefix-icon="iconfont iconSearch" clearable
-                      @keyup.enter.native="page.current=1,getAppThreeMeetingInfo()"/>
-            <el-button type="primary" icon="iconfont iconSearch" @click="page.current=1,getAppThreeMeetingInfo()">查询
-            </el-button>
-            <el-button icon="el-icon-refresh-right" @click="resetSearch">重置</el-button>
+                      suffix-icon="iconfont iconSearch" v-throttle="() => {page.current = 1, getAppThreeMeetingInfo()}" clearable @clear="search.meetingAgenda = '', page.current=1,getAppThreeMeetingInfo()"/>
           </template>
         </ai-search-bar>
         <ai-search-bar>
@@ -136,18 +133,19 @@
       <div class="content input-240">
         <div class="flex">
           <el-date-picker
-            v-model="searchYear"
-            type="year"
-            size="small"
-            style="width: 200px; margin-right: 10px;"
-            value-format="yyyy"
-            @change="getMeetStatistics"
-            placeholder="选择年份">
+              v-model="searchYear"
+              type="year"
+              size="small"
+              style="width: 200px; margin-right: 10px;"
+              value-format="yyyy"
+              @change="getMeetStatistics"
+              placeholder="选择年份">
           </el-date-picker>
-          <el-select style="width: 200px" v-model="searchMonth" placeholder="全部" size="small" clearable class="timeSelect"
-                      @change="getMeetStatistics">
+          <el-select style="width: 200px" v-model="searchMonth" placeholder="全部" size="small" clearable
+                     class="timeSelect"
+                     @change="getMeetStatistics">
             <el-option v-for="(op,j) in dict.getDict('monthList')" :key="j" :label="op.dictName"
-                        :value="op.dictValue"/>
+                       :value="op.dictValue"/>
           </el-select>
         </div>
         <ul class="totalTitle">
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue b/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
index cacd37b3..28ae9ab9 100644
--- a/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
@@ -47,28 +47,28 @@
                         </span>
                       </span>
                 <span class="value" v-else>-</span></el-form-item>
-              <ai-title title="附件" isShowBottomBorder>
-                <template #rightBtn>
-                  <el-button type="text" icon="iconfont iconDownload" @click="downLoadAll">下载全部</el-button>
-                </template>
-              </ai-title>
-              <el-form-item label-width="0">
-                <div v-if="obj.annex.length">
-                  <div class="flie" v-for="(item, index) in obj.annex" :key="index"
-                       @click="downFile(item)">
-                    <p>
-                      <svg aria-hidden="true" style="width:24px;height:24px;">
-                        <use xlink:href="#iconAppendix_UNdownload"></use>
-                      </svg>
-                      <span>{{ item.name }}</span>
-                    </p>
-                    <span style="color:#999;">{{ (item.size / 1024).toFixed(2) + "KB" }}
-                            <span class="iconfont iconDownload" style="color:#5088FF"></span>
-                        </span>
-                  </div>
-                </div>
-                <div class="no-data" style="height:160px;width:100%;" v-else></div>
-              </el-form-item>
+<!--              <ai-title title="附件" isShowBottomBorder>-->
+<!--                <template #rightBtn>-->
+<!--                  <el-button type="text" icon="iconfont iconDownload" @click="downLoadAll">下载全部</el-button>-->
+<!--                </template>-->
+<!--              </ai-title>-->
+<!--              <el-form-item label-width="0">-->
+<!--                <div v-if="obj.annex.length">-->
+<!--                  <div class="flie" v-for="(item, index) in obj.annex" :key="index"-->
+<!--                       @click="downFile(item)">-->
+<!--                    <p>-->
+<!--                      <svg aria-hidden="true" style="width:24px;height:24px;">-->
+<!--                        <use xlink:href="#iconAppendix_UNdownload"></use>-->
+<!--                      </svg>-->
+<!--                      <span>{{ item.name }}</span>-->
+<!--                    </p>-->
+<!--                    <span style="color:#999;">{{ (item.size / 1024).toFixed(2) + "KB" }}-->
+<!--                            <span class="iconfont iconDownload" style="color:#5088FF"></span>-->
+<!--                        </span>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--                <div class="no-data" style="height:160px;width:100%;" v-else></div>-->
+<!--              </el-form-item>-->
               <ai-title title="人员信息" isShowBottomBorder/>
               <el-form-item label="与会组织">{{ arrLabel(obj.appThreeMeetingOrganizationList, 'name') }}</el-form-item>
               <el-form-item label="主持人">{{ arrLabel(obj.hostList, 'userName') }}</el-form-item>
diff --git a/packages/3.0.0/AppNavConfig/components/List.vue b/packages/3.0.0/AppNavConfig/components/List.vue
index 394ec788..461cdc12 100644
--- a/packages/3.0.0/AppNavConfig/components/List.vue
+++ b/packages/3.0.0/AppNavConfig/components/List.vue
@@ -1,5 +1,5 @@
 <template>
-  <ai-list class="list">
+  <ai-list class="list" v-loading="isLoading">
     <ai-title slot="title" title="导航配置" isShowBottomBorder></ai-title>
     <template slot="content">
       <ai-card title="首页功能">
@@ -37,6 +37,13 @@
                 <i class="el-icon-error icon" @click="removeApp(item.id)" v-if="isRemove && item.type !== '0' && item.picked !== '1'"></i>
                 <i class="el-icon-circle-plus icon" @click="addApp(item)" v-if="isCanAdd(item)"></i>
                 <h2>{{ item.name }}</h2>
+                <div class="item-setting">
+                  <div class="item-mask"></div>
+                  <div class="item-wrapper__icon" @click.stop="editApp(item)">
+                    <i class="el-icon-setting"></i>
+                    <div>编辑</div>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -93,9 +100,35 @@
             <el-form-item label="图标" prop="pictureUrl" style="width: 100%;" :rules="[{ required: true, message: '请上传图标 ', trigger: 'change' }]">
               <ai-uploader v-model="form.pictureUrl" :instance="instance" :limit="1"></ai-uploader>
             </el-form-item>
+            <!-- <el-form-item label="权限配置" v-if="form.type === '0'" prop="pictureUrl" style="width: 100%;">
+              <el-input disabled :value="girdName" size="small" placeholder="请选择地区">
+                <template slot="append">
+                  <el-button size="small" @click="isShowArea = true">选择地区</el-button>
+                </template>
+              </el-input>
+            </el-form-item> -->
           </div>
         </el-form>
       </ai-dialog>
+      <ai-dialog
+        title="选择权限"
+        :visible.sync="isShowArea"
+        :destroyOnClose="true"
+        @close="isShowArea = false"
+        @onConfirm="getCheckedTree"
+        width="720px">
+        <el-tree
+          :data="treeList"
+          :props="defaultProps"
+          node-key="id"
+          check-strictly
+          ref="tree"
+          show-checkbox 
+          :default-checked-keys="defaultChecked"
+          :default-expanded-keys="defaultExpanded"
+          default-expand-all>
+        </el-tree>
+      </ai-dialog>
     </template>
   </ai-list>
 </template>
@@ -120,7 +153,15 @@
         id: '',
         isEdit: false,
         isRemove: false,
+        defaultExpanded: [],
         isRest: true,
+        isShowArea: false,
+        isLoading: false,
+        defaultProps: {
+          children: "children",
+          label: "label",
+        },
+        treeList: [],
         form: {
           type: '',
           pictureUrl: [],
@@ -143,8 +184,10 @@
           dictName: '客服',
           dictValue: '4'
         }],
+        info: {},
         isShowAdd: false,
-        list: []
+        list: [],
+        defaultChecked: []
       }
     },
 
@@ -169,6 +212,86 @@
         })
       },
 
+      getCheckedTree () {
+        const keys = this.$refs.tree.getCheckedNodes(false, true).map(v => v.id)
+
+        this.instance.post(`/app/appminihomeconfig/addOrUpdate`, {
+          ...this.info,
+          areaIds: keys
+        }).then(res => {
+          if (res.code === 0) {
+            this.$message.success('修改成功')
+            this.isShowArea = false
+
+            this.getList()
+          }
+        })
+      },
+
+      format (list) {
+        return list.map(item => {
+          if (item.girdLevel !== '2') {
+            item.disabled = true
+          }
+
+          if (item.girdList && item.girdList.length) {
+            item.girdList = this.format(item.girdList)
+          }
+
+          return item
+        })
+      },
+
+      editApp (e) {
+        if (e.type !== '0') {
+          this.form = {
+            ...e,
+            pictureUrl: [{
+              url: e.pictureUrl
+            }]
+          }
+          this.isShowAdd = true
+
+          return false
+        }
+        
+
+        this.info = e
+        this.isLoading = true
+        this.instance.post(`/app/appminihomeconfig/queryDetailById?id=${e.id}`).then(res => {
+          if (res.code === 0) {
+            let parent = res.data.areaConfigs.map(v => {
+              v.label = v.name
+              v.children = []
+
+              return v
+            }).filter(e => !e.parentId)[0]
+            this.defaultExpanded = res.data.areaConfigs.filter(v => v.checked).map(v => v.id)
+            this.defaultChecked = res.data.areaConfigs.filter(v => v.checked).map(v => v.id)
+            this.addChild(parent, res.data.areaConfigs)
+            this.treeList = [parent]
+
+            this.isShowArea = true
+          }
+
+          this.isLoading = false
+        }).catch(() => {
+          this.isLoading = false
+        })
+      },
+
+      addChild(parent, list) {
+        for (let i = 0; i < list.length; i++) {
+          if (list[i].parentId === parent.id) {
+            parent.children.push(list[i])
+          }
+        }
+
+        if (list.length > 0) {
+          parent['children'].map(v => this.addChild(v, list))
+        }
+      },
+
       isCanAdd (item) {
         const isHas = this.picked.map(v => v.id).indexOf(item.id) > -1
 
@@ -238,7 +361,6 @@
           if (valid) {
             this.instance.post(`/app/appminihomeconfig/addOrUpdate`, {
               ...this.form,
-              id: this.id || null,
               pictureUrl: this.form.pictureUrl[0].url
             }).then(res => {
               if (res.code === 0) {
@@ -328,6 +450,53 @@
         position: relative;
         margin: 0 16px 16px 0;
         text-align: center;
+        cursor: pointer;
+
+        .item-setting {
+          position: absolute;
+          top: 0;
+          left: 0;
+          z-index: 0;
+          opacity: 0;
+          width: 100%;
+          height: 100%;
+          transition: all ease 0.3s;
+
+          .item-wrapper__icon {
+            position: relative;
+            z-index: 1;
+            width: 100%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex-direction: column;
+
+            div {
+              margin-top: 6px;
+              font-size: 16px;
+            }
+          }
+
+          i, div {
+            font-size: 16px;
+            color: #fff;
+          }
+
+          .item-mask {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: rgba(0, 0, 0, 0.6);
+          }
+
+          &:hover {
+            z-index: 1;
+            opacity: 1;
+          }
+        }
 
         img {
           width: 60px;
diff --git a/packages/3.0.0/AppNotice/components/List.vue b/packages/3.0.0/AppNotice/components/List.vue
index f491389f..4ec56566 100644
--- a/packages/3.0.0/AppNotice/components/List.vue
+++ b/packages/3.0.0/AppNotice/components/List.vue
@@ -13,7 +13,7 @@
             v-model="search.title"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入标题"
             clearable
             @change="getList"
diff --git a/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue b/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
index c85c744e..b65c874b 100644
--- a/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
+++ b/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
@@ -14,10 +14,10 @@
               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()"
+              v-throttle="() => {search.current = 1, getList()}"
+              @clear="search.current=1, search.title = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
           </template>
diff --git a/packages/3.0.0/AppReportAiWill/components/List.vue b/packages/3.0.0/AppReportAiWill/components/List.vue
index b724c1eb..d43832ac 100644
--- a/packages/3.0.0/AppReportAiWill/components/List.vue
+++ b/packages/3.0.0/AppReportAiWill/components/List.vue
@@ -21,7 +21,7 @@
             v-model="search.content"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入内容描述/上报居民/联系方式"
             clearable
             @change="getList"
diff --git a/packages/3.0.0/AppReportAiWill/components/Setting.vue b/packages/3.0.0/AppReportAiWill/components/Setting.vue
index 4cc7ec25..13cd8f77 100644
--- a/packages/3.0.0/AppReportAiWill/components/Setting.vue
+++ b/packages/3.0.0/AppReportAiWill/components/Setting.vue
@@ -13,7 +13,7 @@
             v-model="search.groupName"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入事件类型名称"
             clearable
             @change="getList"
diff --git a/packages/3.0.0/AppReturnHomeRegister/AppReturnHomeRegister.vue b/packages/3.0.0/AppReturnHomeRegister/AppReturnHomeRegister.vue
index c86d5b13..2e8165c4 100644
--- a/packages/3.0.0/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -1,14 +1,24 @@
 <template>
-  <div class="AppReturnHomeRegister">
-    <keep-alive :include="['List']">
-      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
-    </keep-alive>
-  </div>
+  <ai-list class="AppReturnHomeRegister" v-if="!isShowDetail">
+    <template slot="title">
+      <ai-title title="返乡登记" :isShowBottomBorder="false" :fullname.sync="areaName" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
+    </template>
+    <template slot="tabs">
+      <el-tabs v-model="currIndex">
+        <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
+          <component :areaId="areaId" :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions"/>
+        </el-tab-pane>
+      </el-tabs>
+    </template>
+  </ai-list>
+  <Detail v-else-if="component === 'Detail'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Detail>
 </template>
 
 <script>
   import List from './components/List.vue'
   import Detail from './components/Detail.vue'
+  import AbnormalList from './components/AbnormalList.vue'
+  import { mapState } from 'vuex'
 
   export default {
     name: 'AppReturnHomeRegister',
@@ -16,7 +26,8 @@
 
     components: {
       List,
-      Detail
+      Detail,
+      AbnormalList
     },
 
     props: {
@@ -25,13 +36,35 @@
       permissions: Function
     },
 
+    computed: {
+      ...mapState(['user']),
+
+      tabs () {
+        const tabList = [
+          {label: '返乡登记', name: 'List', comp: List, permission: ''},
+          // {label: '历史异常人员', name: 'AbnormalList', comp: AbnormalList, permission: ''}
+        ]
+
+        return tabList
+      }
+    },
+
     data () {
       return {
+        activeName: 'JoinEvent',
+        currIndex: '0',
         component: 'List',
-        params: {}
+        params: {},
+        areaId: '',
+        isShowDetail: false,
+        areaName: ''
       }
     },
 
+    created () {
+      this.areaId = this.user.info.areaId
+    },
+
     methods: {
       onChange (data) {
         if (data.type === 'Detail') {
@@ -39,9 +72,15 @@
           this.isShowDetail = true
           this.params = data.params
         }
+        if (data.type === 'AbnormalList') {
+          this.component = 'AbnormalList'
+          this.isShowDetail = false
+          this.params = data.params
+        }
 
-        if (data.type === 'list') {
+        if (data.type === 'List') {
           this.component = 'List'
+          this.isShowDetail = false
           this.params = data.params
 
           this.$nextTick(() => {
@@ -50,6 +89,10 @@
             }
           })
         }
+      },
+
+      onAreaChange () {
+        this.$refs[this.currIndex][0].changeArea()
       }
     }
   }
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/AbnormalList.vue b/packages/3.0.0/AppReturnHomeRegister/components/AbnormalList.vue
new file mode 100644
index 00000000..7b951ce1
--- /dev/null
+++ b/packages/3.0.0/AppReturnHomeRegister/components/AbnormalList.vue
@@ -0,0 +1,200 @@
+<template>
+  <ai-list isTabs>
+    <template slot="content">
+      <ai-search-bar bottomBorder>
+        <template #left>
+          <ai-select
+            v-model="search.status"
+            clearable
+            placeholder="请选择健康状态"
+            :selectList="dictList"
+            @change="search.current = 1, getList()">
+          </ai-select>
+          <ai-download :instance="instance" url="/app/appepidemicbackhomerecord/export" :params="param" fileName="返乡登记" :disabled="tableData.length == 0">
+            <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
+          </ai-download>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.name"
+            size="small"
+            placeholder="请输入姓名"
+            clearable
+            v-throttle="() => {search.current = 1, getList()}"
+            @clear="search.current = 1, search.name = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        v-loading="loading"
+        style="margin-top: 16px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="remove(row.id)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'AbnormalList',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          name: '',
+          arriveAreaId: '',
+          status: ''
+        },
+        dictList: [{
+          dictName: '异常',
+          dictValue: '0'
+        }, {
+          dictName: '正常',
+          dictValue: '1'
+        }],
+        info: {},
+        colConfigs: [
+          { prop: 'name', label: '姓名' },
+          { prop: 'phone', align: 'center', label: '手机号码' },
+          { prop: 'startTime', align: 'center', label: '出发时间', formart: v => v.substr(0, v.length - 3) },
+          {
+            prop: 'startAreaName',
+            align: 'center',
+            label: '出发地区'
+          },
+          { prop: 'arriveTime', align: 'center', label: '到达时间', formart: v => v.substr(0, v.length - 3) }, 
+          {
+            prop: 'arriveAreaName',
+            align: 'center',
+            label: '到达地区'
+          },
+          { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v.split(' ')[0] },
+          {
+            prop: 'status',
+            align: 'center',
+            label: '健康状态',
+            render: (h, {row}) => {
+              return h('span', {
+                style: {
+                  color: row.status === '0' ? 'red' : '#333'
+                }
+              }, row.status === '0' ? '异常' : '正常')
+            }
+          }
+        ],
+        ids: [],
+        tableData: [],
+        total: 0,
+        loading: false,
+        disabledLevel: 0
+      }
+    },
+
+    computed: {
+      ...mapState(['user']),
+
+      param () {
+        return this.search
+      }
+    },
+
+    created () {
+      this.disabledLevel = this.user.info.areaList.length - 1
+      this.search.arriveAreaId = this.user.info.areaId
+      this.loading = true
+      this.dict.load(['marriageType', 'marriagePersonType', 'modeType']).then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appepidemicbackhomerecord/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        }).catch(() => {
+          this.loading = false
+        })
+        
+        this.getTotalInfo()
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      changeArea () {
+        this.search.current = 1
+
+        this.$nextTick(() => {
+          this.getList()
+          this.getTotalInfo()
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicbackhomerecord/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getTotalInfo()
+              this.getList()
+            }
+          })
+        })
+      },
+
+
+      getTotalInfo () {
+        this.instance.post(`/app/appepidemicbackhomerecord/statistic`, null, {
+          params: {
+            areaId: this.search.arriveAreaId
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.info = res.data
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
index fbddb253..60bf85e1 100644
--- a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
@@ -258,7 +258,7 @@
 
       cancel () {
         this.$emit('change', {
-          type: 'list',
+          type: 'List',
           isRefresh: true
         })
       }
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/List.vue b/packages/3.0.0/AppReturnHomeRegister/components/List.vue
index 741ede6b..111d3f33 100644
--- a/packages/3.0.0/AppReturnHomeRegister/components/List.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/List.vue
@@ -1,6 +1,5 @@
 <template>
-  <ai-list class="list">
-    <ai-title slot="title" title="返乡登记" v-if="search.arriveAreaId" isShowBottomBorder :instance="instance" :disabledLevel="disabledLevel" isShowArea v-model="search.arriveAreaId" @change="changeArea"></ai-title>
+  <ai-list class="list" isTabs>
     <template slot="content">
       <div class="statistics-top">
         <div class="statistics-top__item">
@@ -44,7 +43,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
@@ -80,7 +79,8 @@
 
     props: {
       instance: Function,
-      dict: Object
+      dict: Object,
+      areaId: String
     },
 
     data () {
@@ -89,7 +89,6 @@
           current: 1,
           size: 10,
           name: '',
-          arriveAreaId: '',
           status: ''
         },
         dictList: [{
@@ -147,7 +146,6 @@
 
     created () {
       this.disabledLevel = this.user.info.areaList.length - 1
-      this.search.arriveAreaId = this.user.info.areaId
       this.loading = true
       this.dict.load(['marriageType', 'marriagePersonType', 'modeType']).then(() => {
         this.getList()
@@ -158,7 +156,8 @@
       getList () {
         this.instance.post(`/app/appepidemicbackhomerecord/list`, null, {
           params: {
-            ...this.search
+            ...this.search,
+            arriveAreaId: this.areaId
           }
         }).then(res => {
           if (res.code == 0) {
@@ -230,7 +229,7 @@
         background: transparent!important;
         box-shadow: none!important;
         margin: 0!important;
-        padding: 12px 16px 12px!important;
+        padding: 0 0 0!important;
       }
     }
     .statistics-top {
diff --git a/packages/3.0.0/AppRiskArea/components/List.vue b/packages/3.0.0/AppRiskArea/components/List.vue
index eae56fec..5e1fffd1 100644
--- a/packages/3.0.0/AppRiskArea/components/List.vue
+++ b/packages/3.0.0/AppRiskArea/components/List.vue
@@ -20,7 +20,7 @@
             v-model="search.province"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="省级名称/市级名称/区级名称"
             clearable
             @clear="search.current = 1, search.province = '', getList()"
diff --git a/packages/3.0.0/AppShowProduce/components/List.vue b/packages/3.0.0/AppShowProduce/components/List.vue
index f7a0c9bd..30bc42e7 100644
--- a/packages/3.0.0/AppShowProduce/components/List.vue
+++ b/packages/3.0.0/AppShowProduce/components/List.vue
@@ -13,7 +13,7 @@
             size="small"
             placeholder="请输入标题/联系电话"
             clearable
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             @clear="search.current = 1, search.title = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
diff --git a/packages/3.0.0/AppThematicConfig/AppThematicConfig.vue.vue b/packages/3.0.0/AppThematicConfig/AppThematicConfig.vue
similarity index 100%
rename from packages/3.0.0/AppThematicConfig/AppThematicConfig.vue.vue
rename to packages/3.0.0/AppThematicConfig/AppThematicConfig.vue
diff --git a/packages/3.0.0/AppThematicConfig/components/List.vue b/packages/3.0.0/AppThematicConfig/components/List.vue
index 8eced9e4..a7e06791 100644
--- a/packages/3.0.0/AppThematicConfig/components/List.vue
+++ b/packages/3.0.0/AppThematicConfig/components/List.vue
@@ -12,7 +12,7 @@
             size="small"
             placeholder="请输入专题名称"
             clearable
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             @clear="search.current = 1, search.name = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
diff --git a/packages/3.0.0/AppVillageActivity/components/List.vue b/packages/3.0.0/AppVillageActivity/components/List.vue
index 1a168fd3..273d0138 100644
--- a/packages/3.0.0/AppVillageActivity/components/List.vue
+++ b/packages/3.0.0/AppVillageActivity/components/List.vue
@@ -16,7 +16,7 @@
             v-model="search.title"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入活动名称"
             clearable
             @change="getList"
diff --git a/packages/3.0.0/AppVillageActivity/components/Statistics.vue b/packages/3.0.0/AppVillageActivity/components/Statistics.vue
index 92b0bdfa..2a35b4f1 100644
--- a/packages/3.0.0/AppVillageActivity/components/Statistics.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Statistics.vue
@@ -153,7 +153,6 @@
         chart2: '',
         currIndex: -1,
         list: [],
-        areaList: [],
         unitName: '',
         areaId: ''
       }
@@ -175,7 +174,6 @@
       this.areaId = this.user.info.areaId
       this.areaName = this.user.info.areaName
       this.getTree()
-      this.getAreaList()
       this.loading = true
       this.$nextTick(() => {
         this.chart1 = echarts.init(document.querySelector('.chart1'))
@@ -245,14 +243,6 @@
         }
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data
-          }
-        })
-      },
-
       getInfo () {
         this.loading = true
         this.instance.post(`/app/appvillageactivityinfo/statistic?areaId=${this.areaId}&time1=${this.time1 || ''}&time2=${this.time2 || '-'}`).then(res => {
diff --git a/packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue b/packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue
index f414220f..42a82792 100644
--- a/packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue
+++ b/packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue
@@ -63,14 +63,11 @@
           picture: [],
           isPublic: '1'
         },
-        id: '',
-        areaList: []
+        id: ''
       }
     },
 
     created () {
-      this.getAreaList()
-
       if (this.params && this.params.areaId && !this.params.id) {
         this.form.areaId = this.params.areaId
         this.form.areaName = this.params.areaName
@@ -92,19 +89,6 @@
         })
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data.map(item => {
-              item.dictName = item.name
-              item.dictValue = item.id
-
-              return item
-            })
-          }
-        })
-      },
-
       onClose () {
         this.form.explain = ''
       },
diff --git a/packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue b/packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue
index 43a76483..eab6d800 100644
--- a/packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue
+++ b/packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue
@@ -44,7 +44,7 @@
             v-model="search.name"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入姓名/电话"
             clearable
             @change="getList"
@@ -110,7 +110,6 @@
           label: 'name'
         },
         currIndex: -1,
-        areaList: [],
         total: 10,
         colConfigs: [
           {prop: 'name', label: '姓名', align: 'left'},
@@ -140,7 +139,6 @@
       this.search.areaId = this.user.info.areaId
       this.areaName = this.user.info.areaName
       this.getTree()
-      this.getAreaList()
       this.getList()
 
       this.$nextTick(() => {
@@ -219,14 +217,6 @@
         }
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data
-          }
-        })
-      },
-
       remove(id) {
         this.$confirm('确定删除该数据？').then(() => {
           this.instance.post(`/app/appvillageauxiliarypolice/delete?ids=${id}`).then(res => {
diff --git a/packages/3.0.0/AppVillageIntroduction/components/List.vue b/packages/3.0.0/AppVillageIntroduction/components/List.vue
index e33ced71..c0b1bdea 100644
--- a/packages/3.0.0/AppVillageIntroduction/components/List.vue
+++ b/packages/3.0.0/AppVillageIntroduction/components/List.vue
@@ -13,7 +13,7 @@
             v-model="search.title"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入标题"
             clearable
             @clear="search.current = 1, search.title = '', getList()"
diff --git a/packages/3.0.0/AppVillageRegulations/components/List.vue b/packages/3.0.0/AppVillageRegulations/components/List.vue
index 155144ff..76762283 100644
--- a/packages/3.0.0/AppVillageRegulations/components/List.vue
+++ b/packages/3.0.0/AppVillageRegulations/components/List.vue
@@ -13,7 +13,7 @@
             v-model="search.title"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, search.title, getList()"
+            v-throttle="() => {search.current=1,getList()}"
             placeholder="请输入标题"
             clearable
             @clear="search.current = 1, search.title = '', getList()"
diff --git a/packages/3.0.0/AppVillagerDiscussion/components/List.vue b/packages/3.0.0/AppVillagerDiscussion/components/List.vue
index fa57fec1..aadbcc12 100644
--- a/packages/3.0.0/AppVillagerDiscussion/components/List.vue
+++ b/packages/3.0.0/AppVillagerDiscussion/components/List.vue
@@ -15,7 +15,7 @@
             v-model="search.title"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, search.title, getList()"
+            v-throttle="() => {search.current=1,getList()}"
             placeholder="请输入议事主题"
             clearable
             @clear="search.current = 1, search.title = '', getList()"
diff --git a/packages/3.0.0/AppWeddingsFunerals/components/List.vue b/packages/3.0.0/AppWeddingsFunerals/components/List.vue
index 829125f1..74cdf457 100644
--- a/packages/3.0.0/AppWeddingsFunerals/components/List.vue
+++ b/packages/3.0.0/AppWeddingsFunerals/components/List.vue
@@ -31,7 +31,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index d9afd889..72409299 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -461,7 +461,11 @@
           return this.$message.error('请上传图片')
         }
 
-        this.images.push(this.form.images)
+        this.images = [
+          ...this.images,
+          ...this.form.images
+        ]
+
         this.form.images = []
         this.isShowAddImg = false
       },
diff --git a/packages/bigscreen/designer/components/List.vue b/packages/bigscreen/designer/components/List.vue
index d55f26ff..70fc3d0c 100644
--- a/packages/bigscreen/designer/components/List.vue
+++ b/packages/bigscreen/designer/components/List.vue
@@ -18,7 +18,7 @@
             size="small"
             placeholder="请输入模板名称或创建人"
             clearable
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             @clear="search.current = 1, search.title = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
diff --git a/packages/bigscreen/designer/components/SourceData.vue b/packages/bigscreen/designer/components/SourceData.vue
index 42fd4f4a..1e77eb0b 100644
--- a/packages/bigscreen/designer/components/SourceData.vue
+++ b/packages/bigscreen/designer/components/SourceData.vue
@@ -15,7 +15,7 @@
               <el-input
                 v-model="search.name"
                 size="small"
-                @keyup.enter.native="search.current = 1, getList()"
+                v-throttle="() => {search.current = 1, getList()}"
                 placeholder="请输入名字"
                 clearable
                 @clear="search.current = 1, search.name = '', getList()"
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index c152dbf6..14e6add3 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -620,7 +620,7 @@ const components = [
             title: '',
             moniterId: '',
             monitorType: 'cmcc',
-            api: '/app/appzyvideoequipment/list',
+            api: '/app/appzyvideoequipment/list2',
             border: 'border2',
             sourceDataId: '',
             dataType: 'staticData',
diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue
index 974967dd..425d8a60 100644
--- a/packages/bigscreen/viewer/AppGigscreenViewer.vue
+++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue
@@ -100,13 +100,20 @@
                 if (item.dataType !== 'staticData' && ((item.type.indexOf('Chart') > -1) || item.type === 'display' || item.type === 'table' || item.type === 'summary')) {
                   this.getSourceData(item, index)
                 }
-                if (item.type === 'monitor' && item.monitorType !== 'hik' && item.monitorType !== 'dahua') {
+                if (item.type === 'monitor' && item.monitorType === 'cmcc') {
                   this.instance.post(`${this.urlPrefix}/appzyvideoequipment/getWebSdkUrl?deviceId=${item.moniterId}`).then(res => {
                     if (res.code == 0) {
                       this.$set(this.componentList[index], 'src', JSON.parse(res.data).url)
                     }
                   })
                 }
+                if (item.type === 'monitor' && item.monitorType === 'slw') {
+                  this.instance.post(`${this.urlPrefix}/appzyvideoequipment/getWebSdkUrl?deviceId=${item.moniterId}`).then(res => {
+                    if (res.code == 0) {
+                      this.$set(this.componentList[index], 'src', res.data)
+                    }
+                  })
+                }
               })
             }
           }
diff --git a/packages/creditScore/scoreFamily/AppScoreFamily.vue b/packages/creditScore/scoreFamily/AppScoreFamily.vue
index a05b20ab..708bebae 100644
--- a/packages/creditScore/scoreFamily/AppScoreFamily.vue
+++ b/packages/creditScore/scoreFamily/AppScoreFamily.vue
@@ -21,8 +21,8 @@
               v-model="searchObj.con"
               size="small"
               placeholder="户主姓名"
-              @keyup.enter.native="page.current = 1, getList()"
-              @clear="search.current = 1, search.con = '', getList()"
+              v-throttle="() => {page.current = 1, getList()}"
+              @clear="page.current = 1, searchObj.con = '', getList()"
               clearable
               suffix-icon="iconfont iconSearch" />
           </template>
diff --git a/packages/creditScore/scoreFamily/detail.vue b/packages/creditScore/scoreFamily/detail.vue
index 351e702b..43154381 100644
--- a/packages/creditScore/scoreFamily/detail.vue
+++ b/packages/creditScore/scoreFamily/detail.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-detail class="family_detail">
     <template slot="title">
-      <ai-title title="余额明细" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="$emit('goBack')" ></ai-title>
+      <ai-title title="余额明细" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="$emit('goBack')"></ai-title>
     </template>
     <template slot="content">
       <div class="detail-info">
@@ -25,33 +25,33 @@
       <ai-card title="余额变动明细">
         <template slot="right">
           <ai-download
-            :instance="instance"
-            url="/app/appvillagerintegraldetail/export"
-            :disabled="!Boolean(tableData.length)"
-            :params="{familyName:detailInfo.name,doType:doType}"
-            fileName="余额变动明细">
+              :instance="instance"
+              url="/app/appvillagerintegraldetail/export"
+              :disabled="!Boolean(tableData.length)"
+              :params="{familyId:detailInfo.id,bizType:doType}"
+              fileName="余额变动明细">
             <span class="iconfont iconExported">导出</span>
           </ai-download>
         </template>
         <template #content>
-          <el-select v-model="doType" placeholder="请选择类型" size='small' clearable  @change="page.current=1,getList()">
+          <el-select v-model="doType" placeholder="请选择类型" size='small' clearable @change="page.current=1,getList()">
             <el-option
-              v-for="(item,i) in dict.getDict('integralDetailType')"
-              :label="item.dictName"
-              :key="i"
-              :value="item.dictValue">
+                v-for="(item,i) in dict.getDict('integralDetailType')"
+                :label="item.dictName"
+                :key="i"
+                :value="item.dictValue">
             </el-option>
           </el-select>
           <ai-table
-            style="margin-top: 16px;"
-            :tableData="tableData"
-            :col-configs="colConfigs"
-            :total="page.total"
-            :border="true"
-            :stripe="false"
-            :current.sync="page.current"
-            :size.sync="page.size"
-            @getList="getList">
+              style="margin-top: 16px;"
+              :tableData="tableData"
+              :col-configs="colConfigs"
+              :total="page.total"
+              :border="true"
+              :stripe="false"
+              :current.sync="page.current"
+              :size.sync="page.size"
+              @getList="getList">
           </ai-table>
         </template>
       </ai-card>
@@ -60,153 +60,152 @@
 </template>
 
 <script>
-  export default {
-    name: 'balance',
+export default {
+  name: 'balance',
 
-    props: {
-      detailInfo: {
-        type: Object,
-        require: true
+  props: {
+    detailInfo: {
+      type: Object,
+      require: true
+    },
+    instance: Function,
+    dict: Object
+  },
+
+  data() {
+    return {
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
       },
-      instance: Function,
-      dict: Object
-    },
+      doType: '',
+      tableData: []
+    }
+  },
 
-    data () {
-      return {
-        page: {
-          current: 1,
-          size: 10,
-          total: 0
+  created() {
+    this.dict.load('integralDetailType')
+    this.getList()
+  },
+
+  computed: {
+    colConfigs() {
+      const _this = this
+      return [
+        {
+          prop: 'doTime',
+          label: '时间'
         },
-        doType: '',
-        tableData: []
-      }
-    },
-
-    created () {
-      this.dict.load('integralDetailType')
-      this.getList()
-    },
-
-    computed: {
-      colConfigs () {
-        const _this = this
-        return [
-          {
-            prop: 'doTime',
-            align: 'center',
-            label: '时间',
-            align:'left'
-          },
-          {
-            prop: 'bizType',
-            align: 'center',
-            label: '类型',
-            render (h, {row}) {
-              return h('span',{}, _this.dict.getLabel('integralDetailType', row.bizType))
-            }
-          },
-          {
-            prop: 'changeIntegral',
-            align: 'center',
-            label: '变动积分',
-            formart: v => v > 0 ? `+${v}` : v
-          },
-          {
-            prop: 'nowIntegral',
-            align: 'center',
-            label: '剩余积分'
-          },
-          {
-            prop: 'description',
-            align: 'center',
-            label: '事件类型',
-            align:'left'
+        {
+          prop: 'bizType',
+          align: 'center',
+          label: '类型',
+          render(h, {row}) {
+            return h('span', {}, _this.dict.getLabel('integralDetailType', row.bizType))
           }
-        ]
-      }
-    },
+        },
+        {
+          prop: 'changeIntegral',
+          align: 'center',
+          label: '变动积分',
+          formart: v => v > 0 ? `+${v}` : v
+        },
+        {
+          prop: 'nowIntegral',
+          align: 'center',
+          label: '剩余积分'
+        },
+        {
+          prop: 'description',
+          label: '事件类型',
+        }
+      ]
+    }
+  },
 
-    methods: {
-      getList () {
-        this.instance.post('/app/appvillagerintegraldetail/list', null, {
-          params: {                       
-            ...this.page,
-            familyId:this.detailInfo.id,
-            bizType:this.doType
-          }
-        }).then(res => {
-          if (res.code === 0) {
-            this.tableData = res.data.records
-            this.page.total = res.data.total
-          }
-        })
-      }
+  methods: {
+    getList() {
+      this.instance.post('/app/appvillagerintegraldetail/list', null, {
+        params: {
+          ...this.page,
+          familyId: this.detailInfo.id,
+          bizType: this.doType
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          this.tableData = res.data.records
+          this.page.total = res.data.total
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .family_detail{
-    height: 100%;
-    background-color: #fff;
+.family_detail {
+  height: 100%;
+  background-color: #fff;
 
-    ::v-deep .ai-card__body {
-      padding: 12px 16px 20px!important;
-    }
+  ::v-deep .ai-card__body {
+    padding: 12px 16px 20px !important;
+  }
 
 
-    .detail-info {
-      display: flex;
-      align-items: center;
-      margin-bottom: 20px;
+  .detail-info {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
 
-      .detail-info__item {
-        flex: 1;
-        height: 96px;
-        margin-right: 20px;
-        padding: 16px 24px;
-        background: #FFFFFF;
-        box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
-        border-radius: 4px;
+    .detail-info__item {
+      flex: 1;
+      height: 96px;
+      margin-right: 20px;
+      padding: 16px 24px;
+      background: #FFFFFF;
+      box-shadow: 0 4px 6px -2px rgba(15, 15, 21, 0.15);
+      border-radius: 4px;
 
-        &:last-child {
-          margin-right: 0;
-        }
-
-        h2 {
-          margin-bottom: 8px;
-          color: #888888;
-          font-size: 16px;
-          font-weight: bold;
-        }
-
-        span {
-          display: block;
-          line-height: 32px;
-          font-size: 24px;
-          font-weight: bold;
-          color: #222;
-        }
+      &:last-child {
+        margin-right: 0;
       }
-    }
 
-    .iconExported{
-      color:#5088FF;
-      font-size: 12px;
-      cursor: pointer;
-    }
-    .info{
-      padding: 16px 0 16px 0;
-    }
-    .do_type{
-      height: 56px;
-    }
-    .fs-14{
-      ::v-deep .el-table--small{
-        font-size: 14px!important;
+      h2 {
+        margin-bottom: 8px;
+        color: #888888;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      span {
+        display: block;
+        line-height: 32px;
+        font-size: 24px;
+        font-weight: bold;
+        color: #222;
       }
     }
   }
-</style>
\ No newline at end of file
+
+  .iconExported {
+    color: #5088FF;
+    font-size: 12px;
+    cursor: pointer;
+  }
+
+  .info {
+    padding: 16px 0 16px 0;
+  }
+
+  .do_type {
+    height: 56px;
+  }
+
+  .fs-14 {
+    ::v-deep .el-table--small {
+      font-size: 14px !important;
+    }
+  }
+}
+</style>
diff --git a/packages/creditScore/scoreManage/pointsAppeal.vue b/packages/creditScore/scoreManage/pointsAppeal.vue
index 4fbcf1f1..742b7ede 100644
--- a/packages/creditScore/scoreManage/pointsAppeal.vue
+++ b/packages/creditScore/scoreManage/pointsAppeal.vue
@@ -39,7 +39,7 @@
               size="mini"
               placeholder="申诉人/申诉对象/..."
               clearable
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
               @clear="page.current = 1, getList()"
               suffix-icon="iconfont iconSearch" />
           </template>
diff --git a/packages/creditScore/scoreManage/pointsDeclaration.vue b/packages/creditScore/scoreManage/pointsDeclaration.vue
index 7d0a2bf3..42562458 100644
--- a/packages/creditScore/scoreManage/pointsDeclaration.vue
+++ b/packages/creditScore/scoreManage/pointsDeclaration.vue
@@ -39,7 +39,7 @@
               size="mini"
               placeholder="申诉人/申诉对象/..."
               clearable
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
               @clear="page.current = 1, getList()"
               suffix-icon="iconfont iconSearch" />
           </template>
diff --git a/packages/creditScore/scoreManage/pointsDetails.vue b/packages/creditScore/scoreManage/pointsDetails.vue
index 2dc45dee..c6d5e97d 100644
--- a/packages/creditScore/scoreManage/pointsDetails.vue
+++ b/packages/creditScore/scoreManage/pointsDetails.vue
@@ -14,7 +14,7 @@
               size="small"
               placeholder="对象、户主、事件类型"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, getList()"
               suffix-icon="iconfont iconSearch" />
           </template>
diff --git a/packages/creditScore/scoreManage/scoreChange.vue b/packages/creditScore/scoreManage/scoreChange.vue
index 6140059d..abfc0dc2 100644
--- a/packages/creditScore/scoreManage/scoreChange.vue
+++ b/packages/creditScore/scoreManage/scoreChange.vue
@@ -31,7 +31,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="选择人员" prop="residentId">
           <ai-person-select :instance="instance" :customClicker="true"
-                            :url="'/app/appresident/list?areaId=' + user.info.areaId"
+                            :url="'/app/appresident/list?auditType=1areaId=' + user.info.areaId"
                             :isMultiple="false" dialogTitle="选择" @selectPerson="selectPerson">
             <template name="option" v-slot:option="{ item }">
               <span class="iconfont iconProlife">{{ item.name }}</span>
diff --git a/packages/creditScore/scorePersonal/AppScorePersonal.vue b/packages/creditScore/scorePersonal/AppScorePersonal.vue
index 7ebe4cbe..7534cf2a 100644
--- a/packages/creditScore/scorePersonal/AppScorePersonal.vue
+++ b/packages/creditScore/scorePersonal/AppScorePersonal.vue
@@ -29,7 +29,7 @@
               v-model="searchObj.con"
               size="small"
               placeholder="个人姓名"
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
               @clear="page.current = 1, searchObj.con = '', getList()"
               clearable
               suffix-icon="iconfont iconSearch" />
diff --git a/packages/creditScore/scoreRules/AppScoreRules.vue b/packages/creditScore/scoreRules/AppScoreRules.vue
index c227749f..35ac9daa 100644
--- a/packages/creditScore/scoreRules/AppScoreRules.vue
+++ b/packages/creditScore/scoreRules/AppScoreRules.vue
@@ -89,12 +89,14 @@
             </ai-select>
           </el-form-item>
           <el-form-item label="事项" prop="ruleName">
-            <el-input placeholder="请输入…" v-model="dialogInfo.ruleName"></el-input>
+            <el-input placeholder="请输入…" maxlength="30" show-word-limit v-model="dialogInfo.ruleName"></el-input>
           </el-form-item>
           <el-form-item label="规则说明" prop="ruleDescription">
             <el-input
               type="textarea"
               :rows="3"
+              maxlength="500"
+              show-word-limit
               placeholder="请输入…"
               v-model="dialogInfo.ruleDescription">
             </el-input>
diff --git a/packages/creditScore/scoreSupermarket/orderManagement.vue b/packages/creditScore/scoreSupermarket/orderManagement.vue
index 7322d071..21f90219 100644
--- a/packages/creditScore/scoreSupermarket/orderManagement.vue
+++ b/packages/creditScore/scoreSupermarket/orderManagement.vue
@@ -56,7 +56,7 @@
               v-model="searchObj.name"
               size="small"
               placeholder="订单号/商品名/兑换家庭"
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
               @clear="page.current = 1, searchObj.name = '', getList()"
               clearable
               suffix-icon="iconfont iconSearch"
@@ -69,7 +69,7 @@
             <ai-download
               :instance="instance"
               url="/app/appvillagerintegralshoporder/listExport"
-              :params="{ ...searchObj, areaId: areaId }"
+              :params="{ ...searchObj, areaId: areaId, ids: ids.join(',') }"
               fileName="订单管理"
               v-if="$permissions('app_appvillagerintegralshoporder_export')">
             </ai-download>
diff --git a/packages/meta/AppResident/AppResident.vue b/packages/meta/AppResident/AppResident.vue
index 1ef46b3e..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"/>
+            <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>
@@ -20,6 +21,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",
@@ -34,7 +37,7 @@ export default {
       resident: this
     }
   },
-  components: {ResidentSta, MobileResident, ListTpl, localResident},
+  components: {ResidentSta, MobileResident, ListTpl, localResident, auditList, audtiDetail: auditDetail},
   computed: {
     ...mapState(["user"]),
     tabs() {
@@ -50,6 +53,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 96%
rename from project/shandong10086/apps/shandong/AppResident/auditList.vue
rename to packages/meta/AppResident/auditList.vue
index b7c2a87d..9313db67 100644
--- a/project/shandong10086/apps/shandong/AppResident/auditList.vue
+++ b/packages/meta/AppResident/auditList.vue
@@ -35,7 +35,7 @@
             size="small"
             placeholder="姓名/身份证/联系方式"
             clearable
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             @clear="search.current = 1, search.con = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
@@ -71,8 +71,8 @@
               <el-radio label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="审核意见" prop="opinion" style="width: 100%;" :rules="[{ required: form.pass === '0' ? true : false, message: '请输入审核意见' }]">
-            <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+          <el-form-item label="审核意见" prop="opinion" style="width: 100%;" :rules="[{ required: form.pass === '0', message: '请输入审核意见' }]">
+            <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
           </el-form-item>
         </el-form>
       </ai-dialog>
diff --git a/project/shandong10086/apps/shandong/AppResident/audtiDetail.vue b/packages/meta/AppResident/audtiDetail.vue
similarity index 98%
rename from project/shandong10086/apps/shandong/AppResident/audtiDetail.vue
rename to packages/meta/AppResident/audtiDetail.vue
index e41a9b74..6986f4c3 100644
--- a/project/shandong10086/apps/shandong/AppResident/audtiDetail.vue
+++ b/packages/meta/AppResident/audtiDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="addAborigines">
     <ai-detail>
-      <ai-title slot="title" title="详情" isShowBack @onBackClick="$router.push({query:{}})" isShowBottomBorder></ai-title>
+      <ai-title slot="title" title="详情" isShowBack @onBackClick="$router.push({query:{}})" isShowBottomBorder/>
       <template #content>
           <ai-card title="基本信息">
             <div slot="content">
@@ -193,8 +193,8 @@
                   <el-radio label="1">是</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="审核意见" prop="opinion" style="width: 100%;" :rules="[{ required: form.pass === '0' ? true : false, message: '请输入审核意见' }]">
-                <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+              <el-form-item label="审核意见" prop="opinion" style="width: 100%;" :rules="[{ required: form.pass === '0', message: '请输入审核意见' }]">
+                <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
               </el-form-item>
             </el-form>
           </ai-dialog>
diff --git a/packages/meta/AppResident/listTpl.vue b/packages/meta/AppResident/listTpl.vue
index b8569198..09a57ada 100644
--- a/packages/meta/AppResident/listTpl.vue
+++ b/packages/meta/AppResident/listTpl.vue
@@ -87,7 +87,7 @@
                 size="small"
                 v-model="search.con"
                 placeholder="姓名/身份证/联系方式"
-                @keyup.enter.native="search.current = 1, refreshTable()"
+                v-throttle="() => {search.current = 1, refreshTable()}"
                 @clear="search.current = 1, refreshTable()"
                 clearable
                 suffix-icon="iconfont iconSearch"/>
@@ -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>
@@ -117,8 +117,8 @@
                        :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="居民档案"/>
+            <!-- <ai-download :instance="resident.instance" :params="params" url="/app/appresident/export"
+                         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"]),
diff --git a/packages/meta/AppResident/localResident.vue b/packages/meta/AppResident/localResident.vue
index 27905ac4..ea63a19d 100644
--- a/packages/meta/AppResident/localResident.vue
+++ b/packages/meta/AppResident/localResident.vue
@@ -44,6 +44,8 @@
                         size="small"
                         placeholder="请输入姓名"
                         v-if="showEdit1"
+                        maxlength="20"
+                        show-word-limit
                         :disabled="!!showDetail"
                     ></el-input>
                     <!-- <p v-else>{{baseInfo.name||'-'}}</p> -->
@@ -375,7 +377,7 @@
                 <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-input v-model="baseInfo.currentAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/>
                 </el-form-item>
               </el-form-item>
             </div>
@@ -437,7 +439,7 @@
                 <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-input v-model="baseInfo.householdAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/>
                 </el-form-item>
               </el-form-item>
             </div>
@@ -516,6 +518,20 @@
               </el-table>
             </div>
           </ai-card>
+          <ai-card v-for="(item, index) in baseInfo.tsrqInfos" :key="index" :title="item.applicationName">
+            <ai-wrapper
+              slot="content"
+              label-width="120px">
+              <ai-info-item
+                v-for="(filed, i) in item.tableInfos"
+                :label="filed.fieldName"
+                :key="i"
+                :isLine="filed.grid === '1'">
+                <ai-file-list :fileList="formData[item.fieldDbName]" v-if="item.type == 'upload'" :fileOps="{name: 'name', size: 'fileSizeStr'}"></ai-file-list>
+                <div v-else>{{ filed.fieldValue || '-' }}</div>
+              </ai-info-item>
+            </ai-wrapper>
+          </ai-card>
         </el-form>
       </template>
       <template v-if="!showDetail" #footer>
@@ -694,7 +710,8 @@ export default {
         phone: "",
         photo: "",
         politicsStatus: "",
-        sex: ""
+        sex: "",
+        tsrqInfos: []
       },
       family: [],
       familyDialog: false,
diff --git a/packages/meta/AppResident/mobileResident.vue b/packages/meta/AppResident/mobileResident.vue
index 072c409c..c9a35a18 100644
--- a/packages/meta/AppResident/mobileResident.vue
+++ b/packages/meta/AppResident/mobileResident.vue
@@ -43,6 +43,8 @@
                         size="small"
                         placeholder="请输入姓名"
                         v-if="showEdit1"
+                        maxlength="20"
+                        show-word-limit
                         :disabled="!!showDetail"
                     ></el-input>
                     <!-- <p v-else>{{baseInfo.name||'-'}}</p> -->
@@ -373,7 +375,7 @@
                 <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-input v-model="baseInfo.currentAddress" maxlength="30" show-word-limit placeholder="详细地址" clearable/>
                 </el-form-item>
               </el-form-item>
             </div>
@@ -434,7 +436,7 @@
                 <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-input v-model="baseInfo.householdAddress" maxlength="30" show-word-limit placeholder="详细地址" clearable/>
                 </el-form-item>
               </el-form-item>
             </div>
diff --git a/packages/meta/AppVillageCadres/cadreFiles.vue b/packages/meta/AppVillageCadres/cadreFiles.vue
index 0d3897eb..c3f3ffcd 100644
--- a/packages/meta/AppVillageCadres/cadreFiles.vue
+++ b/packages/meta/AppVillageCadres/cadreFiles.vue
@@ -75,7 +75,8 @@
             placeholder="姓名/身份证号/联系方式"
             prefix-icon="iconfont iconSearch"
             clearable
-            @change="page.current=1,getTableData()"
+            @clear="page.current = 1,search.param = '', getTableData()"
+            v-throttle="() => {page.current = 1, getTableData()}"
         />
         <el-button
             type="primary"
diff --git a/packages/monitor/AppMonitorDevice/AppMonitorDevice.vue b/packages/monitor/AppMonitorDevice/AppMonitorDevice.vue
index 4ebaa8bd..0634ad7c 100644
--- a/packages/monitor/AppMonitorDevice/AppMonitorDevice.vue
+++ b/packages/monitor/AppMonitorDevice/AppMonitorDevice.vue
@@ -6,9 +6,8 @@
         <ai-search-bar>
           <template #right>
             <el-input prefix-icon="iconfont iconSearch" v-model="search.title" placeholder="设备名、MAC号" clearable
-                      @change="page.current=1,getTableData()" size="small"/>
-            <el-button type="primary" icon="iconfont iconSearch" @click="page.current=1,getTableData()">查询</el-button>
-            <el-button icon="iconfont iconResetting" @click="search={},page.current=1,getTableData()">重置</el-button>
+            @clear="page.current = 1,search.title = '', getTableData()"
+                      v-throttle="() => {page.current = 1, getTableData()}" size="small"/>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :colConfigs="colConfigs" :total="page.total" :current.sync="page.current"
diff --git a/packages/monitor/AppMonitorManage/AppMonitorManage.vue b/packages/monitor/AppMonitorManage/AppMonitorManage.vue
index 757584d9..4dbfe6ec 100644
--- a/packages/monitor/AppMonitorManage/AppMonitorManage.vue
+++ b/packages/monitor/AppMonitorManage/AppMonitorManage.vue
@@ -25,152 +25,169 @@
         </el-form-item>
       </el-form>
     </ai-dialog>
-    <locate-dialog v-model="locate" :ins="instance" @confirm="v=>handleLocate(selected,v)"/>
-    <ai-area custom-clicker :input-clicker="false" v-model="selected.areaId" :instance="instance" ref="BindArea"
+    <locate-dialog v-model="locate" :ins="instance" :latlng="latlng" @confirm="v=>handleLocate(selected,v)"/>
+    <ai-area custom-clicker :input-clicker="false" v-model="selected.areaId" :hideLevel="disabledLevel" :instance="instance" ref="BindArea"
              @change="handleSubmit(selected)"/>
   </section>
 </template>
 
 <script>
-import DeviceSlider from "../components/deviceSlider";
-import LocateDialog from "../components/locateDialog";
+  import { mapState } from 'vuex'
+  import DeviceSlider from "../components/deviceSlider";
+  import LocateDialog from "../components/locateDialog";
 
-export default {
-  name: "AppMonitorManage",
-  components: {LocateDialog, DeviceSlider},
-  label: "监控实况",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function
-  },
-  computed: {
-    splitOps() {
-      return [
-        {label: "单分屏", value: 1, per: "100%"},
-        {label: "四分屏", value: 4, per: "49%"},
-        {label: "九分屏", value: 9, per: "32%"}
-      ]
+  export default {
+    name: "AppMonitorManage",
+    components: {LocateDialog, DeviceSlider},
+    label: "监控实况",
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function
     },
-    currentSplitStyle() {
-      let per = this.splitOps.find(e => e.value == this.splitScreen)?.per || "100%"
-      return {width: per, height: per}
+    computed: {
+      splitOps() {
+        return [
+          {label: "单分屏", value: 1, per: "100%"},
+          {label: "四分屏", value: 4, per: "49%"},
+          {label: "九分屏", value: 9, per: "32%"}
+        ]
+      },
+      currentSplitStyle() {
+        let per = this.splitOps.find(e => e.value == this.splitScreen)?.per || "100%"
+        return {width: per, height: per}
+      },
+      ...mapState(['user'])
     },
-  },
-  data() {
-    return {
-      slider: true,
-      fullscreen: false,
-      splitScreen: 1,
-      monitors: [],
-      dialog: false,
-      locate: false,
-      selected: {},
-      rules: {
-        name: [{required: true, message: "请填写 设备名称"}]
+
+    data() {
+      return {
+        slider: true,
+        fullscreen: false,
+        splitScreen: 1,
+        monitors: [],
+        dialog: false,
+        locate: false,
+        selected: {
+          areaId: ''
+        },
+        latlng: null,
+        disabledLevel: 0,
+        rules: {
+          name: [{required: true, message: "请填写 设备名称"}]
+        }
       }
-    }
-  },
-  methods: {
-    handleFullscreen() {
-      this.fullscreen = !this.fullscreen
-      this.$fullscreen(this.fullscreen)
     },
-    handleSelectMonitor(monitor) {
-      let {id} = monitor,
-          index = this.monitors.findIndex(e => e.id == id)
-      if (index > -1) {
-        this.monitors.splice(index, 1)
-        this.monitors.map((e, i) => {
-          if (i > index) {
-            this.showMonitor(e, true)
+
+    created () {
+      this.selected.areaId = this.user.info.areaId
+      this.disabledLevel = this.user.info.areaList.length
+    },
+
+    methods: {
+      handleFullscreen() {
+        this.fullscreen = !this.fullscreen
+        this.$fullscreen(this.fullscreen)
+      },
+      handleSelectMonitor(monitor) {
+        let {id} = monitor,
+            index = this.monitors.findIndex(e => e.id == id)
+        if (index > -1) {
+          this.monitors.splice(index, 1)
+          this.monitors.map((e, i) => {
+            if (i > index) {
+              this.showMonitor(e, true)
+            }
+          })
+        } else if (this.monitors.length >= this.splitScreen && this.splitScreen > 1) {
+          this.$message.warning("可分屏监控已满,请先取消其他的监控")
+        } else {
+          this.showMonitor(monitor)
+        }
+      },
+      showMonitor(monitor, refresh = false) {
+        let {id: deviceId} = monitor
+        deviceId && this.instance.post("/app/appzyvideoequipment/getWebSdkUrl", null, {
+          params: {deviceId}
+        }).then(res => {
+          if (res?.data) {
+            let data = JSON.parse(res.data)
+            if (refresh) {
+              monitor.url = data.url
+            } else if (this.splitScreen == 1) {
+              this.monitors = [{...monitor, ...data}]
+            } else {
+              this.monitors.push({...monitor, ...data})
+            }
           }
         })
-      } else if (this.monitors.length >= this.splitScreen && this.splitScreen > 1) {
-        this.$message.warning("可分屏监控已满,请先取消其他的监控")
-      } else {
-        this.showMonitor(monitor)
-      }
-    },
-    showMonitor(monitor, refresh = false) {
-      let {id: deviceId} = monitor
-      deviceId && this.instance.post("/app/appzyvideoequipment/getWebSdkUrl", null, {
-        params: {deviceId}
-      }).then(res => {
-        if (res?.data) {
-          let data = JSON.parse(res.data)
-          if (refresh) {
-            monitor.url = data.url
-          } else if (this.splitScreen == 1) {
-            this.monitors = [{...monitor, ...data}]
-          } else {
-            this.monitors.push({...monitor, ...data})
-          }
-        }
-      })
-    },
-    renderTreeItem: function (h, {node, data}) {
-      let show = data.deviceStatus==1 ? 'show' : ''
-      if (node.isLeaf) {
-        return (
+      },
+      renderTreeItem: function (h, {node, data}) {
+        let show = data.deviceStatus==1 ? 'show' : ''
+        if (node.isLeaf) {
+          return (
+              <div class="flexRow">
+                <i class={['iconfont', 'iconshipinjiankong', show]}/>
+                <div>{node.label}</div>
+                <el-dropdown class="menuBtn" onCommand={e => this.handleSliderOption(e, data)}>
+                  <i class="iconfont iconMore"/>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="edit">修改名称</el-dropdown-item>
+                    <el-dropdown-item command="area">行政地区</el-dropdown-item>
+                    <el-dropdown-item command="locate">地图标绘</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+          )
+        } else return (
             <div class="flexRow">
-              <i class={['iconfont', 'iconshipinjiankong', show]}/>
               <div>{node.label}</div>
-              <el-dropdown class="menuBtn" onCommand={e => this.handleSliderOption(e, data)}>
-                <i class="iconfont iconMore"/>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="edit">修改名称</el-dropdown-item>
-                  <el-dropdown-item command="area">行政地区</el-dropdown-item>
-                  <el-dropdown-item command="locate">地图标绘</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
+              {data.id != 'no_area' ? <div class="sta">
+                    <p>{data.online || 0}</p>/{data.sum || 0}
+                  </div>
+                  : <div/>}
             </div>
         )
-      } else return (
-          <div class="flexRow">
-            <div>{node.label}</div>
-            {data.id != 'no_area' ? <div class="sta">
-                  <p>{data.online || 0}</p>/{data.sum || 0}
-                </div>
-                : <div/>}
-          </div>
-      )
-    },
-    handleSliderOption(command, data) {
-      this.selected = JSON.parse(JSON.stringify({...data, command}))
-      if (command == "edit") {//修改名称
-        this.dialog = true
-      } else if (command == "area") {//绑定areaId
-        this.$refs.BindArea?.chooseArea()
-      } else if (command == "locate") {//地图标绘
-        this.locate = true
-      }
-    },
-    handleSubmit(row) {
-      delete row.createTime
-      return this.instance.post("/app/appzyvideoequipment/addOrUpdate", {
-        ...row
-      }).then(res => {
-        if (res?.code == 0) {
-          this.$message.success("提交成功!")
-          this.dialog = false
-          this.$refs.DeviceSlider?.getDevices()
+      },
+      handleSliderOption(command, data) {
+        this.selected = JSON.parse(JSON.stringify({...data, command}))
+        if (command == "edit") {//修改名称
+          this.dialog = true
+        } else if (command == "area") {//绑定areaId
+          this.$refs.BindArea?.chooseArea()
+        } else if (command == "locate") {//地图标绘
+          this.latlng = data.lat && data.lng ? {
+            lat: data.lat,
+            lng: data.lng
+          } : ''
+          this.locate = true
         }
-      })
-    },
-    handleLocate(row, locate) {
-      if (locate) {
-        let {lat, lng} = locate.location
-        this.handleSubmit({...row, lat, lng}).then(() => {
-          this.locate = false
+      },
+      handleSubmit(row) {
+        delete row.createTime
+        return this.instance.post("/app/appzyvideoequipment/addOrUpdate", {
+          ...row
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("提交成功!")
+            this.dialog = false
+            this.$refs.DeviceSlider?.getDevices()
+          }
         })
+      },
+      handleLocate(row, locate) {
+        if (locate) {
+          let {lat, lng} = locate.location
+          this.handleSubmit({...row, lat, lng}).then(() => {
+            this.locate = false
+          })
+        }
       }
+    },
+    beforeDestroy() {
+      this.monitors = []
     }
-  },
-  beforeDestroy() {
-    this.monitors = []
   }
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/monitor/components/locateDialog.vue b/packages/monitor/components/locateDialog.vue
index 13cdd466..e3e6c673 100644
--- a/packages/monitor/components/locateDialog.vue
+++ b/packages/monitor/components/locateDialog.vue
@@ -30,9 +30,7 @@ export default {
     prop: "visible",
     event: "visible",
   },
-  props: {
-    visible: Boolean
-  },
+  props: ['latlng', 'visible'],
   data() {
     return {
       dialog: false,
@@ -59,11 +57,18 @@ export default {
         this.AMap = AMap
         this.map = new AMap.Map('amap', {
           zoom: 14,
+          center: this.latlng ? [this.latlng.lng, this.latlng.lat] : ''
         }).on('click', res => {
           this.map.clearMap()
           this.selected = {location: res.lnglat}
           this.poi?.searchNearBy('', res.lnglat, 100)
         });
+        if (this.latlng) {
+          let marker = new AMap.Marker({
+            position: [this.latlng.lng, this.latlng.lat]
+          })
+          this.map.add(marker)
+        }
         this.poi = new AMap.PlaceSearch().on('complete', ({poiList}) => {
           this.map.clearMap()
           if (poiList?.length > 0) {
diff --git a/packages/party/AppPartyOrg/AppPartyOrganization.vue b/packages/party/AppPartyOrg/AppPartyOrganization.vue
index d5ad1921..9d8205c4 100644
--- a/packages/party/AppPartyOrg/AppPartyOrganization.vue
+++ b/packages/party/AppPartyOrg/AppPartyOrganization.vue
@@ -583,10 +583,19 @@ export default {
     margin-left: 1px;
 
     .ai-list__content--right-wrapper {
-      height: 100%;
+      position: relative;
+      // height: 100%;
 
       .ai-empty {
-        height: 100%;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        z-index: 1;
+        transform: translate(-50%, -50%);
+
+        .ai-empty__bg {
+          margin-top: 0;
+        }
       }
     }
   }
diff --git a/packages/party/partyMember/components/List.vue b/packages/party/partyMember/components/List.vue
index 6f828ed1..58dbff63 100644
--- a/packages/party/partyMember/components/List.vue
+++ b/packages/party/partyMember/components/List.vue
@@ -86,7 +86,7 @@
           <el-input
               v-model="search.con"
               size="small"
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               placeholder="请输入姓名或身份证"
               clearable
               @clear="search.current = 1, search.con = '', getList()"
diff --git a/packages/processManagement/approvalManage/AppApprovalManage.vue b/packages/processManagement/approvalManage/AppApprovalManage.vue
index b887a8f8..55de8783 100644
--- a/packages/processManagement/approvalManage/AppApprovalManage.vue
+++ b/packages/processManagement/approvalManage/AppApprovalManage.vue
@@ -1,8 +1,8 @@
 <template>
-  <section class="approval-manage">
+  <section class="AppApprovalManage">
     <ai-list v-if="showList">
       <template slot="title">
-        <ai-title title="审批管理" :isShowBottomBorder="false"></ai-title>
+        <ai-title title="审批管理" :isShowBottomBorder="false"/>
       </template>
       <template slot="tabs">
         <el-tabs class="tabs-page" v-model="currIndex">
@@ -86,7 +86,7 @@
 </script>
 
 <style lang="scss" scoped>
-  .approval-manage {
+  .AppApprovalManage {
     width: 100%;
     height: 100%;
     background-color: #F3F6F9;
diff --git a/packages/processManagement/approvalManage/components/approvalDetail.vue b/packages/processManagement/approvalManage/components/approvalDetail.vue
index 2042ffab..bc9ec36e 100644
--- a/packages/processManagement/approvalManage/components/approvalDetail.vue
+++ b/packages/processManagement/approvalManage/components/approvalDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app_detail detail-content details-page">
-    <ai-detail>
+    <ai-detail isHasSidebar>
       <ai-title slot="title" title="审批详情" isShowBack isShowBottomBorder @onBackClick="approval.goBack()">
         <template #rightBtn>
           <template v-if="listType==0&&$permissions('zwsp_oaapprovalapplyinfo_approve')">
@@ -61,7 +61,7 @@
                       </el-form-item>
                     </div>
                     <template v-if="applyForm=={}">
-                      <div class="no-data"></div>
+                      <div class="no-data"/>
                     </template>
                   </div>
                 </el-form>
diff --git a/packages/processManagement/approvalManage/components/forMyApproval.vue b/packages/processManagement/approvalManage/components/forMyApproval.vue
index e41af2a5..cd1c2942 100644
--- a/packages/processManagement/approvalManage/components/forMyApproval.vue
+++ b/packages/processManagement/approvalManage/components/forMyApproval.vue
@@ -8,7 +8,7 @@
               v-model="search.param"
               size="small"
               placeholder="标题/发起人"
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="reset"
               clearable
               suffix-icon="iconfont iconSearch"/>
diff --git a/packages/processManagement/examinationApproval/AppExaminationApproval.vue b/packages/processManagement/examinationApproval/AppExaminationApproval.vue
index 8693882b..457c4574 100644
--- a/packages/processManagement/examinationApproval/AppExaminationApproval.vue
+++ b/packages/processManagement/examinationApproval/AppExaminationApproval.vue
@@ -14,7 +14,7 @@
               v-model="search.name"
               size="small"
               placeholder="分类名称/创建人"
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="reset"
               clearable
               suffix-icon="iconfont iconSearch"/>
diff --git a/packages/processManagement/mattersConfig/components/configList.vue b/packages/processManagement/mattersConfig/components/configList.vue
index e0a0ce63..739979d4 100644
--- a/packages/processManagement/mattersConfig/components/configList.vue
+++ b/packages/processManagement/mattersConfig/components/configList.vue
@@ -27,7 +27,7 @@
               size="small"
               placeholder="事项名称/创建人"
               @clear="search={},page.current=1,getList()"
-              @keyup.enter.native="page.current=1,getList()"
+              v-throttle="() => {page.current = 1, getList()}"
               clearable
               suffix-icon="iconfont iconSearch"/>
           </template>
diff --git a/packages/tutelage/AppEarlyWarning/components/List.vue b/packages/tutelage/AppEarlyWarning/components/List.vue
index f750fec6..3c760751 100644
--- a/packages/tutelage/AppEarlyWarning/components/List.vue
+++ b/packages/tutelage/AppEarlyWarning/components/List.vue
@@ -31,7 +31,7 @@
           <el-input
             v-model="search.name"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入成员姓名、设备号"
             clearable
             @clear="search.current = 1, search.name = '', getList()"
diff --git a/packages/tutelage/AppSoS/components/List.vue b/packages/tutelage/AppSoS/components/List.vue
index 8dc02947..c19590a4 100644
--- a/packages/tutelage/AppSoS/components/List.vue
+++ b/packages/tutelage/AppSoS/components/List.vue
@@ -22,7 +22,7 @@
           <el-input
             v-model="search.name"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入成员姓名、设备号"
             clearable
             @clear="search.current = 1, search.name = '', getList()"
diff --git a/packages/tutelage/AppWristband/components/List.vue b/packages/tutelage/AppWristband/components/List.vue
index f4d59f79..8594165e 100644
--- a/packages/tutelage/AppWristband/components/List.vue
+++ b/packages/tutelage/AppWristband/components/List.vue
@@ -23,7 +23,7 @@
           <el-input
             v-model="search.name"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入成员姓名、设备号、监护人"
             clearable
             @clear="search.current = 1, search.name = '', getList()"
diff --git a/packages/wechat/AppAddressBook/components/Add.vue b/packages/wechat/AppAddressBook/components/Add.vue
index a534cdc3..1366ad2b 100644
--- a/packages/wechat/AppAddressBook/components/Add.vue
+++ b/packages/wechat/AppAddressBook/components/Add.vue
@@ -10,13 +10,13 @@
         <template #content>
           <div class="ai-form">
             <el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
-              <el-input size="small" placeholder="请输入姓名" v-model="form.name"></el-input>
+              <el-input size="small" placeholder="请输入姓名" show-word-limit v-model="form.name" :maxlength="10"></el-input>
             </el-form-item>
             <el-form-item label="账号" prop="id" :rules="[{ required: true, message: '请输入账号', trigger: 'blur' }]">
-              <el-input size="small" :disabled="!!id" placeholder="成员唯一标识，设定以后不支持修改" v-model="form.id"></el-input>
+              <el-input size="small" :disabled="!!id" show-word-limit :maxlength="30" placeholder="成员唯一标识，设定以后不支持修改" v-model="form.id"></el-input>
             </el-form-item>
             <el-form-item label="手机号" prop="mobile" :rules="[{ required: true, validator: validatorPhone, trigger: 'blur' }]">
-              <el-input size="small" placeholder="请输入手机号" v-model="form.mobile"></el-input>
+              <el-input size="small" placeholder="请输入手机号" show-word-limit :maxlength="11" v-model="form.mobile"></el-input>
             </el-form-item>
             <el-form-item label="性别" prop="gender">
               <el-radio-group v-model="form.gender">
@@ -31,7 +31,7 @@
               <el-input size="small" placeholder="请输入邮箱" v-model="form.email"></el-input>
             </el-form-item>
             <el-form-item label="地址" style="width: 100%;" prop="address">
-              <el-input size="small" style="width: 100%;" placeholder="请输入地址" v-model="form.address"></el-input>
+              <el-input size="small" style="width: 100%;" show-word-limit :maxlength="30" placeholder="请输入地址" v-model="form.address"></el-input>
             </el-form-item>
           </div>
         </template>
@@ -106,13 +106,11 @@
           id: ''
         },
         id: '',
-        tagsList: [],
-        areaList: []
+        tagsList: []
       }
     },
 
     created () {
-      this.getAreaList()
       this.getTags()
 
       if (this.params && this.params.departmentId && !this.params.id) {
@@ -134,6 +132,13 @@
       getInfo (id) {
         this.instance.post(`/app/wxcp/wxuser/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
+            const departmentNames = res.data.departmentNames.split(',')
+            this.department = res.data.departmentIdsStr.split(',').map((item, index) => {
+              return {
+                name: departmentNames[index],
+                id: item
+              }
+            })
             this.form = {
               ...res.data,
               departmentName: res.data.departmentNames,
@@ -162,19 +167,6 @@
         })
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data.map(item => {
-              item.dictName = item.name
-              item.dictValue = item.id
-
-              return item
-            })
-          }
-        })
-      },
-
       onClose () {
         this.form.explain = ''
       },
diff --git a/packages/wechat/AppAddressBook/components/List.vue b/packages/wechat/AppAddressBook/components/List.vue
index 14f3f8ab..bd8d77c0 100644
--- a/packages/wechat/AppAddressBook/components/List.vue
+++ b/packages/wechat/AppAddressBook/components/List.vue
@@ -15,6 +15,7 @@
               size="mini"
               placeholder="请输入部门名称"
               v-model="unitName"
+              clearable
               suffix-icon="iconfont iconSearch">
           </el-input>
         </div>
@@ -103,7 +104,7 @@
           <el-input
               v-model="search.name"
               size="small"
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               placeholder="请输入成员姓名、手机号或标签名称"
               clearable
               @clear="search.current = 1, search.name = '', getList()"
@@ -161,7 +162,7 @@
           @onConfirm="onFormConfirm">
         <el-form ref="tagForm" :model="tagForm" label-width="110px" label-position="right">
           <el-form-item label="标签名称" prop="tagname" :rules="[{ required: true, message: '请输入标签名称', trigger: 'blur' }]">
-            <el-input size="small" placeholder="请输入标签名称" v-model="tagForm.tagname"></el-input>
+            <el-input size="small" placeholder="请输入标签名称" show-word-limit :maxlength="10" v-model="tagForm.tagname"></el-input>
           </el-form-item>
         </el-form>
       </ai-dialog>
@@ -173,7 +174,7 @@
           @onConfirm="onDepartConfirm">
         <el-form ref="departForm" :model="departForm" label-width="110px" label-position="right">
           <el-form-item label="部门名称" prop="name" :rules="[{ required: true, message: '请输入部门名称', trigger: 'blur' }]">
-            <el-input size="small" placeholder="请输入部门名称" v-model="departForm.name"></el-input>
+            <el-input size="small" placeholder="请输入部门名称" show-word-limit :maxlength="30" v-model="departForm.name"></el-input>
           </el-form-item>
         </el-form>
       </ai-dialog>
@@ -486,6 +487,7 @@ export default {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getTags()
+              this.getList()
             }
           })
         })
diff --git a/packages/wechat/AppAsk/components/List.vue b/packages/wechat/AppAsk/components/List.vue
index 3d558ffc..2dec4beb 100644
--- a/packages/wechat/AppAsk/components/List.vue
+++ b/packages/wechat/AppAsk/components/List.vue
@@ -20,7 +20,7 @@
           <el-input
             v-model="search.title"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入标题或编号"
             clearable
             @clear="search.current = 1, search.title = '', getList()"
diff --git a/packages/wechat/AppAskForm/components/Add.vue b/packages/wechat/AppAskForm/components/Add.vue
index 06ac7ff4..efd172c5 100644
--- a/packages/wechat/AppAskForm/components/Add.vue
+++ b/packages/wechat/AppAskForm/components/Add.vue
@@ -587,11 +587,7 @@
       },
 
       onheadPictureChange (e) {
-        if (e.length) {
-          this.form.isShowheadPicture = true
-        } else {
-          this.form.isShowheadPicture = false
-        }
+        this.form.isShowheadPicture = !!e.length;
       },
 
       init () {
@@ -757,7 +753,7 @@
 
       onConfirm (status) {
         if (this.params.templateType == 1) {
-          this.submitTemp()
+          // this.submitTemp()
         }
 
         if (this.form.periodValidityType === '1') {
diff --git a/packages/wechat/AppAskForm/components/FormList.vue b/packages/wechat/AppAskForm/components/FormList.vue
index 43aa1f09..14c4342b 100644
--- a/packages/wechat/AppAskForm/components/FormList.vue
+++ b/packages/wechat/AppAskForm/components/FormList.vue
@@ -22,7 +22,7 @@
               size="small"
               placeholder="请输入模板名称或创建人"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.title = '', getList()"
               suffix-icon="iconfont iconSearch">
           </el-input>
diff --git a/packages/wechat/AppAskForm/components/Statistics.vue b/packages/wechat/AppAskForm/components/Statistics.vue
index b208b748..2c7264d3 100644
--- a/packages/wechat/AppAskForm/components/Statistics.vue
+++ b/packages/wechat/AppAskForm/components/Statistics.vue
@@ -73,7 +73,7 @@
                     size="small"
                     placeholder="请输入居民名称或真实姓名"
                     clearable
-                    @keyup.enter.native="search.current = 1, getList()"
+                    v-throttle="() => {search.current = 1, getList()}"
                     @clear="search.current = 1, search.name = '', getList()"
                     suffix-icon="iconfont iconSearch">
                 </el-input>
diff --git a/packages/wechat/AppAskForm/components/Template.vue b/packages/wechat/AppAskForm/components/Template.vue
index 5aab70ec..cced3a3e 100644
--- a/packages/wechat/AppAskForm/components/Template.vue
+++ b/packages/wechat/AppAskForm/components/Template.vue
@@ -16,7 +16,7 @@
               size="small"
               placeholder="请输入模板名称或创建人"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.title = '', getList()"
               suffix-icon="iconfont iconSearch">
           </el-input>
diff --git a/packages/wechat/AppCarousel/AppCarousel.vue b/packages/wechat/AppCarousel/AppCarousel.vue
index e8d9ef6f..babfce00 100644
--- a/packages/wechat/AppCarousel/AppCarousel.vue
+++ b/packages/wechat/AppCarousel/AppCarousel.vue
@@ -13,7 +13,7 @@
 
           <template slot="right">
             <el-input v-model="search.title" size="small" placeholder="搜索标题" clearable
-                      @keyup.enter.native=";(page.current = 1), getList()"
+                      v-throttle="() => {page.current = 1, getList()}"
                       @clear=";(page.current = 1), (search.title = ''), getList()" suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
@@ -51,8 +51,8 @@
           <ai-uploader v-model="dialogInfo.imgUrl" @change="change" :instance="instance" :limit="1"></ai-uploader>
         </el-form-item>
         <!-- 活动名称 -->
-        <el-form-item label="活动名称" prop="title">
-          <el-input placeholder="请输入活动名称" :maxlength="30" show-word-limit v-model="dialogInfo.title"></el-input>
+        <el-form-item label="标题" prop="title">
+          <el-input placeholder="请输入标题" :maxlength="30" show-word-limit v-model="dialogInfo.title"></el-input>
         </el-form-item>
         <!-- 连接类型 -->
         <el-form-item label="链接类型" prop="type">
@@ -74,13 +74,13 @@
           <ai-info-item label="首页封面">
             <span><img :src="dialogInfo.imgUrl" alt="" style="width:100px;height:100px;"/></span>
           </ai-info-item>
-          <ai-info-item label="活动名称：">
+          <ai-info-item label="标题">
             <span>{{ dialogInfo.title }}</span>
           </ai-info-item>
-          <ai-info-item label="链接类型：">
+          <ai-info-item label="链接类型">
             <span>{{ this.dict.getLabel('bannerType', dialogInfo.type) }}</span>
           </ai-info-item>
-          <ai-info-item label="链接：">
+          <ai-info-item label="链接">
             <span>{{ dialogInfo.linkUrl }}</span>
           </ai-info-item>
         </ai-wrapper>
@@ -135,15 +135,15 @@ export default {
       // fileList: '',
       formRules: {
         imgUrl: [{required: true, message: '请添加图片', trigger: 'blur'}],
-        title: [{required: true, message: '请输入活动名称', trigger: 'blur'}],
-        type: [{required: true, trigger: 'blur'}],
+        title: [{required: true, message: '请输入标题', trigger: 'blur'}],
+        type: [{required: true, trigger: 'change', message: '请选择链接类型'}],
         // linkUrl: [{ required: true, message: '请输入链接', trigger: 'blur' }]
       },
       colConfigs: [
         {prop: 'imgUrl', label: '首页封面', slot: 'imgUrl'},
         {
           prop: 'title',
-          label: '活动名称',
+          label: '标题',
 
           'show-overflow-tooltip': true,
         },
@@ -223,20 +223,22 @@ export default {
     // 确定新增
     addConfirm() {
       // console.log('确定')
-      this.instance
-      .post(`/app/appbanner/addOrUpdate`, {
-        imgUrl: this.dialogInfo.imgUrl[0].url,
-        linkUrl: this.dialogInfo.linkUrl,
-        status: this.status,
-        title: this.dialogInfo.title,
-        type: this.dialogInfo.type,
-        id: this.dialogInfo.id,
-      })
-      .then(res => {
-        if (res?.code == 0) {
-          this.$message.success('新增成功')
-          this.visible = false
-          this.getList()
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/app/appbanner/addOrUpdate`, {
+            imgUrl: this.dialogInfo.imgUrl[0].url,
+            linkUrl: this.dialogInfo.linkUrl,
+            status: this.status,
+            title: this.dialogInfo.title,
+            type: this.dialogInfo.type,
+            id: this.dialogInfo.id,
+          }).then(res => {
+            if (res?.code == 0) {
+              this.$message.success('新增成功')
+              this.visible = false
+              this.getList()
+            }
+          })
         }
       })
     },
diff --git a/packages/wechat/AppClientMassTextin/components/TableList.vue b/packages/wechat/AppClientMassTextin/components/TableList.vue
index e8b2ee7f..f9ed3528 100644
--- a/packages/wechat/AppClientMassTextin/components/TableList.vue
+++ b/packages/wechat/AppClientMassTextin/components/TableList.vue
@@ -10,7 +10,7 @@
             v-model="search.name"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入标题或编号"
             clearable
             @clear="search.current = 1, search.name = '', getList()"
diff --git a/packages/wechat/AppConference/detail.vue b/packages/wechat/AppConference/detail.vue
index dd1ce767..554da89d 100644
--- a/packages/wechat/AppConference/detail.vue
+++ b/packages/wechat/AppConference/detail.vue
@@ -4,9 +4,6 @@
       <template #title>
         <ai-title title="会议详情" isShowBottomBorder isShowBack @onBackClick="$parent.goBack">
           <template #rightBtn>
-            <p class="conference_top_area" v-if="detail.joinStatus==3">
-              <el-button type="primary" @click="toDo">待定</el-button>
-            </p>
             <p class="conference_top_area" v-if="listType==0">
               <!-- <el-button type="primary" v-if="detail.status==0" @click="changeMeeting('是否立即发布会议？')">立即发布</el-button> -->
               <el-button type="primary" v-if="detail.status==1" @click="noticeMetting()">参会提醒</el-button>
@@ -18,6 +15,7 @@
             </p>
             <!-- v-if="detail.status==0||detail.status==3" -->
             <p class="conference_top_area" v-if="listType==1&&info.status==1">
+              <el-button @click="toDo" style="width:80px;" class="del-btn-list">待定</el-button>
               <el-button @click="innerVisible=true" v-if="info.joinStatus!=2" style="width:80px;" class="del-btn-list">
                 请假
               </el-button>
@@ -93,28 +91,28 @@
         </ai-card>
         <ai-card title="参会名单">
           <template slot="content">
-            <ai-search-bar>
+            <ai-search-bar bottomBorder>
               <template #left>
-                <el-select v-model="search.joinStatus" placeholder="确认状态" size="small" clearable class="vc-input-160"
-                           @change="searchMeetinguser">
+                <el-select v-model="search.joinStatus" placeholder="确认状态" size="small" clearable class="vc-input-160" @change="searchMeetinguser">
                   <el-option
-                      v-for="(item,k) in confirmStatus"
-                      :key="k"
-                      :label="item.label"
-                      :value="k">
+                    v-for="(item,k) in confirmStatus"
+                    :key="k"
+                    :label="item.label"
+                    :value="k">
                   </el-option>
                 </el-select>
               </template>
-              <!--              <template #right>-->
-              <!--                <el-input v-model="search.param" placeholder="姓名/手机号" @change="searchMeetinguser()"-->
-              <!--                          size="small" suffix-icon="iconfont iconSearch" clearable/>-->
-              <!--              </template>-->
+              <template #right>
+                <!-- <ai-download :instance="instance" url="/app/appepidemicbackhomerecord/export" fileName="参会名单">
+                  <el-button icon="iconfont iconExported">导出</el-button>
+                </ai-download> -->
+              </template>
             </ai-search-bar>
             <ai-table
-                :tableData="info.attendees"
-                :colConfigs="colConfigs"
-                :isShowPagination="false"
-            >
+              :tableData="info.attendees"
+              :colConfigs="colConfigs"
+              style="margin-top: 12px;"
+              :isShowPagination="false">
               <el-table-column slot="meetingUserName"
                                label="姓名"
                                align="center"
@@ -197,17 +195,13 @@ export default {
         {
           slot: 'meetingUserName'
         },
-        // {
-        //   prop: 'meetingUserPhone',
-        //   align: 'center',
-        //   label: '手机号码',
-        // },
         {
           slot: 'meetingUnitName'
         },
         {
           slot: 'joinStatus',
         },
+        { prop: 'signInStatus', align: 'center', label: '签到', formart: v => v === '1' ? '已签到' : '未签到' },
         {
           slot: 'option',
         }
@@ -225,13 +219,13 @@ export default {
   methods: {
     toDo() {
       this.$confirm("是否确认待定会议？").then(_ => {
-        this.$http.post("/app/appmeetinginfo/tobeConfirm", null, {
+        this.instance.post("/app/appmeetinginfo/tobeConfirm", null, {
           params: {
             meetingId: this.detail.id,
           }
         }).then(res => {
           if (res.code == 0) {
-            this.$u.toast("会议待定");
+            this.$message.success("会议待定");
             setTimeout(_ => {
               this.$parent.goBack();
             }, 800)
@@ -412,6 +406,11 @@ export default {
   height: 100%;
   background: rgba(255, 255, 255, 1);
 
+  .conference_top_area {
+    display: flex;
+    align-items: center;
+  }
+
   .user-search {
     width: 100%;
     height: 48px;
diff --git a/packages/wechat/AppConference/list.vue b/packages/wechat/AppConference/list.vue
index dcb87fa2..59b4de58 100644
--- a/packages/wechat/AppConference/list.vue
+++ b/packages/wechat/AppConference/list.vue
@@ -19,8 +19,12 @@
           ></ai-select>
         </template>
         <template #right>
-          <el-input v-model="search.param" @keyup.enter.native="search.current=1,getTableData()" placeholder="会议标题/地点"
-                    size="small" suffix-icon="iconfont iconSearch" clearable @clear="getTableData()"></el-input>
+          <el-input
+            v-model="search.param"
+            v-throttle="() => {search.current=1,getTableData()}"
+            @keyup.enter.native="search.current=1,getTableData()"
+            placeholder="会议标题/地点"
+            size="small" suffix-icon="iconfont iconSearch" clearable @clear="getTableData()"></el-input>
         </template>
       </ai-search-bar>
       <div class="list_main">
@@ -123,6 +127,7 @@ export default {
         comp: 'addMeeting'
       });
     },
+
     getTableData() {
       this.instance.post(`/app/appmeetinginfo/list`, null, {
         params: {
diff --git a/packages/wechat/AppDispatchManagement/components/List.vue b/packages/wechat/AppDispatchManagement/components/List.vue
index 27337adf..540a25e2 100644
--- a/packages/wechat/AppDispatchManagement/components/List.vue
+++ b/packages/wechat/AppDispatchManagement/components/List.vue
@@ -55,8 +55,9 @@
           <el-input placeholder="输入公文名称/编号"
                     v-model="searchObj.name"
                     size="small"
-                    @change="(page.current = 1), getList()"
+                    v-throttle="() => {page.current = 1, getList()}"
                     clearable
+                    @clear="page.current = 1, searchObj.name = '', getList()"
                     prefix-icon="iconfont iconSearch"/>
         </template>
       </ai-search-bar>
@@ -192,7 +193,7 @@ export default {
       ];
     },
   },
-  mounted() {
+  created() {
     this.dict.load('officialDocumentName', 'officialDocumentConfidentialityLevel', 'officialDocumentReadType', 'documentStatus').then(() => {
       this.$nextTick(() => this.getList())
     })
diff --git a/packages/wechat/AppHotTopic/AppHotTopic.vue b/packages/wechat/AppHotTopic/AppHotTopic.vue
index 63642570..593b9865 100644
--- a/packages/wechat/AppHotTopic/AppHotTopic.vue
+++ b/packages/wechat/AppHotTopic/AppHotTopic.vue
@@ -15,7 +15,7 @@
               size="small"
               placeholder="搜索标题"
               clearable
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
               @clear="page.current = 1, page.title = '', getList()"
               suffix-icon="iconfont iconSearch"/>
           </template>
diff --git a/packages/wechat/AppInterview/AppInterview.vue b/packages/wechat/AppInterview/AppInterview.vue
index efdca451..2ed746f5 100644
--- a/packages/wechat/AppInterview/AppInterview.vue
+++ b/packages/wechat/AppInterview/AppInterview.vue
@@ -29,7 +29,7 @@
                 v-model="search.title"
                 placeholder="标题"
                 clearable
-                @keyup.enter.native="page.current = 1, getTableData()"
+                v-throttle="() => {page.current = 1, getTableData()}"
                 @clear="page.current = 1, search.title = '', getTableData()"
                 size="small"/>
           </template>
diff --git a/packages/wechat/AppJob/components/JobList.vue b/packages/wechat/AppJob/components/JobList.vue
index 68e3771c..139fb7ee 100644
--- a/packages/wechat/AppJob/components/JobList.vue
+++ b/packages/wechat/AppJob/components/JobList.vue
@@ -10,7 +10,7 @@
             v-model="search.title"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, search.title, getList()"
+            v-throttle="() => {search.current=1,getList()}"
             placeholder="请输入标题"
             clearable
             @clear="search.current = 1, search.title = '', getList()"
diff --git a/packages/wechat/AppJob/components/List.vue b/packages/wechat/AppJob/components/List.vue
index 82a3ab6c..59701896 100644
--- a/packages/wechat/AppJob/components/List.vue
+++ b/packages/wechat/AppJob/components/List.vue
@@ -23,7 +23,7 @@
           </template>
 
           <!-- 搜索 -->
-          <template slot="right"> <el-input v-model="searchObj.title" size="small" placeholder="请输入单位名称" clearable @keyup.enter.native=";(page.current = 1), getList()" @clear=";(page.current = 1), (searchObj.title = ''), getList()" suffix-icon="iconfont iconSearch"/></template>
+          <template slot="right"> <el-input v-model="searchObj.title" size="small" placeholder="请输入单位名称" clearable v-throttle="() => {page.current = 1, getList()}" @clear=";(page.current = 1), (searchObj.title = ''), getList()" suffix-icon="iconfont iconSearch"/></template>
         </ai-search-bar>
 
         <ai-search-bar style="margin-top: 16px;">
diff --git a/packages/wechat/AppNotification/components/noticeManage.vue b/packages/wechat/AppNotification/components/noticeManage.vue
index 78792f8f..0d1b978c 100644
--- a/packages/wechat/AppNotification/components/noticeManage.vue
+++ b/packages/wechat/AppNotification/components/noticeManage.vue
@@ -21,7 +21,7 @@
             <el-input
                 v-model="search.title"
                 size="small"
-                @keyup.enter.native="search.current = 1, getList()"
+                v-throttle="() => {search.current = 1, getList()}"
                 placeholder="标题"
                 clearable
                 @clear="search.current = 1, search.title = '', getList()"
diff --git a/packages/wechat/AppPressCenter/components/commentList.vue b/packages/wechat/AppPressCenter/components/commentList.vue
index 6067cdea..cfd6c7b2 100644
--- a/packages/wechat/AppPressCenter/components/commentList.vue
+++ b/packages/wechat/AppPressCenter/components/commentList.vue
@@ -8,7 +8,7 @@
             size="small"
             placeholder="搜索内容/用户"
             clearable
-            @keyup.enter.native="page.current = 1, getList()"
+            v-throttle="() => {page.current = 1, getList()}"
             @clear="page.current = 1, searchObj.title = '', getList()"
             suffix-icon="iconfont iconSearch" />
         </template>
diff --git a/packages/wechat/AppPressCenter/components/newsList.vue b/packages/wechat/AppPressCenter/components/newsList.vue
index 936f9167..a64b19f4 100644
--- a/packages/wechat/AppPressCenter/components/newsList.vue
+++ b/packages/wechat/AppPressCenter/components/newsList.vue
@@ -16,7 +16,7 @@
               size="small"
               placeholder="搜索标题/发布地区"
               clearable
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
               @clear="page.current = 1, searchObj.title = '', getList()"
               suffix-icon="iconfont iconSearch"/>
         </template>
diff --git a/packages/wechat/AppProjectActivities/components/Event.vue b/packages/wechat/AppProjectActivities/components/Event.vue
index 11f7a5cf..08542643 100644
--- a/packages/wechat/AppProjectActivities/components/Event.vue
+++ b/packages/wechat/AppProjectActivities/components/Event.vue
@@ -11,7 +11,7 @@
             size="small"
             clearable
             v-model="search.title"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             @clear="search.current = 1, search.title = '', getList()"
             suffix-icon="iconfont iconSearch" />
         </template>
diff --git a/packages/wechat/AppResidentGroupManage/components/List.vue b/packages/wechat/AppResidentGroupManage/components/List.vue
index 05561119..ffa72471 100644
--- a/packages/wechat/AppResidentGroupManage/components/List.vue
+++ b/packages/wechat/AppResidentGroupManage/components/List.vue
@@ -22,7 +22,7 @@
             v-model="search.name"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入群主/群名称"
             clearable
             @change="getList"
diff --git a/packages/wechat/AppResidentManage/components/List.vue b/packages/wechat/AppResidentManage/components/List.vue
index 1d58e009..f74d5de9 100644
--- a/packages/wechat/AppResidentManage/components/List.vue
+++ b/packages/wechat/AppResidentManage/components/List.vue
@@ -28,7 +28,7 @@
             v-model="search.name"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入备注、昵称、姓名"
             clearable
             @change="getList"
diff --git a/packages/wechat/AppVillageCode/components/Add.vue b/packages/wechat/AppVillageCode/components/Add.vue
index 299235c3..2734dbff 100644
--- a/packages/wechat/AppVillageCode/components/Add.vue
+++ b/packages/wechat/AppVillageCode/components/Add.vue
@@ -12,7 +12,7 @@
               <span style="color: #666;">{{ form.areaName }}</span>
             </el-form-item>
             <el-form-item label="二维码名称" prop="codeName" :rules="[{ required: true, message: '请输入二维码名称', trigger: 'blur' }]">
-              <el-input size="small" placeholder="请输入二维码名称" style="width: 328px;" v-model="form.codeName"></el-input>
+              <el-input size="small" maxlength="30" show-word-limit placeholder="请输入二维码名称" style="width: 328px;" v-model="form.codeName"></el-input>
             </el-form-item>
             <el-form-item style="width: 100%;" label="二维码类型" prop="type" :rules="[{ required: true, message: '请选择二维码类型', trigger: 'change' }]">
               <el-radio-group v-model="form.type">
@@ -55,14 +55,11 @@
           codeUrl: [],
           type: '',
         },
-        id: '',
-        areaList: []
+        id: ''
       }
     },
 
     created () {
-      this.getAreaList()
-
       if (this.params && this.params.areaId && !this.params.id) {
         this.form.areaId = this.params.areaId
         this.form.areaName = this.params.areaName
@@ -86,19 +83,6 @@
         })
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data.map(item => {
-              item.dictName = item.name
-              item.dictValue = item.id
-
-              return item
-            })
-          }
-        })
-      },
-
       onClose () {
         this.form.explain = ''
       },
diff --git a/packages/wechat/AppVillageCode/components/List.vue b/packages/wechat/AppVillageCode/components/List.vue
index eee818c7..9f0aa0cc 100644
--- a/packages/wechat/AppVillageCode/components/List.vue
+++ b/packages/wechat/AppVillageCode/components/List.vue
@@ -106,7 +106,6 @@
           label: 'name'
         },
         currIndex: -1,
-        areaList: [],
         total: 10,
         colConfigs: [
           {prop: 'codeName', label: '名称', align: 'left'},
@@ -141,7 +140,6 @@
       this.search.areaId = this.user.info.areaId
       this.areaName = this.user.info.areaName
       this.getTree()
-      this.getAreaList()
       this.getList()
 
       this.$nextTick(() => {
@@ -211,14 +209,6 @@
         }
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data
-          }
-        })
-      },
-
       remove(id) {
         this.$confirm('确定删除该数据？').then(() => {
           this.instance.post(`/app/appeveryvillagecode/delete?ids=${id}`).then(res => {
diff --git a/packages/wechat/AppVillageInfo/components/Event.vue b/packages/wechat/AppVillageInfo/components/Event.vue
index b350ad61..abdd3764 100644
--- a/packages/wechat/AppVillageInfo/components/Event.vue
+++ b/packages/wechat/AppVillageInfo/components/Event.vue
@@ -11,7 +11,7 @@
             size="small"
             clearable
             v-model="search.title"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             @clear="search.current = 1, search.title = '', getList()"
             suffix-icon="iconfont iconSearch" />
         </template>
diff --git a/packages/wechat/AppWhereabouts/AppWhereabouts.vue b/packages/wechat/AppWhereabouts/AppWhereabouts.vue
index aef4d9f6..5421efb5 100644
--- a/packages/wechat/AppWhereabouts/AppWhereabouts.vue
+++ b/packages/wechat/AppWhereabouts/AppWhereabouts.vue
@@ -25,7 +25,8 @@
             </template>
             <template #right>
               <el-input suffix-icon="iconfont iconSearch" v-model="search.name" placeholder="姓名/手机号码" clearable
-                        @change="page.current=1,getTableData()" size="small"/>
+                      @clear="page.current = 1,search.name = '', getTableData()"
+                        v-throttle="() => {page.current = 1, getTableData()}" size="small"/>
             </template>
           </ai-search-bar>
 
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/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
new file mode 100644
index 00000000..d9f9c3bc
--- /dev/null
+++ b/project/oms/apps/AppArticles/components/Add.vue
@@ -0,0 +1,227 @@
+<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,
+    instance: Function,
+    areaId: String
+  },
+
+  data() {
+    return {
+      form: {
+        title: '',
+        type: '',
+        content: '',
+        fileIds: [],
+        thumbUrl: []
+      },
+      fileList: [],
+      isDetail: true,
+      cropOps: {
+        width: "336px",
+        height: "210px"
+      }
+    }
+  },
+
+  computed: {
+    ...mapState(['user']),
+    params() {
+      return this.$route.query
+    }
+  },
+
+  created() {
+    if (this.params && this.params.id) {
+      this.getInfo()
+    }
+  },
+
+  methods: {
+    onBack() {
+      this.$router.push({})
+    },
+
+    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)
+            }
+          })
+        }
+      })
+    },
+  }
+}
+</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..a1a550bf
--- /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,
+  },
+
+  data() {
+    return {
+      info: {}
+    }
+  },
+  computed: {
+    params() {
+      return this.$route.query
+    }
+  },
+  mounted() {
+    this.getInfo()
+  },
+
+  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.$router.push({})
+    }
+  }
+}
+</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..58acab5a
--- /dev/null
+++ b/project/oms/apps/AppArticles/components/Event.vue
@@ -0,0 +1,269 @@
+<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="toAdd">添加</el-button>
+          </template>
+          <template slot="right">
+            <el-input
+                placeholder="请输入标题"
+                size="small"
+                clearable
+                v-model="search.title"
+                v-throttle="() => {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="toEdit(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() {
+      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()
+          }
+        })
+      })
+    },
+
+    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/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
new file mode 100644
index 00000000..d4bd515d
--- /dev/null
+++ b/project/oms/apps/AppCompany/components/List.vue
@@ -0,0 +1,222 @@
+<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) {
+      let {corpId} = item
+      this.$router.push({query: {corpId}, hash: "#sta"})
+    },
+  },
+  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..b10e11d0
--- /dev/null
+++ b/project/oms/apps/AppCompany/components/Statistics.vue
@@ -0,0 +1,380 @@
+<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,
+  },
+
+  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 || {}
+    }
+  },
+
+  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]
+            },
+            {
+              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.$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;
+}
+
+.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/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..22d048ed
--- /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"
+            v-throttle="() => {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>
diff --git a/project/oms/apps/AppLicense/AppLicense.vue b/project/oms/apps/AppLicense/AppLicense.vue
new file mode 100644
index 00000000..db1d1e23
--- /dev/null
+++ b/project/oms/apps/AppLicense/AppLicense.vue
@@ -0,0 +1,179 @@
+<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
+            @clear="page.current = 1,search.condition = '', getTableData()"
+                      v-throttle="() => {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..e449bc29
--- /dev/null
+++ b/project/oms/apps/AppSaas/AppSaas.vue
@@ -0,0 +1,198 @@
+<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
+             @clear="page.current = 1,search.condition = '', getTableData()"
+                      v-throttle="() => {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/project/sass/apps/AppAddressBook/components/Add.vue b/project/sass/apps/AppAddressBook/components/Add.vue
index 90f56987..d13bd75a 100644
--- a/project/sass/apps/AppAddressBook/components/Add.vue
+++ b/project/sass/apps/AppAddressBook/components/Add.vue
@@ -106,13 +106,11 @@
           id: ''
         },
         id: '',
-        tagsList: [],
-        areaList: []
+        tagsList: []
       }
     },
 
     created () {
-      this.getAreaList()
       this.getTags()
 
       if (this.params && this.params.departmentId && !this.params.id) {
@@ -162,19 +160,6 @@
         })
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data.map(item => {
-              item.dictName = item.name
-              item.dictValue = item.id
-
-              return item
-            })
-          }
-        })
-      },
-
       onClose () {
         this.form.explain = ''
       },
diff --git a/project/sass/apps/AppAddressBook/components/List.vue b/project/sass/apps/AppAddressBook/components/List.vue
index 0b0b0db9..1a0867da 100644
--- a/project/sass/apps/AppAddressBook/components/List.vue
+++ b/project/sass/apps/AppAddressBook/components/List.vue
@@ -106,7 +106,7 @@
           <el-input
               v-model="search.name"
               size="small"
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               placeholder="请输入成员姓名、手机号或标签名称"
               clearable
               @clear="search.current = 1, search.name = '', getList()"
diff --git a/project/sass/apps/AppAskForm/components/FormList.vue b/project/sass/apps/AppAskForm/components/FormList.vue
index 48c87112..bf425d50 100644
--- a/project/sass/apps/AppAskForm/components/FormList.vue
+++ b/project/sass/apps/AppAskForm/components/FormList.vue
@@ -22,7 +22,7 @@
             size="small"
             placeholder="请输入模板名称"
             clearable
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             @clear="search.current = 1, search.title = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
diff --git a/project/sass/apps/AppAskForm/components/Statistics.vue b/project/sass/apps/AppAskForm/components/Statistics.vue
index 5de65aa5..36042c0b 100644
--- a/project/sass/apps/AppAskForm/components/Statistics.vue
+++ b/project/sass/apps/AppAskForm/components/Statistics.vue
@@ -68,7 +68,7 @@
                   size="small"
                   placeholder="请输入居民名称"
                   clearable
-                  @keyup.enter.native="search.current = 1, getList()"
+                  v-throttle="() => {search.current = 1, getList()}"
                   @clear="search.current = 1, search.name = '', getList()"
                   suffix-icon="iconfont iconSearch">
                 </el-input>
diff --git a/project/sass/apps/AppAskForm/components/Template.vue b/project/sass/apps/AppAskForm/components/Template.vue
index ce72f773..a63ee951 100644
--- a/project/sass/apps/AppAskForm/components/Template.vue
+++ b/project/sass/apps/AppAskForm/components/Template.vue
@@ -16,7 +16,7 @@
             size="small"
             placeholder="请输入模板名称"
             clearable
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             @clear="search.current = 1, search.title = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
diff --git a/project/sass/apps/AppBuildManage/components/BuildMsg.vue b/project/sass/apps/AppBuildManage/components/BuildMsg.vue
index 3f9d71f4..1bf7a318 100644
--- a/project/sass/apps/AppBuildManage/components/BuildMsg.vue
+++ b/project/sass/apps/AppBuildManage/components/BuildMsg.vue
@@ -18,7 +18,7 @@
 
         <template #right>
           <el-input v-model="search.houseCode" size="small" placeholder="请输入户号/户主" clearable
-                    @keyup.enter.native=";(page.current = 1), getList()"
+                    v-throttle="() => {page.current = 1, getList()}"
                     @clear=";(page.current = 1), (search.houseCode = ''), getList()" suffix-icon="iconfont iconSearch"/>
         </template>
       </ai-search-bar>
diff --git a/project/sass/apps/AppBuildManage/components/List.vue b/project/sass/apps/AppBuildManage/components/List.vue
index bce00f89..e23efbff 100644
--- a/project/sass/apps/AppBuildManage/components/List.vue
+++ b/project/sass/apps/AppBuildManage/components/List.vue
@@ -16,7 +16,7 @@
 
           <!-- 搜索 -->
           <template slot="right">
-            <el-input v-model="search.managerName" size="small" placeholder="楼栋号/楼长/联系方式" clearable @keyup.enter.native=";(page.current = 1), getList()" @clear=";(page.current = 1), (search.managerName = ''), getList()" suffix-icon="iconfont iconSearch" />
+            <el-input v-model="search.managerName" size="small" placeholder="楼栋号/楼长/联系方式" clearable v-throttle="() => {page.current = 1, getList()}" @clear=";(page.current = 1), (search.managerName = ''), getList()" suffix-icon="iconfont iconSearch" />
           </template>
         </ai-search-bar>
 
diff --git a/project/sass/apps/AppCarousel/AppCarousel.vue b/project/sass/apps/AppCarousel/AppCarousel.vue
index c18aa9f6..67679cef 100644
--- a/project/sass/apps/AppCarousel/AppCarousel.vue
+++ b/project/sass/apps/AppCarousel/AppCarousel.vue
@@ -11,7 +11,7 @@
           </template>
           <template slot="right">
             <el-input v-model="search.title" size="small" placeholder="搜索标题" clearable
-                      @keyup.enter.native=";(page.current = 1), getList()"
+                      v-throttle="() => {page.current = 1, getList()}"
                       @clear=";(page.current = 1), (search.title = ''), getList()" suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
diff --git a/project/sass/apps/AppConvenienceAddressBook/components/List.vue b/project/sass/apps/AppConvenienceAddressBook/components/List.vue
index 3e144cb0..135d3038 100644
--- a/project/sass/apps/AppConvenienceAddressBook/components/List.vue
+++ b/project/sass/apps/AppConvenienceAddressBook/components/List.vue
@@ -19,7 +19,7 @@
             v-model="search.name"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入名称/电话"
             clearable
             @change="getList"
diff --git a/project/sass/apps/AppGridBlock/components/list.vue b/project/sass/apps/AppGridBlock/components/list.vue
index 7fea9f0c..f6673505 100644
--- a/project/sass/apps/AppGridBlock/components/list.vue
+++ b/project/sass/apps/AppGridBlock/components/list.vue
@@ -7,14 +7,14 @@
       <template slot="left">
         <ai-tree-menu title="网格层级" @search="(v) => $refs.tree.filter(v)">
           <el-tree
-            :data="treeObj.treeList"
-            :props="treeObj.defaultProps"
-            @node-click="handleNodeClick"
-            node-key="id"
-            ref="tree"
-            :filter-node-method="filterNode"
-            default-expand-all
-            highlight-current
+              :data="treeObj.treeList"
+              :props="treeObj.defaultProps"
+              @node-click="handleNodeClick"
+              node-key="id"
+              ref="tree"
+              :filter-node-method="filterNode"
+              default-expand-all
+              highlight-current
           />
         </ai-tree-menu>
       </template>
@@ -22,62 +22,63 @@
         <ai-search-bar>
           <template slot="left">
             <el-date-picker
-              v-model="searchObj.createTimeStr"
-              type="date"
-              @change="(page.current = 1), getList()"
-              value-format="yyyy-MM-dd"
-              size="small"
-              placeholder="创建时间"
+                v-model="searchObj.createTimeStr"
+                type="date"
+                @change="(page.current = 1), getList()"
+                value-format="yyyy-MM-dd"
+                size="small"
+                placeholder="创建时间"
             >
             </el-date-picker>
           </template>
           <template slot="right">
             <el-input
-              v-model="searchObj.girdName"
-              size="small"
-              placeholder="输入网格名称"
-              @keyup.enter.native="(page.current = 1), getList()"
-              clearable
-              @clear="(searchObj.girdName = '', page.current = 1), getList()"
-              suffix-icon="iconfont iconSearch"
+                v-model="searchObj.girdName"
+                size="small"
+                placeholder="输入网格名称"
+                @keyup.enter.native="(page.current = 1), getList()"
+                clearable
+                @clear="(searchObj.girdName = '', page.current = 1), getList()"
+                suffix-icon="iconfont iconSearch"
             />
           </template>
         </ai-search-bar>
         <ai-search-bar bottomBorder>
           <template slot="left">
             <el-button
-              type="primary"
-              icon="iconfont iconAdd"
-              :disabled="info.girdLevel === '3'"
-              @click="(isEdit = false), toAdd()"
-              >新增
+                type="primary"
+                icon="iconfont iconAdd"
+                :disabled="info.girdLevel === '3'"
+                @click="(isEdit = false), toAdd()"
+            >新增
             </el-button>
             <el-button
-              icon="iconfont iconDelete"
-              @click="deleteById(ids.join(','))"
-              :disabled="!Boolean(ids.length)"
+                icon="iconfont iconDelete"
+                @click="deleteById(ids.join(','))"
+                :disabled="!Boolean(ids.length)"
             >
               删除
             </el-button>
             <ai-download
-              :instance="instance"
-              url="/app/appgirdinfo/exportGirdInfo"
-              :params="{ ...searchObj, ids: ids.join(',') }"
-              fileName="网格区块"
+                :instance="instance"
+                url="/app/appgirdinfo/exportGirdInfo"
+                :params="{ ...searchObj, ids: ids.join(',') }"
+                fileName="网格区块"
             >
               <el-button icon="iconfont iconExported" size="small"
-                >导出全部</el-button
+              >导出全部
+              </el-button
               >
             </ai-download>
             <ai-import
-              ref="import"
-              title="导入"
-              name="网格区块"
-              url="/app/appgirdinfo/downloadGirdInfo"
-              importUrl="/app/appgirdinfo/importGirdInfo"
-              suffixName="xlsx"
-              :customCliker="true"
-              :instance="instance"
+                ref="import"
+                title="导入"
+                name="网格区块"
+                url="/app/appgirdinfo/downloadGirdInfo"
+                importUrl="/app/appgirdinfo/importGirdInfo"
+                suffixName="xlsx"
+                :customCliker="true"
+                :instance="instance"
             >
               <template slot="tips">
                 <p>
@@ -85,49 +86,51 @@
                 </p>
               </template>
               <el-button size="small" icon="iconfont iconImport"
-                >导入</el-button
+              >导入
+              </el-button
               >
             </ai-import>
           </template>
         </ai-search-bar>
         <ai-table
-          class="mt10"
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="page.total"
-          ref="aitableex"
-          :current.sync="page.current"
-          :size.sync="page.size"
-          @selection-change="(v) => (ids = v.map((e) => e.id))"
-          @getList="getList()"
+            class="mt10"
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="page.total"
+            ref="aitableex"
+            :current.sync="page.current"
+            :size.sync="page.size"
+            @selection-change="(v) => (ids = v.map((e) => e.id))"
+            @getList="getList()"
         >
           <el-table-column
-            slot="selectId"
-            type="selection"
-            align="center"
-            width="40"
+              slot="selectId"
+              type="selection"
+              align="center"
+              width="40"
           >
           </el-table-column>
           <el-table-column
-            label="网格员"
-            slot="user"
-            align="center"
-            fixed="right"
-            width="160">
+              label="网格员"
+              slot="user"
+              align="center"
+              fixed="right"
+              width="160">
             <template slot-scope="{ row }">
               <div class="flex-box">
                 <div v-for="(item, index) in row.girdMemberNames" v-show="index < 3" :key="index">
-                  <AiOpenData type="userName" :openid="item"></AiOpenData><span v-if="index < 2 && index < row.girdMemberNames.length - 1">、</span>
+                  <AiOpenData type="userName" :openid="item"></AiOpenData>
+                  <span v-if="index < 2 && index < row.girdMemberNames.length - 1">、</span>
                 </div>
               </div>
             </template>
           </el-table-column>
           <el-table-column
-            label="操作"
-            slot="options"
-            align="center"
-            fixed="right"
-            width="160">
+              label="操作"
+              slot="options"
+              align="center"
+              fixed="right"
+              width="160">
             <template slot-scope="{ row }">
               <div class="table-options">
                 <el-button type="text" @click="see(row)">编辑</el-button>
@@ -140,43 +143,45 @@
       </template>
     </ai-list>
     <ai-dialog
-      title="网格范围"
-      :visible.sync="showMap"
-      :customFooter="true"
-      :destroyOnClose="true"
-      border
-      width="850px"
+        title="网格范围"
+        :visible.sync="showMap"
+        :customFooter="true"
+        :destroyOnClose="true"
+        border
+        width="850px"
     >
       <div class="map">
         <div class="tipinput">
           <el-input
-            v-if="editRow.plottingStatus == 0"
-            v-model="searchAddress"
-            @change="addressChange"
-            clearable
-            placeholder="请输入关键字"
-            id="tipinput"
-            size="medium"
-            style="width: 200px"
+              v-if="editRow.plottingStatus == 0"
+              v-model="searchAddress"
+              @change="addressChange"
+              clearable
+              placeholder="请输入关键字"
+              id="tipinput"
+              size="medium"
+              style="width: 200px"
           ></el-input>
         </div>
         <div id="panel" v-if="editRow.plottingStatus == 0"></div>
         <div class="container" id="container"></div>
         <el-button-group
-          style="margin-top: 8px"
-          v-if="editRow.plottingStatus == 1"
+            style="margin-top: 8px"
+            v-if="editRow.plottingStatus == 1"
         >
           <el-button type="primary" size="mini" @click="beginPoltting()"
-            >开始编辑</el-button
+          >开始编辑
+          </el-button
           >
           <el-button size="mini" @click="finishPoltting()">结束编辑</el-button>
         </el-button-group>
         <el-button-group
-          style="margin-top: 8px"
-          v-if="editRow.plottingStatus == 0"
+            style="margin-top: 8px"
+            v-if="editRow.plottingStatus == 0"
         >
           <el-button size="mini" @click="draw('polygon')"
-            >开始绘制多边形</el-button
+          >开始绘制多边形
+          </el-button
           >
           <!-- <el-button  size="mini" @click="close()">关闭绘制</el-button> -->
           <el-button size="mini" @click="clear()">清除绘制</el-button>
@@ -185,7 +190,8 @@
       <div class="dialog-footer" slot="footer">
         <el-button size="medium" @click="showMap = false">取消</el-button>
         <el-button type="primary" size="medium" @click="confirm()"
-          >确认</el-button
+        >确认
+        </el-button
         >
       </div>
     </ai-dialog>
@@ -197,7 +203,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
 import Template from '../../../../../packages/wechat/AppAskForm/components/Template.vue';
 
 export default {
-  components: { Template },
+  components: {Template},
   name: "List",
   label: "网格区块",
   props: {
@@ -253,7 +259,7 @@ export default {
     colConfigs() {
       let _ = this;
       return [
-        { type: 'selection'},
+        {type: 'selection'},
         {
           prop: "girdName",
           align: "left",
@@ -268,7 +274,7 @@ export default {
           prop: "girdType",
           align: "center",
           label: "网格类型",
-          render(h, { row }) {
+          render(h, {row}) {
             return h("span", {}, _.dict.getLabel("girdType", row.girdType) || '-');
           },
         },
@@ -276,7 +282,7 @@ export default {
           prop: "girdLevel",
           align: "center",
           label: "网格层级",
-          render(h, { row }) {
+          render(h, {row}) {
             return h("span", {}, _.dict.getLabel("girdLevel", row.girdLevel) || '-');
           },
         },
@@ -284,15 +290,15 @@ export default {
           prop: "plottingStatus",
           align: "center",
           label: "标绘状态",
-          render(h, { row }) {
+          render(h, {row}) {
             return h(
-              "span",
-              {
-                style: {
-                  color: _.dict.getColor("plottingStatus", row.plottingStatus),
+                "span",
+                {
+                  style: {
+                    color: _.dict.getColor("plottingStatus", row.plottingStatus),
+                  },
                 },
-              },
-              _.dict.getLabel("plottingStatus", row.plottingStatus)
+                _.dict.getLabel("plottingStatus", row.plottingStatus)
             );
           },
         },
@@ -300,7 +306,7 @@ export default {
           prop: "createTime",
           align: "center",
           label: "创建时间",
-          render(h, { row }) {
+          render(h, {row}) {
             return h("span", {}, row.createTime.substring(0, 11));
           },
         },
@@ -309,41 +315,41 @@ export default {
           align: "center",
           slot: 'user',
           width: 200,
-          label: "网格员", 
+          label: "网格员",
         },
       ];
     },
   },
   methods: {
-    getCorpLocation(){
-      this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res=>{
-        if(res.code==0){
+    getCorpLocation() {
+      this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res => {
+        if (res.code == 0) {
           this.location = res.data
         }
       })
     },
     handleNodeClick(val) {
-      this.info = { ...val };
+      this.info = {...val};
       this.searchId = val.id;
       this.getList();
     },
     getTreeList() {
       this.instance
-        .post("/app/appgirdinfo/listByTop", null, null)
-        .then((res) => {
-          if (res.code == 0) {
-            this.treeObj.treeList = [...res.data];
+      .post("/app/appgirdinfo/listByTop", null, null)
+      .then((res) => {
+        if (res.code == 0) {
+          this.treeObj.treeList = [...res.data];
 
-            this.$nextTick(() => {
-              if (this.treeObj.treeList.length && !this.info.girdLevel) {
-                this.$refs.tree.setCurrentKey(this.treeObj.treeList[0].id)
-                this.info = { ...this.treeObj.treeList[0] };
-              } else {
-                this.$refs.tree.setCurrentKey(this.info.id)
-              }
-            })
-          }
-        });
+          this.$nextTick(() => {
+            if (this.treeObj.treeList.length && !this.info.girdLevel) {
+              this.$refs.tree.setCurrentKey(this.treeObj.treeList[0].id)
+              this.info = {...this.treeObj.treeList[0]};
+            } else {
+              this.$refs.tree.setCurrentKey(this.info.id)
+            }
+          })
+        }
+      });
     },
     filterNode(value, data) {
       if (!value) return true;
@@ -351,64 +357,66 @@ export default {
     },
     deleteById(ids) {
       ids &&
-        this.$confirm("是否要删除该网格区块？", {
-          type: "error",
+      this.$confirm("是否要删除该网格区块？", {
+        type: "error",
+      })
+      .then(() => {
+        this.instance
+        .post("/app/appgirdinfo/delete", null, {
+          params: {ids},
         })
-          .then(() => {
-            this.instance
-              .post("/app/appgirdinfo/delete", null, {
-                params: { ids },
-              })
-              .then((res) => {
-                if (res?.code == 0) {
-                  this.$message.success("删除成功!");
+        .then((res) => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功!");
 
-                  this.getList();
-                }
-              });
-          })
-          .catch(() => {});
+            this.getList();
+          }
+        });
+      })
+      .catch(() => {
+      });
     },
     deleteTree(ids) {
       ids &&
-        this.$confirm("是否要删除该网格区块？", {
-          type: "error",
+      this.$confirm("是否要删除该网格区块？", {
+        type: "error",
+      })
+      .then(() => {
+        this.instance
+        .post("/app/appgirdinfo/delete", null, {
+          params: {ids},
         })
-          .then(() => {
-            this.instance
-              .post("/app/appgirdinfo/delete", null, {
-                params: { ids },
-              })
-              .then((res) => {
-                if (res?.code == 0) {
-                  this.$message.success("删除成功!");
+        .then((res) => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功!");
 
-                  this.getTreeList();
-                }
-              });
-          })
-          .catch(() => {});
+            this.getTreeList();
+          }
+        });
+      })
+      .catch(() => {
+      });
     },
     getList() {
       this.instance
-        .post("/app/appgirdinfo/list", null, {
-          params: {
-            ...this.searchObj,
-            ...this.page,
-            parentGirdId: this.info.girdLevel === '0' ? '' : this.searchId,
-          },
-        })
-        .then((res) => {
-          if (res?.data) {
-            this.tableData = res.data.records.map(v => {
-              return {
-                ...v,
-                girdMemberNames: v.girdMemberNames ? v.girdMemberNames.split(',') : []
-              }
-            });
-            this.page.total = res.data.total;
-          }
-        });
+      .post("/app/appgirdinfo/list", null, {
+        params: {
+          ...this.searchObj,
+          ...this.page,
+          parentGirdId: this.info.girdLevel === '0' ? '' : this.searchId,
+        },
+      })
+      .then((res) => {
+        if (res?.data) {
+          this.tableData = res.data.records.map(v => {
+            return {
+              ...v,
+              girdMemberNames: v.girdMemberNames ? v.girdMemberNames.split(',') : []
+            }
+          });
+          this.page.total = res.data.total;
+        }
+      });
     },
     handleSelectionChange(val) {
       this.ids = [];
@@ -418,7 +426,7 @@ export default {
     },
     //添加二级网格
     addTwoLevel() {
-      this.info = { ...this.treeObj.treeList[0] };
+      this.info = {...this.treeObj.treeList[0]};
       this.toAdd()
     },
     toAdd() {
@@ -437,7 +445,7 @@ export default {
     },
     poltting(row) {
       this.showMap = true;
-      this.editRow = { ...row };
+      this.editRow = {...row};
       AMapLoader.load({
         key: "b553334ba34f7ac3cd09df9bc8b539dc", // 申请好的Web端开发者Key，首次调用 load 时必填
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
@@ -448,52 +456,52 @@ export default {
           plugins: [], // 需要加载的 AMapUI ui插件
         },
       })
-        .then((AMap) => {
-          this.map = new AMap.Map("container", {
-            resizeEnable: true,
-            zoom: 14,
-          });
-          if (this.editRow.plottingStatus == 1) {
-            let path = [];
-            this.editRow.points.map((e, index) => {
-              path[index] = [e.lng, e.lat];
-            });
-            let polygon = new AMap.Polygon({
-              path: path,
-              strokeColor: "#FF33FF",
-              strokeWeight: 6,
-              strokeOpacity: 0.2,
-              fillOpacity: 0.4,
-              fillColor: "#1791fc",
-              zIndex: 50,
-              bubble: true,
-            });
-            this.map.add([polygon]);
-            this.map.setFitView();
-            this.polyEditor = new AMap.PolygonEditor(this.map, polygon);
-          } else {
-            this.mouseTool = new AMap.MouseTool(this.map);
-            this.placeSearch = new AMap.PlaceSearch({
-              pageSize: 3, // 单页显示结果条数
-              pageIndex: 1, // 页码
-              city: "", // 兴趣点城市
-              citylimit: false, //是否强制限制在设置的城市内搜索
-              map: this.map, // 展现结果的地图实例
-              panel: "panel", // 结果列表将在此容器中进行展示。
-              autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-            });
-            // this.map.setZoomAndCenter(14, [this.location.lng, this.location.lat], false, 600);
-            this.eventOn();
-          }
-        })
-        .catch((e) => {
-          console.log(e);
+      .then((AMap) => {
+        this.map = new AMap.Map("container", {
+          resizeEnable: true,
+          zoom: 14,
         });
+        if (this.editRow.plottingStatus == 1) {
+          let path = [];
+          this.editRow.points.map((e, index) => {
+            path[index] = [e.lng, e.lat];
+          });
+          let polygon = new AMap.Polygon({
+            path: path,
+            strokeColor: "#FF33FF",
+            strokeWeight: 6,
+            strokeOpacity: 0.2,
+            fillOpacity: 0.4,
+            fillColor: "#1791fc",
+            zIndex: 50,
+            bubble: true,
+          });
+          this.map.add([polygon]);
+          this.map.setFitView();
+          this.polyEditor = new AMap.PolygonEditor(this.map, polygon);
+        } else {
+          this.mouseTool = new AMap.MouseTool(this.map);
+          this.placeSearch = new AMap.PlaceSearch({
+            pageSize: 3, // 单页显示结果条数
+            pageIndex: 1, // 页码
+            city: "", // 兴趣点城市
+            citylimit: false, //是否强制限制在设置的城市内搜索
+            map: this.map, // 展现结果的地图实例
+            panel: "panel", // 结果列表将在此容器中进行展示。
+            autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+          });
+          // this.map.setZoomAndCenter(14, [this.location.lng, this.location.lat], false, 600);
+          this.eventOn();
+        }
+      })
+      .catch((e) => {
+        console.log(e);
+      });
     },
     see(row) {
-      this.info = { ...row };
+      this.info = {...row};
       this.isEdit = true;
-     this.toAdd()
+      this.toAdd()
     },
     draw(type) {
       switch (type) {
@@ -560,39 +568,35 @@ export default {
       let path = [];
       if (this.editRow.plottingStatus == 1) {
         this.polyEditor
-          .getTarget()
-          .getPath()
-          .map((e) => {
-            path.push({ lng: e.lng, lat: e.lat });
-          });
+        .getTarget()
+        .getPath()
+        .map((e) => {
+          path.push({lng: e.lng, lat: e.lat});
+        });
       } else {
         path = [...this.path];
       }
       delete this.editRow.points;
-      this.instance
-        .post(
-          `/app/appgirdinfo/addOrUpdate`,
-          {
-            ...this.editRow,
-            points: path,
-          },
-          null
-        )
-        .then((res) => {
-          if (res.code == 0) {
-            this.getList();
-            this.showMap = false;
-          }
-        });
+      let {girdMemberNames} = this.editRow
+      this.instance.post(`/app/appgirdinfo/addOrUpdate`, {
+        ...this.editRow,
+        points: path,
+        girdMemberNames: girdMemberNames?.toString()
+      }).then((res) => {
+        if (res.code == 0) {
+          this.getList();
+          this.showMap = false;
+        }
+      });
     },
     eventOn() {
       this.path = [];
       this.overlays = [];
       this.map.on("mousemove", this.showInfoMove, this);
-      this.mouseTool.on("draw", ({ type, obj }) => {
+      this.mouseTool.on("draw", ({type, obj}) => {
         obj.getPath().map((e) => {
           console.log(e)
-          this.path.push({ lat: e.getLat(), lng: e.getLng() });
+          this.path.push({lat: e.getLat(), lng: e.getLng()});
         });
         this.overlays.push(obj);
       });
@@ -611,11 +615,12 @@ export default {
 .app-grid-block {
   width: 100%;
   height: 100%;
+
   ::v-deep .el-tree {
     background: transparent;
 
     .el-tree-node__expand-icon.is-leaf {
-      color: transparent!important;
+      color: transparent !important;
     }
 
     .el-tree-node__content > .el-tree-node__expand-icon {
@@ -648,7 +653,7 @@ export default {
       }
 
       background: #2266FF;
-      
+
       span {
         color: #fff;
       }
diff --git a/project/sass/apps/AppGridMember/components/Family.vue b/project/sass/apps/AppGridMember/components/Family.vue
index 9af0f4ed..99c69374 100644
--- a/project/sass/apps/AppGridMember/components/Family.vue
+++ b/project/sass/apps/AppGridMember/components/Family.vue
@@ -23,7 +23,7 @@
             v-model="search.name"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="姓名/身份证/联系方式"
             clearable
             @clear="search.current = 1, search.name = '', getList()"
diff --git a/project/sass/apps/AppHealthReport/components/List.vue b/project/sass/apps/AppHealthReport/components/List.vue
index 5ab6dc24..83ba0154 100644
--- a/project/sass/apps/AppHealthReport/components/List.vue
+++ b/project/sass/apps/AppHealthReport/components/List.vue
@@ -10,7 +10,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
diff --git a/project/sass/apps/AppHomesteadManagement/components/List.vue b/project/sass/apps/AppHomesteadManagement/components/List.vue
index 43fb30c7..dbb07d69 100644
--- a/project/sass/apps/AppHomesteadManagement/components/List.vue
+++ b/project/sass/apps/AppHomesteadManagement/components/List.vue
@@ -12,7 +12,7 @@
 
           <!-- 搜索 -->
           <template slot="right">
-            <el-input v-model="search.name" size="small" placeholder="户主/联系电话" clearable @keyup.enter.native=";(page.current = 1), getList()" @clear=";(page.current = 1), (search.name = ''), getList()" suffix-icon="iconfont iconSearch" />
+            <el-input v-model="search.name" size="small" placeholder="户主/联系电话" clearable v-throttle="() => {page.current = 1, getList()}" @clear=";(page.current = 1), (search.name = ''), getList()" suffix-icon="iconfont iconSearch" />
           </template>
         </ai-search-bar>
 
diff --git a/project/sass/apps/AppInterview/AppInterview.vue b/project/sass/apps/AppInterview/AppInterview.vue
index 2c69d238..eef5528e 100644
--- a/project/sass/apps/AppInterview/AppInterview.vue
+++ b/project/sass/apps/AppInterview/AppInterview.vue
@@ -28,7 +28,7 @@
                 v-model="search.title"
                 placeholder="标题"
                 clearable
-                @keyup.enter.native="page.current = 1, getTableData()"
+                v-throttle="() => {page.current = 1, getTableData()}"
                 @clear="page.current = 1, search.title = '', getTableData()"
                 size="small"/>
           </template>
diff --git a/project/sass/apps/AppNotification/components/noticeManage.vue b/project/sass/apps/AppNotification/components/noticeManage.vue
index 665d3394..f3ef3750 100644
--- a/project/sass/apps/AppNotification/components/noticeManage.vue
+++ b/project/sass/apps/AppNotification/components/noticeManage.vue
@@ -21,7 +21,7 @@
             <el-input
               v-model="search.title"
               size="small"
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               placeholder="标题"
               clearable
               @clear="search.current = 1, search.title = '', getList()"
diff --git a/project/sass/apps/AppReportAiWill/components/List.vue b/project/sass/apps/AppReportAiWill/components/List.vue
index 8ab3e4c1..8969d85f 100644
--- a/project/sass/apps/AppReportAiWill/components/List.vue
+++ b/project/sass/apps/AppReportAiWill/components/List.vue
@@ -19,7 +19,7 @@
             v-model="search.content"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="请输入内容描述"
             clearable
             @change="getList"
diff --git a/project/sass/apps/AppReturnHomeRegister/components/List.vue b/project/sass/apps/AppReturnHomeRegister/components/List.vue
index 795042bd..cdf6cd37 100644
--- a/project/sass/apps/AppReturnHomeRegister/components/List.vue
+++ b/project/sass/apps/AppReturnHomeRegister/components/List.vue
@@ -55,7 +55,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
diff --git a/project/sass/apps/AppRiskArea/components/List.vue b/project/sass/apps/AppRiskArea/components/List.vue
index 6033e6c1..4835fcac 100644
--- a/project/sass/apps/AppRiskArea/components/List.vue
+++ b/project/sass/apps/AppRiskArea/components/List.vue
@@ -20,7 +20,7 @@
             v-model="search.province"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
             placeholder="省级名称/市级名称/区级名称"
             clearable
             @clear="search.current = 1, search.province = '', getList()"
diff --git a/project/sass/apps/AppSpecialAdjustment/components/List.vue b/project/sass/apps/AppSpecialAdjustment/components/List.vue
index 5ce9dac1..621dab5d 100644
--- a/project/sass/apps/AppSpecialAdjustment/components/List.vue
+++ b/project/sass/apps/AppSpecialAdjustment/components/List.vue
@@ -14,7 +14,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
diff --git a/project/sass/apps/AppSpecialDisabled/components/List.vue b/project/sass/apps/AppSpecialDisabled/components/List.vue
index 644c0655..b367accc 100644
--- a/project/sass/apps/AppSpecialDisabled/components/List.vue
+++ b/project/sass/apps/AppSpecialDisabled/components/List.vue
@@ -14,7 +14,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
diff --git a/project/sass/apps/AppSpecialDrug/components/List.vue b/project/sass/apps/AppSpecialDrug/components/List.vue
index 4894de01..2b6e7623 100644
--- a/project/sass/apps/AppSpecialDrug/components/List.vue
+++ b/project/sass/apps/AppSpecialDrug/components/List.vue
@@ -14,7 +14,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
diff --git a/project/sass/apps/AppSpecialMental/components/List.vue b/project/sass/apps/AppSpecialMental/components/List.vue
index ca2d4f05..044c85d9 100644
--- a/project/sass/apps/AppSpecialMental/components/List.vue
+++ b/project/sass/apps/AppSpecialMental/components/List.vue
@@ -14,7 +14,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
diff --git a/project/sass/apps/AppSpecialPrison/components/List.vue b/project/sass/apps/AppSpecialPrison/components/List.vue
index 09f1c63b..630d8f7b 100644
--- a/project/sass/apps/AppSpecialPrison/components/List.vue
+++ b/project/sass/apps/AppSpecialPrison/components/List.vue
@@ -14,7 +14,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
diff --git a/project/shandong10086/apps.import.json b/project/shandong10086/apps.import.json
index 1c21b6cd..2663100d 100644
--- a/project/shandong10086/apps.import.json
+++ b/project/shandong10086/apps.import.json
@@ -28,5 +28,8 @@
   "AppMeetingChinaunion": "三会一课",
   "AppPartyHistoryClass": "党员学习",
   "AppPartyOrganization": "党组织管理",
-  "AppPartyMember": "党员管理"
+  "AppPartyMember": "党员管理",
+  "AppLicence": "产品许可",
+  "AppContentManage": "内容中心",
+  "AppResident": "居民档案"
 }
diff --git a/project/shandong10086/apps/shandong/AppDispatchManagement/components/Detail.vue b/project/shandong10086/apps/shandong/AppDispatchManagement/components/Detail.vue
index 50a4424c..b736543e 100644
--- a/project/shandong10086/apps/shandong/AppDispatchManagement/components/Detail.vue
+++ b/project/shandong10086/apps/shandong/AppDispatchManagement/components/Detail.vue
@@ -4,7 +4,7 @@
       <template #title>
         <ai-title title="公文详情" isShowBottomBorder isShowBack @onBackClick="cancel(true)">
           <template #rightBtn>
-            <ai-wechat-selecter :instance="instance" v-model="addUser" :isMultiple="form.readType == '0' ? false : true" @change="onChange" v-if="form.status === '0'">
+            <ai-wechat-selecter :instance="instance" v-model="addUser" :isMultiple="form.readType!='0'" @change="onChange" v-if="form.status === '0'">
               <el-button
                 size="small"
                 type="primary"
@@ -12,7 +12,7 @@
                 开始流转
               </el-button>
             </ai-wechat-selecter>
-            <ai-wechat-selecter :instance="instance" v-model="addUser" :isMultiple="form.readType == '0' ? false : true" @change="onChange" v-if="form.status === '2' && form.readType == '0'">
+            <ai-wechat-selecter :instance="instance" v-model="addUser" :isMultiple="form.readType!='0'" @change="onChange" v-if="form.status === '2' && form.readType == '0'">
               <el-button
                 size="small"
                 type="primary"
@@ -28,7 +28,7 @@
             结束流转</el-button>
           </template>
         </ai-title>
-        
+
       </template>
       <template #content>
         <ai-card :title="form.documentName">
@@ -131,7 +131,7 @@
                     class="iconfont iconDelete"
                     title="删除"
                     style="cursor: pointer;"
-                    @click="remove(row.id)">
+                    @click="remove(row.flowId)">
                   </span>
                 </template>
               </el-table-column>
@@ -220,9 +220,9 @@ export default {
     this.showDetail = true
     this.isAdd = false
     this.getDetail()
-    
+
   },
-  methods: { 
+  methods: {
     remove (id) {
       if(this.form.flowUsers.length<=1){
         return this.$message.error("至少留一个流转对象！");
@@ -560,4 +560,4 @@ export default {
       }
     }
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/project/shandong10086/apps/shandong/AppDispatchManagement/components/List.vue b/project/shandong10086/apps/shandong/AppDispatchManagement/components/List.vue
index 27337adf..6c35c76f 100644
--- a/project/shandong10086/apps/shandong/AppDispatchManagement/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppDispatchManagement/components/List.vue
@@ -55,8 +55,9 @@
           <el-input placeholder="输入公文名称/编号"
                     v-model="searchObj.name"
                     size="small"
-                    @change="(page.current = 1), getList()"
                     clearable
+                    @clear="searchObj.name = '', getList()"
+                    v-throttle="() => {page.current = 1, getList()}"
                     prefix-icon="iconfont iconSearch"/>
         </template>
       </ai-search-bar>
@@ -80,6 +81,7 @@
           :size.sync="page.size"
           @getList="getList"
           @selection-change="handleSelectionChange"
+          :dict="dict"
       >
         <el-table-column slot="selection" type="selection" width="55"></el-table-column>
         <el-table-column slot="options" label="操作" align="center" width="200">
@@ -142,24 +144,21 @@ export default {
           label: "公文类型",
           width: 120,
           align: "center",
-          formart: (documentType) =>
-              this.$dict.getLabel("officialDocumentName", documentType),
+          dict: "officialDocumentName"
         },
         {
           prop: "readType",
           label: "阅示类型",
           width: 120,
           align: "center",
-          formart: (readType) =>
-              this.$dict.getLabel("officialDocumentReadType", readType),
+          dict: "officialDocumentReadType"
         },
         {
           prop: "confidentialityLevel",
           label: "保密等级",
           width: 120,
           align: "center",
-          formart: (confidentialityLevel) =>
-              this.$dict.getLabel("officialDocumentConfidentialityLevel", confidentialityLevel),
+          dict: "officialDocumentConfidentialityLevel"
         },
         {
           prop: "flowUserName",
@@ -192,7 +191,7 @@ export default {
       ];
     },
   },
-  mounted() {
+  created() {
     this.dict.load('officialDocumentName', 'officialDocumentConfidentialityLevel', 'officialDocumentReadType', 'documentStatus').then(() => {
       this.$nextTick(() => this.getList())
     })
diff --git a/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue b/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue
index b7dea1b2..de3f7a92 100644
--- a/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue
+++ b/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue
@@ -72,7 +72,7 @@
             </div>
           </el-form-item>
           <el-form-item label="审核意见" v-if="form.pass === '0'" prop="opinion" style="width: 100%;" :rules="[{ required: true, message: '请输入审核意见' }]">
-            <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+            <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
           </el-form-item>
         </el-form>
       </ai-dialog>
diff --git a/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue b/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue
index 46600d57..c20e9e4e 100644
--- a/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue
@@ -52,7 +52,7 @@
               size="small"
               placeholder="请输入姓名"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.residentName = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
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>
diff --git a/project/shandong10086/apps/shandong/AppVillageCode/components/Add.vue b/project/shandong10086/apps/shandong/AppVillageCode/components/Add.vue
index 299235c3..2734dbff 100644
--- a/project/shandong10086/apps/shandong/AppVillageCode/components/Add.vue
+++ b/project/shandong10086/apps/shandong/AppVillageCode/components/Add.vue
@@ -12,7 +12,7 @@
               <span style="color: #666;">{{ form.areaName }}</span>
             </el-form-item>
             <el-form-item label="二维码名称" prop="codeName" :rules="[{ required: true, message: '请输入二维码名称', trigger: 'blur' }]">
-              <el-input size="small" placeholder="请输入二维码名称" style="width: 328px;" v-model="form.codeName"></el-input>
+              <el-input size="small" maxlength="30" show-word-limit placeholder="请输入二维码名称" style="width: 328px;" v-model="form.codeName"></el-input>
             </el-form-item>
             <el-form-item style="width: 100%;" label="二维码类型" prop="type" :rules="[{ required: true, message: '请选择二维码类型', trigger: 'change' }]">
               <el-radio-group v-model="form.type">
@@ -55,14 +55,11 @@
           codeUrl: [],
           type: '',
         },
-        id: '',
-        areaList: []
+        id: ''
       }
     },
 
     created () {
-      this.getAreaList()
-
       if (this.params && this.params.areaId && !this.params.id) {
         this.form.areaId = this.params.areaId
         this.form.areaName = this.params.areaName
@@ -86,19 +83,6 @@
         })
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data.map(item => {
-              item.dictName = item.name
-              item.dictValue = item.id
-
-              return item
-            })
-          }
-        })
-      },
-
       onClose () {
         this.form.explain = ''
       },
diff --git a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue
index 45e80022..35b9060b 100644
--- a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-list class="villagecode">
     <template slot="title">
-      <ai-title title="一村一码" isShowBottomBorder></ai-title>
+      <ai-title title="一村一群" isShowBottomBorder></ai-title>
     </template>
     <template #left>
       <div class="villagecode-left">
@@ -15,6 +15,7 @@
               size="mini"
               placeholder="请输入地区名称"
               v-model="unitName"
+              clearable
               suffix-icon="iconfont iconSearch">
             </el-input>
           </div>
@@ -105,7 +106,6 @@
           label: 'name'
         },
         currIndex: -1,
-        areaList: [],
         total: 10,
         colConfigs: [
           {prop: 'codeName', label: '名称', align: 'left'},
@@ -140,7 +140,6 @@
       this.search.areaId = this.user.info.areaId
       this.areaName = this.user.info.areaName
       this.getTree()
-      this.getAreaList()
       this.getList()
 
       this.$nextTick(() => {
@@ -210,14 +209,6 @@
         }
       },
 
-      getAreaList() {
-        this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
-          if (res.code == 0) {
-            this.areaList = res.data
-          }
-        })
-      },
-
       remove(id) {
         this.$confirm('确定删除该数据？').then(() => {
           this.instance.post(`/app/appeveryvillagecode/delete?ids=${id}`).then(res => {
diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsDetail.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsDetail.vue
index 4a595735..c9830f10 100644
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsDetail.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsDetail.vue
@@ -39,7 +39,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="审核意见" v-if="form.pass === '0'" prop="opinion" style="width: 100%;" :rules="[{ required: true, message: '请输入审核意见' }]">
-            <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+            <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
           </el-form-item>
         </el-form>
       </ai-dialog>
diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue
index c9a27fa8..5d706c1e 100644
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue
@@ -20,13 +20,13 @@
         </template>
         <template #right>
           <el-input
-            v-model="search.title"
+            v-model="search.content"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, search.title, getList()"
+            v-throttle="() => {search.current=1,getList()}"
             placeholder="请输入发布人姓名"
             clearable
-            @clear="search.current = 1, search.title = '', getList()"
+            @clear="search.current = 1, search.content = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
@@ -69,7 +69,7 @@
           size: 10,
           status: '',
           topic: '',
-          title: ''
+          content: ''
         },
         total: 0,
         colConfigs: [
diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/Detail.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/Detail.vue
index 238d22da..a984faa6 100644
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/Detail.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/Detail.vue
@@ -47,7 +47,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="审核意见" v-if="form.pass === '0'" prop="opinion" style="width: 100%;" :rules="[{ required: true, message: '请输入审核意见' }]">
-            <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+            <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
           </el-form-item>
         </el-form>
       </ai-dialog>
diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue
index 8e316ed9..148adabd 100644
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue
@@ -36,13 +36,13 @@
         </template>
         <template #right>
           <el-input
-            v-model="search.title"
+            v-model="search.content"
             class="search-input"
             size="small"
-            @keyup.enter.native="search.current = 1, search.title, getList()"
             placeholder="请输入发布人姓名"
             clearable
-            @clear="search.current = 1, search.title = '', getList()"
+            v-throttle="() => {search.current = 1, getList()}"
+            @clear="search.current = 1, search.content = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
@@ -85,7 +85,7 @@
           size: 10,
           status: '',
           topic: '',
-          title: '',
+          content: '',
           areaId: '',
           createTimeStart: '',
           createTimeEnd: ''
diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorDevice/AppMonitorDevice.vue b/project/shandong10086/apps/shandong/monitor/AppMonitorDevice/AppMonitorDevice.vue
index 4ebaa8bd..fd9b7e78 100644
--- a/project/shandong10086/apps/shandong/monitor/AppMonitorDevice/AppMonitorDevice.vue
+++ b/project/shandong10086/apps/shandong/monitor/AppMonitorDevice/AppMonitorDevice.vue
@@ -5,10 +5,11 @@
       <template #content>
         <ai-search-bar>
           <template #right>
-            <el-input prefix-icon="iconfont iconSearch" v-model="search.title" placeholder="设备名、MAC号" clearable
-                      @change="page.current=1,getTableData()" size="small"/>
-            <el-button type="primary" icon="iconfont iconSearch" @click="page.current=1,getTableData()">查询</el-button>
-            <el-button icon="iconfont iconResetting" @click="search={},page.current=1,getTableData()">重置</el-button>
+            <el-input
+              prefix-icon="iconfont iconSearch"
+              v-model="search.title" placeholder="设备名、MAC号" clearable
+              @clear="page.current = 1,search.title = '', getTableData()"
+              v-throttle="() => {page.current = 1, getTableData()}" size="small"/>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :colConfigs="colConfigs" :total="page.total" :current.sync="page.current"
diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
index 1d8200d1..f15006ac 100644
--- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
+++ b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
@@ -12,8 +12,7 @@
       </div>
       <div class="videoList">
         <div class="videoBox" v-for="(m,i) in monitors" :key="i" :style="currentSplitStyle">
-          <iframe :src="m.url" allow="autoplay *; microphone *; fullscreen *" allowfullscreen allowtransparency
-                  allowusermedia frameBorder="no"/>
+          <AiMonitor :src="m.url" type="slw"></AiMonitor>
         </div>
       </div>
     </div>
@@ -25,162 +24,173 @@
         </el-form-item>
       </el-form>
     </ai-dialog>
-    <locate-dialog v-model="locate" :ins="instance" @confirm="v=>handleLocate(selected,v)"/>
+    <locate-dialog v-model="locate" :ins="instance" :latlng="latlng" @confirm="v=>handleLocate(selected,v)"/>
     <ai-area custom-clicker :input-clicker="false" v-model="selected.areaId" :instance="instance" ref="BindArea"
              @change="handleSubmit(selected)"/>
   </section>
 </template>
 
 <script>
-import DeviceSlider from "../components/deviceSlider";
-import LocateDialog from "../components/locateDialog";
+  import { mapState } from 'vuex'
+  import DeviceSlider from "../components/deviceSlider";
+  import LocateDialog from "../components/locateDialog";
 
-export default {
-  name: "AppMonitorManage",
-  components: {LocateDialog, DeviceSlider},
-  label: "监控实况",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function
-  },
-  computed: {
-    splitOps() {
-      return [
-        {label: "单分屏", value: 1, per: "100%"},
-        {label: "四分屏", value: 4, per: "49%"},
-        {label: "九分屏", value: 9, per: "32%"}
-      ]
+  export default {
+    name: "AppMonitorManage",
+    components: {LocateDialog, DeviceSlider},
+    label: "监控实况",
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function
     },
-    currentSplitStyle() {
-      let per = this.splitOps.find(e => e.value == this.splitScreen)?.per || "100%"
-      return {width: per, height: per}
+    computed: {
+      splitOps() {
+        return [
+          {label: "单分屏", value: 1, per: "100%"},
+          {label: "四分屏", value: 4, per: "49%"},
+          {label: "九分屏", value: 9, per: "32%"}
+        ]
+      },
+      currentSplitStyle() {
+        let per = this.splitOps.find(e => e.value == this.splitScreen)?.per || "100%"
+        return {width: per, height: per}
+      },
+      ...mapState(['user'])
     },
-  },
-  data() {
-    return {
-      slider: true,
-      fullscreen: false,
-      splitScreen: 1,
-      monitors: [],
-      dialog: false,
-      locate: false,
-      selected: {},
-      rules: {
-        name: [{required: true, message: "请填写 设备名称"}]
+
+    data() {
+      return {
+        slider: true,
+        fullscreen: false,
+        splitScreen: 1,
+        monitors: [],
+        dialog: false,
+        locate: false,
+        selected: {
+          areaId: ''
+        },
+        videoUrl: '',
+        latlng: null,
+        disabledLevel: 0,
+        rules: {
+          name: [{required: true, message: "请填写 设备名称"}]
+        }
       }
-    }
-  },
-  methods: {
-    handleFullscreen() {
-      this.fullscreen = !this.fullscreen
-      this.$fullscreen(this.fullscreen)
     },
-    handleSelectMonitor(monitor) {
-      let {id} = monitor,
-          index = this.monitors.findIndex(e => e.id == id)
-      if (index > -1) {
-        this.monitors.splice(index, 1)
-        this.monitors.map((e, i) => {
-          if (i > index) {
-            this.showMonitor(e, true)
+
+    created () {
+      this.selected.areaId = this.user.info.areaId
+    },
+
+    methods: {
+      handleFullscreen() {
+        this.fullscreen = !this.fullscreen
+        this.$fullscreen(this.fullscreen)
+      },
+      handleSelectMonitor(monitor) {
+        let {id} = monitor,
+            index = this.monitors.findIndex(e => e.id == id)
+        if (index > -1) {
+          this.monitors.splice(index, 1)
+          this.monitors.map((e, i) => {
+            if (i > index) {
+              this.showMonitor(e, true)
+            }
+          })
+        } else if (this.monitors.length >= this.splitScreen && this.splitScreen > 1) {
+          this.$message.warning("可分屏监控已满,请先取消其他的监控")
+        } else {
+          this.showMonitor(monitor)
+        }
+      },
+      showMonitor(monitor, refresh = false) {
+        let {id: deviceId} = monitor
+        deviceId && this.instance.post("/app/appzyvideoequipment/getWebSdkUrl", null, {
+          params: {deviceId}
+        }).then(res => {
+          if (res?.data) {
+            this.videoUrl = res.data
+            let data = {
+              url: res.data
+            }
+            if (refresh) {
+              monitor.url = data.url
+            } else if (this.splitScreen == 1) {
+              this.monitors = [{...monitor, ...data}]
+            } else {
+              this.monitors.push({...monitor, ...data})
+            }
           }
         })
-      } else if (this.monitors.length >= this.splitScreen && this.splitScreen > 1) {
-        this.$message.warning("可分屏监控已满,请先取消其他的监控")
-      } else {
-        this.showMonitor(monitor)
-      }
-    },
-    showMonitor(monitor, refresh = false) {
-      let {id: deviceId} = monitor
-      deviceId && this.instance.post("/app/appzyvideoequipment/getWebSdkUrl", null, {
-        params: {deviceId}
-      }).then(res => {
-        if (res?.data) {
-          let data = JSON.parse(res.data)
-          if (refresh) {
-            monitor.url = data.url
-          } else if (this.splitScreen == 1) {
-            this.monitors = [{...monitor, ...data}]
-          } else {
-            this.monitors.push({...monitor, ...data})
-          }
-        }
-      })
-    },
-    renderTreeItem: function (h, {node, data}) {
-      let show = data.deviceStatus==1 ? 'show' : ''
-      if (node.isLeaf) {
-        return (
+      },
+      renderTreeItem: function (h, {node, data}) {
+        let show = data.deviceStatus==1 ? 'show' : ''
+        if (node.isLeaf) {
+          return (
+              <div class="flexRow">
+                <i class={['iconfont', 'iconshipinjiankong', show]}/>
+                <div>{node.label}</div>
+                <el-dropdown class="menuBtn" onCommand={e => this.handleSliderOption(e, data)}>
+                  <i class="iconfont iconMore"/>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="edit">修改名称</el-dropdown-item>
+                    <el-dropdown-item command="area">行政地区</el-dropdown-item>
+                    <el-dropdown-item command="locate">地图标绘</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+          )
+        } else return (
             <div class="flexRow">
-              <i class={['iconfont', 'iconshipinjiankong', show]}/>
               <div>{node.label}</div>
-              <el-dropdown class="menuBtn" onCommand={e => this.handleSliderOption(e, data)}>
-                <i class="iconfont iconMore"/>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="changeStatus">设为公开</el-dropdown-item>
-                  <el-dropdown-item command="edit">修改名称</el-dropdown-item>
-                  <el-dropdown-item command="area">行政地区</el-dropdown-item>
-                  <el-dropdown-item command="locate">地图标绘</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
+              {data.id != 'no_area' ? <div class="sta">
+                    <p>{data.online || 0}</p>/{data.sum || 0}
+                  </div>
+                  : <div/>}
             </div>
         )
-      } else return (
-          <div class="flexRow">
-            <div>{node.label}</div>
-            {data.id != 'no_area' ? <div class="sta">
-                  <p>{data.online || 0}</p>/{data.sum || 0}
-                </div>
-                : <div/>}
-          </div>
-      )
-    },
-    handleSliderOption(command, data) {
-      this.selected = JSON.parse(JSON.stringify({...data, command}))
-      if (command == "edit") {//修改名称
-        this.dialog = true
-      } else if (command == "area") {//绑定areaId
-        this.$refs.BindArea?.chooseArea()
-      } else if (command == "locate") {//地图标绘
-        this.locate = true
-      } else {
-        this.$confirm('确定设为公开？').then(() => {
-          console.log(data)
-          // this.instance.post(`/app/appeveryvillagecode/delete?ids=${this.selected.id}`).then(res => {
-          //   if (res.code == 0) {
-          //     this.getList()
-          //   }
-          // })
-        })
-      }
-    },
-    handleSubmit(row) {
-      delete row.createTime
-      return this.instance.post("/app/appzyvideoequipment/addOrUpdate", {
-        ...row
-      }).then(res => {
-        if (res?.code == 0) {
-          this.$message.success("提交成功!")
-          this.dialog = false
-          this.$refs.DeviceSlider?.getDevices()
+      },
+      handleSliderOption(command, data) {
+        this.selected = JSON.parse(JSON.stringify({...data, command}))
+        this.selected.areaId = data.areaId || this.user.info.areaId
+        if (command == "edit") {//修改名称
+          this.dialog = true
+        } else if (command == "area") {//绑定areaId
+          this.$refs.BindArea?.chooseArea()
+        } else if (command == "locate") {//地图标绘
+          this.latlng = data.lat && data.lng ? {
+            lat: data.lat,
+            lng: data.lng
+          } : ''
+          this.locate = true
         }
-      })
-    },
-    handleLocate(row, locate) {
-      if (locate) {
-        let {lat, lng} = locate.location
-        this.handleSubmit({...row, lat, lng}).then(() => {
-          this.locate = false
+      },
+      handleSubmit(row) {
+        delete row.createTime
+        return this.instance.post("/app/appzyvideoequipment/addOrUpdate", {
+          ...row
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("提交成功!")
+            this.dialog = false
+            this.$refs.DeviceSlider?.getDevices()
+          }
         })
+      },
+      handleLocate(row, locate) {
+        if (locate) {
+          let {lat, lng} = locate.location
+          this.handleSubmit({...row, lat, lng}).then(() => {
+            this.locate = false
+          })
+        }
       }
+    },
+    beforeDestroy() {
+      this.monitors = []
     }
-  },
-  beforeDestroy() {
-    this.monitors = []
   }
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/project/shandong10086/apps/shandong/monitor/components/locateDialog.vue b/project/shandong10086/apps/shandong/monitor/components/locateDialog.vue
index 13cdd466..a8af27a3 100644
--- a/project/shandong10086/apps/shandong/monitor/components/locateDialog.vue
+++ b/project/shandong10086/apps/shandong/monitor/components/locateDialog.vue
@@ -30,9 +30,7 @@ export default {
     prop: "visible",
     event: "visible",
   },
-  props: {
-    visible: Boolean
-  },
+  props: ['latlng', 'visible'],
   data() {
     return {
       dialog: false,
@@ -57,13 +55,21 @@ export default {
         plugins: ['AMap.PlaceSearch', 'AMap.Marker', 'AMap.Geolocation'],
       }).then(AMap => {
         this.AMap = AMap
+        console.log(this.latlng)
         this.map = new AMap.Map('amap', {
           zoom: 14,
+          center: this.latlng ? [this.latlng.lng, this.latlng.lat] : ''
         }).on('click', res => {
           this.map.clearMap()
           this.selected = {location: res.lnglat}
           this.poi?.searchNearBy('', res.lnglat, 100)
         });
+        if (this.latlng) {
+          let marker = new AMap.Marker({
+            position: [this.latlng.lng, this.latlng.lat]
+          })
+          this.map.add(marker)
+        }
         this.poi = new AMap.PlaceSearch().on('complete', ({poiList}) => {
           this.map.clearMap()
           if (poiList?.length > 0) {
diff --git a/project/shandong10086/apps/shandong/scoreManage/AppScoreManage.vue b/project/shandong10086/apps/shandong/scoreManage/AppScoreManage.vue
index 57f03759..82759bac 100644
--- a/project/shandong10086/apps/shandong/scoreManage/AppScoreManage.vue
+++ b/project/shandong10086/apps/shandong/scoreManage/AppScoreManage.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-list>
     <template slot="title">
-      <ai-title title="积分审核" :isShowBottomBorder="false" :instance="instance" :isShowArea="true" v-model="areaId"
+      <ai-title title="积分维护" :isShowBottomBorder="false" :instance="instance" :isShowArea="true" v-model="areaId"
                 @change="changeArea"></ai-title>
     </template>
     <template slot="tabs">
@@ -24,7 +24,7 @@ import scoreChange from "./scoreChange";
 
 export default {
     name: 'AppScoreManage',
-    label: "积分审核",
+    label: "积分维护",
     components: {pointsDeclaration, pointsDetails, pointsAppeal, scoreChange},
     props: {
       instance: Function,
diff --git a/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue b/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue
index 4fbcf1f1..742b7ede 100644
--- a/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue
+++ b/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue
@@ -39,7 +39,7 @@
               size="mini"
               placeholder="申诉人/申诉对象/..."
               clearable
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
               @clear="page.current = 1, getList()"
               suffix-icon="iconfont iconSearch" />
           </template>
diff --git a/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue b/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue
index 7d0a2bf3..42562458 100644
--- a/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue
+++ b/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue
@@ -39,7 +39,7 @@
               size="mini"
               placeholder="申诉人/申诉对象/..."
               clearable
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
               @clear="page.current = 1, getList()"
               suffix-icon="iconfont iconSearch" />
           </template>
diff --git a/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue b/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue
index 2dc45dee..c6d5e97d 100644
--- a/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue
+++ b/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue
@@ -14,7 +14,7 @@
               size="small"
               placeholder="对象、户主、事件类型"
               clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, getList()"
               suffix-icon="iconfont iconSearch" />
           </template>
diff --git a/project/xiushan/apps.import.json b/project/xiushan/apps.import.json
new file mode 100644
index 00000000..c89141eb
--- /dev/null
+++ b/project/xiushan/apps.import.json
@@ -0,0 +1,3 @@
+{
+  "AppCodeGeneration": "动态表单"
+}
diff --git a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
index a92e482c..fb9d8c91 100644
--- a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
+++ b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
@@ -109,7 +109,7 @@ export default {
         {label: "姓名", slot: "name"},
         {label: "联系方式", prop: "phone", align: 'center', width: "120px"},
         {label: "账号角色", prop: "roleName", width: "120px", align: '120px'},
-        {label: "地区", prop: "areaFullName"},
+        {label: "地区", prop: "areaName"},
         {slot: "options"}
       ]
     },
diff --git a/project/xiushan/apps/AppMassMessage/AppMassMessage.vue b/project/xiushan/apps/AppMassMessage/AppMassMessage.vue
new file mode 100644
index 00000000..92a831fe
--- /dev/null
+++ b/project/xiushan/apps/AppMassMessage/AppMassMessage.vue
@@ -0,0 +1,36 @@
+<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() {
+    this.dict.load("leaveMessageType", "yesOrNo", "msgStatus")
+  }
+}
+</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..e12320f1
--- /dev/null
+++ b/project/xiushan/apps/AppMassMessage/mmDetail.vue
@@ -0,0 +1,217 @@
+<template>
+  <section class="mmDetail">
+    <ai-detail>
+      <ai-title slot="title" title="留言详情" isShowBottomBorder isShowBack @onBackClick="back">
+        <template #rightBtn v-if="!isClosed">
+          <el-button type="primary" @click="dialog=true">回复留言</el-button>
+          <el-button @click="handleCloseMass(detail.id)">关闭留言</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.messageCode || "-" }}</el-form-item>
+                <el-form-item label="留言时间">{{ detail.createTime || "-" }}</el-form-item>
+                <el-form-item label="留言人">{{ detail.leaveName || "-" }}</el-form-item>
+              </el-row>
+              <ai-icon type="svg" :icon="statusImages[detail.status||0]"/>
+            </template>
+            <template #content>
+              <div v-html="detail.content"/>
+              <div class="mar-t8">
+                <el-image class="thumb" v-for="img in detail.images" :key="img.url" :src="img.url"
+                          :preview-src-list="[img.url]"/>
+              </div>
+            </template>
+          </ai-card>
+          <ai-card title="沟通记录">
+            <template #content>
+              <div class="commentItem" v-for="op in detail.appLeaveMessageReplyList" :key="op.id">
+                <b v-text="userTypeLabel[op.userType]"/>
+                <div :class="{reply:op.userType==1}">
+                  <div v-text="op.content"/>
+                  <div class="rightText" v-text="`留言时间：${op.createTime}`"/>
+                </div>
+              </div>
+              <ai-empty v-if="!detail.appLeaveMessageReplyList"/>
+            </template>
+          </ai-card>
+        </el-form>
+      </template>
+    </ai-detail>
+    <ai-dialog :visible.sync="dialog" title="回复留言" width="500px" @onConfirm="submit">
+      <el-form size="small" :model="form" :rules="rules" label-width="80px" ref="ReplyForm">
+        <el-form-item label="回复内容" prop="content">
+          <el-input type="textarea" v-model="form.content" rows="4" clearable placeholder="请输入回复内容"/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "mmDetail",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    statusImages() {
+      return {
+        0: "iconno_response",
+        1: "iconreplied",
+        2: "iconfinished"
+      }
+    },
+    userTypeLabel() {
+      return {
+        0: "留言",
+        1: "回复"
+      }
+    },
+    isClosed() {
+      return this.detail.status == 2
+    }
+  },
+  data() {
+    return {
+      detail: {},
+      dialog: false,
+      form: {},
+      rules: {
+        content: [{required: true, message: "请输入回复内容"}]
+      }
+    }
+  },
+  methods: {
+    getDetail() {
+      let {id} = this.$route.query
+      this.instance.post("/appleavemessage/queryDetailById", null, {
+        params: {id}
+      }).then(res => {
+        if (res?.data) {
+          this.detail = res.data
+          this.detail.images = this.detail.images ? JSON.parse(this.detail.images) : []
+        }
+      })
+    },
+    back() {
+      this.$router.push({})
+    },
+    handleCloseMass(id) {
+      this.$confirm("是否要关闭留言?").then(() => {
+        this.instance.post("/appleavemessage/close", null, {
+          params: {id}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("关闭成功")
+            this.back()
+          }
+        })
+      }).catch(() => 0)
+    },
+    submit() {
+      this.$refs.ReplyForm.validate(v => {
+        if (v) {
+          let {id: messageId} = this.detail
+          this.instance.post("/appleavemessagereply/addOrUpdate", {...this.form, messageId, userType: 1}).then(res => {
+            if (res?.code == 0) {
+              this.$message.success("提交成功!")
+              this.back()
+            }
+          })
+        }
+      })
+    }
+  },
+  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;
+    }
+  }
+
+  .commentItem {
+    min-height: 50px;
+    margin-bottom: 40px;
+
+    & > b {
+      font-size: 14px;
+      font-weight: normal;
+      background: #408CFF;
+      color: #fff;
+      box-sizing: border-box;
+      display: block;
+      border-radius: 4px 4px 0 0;
+      overflow: hidden;
+      height: 20px;
+      line-height: 20px;
+      width: 50px;
+      text-align: center;
+    }
+
+    & > div {
+      position: relative;
+      padding: 16px 8px;
+      box-sizing: border-box;
+      font-size: 14px;
+      color: #000;
+      background: #fff;
+      border: 1px solid #ccc;
+
+      &.reply {
+        background: #ddd;
+      }
+    }
+
+    .rightText {
+      text-align: right;
+      color: #666;
+      font-size: 12px;
+    }
+  }
+
+  .thumb {
+    width: 120px;
+    height: 120px;
+    margin: 4px 4px 0 0;
+  }
+}
+</style>
diff --git a/project/xiushan/apps/AppMassMessage/mmList.vue b/project/xiushan/apps/AppMassMessage/mmList.vue
new file mode 100644
index 00000000..6daa9d77
--- /dev/null
+++ b/project/xiushan/apps/AppMassMessage/mmList.vue
@@ -0,0 +1,103 @@
+<template>
+  <section class="mmList">
+    <ai-list>
+      <ai-title slot="title" title="群众留言" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <ai-select v-model="search.status" placeholder="留言状态" :selectList="dict.getDict('msgStatus')"
+                       @change="page.current=1,getTableData()"/>
+            <ai-select v-model="search.type" placeholder="留言类型" :selectList="dict.getDict('leaveMessageType')"
+                       @change="page.current=1,getTableData()"/>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="搜索标题/内容" v-model="search.title" 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.isOpen==0" type="text" @click="handleEnable(row)">公示</el-button>
+              <el-button v-else-if="row.isOpen==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: "title"},
+        {label: "类型", prop: "type", dict: "leaveMessageType"},
+        {label: "内容", prop: "content"},
+        {label: "留言人", prop: "leaveName"},
+        {label: "留言提交时间", prop: "createTime"},
+        {label: "最后回复时间", prop: "lastReplyTime"},
+        {label: "状态", prop: "status", dict: "msgStatus"},
+        {label: "是否公示", prop: "isOpen", dict: "yesOrNo", align: 'center'},
+        {slot: "options"}
+      ]
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/appleavemessage/list", null, {
+        params: {...this.page, ...this.search}
+      }).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 openLabel = row.isOpen == 1 ? "取消公示" : "公示", isOpen = (Number(row.isOpen) + 1) % 2
+      this.$confirm(`是否要${openLabel}留言?`).then(() => {
+        this.instance.post("/appleavemessage/setIsOpen", null, {
+          params: {id: row.id, isOpen}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success(openLabel + "成功!")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    },
+  },
+  created() {
+    this.getTableData()
+    this.search.areaId = this.user.info.areaId
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.mmList {
+  height: 100%;
+}
+</style>
diff --git a/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue b/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue
index 1dcf84d0..d7675617 100644
--- a/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue
+++ b/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue
@@ -61,7 +61,9 @@ export default {
       return this.user.info.areaList?.length - 1
     },
     currentPage() {
-      return this.$route.hash?.substring(1) || newsList
+      return this.$route.hash == "#video" ? videoDetail :
+          this.$route.hash == "#news" ? newsDetail :
+              this.$route.hash?.substring(1) || newsList
     }
   },
   methods: {
diff --git a/project/xiushan/apps/AppNewsCenter/components/videoDetail.vue b/project/xiushan/apps/AppNewsCenter/components/videoDetail.vue
index feef5fc5..3fa1b61d 100644
--- a/project/xiushan/apps/AppNewsCenter/components/videoDetail.vue
+++ b/project/xiushan/apps/AppNewsCenter/components/videoDetail.vue
@@ -12,14 +12,12 @@
           <ai-wrapper
               :columnsNumber="1">
             <ai-info-item label="标题：" :value="detail.title"></ai-info-item>
-            <ai-info-item label="类型："
-                          :value="dict.getLabel('newsCenterPolicyType', + detail.policyType)"></ai-info-item>
             <ai-info-item label="视频：" isLine>
-              <video :src="detail.videoFile && detail.videoFile.url"
+              <video :src="detail.videoUrl"
                      style="width: 100%; height:100%; object-fit: fill;" muted controls="controls"></video>
             </ai-info-item>
             <ai-info-item label="封面：" isLine v-viewer>
-              <img :src="detail.videoFile && detail.coverFile.url" alt="">
+              <img :src="detail.thumbUrl" alt="">
             </ai-info-item>
           </ai-wrapper>
         </template>
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/apps/AppVideoPublic/AppVideoPublic.vue b/project/xiushan/apps/AppVideoPublic/AppVideoPublic.vue
new file mode 100644
index 00000000..6b442996
--- /dev/null
+++ b/project/xiushan/apps/AppVideoPublic/AppVideoPublic.vue
@@ -0,0 +1,36 @@
+<template>
+  <section class="AppVideoPublic">
+    <component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
+  </section>
+</template>
+
+<script>
+
+import ProductList from "./vpList";
+import ProductAdd from "./vpAdd";
+
+export default {
+  name: "AppVideoPublic",
+  components: {ProductAdd, ProductList},
+  label: "视频宣传",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentComponent() {
+      return this.$route.hash == "#add" ? ProductAdd : ProductList
+    }
+  },
+  created() {
+    this.dict.load("videoNewsStatus")
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppVideoPublic {
+  height: 100%;
+}
+</style>
diff --git a/project/xiushan/apps/AppVideoPublic/vpAdd.vue b/project/xiushan/apps/AppVideoPublic/vpAdd.vue
new file mode 100644
index 00000000..e125c4d6
--- /dev/null
+++ b/project/xiushan/apps/AppVideoPublic/vpAdd.vue
@@ -0,0 +1,208 @@
+<template>
+  <section class="vpAdd">
+    <ai-detail>
+      <ai-title slot="title" :title="addTitle" isShowBottomBorder isShowBack @onBackClick="back"/>
+      <template #content>
+        <el-form size="small" label-width="120px" :model="form" ref="VideoForm" :rules="rules">
+          <ai-card title="基本信息">
+            <template #content>
+              <el-form-item label="标题" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" clearable show-word-limit maxlength="30"/>
+              </el-form-item>
+              <el-form-item label="视频" prop="videoUrl">
+                <video v-if="hasVideo" class="video-com" muted :src="form.videoUrl" controls="controls"/>
+                <el-upload :show-file-list="false" ref="upload1" action :http-request="submitUpload"
+                           :accept="accept" :limit="1">
+                  <div class="video" v-if="!hasVideo">
+                    <div class="icon">
+                      <ai-icon type="svg" icon="iconVideo"/>
+                      <span>上传视频</span>
+                    </div>
+                    <span class="tips">支持mp4格式，单个文件最大100MB</span>
+                  </div>
+                  <el-button v-else style="margin-top: 10px;">重新选择</el-button>
+                </el-upload>
+              </el-form-item>
+              <el-form-item label="视频封面" prop="thumbUrl">
+                <ai-uploader :instance="instance" :value="thumb" @change="handleUploader" key="file" :limit="1">
+                  <template slot="tips">
+                    <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
+                  </template>
+                </ai-uploader>
+              </el-form-item>
+            </template>
+          </ai-card>
+        </el-form>
+      </template>
+      <template #footer>
+        <el-button @click="back">取消</el-button>
+        <el-button type="primary" @click="submit">保存</el-button>
+      </template>
+    </ai-detail>
+  </section>
+</template>
+
+<script>
+import mp4box from "mp4box";
+
+export default {
+  name: "vpAdd",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    addTitle() {
+      return !!this.$route.query.id ? "编辑视频" : "添加视频"
+    },
+    rules() {
+      return {
+        title: [{required: true, message: "请输入标题"}],
+        thumbUrl: [{required: true, message: "请上传视频封面"}],
+        videoUrl: [{required: true, message: "请上传视频"}],
+      }
+    },
+    hasVideo() {
+      return !!this.form.videoUrl
+    },
+    thumb() {
+      return this.form.thumbUrl ? [{url: this.form.thumbUrl}] : []
+    }
+  },
+  data() {
+    return {
+      dialog: false,
+      form: {videoUrl: "", thumbUrl: ""},
+      accept: ".mp4"
+    }
+  },
+  methods: {
+    getDetail() {
+      let {id} = this.$route.query
+      id && this.instance.post("/appvideonews/getById", null, {
+        params: {id}
+      }).then(res => {
+        if (res?.data) {
+          this.form = res.data
+        }
+      })
+    },
+    submit() {
+      this.$refs.VideoForm.validate(v => {
+        if (v) {
+          let {form} = this
+          this.instance.post("/appvideonews/addOrUpdate", form).then(res => {
+            if (res?.code == 0) {
+              this.$message.success("提交成功!")
+              this.back()
+            }
+          })
+        }
+      })
+    },
+    back() {
+      this.$router.push({})
+    },
+    submitUpload(file) {
+      this.$refs.upload1?.clearFiles();
+      const fileType = file.file.name.split(".")[1];
+      const size = file.file.size / 1024 / 1024 > 100;
+      let mp4boxfile = mp4box.createFile();
+      const reader = new FileReader();
+      reader.readAsArrayBuffer(file.file);
+      reader.onload = (e) => {
+        const arrayBuffer = e.target.result;
+        arrayBuffer.fileStart = 0;
+        mp4boxfile.appendBuffer(arrayBuffer);
+      };
+      mp4boxfile.onReady = (info) => {
+        let codec = info.mime.match(/codecs="(\S*),/)[1]
+        if (codec.indexOf('avc') === -1) {
+          return this.$message.error("视频编码格式不支持")
+        }
+        if (size) {
+          return this.$message.error("视频大小不能超过100M");
+        }
+        if (fileType && this.accept.indexOf(fileType.toLocaleLowerCase()) > -1) {
+          let formData = new FormData()
+          formData.append('file', file.file);
+          this.instance.post(`/admin/file/add-unlimited`, formData).then(res => {
+            if (res && res.data) {
+              let videoList = res.data[0].split(";");
+              this.form.videoUrl = videoList[0]
+            }
+          })
+        } else {
+          return this.$message.error("视频格式错误")
+        }
+      }
+    },
+    handleUploader(list) {
+      this.form.thumbUrl = list?.[0]?.url
+      this.$forceUpdate()
+    }
+  },
+  created() {
+    this.getDetail()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.vpAdd {
+  height: 100%;
+
+  video {
+    width: 100%;
+    height: 100%;
+    object-fit: fill;
+  }
+
+  ::v-deep input[type="number"] {
+    line-height: 1px !important;
+
+    &::-webkit-outer-spin-button, &::-webkit-inner-spin-button {
+      -webkit-appearance: none !important;
+    }
+  }
+
+  .video {
+    width: 640px;
+    height: 360px;
+    border-radius: 4px;
+    border: 1px dashed #D0D4DC;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+
+    .icon {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+
+      span:nth-child(2) {
+        display: inline-block;
+        font-size: 16px;
+        color: #333333;
+        line-height: 30px;
+      }
+
+      .iconfont {
+        display: inline-block;
+        font-size: 40px;
+        color: #2266FF;
+      }
+    }
+
+    .tips {
+      display: inline-block;
+      font-size: 12px;
+      color: #999999;
+      line-height: 26px;
+    }
+  }
+}
+</style>
diff --git a/project/xiushan/apps/AppVideoPublic/vpList.vue b/project/xiushan/apps/AppVideoPublic/vpList.vue
new file mode 100644
index 00000000..3e307426
--- /dev/null
+++ b/project/xiushan/apps/AppVideoPublic/vpList.vue
@@ -0,0 +1,128 @@
+<template>
+  <section class="vpList">
+    <ai-list>
+      <ai-title slot="title" title="视频宣传" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="handleEdit()">添加</el-button>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="搜索标题" v-model="search.productName" 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" width="200px">
+            <template slot-scope="{row}">
+              <el-button v-if="row.status==0" type="text" @click="handlePublic(row)">发布</el-button>
+              <el-button v-else-if="row.status==1" type="text" @click="handlePublic(row)">取消发布</el-button>
+              <el-button type="text" @click="handleEdit(row.id)">编辑</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "vpList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    ...mapState(['user']),
+    isFinanceUser() {
+      return !!this.user.financeUser?.id
+    }
+  },
+  data() {
+    return {
+      search: {productName: ""},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      colConfigs: [
+        {label: "标题", prop: "title"},
+        {label: "浏览数量", prop: "viewCount", align: "center", width: 100},
+        {label: "发布人", prop: "publishUserName", width: 120},
+        {label: "发布时间", prop: "publishTime"},
+        {label: "状态", prop: "status", dict: "videoNewsStatus", align: "center"},
+        {slot: "options"}
+      ]
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/appvideonews/list", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    showDetail(id) {
+      this.$router.push({query: {id}})
+    },
+    handleEdit(id) {
+      this.$router.push({query: {id}, hash: "#add"})
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该视频?").then(() => {
+        this.instance.post("/appvideonews/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功!")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    },
+    handleIsHot(row) {
+      let {id, isHot} = row
+      this.instance.post("appfinancialproduct/setIsHot", null, {
+        params: {id, isHot}
+      }).then(res => {
+        if (res?.code == 0) {
+          this.$message.success("修改成功!")
+          this.getTableData()
+        } else {
+
+        }
+      })
+    },
+    handlePublic(row) {
+      let openLabel = row.status == 1 ? "取消发布" : "发布", status = (Number(row.status) + 1) % 2
+      this.$confirm(`是否要${openLabel}视频?`).then(() => {
+        this.instance.post("/appvideonews/setStatus", null, {
+          params: {id: row.id, status}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success(openLabel + "成功!")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    },
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.vpList {
+  height: 100%;
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreManage/AppScoreManage.vue b/project/xiushan/apps/creditScore/scoreManage/AppScoreManage.vue
new file mode 100644
index 00000000..9264e48e
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreManage/AppScoreManage.vue
@@ -0,0 +1,83 @@
+<template>
+  <ai-list>
+    <template slot="title">
+      <ai-title title="积分管理" :isShowBottomBorder="false"/>
+    </template>
+    <template slot="tabs">
+      <el-tabs v-model="currIndex">
+        <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
+          <component :is="tab.comp" v-if="currIndex === String(i)" :bizType="tab.bizType" :ref="tab.name"
+                     :areaId="areaId" :instance="instance" :dict="dict" :permissions="permissions"/>
+        </el-tab-pane>
+      </el-tabs>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+import pointsDeclaration from "./pointsDeclaration.vue"
+import pointsDetails from "./pointsDetails.vue"
+import pointsAppeal from './pointsAppeal'
+import {mapState} from 'vuex'
+import scoreChange from "./scoreChange";
+
+export default {
+    name: 'AppScoreManage',
+    label: "积分管理(秀山)",
+    components: {pointsDeclaration, pointsDetails, pointsAppeal, scoreChange},
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function
+    },
+
+    computed: {
+      ...mapState(['user']),
+      tabs() {
+        return [
+          // {
+          //   label: "积分申报",
+          //   name: "pointsDeclaration",
+          //   comp: pointsDeclaration,
+          //   permission: "app_apppartyfee_record",
+          //   bizType: '0'
+          // },
+          // { label: "积分申诉", name: "pointsAppeal", comp: pointsAppeal, permission: "app_apppartyfee_config", bizType: '1'},
+          {
+            label: "积分明细",
+            name: "pointsDetails",
+            comp: pointsDetails,
+            permission: "app_apppartyfee_statistics",
+            bizType: '2'
+          },
+          {
+            label: "积分调整",
+            name: "scoreChange",
+            comp: scoreChange,
+            permission: "",
+          },
+        ]
+      }
+    },
+    created() {
+      this.areaId = this.user.info.areaId
+    },
+    methods: {
+      changeArea() {
+        this.$nextTick(() => {
+          this.$refs[this.tabs[Number(this.currIndex)].name][0].getList()
+        })
+      }
+    },
+    data() {
+      return {
+        activeName: "pointsDeclaration",
+        currIndex: '0',
+        areaId: ''
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue b/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue
new file mode 100644
index 00000000..47b06f7b
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue
@@ -0,0 +1,627 @@
+<template>
+  <section class="pointsDeclaration">
+    <ai-list isTabs>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template slot="left">
+            <el-button type="primary" icon="iconfont iconAdd" @click="onAdd"
+                       v-if="$permissions('app_appvillagerintegraldeclare_edit')">代申诉
+            </el-button>
+            <el-button icon="iconfont iconEdit" @click="batchAduit()" :disabled="!Boolean(selectionList.length)"
+                       v-if="$permissions('app_appvillagerintegraldeclare_edit')">批量审核
+            </el-button>
+            <ai-select
+                v-model="search.status"
+                @change="page.current = 1, getList()"
+                placeholder="发布状态"
+                :selectList="dict.getDict('integralDeclareStatus')">
+            </ai-select>
+            <div class="times_div">
+              <p class="times">申诉时间</p>
+              <el-date-picker
+                  v-model="search.declareTimeStart"
+                  type="date"
+                  size="small"
+                  @change="page.current = 1,getList()"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="开始日期">
+              </el-date-picker>
+              <el-date-picker
+                  v-model="search.declareTimeEnd"
+                  type="date"
+                  size="small"
+                  @change="page.current = 1,getList()"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="结束日期">
+              </el-date-picker>
+            </div>
+          </template>
+          <template slot="right">
+            <el-input
+                v-model="search.portalUserPhone"
+                class="search-input"
+                size="mini"
+                placeholder="申诉人/申诉对象/..."
+                clearable
+                @change="page.current = 1, getList()"
+                suffix-icon="iconfont iconSearch"/>
+          </template>
+        </ai-search-bar>
+        <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="page.total"
+            :current.sync="page.current"
+            :size.sync="page.size"
+            @getList="getList"
+            @selection-change="handleSelectionChange"
+        >
+          <el-table-column slot="selection" type="selection" width="55" :selectable="row=>row.status==0"/>
+          <el-table-column slot="options" label="操作" align="center">
+            <template slot-scope="{ row }">
+              <span
+                  class="iconfont iconEdit icon-color89B"
+                  v-if="row.status === '0'&&$permissions('app_appvillagerintegraldeclare_edit')"
+                  title="编辑"
+                  @click="toEdit(row)"
+              ></span>
+              <span
+                  class="iconfont iconShow icon-color89B"
+                  v-if="row.status !== '0'&&$permissions('app_appvillagerintegraldeclare_detail')"
+                  title="详情"
+                  @click="toEdit(row)"
+              ></span>
+              <!-- <span
+                class="iconfont iconDelete icon-color89B"
+                v-if="$permissions('app_appofficialdocumentinfo_del')"
+                title="删除"
+                @click="remove(row.id)"
+              ></span> -->
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog
+        title="积分代申诉"
+        :visible.sync="dialog.visibleAdd"
+        :customFooter="true"
+        :destroyOnClose="true"
+        width="720px"
+        @close="init('ruleForm')"
+    >
+      <div class="form_div">
+        <el-form
+            ref="ruleForm"
+            :model="dialogInfo"
+            :rules="formRules"
+            size="small"
+            label-suffix="："
+            label-width="140px"
+        >
+          <el-form-item label="代申诉家庭" prop="users">
+            <ai-person-select :customClicker="true" :isMultiple="true" :chooseUserList.sync="dialogInfo.users"
+                              :instance="instance" url="/app/appvillagerintegralfamilymember/list">
+              <template name="option" v-slot:option="{ item }">
+                <span class="iconfont iconProlife">{{ item.name }}</span>
+                <ai-id mode="show" :show-eyes="false" :value="item.idNumber"/>
+              </template>
+            </ai-person-select>
+          </el-form-item>
+          <el-form-item label="代申诉说明" prop="declareDescription">
+            <el-input type="textarea" :rows="3" placeholder="请输入…" maxlength="100" show-word-limit
+                      v-model="dialogInfo.declareDescription"></el-input>
+          </el-form-item>
+          <el-form-item label="照片" prop="fileList">
+            <div class="upload">
+              <ai-uploader :instance="instance" v-model="dialogInfo.fileList" :limit="9"></ai-uploader>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialog.visibleAdd=false" size="medium">取消</el-button>
+        <el-button @click="declare('ruleForm')" type="primary" size="medium">提交</el-button>
+      </div>
+    </ai-dialog>
+    <ai-dialog
+        title="申诉审核"
+        :visible.sync="dialog.visibleDetail"
+        :customFooter="true"
+        :destroyOnClose="true"
+        width="720px"
+        @close="init('rules')"
+    >
+      <div class="form_content" v-if="!isBatch">
+        <div class="form_flex form_info">
+          <div>
+            <span class="form_label">申诉人：</span>
+            <span class="form_value">{{ rowInfo.declareName }}</span>
+          </div>
+          <div>
+            <span class="form_label">申诉对象：</span>
+            <span class="form_value">{{ rowInfo.declareObjName }}</span>
+          </div>
+          <div>
+            <span class="form_label">用户账号：</span>
+            <span class="form_value">{{ rowInfo.portalUserPhone }}</span>
+          </div>
+        </div>
+        <div class="form_info">
+          <span class="form_label">申诉说明：</span>
+          <span class="form_value">{{ rowInfo.declareDescription }}</span>
+        </div>
+        <div class="form_info">
+          <span class="form_label">申诉时间：</span>
+          <span class="form_value">{{ rowInfo.declareTime }}</span>
+        </div>
+        <div class="form_info">
+          <span class="form_label">照片：</span>
+          <span class="form_value">
+              <ai-uploader :disabled="true" :instance="instance" v-model="rowInfo.fileList" :limit="9"></ai-uploader>
+          </span>
+        </div>
+      </div>
+      <div class="form_div">
+        <el-form
+            ref="rules"
+            :model="dialogDetail"
+            :rules="formRules"
+            size="small"
+            label-suffix="："
+            v-show="rowInfo.status==0"
+            label-width="90px"
+        >
+          <el-form-item label="类型" prop="doType">
+            <el-radio-group v-model="dialogDetail.doType" @change="changeDoType">
+              <el-radio label="1">加分</el-radio>
+              <el-radio label="0">扣分</el-radio>
+              <el-radio label="2">拒绝</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="事项" prop="ruleId" v-if='dialogDetail.doType!=2'>
+            <el-select v-model="dialogDetail.ruleId" placeholder="请选择..." @change="ruleChange">
+              <el-option
+                  v-for="(item,i) in rulesList"
+                  :key="i"
+                  :label="item.ruleName"
+                  :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="积分" prop="doIntegral" v-if='dialogDetail.doType!=2'>
+            <el-col :span="1.5" style="margin-right: 8px;">{{ dialogDetail.doType == 0 ? '减少' : '增加' }}</el-col>
+            <el-col :span="6" style="margin-right: 8px;width:120px;">
+              <el-input type="number" v-model="dialogDetail.doIntegral" :placeholder="placeholder"
+                        :disabled="integralEdit"></el-input>
+            </el-col>
+            <el-col :span="1" style="margin-right: 8px;">分</el-col>
+          </el-form-item>
+          <el-form-item label="备注说明">
+            <el-input type="textarea" :rows="3" maxlength="100" placeholder="请输入…" show-word-limit
+                      v-model="dialogDetail.remark"></el-input>
+          </el-form-item>
+        </el-form>
+        <ai-wrapper
+            label-width="70px"
+            v-if="rowInfo.status!=0"
+            :columnsNumber="1">
+          <ai-info-item label="类型："><span
+              :style="{color:colorList[rowInfo.status]}">{{ dict.getLabel('integralDeclareStatus', rowInfo.status) }}</span>
+          </ai-info-item>
+          <ai-info-item label="事项：" v-if='rowInfo.doType!=2'><span>{{ rowInfo.ruleName }}</span></ai-info-item>
+          <ai-info-item label="积分：" v-if='rowInfo.doType!=2'>{{ rowInfo.doType == 0 ? '减少' : '增加' }}<span
+              style="color:#2266FF">{{ Math.abs(rowInfo.doIntegral) }}</span>分
+          </ai-info-item>
+          <ai-info-item label="备注说明："><span>{{ rowInfo.remark || '-' }}</span></ai-info-item>
+        </ai-wrapper>
+      </div>
+      <div class="dialog-footer" slot="footer" v-if="rowInfo.status==0">
+        <el-button @click="dialog.visibleDetail=false" size="medium">取消</el-button>
+        <el-button @click="onConfirm('rules')" type="primary" size="medium">提交</el-button>
+      </div>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "pointsAppeal",
+
+  props: {
+    instance: Function,
+    dict: Object,
+    bizType: String,
+    areaId: String
+  },
+
+  data() {
+    var integral = (rule, value, callback) => {
+      if (value) {
+        if (/^[1-9]\d*$/.test(value)) {
+          if (!this.integralEdit) {
+            if (Number(value) >= this.sectionNum.min && Number(value) <= this.sectionNum.max) {
+              callback();
+            } else {
+              callback(new Error(`请输入${this.sectionNum.min}至${this.sectionNum.max}之间的正整数积分`));
+            }
+          } else {
+            callback();
+          }
+
+        } else {
+          callback(new Error('请输入正整数'));
+        }
+      } else {
+        callback(new Error('请输入正整数'));
+      }
+    };
+    return {
+      search: {
+        status: '',
+        portalUserPhone: '',
+        declareTimeStart: null,
+        declareTimeEnd: null
+      },
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      colConfigs: [
+        {slot: "selection", label: "", align: "center"},
+        {prop: "declareName", label: "申诉人", align: "center"},
+        {prop: "declareObjName", label: "申诉对象", align: "center", hide: this.bizType == 1},
+        {
+          prop: "portalUserPhone",
+          label: "用户账号",
+        },
+        {
+          prop: "declareDescription",
+          label: "申诉说明",
+          align: "left",
+          width: 300
+        },
+        {
+          prop: "declareTime",
+          label: "申诉时间",
+          align: "left",
+          width: 150
+        },
+        {
+          prop: "declareName",
+          label: "操作人",
+          align: "center",
+        },
+        {
+          prop: "status",
+          label: "状态",
+          align: "center",
+          render: (h, {row}) => {
+            return h('span', {style: {color: this.dict.getColor('integralDeclareStatus', row.status)}}, this.dict.getLabel('integralDeclareStatus', row.status))
+          },
+        },
+        {slot: "options", label: "操作", align: "center"},
+      ],
+      tableData: [],
+      dialog: {
+        visibleAdd: false,
+        visibleDetail: false,
+        title: '积分代申诉'
+      },
+      dialogInfo: {
+        users: [],
+        reportIds: [],
+        declareDescription: "",
+        fileList: [],
+      },
+      dialogDetail: {
+        doType: '1',
+        ruleId: '',
+        doIntegral: '',
+        remark: '',
+        aduitIds: [],
+        ruleName: ''
+      },
+      isBatch: false,
+      rulesList: [],
+      rowInfo: {},
+      formRules: {
+        users: [{required: true, message: "请选择人员", trigger: "change"},],
+        declareDescription: [{required: true, message: "代申诉说明", trigger: "blur"}],
+        // fileList: [{ required: true, message: "请上传照片", trigger: "blur" },],
+        ruleId: [{required: true, message: "请选择事项", trigger: "blur"}],
+        doIntegral: [{required: true, validator: integral, trigger: "blur"}],
+        doType: [{required: true, message: "请选择类型", trigger: "change"}]
+      },
+      selectionList: [],
+      integralEdit: false,
+      sectionNum: {
+        min: null,
+        max: null
+      },
+      placeholder: '请输入...'
+    };
+  },
+  computed: {
+    colorList() {
+      return {
+        '0': '#FF8822',
+        '1': '#2EA222',
+        '2': '#FF4466'
+      }
+    }
+  },
+  created() {
+    this.dict
+    .load([
+      'integralDeclareStatus',
+      'integralDeclareDoType'
+    ]).then(() => {
+      this.getList();
+    });
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appvillagerintegraldeclare/list`, null, {
+        params: {
+          ...this.search,
+          ...this.page,
+          bizType: this.bizType,
+          areaId: this.areaId
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.tableData = res.data.records;
+          this.page.total = res.data.total;
+        }
+      });
+    },
+    handleSelectionChange(val) {
+      this.selectionList = val
+      this.dialogDetail.aduitIds = [];
+      val.forEach(e => {
+        this.dialogDetail.aduitIds.push(e.id);
+      })
+    },
+    // getSelect(val){
+    //     for(let e of val){
+    //         this.dialogInfo.reportIds.push(e.id)
+    //     }
+    // },
+    getColor(status) {
+      return this.dict.getColor('integralDeclareStatus', status)
+    },
+    onChange(val) {
+
+    },
+    declare(formName) {
+      this.dialogInfo.reportIds = [];
+      for (let e of this.dialogInfo.users) {
+        this.dialogInfo.reportIds.push(e.id)
+      }
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.instance.post("/app/appvillagerintegraldeclare/addOrUpdate", {
+            ...this.dialogInfo,
+            bizType: this.bizType
+          }, null).then(res => {
+            if (res.code == 0) {
+              this.dialog.visibleAdd = false;
+              this.getList();
+            }
+          })
+        } else {
+          return false;
+        }
+      });
+    },
+    init(formName) {
+      this.$refs[formName].clearValidate();
+      this.dialogDetail = {
+        doType: '1',
+        ruleId: '',
+        doIntegral: '',
+        remark: '',
+        aduitIds: [],
+        ruleName: ''
+      }
+      this.dialogInfo = {
+        users: [],
+        reportIds: [],
+        declareDescription: "",
+        fileList: [],
+      };
+      this.rulesList = [];
+    },
+    //批量审核
+    batchAduit() {
+      this.isBatch = true;
+      this.rowInfo.status = 0;
+      this.dialog.visibleDetail = true;
+      this.getRules('1')
+    },
+    getRowDetail(row) {
+      this.instance.post(`/app/appvillagerintegraldeclare/queryDetailById`, null, {
+        params: {
+          id: row.id
+        },
+      }).then((res) => {
+        if (res.code == 0) {
+          this.rowInfo = {...res.data}
+          this.dialog.visibleDetail = true;
+          this.dialogDetail.aduitIds = [];
+          this.dialogDetail.aduitIds.push(row.id);
+
+        }
+      });
+    },
+    toEdit(row) {
+      this.isBatch = false;
+      this.getRowDetail(row);
+      this.getRules('1')
+    },
+    changeDoType(val) {
+      this.dialogDetail.ruleId = "";
+      this.dialogDetail.ruleName = "";
+      this.dialogDetail.doIntegral = "";
+      this.placeholder = '请输入...';
+      this.$refs.rules.clearValidate();
+      this.getRules(val)
+    },
+    ruleChange(val) {
+      let item = this.rulesList.find(e => e.id == val);
+      this.dialogDetail.doIntegral = '';
+      this.$refs.rules.clearValidate();
+      if (item) {
+        //固定区间
+        this.dialogDetail.ruleName = item.ruleName;
+        if (item.integralValueType == 0) {
+          this.dialogDetail.doIntegral = Math.abs(item.integral);
+          this.integralEdit = true;
+        } else {
+          this.integralEdit = false;
+          if (Math.abs(item.integralEnd) > Math.abs(item.integralStart)) {
+            this.sectionNum.min = Math.abs(item.integralStart);
+            this.sectionNum.max = Math.abs(item.integralEnd);
+          } else {
+            this.sectionNum.max = Math.abs(item.integralStart);
+            this.sectionNum.min = Math.abs(item.integralEnd);
+          }
+          this.placeholder = `${this.sectionNum.min}~${this.sectionNum.max}`
+        }
+      }
+    },
+    //事项查询
+    getRules(integralType) {
+      this.instance.post(`/app/appvillagerintegralrule/list`, null, {
+        params: {
+          integralType,
+          size: 10000000
+        },
+      }).then((res) => {
+        if (res.code == 0) {
+          this.rulesList = res.data.records.filter(e => e.ruleStatus == 1);
+        }
+      });
+    },
+    remove(id) {
+      this.$confirm("确定删除该公文及其相关的流转信息？").then(() => {
+        this.instance
+        .post(`/app/appofficialdocumentinfo/delete?ids=${id}`)
+        .then((res) => {
+          if (res.code == 0) {
+            this.$message.success("删除成功！");
+            this.getList();
+          }
+        });
+      });
+    },
+    onReset() {
+      Object.keys(this.search).forEach(e => {
+        this.search[e] = "";
+      });
+      this.search.declareTimeStart = null;
+      this.search.declareTimeEnd = null;
+      this.getList();
+    },
+
+    onAdd() {
+      this.dialog.visibleAdd = true;
+    },
+
+    onConfirm(formName) {
+      this.$refs[formName].validate(v => {
+        if (v) {
+          this.instance.post("/app/appvillagerintegraldeclare/aduit", {
+            ...this.dialogDetail,
+          }, null).then(res => {
+            if (res.code == 0) {
+              this.dialog.visibleDetail = false;
+              this.$message.success("提交成功！");
+              this.dialogDetail.aduitIds = [];
+              this.getList();
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+
+
+  },
+};
+</script>
+
+<style lang="scss">
+.pointsDeclaration {
+  height: 100%;
+  overflow: auto;
+  background: #f3f6f9;
+
+  .times_div {
+    display: flex;
+    align-items: center;
+
+    .times {
+      display: block;
+      width: 72px;
+      height: 30px;
+      line-height: 30px;
+      text-align: center;
+      background: #F5F5F5;
+      border-radius: 2px 0px 0px 2px;
+      border: 1px solid #D0D4DC;
+      font-size: 14px;
+      color: #666666;
+    }
+  }
+
+  .form_content {
+    border-bottom: 1px solid #eee;
+
+    .form_flex {
+      display: flex;
+
+      div {
+        flex: 1;
+      }
+    }
+
+    .form_info {
+      margin-bottom: 8px;
+    }
+
+    .form_label {
+      display: inline-block;
+      color: #999;
+      vertical-align: top;
+    }
+
+    .form_value {
+      display: inline-block;
+      color: #333;
+      width: calc(100% - 80px);
+    }
+  }
+
+  .form_div {
+    padding-top: 24px;
+  }
+
+  .status-0 {
+    color: #ff8822;
+  }
+
+  .status-1 {
+    color: #2266ff;
+  }
+
+  .status-2 {
+    color: #999999;
+  }
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue b/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue
new file mode 100644
index 00000000..25d15d1b
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue
@@ -0,0 +1,618 @@
+<template>
+  <section class="pointsDeclaration">
+    <ai-list isTabs>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template slot="left">
+            <el-button type="primary" icon="iconfont iconAdd" @click="onAdd"
+                       v-if="$permissions('app_appvillagerintegraldeclare_edit')">代申报
+            </el-button>
+            <el-button icon="iconfont iconEdit" @click="batchAduit()" :disabled="!selectionList.length"
+                       v-if="$permissions('app_appvillagerintegraldeclare_edit')">批量审核
+            </el-button>
+            <ai-select
+                v-model="search.status"
+                @change="page.current = 1, getList()"
+                placeholder="发布状态"
+                :selectList="dict.getDict('integralDeclareStatus')">
+            </ai-select>
+            <div class="times_div">
+              <p class="times">申报时间</p>
+              <el-date-picker
+                  v-model="search.declareTimeStart"
+                  type="date"
+                  size="small"
+                  @change="page.current = 1,getList()"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="开始日期">
+              </el-date-picker>
+              <el-date-picker
+                  v-model="search.declareTimeEnd"
+                  type="date"
+                  size="small"
+                  @change="page.current = 1,getList()"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="结束日期">
+              </el-date-picker>
+            </div>
+          </template>
+          <template slot="right">
+            <el-input
+                v-model="search.portalUserPhone"
+                class="search-input"
+                size="mini"
+                placeholder="申诉人/申诉对象/..."
+                clearable
+                @change="page.current = 1, getList()"
+                suffix-icon="iconfont iconSearch"/>
+          </template>
+        </ai-search-bar>
+        <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="page.total"
+            :current.sync="page.current"
+            :size.sync="page.size"
+            @getList="getList"
+            @selection-change="handleSelectionChange">
+          <el-table-column slot="selection" type="selection" width="55" :selectable="row=>row.status==0"/>
+          <el-table-column slot="options" label="操作" align="center">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button
+                    type="text"
+                    :disabled="row.status === '0' || $permissions('app_appvillagerintegraldeclare_edit')"
+                    title="编辑"
+                    @click="toEdit(row)">
+                  编辑
+                </el-button>
+                <el-button
+                    type="text"
+                    :disabled="$permissions('app_appvillagerintegraldeclare_detail')"
+                    title="详情"
+                    @click="toEdit(row)">
+                  详情
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog
+        title="积分代申报"
+        :visible.sync="dialog.visibleAdd"
+        :customFooter="true"
+        :destroyOnClose="true"
+        width="720px"
+        @close="init('ruleForm')">
+      <div class="form_div">
+        <el-form
+            ref="ruleForm"
+            :model="dialogInfo"
+            :rules="formRules"
+            size="small"
+            label-suffix="："
+            label-width="140px">
+          <el-form-item label="代申报家庭" prop="users">
+            <ai-person-select :customClicker="true" :isMultiple="true" :chooseUserList.sync="dialogInfo.users"
+                              :instance="instance" url="/app/appvillagerintegralfamilymember/list">
+              <template name="option" v-slot:option="{ item }">
+                <span class="iconfont iconProlife">{{ item.name }}</span>
+                <ai-id mode="show" :show-eyes="false" :value="item.idNumber"/>
+              </template>
+            </ai-person-select>
+          </el-form-item>
+          <el-form-item label="代申报说明" prop="declareDescription">
+            <el-input type="textarea" :rows="3" placeholder="请输入…" maxlength="100" show-word-limit
+                      v-model="dialogInfo.declareDescription"></el-input>
+          </el-form-item>
+          <el-form-item label="照片" prop="fileList">
+            <div class="upload">
+              <ai-uploader :instance="instance" v-model="dialogInfo.fileList" :limit="9"></ai-uploader>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialog.visibleAdd=false" size="medium">取消</el-button>
+        <el-button @click="declare('ruleForm')" type="primary" size="medium">提交</el-button>
+      </div>
+    </ai-dialog>
+    <ai-dialog
+        title="申报审核"
+        :visible.sync="dialog.visibleDetail"
+        :customFooter="true"
+        :destroyOnClose="true"
+        width="720px"
+        @close="init('rules')">
+      <div class="form_content" v-if="!isBatch">
+        <div class="form_flex form_info">
+          <div>
+            <span class="form_label">申报人：</span>
+            <span class="form_value">{{ rowInfo.declareName }}</span>
+          </div>
+          <div>
+            <span class="form_label">申报对象：</span>
+            <span class="form_value">{{ rowInfo.declareObjName }}</span>
+          </div>
+          <div>
+            <span class="form_label">用户账号：</span>
+            <span class="form_value">{{ rowInfo.portalUserPhone }}</span>
+          </div>
+        </div>
+        <div class="form_info">
+          <span class="form_label">申报说明：</span>
+          <span class="form_value">{{ rowInfo.declareDescription }}</span>
+        </div>
+        <div class="form_info">
+          <span class="form_label">申报时间：</span>
+          <span class="form_value">{{ rowInfo.declareTime }}</span>
+        </div>
+        <div class="form_info">
+          <span class="form_label">照片：</span>
+          <span class="form_value">
+              <ai-uploader :disabled="true" :instance="instance" v-model="rowInfo.fileList" :limit="9"></ai-uploader>
+          </span>
+        </div>
+      </div>
+      <div class="form_div">
+        <el-form
+            ref="rules"
+            :model="dialogDetail"
+            :rules="formRules"
+            size="small"
+            label-suffix="："
+            v-show="rowInfo.status==0"
+            label-width="90px"
+        >
+          <el-form-item label="类型" prop="doType">
+            <el-radio-group v-model="dialogDetail.doType" @change="changeDoType">
+              <el-radio label="1">加分</el-radio>
+              <el-radio label="0">扣分</el-radio>
+              <el-radio label="2">拒绝</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="事项" prop="ruleId" v-if='dialogDetail.doType!=2'>
+            <el-select v-model="dialogDetail.ruleId" placeholder="请选择..." @change="ruleChange">
+              <el-option
+                  v-for="(item,i) in rulesList"
+                  :key="i"
+                  :label="item.ruleName"
+                  :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="积分" prop="doIntegral" v-if='dialogDetail.doType!=2'>
+            <el-col :span="1.5" style="margin-right: 8px;">{{ dialogDetail.doType == 0 ? '减少' : '增加' }}</el-col>
+            <el-col :span="6" style="margin-right: 8px;width:120px;">
+              <el-input type="number" v-model="dialogDetail.doIntegral" :placeholder="placeholder"
+                        :disabled="integralEdit"></el-input>
+            </el-col>
+            <el-col :span="1" style="margin-right: 8px;">分</el-col>
+          </el-form-item>
+          <el-form-item label="备注说明">
+            <el-input type="textarea" :rows="3" maxlength="100" placeholder="请输入…" show-word-limit
+                      v-model="dialogDetail.remark"></el-input>
+          </el-form-item>
+        </el-form>
+        <ai-wrapper
+            label-width="70px"
+            v-if="rowInfo.status!=0"
+            :columnsNumber="1">
+          <ai-info-item label="类型："><span
+              :style="{color:colorList[rowInfo.status]}">{{ dict.getLabel('integralDeclareStatus', rowInfo.status) }}</span>
+          </ai-info-item>
+          <ai-info-item label="事项：" v-if='rowInfo.doType!=2'><span>{{ rowInfo.ruleName }}</span></ai-info-item>
+          <ai-info-item label="积分：" v-if='rowInfo.doType!=2'>{{ rowInfo.doType == 0 ? '减少' : '增加' }}<span
+              style="color:#2266FF">{{ Math.abs(rowInfo.doIntegral) }}</span>分
+          </ai-info-item>
+          <ai-info-item label="备注说明："><span>{{ rowInfo.remark || '-' }}</span></ai-info-item>
+        </ai-wrapper>
+      </div>
+      <div class="dialog-footer" slot="footer" v-if="rowInfo.status==0">
+        <el-button @click="dialog.visibleDetail=false" size="medium">取消</el-button>
+        <el-button @click="onConfirm('rules')" type="primary" size="medium">提交</el-button>
+      </div>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "pointsDeclaration",
+
+  props: {
+    instance: Function,
+    dict: Object,
+    bizType: String,
+    areaId: String
+  },
+
+  data() {
+    var integral = (rule, value, callback) => {
+      if (value) {
+        if (/^[1-9]\d*$/.test(value)) {
+          if (!this.integralEdit) {
+            if (Number(value) >= this.sectionNum.min && Number(value) <= this.sectionNum.max) {
+              callback();
+            } else {
+              callback(new Error(`请输入${this.sectionNum.min}至${this.sectionNum.max}之间的正整数积分`));
+            }
+          } else {
+            callback();
+          }
+
+        } else {
+          callback(new Error('请输入正整数'));
+        }
+      } else {
+        callback(new Error('请输入正整数'));
+      }
+    };
+    return {
+      search: {
+        status: '',
+        portalUserPhone: '',
+        declareTimeStart: null,
+        declareTimeEnd: null
+      },
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      colConfigs: [
+        {slot: "selection", label: ""},
+        {prop: "declareName", label: "申报人", align: "center"},
+        {prop: "declareObjName", label: "申报对象", align: "center", hide: this.bizType == 1},
+        {
+          prop: "portalUserPhone",
+          label: "用户账号",
+        },
+        {
+          prop: "declareDescription",
+          label: "申诉说明",
+          align: "left",
+          width: 300
+        },
+        {
+          prop: "declareTime",
+          label: "申报时间",
+          align: "left",
+          width: 150
+        },
+        {
+          prop: "declareName",
+          label: "操作人",
+          align: "center",
+        },
+        {
+          prop: "status",
+          label: "状态",
+          align: "center",
+          render: (h, {row}) => {
+            return h('span', {style: {color: this.dict.getColor('integralDeclareStatus', row.status)}}, this.dict.getLabel('integralDeclareStatus', row.status))
+          },
+        },
+        {slot: "options", label: "操作", align: "center"},
+      ],
+      tableData: [],
+      dialog: {
+        visibleAdd: false,
+        visibleDetail: false,
+        title: '积分代申报'
+      },
+      dialogInfo: {
+        users: [],
+        reportIds: [],
+        declareDescription: "",
+        fileList: [],
+      },
+      dialogDetail: {
+        doType: '1',
+        ruleId: '',
+        doIntegral: '',
+        remark: '',
+        aduitIds: [],
+        ruleName: ''
+      },
+      isBatch: false,
+      rulesList: [],
+      rowInfo: {},
+      formRules: {
+        users: [{required: true, message: "请选择人员", trigger: "change"},],
+        declareDescription: [{required: true, message: "代申报说明", trigger: "blur"}],
+        // fileList: [{ required: true, message: "请上传照片", trigger: "blur" },],
+        ruleId: [{required: true, message: "请选择事项", trigger: "blur"}],
+        doIntegral: [{required: true, validator: integral, trigger: "blur"}],
+        doType: [{required: true, message: "请选择类型", trigger: "change"}]
+      },
+      selectionList: [],
+      integralEdit: false,
+      sectionNum: {
+        min: null,
+        max: null
+      },
+      placeholder: '请输入...'
+    };
+  },
+  computed: {
+    colorList() {
+      return {
+        '0': '#FF8822',
+        '1': '#2EA222',
+        '2': '#FF4466'
+      }
+    }
+  },
+  created() {
+    this.dict
+    .load([
+      'integralDeclareStatus',
+      'integralDeclareDoType'
+    ]).then(() => {
+      this.getList();
+    });
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appvillagerintegraldeclare/list`, null, {
+        params: {
+          ...this.search,
+          ...this.page,
+          bizType: this.bizType,
+          areaId: this.areaId
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.tableData = res.data.records;
+          this.page.total = res.data.total;
+        }
+      });
+    },
+    handleSelectionChange(val) {
+      this.selectionList = val
+      this.dialogDetail.aduitIds = [];
+      val.forEach(e => {
+        this.dialogDetail.aduitIds.push(e.id);
+      })
+    },
+    // getSelect(val){
+    //     for(let e of val){
+    //         this.dialogInfo.reportIds.push(e.id)
+    //     }
+    // },
+    getColor(status) {
+      return this.dict.getColor('integralDeclareStatus', status)
+    },
+    onChange(val) {
+
+    },
+    declare(formName) {
+      this.dialogInfo.reportIds = [];
+      for (let e of this.dialogInfo.users) {
+        this.dialogInfo.reportIds.push(e.id)
+      }
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.instance.post("/app/appvillagerintegraldeclare/addOrUpdate", {
+            ...this.dialogInfo,
+            bizType: this.bizType
+          }, null).then(res => {
+            if (res.code == 0) {
+              this.dialog.visibleAdd = false;
+              this.getList();
+            }
+          })
+        } else {
+          return false;
+        }
+      });
+    },
+    init(formName) {
+      this.$refs[formName].clearValidate();
+      this.dialogDetail = {
+        doType: '1',
+        ruleId: '',
+        doIntegral: '',
+        remark: '',
+        aduitIds: [],
+        ruleName: ''
+      }
+      this.dialogInfo = {
+        users: [],
+        reportIds: [],
+        declareDescription: "",
+        fileList: [],
+      };
+      this.rulesList = [];
+    },
+    //批量审核
+    batchAduit() {
+      this.isBatch = true;
+      this.rowInfo.status = 0;
+      this.dialog.visibleDetail = true;
+      this.getRules('1')
+    },
+    getRowDetail(row) {
+      this.instance.post(`/app/appvillagerintegraldeclare/queryDetailById`, null, {
+        params: {
+          id: row.id
+        },
+      }).then((res) => {
+        if (res.code == 0) {
+          this.rowInfo = {...res.data}
+          this.dialog.visibleDetail = true;
+          this.dialogDetail.aduitIds = [];
+          this.dialogDetail.aduitIds.push(row.id);
+
+        }
+      });
+    },
+    toEdit(row) {
+      this.isBatch = false;
+      this.getRowDetail(row);
+      this.getRules('1')
+    },
+    changeDoType(val) {
+      this.dialogDetail.ruleId = "";
+      this.dialogDetail.ruleName = "";
+      this.dialogDetail.doIntegral = "";
+      this.placeholder = '请输入...';
+      this.$refs.rules.clearValidate();
+      this.getRules(val)
+    },
+    ruleChange(val) {
+      let item = this.rulesList.find(e => e.id == val);
+      this.dialogDetail.doIntegral = '';
+      this.$refs.rules.clearValidate();
+      if (item) {
+        //固定区间
+        this.dialogDetail.ruleName = item.ruleName;
+        if (item.integralValueType == 0) {
+          this.dialogDetail.doIntegral = Math.abs(item.integral);
+          this.integralEdit = true;
+        } else {
+          this.integralEdit = false;
+          if (Math.abs(item.integralEnd) > Math.abs(item.integralStart)) {
+            this.sectionNum.min = Math.abs(item.integralStart);
+            this.sectionNum.max = Math.abs(item.integralEnd);
+          } else {
+            this.sectionNum.max = Math.abs(item.integralStart);
+            this.sectionNum.min = Math.abs(item.integralEnd);
+          }
+          this.placeholder = `${this.sectionNum.min}~${this.sectionNum.max}`
+        }
+      }
+    },
+    //事项查询
+    getRules(integralType) {
+      this.instance.post(`/app/appvillagerintegralrule/list`, null, {
+        params: {
+          integralType,
+          size: 10000000
+        },
+      }).then((res) => {
+        if (res.code == 0) {
+          this.rulesList = res.data.records.filter(e => e.ruleStatus == 1);
+        }
+      });
+    },
+    remove(id) {
+      this.$confirm("确定删除该公文及其相关的流转信息？").then(() => {
+        this.instance
+        .post(`/app/appofficialdocumentinfo/delete?ids=${id}`)
+        .then((res) => {
+          if (res.code == 0) {
+            this.$message.success("删除成功！");
+            this.getList();
+          }
+        });
+      });
+    },
+    onReset() {
+      Object.keys(this.search).forEach(e => {
+        this.search[e] = "";
+      });
+      this.search.declareTimeStart = null;
+      this.search.declareTimeEnd = null;
+      this.getList();
+    },
+
+    onAdd() {
+      this.dialog.visibleAdd = true;
+    },
+
+    onConfirm(formName) {
+      this.$refs[formName].validate(v => {
+        if (v) {
+          this.instance.post("/app/appvillagerintegraldeclare/aduit", {
+            ...this.dialogDetail,
+          }, null).then(res => {
+            if (res.code == 0) {
+              this.dialog.visibleDetail = false;
+              this.$message.success("提交成功！");
+              this.dialogDetail.aduitIds = [];
+              this.getList();
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+
+
+  },
+};
+</script>
+
+<style lang="scss">
+.pointsDeclaration {
+  height: 100%;
+  overflow: auto;
+  background: #f3f6f9;
+
+  .times_div {
+    .times {
+      display: block;
+      width: 72px;
+      height: 30px;
+      line-height: 30px;
+      text-align: center;
+      background: #F5F5F5;
+      border-radius: 2px 0px 0px 2px;
+      border: 1px solid #D0D4DC;
+      font-size: 14px;
+      color: #666666;
+    }
+  }
+
+  .form_content {
+    border-bottom: 1px solid #eee;
+
+    .form_flex {
+      display: flex;
+
+      div {
+        flex: 1;
+      }
+    }
+
+    .form_info {
+      margin-bottom: 8px;
+    }
+
+    .form_label {
+      display: inline-block;
+      color: #999;
+      vertical-align: top;
+    }
+
+    .form_value {
+      display: inline-block;
+      color: #333;
+      width: calc(100% - 80px);
+    }
+  }
+
+  .form_div {
+    padding-top: 24px;
+  }
+
+  .status-0 {
+    color: #ff8822;
+  }
+
+  .status-1 {
+    color: #2266ff;
+  }
+
+  .status-2 {
+    color: #999999;
+  }
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue b/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
new file mode 100644
index 00000000..f53784ea
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
@@ -0,0 +1,291 @@
+<template>
+  <section class="pointsDetails">
+    <ai-list isTabs>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template slot="left">
+            <el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至"
+                            @change="timeChange"
+                            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
+                            format="yyyy-MM-dd"></el-date-picker>
+          </template>
+          <template slot="right">
+            <el-input
+                v-model="search.portalUserPhone"
+                class="search-input"
+                size="small"
+                placeholder="对象、用户账号、事件类型"
+                clearable
+                @change="search.current = 1, getList()"
+                suffix-icon="iconfont iconSearch"/>
+          </template>
+        </ai-search-bar>
+        <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            ref="aitableex"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
+          <el-table-column slot="changeIntegral" label="积分" align="center">
+            <template slot-scope="{ row }">
+              <span>{{ row.changeIntegral > 0 ? '+' : '' }}{{ row.changeIntegral }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="doType" label="类型" align="center">
+            <template slot-scope="{ row }">
+              <span>{{ dict.getLabel('integralDetailType', row.bizType) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="options" label="操作" align="center" fixed="right" width="120">
+            <template slot-scope="{ row }">
+              <el-button
+                  type="text"
+                  title="详情"
+                  :disabled="!$permissions('app_appvillagerintegraldetail_detail')"
+                  @click="viewItem(row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog
+        title="详情"
+        :visible.sync="dialog.visible"
+        :customFooter="true"
+        :destroyOnClose="true"
+        width="720px"
+    >
+      <div class="form_content">
+        <div class="form_info">
+          <span class="form_label">用户账号：</span>
+          <span class="form_value">{{ dialogInfo.portalUserPhone }}</span>
+        </div>
+        <div class="form_info">
+          <span class="form_label">事项：</span>
+          <span class="form_value">{{ dialogInfo.ruleName }}</span>
+        </div>
+        <div class="form_flex form_info">
+          <div>
+            <span class="form_label">积分：</span>
+            <span class="form_value">{{ dialogInfo.changeIntegral >= 0 ? '增加' : '减少' }}<span
+                style="color:#2266FF">{{ Math.abs(dialogInfo.changeIntegral) }}</span>分</span>
+          </div>
+          <!-- <div>
+            <span class="form_label">途径：</span>
+          <span class="form_value">{{$dict.getLabel("integralDetailBizType", dialogInfo.bizType)}}</span>
+          </div> -->
+        </div>
+        <!-- <div class="form_info">
+          <span class="form_label">{{dialogInfo.bizType == 1 ? '申诉' : '申报'}}说明：</span>
+          <span
+            class="form_value"
+          >{{dialogInfo.description}}</span>
+        </div>
+        <div class="form_info">
+          <span class="form_label">照片：</span>
+          <span class="form_value" v-if="dialogInfo.fileList && dialogInfo.fileList.length">
+            <ai-uploader  :disabled="true" :instance="instance" v-model="dialogInfo.fileList" :limit="9" ></ai-uploader>
+          </span>
+          <span class="form_value" v-else>-</span>
+        </div> -->
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialog.visible=false" size="medium">关闭</el-button>
+      </div>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "pointsDeclaration",
+
+  props: {
+    instance: Function,
+    dict: Object,
+    areaId: String
+  },
+
+  data() {
+    return {
+      searchDotime: [],
+      search: {
+        current: 1,
+        size: 10,
+        portalUserPhone: '',
+        doTimeStart: null,
+        doTimeEnd: null
+      },
+      total: 10,
+      colConfigs: [
+        {prop: "portalUserPhone", label: "用户账号", align: "center", width: 160},
+        {
+          prop: "ruleName",
+          label: "事件类型",
+          "show-overflow-tooltip": true,
+          width: 420
+        },
+        {
+          prop: "doTime",
+          label: "时间",
+          width: 200
+        },
+        // {
+        //   prop: "doType",
+        //   label: "类型",
+        //   align: "center",
+        //   width: 100,
+        //   render: (h, params) => {
+        //     return h(
+        //       "span",
+        //       {
+        //         class: "status-" + params.row.doType,
+        //       },
+        //       this.$dict.getLabel("integralIntegralType", params.row.doType)
+        //     );
+        //   },
+        // },
+        {slot: "doType", label: "类型", width: 100},
+        {slot: "changeIntegral", label: "积分", width: 100},
+        // {
+        //   prop: "bizType",
+        //   label: "途径",
+        //   align: "center",
+        //   width: 100,
+        //   formart: (bizType) =>
+        //   this.$dict.getLabel("integralDetailBizType", bizType) || '-',
+        // },
+        {slot: "options", label: "操作", align: "center"},
+      ],
+      tableData: [],
+      dialog: {
+        visible: false,
+      },
+      dialogInfo: {},
+    };
+  },
+
+  mounted() {
+    this.$dict
+    .load([
+      "integralDeclareDoType",
+      "integralDetailType",
+      "integralDetailBizType"
+    ])
+    .then(() => {
+      this.getList();
+    });
+  },
+
+  methods: {
+    getList() {
+      this.instance
+      .post(`/app/appvillagerintegraldetail/list`, null, {
+        params: {
+          ...this.search,
+          areaId: this.areaId,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.tableData = res.data.records;
+          this.total = res.data.total;
+        }
+      });
+    },
+
+    timeChange() {
+      if (this.searchDotime) {
+        this.search.doTimeStart = this.searchDotime[0]
+        this.search.doTimeEnd = this.searchDotime[1]
+      } else {
+        this.search.doTimeStart = null
+        this.search.doTimeEnd = null
+      }
+      this.search.current = 1
+      this.getList()
+    },
+
+    viewItem(row) {
+      this.dialog.visible = true
+      this.instance.post(`/app/appvillagerintegraldetail/queryDetailById?id=${row.id}`, null, {}).then((res) => {
+        if (res.code == 0) {
+          this.dialogInfo = res.data
+          console.log(this.dialogInfo)
+        }
+      });
+    },
+
+    onReset() {
+      this.search.current = 1
+      this.search.doTimeStart = null
+      this.search.doTimeEnd = null
+      this.search.portalUserPhone = ''
+      this.searchDotime = []
+      this.getList();
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.pointsDetails {
+  height: 100%;
+  background: #f3f6f9;
+  overflow: auto;
+
+  .form_content {
+    .form_flex {
+      display: flex;
+
+      div {
+        flex: 1;
+      }
+    }
+
+    .form_info {
+      margin-bottom: 8px;
+    }
+
+    .form_label {
+      display: inline-block;
+      color: #999;
+      vertical-align: top;
+      width: 70px;
+      text-align: right;
+    }
+
+    .form_value {
+      display: inline-block;
+      color: #333;
+      width: calc(100% - 70px);
+      // img {
+      //   width: 100px;
+      //   height: 100px;
+      //   margin: 0 8px 8px 0;
+      // }
+    }
+  }
+
+  .form_div {
+    padding-top: 24px;
+    border-top: 1px solid #eee;
+  }
+
+  .status-0 {
+    color: #FF4466;
+  }
+
+  .status-1 {
+    color: #2EA222;
+  }
+
+  .status-2 {
+    color: #999999;
+  }
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreManage/scoreChange.vue b/project/xiushan/apps/creditScore/scoreManage/scoreChange.vue
new file mode 100644
index 00000000..6edb64ed
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreManage/scoreChange.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="scoreChange">
+    <ai-list isTabs>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template slot="left">
+            <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true"
+                       :disabled="!permissions('app_appvillagerintegraldetail_change')">添加
+            </el-button>
+<!--            <ai-import :instance="instance" :dict="dict" name="积分调整" type="appvillagerintegraldetail"-->
+<!--                       v-if="permissions('app_appvillagerintegraldetail_change')" @success="getList"/>-->
+          </template>
+        </ai-search-bar>
+        <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="page.total"
+            :current.sync="page.current"
+            :size.sync="page.size"
+            @getList="getList">
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog
+        title="添加积分调整"
+        :visible.sync="dialog"
+        :destroyOnClose="true"
+        width="720px"
+        @onConfirm="onConfirm"
+        @closed="form={}">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="选择账号" prop="portalUserId">
+          <ai-user-picker :instance="instance" v-model="form.portalUserId"/>
+        </el-form-item>
+        <el-form-item label="调整说明" prop="description">
+          <el-input v-model.trim="form.description" placeholder="请输入..." type="textarea" :rows="4" show-word-limit
+                    maxlength="100"></el-input>
+        </el-form-item>
+        <el-form-item label="类型" prop="doType">
+          <el-radio-group v-model="form.doType">
+            <el-radio label="0">加分</el-radio>
+            <el-radio label="1">减分</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="积分" prop="changeIntegral">
+          <el-input v-model.trim.num="form.changeIntegral" placeholder="请输入正整数" size="small"></el-input>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex"
+import AiUserPicker from "../../../components/AiUserPicker";
+
+export default {
+  name: "scoreChange",
+  components: {AiUserPicker},
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    areaId: String
+  },
+  data() {
+    return {
+      tableData: [],
+      page: {
+        current: 1,
+        size: 10,
+        total: 10
+      },
+      form: {},
+      dialog: false,
+      personList: [],
+    }
+  },
+  computed: {
+    ...mapState(["user"]),
+    rules() {
+      return {
+        portalUserId: [{required: true, message: '请选择人员', trigger: 'blur'},],
+        description: [{required: true, message: '请输入调整说明', trigger: 'blur'},],
+        doType: [{required: true, message: '请输入调整说明', trigger: 'change'},],
+        changeIntegral: [
+          {
+            required: true, validator: (rule, value, callback) => {
+              if (!/^[1-9]\d*$/.test(value)) {
+                callback(new Error('请输入正整数'))
+              } else {
+                callback();
+              }
+            }, trigger: 'blur'
+          },],
+      }
+    },
+    colConfigs() {
+      return [
+        {prop: "portalUserPhone", label: "用户账号"},
+        {prop: "description", label: "调整说明"},
+        {
+          prop: "changeIntegral", label: "类型", align: "center",
+          render: (h, {row}) => [< span> {+row.changeIntegral > 0 ? "加分" : '减分'
+          } < /span>]
+        },
+        {
+          prop: "changeIntegral",
+          label: "积分",
+          align: "center",
+          render: (h, {row}) => [
+            <span>{row.changeIntegral > 0 ? `+${row.changeIntegral}` : `${row.changeIntegral}`}</span>]
+        },
+        {prop: "doTime", label: "操作时间"},
+        {prop: "declareObjName", label: "操作人", align: "center"},
+      ]
+    }
+  },
+  methods: {
+    selectPerson(val) {
+      if (val) {
+        this.form.portalUserId = val.id
+        this.personList = [{...val}]
+      } else {
+        this.form.portalUserId = ""
+        this.personList = []
+      }
+    },
+    onConfirm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.instance.post(`/app/appvillagerintegraldetail/changeIntegral`, {
+            ...this.form,
+            changeIntegral: this.form.doType == 0 ? `+${this.form.changeIntegral}` : `-${this.form.changeIntegral}`
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success("添加成功")
+              this.dialog = false
+              this.getList()
+            }
+          })
+        }
+      })
+    },
+    getList() {
+      this.instance.post(`/app/appvillagerintegraldetail/list`, null, {
+        params: {
+          ...this.page,
+          areaId: this.areaId,
+          doType: 2
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data.records
+          this.page.total = res.data.total
+        }
+      })
+    }
+  },
+  created() {
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.scoreChange {
+  height: 100%;
+  overflow: auto;
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scorePersonal/AppScorePersonal.vue b/project/xiushan/apps/creditScore/scorePersonal/AppScorePersonal.vue
new file mode 100644
index 00000000..2b1ad3e0
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scorePersonal/AppScorePersonal.vue
@@ -0,0 +1,35 @@
+<template>
+  <section class="AppScorePersonal">
+    <component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
+  </section>
+</template>
+
+<script>
+import detail from './detail'
+import SpList from "./spList";
+
+export default {
+  name: 'AppScorePersonal',
+  label: "积分统计(秀山)",
+  components: {SpList, detail},
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentComponent() {
+      return this.$route.query.id ? detail : SpList
+    }
+  },
+  created() {
+    this.dict.load('integralVillageGroup', 'integralRuleStatus', 'integralPersonType', 'householdRelation', 'residentType', "integralDetailType");
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppScorePersonal {
+  height: 100%;
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scorePersonal/detail.vue b/project/xiushan/apps/creditScore/scorePersonal/detail.vue
new file mode 100644
index 00000000..17b32950
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scorePersonal/detail.vue
@@ -0,0 +1,194 @@
+<template>
+  <ai-detail class="spDetail">
+    <template slot="title">
+      <ai-title title="积分明细" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="$router.push({})"></ai-title>
+    </template>
+    <template slot="content">
+      <div class="detail-info">
+        <div class="detail-info__item">
+          <h2>账号</h2>
+          <span>{{ info.phone || "-" }}</span>
+        </div>
+        <div class="detail-info__item">
+          <h2>获取积分</h2>
+          <span style="color: #2266FF;">{{ info.personalIntegral || 0 }}</span>
+        </div>
+        <div class="detail-info__item">
+          <h2>已用积分</h2>
+          <span style="color: #2266FF;">{{ info.personalUsedIntegral || 0 }}</span>
+        </div>
+      </div>
+      <ai-card title="余额变动明细">
+        <template slot="right">
+        </template>
+        <template #content>
+          <el-select v-model="doType" placeholder="请选择类型" size='small' clearable @change="page.current=1,getList()">
+            <el-option
+                v-for="(item,i) in dict.getDict('integralDetailType')"
+                :label="item.dictName"
+                :key="i"
+                :value="item.dictValue">
+            </el-option>
+          </el-select>
+          <ai-table class="fs-14"
+                    style="margin-top: 16px;"
+                    :tableData="tableData"
+                    :col-configs="colConfigs"
+                    :total="page.total"
+                    :current.sync="page.current"
+                    :size.sync="page.size"
+                    :isShowPagination="false"
+                    tableSize="small"
+                    :border="true"
+                    :dict="dict"
+                    @getList="getList">
+          </ai-table>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+export default {
+  name: 'spDetail',
+  props: {
+    instance: Function,
+    dict: Object
+  },
+  data() {
+    return {
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      info: {},
+      doType: '',
+      tableData: []
+    }
+  },
+  created() {
+    this.getInfo()
+    this.getList()
+  },
+  computed: {
+    colConfigs() {
+      return [
+        {
+          prop: 'doTime',
+          label: '时间',
+          align: 'left'
+        },
+        {
+          prop: 'doType',
+          align: 'center',
+          label: '类型',
+          dict:"integralDetailType",
+        },
+        {
+          prop: 'changeIntegral',
+          align: 'center',
+          label: '变动积分'
+        },
+        {
+          prop: 'nowIntegral',
+          align: 'center',
+          label: '剩余积分'
+        },
+        {
+          prop: 'description',
+          label: '事件类型',
+          align: 'left'
+        }
+      ]
+    },
+  },
+  methods: {
+    getInfo() {
+      let {id} = this.$route.query
+      this.instance.post(`/app/appportaluser/list?id=${id}`).then(res => {
+        if (res?.data) {
+          this.info = res.data.records?.[0]
+        }
+      })
+    },
+    getList() {
+      let {id: portalUserId} = this.$route.query
+      this.instance.post(`/appvillagerintegraldetail/list`, null, {
+        params: {...this.page, portalUserId}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data.records
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.spDetail {
+  height: 100%;
+  background-color: #fff;
+
+  ::v-deep .ai-card__body {
+    padding: 12px 16px 20px !important;
+  }
+
+  .detail-info {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+
+    .detail-info__item {
+      flex: 1;
+      height: 96px;
+      margin-right: 20px;
+      padding: 16px 24px;
+      background: #FFFFFF;
+      box-shadow: 0 4px 6px -2px rgba(15, 15, 21, 0.15);
+      border-radius: 4px;
+
+      &:last-child {
+        margin-right: 0;
+      }
+
+      h2 {
+        margin-bottom: 8px;
+        color: #888888;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      span {
+        display: block;
+        line-height: 32px;
+        font-size: 24px;
+        font-weight: bold;
+        color: #222;
+      }
+    }
+  }
+
+  .iconExported {
+    color: #5088FF;
+    font-size: 12px;
+    cursor: pointer;
+  }
+
+  .info {
+    padding: 16px 0 16px 0;
+  }
+
+  .do_type {
+    height: 56px;
+  }
+
+  .fs-14 {
+    ::v-deep .el-table--small {
+      font-size: 14px !important;
+    }
+  }
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scorePersonal/spList.vue b/project/xiushan/apps/creditScore/scorePersonal/spList.vue
new file mode 100644
index 00000000..8eae750c
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scorePersonal/spList.vue
@@ -0,0 +1,171 @@
+<template>
+  <section class="spList">
+    <ai-list>
+      <ai-title slot="title" title="个人积分" isShowBottomBorder/>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template slot="left">
+            <el-select size="small" v-model="searchObj.isPositive" placeholder="积分是否大于0" clearable
+                       @change="page.current = 1,getList()">
+              <el-option
+                  v-for="(item,i) in isPositiveList"
+                  :key="i"
+                  :label="item.dictName"
+                  :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </template>
+          <template slot="right">
+            <el-input v-model="searchObj.phone" size="small" placeholder="用户账号"
+                      @change="page.current = 1, searchObj.con = '', getList()" clearable
+                      suffix-icon="iconfont iconSearch"/>
+          </template>
+        </ai-search-bar>
+        <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="page.total"
+            style="margin-top: 12px;"
+            :current.sync="page.current"
+            :size.sync="page.size"
+            @getList="getList">
+          <el-table-column label="操作" slot="options" fixed="right" align="center" width="180">
+            <template v-slot="{row}">
+              <div class="table-options">
+                <el-button type="text" :disabled="!$permissions('app_appvillagerintegralfamily_detail')" title="详情"
+                           @click="goDetail(row)">详情
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "spList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {
+      searchObj: {
+        householdName: '',
+        con: '',
+        isPositive: ''
+      },
+      isPositiveList: [{
+        dictName: '是',
+        dictValue: '1'
+      }, {
+        dictName: '否',
+        dictValue: '0'
+      }],
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      tableData: [],
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    colConfigs() {
+      return [
+        {
+          prop: 'phone',
+          align: 'center',
+          label: '用户账号',
+        },
+        {
+          prop: 'personalIntegral',
+          align: 'center',
+          label: '获取积分',
+        },
+        {
+          prop: 'personalUsedIntegral',
+          align: 'center',
+          label: '已用积分',
+        },
+        {
+          align: 'center',
+          label: '剩余积分',
+          render: (h, {row}) => h('span', null, row.personalIntegral - row.personalUsedIntegral)
+        }
+      ]
+    },
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.instance.post("/app/appportaluser/list", null, {
+        params: {
+          ...this.searchObj,
+          ...this.page,
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records.map(v => {
+            return v
+          })
+          this.page.total = res.data.total
+        }
+      })
+    },
+    goDetail(row) {
+      let {id} = row
+      this.$router.push({query: {id}})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.spList {
+  height: 100%;
+
+  .form_div {
+    width: 380px;
+  }
+
+  .add_btn {
+    color: #5088FF;
+    font-size: 14px;
+    line-height: 36px;
+    text-align: right;
+
+    span {
+      cursor: pointer;
+    }
+
+    span:nth-child(2) {
+      margin-left: 4px;
+    }
+
+  }
+
+  .iconfont {
+    cursor: pointer;
+  }
+
+  .iconAll_Profile {
+    padding: 0 8px;
+  }
+
+  .family-list {
+    ::v-deep .el-table--small {
+      font-size: 14px !important;
+    }
+  }
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreRules/AppScoreRules.vue b/project/xiushan/apps/creditScore/scoreRules/AppScoreRules.vue
new file mode 100644
index 00000000..2d5f1316
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreRules/AppScoreRules.vue
@@ -0,0 +1,424 @@
+<template>
+  <section class="AppScoreRules">
+    <ai-list v-if="$permissions('app_appvillagerintegralrule_detail')">
+      <template slot="title">
+        <ai-title title="积分规则" isShowBottomBorder></ai-title>
+      </template>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template slot="left">
+            <ai-select
+              v-model="search.classification"
+              @change="search.current = 1, getList()"
+              placeholder="请选择分类"
+              :selectList="dict.getDict('atWillReportType')">
+            </ai-select>
+            <ai-select
+              v-model="search.integralType"
+              @change="search.current = 1, getList()"
+              placeholder="请选择类型"
+              :selectList="dict.getDict('integralIntegralType')">
+            </ai-select>
+            <ai-select
+              v-model="search.ruleStatus"
+              @change="search.current = 1, getList()"
+              placeholder="请选择状态"
+              :selectList="dict.getDict('integralRuleStatus')">
+            </ai-select>
+          </template>
+          <template slot="right">
+          </template>
+        </ai-search-bar>
+        <ai-search-bar style="margin-top: 16px;">
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="addRule">添加</el-button>
+          </template>
+        </ai-search-bar>
+        <ai-table
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          ref="aitableex"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
+        <el-table-column slot="integral" label="分值" align="center">
+          <template slot-scope="{ row }">
+            <span
+              v-if="row.integralValueType == 1">
+              {{ row.integralStart > 0 ? '+' + row.integralStart : row.integralStart }} ~ {{ row.integralEnd > 0 ? '+' + row.integralEnd : row.integralEnd }}
+            </span>
+            <span v-else>{{ row.integral > 0 ? '+' : '' }}{{ row.integral }}</span>
+          </template>
+        </el-table-column>
+          <el-table-column slot="options" label="操作" align="center" fixed="right" width="200">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" :disabled="!$permissions('app_appvillagerintegralrule_edit')" @click="changeStatus(row.id, 0)" v-if="row.ruleStatus == 1">停用</el-button>
+                <el-button type="text" :disabled="!$permissions('app_appvillagerintegralrule_edit')" @click="changeStatus(row.id, 1)" v-else >启用</el-button>
+                <el-button type="text" :disabled="!$permissions('app_appvillagerintegralrule_edit')" @click="toEdit(row)">编辑</el-button>
+                <el-button type="text" :disabled="!$permissions('app_appvillagerintegralrule_del')" @click="remove(row.id)">删除</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+
+    <ai-dialog
+      :title="dialog.title"
+      :visible.sync="dialog.visible"
+      :customFooter="true"
+      :destroyOnClose="true"
+      @close="init('ruleForm')"
+      width="520px">
+      <div class="form_div">
+        <el-form
+          ref="ruleForm"
+          :model="dialogInfo"
+          :rules="formRules"
+          size="small"
+          label-suffix="："
+          label-width="100px">
+          <el-form-item label="类别" prop="classification">
+            <ai-select
+              size="small"
+              v-model="dialogInfo.classification"
+              placeholder="请选择..."
+              :selectList="dict.getDict('atWillReportType')">
+            </ai-select>
+          </el-form-item>
+          <el-form-item label="事项" prop="ruleName">
+            <el-input placeholder="请输入…" v-model="dialogInfo.ruleName"></el-input>
+          </el-form-item>
+          <el-form-item label="规则说明" prop="ruleDescription">
+            <el-input
+              type="textarea"
+              :rows="3"
+              maxlength="500"
+              show-word-limit
+              placeholder="请输入…"
+              v-model="dialogInfo.ruleDescription">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="类型" prop="integralType">
+            <el-radio-group v-model="dialogInfo.integralType">
+              <el-radio label="1">加分</el-radio>
+              <el-radio label="0">扣分</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!-- <el-form-item label="分值" prop="integralValueType">
+            <el-radio-group v-model="dialogInfo.integralValueType" @change="numTypeChange">
+              <el-radio label="0">固定分值</el-radio>
+              <el-radio label="1">区间分值</el-radio>
+            </el-radio-group>
+          </el-form-item> -->
+          <!-- <el-form-item label="积分" required v-if="dialogInfo.integralValueType == '1'">
+            <el-col :span="7" style="width: 30%;">
+              <el-form-item prop="integralStart">
+                <el-input placeholder="请输入整数" v-model="dialogInfo.integralStart"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="line" :span="1" style="width: 4%;text-align:center;">-</el-col>
+            <el-col :span="7" style="width: 30%;">
+              <el-form-item prop="integralEnd">
+                <el-input placeholder="请输入整数" v-model="dialogInfo.integralEnd"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="line" :span="9" style="width: 36%;"></el-col>
+          </el-form-item> -->
+          <el-form-item label="积分" required v-if="dialogInfo.integralValueType == '0'">
+            <el-form-item prop="integral">
+              <el-input placeholder="请输入自然数" v-model="dialogInfo.integral"></el-input>
+            </el-form-item>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialog.visible=false" size="medium">取消</el-button>
+        <el-button @click="onConfirm('ruleForm')" type="primary" size="medium">确认</el-button>
+      </div>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "AppScoreRules",
+  label: "积分规则(秀山)",
+  props: {
+    instance: Function,
+    dict: Object,
+  },
+
+  data() {
+    var integralPass = (rule, value, callback) => {
+      if (value) {
+        if ((/(^[0-9]\d*$)/.test(value))) {
+          callback();
+        } else {
+          callback(new Error("请输入自然数"));
+        }
+      } else {
+        callback(new Error("请输入积分"));
+      }
+    };
+    var integralStartPass = (rule, value, callback) => {
+      if (value) {
+        if ((/(^[1-9]\d*$)/.test(value))) {
+          callback();
+        } else {
+          callback(new Error("请输入整数积分"));
+        }
+      } else {
+        callback(new Error("请输入积分"));
+      }
+    };
+    var integralEndPass = (rule, value, callback) => {
+      if (value) {
+        if ((/(^[1-9]\d*$)/.test(value))) {
+          if (Number(value) < Number(this.dialogInfo.integralStart)) {
+            callback(new Error("请输入大于前面数字的积分"));
+          } else {
+            callback()
+          }
+        } else {
+          callback(new Error("请输入整数积分"));
+        }
+      } else {
+        callback(new Error("请输入积分"));
+      }
+    };
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        classification: "",
+        integralType: "",
+        ruleStatus: "",
+      },
+      total: 10,
+      colConfigs: [
+        {
+          prop: "classification", label: "类型", width: 168,
+          formart: (classification) =>
+              this.dict.getLabel("atWillReportType", classification),
+        },
+        {prop: "ruleName", label: "事项", "show-overflow-tooltip": true, width: 260},
+        {prop: "ruleDescription", label: "规则说明", width: 390},
+        {
+          prop: "integralType",
+          label: "类型",
+          width: 60,
+          formart: (integralType) =>
+              this.dict.getLabel("integralIntegralType", integralType),
+        },
+        {slot: "integral", label: "分值", width: 70},
+        {prop: "doTime", label: "最后编辑时间", width: 160},
+        {prop: "doUserName", label: "操作人", width: 120},
+        {
+          prop: "ruleStatus",
+          label: "状态",
+          align: "center",
+          width: 96,
+          fixed: "right",
+          render: (h, params) => {
+            return h(
+                "span",
+                {
+                  class: "status-" + params.row.ruleStatus,
+                },
+                this.dict.getLabel("integralRuleStatus", params.row.ruleStatus)
+            );
+          },
+        },
+        {slot: "options", label: "操作", align: "center"},
+      ],
+      tableData: [],
+
+      dialog: {
+        title: "",
+        visible: false,
+      },
+      dialogInfo: {
+        classification: "",
+        ruleName: "",
+        ruleDescription: "",
+        integralType: '1',
+        integralValueType: '0',
+        integral: "",
+        // integralStart: "",
+        // integralEnd: "",
+        doTime: '',
+        id: '',
+        doUserId: '',
+        doUserName: '',
+      },
+      formRules: {
+        classification: [
+          {required: true, message: "请选择类型", trigger: "change"},
+        ],
+        ruleName: [{required: true, message: "请输入事项", trigger: "blur"}],
+        ruleDescription: [
+          {required: true, message: "请输入规则说明", trigger: "blur"},
+        ],
+        integralType: [
+          {required: true, message: "请选择类型", trigger: "change"},
+        ],
+        integralValueType: [
+          {required: true, message: "请选择分值类型", trigger: "change"},
+        ],
+        integral: [
+          {required: true, validator: integralPass, trigger: "change"},
+        ],
+        integralStart: [
+          {required: true, validator: integralStartPass, trigger: "change"},
+        ],
+        integralEnd: [
+          {required: true, validator: integralEndPass, trigger: "change"},
+        ],
+      },
+    };
+  },
+
+  created() {
+    this.dict.load(["classification", "integralIntegralType", "integralRuleStatus", 'atWillReportType']).then(() => {
+      this.getList();
+    });
+  },
+
+  methods: {
+    getList() {
+      this.instance
+      .post(`/app/appvillagerintegralrule/list`, null, {
+        params: {
+          ...this.search,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.tableData = res.data.records;
+          this.total = res.data.total;
+        }
+      });
+    },
+
+    toEdit(row) {
+      this.dialog.title = "编辑积分规则";
+      this.dialog.visible = true;
+      this.dialogInfo = {...row}
+      this.dialogInfo.integralStart = Math.abs(this.dialogInfo.integralStart)
+      this.dialogInfo.integralEnd = Math.abs(this.dialogInfo.integralEnd)
+      this.dialogInfo.integral = Math.abs(this.dialogInfo.integral)
+    },
+
+    remove(id) {
+      this.$confirm("删除后不可恢复，是否要删除该事项？", {
+        type: 'error'
+      }).then(() => {
+        this.instance
+        .post(`/app/appvillagerintegralrule/delete?ids=${id}`)
+        .then((res) => {
+          if (res.code == 0) {
+            this.$message.success("删除成功！");
+            this.getList();
+          }
+        });
+      });
+    },
+
+    changeStatus(id, status) {
+      var text = status == 1 ? '启用' : '停用'
+      this.$confirm(`确定${text}该条规则？`).then(() => {
+        this.instance
+        .post(`/app/appvillagerintegralrule/enableOrDisable?id=${id}`)
+        .then((res) => {
+          if (res.code == 0) {
+            this.$message.success(`${text}成功！`)
+            this.getList();
+          }
+        });
+      });
+    },
+
+    onReset() {
+      this.search.current = 1
+      this.search.classification = ""
+      this.search.integralType = ""
+      this.search.ruleStatus = ""
+      this.getList();
+    },
+
+    onAdd() {
+      this.$emit("change", {
+        type: "add",
+      });
+    },
+
+    addRule() {
+      this.dialog.title = "添加积分规则";
+      this.dialog.visible = true;
+    },
+
+    onConfirm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.instance
+          .post(`/app/appvillagerintegralrule/addOrUpdate`, this.dialogInfo)
+          .then((res) => {
+            if (res.code == 0) {
+              this.$message.success(`${this.dialogInfo.id ? '编辑成功' : '添加成功'}`)
+              this.onReset()
+              this.onCancel();
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+
+    onCancel() {
+      this.dialog.visible = false;
+    },
+
+    numTypeChange() {
+      // this.dialogInfo.integra = "";
+      // this.dialogInfo.integralStart = "";
+      // this.dialogInfo.integralEnd = "";
+    },
+
+    init(formName) {
+      this.$refs[formName].clearValidate();
+      Object.keys(this.dialogInfo).forEach((e) => {
+        this.dialogInfo[e] = "";
+      });
+      this.dialogInfo.integralType = '1'
+      this.dialogInfo.integralValueType = '0'
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.AppScoreRules {
+  height: 100%;
+  background: #f3f6f9;
+
+  .cur-p {
+    cursor: pointer;
+  }
+
+  ::v-deep .ai-list__content--right {
+    width: 100%;
+  }
+
+  .status-0 {
+    color: #ff4466;
+  }
+
+  .status-1 {
+    color: #2ea222;
+  }
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreSupermarket/AppScoreSupermarket.vue b/project/xiushan/apps/creditScore/scoreSupermarket/AppScoreSupermarket.vue
new file mode 100644
index 00000000..70bd4d69
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreSupermarket/AppScoreSupermarket.vue
@@ -0,0 +1,119 @@
+<template>
+  <div class="AppScoreSupermarket">
+    <ai-list v-show="!detailShow">
+      <template slot="title">
+        <ai-title title="积分超市" :isShowBottomBorder="false"/>
+      </template>
+      <template slot="tabs">
+        <el-tabs v-model="currIndex">
+          <el-tab-pane v-for="(tab,i) in tabs" :key="i" :name="String(i)" :label="tab.label">
+            <component
+                :is="tab.comp"
+                v-if="currIndex === String(i)"
+                :areaId="areaId"
+                :ref="tab.name"
+                @showDetail="showDetail"
+                :instance="instance"
+                :dict="dict"
+                :permissions="permissions"/>
+          </el-tab-pane>
+        </el-tabs>
+      </template>
+    </ai-list>
+    <component v-if="detailShow" :is="currDet" :areaId="areaId" :info="info" @goBack="goBack" :instance="instance"
+               :dict="dict" :permissions="permissions"/>
+  </div>
+</template>
+
+<script>
+import orderManagement from './orderManagement'
+import goodsManagement from './goodsManagement'
+import storeManagement from './storeManagement'
+import addOrderDetail from './components/addOrder'
+import addGoods from './components/addGoods'
+import {mapState} from 'vuex'
+
+export default {
+  name: "AppScoreSupermarket",
+  label: "积分超市(秀山)",
+  components: {orderManagement, goodsManagement, storeManagement, addOrderDetail, addGoods},
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+
+  computed: {
+    tabs() {
+      // .filter(item => {
+      //   return this.$permissions(item.permission)
+      // })
+
+      return [
+        {
+          label: "订单管理",
+          name: "orderManagement",
+          comp: orderManagement,
+          detail: addOrderDetail,
+          permission: "app_apppartyfee_record"
+        },
+        {
+          label: "商品管理",
+          name: "goodsManagement",
+          comp: goodsManagement,
+          detail: addGoods,
+          permission: "app_apppartyfee_config"
+        },
+        {
+          label: "店铺管理",
+          name: "storeManagement",
+          comp: storeManagement,
+          detail: '',
+          permission: "app_apppartyfee_statistics"
+        },
+      ]
+    },
+    ...mapState(['user']),
+    currDet() {
+      return this.tabs[Number(this.currIndex)].detail;
+    }
+  },
+  created() {
+    this.areaId = this.user.info.areaId;
+  },
+  data() {
+    return {
+      activeName: "orderManagement",
+      currIndex: 0,
+      areaId: '',
+      detailShow: false,
+      info: {}
+    }
+  },
+  methods: {
+    goBack() {
+      this.detailShow = false;
+      this.$nextTick(() => {
+        this.$refs[this.tabs[Number(this.currIndex)].name][0].getList();
+      })
+    },
+    showDetail(obj) {
+      this.info = {...obj};
+      this.detailShow = true;
+    },
+    changeArea() {
+      this.$nextTick(() => {
+        if (this.currIndex == 0) this.$refs[this.tabs[Number(this.currIndex)].name][0].getShopList();
+        if (this.currIndex == 1) this.$refs[this.tabs[Number(this.currIndex)].name][0].updateList();
+        this.$refs[this.tabs[Number(this.currIndex)].name][0].getList();
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.AppScoreSupermarket {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreSupermarket/components/addGoods.vue b/project/xiushan/apps/creditScore/scoreSupermarket/components/addGoods.vue
new file mode 100644
index 00000000..1079d999
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreSupermarket/components/addGoods.vue
@@ -0,0 +1,366 @@
+<template>
+  <section class="add_order">
+    <ai-detail>
+      <template slot="title">
+        <ai-title :title="title" isShowBack :isShowBottomBorder="true" @onBackClick="$emit('goBack')"></ai-title>
+      </template>
+      <template slot="content" v-if="!isEdit">
+        <ai-card title="商品信息">
+          <template #content>
+            <div class="form_div">
+              <el-form
+                ref="rules"
+                :model="forms"
+                :rules="formRules"
+                size="small"
+                label-suffix="："
+                label-width="100px">
+                <el-form-item label="店铺名称" prop="shopId">
+                  <el-select
+                    v-model="forms.shopId"
+                    placeholder="请选择..."
+                    clearable>
+                    <el-option
+                      v-for="(item, i) in shopList"
+                      :key="i"
+                      :label="item.shopName"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="商品类型" prop="merchandiseType">
+                  <el-select
+                    v-model="forms.merchandiseType"
+                    placeholder="请选择..."
+                    clearable>
+                    <el-option
+                      v-for="(item, i) in dict.getDict('integralMerchandiseType')"
+                      :key="i"
+                      :label="item.dictName"
+                      :value="item.dictValue">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="商品名称" prop="merchandiseName">
+                  <el-input
+                    v-model="forms.merchandiseName"
+                    placeholder="请输入..."
+                    maxlength="100"
+                    show-word-limit>
+                  </el-input>
+                </el-form-item>
+                <div class="above">
+                  <div class="left">
+                    <el-form-item label="单价" prop="costIntegral">
+                      <el-input
+                        v-model="forms.costIntegral"
+                        placeholder="请输入..."
+                      ></el-input>
+                    </el-form-item>
+                  </div>
+                  <div class="right">
+                    <el-form-item label="库存" prop="inventoryNumber">
+                      <el-input
+                        v-model="forms.inventoryNumber"
+                        placeholder="请输入...">
+                      </el-input>
+                    </el-form-item>
+                  </div>
+                </div>
+                <el-form-item label="状态" prop="status">
+                  <el-radio-group v-model="forms.status">
+                    <el-radio label="1">上架中</el-radio>
+                    <el-radio label="0">已下架</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="商品图片" prop="fileList" ref="fileList">
+                  <div class="upload">
+                    <ai-uploader
+                      :instance="instance"
+                      @change="changeFile"
+                      v-model="forms.fileList"
+                      :limit="9">
+                    </ai-uploader>
+                  </div>
+                </el-form-item>
+                <el-form-item label="商品详情" prop="description">
+                  <el-input
+                    v-model="forms.description"
+                    type="textarea"
+                    :rows="5"
+                    maxlength="100"
+                    show-word-limit
+                    placeholder="请输入...">
+                  </el-input>
+                </el-form-item>
+              </el-form>
+            </div>
+          </template>
+        </ai-card>
+      </template>
+      <template slot="content" v-if="isEdit">
+        <ai-card title="商品信息">
+          <template #content>
+            <div class="info">
+              <ai-wrapper label-width="70px" :columnsNumber="1">
+                <ai-info-item label="店铺名称"><span>{{ forms.shopName }}</span></ai-info-item>
+                <ai-info-item label="商品类型"
+                  ><span>{{
+                    dict.getLabel("integralMerchandiseType", forms.merchandiseType)
+                  }}</span></ai-info-item
+                >
+                <ai-info-item label="商品名称"
+                  ><span>{{ forms.merchandiseName }}</span></ai-info-item
+                >
+              </ai-wrapper>
+              <ai-wrapper label-width="70px" :columnsNumber="2">
+                <ai-info-item label="单价"
+                  ><span>{{ forms.costIntegral + "积分" }}</span></ai-info-item
+                >
+                <ai-info-item label="库存"
+                  ><span>{{ forms.inventoryNumber }}</span></ai-info-item
+                >
+                <ai-info-item label="销量"
+                  ><span>{{ forms.saleNumber || "0" }}</span></ai-info-item
+                >
+              </ai-wrapper>
+              <ai-wrapper label-width="70px" :columnsNumber="1">
+                <ai-info-item label="状态"
+                  ><span
+                    :style="{
+                      color: dict.getColor(
+                        'integralMerchandiseStatus',
+                        forms.status
+                      ),
+                    }"
+                    >{{
+                      dict.getLabel("integralMerchandiseStatus", forms.status)
+                    }}</span
+                  ></ai-info-item
+                >
+                <ai-info-item label="商品图片">
+                  <ai-uploader
+                    :disabled="true"
+                    :instance="instance"
+                    v-model="forms.fileList"
+                    :limit="9"
+                  ></ai-uploader>
+                </ai-info-item>
+                <ai-info-item label="商品详情"
+                  ><span>{{ forms.description }}</span></ai-info-item
+                >
+              </ai-wrapper>
+            </div>
+          </template>
+        </ai-card>
+      </template>
+      <template slot="footer" v-if="!isEdit">
+        <el-button @click="$emit('goBack')" style="width: 120px">取消</el-button>
+        <el-button type="primary" @click="save('rules')" style="width: 120px">提 交</el-button>
+      </template>
+    </ai-detail>
+  </section>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "addGoods",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    info: Object,
+    areaId: String,
+  },
+  data() {
+    return {
+      forms: {
+        shopId: "",
+        merchandiseType: "",
+        merchandiseName: "",
+        costIntegral: "",
+        inventoryNumber: "",
+        status: "",
+        fileList: [],
+        description: "",
+      },
+      shopList: [],
+      title: "添加商品",
+      showEdit: false,
+      isEdit: false,
+      detailInfo: {},
+    };
+  },
+  computed: {
+    ...mapState(["user"]),
+    formRules() {
+      var integral = (rule, value, callback) => {
+        if (value) {
+          if (/^[1-9]\d*$/.test(value)) {
+            callback();
+          } else {
+            callback(new Error("请输入正整数"));
+          }
+        } else {
+          callback(new Error("请输入单价"));
+        }
+      };
+      var integral2 = (rule, value, callback) => {
+        if (value) {
+          if (/^[1-9]\d*$/.test(value)) {
+            callback();
+          } else {
+            callback(new Error("请输入正整数"));
+          }
+        } else {
+          callback(new Error("请输入库存"));
+        }
+      };
+      return {
+        shopId: [{ required: true, message: "请选择店铺", trigger: "change" }],
+        merchandiseType: [
+          { required: true, message: "请选择商品类型", trigger: "change" },
+        ],
+        merchandiseName: [
+          { required: true, message: "请输入商品名称", trigger: "blur" },
+        ],
+        costIntegral: [
+          { required: true, validator: integral, trigger: "blur" },
+        ],
+        inventoryNumber: [
+          { required: true, validator: integral2, trigger: "blur" },
+        ],
+        status: [{ required: true, message: "请选择状态", trigger: "change" }],
+        fileList: [
+          { required: true, message: "请上传商品图片", trigger: "change" },
+        ],
+      };
+    },
+  },
+  created() {
+    let l = Object.keys(this.info).length;
+    if (this.info.isAdd) {
+      this.showEdit = false;
+      if (l > 1) {
+        this.title = "修改商品";
+        this.getShopList().then(() => {
+          this.searchDetail(this.info.id);
+        });
+      } else {
+        this.title = "添加商品";
+        this.getShopList();
+      }
+    } else {
+      this.title = "商品详情";
+      this.isEdit = true;
+      this.showEdit = true;
+      this.getShopList().then(() => {
+        this.searchDetail(this.info.id);
+      });
+    }
+  },
+  methods: {
+    getShopList() {
+      return new Promise((reslove) => {
+        this.instance
+          .post(`/app/appvillagerintegralshop/listForOperator`, null, {
+            params: {
+              size: 100000,
+              areaId: this.areaId,
+            },
+          })
+          .then((res) => {
+            if (res.code == 0) {
+              this.shopList = res.data.records;
+              reslove();
+            }
+          });
+      });
+    },
+    changeFile() {
+      this.$refs.fileList.$emit("el.form.change");
+    },
+    searchDetail(id) {
+      this.instance
+        .post(`/app/appvillagerintegralmerchandise/queryDetailById`, null, {
+          params: {
+            id,
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.forms = { ...res.data };
+            let i = this.shopList.findIndex(
+              (item) => item.id == this.forms.shopId
+            );
+            if (i > -1) {
+              this.forms.shopName = this.shopList[i].shopName;
+            }
+          }
+        });
+    },
+    edit() {
+      this.isEdit = false;
+    },
+    save(formName, type) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.instance
+            .post(
+              `/app/appvillagerintegralmerchandise/addOrUpdate`,
+              {
+                ...this.forms,
+                areaId: this.user.info.areaId,
+              },
+              null
+            )
+            .then((res) => {
+              if (res.code == 0) {
+                this.$message.success("提交成功");
+                if (type == "detail") {
+                  this.isEdit = true;
+                } else {
+                  this.$emit("goBack");
+                }
+              }
+            });
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.add_order {
+  height: 100%;
+  .form_div {
+    padding: 16px 0;
+  }
+  .above {
+    overflow: hidden;
+    width: 100%;
+    .left {
+      width: 50%;
+      float: left;
+    }
+    .right {
+      width: 50%;
+      float: right;
+    }
+  }
+  .iconEdit,
+  .Edit {
+    color: #5088ff;
+    font-size: 12px;
+    cursor: pointer;
+    padding-left: 8px;
+  }
+  .info {
+    padding: 16px 0;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/project/xiushan/apps/creditScore/scoreSupermarket/components/addOrder.vue b/project/xiushan/apps/creditScore/scoreSupermarket/components/addOrder.vue
new file mode 100644
index 00000000..9ea1e6cf
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreSupermarket/components/addOrder.vue
@@ -0,0 +1,617 @@
+<template>
+  <section class="add_order">
+    <ai-detail>
+      <template slot="title">
+        <ai-title :title="title" :isShowBack="true" :isShowBottomBorder="true"
+                  @onBackClick="$emit('goBack')"></ai-title>
+      </template>
+      <template slot="content" v-if="info.isAdd">
+        <ai-card title="订单信息">
+          <template #content>
+            <div class="form_div">
+              <el-form
+                  ref="rules"
+                  :model="forms"
+                  :rules="formRules"
+                  size="small"
+                  label-suffix="："
+                  label-width="100px">
+                <el-form-item label="店铺名称" prop="shopId">
+                  <el-select
+                      v-model="forms.shopId"
+                      placeholder="请选择..."
+                      @change="(forms.merchandiseList = []), (goodIntegral = {})"
+                      clearable>
+                    <el-option
+                        v-for="(item, i) in shopList"
+                        :key="i"
+                        :label="item.shopName"
+                        :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="兑换家庭" prop="name">
+                  <el-row type="flex" :gutter="8">
+                    <el-col
+                    >
+                      <el-input v-model="forms.name" disabled clearable
+                      />
+                    </el-col>
+                    <el-col>
+                      <ai-person-select
+                          :instance="instance"
+                          url="/app/appvillagerintegralfamilymember/list"
+                          headerTitle="家庭列表"
+                          dialogTitle="选择家庭"
+                          @selectPerson="getSelect"
+                      >
+                        <template name="option" v-slot:option="{ item }">
+                          <span class="iconfont iconProlife">{{ item.name }}</span>
+                          <ai-id
+                              mode="show"
+                              :show-eyes="false"
+                              :value="item.idNumber"
+                          />
+                          <span>{{ item.phone }}</span>
+                        </template>
+                      </ai-person-select>
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+                <el-form-item label="积分余额">
+                  <p>
+                    <span style="color: #2266ff">{{ integral || "0" }}</span
+                    >分
+                  </p>
+                </el-form-item>
+                <el-form-item label="兑换商品" prop="merchandiseList">
+                  <el-button @click="showGoodsList()" :disabled="!forms.shopId || !forms.name">选择商品</el-button>
+                </el-form-item>
+                <ai-table
+                    :tableData="forms.merchandiseList"
+                    :col-configs="colConfigs"
+                    :isShowPagination="false">
+                  <el-table-column
+                      label="商品图"
+                      slot="photo"
+                      align="center"
+                      width="150">
+                    <template v-slot="{ row }">
+                      <ai-uploader
+                          :disabled="true"
+                          :instance="instance"
+                          v-model="row.photo"
+                          :limit="9">
+                      </ai-uploader>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      label="兑换数量"
+                      width="180"
+                      slot="merchandiseNumber"
+                      align="center">
+                    <template v-slot="{ row }">
+                      <el-input-number
+                          :min="1"
+                          :max="row.inventoryNumber"
+                          size="mini"
+                          v-model="merchandiseNumbers[row.id]"
+                          @change="
+                          (currentValue, oldValue) =>
+                            changeNumber(currentValue, oldValue, row)
+                        "
+                          :step="1"
+                          step-strictly
+                      ></el-input-number>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="消耗积分" slot="integral" align="center">
+                    <template v-slot="{ row }">
+                      <span>{{ goodIntegral[row.id] }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      slot="options"
+                      label="操作"
+                      align="center"
+                      width="60"
+                  >
+                    <template slot-scope="row">
+                      <el-button
+                          type="text"
+                          class="icon-color89B"
+                          icon="iconfont iconDelete"
+                          title="删除"
+                          @click="deleteGood(row)"
+                      />
+                    </template>
+                  </el-table-column>
+                </ai-table>
+                <div class="total">
+                  <p class="num">
+                    <span>合计积分：</span>
+                    <span>{{ allIntegral }}</span>
+                    <span>分</span>
+                  </p>
+                  <p class="tip" v-if="allIntegral > Number(integral)">
+                    （积分不足，请删减商品）
+                  </p>
+                </div>
+              </el-form>
+            </div>
+          </template>
+        </ai-card>
+      </template>
+      <template slot="content" v-if="!info.isAdd">
+        <ai-card title="订单信息">
+          <template #content>
+            <div class="info">
+              <ai-wrapper label-width="70px" :columnsNumber="1">
+                <ai-info-item label="订单号"><span>{{ detailInfo.orderCode }}</span></ai-info-item>
+                <ai-info-item label="创建时间"><span>{{ detailInfo.createTime }}</span></ai-info-item>
+                <ai-info-item label="店铺名"><span>{{ detailInfo.shopName }}</span></ai-info-item>
+                <ai-info-item label="状态">
+                  <span :style="{ color: dict.getColor('integralOrderStatus', detailInfo.orderStatus)}">
+                    {{ dict.getLabel("integralOrderStatus", detailInfo.orderStatus) }}
+                  </span>
+                </ai-info-item>
+              </ai-wrapper>
+              <ai-table
+                  :tableData="detailInfo.merchandiseList"
+                  :col-configs="colConfigs"
+                  :isShowPagination="false">
+                <el-table-column
+                    label="商品图"
+                    slot="photo"
+                    align="center"
+                    width="150">
+                  <template v-slot="{ row }">
+                    <ai-uploader
+                        :disabled="true"
+                        :instance="instance"
+                        v-model="row.merchandisePhoto"
+                        :limit="9">
+                    </ai-uploader>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                    label="兑换数量"
+                    width="200"
+                    slot="merchandiseNumber"
+                    align="center">
+                  <template v-slot="{ row }">
+                    {{ row.merchandiseNumber }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="消耗积分" slot="integral" align="center">
+                  <template v-slot="{ row }">
+                    <span>{{ Number(row.merchandiseNumber) * Number(row.costIntegral) }}</span>
+                  </template>
+                </el-table-column>
+              </ai-table>
+              <div class="total">
+                <p class="num">
+                  <span>合计积分：</span>
+                  <span>{{ detailInfo.orderIntegral }}</span>
+                  <span>分</span>
+                </p>
+              </div>
+            </div>
+          </template>
+        </ai-card>
+        <ai-card title="操作人信息">
+          <template #content>
+            <div class="info">
+              <ai-wrapper label-width="70px">
+                <ai-info-item label="用户账号"><span>{{ detailInfo.createUserPhone || "-" }}</span></ai-info-item>
+                <ai-info-item label="完成时间"><span>{{ detailInfo.finishTime || "-" }}</span></ai-info-item>
+              </ai-wrapper>
+            </div>
+          </template>
+        </ai-card>
+      </template>
+      <template slot="footer" v-if="info.isAdd">
+        <el-button @click="$emit('goBack')" style="width: 120px">取消</el-button>
+        <el-button type="primary" @click="save('rules')" style="width: 120px"
+                   :disabled="allIntegral > Number(integral)">确认兑换
+        </el-button>
+      </template>
+    </ai-detail>
+    <ai-dialog
+        title="选择商品"
+        :visible.sync="showGoods"
+        :customFooter="true"
+        :destroyOnClose="true"
+        class="goods"
+        @close="init"
+        border
+        width="780px">
+      <div class="border_div">
+        <header>
+          <span>商品列表</span>
+          <el-input
+              v-model="keyWord"
+              size="mini"
+              placeholder="商品关键字"
+              @keyup.enter.native="showGoodsList()"
+              clearable
+              style="width: 220px"
+              suffix-icon="iconfont iconSearch"
+          />
+        </header>
+        <ai-table
+            :tableData="goodList"
+            :col-configs="goodsConfig"
+            :isShowPagination="false"
+            @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+              slot="selection"
+              type="selection"
+              width="55" :selectable="row=>Number(row.inventoryNumber)>0"
+          />
+        </ai-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="showGoods = false" size="medium">取消</el-button>
+        <el-button @click="onConfirm()" type="primary" size="medium">确认</el-button>
+      </div>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "addOrder",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    info: Object,
+    areaId: String,
+  },
+  data() {
+    return {
+      forms: {
+        shopId: "",
+        portalUserId: "",
+        portalUserPhone: "",
+        name: "",
+        memberId: "",
+        merchandiseList: [],
+        phone: "",
+      },
+      integral: "",
+      shopList: [],
+      goodList: [],
+      goodIntegral: {},
+      merchandiseNumbers: {},
+      showGoods: false,
+      selectGoodList: [],
+      keyWord: "",
+      title: "",
+      detailInfo: {},
+    };
+  },
+  computed: {
+    ...mapState(["user"]),
+    formRules() {
+      return {
+        shopId: [{required: true, message: "请选择店铺", trigger: "change"}],
+        name: [
+          {required: true, message: "请选择兑换家庭", trigger: "change"},
+        ],
+        merchandiseList: [
+          {required: true, message: "请选择商品", trigger: "change"},
+        ],
+      };
+    },
+    colConfigs() {
+      return [
+        {slot: "photo", prop: "photo", label: "商品图", align: "center"},
+        {
+          prop: "merchandiseName",
+          label: "商品名",
+          align: "left",
+          width: 160,
+          "show-overflow-tooltip": false,
+        },
+        {
+          prop: "costIntegral",
+          label: "单价",
+          align: "center",
+          width: 60,
+        },
+        {
+          slot: "merchandiseNumber",
+          prop: "merchandiseNumber",
+          label: "兑换数量",
+          align: "center",
+        },
+        {
+          prop: "inventoryNumber",
+          label: "库存",
+          align: "center",
+          width: 60,
+          hide: this.title == "兑换订单详情",
+        },
+        {
+          slot: "integral",
+          prop: "integral",
+          label: "消耗积分",
+          align: "center",
+        },
+        {slot: "options", label: "操作", align: "center"},
+      ];
+    },
+    goodsConfig() {
+      return [
+        {slot: "selection", label: "", align: "center"},
+        {prop: "merchandiseName", label: "商品名", align: "left", width: 350},
+        {prop: "costIntegral", label: "单价", align: "left"},
+        {prop: "inventoryNumber", align: "center", label: "库存"},
+      ];
+    },
+    allIntegral() {
+      let arr = Object.keys(this.goodIntegral);
+      let all = 0;
+      arr.forEach((e) => {
+        all += this.goodIntegral[e];
+      });
+      return all;
+    },
+  },
+  created() {
+    if (this.info.isAdd) {
+      this.title = "添加兑换订单";
+    } else {
+      this.title = "兑换订单详情";
+      this.searchDetail(this.info.id);
+    }
+    this.getShopList();
+  },
+  methods: {
+    getSelect(val) {
+      if (val) {
+        this.forms.portalUserPhone = val.portalUserPhone;
+        this.forms.portalUserId = val.portalUserId;
+        this.forms.name = val.name;
+        this.forms.memberId = val.id;
+        this.forms.phone = val.phone;
+        this.integral = val.integral;
+      } else {
+        this.forms.portalUserPhone = "";
+        this.forms.portalUserId = "";
+        this.forms.name = "";
+        this.forms.memberId = "";
+        this.forms.phone = "";
+        this.integral = 0;
+      }
+    },
+    handleSelectionChange(val) {
+      this.selectGoodList = [...val];
+    },
+    onConfirm() {
+      this.selectGoodsInit(this.selectGoodList).then(() => {
+        this.showGoods = false;
+      });
+    },
+    init() {
+      this.selectGoodList = [];
+      this.goodList = [];
+    },
+    deleteGood(row) {
+      console.log(row);
+      this.$confirm("是否删除该商品？", {
+        type: "error",
+      })
+      .then(() => {
+        this.forms.merchandiseList.splice(row.$index, 1);
+        this.$delete(this.goodIntegral, row.row.id);
+        this.$delete(this.merchandiseNumbers, row.row.id);
+        return this.$message.success("删除成功");
+      })
+      .catch(() => {
+      });
+    },
+    selectGoodsInit(val) {
+      return new Promise((reslove) => {
+        val.map((e) => {
+          e.merchandiseNumber = 1;
+          e.merchandiseId = e.id;
+          this.$set(this.merchandiseNumbers, e.id, 1);
+          this.$set(this.goodIntegral, e.id, Number(e.costIntegral));
+          if (e.photo) {
+            e.merchandisePhoto = e.photo;
+            e.photo = [{...JSON.parse(e.photo)[0]}];
+          } else {
+            e.photo = [];
+          }
+        });
+        this.forms.merchandiseList = this.forms.merchandiseList.concat([
+          ...val,
+        ]);
+        reslove();
+      });
+    },
+    showGoodsList() {
+      this.instance
+      .post(`/app/appvillagerintegralmerchandise/list`, null, {
+        params: {
+          size: 100000,
+          shopId: this.forms.shopId,
+          merchandiseName: this.keyWord,
+          status: "1",
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          if (this.forms.merchandiseList.length > 0) {
+            this.forms.merchandiseList.forEach((e1) => {
+              res.data.records.forEach((e2, index2) => {
+                if (e1.id == e2.id) {
+                  res.data.records.splice(index2, 1);
+                }
+              });
+            });
+          }
+          this.goodList = res.data.records;
+          this.showGoods = true;
+        }
+      });
+    },
+    changeNumber(currentValue, oldValue, row) {
+      console.log(currentValue, oldValue, row);
+      this.$set(
+          this.goodIntegral,
+          row.id,
+          Number(currentValue) * Number(row.costIntegral)
+      );
+    },
+    getShopList() {
+      this.instance
+      .post(`/app/appvillagerintegralshop/listForOperator`, null, {
+        params: {
+          size: 100000,
+          areaId: this.areaId,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.shopList = res.data.records;
+        }
+      });
+    },
+    save(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.forms.merchandiseList.forEach((e1, index1) => {
+            Object.keys(this.merchandiseNumbers).forEach((e2) => {
+              if (e1.id == e2) {
+                this.forms.merchandiseList[
+                    index1
+                    ].merchandiseNumber = this.merchandiseNumbers[e2];
+              }
+            });
+          });
+          this.instance
+          .post(
+              `/app/appvillagerintegralshoporder/addOrder`,
+              {
+                ...this.forms,
+                areaId: this.user.info.areaId,
+                orderIntegral: this.allIntegral,
+              },
+              null
+          )
+          .then((res) => {
+            if (res.code == 0) {
+              this.$message.success("提交成功");
+              this.$emit("goBack");
+            } else {
+              return this.$message.error(res.msg);
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    searchDetail(id) {
+      this.instance
+      .post(`/app/appvillagerintegralshoporder/queryDetailById`, null, {
+        params: {
+          id,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.detailInfo = {...res.data};
+          this.detailInfo.merchandiseList.map((e) => {
+            let arr = JSON.parse(e.merchandisePhoto);
+            e.merchandisePhoto = [{...arr[0]}];
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.add_order {
+  height: 100%;
+
+  .form_div {
+    padding: 16px 0;
+  }
+
+  .goods {
+    ::v-deep .el-table td {
+      border-bottom: none;
+      padding: 2px 0;
+    }
+
+    ::v-deep .el-table th {
+      padding: 2px 0;
+    }
+  }
+
+  .total {
+    width: 100%;
+    padding: 32px 0;
+
+    p {
+      text-align: right;
+      font-size: 14px;
+    }
+
+    .num {
+      font-size: 14px;
+      color: #333333;
+
+      span:nth-child(1) {
+        color: #999999;
+      }
+
+      span:nth-child(2) {
+        color: #2266ff;
+        font-size: 20px;
+        font-weight: bold;
+      }
+    }
+
+    .tip {
+      color: #ff4466;
+    }
+  }
+
+  .border_div {
+    overflow: hidden;
+    border-radius: 2px;
+    border: 1px solid #d0d4dc;
+
+    header {
+      height: 40px;
+      background: #f5f5f5;
+      padding: 0 8px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border-bottom: 1px solid #d0d4dc;
+
+      span {
+        color: #333333;
+        font-size: 12px;
+      }
+    }
+  }
+
+  .info {
+    padding: 16px 0;
+  }
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreSupermarket/goodsManagement.vue b/project/xiushan/apps/creditScore/scoreSupermarket/goodsManagement.vue
new file mode 100644
index 00000000..2e1ab2c2
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreSupermarket/goodsManagement.vue
@@ -0,0 +1,336 @@
+<template>
+  <section class="order_management">
+    <ai-list isTabs>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template slot="left">
+            <el-select
+              size="small"
+              v-model="searchObj.shopId"
+              placeholder="请选择店铺"
+              clearable
+              @change="(page.current = 1), getList()">
+              <el-option
+                v-for="(item, i) in shopList"
+                :key="i"
+                :label="item.shopName"
+                :value="item.id">
+              </el-option>
+            </el-select>
+            <el-select
+              size="small"
+              v-model="searchObj.merchandiseType"
+              placeholder="请选择商品类型"
+              clearable
+              @change="(page.current = 1), getList()">
+              <el-option
+                v-for="(item, i) in dict.getDict('integralMerchandiseType')"
+                :key="i"
+                :label="item.dictName"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
+            <el-select
+              size="small"
+              v-model="searchObj.status"
+              placeholder="请选择状态"
+              clearable
+              @change="(page.current = 1), getList()">
+              <el-option
+                v-for="(item, i) in dict.getDict('integralMerchandiseStatus')"
+                :key="i"
+                :label="item.dictName"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </template>
+          <template slot="right">
+            <el-input
+              v-model="searchObj.merchandiseName"
+              size="small"
+              placeholder="商品名"
+              @keyup.enter.native="(page.current = 1), getList()"
+              @clear="(page.current = 1), searchObj.merchandiseName = '', getList()"
+              clearable
+              suffix-icon="iconfont iconSearch" />
+          </template>
+        </ai-search-bar>
+        <ai-search-bar class="mt10">
+          <template slot="left">
+            <el-button
+              type="primary"
+              icon="iconfont iconAdd"
+              @click="add()"
+              v-if="$permissions('app_appvillagerintegralmerchandise_edit')">
+              添加
+            </el-button>
+            <ai-download
+              :instance="instance"
+              :fileName="'商品列表'"
+              url="/app/appvillagerintegralmerchandise/export"
+              v-if="$permissions('app_appvillagerintegralmerchandise_export')"
+              :params="{ ...searchObj, areaId: areaId }">
+            </ai-download>
+          </template>
+          <template slot="right"> </template>
+        </ai-search-bar>
+        <ai-table
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="page.total"
+          :current.sync="page.current"
+          :size.sync="page.size"
+          @getList="getList">
+          <el-table-column
+            label="商品图"
+            slot="photo"
+            align="center"
+            width="150">
+            <template v-slot="{ row }">
+              <ai-uploader
+                :disabled="true"
+                :instance="instance"
+                v-model="row.photo"
+                :limit="9">
+              </ai-uploader>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" slot="options" align="center" width="200" fixed="right">
+            <template v-slot="{ row }">
+              <div class="table-options">
+                <el-button
+                  type="text"
+                  title="编辑"
+                  :disabled="!$permissions('app_appvillagerintegralmerchandise_edit') || row.enable != 1"
+                  @click="edit(row)">
+                  编辑
+                </el-button>
+                <el-button
+                  type="text"
+                  title="详情"
+                  :disabled="!$permissions('app_appvillagerintegralmerchandise_detail') || row.enable != 1"
+                  @click="goDetail(row)">
+                  详情
+                </el-button>
+                <el-button
+                  type="text"
+                  title="上架"
+                  :disabled="row.status != 0 || !$permissions('app_appvillagerintegralmerchandise_edit') || row.enable != 1"
+                  @click="changeStatus(row)">
+                  上架
+                </el-button>
+                <el-button
+                  type="text"
+                  title="下架"
+                  :disabled="row.status != 1 || !$permissions('app_appvillagerintegralmerchandise_edit') || row.enable != 1"
+                  @click="changeStatus(row)">
+                  下架
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "goodsManagement",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    areaId: String,
+  },
+  data() {
+    return {
+      searchObj: {
+        shopId: "",
+        status: "",
+        merchandiseName: "",
+        merchandiseType: "",
+      },
+      page: {
+        size: 10,
+        current: 1,
+        total: 0,
+      },
+      tableData: [],
+      shopList: [],
+    };
+  },
+  computed: {
+    colConfigs() {
+      let _ = this;
+      return [
+        {
+          prop: "shopId",
+          label: "店铺名称",
+        },
+        {
+          slot: "photo",
+          prop: "photo",
+          align: "center",
+          label: "商品图",
+        },
+        {
+          prop: "merchandiseName",
+          align: "left",
+          label: "商品名",
+          width: 180,
+          "show-overflow-tooltip": false,
+        },
+        {
+          prop: "costIntegral",
+          align: "center",
+          label: "单价",
+          width: 100,
+        },
+        {
+          prop: "inventoryNumber",
+          align: "center",
+          label: "库存",
+        },
+        {
+          prop: "saleNumber",
+          align: "center",
+          label: "销量",
+        },
+        {
+          prop: "status",
+          align: "center",
+          label: "状态",
+          render(h, { row }) {
+            return h(
+              "span",
+              {
+                style: {
+                  color: _.$dict.getColor(
+                    "integralMerchandiseStatus",
+                    row.status
+                  ),
+                },
+              },
+              _.$dict.getLabel("integralMerchandiseStatus", row.status)
+            );
+          },
+        },
+      ];
+    },
+  },
+  created() {
+    this.dict.load("integralMerchandiseType", "integralMerchandiseStatus");
+    this.getShopList().then(() => {
+      this.getList();
+    });
+  },
+  methods: {
+    getList() {
+      this.instance
+        .post(`/app/appvillagerintegralmerchandise/list`, null, {
+          params: {
+            ...this.searchObj,
+            ...this.page,
+            areaId: this.areaId,
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.tableData = res.data.records;
+            this.tableData.map(e => {
+              let i = this.shopList.findIndex((item) => item.id == e.shopId);
+              if (i > -1) {
+                e.shopId = this.shopList[i].shopName;
+              }
+              if (e.photo) {
+                e.allPhoto = [...JSON.parse(e.photo)];
+                e.photo = [{ ...e.allPhoto[0] }];
+              } else {
+                e.photo = [];
+              }
+            });
+            this.page.total = res.data.total;
+          }
+        });
+    },
+    updateList() {
+      this.getShopList().then(() => {
+        this.getList();
+      });
+    },
+    reset() {
+      Object.keys(this.searchObj).forEach((e) => {
+        this.searchObj[e] = "";
+      });
+      this.getList();
+    },
+    add() {
+      this.$emit("showDetail", { isAdd: true });
+    },
+    edit(row) {
+      this.$emit("showDetail", { isAdd: true, ...row });
+    },
+    goDetail(row) {
+      this.$emit("showDetail", { isAdd: false, ...row });
+    },
+    changeStatus(row) {
+      let status =
+        row.status == 0
+          ? `上架 ${row.shopId}-${row.merchandiseName}`
+          : `下架 ${row.shopId}-${row.merchandiseName}`;
+      this.$confirm(
+        `<p>是否要<span style='color:#2266FF;'>${status}</span>？</p>`,
+        {
+          type: "error",
+        }
+      )
+        .then(() => {
+          this.instance
+            .post("/app/appvillagerintegralmerchandise/enableOrDisable", null, {
+              params: { id: row.id },
+            })
+            .then((res) => {
+              if (res?.code == 0) {
+                this.$message.success("操作成功!");
+                this.getList();
+              }
+            });
+        })
+        .catch(() => {});
+    },
+    getShopList() {
+      return new Promise((reslove) => {
+        this.instance
+          .post(`/app/appvillagerintegralshop/list`, null, {
+            params: {
+              size: 100000,
+              areaId: this.areaId,
+            },
+          })
+          .then((res) => {
+            if (res.code == 0) {
+              this.shopList = res.data.records;
+              reslove();
+            }
+          });
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.order_management {
+  background: #f3f6f9;
+  height: 100%;
+  overflow: auto;
+  .iconShow {
+    padding: 0 8px;
+  }
+  .iconfont {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue b/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue
new file mode 100644
index 00000000..b7acbfc6
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue
@@ -0,0 +1,483 @@
+<template>
+  <section class="order_management">
+    <ai-list isTabs>
+      <template slot="content">
+        <ai-search-bar>
+          <template slot="left">
+            <el-select
+              size="small"
+              v-model="searchObj.shopId"
+              placeholder="请选择店铺"
+              clearable
+              @change="(page.current = 1), getList()">
+              <el-option
+                v-for="(item, i) in shopList"
+                :key="i"
+                :label="item.shopName"
+                :value="item.id">
+              </el-option>
+            </el-select>
+            <el-select
+              size="small"
+              v-model="searchObj.orderStatus"
+              placeholder="请选择状态"
+              clearable
+              @change="(page.current = 1), getList()">
+              <el-option
+                v-for="(item, i) in dict.getDict('integralOrderStatus')"
+                :key="i"
+                :label="item.dictName"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
+            <div class="times_div">
+              <p class="times">创建时间</p>
+              <el-date-picker
+                v-model="searchObj.createTimeStart"
+                type="date"
+                size="small"
+                @change="(page.current = 1), getList()"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="开始日期">
+              </el-date-picker>
+              <el-date-picker
+                v-model="searchObj.createTimeEnd"
+                type="date"
+                size="small"
+                @change="(page.current = 1), getList()"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="结束日期">
+              </el-date-picker>
+            </div>
+          </template>
+
+          <template slot="right">
+            <el-input
+              v-model="searchObj.name"
+              size="small"
+              placeholder="订单号/商品名"
+              @change="page.current = 1, searchObj.name = '', getList()"
+              clearable
+              suffix-icon="iconfont iconSearch"
+            />
+          </template>
+        </ai-search-bar>
+        <ai-search-bar>
+          <template slot="left">
+            <!-- <el-button type="primary" icon="iconfont iconAdd" @click="add()">添加</el-button> -->
+            <ai-download
+              :instance="instance"
+              url="/app/appvillagerintegralshoporder/listExport"
+              :params="{ ...searchObj, areaId: areaId, ids: ids.join(',') }"
+              fileName="订单管理"
+              v-if="$permissions('app_appvillagerintegralshoporder_export')">
+            </ai-download>
+            <el-dropdown @command="handleCommand">
+              <el-button type="primary">
+                变更状态<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="1">批量完成</el-dropdown-item>
+                <el-dropdown-item command="2">批量取消</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+          <template slot="right"></template>
+        </ai-search-bar>
+        <ai-table
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="page.total"
+          ref="aitableex"
+          :current.sync="page.current"
+          @select="onRowClick"
+          @select-all="onRowClick"
+          row-key="id"
+          :default-expand-all="false"
+          :tree-props="{ children: 'merchandiseList' }"
+          :size.sync="page.size"
+          @getList="getList">
+          <el-table-column
+            align="center"
+            type="selection"
+            :selectable="row=>row.orderStatus==0"
+            width="55"
+            slot="selection">
+          </el-table-column>
+          <el-table-column
+            label="订单号/创建时间"
+            slot="orderCode"
+            align="center"
+            width="150">
+            <template v-slot="{ row }">
+              <el-row>
+                <el-col>{{ row.orderCode }}</el-col>
+                <el-col style="color: #999999">{{ row.createTime }}</el-col>
+              </el-row>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="商品图"
+            slot="merchandisePhoto"
+            align="center"
+            width="130">
+            <template v-slot="{ row }">
+              <ai-uploader
+                :disabled="true"
+                :instance="instance"
+                v-model="row.merchandisePhoto"
+                :limit="9">
+              </ai-uploader>
+            </template>
+          </el-table-column>
+          <el-table-column label="兑换家庭" slot="portalUserPhone" align="left">
+            <template v-slot="{ row }">
+              <el-row>
+                <el-col style="width: 100%">{{ row.portalUserPhone }}</el-col>
+                <el-col style="color: #999999">{{ row.portalUserPhone }}</el-col>
+              </el-row>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作人" slot="createUserName" align="left">
+            <template v-slot="{ row }">
+              <el-row>
+                <el-col style="width: 100%">{{ row.createUserName }}</el-col>
+                <el-col style="color: #999999">{{
+                  row.createUserPhone
+                  }}
+                </el-col>
+              </el-row>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="订单状态"
+            slot="orderStatus"
+            align="center"
+            width="130"
+            fixed="right">
+            <template v-slot="{ row }">
+              <el-row v-if="row.isParent">
+                <el-col
+                  style="width: 100%"
+                  :style="{
+                    color: dict.getColor(
+                      'integralOrderStatus',
+                      row.orderStatus
+                    ),
+                  }"
+                >{{
+                  dict.getLabel("integralOrderStatus", row.orderStatus)
+                  }}
+                </el-col
+                >
+                <el-col style="width: 100%" v-if="row.orderStatus == 0"
+                >{{ row.reserveDate }} {{ row.reserveTime }}
+                </el-col
+                >
+                <el-col style="color: #2266ff; width: 100%" v-if="row.remark">
+                  <el-tooltip
+                    :disabled="!row.remark"
+                    class="item"
+                    effect="light"
+                    :content="row.remark"
+                    placement="left-end"
+                  >
+                    <el-link type="primary">备注</el-link>
+                  </el-tooltip>
+                </el-col>
+              </el-row>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            slot="options"
+            align="center"
+            width="120"
+            fixed="right">
+            <template v-slot="{ row }">
+              <div class="table-options">
+                <el-button
+                  v-if="row.orderCode"
+                  type="text"
+                  @click="goDetail(row)"
+                  title="详情"
+                  :disabled="!$permissions('app_appvillagerintegralshoporder_detail')">
+                  详情
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+  </section>
+</template>
+
+<script>
+  export default {
+    name: "orderManagement",
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function,
+      areaId: String,
+    },
+    data() {
+      return {
+        searchObj: {
+          name: "",
+          orderStatus: "",
+          createTimeStart: null,
+          createTimeEnd: null,
+          shopId: "",
+        },
+        page: {
+          size: 10,
+          current: 1,
+          total: 0,
+        },
+        tableData: [],
+        shopList: [],
+        ids: [],
+      };
+    },
+    computed: {
+      colConfigs() {
+        return [
+          {slot: "selection"},
+          {
+            prop: "orderCode",
+            align: "center",
+            slot: "orderCode",
+            label: "订单号/创建时间",
+          },
+          {
+            prop: "merchandisePhoto",
+            slot: "merchandisePhoto",
+            align: "center",
+            label: "商品图",
+          },
+          {
+            prop: "merchandiseName",
+            align: "left",
+            label: "商品名",
+            width: 180,
+            "show-overflow-tooltip": false,
+          },
+          {
+            prop: "costIntegral",
+            align: "center",
+            label: "单价",
+            width: 100,
+          },
+          {
+            prop: "merchandiseNumber",
+            align: "center",
+            label: "数量",
+          },
+          {
+            prop: "allCostIntegral",
+            align: "center",
+            label: "消耗积分",
+          },
+          {
+            prop: "createUserName",
+            align: "center",
+            label: "操作人",
+            slot: "createUserName",
+          },
+          {
+            prop: "orderStatus",
+            align: "center",
+            label: "订单状态",
+            fixed: "right",
+            slot: "orderStatus",
+            // render(h, {row}) {
+            //     return h('span', {style: {color: _.dict.getColor('integralOrderStatus', row.orderStatus)}}, _.dict.getLabel('integralOrderStatus', row.orderStatus))
+            // }
+          },
+        ];
+      },
+    },
+    created() {
+      this.getList();
+      this.dict.load("integralOrderStatus");
+      this.getShopList();
+    },
+    methods: {
+      onRowClick(row) {
+        this.ids = row.map(e => e.id)
+      },
+      handleCommand(val) {
+        if (this.ids.length == 0) {
+          return this.$message.error("请选择商品")
+        }
+        this.instance.post(`/app/appvillagerintegralshoporder/changeOrderStatus`, null, {
+          params: {
+            ids: this.ids.join(","),
+            status: val
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.$message.success(`批量${val == 1 ? '完成' : '取消'}成功`)
+            this.getList()
+          }
+        })
+      },
+      getList() {
+        this.instance
+          .post(`/app/appvillagerintegralshoporder/list`, null, {
+            params: {
+              ...this.searchObj,
+              ...this.page,
+              areaId: this.areaId,
+            },
+          })
+          .then((res) => {
+            if (res.code == 0) {
+              this.tableData = res.data.records;
+              this.tableData.map((e) => {
+                e.merchandiseName = e.merchandiseList[0].merchandiseName;
+                e.merchandiseNumber = e.merchandiseList[0].merchandiseNumber;
+                e.merchandisePhoto = [
+                  {...JSON.parse(e.merchandiseList[0].merchandisePhoto)[0]},
+                ];
+                e.idForWeb = e.merchandiseList[0].idForWeb;
+                e.costIntegral = e.merchandiseList[0].costIntegral;
+                e.allCostIntegral =
+                  Number(e.merchandiseList[0].costIntegral) *
+                  Number(e.merchandiseNumber);
+                e.merchandiseList.splice(0, 1);
+                e.isParent = true;
+                if (e.merchandiseList.length > 0) {
+                  e.merchandiseList.map((e2) => {
+                    e2.createTime = "";
+                    let arr = JSON.parse(e2.merchandisePhoto);
+                    e2.merchandisePhoto = [{...arr[0]}];
+                    e2.allCostIntegral =
+                      Number(e2.costIntegral) * Number(e2.merchandiseNumber);
+                    e2.isParent = false;
+                    // e2.id = e2.orderId
+                  });
+                }
+              });
+              this.page.total = res.data.total;
+            }
+          });
+      },
+      getShopList() {
+        return new Promise((reslove) => {
+          this.instance
+            .post(`/app/appvillagerintegralshop/list`, null, {
+              params: {
+                size: 100000,
+                areaId: this.areaId,
+              },
+            })
+            .then((res) => {
+              if (res.code == 0) {
+                this.shopList = res.data.records;
+                reslove();
+              }
+            });
+        });
+      },
+      reset() {
+        Object.keys(this.searchObj).forEach((e) => {
+          this.searchObj[e] = "";
+        });
+        this.searchObj.createTimeStart = null;
+        this.searchObj.createTimeEnd = null;
+        this.getList();
+      },
+      add() {
+        this.$emit("showDetail", {isAdd: true});
+      },
+      goDetail(row) {
+        this.$emit("showDetail", {isAdd: false, ...row});
+      },
+      finishOrder(row) {
+        this.$confirm(`是否完成此订单？`, {
+          type: "error",
+        })
+          .then(() => {
+            this.instance
+              .post(`/app/appvillagerintegralshoporder/FinishOrder`, null, {
+                params: {
+                  orderId: row.id,
+                },
+              })
+              .then((res) => {
+                if (res.code == 0) {
+                  this.$message.success("已完成！");
+                  this.getList();
+                }
+              });
+          })
+          .catch(() => {
+          });
+      },
+      overOrder(row) {
+        this.$confirm(`是否结束此订单？`, {
+          type: "error",
+        })
+          .then(() => {
+            this.instance
+              .post(`/app/appvillagerintegralshoporder/overOrder`, null, {
+                params: {
+                  orderId: row.id,
+                },
+              })
+              .then((res) => {
+                if (res.code == 0) {
+                  this.$message.success("已结束！");
+                  this.getList();
+                }
+              });
+          })
+          .catch(() => {
+          });
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .order_management {
+    height: 100%;
+    overflow: auto;
+    background: #f3f6f9;
+
+    .times_div {
+      display: flex;
+      align-items: center;
+
+      .times {
+        display: block;
+        width: 72px;
+        height: 30px;
+        line-height: 30px;
+        margin: 0;
+        text-align: center;
+        background: #f5f5f5;
+        border-radius: 2px 0px 0px 2px;
+        border: 1px solid #d0d4dc;
+        font-size: 14px;
+        color: #666666;
+      }
+    }
+
+    .iconfont {
+      cursor: pointer;
+    }
+
+    .iconCorrect {
+      color: #53b43b;
+    }
+
+    .iconReject {
+      color: #e75555;
+      padding: 0 8px;
+    }
+  }
+</style>
diff --git a/project/xiushan/apps/creditScore/scoreSupermarket/storeManagement.vue b/project/xiushan/apps/creditScore/scoreSupermarket/storeManagement.vue
new file mode 100644
index 00000000..c27238ab
--- /dev/null
+++ b/project/xiushan/apps/creditScore/scoreSupermarket/storeManagement.vue
@@ -0,0 +1,412 @@
+<template>
+  <section class="storeManagement">
+    <ai-list isTabs>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template slot="left">
+            <el-button
+                type="primary"
+                icon="iconfont iconAdd"
+                @click="onAdd">
+              添加
+            </el-button>
+          </template>
+        </ai-search-bar>
+        <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            ref="aitableex"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
+          <el-table-column
+              slot="changeIntegral"
+              label="积分"
+              align="center">
+            <template slot-scope="{ row }">
+              <span>{{ row.doType > 0 ? "+" : "" }}{{ row.changeIntegral }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="options" label="操作" align="center" width="120" fixed="right">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button
+                    type="text"
+                    title="编辑"
+                    style="margin-right: 8px;"
+                    :disabled="!$permissions('app_appvillagerintegralshop_edit')"
+                    @click="editItem(row)">
+                  编辑
+                </el-button>
+                <el-button
+                    type="text"
+                    @click="statusChage(row)"
+                    title="授权"
+                    v-if="$permissions('app_appvillagerintegralshop_edit')">
+                  授权
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog
+        :title="dialog.title"
+        :visible.sync="dialog.visible"
+        :customFooter="true"
+        :destroyOnClose="true"
+        @close="init('ruleForm')"
+        width="520px"
+    >
+      <div class="form_div">
+        <el-form
+            ref="ruleForm"
+            :model="dialogInfo"
+            :rules="formRules"
+            size="small"
+            label-suffix="："
+            label-width="100px"
+        >
+          <el-form-item label="店铺名称" prop="shopName">
+            <el-input
+                placeholder="请输入…"
+                v-model="dialogInfo.shopName"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="店主" prop="shopkeeper">
+            <el-input
+                placeholder="请输入…"
+                v-model="dialogInfo.shopkeeper"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="phone">
+            <el-input
+                placeholder="请输入…"
+                v-model="dialogInfo.phone"
+                maxlength="11"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="店铺地址" prop="shopAddress">
+            <el-input
+                placeholder="请输入…"
+                v-model="dialogInfo.shopAddress"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="dialogInfo.status">
+              <el-radio label="1">启用</el-radio>
+              <el-radio label="0">停用</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialog.visible = false" size="medium"
+        >取消
+        </el-button
+        >
+        <el-button @click="onConfirm('ruleForm')" type="primary" size="medium"
+        >确认
+        </el-button
+        >
+      </div>
+    </ai-dialog>
+    <ai-dialog :visible.sync="authDialog" title="授权" @onConfirm="handleAuth" @closed="form={}" width="500px">
+      <ai-user-picker :instance="instance" v-model="form.operators" multiple action="/user/page" label="name"
+                      @list="v=>operators=v"/>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+import AiUserPicker from "../../../components/AiUserPicker";
+
+export default {
+  name: "storeManagement",
+  components: {AiUserPicker},
+  props: {
+    instance: Function,
+    dict: Object,
+    areaId: String,
+  },
+
+  data() {
+    return {
+      searchDotime: [],
+      search: {
+        current: 1,
+        size: 10,
+      },
+      unitId: "",
+      total: 10,
+      colConfigs: [
+        {prop: "shopName", label: "店铺名称", align: "left"},
+        {
+          prop: "shopkeeper",
+          label: "店主",
+          align: "center",
+        },
+        {
+          prop: "phone",
+          label: "联系电话",
+          align: "center",
+        },
+        {
+          prop: "shopAddress",
+          label: "店铺地址",
+          align: "left",
+          width: 280,
+        },
+        {
+          prop: "names",
+          label: "店铺操作员",
+          align: "left",
+        },
+        {
+          prop: "status",
+          label: "状态",
+          align: "center",
+          render: (h, params) => {
+            return h(
+                "span",
+                {
+                  class: "status-" + params.row.status,
+                },
+                this.$dict.getLabel("assessmentStartStatus", params.row.status)
+            );
+          },
+        },
+        {slot: "options", label: "操作", align: "center"},
+      ],
+      tableData: [],
+      dialog: {
+        title: "",
+        visible: false,
+        visibleStatus: false,
+      },
+      dialogInfo: {
+        shopName: "",
+        shopkeeper: "",
+        phone: "",
+        shopAddress: "",
+        status: "1",
+        areaId: "",
+        operators: [],
+      },
+      formRules: {
+        shopName: [
+          {required: true, message: "请输入店铺名称", trigger: "change"},
+        ],
+        shopkeeper: [
+          {required: true, message: "请输入店主", trigger: "blur"},
+        ],
+        phone: [{required: true, message: "请输入联系电话", trigger: "blur"}],
+        shopAddress: [
+          {required: true, message: "请输入店铺地址", trigger: "blur"},
+        ],
+        status: [{required: true, message: "请选择状态", trigger: "blur"}],
+        areaId: [
+          {required: true, message: "请选择事件区域", trigger: "blur"},
+        ],
+        operators: [
+          {required: true, message: "请选择操作员", trigger: "blur"},
+        ],
+      },
+      peopleAjaxUrl: "/admin/user/page",
+      authDialog: false,
+      form: {},
+      operators: []
+    };
+  },
+
+  computed: {
+    ...mapState(["user"]),
+  },
+
+  created() {
+    this.unitId = this.user.info.unitId;
+
+    this.$dict.load("assessmentStartStatus").then(() => {
+      this.getList();
+    });
+  },
+
+  methods: {
+    getList() {
+      this.instance
+      .post(`/app/appvillagerintegralshop/list`, null, {
+        params: {
+          ...this.search,
+          areaId: this.areaId,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.tableData = res.data.records;
+          this.total = res.data.total;
+        }
+      });
+    },
+
+    timeChange() {
+      if (this.searchDotime) {
+        this.search.doTimeStart = this.searchDotime[0];
+        this.search.doTimeEnd = this.searchDotime[1];
+      } else {
+        this.search.doTimeStart = null;
+        this.search.doTimeEnd = null;
+      }
+      this.search.current = 1;
+      this.getList();
+    },
+
+    editItem(row) {
+      this.dialogInfo = {...row};
+      this.dialog.visible = true;
+    },
+
+    statusChage(row) {
+      this.authDialog = true
+      let store = JSON.parse(JSON.stringify(row))
+      this.form = {...store, operators: store.operators?.map(e => e.id)}
+    },
+    handleAuth() {
+      let form = JSON.parse(JSON.stringify(this.form))
+      form.operators = this.operators.map(({id, name}) => ({id, name}))
+      this.instance.post(`/app/appvillagerintegralshop/addOrUpdate`, form).then((res) => {
+        if (res?.code == 0) {
+          this.$message.success("授权成功!")
+          this.authDialog = false
+          this.getList()
+        }
+      })
+    },
+    getSelect(e) {
+      this.dialogInfo.operators = e;
+      this.dialogInfo.operators.map((item) => {
+        if (!item.name) {
+          item.name = item.userName;
+        }
+      });
+      this.instance
+      .post(`/app/appvillagerintegralshop/addOrUpdate`, this.dialogInfo)
+      .then((res) => {
+        this.dialogInfo.operators = []
+        if (res.code == 0) {
+          this.onReset();
+        }
+      }).catch(() => {
+        this.dialogInfo.operators = []
+      })
+    },
+    onReset() {
+      this.search.current = 1;
+      this.getList();
+    },
+
+    onConfirm(formName) {
+      if (this.dialogInfo.operators.length) {
+        this.dialogInfo.operators.map((item) => {
+          if (!item.name) {
+            item.name = item.userName;
+          }
+        });
+      }
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.instance
+          .post(`/app/appvillagerintegralshop/addOrUpdate`, this.dialogInfo)
+          .then((res) => {
+            if (res.code == 0) {
+              this.onReset();
+              this.onCancel();
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+
+    onCancel() {
+      this.dialog.visible = false;
+      this.dialog.visibleStatus = false;
+    },
+
+    init(formName) {
+      this.$refs[formName].clearValidate();
+      Object.keys(this.dialogInfo).forEach((e) => {
+        this.dialogInfo[e] = "";
+      });
+      this.dialogInfo.status = "1";
+      this.dialogInfo.operators = [];
+    },
+
+
+    delate(index) {
+      this.dialogInfo.operators.splice(index, 1);
+    },
+
+    onAdd() {
+      Object.keys(this.dialogInfo).forEach((e) => {
+        this.dialogInfo[e] = "";
+      });
+      this.dialogInfo.status = "1";
+      this.dialogInfo.operators = [];
+      this.dialog.visible = true;
+      this.dialogInfo.areaId = this.areaId;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.storeManagement {
+  height: 100%;
+  overflow: auto;
+  background: #f3f6f9;
+
+  .status-0 {
+    color: #ff4466;
+  }
+
+  .table-options {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .status-1 {
+    color: #2ea222;
+  }
+
+  .status-2 {
+    color: #999999;
+  }
+
+  .ai-dialog__content--wrapper {
+    overflow-x: hidden;
+  }
+
+  .organ {
+    width: auto;
+    height: auto;
+    padding: 0px 10px;
+    line-height: 32px;
+    border: 1px solid #d0d4dc;
+    border-radius: 5px;
+    cursor: pointer;
+    box-sizing: border-box;
+    color: #666;
+
+    .organzation {
+      background-color: #eee;
+      margin-right: 4px;
+      padding: 4px;
+    }
+  }
+}
+</style>
diff --git a/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue b/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue
index 10115e67..d870055f 100644
--- a/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue
+++ b/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue
@@ -34,6 +34,9 @@
           <ai-select v-model="form.organizationType" :selectList="dict.getDict('financialOrganizationType')"
                      placeholder="请选择"/>
         </el-form-item>
+        <el-form-item label="抢单数量" prop="maxOrderNumber">
+          <el-input type="number" v-model.number="form.maxOrderNumber" placeholder="每日最大抢单数量" clearable/>
+        </el-form-item>
         <el-form-item label="logo" prop="logoUrl">
           <ai-uploader v-model="form.logoUrl" :instance="instance" :limit="1" isShowTip/>
         </el-form-item>
@@ -60,6 +63,7 @@ export default {
         organizationName: [{required: true, message: "请输入机构名称"}],
         organizationType: [{required: true, message: "请选择机构类型"}],
         logoUrl: [{required: true, message: "请上传logo"}],
+        maxOrderNumber: [{required: true, message: "请输入抢单数量"},{pattern:/^\d+$/,message: '请输入正整数'}],
       }
     },
   },
@@ -72,6 +76,7 @@ export default {
       form: {logoUrl: []},
       colConfigs: [
         {label: "金融机构名称", prop: "organizationName"},
+        {label: "抢单数量", prop: "maxOrderNumber"},
         {label: "创建人", prop: "createUserName", align: 'center'},
         {label: "创建时间", prop: "createTime", align: '120px'},
         {slot: "options"}
diff --git a/project/xiushan/apps/finance/AppFinanceProduct/AppFinanceProduct.vue b/project/xiushan/apps/finance/AppFinanceProduct/AppFinanceProduct.vue
index dc234d11..b0c70944 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/AppFinanceProduct.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/AppFinanceProduct.vue
@@ -9,10 +9,11 @@
 import ProductDetail from "./productDetail";
 import ProductList from "./productList";
 import ProductAdd from "./productAdd";
+import ProductRecommend from "./productRecommend";
 
 export default {
   name: "AppFinanceProduct",
-  components: {ProductAdd, ProductList, ProductDetail},
+  components: {ProductRecommend, ProductAdd, ProductList, ProductDetail},
   label: "产品发布",
   props: {
     instance: Function,
@@ -22,11 +23,13 @@ export default {
   computed: {
     currentComponent() {
       return this.$route.hash == "#add" ? ProductAdd :
-          !!this.$route.query.id ? ProductDetail : ProductList
+          this.$route.hash == "#productRecommend" ? ProductRecommend :
+              !!this.$route.query.id ? ProductDetail : ProductList
     }
   },
   created() {
-    this.dict.load( "productGuaranteeMode", "productRepaymentMethod", "productRepaymentTimeline", "productStatus", "productFaceUser","enterpriseAuditStatus")
+    this.dict.load("productGuaranteeMode", "productRepaymentMethod", "productRepaymentTimeline", "productStatus", "productFaceUser",
+        "enterpriseAuditStatus", "yesOrNo", "financialOrganizationType")
   }
 }
 </script>
diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue b/project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue
index fd2126d4..4e693035 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue
@@ -11,16 +11,16 @@
               </el-form-item>
               <el-row type="flex" class="flexWrap">
                 <el-form-item label="贷款额度(万)" prop="loanMin">
-                  <el-input type="number" v-model="form.loanMin" placeholder="最低额度" clearable/>
+                  <el-input type="number" v-model.number="form.loanMin" placeholder="最低额度" clearable/>
                 </el-form-item>
                 <el-form-item label="" prop="loanMax">
-                  <el-input type="number" v-model="form.loanMax" placeholder="最高额度" clearable/>
+                  <el-input type="number" v-model.number="form.loanMax" placeholder="最高额度" clearable/>
                 </el-form-item>
                 <el-form-item label="参考利率(%)" prop="interestRateMin">
-                  <el-input type="number" v-model="form.interestRateMin" placeholder="最低利率" clearable/>
+                  <el-input type="number" v-model.number="form.interestRateMin" placeholder="最低利率" clearable/>
                 </el-form-item>
                 <el-form-item label="" prop="interestRateMax">
-                  <el-input type="number" v-model="form.interestRateMax" placeholder="最高利率" clearable/>
+                  <el-input type="number" v-model.number="form.interestRateMax" placeholder="最高利率" clearable/>
                 </el-form-item>
                 <el-form-item class="half" label="还款期限" prop="repaymentTimeline">
                   <ai-select v-model="form.repaymentTimeline" placeholder="请选择"
@@ -99,15 +99,15 @@ export default {
     rules() {
       return {
         productName: [{required: true, message: "请输入产品名称", trigger: 'blur'}],
-        loanMin: [{required: true, message: "请输入最低贷款额度", trigger: 'blur'}],
+        loanMin: [{required: true, message: "请输入最低贷款额度"}],
         loanMax: [
           {required: true, message: "请输入最高贷款额度", trigger: 'blur'},
-          {validator: (r, v, cb) => v <= this.form.loanMin ? cb("输入的最高贷款需大于最低贷款") : cb()}
+          {validator: (r, v, cb) => v < this.form.loanMin ? cb("输入的最高贷款需大于最低贷款") : cb()}
         ],
         interestRateMin: [{required: true, message: "请输入最低参考利率", trigger: 'blur'}],
         interestRateMax: [
           {required: true, message: "请输入最高参考利率", trigger: 'blur'},
-          {validator: (r, v, cb) => v <= this.form.interestRateMin ? cb("输入的最高参考利率需大于最低参考利率") : cb()}
+          {validator: (r, v, cb) => v < this.form.interestRateMin ? cb("输入的最高参考利率需大于最低参考利率") : cb()}
         ],
         repaymentTimeline: [{required: true, message: "请选择还款期限", trigger: 'blur'}],
         repaymentMethod: [{required: true, message: "请选择还款方式", trigger: 'blur'}],
@@ -123,7 +123,7 @@ export default {
   data() {
     return {
       dialog: false,
-      form: {guaranteeMode: [], faceUser: []},
+      form: {guaranteeMode: [], faceUser: [], loanMin: null},
     }
   },
   methods: {
diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
index 1d7d2c57..f9832185 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
@@ -1,16 +1,27 @@
 <template>
   <section class="productList">
     <ai-list>
-      <ai-title slot="title" title="产品发布管理" isShowBottomBorder/>
+      <ai-title slot="title" title="产品发布管理" isShowBottomBorder>
+        <template #rightBtn>
+          <el-button type="primary" @click="$router.push({hash:'#productRecommend'})"
+                     v-if="permissions('app_appfinancialproductrecommend_detail')">推荐产品
+          </el-button>
+        </template>
+      </ai-title>
       <template #content>
         <ai-search-bar>
           <template #left>
+            <ai-select placeholder="机构类型" v-model="search.organizationType" @change="page.current=1,getTableData()"
+                       :selectList="dict.getDict('financialOrganizationType')"/>
             <ai-select v-model="search.repaymentTimeline" :selectList="dict.getDict('productRepaymentTimeline')"
                        placeholder="还款期限"
                        @change="page.current=1,getTableData()"/>
             <ai-select v-model="search.guaranteeMode" :selectList="dict.getDict('productGuaranteeMode')"
                        placeholder="担保方式"
                        @change="page.current=1,getTableData()"/>
+            <ai-select v-model="search.isHot" :selectList="dict.getDict('yesOrNo')"
+                       placeholder="热门推荐"
+                       @change="page.current=1,getTableData()"/>
           </template>
           <template #right>
             <el-input size="small" placeholder="搜索产品名称" v-model="search.productName" clearable
@@ -74,6 +85,7 @@ export default {
       tableData: [],
       colConfigs: [
         {label: "产品名称", prop: "productName", width: "160px"},
+        {label: "机构类型", prop: "organizationType", dict: "financialOrganizationType"},
         {label: "贷款额度(万)", prop: "loanMax", align: "center", width: 120},
         {label: "参考利率(%)", slot: 'interestRateMin', align: "center", width: 120},
         {label: "还款期限", prop: "repaymentTimeline", dict: "productRepaymentTimeline", align: "center"},
diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productRecommend.vue b/project/xiushan/apps/finance/AppFinanceProduct/productRecommend.vue
new file mode 100644
index 00000000..b0e87321
--- /dev/null
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productRecommend.vue
@@ -0,0 +1,163 @@
+<template>
+  <section class="productRecommend">
+    <ai-list>
+      <ai-title slot="title" title="推荐产品" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})"/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" @click="dialog=true">新增推荐</el-button>
+            <ai-select placeholder="机构类型" v-model="search.organizationType" @change="page.current=1,getTableData()"
+                       :selectList="dict.getDict('financialOrganizationType')"/>
+          </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" width="200px">
+            <template slot-scope="{row}">
+              <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog :visible.sync="dialog" :title="dialogTitle" @closed="form={}" @onConfirm="submitAudit" width="560px">
+      <el-form :model="form" :rules="rules" ref="PRForm" size="small" label-width="120px">
+        <el-form-item label="机构类型" prop="organizationType">
+          <ai-select v-model="form.organizationType" :selectList="dict.getDict('financialOrganizationType')"
+                     @change="getProducts(),form.productId=null"/>
+        </el-form-item>
+        <el-form-item label="推荐产品" prop="productId">
+          <ai-select v-model="form.productId" :selectList="productOps" @change="getOrgId"/>
+        </el-form-item>
+        <el-form-item label="推荐顺序" prop="showIndex">
+          <el-input type="number" v-model.number="form.showIndex" placeholder="请输入" clearable/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "productRecommend",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    ...mapState(['user']),
+    isFinanceUser() {
+      return !!this.user.financeUser?.id
+    },
+    dialogTitle() {
+      return this.form.id ? "编辑推荐" : "新增推荐"
+    },
+    productOps() {
+      return this.productList.map(e => ({dictName: e.productName, dictValue: e.id})) || []
+    }
+  },
+  data() {
+    return {
+      search: {productName: ""},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      colConfigs: [
+        {label: "产品名称", prop: "productName"},
+        {label: "机构类型", prop: "organizationType", dict: "financialOrganizationType", width: 120},
+        {label: "推荐顺序", prop: "showIndex", align: "center", width: 120},
+        {label: "机构名称", prop: "organizationName"},
+        {slot: "options"}
+      ],
+      dialog: false,
+      form: {},
+      rules: {
+        showIndex: [
+          {required: true, message: "请输入推荐顺序"},
+          {pattern: /^[1-7]$/, message: "请输入1~7之间的整数"}
+        ],
+        productId: [{required: true, message: "请选择推荐产品", trigger: "blur"}],
+        organizationType: [{required: true, message: "请选择机构类型"}],
+      },
+      productList: []
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/appfinancialproductrecommend/list", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    handleEdit(row) {
+      this.dialog = true
+      this.form = JSON.parse(JSON.stringify(row))
+      this.getProducts()
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该推荐?").then(() => {
+        this.instance.post("/appfinancialproductrecommend/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功!")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    },
+    submitAudit() {
+      this.$refs.PRForm.validate(v => {
+        if (v) {
+          this.instance.post("/appfinancialproductrecommend/addOrUpdate", this.form).then(res => {
+            if (res?.code == 0) {
+              this.$message.success("提交成功!")
+              this.getTableData()
+              this.dialog = false
+            }
+          })
+        }
+      })
+    },
+    getProducts() {
+      let {organizationType} = this.form
+      this.instance.post("/appfinancialproduct/list", null, {
+        params: {organizationType, size: 999, status: 1}
+      }).then(res => {
+        if (res?.data) {
+          this.productList = res.data?.records
+        }
+      })
+    },
+    getOrgId(productId) {
+      let product = this.productList.find(e => e.id == productId)
+      this.form.organizationId = product?.organizationId || ""
+      this.$forceUpdate()
+    }
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.productRecommend {
+  height: 100%;
+
+  ::v-deep input[type="number"] {
+    line-height: 1px !important;
+
+    &::-webkit-outer-spin-button, &::-webkit-inner-spin-button {
+      -webkit-appearance: none !important;
+    }
+  }
+}
+</style>
diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
index 85e00eee..a207103d 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -85,7 +85,7 @@
             <el-date-picker v-model="form.loanDate" placeholder="请选择" clearable value-format="yyyy-MM-dd"/>
           </el-form-item>
         </template>
-        <el-form-item v-else-if="form.auditStatus==2" label="审批意见" prop="remark">
+        <el-form-item v-else-if="form.auditStatus==2" label="审批意见" prop="auditDescription">
           <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入" maxlength="200" show-word-limit/>
         </el-form-item>
       </el-form>
@@ -125,7 +125,7 @@ export default {
         ],
         auditLifespan: [{required: true, message: "请选择 使用期限"}],
         loanDate: [{required: true, message: "请选择 放款日期"}],
-        remark: [{required: true, message: "请输入 审批意见"}],
+        auditDescription: [{required: true, message: "请输入 审批意见"}],
       }
     }
   },
diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
index 6c85fd78..220d8e20 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
@@ -1,32 +1,44 @@
 <template>
   <section class="loanList">
-    <ai-list>
+    <ai-detail>
       <ai-title slot="title" title="贷款审核" isShowBottomBorder/>
       <template #content>
-        <ai-search-bar>
-          <template #left>
-            <ai-select v-model="search.status" :selectList="dict.getDict('financialLoanApplyStatus')" placeholder="审批状态"
-                       @change="page.current=1,getTableData()"/>
-            <ai-search label="申请时间">
-              <el-date-picker size="small" v-model="search.applyTime" type="daterange" @change="handleFilterApplyTime"
-                              :default-time="['00:00:00','23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"/>
-            </ai-search>
+        <el-row type="flex">
+          <div class="staCard fill" v-for="(op,label) in sta" :key="label">
+            <h2 v-text="op"/>
+            <span v-text="label"/>
+          </div>
+        </el-row>
+        <ai-card hideTitle>
+          <template #content>
+            <ai-search-bar class="mar-t8">
+              <template #left>
+                <ai-select v-model="search.status" :selectList="dict.getDict('financialLoanApplyStatus')"
+                           placeholder="审批状态"
+                           @change="page.current=1,getTableData()"/>
+                <ai-search label="申请时间">
+                  <el-date-picker size="small" v-model="search.applyTime" type="daterange"
+                                  @change="handleFilterApplyTime"
+                                  :default-time="['00:00:00','23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"/>
+                </ai-search>
+              </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 type="text" @click="showDetail(row.id)">详情</el-button>
+                </template>
+              </el-table-column>
+            </ai-table>
           </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 type="text" @click="showDetail(row.id)">详情</el-button>
-            </template>
-          </el-table-column>
-        </ai-table>
+        </ai-card>
       </template>
-    </ai-list>
+    </ai-detail>
   </section>
 </template>
 
@@ -58,7 +70,8 @@ export default {
         {label: "贷款银行", prop: "organizationName"},
         {label: "状态", prop: "status", align: "center", dict: "financialLoanApplyStatus"},
         {slot: "options"}
-      ]
+      ],
+      sta: {}
     }
   },
   methods: {
@@ -77,18 +90,41 @@ export default {
     },
     handleFilterApplyTime() {
       this.page.current = 1
-      this.search.applyStartDate = this.search.applyTime?.[0].substring(0,10)
-      this.search.applyEndDate = this.search.applyTime?.[1].substring(0,10)
+      this.search.applyStartDate = this.search.applyTime?.[0].substring(0, 10)
+      this.search.applyEndDate = this.search.applyTime?.[1].substring(0, 10)
       this.getTableData()
+    },
+    getStaData() {
+      this.instance.post("/appfinancialloanapply/staticFinancialLoanApply").then(res => {
+        if (res?.data) {
+          this.sta = res.data
+        }
+      })
     }
   },
   created() {
     this.getTableData()
+    this.getStaData()
   }
 }
 </script>
 
 <style lang="scss" scoped>
 .loanList {
+  height: 100%;
+
+  .mar-t8 {
+    margin-top: 8px;
+  }
+
+  .staCard {
+    text-align: center;
+    margin: 0 8px 16px;
+    box-shadow: 0 4px 6px -2px rgba(15, 15, 21, 0.15);
+    border-radius: 4px;
+    padding: 16px;
+    box-sizing: border-box;
+    background: #fff;
+  }
 }
 </style>
diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/AppFinancingNeeds.vue b/project/xiushan/apps/financing/AppFinancingNeeds/AppFinancingNeeds.vue
index 522ffbb5..3f317442 100644
--- a/project/xiushan/apps/financing/AppFinancingNeeds/AppFinancingNeeds.vue
+++ b/project/xiushan/apps/financing/AppFinancingNeeds/AppFinancingNeeds.vue
@@ -24,7 +24,7 @@ export default {
     }
   },
   created() {
-    this.dict.load("productRepaymentTimeline", "financialFundPurpose")
+    this.dict.load("productRepaymentTimeline", "financialFundPurpose","financingDemandApplyType")
   }
 }
 </script>
diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
index 5a17cfa9..3fe83f94 100644
--- a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
+++ b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
@@ -11,6 +11,8 @@
         <el-form size="small" label-width="160px">
           <ai-card title="融资需求">
             <template #content>
+              <el-form-item label="融资方式">{{ dict.getLabel("financingDemandApplyType", detail.applyType) }}
+              </el-form-item>
               <el-row type="flex" class="flexWrap">
                 <el-form-item label="意向金额(万)">{{ detail.loanAmount }}</el-form-item>
                 <el-form-item label="期望使用期限">{{
@@ -21,7 +23,7 @@
                     dict.getLabel('financialFundPurpose', detail.fundPurpose)
                   }}
                 </el-form-item>
-                <el-form-item label="企业主体">
+                <el-form-item label="企业主体" v-if="detail.applyType==1">
                   <el-row type="flex">
                     {{ detail.enterpriseName }}
                     <el-link type="primary"
@@ -30,6 +32,7 @@
                     </el-link>
                   </el-row>
                 </el-form-item>
+                <el-form-item v-else/>
                 <el-form-item label="联系人">{{ detail.name }}</el-form-item>
                 <el-form-item label="所在地区">{{ detail.areaName }}</el-form-item>
                 <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
diff --git a/project/xiushan/components/AiUserPicker.vue b/project/xiushan/components/AiUserPicker.vue
new file mode 100644
index 00000000..9459120d
--- /dev/null
+++ b/project/xiushan/components/AiUserPicker.vue
@@ -0,0 +1,58 @@
+<template>
+  <section class="AiUserPicker">
+    <el-select size="small" :value="value" placeholder="选择人员" clearable @change="handleSelect" v-bind="$attrs"
+               filterable>
+      <el-option v-for="row in list" :key="row.id" :value="row.id" :label="row[label]"/>
+    </el-select>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "AiUserPicker",
+  model: {
+    prop: "value",
+    event: "select"
+  },
+  props: {
+    value: {default: ""},
+    instance: Function,
+    action: {default: "/appportaluser/list"},
+    params: {default: () => ({})},
+    label: {default: "phone"},
+    name: {default: ""}
+  },
+  data() {
+    return {
+      list: []
+    }
+  },
+  methods: {
+    getUsers() {
+      let {action, params} = this
+      this.instance?.post(action, null, {params: {...params, size: 9999}}).then(res => {
+        if (res?.data) {
+          this.list = res.data.records
+        }
+      })
+    },
+    handleSelect(v) {
+      let list = this.list.filter(e => [v].flat().includes(e.id))
+      this.$emit('select', v)
+      this.$emit("update:name", list?.map(e => e[this.label])?.toString() || "")
+      this.$emit("list", list)
+    }
+  },
+  created() {
+    this.getUsers()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AiUserPicker {
+  .el-select {
+    width: 100%;
+  }
+}
+</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": "菜单管理"
diff --git a/vue.config.js b/vue.config.js
index 2094746a..e4ebd77c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -64,22 +64,19 @@ module.exports = {
     proxy: {
       //设置代理,可解决跨5
       '/lan': {
-        target: 'http://192.168.1.87:9000/',
+        target: 'https://sdtestweb.sdvillage.cn',
         changeOrigin: true,
         pathRewrite: {
           //地址重写
           '^/lan': '/'
         }
       },
-      '/oms': {
+      '/omsapi': {
         target: 'http://192.168.1.87:19898',
         changeOrigin: true,
         pathRewrite: {
           //地址重写
-          '^/oms/app/': '/',
-          '^/oms/auth/': '/',
-          '^/oms/admin/': '/',
-          '^/oms': '/'
+          '^/omsapi': '/'
         }
       },
       '/xsjr': {