diff --git a/packages/2.0.5/AppMonitoringObject/AppMonitoringObject.vue b/packages/2.0.5/AppMonitoringObject/AppMonitoringObject.vue
deleted file mode 100644
index e53b06fa..00000000
--- a/packages/2.0.5/AppMonitoringObject/AppMonitoringObject.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-  <div class="AppMonitoringObject">
-    <keep-alive :include="['List']">
-      <component
-        ref="component"
-        :is="component"
-        @change="onChange"
-        :params="params"
-        :instance="instance"
-        :dict="dict"
-      ></component>
-    </keep-alive>
-  </div>
-</template>
-
-<script>
-import List from "./components/list";
-import Add from "./components/add";
-export default {
-  name: "AppMonitoringObject",
-  label: "监测对象",
-
-  props: {
-    instance: Function,
-    dict: Object,
-  },
-
-  data() {
-    return {
-      component: "List",
-      params: {},
-      include: [],
-    };
-  },
-
-  components: {
-    List, Add 
-  },
-
-  mounted() {},
-
-  methods: {
-    onChange(data) {
-      if (data.type === "Add") {
-        this.component = "Add";
-        this.params = data.params;
-      }
-
-      if (data.type === "List") {
-        this.component = "List";
-        this.params = data.params;
-
-        this.$nextTick(() => {
-          if (data.isRefresh) {
-            this.$refs.component.getTableData();
-          }
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss">
-.AppMonitoringObject {
-  height: 100%;
-  background: #f3f6f9;
-  overflow: auto;
-}
-</style>
diff --git a/packages/2.0.5/AppMonitoringObject/components/add.vue b/packages/2.0.5/AppMonitoringObject/components/add.vue
deleted file mode 100644
index ef5b1371..00000000
--- a/packages/2.0.5/AppMonitoringObject/components/add.vue
+++ /dev/null
@@ -1,797 +0,0 @@
-<template>
-  <section style="height: 100%">
-    <ai-detail class="add">
-      <template #title>
-        <ai-title :title="params.id ? '监测对象详情' : '新增监测对象'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)">
-          <template slot="rightBtn" v-if="params.id && navIndex != 1">
-            <el-button size="small" icon="iconfont iconEdit" type="primary" v-if="!isEdit" @click="isEdit=true">编辑</el-button>
-            <el-button size="small" icon="iconfont" type="primary" v-if="isEdit" @click="save">保存</el-button>
-            <el-button size="small" icon="iconfont" v-if="isEdit" @click="getDetail(),isEdit=false">取消</el-button>
-          </template>
-        </ai-title>
-      </template>
-      <template #content>
-        <el-form ref="rules" :model="forms" :rules="formRules" size="small" label-suffix="：" label-width="136px">   
-          <div class="nav-list" v-if="params.id">
-            <div class="nav-item" :class="navIndex != 1 ? 'active' : ''" @click="navIndex=0">基本信息</div>
-            <div class="nav-item" :class="navIndex == 1 ? 'active' : ''" @click="navIndex=1;getLogList()">帮扶日志</div>
-          </div>
-          <div v-if="navIndex != 1">
-            <ai-card title="基础信息">
-              <template slot="content">
-                <div v-if="isEdit">
-                  <div class="above">
-                    <div class="left">
-                      <el-form-item label="监测对象类型" prop="type" >
-                        <ai-select v-model="forms.type" placeholder="请选择" clearable :selectList="$dict.getDict('fpType')"></ai-select>
-                      </el-form-item>
-                      <el-form-item label="联系方式" prop="phone" >
-                        <el-input v-model="forms.phone" placeholder="请输入" maxlength="20" show-word-limit></el-input>
-                      </el-form-item>
-                    </div>
-                    <div class="right">
-                      <el-form-item label="是否搬迁" prop="move" >
-                        <ai-select v-model="forms.move" placeholder="请选择" clearable :selectList="$dict.getDict('fpYesOrNo')"></ai-select>
-                      </el-form-item>
-                    </div>             
-                  </div>
-                  <el-form-item label="所属区域" prop="addressAreaId">
-                    <ai-area-select
-                      clearable
-                      always-show
-                      :instance="instance"
-                      v-model="forms.addressAreaId"
-                      @fullname="v=>forms.addressArea=v"
-                      :disabled-level="user.info.areaList.length"
-                    />
-                  </el-form-item>
-                  <el-form-item label="家庭住址" prop="address">
-                    <el-input v-model="forms.address" placeholder="请输入" maxlength="50" show-word-limit></el-input>
-                  </el-form-item>
-                  <el-form-item label="安置地区" prop="placeAreaId" v-if="forms.move == '01'">
-                    <ai-area-select
-                      clearable
-                      always-show
-                      :instance="instance"
-                      v-model="forms.placeAreaId"
-                      @fullname="v=>forms.placeArea=v"
-                      :disabled-level="user.info.areaList.length"
-                    />
-                  </el-form-item>
-                  <el-form-item label="安置详细地址" prop="place" v-if="forms.move == '01'">
-                    <el-input v-model="forms.place" placeholder="请输入" maxlength="50" show-word-limit></el-input>
-                  </el-form-item>
-                </div>
-                <template v-else>
-                  <div class="above">
-                    <div class="left">
-                      <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                        <ai-info-item label="监测对象类型："><span >{{dict.getLabel('fpType', forms.type)}}</span></ai-info-item>
-                        <ai-info-item label="联系方式："><span >{{forms.phone}}</span></ai-info-item>
-                      </ai-wrapper>
-                    </div>
-                    <div class="right">
-                      <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                        <ai-info-item label="是否搬迁："><span >{{dict.getLabel('fpYesOrNo', forms.move)}}</span></ai-info-item>
-                      </ai-wrapper>
-                    </div>
-                  </div>
-                  <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                    <ai-info-item label="所属区域："><span >{{forms.addressArea}}</span></ai-info-item>
-                    <ai-info-item label="家庭住址："><span >{{forms.address}}</span></ai-info-item>
-                    <ai-info-item label="安置地区："  v-if="forms.move == '01'"><span >{{forms.placeArea}}</span></ai-info-item>
-                    <ai-info-item label="安置详细地址："  v-if="forms.move == '01'"><span >{{forms.place}}</span></ai-info-item>
-                  </ai-wrapper>
-                </template>
-              </template>
-            </ai-card>
-
-            <ai-card title="家庭成员">
-              <template slot="content">
-                <ai-search-bar v-if="isEdit">
-                  <template #right><el-button type="primary" icon="iconfont iconAdd" @click="showAddFamily=true">添加</el-button></template>
-                </ai-search-bar>
-                <ai-table :tableData="forms.familyList" :colConfigs="colConfigs" :dict="dict" :isShowPagination="false">
-                  <el-table-column slot="age" label="年龄" align="center" width="200">
-                    <template v-slot="{ row }">
-                      <span>{{getAge(row.idNumber)}}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column slot="options" label="操作" align="center" fixed="right" width="200" v-if="isEdit">
-                    <template v-slot="{ row, $index }">
-                      <el-button type="text" @click="editFamily(row, $index)">编辑</el-button>
-                      <el-button type="text" @click="delFamily(row, $index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </ai-table>
-              </template>
-            </ai-card>
-
-            <ai-card title="家庭情况">
-              <template slot="content">
-                <div class="above" v-if="isEdit">
-                  <div class="left">
-                    <el-form-item label="是否危房" prop="dilapidatedHouse" >
-                      <ai-select v-model="forms.dilapidatedHouse" placeholder="请选择" clearable :selectList="$dict.getDict('fpYesOrNo')"></ai-select>
-                    </el-form-item>
-                    <el-form-item label="风险类型" prop="riskType" >
-                      <ai-select v-model="forms.riskType" placeholder="请选择" clearable :selectList="$dict.getDict('fpRiskType')"></ai-select>
-                    </el-form-item>
-                  </div>
-                  <div class="right">
-                    <el-form-item label="是否饮水安全" prop="waterSecurity" >
-                      <ai-select v-model="forms.waterSecurity" placeholder="请选择" clearable :selectList="$dict.getDict('fpYesOrNo')"></ai-select>
-                    </el-form-item>
-                  </div>             
-                </div>
-                <div class="above" v-else>
-                  <div class="left">
-                    <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                      <ai-info-item label="是否危房："><span >{{dict.getLabel('fpYesOrNo', forms.dilapidatedHouse)}}</span></ai-info-item>
-                      <ai-info-item label="风险类型："><span >{{dict.getLabel('fpRiskType', forms.riskType)}}</span></ai-info-item>
-                    </ai-wrapper>
-                  </div>
-                  <div class="right">
-                    <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                      <ai-info-item label="是否饮水安全："><span >{{dict.getLabel('fpYesOrNo', forms.waterSecurity)}}</span></ai-info-item>
-                    </ai-wrapper>
-                  </div>
-                </div>
-              </template>
-            </ai-card>
-
-            <ai-card title="收入情况（单位：元）">
-              <template slot="content">
-                <div v-if="isEdit">
-                  <div class="above">
-                    <div class="left">
-                      <el-form-item label="工资收入">
-                        <el-input v-model.number="forms.income1" placeholder="请输入" maxlength="10"></el-input>
-                      </el-form-item>
-                      <el-form-item label="财产性收入">
-                        <el-input v-model.number="forms.income3" placeholder="请输入" maxlength="10"></el-input>
-                      </el-form-item>
-                      <el-form-item label="理赔收入">
-                        <el-input v-model.number="forms.income8" placeholder="请输入" maxlength="10"></el-input>
-                      </el-form-item>
-                      <el-form-item label="合规自然支出">
-                        <el-input v-model.number="forms.income9" placeholder="请输入" maxlength="10"></el-input>
-                      </el-form-item>
-                    </div>
-                    <div class="right">
-                      <el-form-item label="生存经营收入">
-                        <el-input v-model.number="forms.income2" placeholder="请输入" maxlength="10"></el-input>
-                      </el-form-item>
-                      <el-form-item label="转移性收入">
-                        <el-input v-model.number="forms.income4" placeholder="请输入" maxlength="10"></el-input>
-                      </el-form-item>
-                      <el-form-item label="生产经营支出">
-                        <el-input v-model.number="forms.income5" placeholder="请输入" maxlength="10"></el-input>
-                      </el-form-item>
-                    </div>          
-                  </div>
-                  <p style="font-size:14px;">备注：不填写时默认为0元</p>  
-                </div>
-                <div class="above" v-else>
-                  <div class="left">
-                    <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                      <ai-info-item label="工资收入："><span >{{forms.income1 || 0}}</span></ai-info-item>
-                      <ai-info-item label="财产性收入："><span >{{forms.income3 || 0}}</span></ai-info-item>
-                      <ai-info-item label="理赔收入："><span >{{forms.income8 || 0}}</span></ai-info-item>
-                      <ai-info-item label="合规自然支出："><span >{{forms.income9 || 0}}</span></ai-info-item>
-                    </ai-wrapper>
-                  </div>
-                  <div class="right">
-                    <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                      <ai-info-item label="生存经营收入："><span >{{forms.income2 || 0}}</span></ai-info-item>
-                      <ai-info-item label="转移性收入："><span >{{forms.income4 || 0}}</span></ai-info-item>
-                      <ai-info-item label="生产经营支出："><span >{{forms.income5 || 0}}</span></ai-info-item>
-                    </ai-wrapper>
-                  </div>
-                </div>
-              </template>
-            </ai-card>
-
-            <ai-card title="帮扶情况">
-              <template slot="content">
-                <div class="above" v-if="isEdit">
-                  <div class="left">
-                    <el-form-item label="产业帮扶" prop="industrialAssistance" >
-                      <ai-select v-model="forms.industrialAssistance" placeholder="请选择" clearable :selectList="$dict.getDict('fpIndustrialAssistance')"></ai-select>
-                    </el-form-item>
-                    <el-form-item label="就业帮扶" prop="employmentAssistance" >
-                      <ai-select v-model="forms.employmentAssistance" placeholder="请选择" clearable :selectList="$dict.getDict('fpEmploymentAssistance')"></ai-select>
-                    </el-form-item>
-                    <el-form-item label="金融帮扶" prop="financialAssistance" >
-                      <ai-select v-model="forms.financialAssistance" placeholder="请选择" clearable :selectList="$dict.getDict('fpFinancialAssistance')"></ai-select>
-                    </el-form-item>
-                    <el-form-item label="公益岗位帮扶" prop="publicWelfarePostAssistance" >
-                      <ai-select v-model="forms.publicWelfarePostAssistance" placeholder="请选择" clearable :selectList="$dict.getDict('fpPublicWelfarePostAssistance')"></ai-select>
-                    </el-form-item>
-                    <el-form-item label="风险消除时间" prop="riskEliminationDate" v-if="forms.isRisk == 1">
-                      <el-date-picker
-                        v-model="forms.riskEliminationDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        size="small"
-                        placeholder="选择日期">
-                      </el-date-picker>
-                    </el-form-item>
-                  </div>
-                  <div class="right">
-                     <el-form-item label="健康帮扶" prop="healthAssistance" >
-                      <ai-select v-model="forms.healthAssistance" placeholder="请选择" clearable :selectList="$dict.getDict('fpHealthAssistance')"></ai-select>
-                    </el-form-item>
-                    <el-form-item label="教育帮扶" prop="educationalAssistance" >
-                      <ai-select v-model="forms.educationalAssistance" placeholder="请选择" clearable :selectList="$dict.getDict('fpEducationalAssistance')"></ai-select>
-                    </el-form-item>
-                    <el-form-item label="社会帮扶" prop="socialAssistance" >
-                      <ai-select v-model="forms.socialAssistance" placeholder="请选择" clearable :selectList="$dict.getDict('fpSocialAssistance')"></ai-select>
-                    </el-form-item>
-                    <el-form-item label="是否风险消除">
-                      <ai-select v-model="forms.isRisk" placeholder="请选择" clearable :selectList="$dict.getDict('fpYesOrNo')"></ai-select>
-                    </el-form-item>
-                    <el-form-item label="风险消除方式" prop="riskEliminationMethod"  v-if="forms.isRisk == 1">
-                      <ai-select v-model="forms.riskEliminationMethod" placeholder="请选择" clearable :selectList="$dict.getDict('fpRiskEliminationMethod')"></ai-select>
-                    </el-form-item>
-                  </div>          
-                </div>
-                <div class="above" v-else>
-                  <div class="left">
-                    <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                      <ai-info-item label="产业帮扶："><span >{{dict.getLabel('fpIndustrialAssistance', forms.industrialAssistance)}}</span></ai-info-item>
-                      <ai-info-item label="就业帮扶："><span >{{dict.getLabel('fpEmploymentAssistance', forms.employmentAssistance)}}</span></ai-info-item>
-                      <ai-info-item label="金融帮扶："><span >{{dict.getLabel('fpFinancialAssistance', forms.financialAssistance)}}</span></ai-info-item>
-                      <ai-info-item label="公益岗位帮扶："><span >{{dict.getLabel('fpPublicWelfarePostAssistance', forms.publicWelfarePostAssistance)}}</span></ai-info-item>
-                      <ai-info-item label="风险消除时间：" v-if="forms.isRisk == 1"><span >{{forms.riskEliminationDate}}</span></ai-info-item>
-                    </ai-wrapper>
-                  </div>
-                  <div class="right">
-                    <ai-wrapper label-width="120px"  :columnsNumber="1"  style="margin-top: 16px;">
-                      <ai-info-item label="健康帮扶："><span >{{dict.getLabel('fpHealthAssistance', forms.healthAssistance)}}</span></ai-info-item>
-                      <ai-info-item label="教育帮扶："><span >{{dict.getLabel('fpEducationalAssistance', forms.educationalAssistance)}}</span></ai-info-item>
-                      <ai-info-item label="社会帮扶："><span >{{dict.getLabel('fpSocialAssistance', forms.socialAssistance)}}</span></ai-info-item>
-                      <ai-info-item label="是否风险消除："><span >{{dict.getLabel('fpYesOrNo', forms.isRisk)}}</span></ai-info-item>
-                      <ai-info-item label="风险消除方式：" v-if="forms.isRisk == 1"><span >{{dict.getLabel('fpRiskEliminationMethod', forms.riskEliminationMethod)}}</span></ai-info-item>
-                    </ai-wrapper>
-                  </div>
-                </div>
-              </template>
-            </ai-card>
-          </div>
-          <ai-card title="帮扶日志" v-if="navIndex == 1">
-            <template #right>
-              <span class="edit-text" @click="showAddLog=true">新增日志</span>
-            </template>
-            <template slot="content">
-              <div class="log-list" v-if="logList.length">
-                <div class="log-item" v-for="(item, index) in logList" :key="index">
-                  <img src="https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132" alt="">
-                  <div class="content">
-                    <div class="heade-info">
-                      <h2>{{item.createUserName}}</h2>
-                      <p>{{item.createTime}}</p>
-                    </div>
-                    <p class="text">{{item.detail}}</p>
-                    <div class="img-list">
-                      <ai-uploader :disabled="true"  :instance="instance"  v-model="item.file" :limit="9"></ai-uploader>
-                    </div>
-                    <div class="footer-btn">
-                      <span class="edit-text" @click="editLog(item)">编辑</span>
-                      <span class="edit-text" @click="delLog(item)">删除</span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <ai-empty v-else></ai-empty>
-            </template>
-          </ai-card>
-        </el-form>
-        <ai-dialog title="新增帮扶日志" :visible.sync="showAddLog" :customFooter="true"  :destroyOnClose="true"  border  width="900px">
-          <el-form ref="logrules" :model="logInfo" :rules="formRules" size="small" label-suffix="：" label-width="150px">
-            <el-form-item label="帮扶内容" prop="detail">
-              <el-input v-model="logInfo.detail" type="textarea" placeholder="请输入" maxlength="500" show-word-limit></el-input>
-            </el-form-item>
-            <el-form-item label="图片（最多9张）" >
-              <ai-uploader
-                :isShowTip="true"
-                :instance="instance"
-                v-model="logInfo.file"
-                fileType="img"
-                acceptType=".png,.jpg,.jpeg"
-                :limit="9">
-                <template slot="tips">最多上传9张图片,单张图片最大10MB<br/>支持.png,.jpg,.jpeg格式</template>
-              </ai-uploader>
-            </el-form-item>
-          </el-form>
-          <div class="dialog-footer" slot="footer" >
-            <el-button size="medium" @click="showAddLog=false">取消</el-button>
-            <el-button type="primary" size="medium" @click="addLog()">确认</el-button>
-          </div>
-        </ai-dialog>
-        <ai-dialog title="新增家庭成员" :visible.sync="showAddFamily" :customFooter="true"  :destroyOnClose="true"  border  width="900px">
-          <el-form ref="addrules" :model="familyInfo" :rules="formRules" size="small" label-suffix="：" label-width="150px">
-            <div class="above">
-              <div class="left">
-                <el-form-item label="与户主关系" prop="relationship" >
-                  <ai-select v-model="familyInfo.relationship" placeholder="请选择" clearable :selectList="$dict.getDict('fpRelationship')"></ai-select>
-                </el-form-item>
-                <el-form-item label="性别" prop="sex" >
-                  <ai-select v-model="familyInfo.sex" placeholder="请选择" clearable :selectList="$dict.getDict('sex')" disabled></ai-select>
-                </el-form-item>
-                <el-form-item label="政治面貌" prop="politicalOutlook" >
-                  <ai-select v-model="familyInfo.politicalOutlook" placeholder="请选择" clearable :selectList="$dict.getDict('fpPoliticalOutlook')"></ai-select>
-                </el-form-item>
-                <el-form-item label="在校情况" prop="studentsInSchool" >
-                  <ai-select v-model="familyInfo.studentsInSchool" placeholder="请选择" clearable :selectList="$dict.getDict('fpStudentsInSchool')"></ai-select>
-                </el-form-item>
-                <el-form-item label="劳动技能" prop="laborSkills" >
-                  <ai-select v-model="familyInfo.laborSkills" placeholder="请选择" clearable :selectList="$dict.getDict('fpLaborSkills')"></ai-select>
-                </el-form-item>
-                <el-form-item label="务工时间" prop="workingMonths" >
-                   <el-input v-model.number="familyInfo.workingMonths" placeholder="请输入(月数)" maxlength="30" show-word-limit></el-input>
-                </el-form-item>
-                <el-form-item label="是否参加大病医保" prop="sicknessInsurance" >
-                  <ai-select v-model="familyInfo.sicknessInsurance" placeholder="请选择" clearable :selectList="$dict.getDict('fpYesOrNo')"></ai-select>
-                </el-form-item>
-                <el-form-item label="享受最低生活保障" prop="subsistenceAllowance" >
-                  <ai-select v-model="familyInfo.subsistenceAllowance" placeholder="请选择" clearable :selectList="$dict.getDict('fpYesOrNo')"></ai-select>
-                </el-form-item>
-              </div>
-              <div class="right">
-                <el-form-item label="姓名" prop="name" >
-                  <el-input v-model.number="familyInfo.name" placeholder="请输入" maxlength="11" show-word-limit></el-input>
-                </el-form-item>
-                <el-form-item label="身份证号" prop="idNumber" >
-                  <ai-id size="small" v-model="familyInfo.idNumber" @change="getSex(familyInfo.idNumber)"/>
-                </el-form-item>
-                <el-form-item label="民族" prop="nation" >
-                  <ai-select v-model="familyInfo.nation" placeholder="请选择" clearable :selectList="$dict.getDict('fpNation')"></ai-select>
-                </el-form-item>
-                <el-form-item label="文化程度" prop="education" >
-                  <ai-select v-model="familyInfo.education" placeholder="请选择" clearable :selectList="$dict.getDict('fpEducation')"></ai-select>
-                </el-form-item>
-                <el-form-item label="健康状况" prop="health" >
-                  <ai-select v-model="familyInfo.health" placeholder="请选择" clearable :selectList="$dict.getDict('fpHealth')"></ai-select>
-                </el-form-item>
-                <el-form-item label="务工区域" prop="workArea" >
-                  <el-input v-model="familyInfo.workArea" placeholder="请输入" maxlength="30" show-word-limit></el-input>
-                </el-form-item>
-                <el-form-item label="是否参加医保" prop="medicalInsurance" >
-                  <ai-select v-model="familyInfo.medicalInsurance" placeholder="请选择" clearable :selectList="$dict.getDict('fpYesOrNo')"></ai-select>
-                </el-form-item>
-                <el-form-item label="是否参加养老保险" prop="endowmentInsurance" >
-                  <ai-select v-model="familyInfo.endowmentInsurance" placeholder="请选择" clearable :selectList="$dict.getDict('fpYesOrNo')"></ai-select>
-                </el-form-item>
-                <el-form-item label="是否特困供养" prop="destitute" >
-                  <ai-select v-model="familyInfo.destitute" placeholder="请选择" clearable :selectList="$dict.getDict('fpYesOrNo')"></ai-select>
-                </el-form-item>
-              </div>
-            </div>
-          </el-form>
-          <div class="dialog-footer" slot="footer" >
-            <el-button  size="medium" @click="showAddFamily=false">取消</el-button>
-            <el-button  type="primary" size="medium" @click="addFamily()">确认</el-button>
-          </div>
-        </ai-dialog>
-      </template>
-      <template #footer v-if="!params.id">
-        <el-button @click="cancel(false)" class="delete-btn footer-btn" >取 消</el-button>
-        <el-button type="primary" @click="save()"  class="footer-btn">提 交</el-button>
-      </template>
-    </ai-detail>
-  </section>
-</template>
-
-<script>
-import {mapState} from "vuex";
-export default {
-  name: "add",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    params: Object,
-  },
-  data() {
-    return {
-      forms: {
-        type: '',
-        phone: '',
-        move: '',
-        addressAreaId: '',
-        address: '',
-        placeAreaId: '',
-        dilapidatedHouse: '',
-        riskType: '',
-        waterSecurity: '',
-        income1: '',
-        income2: '',
-        income3: '',
-        income4: '',
-        income5: '',
-        income8: '',
-        income9: '',
-        isRisk: '',
-        riskEliminationDate: '',
-        riskEliminationMethod: '',
-        industrialAssistance: '',
-        employmentAssistance: '',
-        financialAssistance: '',
-        publicWelfarePostAssistance: '',
-        healthAssistance: '',
-        educationalAssistance: '',
-        socialAssistance: '',
-        familyList: []
-      },
-      navIndex: 0,
-      showAddFamily: false,
-      isEdit: false,
-      familyInfo: {
-        relationship: '',
-        sex: '',
-        politicalOutlook: '',
-        studentsInSchool: '',
-        laborSkills: '',
-        workingMonths: '',
-        sicknessInsurance: '',
-        subsistenceAllowance: '',
-        name: '',
-        idNumber: '',
-        nation: '',
-        education: '',
-        health: '',
-        workArea: '',
-        medicalInsurance: '',
-        endowmentInsurance: '',
-        destitute: '',
-      },
-      editFamilyIndex: '',
-      showAddLog: false,
-      logList: [],
-      logInfo: {
-        detail: '',
-        file: [],
-        picture: ''
-      }
-    };
-  },
-  created() {
-    this.dict.load('fpType', 'fpYesOrNo', 'fpRiskType', 'fpRiskEliminationMethod', 'fpIndustrialAssistance', 'fpEmploymentAssistance', 'fpFinancialAssistance',
-    'fpPublicWelfarePostAssistance', 'fpHealthAssistance', 'fpEducationalAssistance', 'fpSocialAssistance', 'fpRelationship', 'sex', 'fpPoliticalOutlook', 
-    'fpStudentsInSchool', 'fpLaborSkills', 'fpNation', 'fpEducation', 'fpHealth')
-    if (this.params.id) {
-      this.getDetail()
-      this.isEdit = false
-    } else {
-      this.isEdit = true
-      this.forms.addressAreaId = this.user.info.areaId
-      this.forms.placeAreaId = this.user.info.areaId
-    }
-  },
-  computed: {
-    formRules() {
-      return {
-        type: [{ required: true, message: "请选择监测对象类型", trigger: "change" }],
-        move: [{ required: true, message: "请选择是否搬迁", trigger: "change" }],
-        phone: [{ required: true, message: "请输入联系方式", trigger: "change" }],
-        addressAreaId: [
-          {required: true, message: "请选择所属区域"},
-          {trigger:'blur',validator: (r, v, cb) => /0{3}$/g.test(v) ? cb('请选择到村/社区') : cb()}
-        ],
-        address: [{ required: true, message: "请输入家庭住址", trigger: "change" }],
-        placeAreaId: [
-          {required: true, message: "请选择安置地区"},
-          {trigger:'blur',validator: (r, v, cb) => /0{3}$/g.test(v) ? cb('请选择到村/社区') : cb()}
-        ],
-        place: [{ required: true, message: "请输入安置详细住址", trigger: "change" }],
-        riskEliminationMethod: [{ required: true, message: "请选择风险消除方式", trigger: "change" }],
-        riskEliminationDate: [{ required: true, message: "请选择风险消除时间", trigger: "change" }],
-
-        relationship: [{ required: true, message: "请选择与户主关系", trigger: "change" }],
-        name: [{ required: true, message: "请输入姓名", trigger: "change" }],
-        idNumber: [{ required: true, message: "请输入证件号码", trigger: "change" }],
-        studentsInSchool: [{ required: true, message: "请选择在校情况", trigger: "change" }],
-        health: [{ required: true, message: "请选择健康情况", trigger: "change" }], 
-        sicknessInsurance: [{ required: true, message: "请选择是否大病医保", trigger: "change" }],
-        subsistenceAllowance: [{ required: true, message: "请选择享受最低生活保障", trigger: "change" }],
-        medicalInsurance: [{ required: true, message: "请选择是否参加医保", trigger: "change" }],
-        endowmentInsurance: [{ required: true, message: "请选择是否参加养老保险", trigger: "change" }],
-        destitute: [{ required: true, message: "请选择是否特困供养", trigger: "change" }],
-        detail: [{ required: true, message: "请输入帮扶内容", trigger: "change" }],
-      };
-    },
-    ...mapState(['user']),
-    colConfigs() {
-      return [
-        {label: "与户主关系", prop: "relationship", dict: 'fpRelationship', align: 'center'},
-        {label: "姓名", prop: "name", align: 'center'},
-        {label: "性别", prop: "sex", dict: 'sex', align: 'center'},
-        {slot: 'age'},
-        {
-          label: "身份证号", width: "160px", align: 'center',
-          render: (h, {row}) => h('span', null, this.idCardNoUtil.hideId(row.idNumber))
-        },
-        {slot: "options"},
-      ]
-    }
-  },
-  methods: {
-    save() {
-      this.$refs["rules"].validate((valid) => {
-        if (valid) {
-          this.confirmSave()
-        } else {
-          return false;
-        }
-      });
-    },
-    confirmSave() {
-      var isHolder = false  //家庭成员必须有户主
-      if(this.forms.familyList.length) {
-        this.forms.familyList.map((item) => {
-          if(item.relationship == '01') {
-            isHolder = true
-          }
-        })
-      }
-      if(!isHolder) {
-        return this.$message.error('家庭成员必须添加户主信息');
-      }
-      if(this.forms.isRisk == '01') {
-        this.forms.status = 1
-      }
-      this.instance .post( `/app/apppreventionreturntopoverty/addOrUpdate`, { ...this.forms}).then((res) => {
-        if (res.code == 0) {
-          if (!this.params.id) {
-            this.cancel(true)
-          } else {
-            this.isEdit = false
-            this.getDetail()
-          }
-        }
-      });
-    },
-    getDetail() {
-      this.instance.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${this.params.id}`).then((res) => {
-        if (res.code == 0) {
-          this.forms = { ...this.forms, ...res.data }
-          if(this.forms.riskEliminationDate) {
-            this.forms.isRisk = '01'
-          }else {
-            this.forms.isRisk = '02'
-          }
-        }
-      });
-    },
-    addFamily() {
-      this.$refs["addrules"].validate((valid) => {
-        if (valid) {
-          if(this.editFamilyIndex === '') {
-            this.forms.familyList.push(this.familyInfo)
-          }else {
-            this.$set(this.forms.familyList, this.editFamilyIndex, this.familyInfo)
-          }
-
-          if(this.forms.isRisk == '02') {
-            this.forms.riskEliminationDate = ''
-            this.forms.riskEliminationMethod = ''
-          }
-          
-          this.showAddFamily = false
-          this.editFamilyIndex = ''
-          this.familyInfo = Object.assign({},this.$options.data().familyInfo);
-        } else {
-          return false;
-        }
-      });
-    },
-    editFamily(item, index) {
-      this.showAddFamily = true
-      this.editFamilyIndex = index
-      this.familyInfo = {...item}
-    },
-    delFamily(item, index) {
-      this.$confirm("是否要删除该家庭成员", {
-        type: 'error'
-      }).then(() => {
-          this.$message({message: '家庭成员删除成功', type: 'success'});
-          this.forms.familyList.splice(index, 1)
-      }).catch(() => 0)
-    },
-    getAge(UUserCard) {
-      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++;
-      }
-      return age
-    },
-    getSex(UUserCard) {
-      if (UUserCard) {
-        if (parseInt(UUserCard.substr(16, 1)) % 2 == 1) {
-          this.familyInfo.sex = '1'
-        } else {
-          this.familyInfo.sex = '0'
-        }
-      }
-    },
-    cancel (isRefresh) {
-      this.$emit('change', {
-        type: 'List',
-        isRefresh: isRefresh ? true : false,
-      })
-    },
-    getLogList() {
-      this.instance.post(`/app/apppreventionreturntopovertylog/list?pid=${this.params.id}`).then((res) => {
-        if (res.code == 0) {
-          res.data.records.map((item) => {
-            item.file = JSON.parse(item.picture)
-          })
-          this.logList = res.data.records
-        }
-      });
-    },
-    addLog() {
-      this.$refs["logrules"].validate((valid) => {
-        if (valid) {
-          this.logInfo.picture = JSON.stringify(this.logInfo.file)
-          this.logInfo.pid = this.params.id
-          this.logInfo.createUserName = this.user.info.name
-          this.instance .post( `/app/apppreventionreturntopovertylog/addOrUpdate`, { ...this.logInfo}).then((res) => {
-            if (res.code == 0) {
-              this.$message({message: this.logInfo.id ? '编辑帮扶日志成功' : '新增帮扶日志成功', type: 'success'});
-              this.getLogList()
-              this.logInfo = Object.assign({},this.$options.data().logInfo)
-              this.showAddLog = false
-            }
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    delLog(row) {
-      this.$confirm("是否要删除该帮扶日志", {
-        type: 'error'
-      }).then(() => {
-        this.instance.post(`/app/apppreventionreturntopovertylog/delete?ids=${row.id}`).then((res) => {
-          if (res.code == 0) {
-            this.$message({message: '帮扶日志删除成功', type: 'success'});
-            this.getLogList()
-          }
-        });
-      }).catch(() => 0)
-    },
-    editLog(row) {
-      this.logInfo = {...row}
-      this.logInfo.file = JSON.parse(row.picture)
-      this.showAddLog = true
-    }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.add {
-  height: 100%;
-  .log-list{
-    .log-item{
-      display: flex;
-      border-bottom: 1px solid #ddd;
-      padding-top: 16px;
-      img{
-        width: 48px;
-        height: 48px;
-        border-radius: 50%;
-        margin-right: 16px;
-      }
-      .content{
-        width: calc(100% - 64px);
-        color: #000;
-        .heade-info{
-          display: flex;
-          justify-content: space-between;
-          height: 36px;
-          line-height: 36px;
-          h2{
-            font-size: 16px;
-            font-weight: 400;
-          }
-          p{
-            font-size: 14px;
-            color: #333;
-          }
-        }
-        .text{
-          font-size: 14px;
-          word-break: break-all;
-          margin-bottom: 8px;
-        }
-        .img-list{
-          img{
-            width: 150px;
-            height: 150px;
-            margin: 0 16px 16px 0;
-          }
-        }
-        .footer-btn{
-          width: 100%;
-          text-align: right;
-          padding-bottom: 16px;
-        }
-      }
-    }
-    .log-item:nth-last-of-type(1) {
-      border-bottom: 0;
-    }
-  }
-  .ai-detail__title {
-    background-color: #fff;
-  }
-  .ai-detail__content {
-    .ai-detail__content--wrapper {
-      .el-form {
-        // background-color: #fff;
-        // padding: 0 60px;
-        .flex {
-          display: flex;
-          flex-wrap: wrap;
-          justify-content: space-between;
-          .el-form-item {
-            width: 48%;
-          }
-          .buildingTypes {
-            width: 100%;
-          }
-        }
-      }
-    }
-  }
-  ::v-deep .el-tag {
-    margin-right: 8px;
-    color: #333333;
-  }
-  .footer-btn {
-    width: 92px;
-  }
-  .above{
-    display: flex;
-    .left, .right{
-      flex: 1;
-    }
-  }
-
-  .nav-list{
-    position: absolute;
-    top: 100px;
-    left: -152px;
-    .nav-item{
-      width: 120px;
-      height: 50px;
-      text-align: center;
-      line-height: 50px;
-      background-color: #fff;
-      cursor: pointer;
-      font-size: 16px;
-      color: #666;
-    }
-    .active{
-      font-weight: 700;
-      color: #26f;
-    }
-  }
-
-  ::v-deep .el-date-editor.el-input, .el-date-editor.el-input__inner{
-    width: 100%;
-  }
-  .edit-text{
-    color:#2266FF;
-    margin-left: 16px;
-    cursor: pointer;
-    font-size: 12px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/packages/2.0.5/AppMonitoringObject/components/list.vue b/packages/2.0.5/AppMonitoringObject/components/list.vue
deleted file mode 100644
index bb99b3af..00000000
--- a/packages/2.0.5/AppMonitoringObject/components/list.vue
+++ /dev/null
@@ -1,296 +0,0 @@
-<template>
-  <section class="list">
-    <ai-list>
-      <ai-title slot="title" title="监测对象" isShowBottomBorder isShowArea v-if="areaId" v-model="areaId" :instance="instance" @change="page.current=1,getTableData()">
-        <template #rightBtn>
-          <el-button size="small" icon="iconfont iconSetting" type="primary" @click="showSet = true">预警规则</el-button>
-        </template>
-      </ai-title>
-      <template #blank>
-        <div class="statistics-top">
-          <div class="statistics-top__item" v-for="(item, index) in dataPanes" :key="index">
-            <span>{{ item.label }}</span>
-            <h2 style="color: #2266FF;">{{ item.v }}</h2>
-          </div>
-        </div>
-        <div class="mainPane">
-          <ai-search-bar>
-            <template #left>
-              <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" @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>
-            <template #left>
-              <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
-              <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)">删除</el-button>
-            </template>
-          </ai-search-bar>
-          <ai-table :tableData="tableData" :colConfigs="colConfigs" :total="page.total" :current.sync="page.current"
-            :size.sync="page.size" @getList="getTableData" :dict="dict" @selection-change="v=>ids=v.map(e=>e.id)">
-            <el-table-column slot="options" label="操作" align="center" fixed="right" width="120">
-              <template slot-scope="{ row }">
-                <div class="table-options">
-                  <el-button type="text" @click="toAdd(row.id)">详情</el-button>
-                  <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column slot="options" label="状态" align="center">
-              <template v-slot="{ row }">
-                <span :class="{'status1': row.status == 1, 'status0': row.status == 2}">{{dict.getLabel('fpStatus', row.status)}}</span>
-              </template>
-            </el-table-column>
-          </ai-table>
-        </div>
-        <ai-dialog title="预警规则设置" :visible.sync="showSet" :customFooter="true"  :destroyOnClose="true"  border  width="900px">
-          <el-form ref="rules" :model="setInfo" :rules="formRules" size="small" label-suffix="：" label-width="200px">
-            <el-form-item label="家庭纯收入标准" prop="type0">
-              <el-input v-model.number="setInfo.type0" placeholder="请输入" maxlength="8" show-word-limit></el-input>
-            </el-form-item>
-            <el-form-item label="家庭人均纯收入标准" prop="type1">
-              <el-input v-model.number="setInfo.type1" placeholder="请输入" maxlength="8" show-word-limit></el-input>
-            </el-form-item>
-          </el-form>
-          <div class="dialog-footer" slot="footer" >
-            <el-button size="medium" @click="showSet=false">取消</el-button>
-            <el-button type="primary" size="medium" @click="addSet()">确认</el-button>
-          </div>
-        </ai-dialog>
-      </template>
-    </ai-list>
-  </section>
-</template>
-
-<script>
-import {mapState} from "vuex";
-
-export default {
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-  },
-  data() {
-    return {
-      areaId: "",
-      page: {current: 1, size: 10, total: 0},
-      search: {inoculationType: "", name: ""},
-      ids: [],
-      tableData: [],
-      staData: {},
-      currIndex: 0,
-      options: [{ value: '0', label: '无风险'},{ value: '2', label: '未解除'}, { value: '1',  label: '已解除'}],
-      status: '',
-      showSet: false,
-      setInfo: {
-        type0: '',
-        type1: ''
-      },
-    }
-  },
-  computed: {
-    ...mapState(['user']),
-    showDetail() {
-      return this.$route.hash == "#add"
-    },
-    dataPanes() {
-      return [
-        {label: "监测家庭户数", v: this.staData.jths || 0},
-        {label: "监测对象总人数", v: this.staData.zrs || 0},
-        {label: "解除风险人数", v: this.staData.fxxcrs || 0},
-        {label: "风险解除率", v: this.staData.jcl || 0},
-      ]
-    },
-    colConfigs() {
-      return [
-        {type: "selection", align: 'center'},
-        {label: "户主姓名", prop: "name", align: 'center'},
-        {label: "性别", prop: "sex", dict: 'sex', align: 'center'},
-        {
-          label: "身份证号", width: "160px", align: 'center',
-          render: (h, {row}) => h('span', null, this.idCardNoUtil.hideId(row.idNumber))
-        },
-        {label: "户主联系方式", prop: "phone", align: 'center'},
-        {
-          label: "家庭住址", width: "160px", align: 'center',
-          render: (h, {row}) => h('span', null, row.addressArea+row.address)
-        },
-        {label: "风险类型", prop: "riskType", dict: 'fpRiskType', align: 'center'},
-        {label: "最后更新时间", prop: "createTime", align: 'center'},
-        {slot: "status"},
-        {label: "操作人", prop: "createUserName", align: 'center'},
-        {slot: "options"},
-      ]
-    },
-    formRules() {
-      return {
-        type0: [{ required: true, message: "请输入家庭纯收入标准", trigger: "change" }],
-        type1: [{ required: true, message: "请输入家庭人均纯收入标准", trigger: "change" }],
-      }
-    }
-  },
-  created() {
-    this.areaId = JSON.parse(JSON.stringify(this.user.info.areaId))
-    this.dict.load('sex', 'fpRiskType', 'fpStatus').then(() => {
-      this.getTableData()
-      this.getSetInfo()
-    })
-  },
-  methods: {
-    getNum() {
-      this.instance.post(`/app/apppreventionreturntopoverty/statistics-list`).then(res => {
-        if (res?.data) {
-          this.staData = res.data
-          this.staData.jcl = !this.staData.jths ? '0%' : ((this.staData.fxxcrs / this.staData.jths) * 100).toFixed(2) + '%'
-        }
-      })
-    },
-    toAdd(id) {
-      this.$emit('change', {
-        type: 'Add',
-        params: {
-          id: id || ''
-        }
-      })
-    },
-    addSet() {
-      this.$refs["rules"].validate((valid) => {
-        if (valid) {
-          this.instance.post(`/app/apppreventionreturntopovertyalarmconfig/addOrUpdate`, this.setInfo).then((res) => {
-            if (res.code == 0) {
-              this.$message({message: '预警规则设置成功', type: 'success'});
-              this.getSetInfo()
-              this.showSet = false
-            }
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    getSetInfo() {
-      this.instance.post(`/app/apppreventionreturntopovertyalarmconfig/query`).then((res) => {
-        if (res.code == 0) {
-          this.setInfo = {...res.data}
-        }
-      });
-    },
-    getTableData() {
-      this.instance.post(`/app/apppreventionreturntopoverty/list`, null, {
-        params: {...this.search, ...this.page, addressAreaId: this.areaId, status: this.status}
-      }).then(res => {
-        if (res?.data) {
-          this.tableData = res.data.records
-          this.page.total = res.data.total
-          this.tableData.map((item) => {
-            item.createTime = item.createTime.substring(0, 10)
-          })
-          this.getNum()
-        }
-      })
-    },
-    handleDelete(ids) {
-      ids = ids?.toString()
-      this.$confirm("确定要删除该条数据吗?").then(() => {
-        this.instance.post(`/app/apppreventionreturntopoverty/delete`, null, {
-          params: {ids}
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$message.success("删除成功!");
-            this.getTableData();
-          }
-        })
-      }).catch(() => 0)
-    },
-    resetSearch() {
-      this.page.current = 1
-      this.search = {}
-      this.getTableData()
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.list {
-  height: 100%;
-    .statistics-top {
-      display: flex;
-      align-items: center;
-      margin-bottom: 20px;
-
-      & > div {
-        flex: 1;
-        height: 96px;
-        line-height: 1;
-        margin-right: 20px;
-        padding: 16px 24px;
-        background: #FFFFFF;
-        box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
-        border-radius: 4px;
-
-        &:last-child {
-          margin-right: 0;
-        }
-
-        h3 {
-          font-size: 24px;
-        }
-
-        span {
-          display: block;
-          margin-bottom: 16px;
-          color: #888888;
-          font-size: 16px;
-        }
-      }
-    }
-
-  ::v-deep .dataPane {
-    flex: 1;
-    min-width: 0;
-    background: #FFFFFF;
-    box-shadow: 0 4px 6px -2px rgba(15, 15, 21, 0.15);
-    border-radius: 2px;
-    margin-bottom: 16px;
-    margin-right: 16px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 60px;
-
-    &:last-of-type {
-      margin-right: 0;
-    }
-  }
-
-  ::v-deep .mainPane {
-    background: #fff;
-    padding: 12px 16px;
-    .ai-table__header {
-      padding: 2px 0;
-    }
-  }
-  .tab-text{
-    display: inline-block;
-    font-size: 14px;
-    width: 150px;
-    height: 32px;
-    line-height: 32px;
-    color: #333;
-    cursor: pointer;
-  }
-  .active-tab{
-    color: #26f;
-  }
-  .status0{
-    color: rgb(255, 136, 34);
-  }
-  .status1{
-    color: rgb(46, 162, 34);
-  }
-}
-</style>
diff --git a/packages/3.0.0/AppConvenienceAddressBook/AppConvenienceAddressBook.vue b/packages/conv/AppConvenienceAddressBook/AppConvenienceAddressBook.vue
similarity index 100%
rename from packages/3.0.0/AppConvenienceAddressBook/AppConvenienceAddressBook.vue
rename to packages/conv/AppConvenienceAddressBook/AppConvenienceAddressBook.vue
diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue b/packages/conv/AppConvenienceAddressBook/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
rename to packages/conv/AppConvenienceAddressBook/components/Add.vue
diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue b/packages/conv/AppConvenienceAddressBook/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppConvenienceAddressBook/components/List.vue
rename to packages/conv/AppConvenienceAddressBook/components/List.vue
diff --git a/packages/3.0.0/AppHealthReport/AppHealthReport.vue b/packages/conv/AppHealthReport/AppHealthReport.vue
similarity index 100%
rename from packages/3.0.0/AppHealthReport/AppHealthReport.vue
rename to packages/conv/AppHealthReport/AppHealthReport.vue
diff --git a/packages/3.0.0/AppHealthReport/components/Detail.vue b/packages/conv/AppHealthReport/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppHealthReport/components/Detail.vue
rename to packages/conv/AppHealthReport/components/Detail.vue
diff --git a/packages/3.0.0/AppHealthReport/components/List.vue b/packages/conv/AppHealthReport/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppHealthReport/components/List.vue
rename to packages/conv/AppHealthReport/components/List.vue
diff --git a/packages/3.0.0/AppReportAiWill/AppReportAtWill.vue b/packages/conv/AppReportAiWill/AppReportAtWill.vue
similarity index 100%
rename from packages/3.0.0/AppReportAiWill/AppReportAtWill.vue
rename to packages/conv/AppReportAiWill/AppReportAtWill.vue
diff --git a/packages/3.0.0/AppReportAiWill/components/Detail.vue b/packages/conv/AppReportAiWill/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppReportAiWill/components/Detail.vue
rename to packages/conv/AppReportAiWill/components/Detail.vue
diff --git a/packages/3.0.0/AppReportAiWill/components/List.vue b/packages/conv/AppReportAiWill/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppReportAiWill/components/List.vue
rename to packages/conv/AppReportAiWill/components/List.vue
diff --git a/packages/3.0.0/AppReportAiWill/components/Setting.vue b/packages/conv/AppReportAiWill/components/Setting.vue
similarity index 100%
rename from packages/3.0.0/AppReportAiWill/components/Setting.vue
rename to packages/conv/AppReportAiWill/components/Setting.vue
diff --git a/packages/3.0.0/AppReturnHomeRegister/AppReturnHomeRegister.vue b/packages/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
similarity index 100%
rename from packages/3.0.0/AppReturnHomeRegister/AppReturnHomeRegister.vue
rename to packages/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/AbnormalList.vue b/packages/conv/AppReturnHomeRegister/components/AbnormalList.vue
similarity index 100%
rename from packages/3.0.0/AppReturnHomeRegister/components/AbnormalList.vue
rename to packages/conv/AppReturnHomeRegister/components/AbnormalList.vue
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue b/packages/conv/AppReturnHomeRegister/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
rename to packages/conv/AppReturnHomeRegister/components/Detail.vue
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/List.vue b/packages/conv/AppReturnHomeRegister/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppReturnHomeRegister/components/List.vue
rename to packages/conv/AppReturnHomeRegister/components/List.vue
diff --git a/packages/3.0.0/AppRiskArea/AppRiskArea.vue b/packages/conv/AppRiskArea/AppRiskArea.vue
similarity index 100%
rename from packages/3.0.0/AppRiskArea/AppRiskArea.vue
rename to packages/conv/AppRiskArea/AppRiskArea.vue
diff --git a/packages/3.0.0/AppRiskArea/components/Add.vue b/packages/conv/AppRiskArea/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppRiskArea/components/Add.vue
rename to packages/conv/AppRiskArea/components/Add.vue
diff --git a/packages/3.0.0/AppRiskArea/components/List.vue b/packages/conv/AppRiskArea/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppRiskArea/components/List.vue
rename to packages/conv/AppRiskArea/components/List.vue
diff --git a/packages/2.0.5/AppVaccination/AppVaccination.vue b/packages/conv/AppVaccination/AppVaccination.vue
similarity index 100%
rename from packages/2.0.5/AppVaccination/AppVaccination.vue
rename to packages/conv/AppVaccination/AppVaccination.vue
diff --git a/packages/2.0.5/AppVaccination/addVaccination.vue b/packages/conv/AppVaccination/addVaccination.vue
similarity index 100%
rename from packages/2.0.5/AppVaccination/addVaccination.vue
rename to packages/conv/AppVaccination/addVaccination.vue
diff --git a/packages/3.0.0/AppVillageActivity/AppVillageActivity.vue b/packages/conv/AppVillageActivity/AppVillageActivity.vue
similarity index 100%
rename from packages/3.0.0/AppVillageActivity/AppVillageActivity.vue
rename to packages/conv/AppVillageActivity/AppVillageActivity.vue
diff --git a/packages/3.0.0/AppVillageActivity/components/Add.vue b/packages/conv/AppVillageActivity/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppVillageActivity/components/Add.vue
rename to packages/conv/AppVillageActivity/components/Add.vue
diff --git a/packages/3.0.0/AppVillageActivity/components/Detail.vue b/packages/conv/AppVillageActivity/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppVillageActivity/components/Detail.vue
rename to packages/conv/AppVillageActivity/components/Detail.vue
diff --git a/packages/3.0.0/AppVillageActivity/components/Dynamic.vue b/packages/conv/AppVillageActivity/components/Dynamic.vue
similarity index 100%
rename from packages/3.0.0/AppVillageActivity/components/Dynamic.vue
rename to packages/conv/AppVillageActivity/components/Dynamic.vue
diff --git a/packages/3.0.0/AppVillageActivity/components/List.vue b/packages/conv/AppVillageActivity/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppVillageActivity/components/List.vue
rename to packages/conv/AppVillageActivity/components/List.vue
diff --git a/packages/3.0.0/AppVillageActivity/components/Statistics.vue b/packages/conv/AppVillageActivity/components/Statistics.vue
similarity index 100%
rename from packages/3.0.0/AppVillageActivity/components/Statistics.vue
rename to packages/conv/AppVillageActivity/components/Statistics.vue
diff --git a/packages/3.0.0/AppVillageAlbum/AppVillageAlbum.vue b/packages/conv/AppVillageAlbum/AppVillageAlbum.vue
similarity index 100%
rename from packages/3.0.0/AppVillageAlbum/AppVillageAlbum.vue
rename to packages/conv/AppVillageAlbum/AppVillageAlbum.vue
diff --git a/packages/3.0.0/AppVillageAlbum/components/Add.vue b/packages/conv/AppVillageAlbum/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppVillageAlbum/components/Add.vue
rename to packages/conv/AppVillageAlbum/components/Add.vue
diff --git a/packages/3.0.0/AppVillageAlbum/components/List.vue b/packages/conv/AppVillageAlbum/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppVillageAlbum/components/List.vue
rename to packages/conv/AppVillageAlbum/components/List.vue
diff --git a/packages/3.0.0/AppVillagerDiscussion/AppVillagerDiscussion.vue b/packages/conv/AppVillagerDiscussion/AppVillagerDiscussion.vue
similarity index 100%
rename from packages/3.0.0/AppVillagerDiscussion/AppVillagerDiscussion.vue
rename to packages/conv/AppVillagerDiscussion/AppVillagerDiscussion.vue
diff --git a/packages/3.0.0/AppVillagerDiscussion/components/Add.vue b/packages/conv/AppVillagerDiscussion/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppVillagerDiscussion/components/Add.vue
rename to packages/conv/AppVillagerDiscussion/components/Add.vue
diff --git a/packages/3.0.0/AppVillagerDiscussion/components/Detail.vue b/packages/conv/AppVillagerDiscussion/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppVillagerDiscussion/components/Detail.vue
rename to packages/conv/AppVillagerDiscussion/components/Detail.vue
diff --git a/packages/3.0.0/AppVillagerDiscussion/components/List.vue b/packages/conv/AppVillagerDiscussion/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppVillagerDiscussion/components/List.vue
rename to packages/conv/AppVillagerDiscussion/components/List.vue
diff --git a/packages/3.0.0/AppWeddingsFunerals/AppWeddingsFunerals.vue b/packages/conv/AppWeddingsFunerals/AppWeddingsFunerals.vue
similarity index 100%
rename from packages/3.0.0/AppWeddingsFunerals/AppWeddingsFunerals.vue
rename to packages/conv/AppWeddingsFunerals/AppWeddingsFunerals.vue
diff --git a/packages/3.0.0/AppWeddingsFunerals/components/List.vue b/packages/conv/AppWeddingsFunerals/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppWeddingsFunerals/components/List.vue
rename to packages/conv/AppWeddingsFunerals/components/List.vue
diff --git a/packages/creditScore/scoreFamily/AppScoreFamily.vue b/packages/conv/creditScore/scoreFamily/AppScoreFamily.vue
similarity index 100%
rename from packages/creditScore/scoreFamily/AppScoreFamily.vue
rename to packages/conv/creditScore/scoreFamily/AppScoreFamily.vue
diff --git a/packages/creditScore/scoreFamily/detail.vue b/packages/conv/creditScore/scoreFamily/detail.vue
similarity index 100%
rename from packages/creditScore/scoreFamily/detail.vue
rename to packages/conv/creditScore/scoreFamily/detail.vue
diff --git a/packages/creditScore/scoreManage/AppScoreManage.vue b/packages/conv/creditScore/scoreManage/AppScoreManage.vue
similarity index 100%
rename from packages/creditScore/scoreManage/AppScoreManage.vue
rename to packages/conv/creditScore/scoreManage/AppScoreManage.vue
diff --git a/packages/creditScore/scoreManage/pointsAppeal.vue b/packages/conv/creditScore/scoreManage/pointsAppeal.vue
similarity index 100%
rename from packages/creditScore/scoreManage/pointsAppeal.vue
rename to packages/conv/creditScore/scoreManage/pointsAppeal.vue
diff --git a/packages/creditScore/scoreManage/pointsDeclaration.vue b/packages/conv/creditScore/scoreManage/pointsDeclaration.vue
similarity index 100%
rename from packages/creditScore/scoreManage/pointsDeclaration.vue
rename to packages/conv/creditScore/scoreManage/pointsDeclaration.vue
diff --git a/packages/creditScore/scoreManage/pointsDetails.vue b/packages/conv/creditScore/scoreManage/pointsDetails.vue
similarity index 100%
rename from packages/creditScore/scoreManage/pointsDetails.vue
rename to packages/conv/creditScore/scoreManage/pointsDetails.vue
diff --git a/packages/creditScore/scoreManage/scoreChange.vue b/packages/conv/creditScore/scoreManage/scoreChange.vue
similarity index 100%
rename from packages/creditScore/scoreManage/scoreChange.vue
rename to packages/conv/creditScore/scoreManage/scoreChange.vue
diff --git a/packages/creditScore/scorePersonal/AppScorePersonal.vue b/packages/conv/creditScore/scorePersonal/AppScorePersonal.vue
similarity index 100%
rename from packages/creditScore/scorePersonal/AppScorePersonal.vue
rename to packages/conv/creditScore/scorePersonal/AppScorePersonal.vue
diff --git a/packages/creditScore/scorePersonal/detail.vue b/packages/conv/creditScore/scorePersonal/detail.vue
similarity index 100%
rename from packages/creditScore/scorePersonal/detail.vue
rename to packages/conv/creditScore/scorePersonal/detail.vue
diff --git a/packages/creditScore/scoreRules/AppScoreRules.vue b/packages/conv/creditScore/scoreRules/AppScoreRules.vue
similarity index 100%
rename from packages/creditScore/scoreRules/AppScoreRules.vue
rename to packages/conv/creditScore/scoreRules/AppScoreRules.vue
diff --git a/packages/creditScore/scoreSupermarket/AppScoreSupermarket.vue b/packages/conv/creditScore/scoreSupermarket/AppScoreSupermarket.vue
similarity index 100%
rename from packages/creditScore/scoreSupermarket/AppScoreSupermarket.vue
rename to packages/conv/creditScore/scoreSupermarket/AppScoreSupermarket.vue
diff --git a/packages/creditScore/scoreSupermarket/components/addGoods.vue b/packages/conv/creditScore/scoreSupermarket/components/addGoods.vue
similarity index 100%
rename from packages/creditScore/scoreSupermarket/components/addGoods.vue
rename to packages/conv/creditScore/scoreSupermarket/components/addGoods.vue
diff --git a/packages/creditScore/scoreSupermarket/components/addOrder.vue b/packages/conv/creditScore/scoreSupermarket/components/addOrder.vue
similarity index 100%
rename from packages/creditScore/scoreSupermarket/components/addOrder.vue
rename to packages/conv/creditScore/scoreSupermarket/components/addOrder.vue
diff --git a/packages/creditScore/scoreSupermarket/goodsManagement.vue b/packages/conv/creditScore/scoreSupermarket/goodsManagement.vue
similarity index 100%
rename from packages/creditScore/scoreSupermarket/goodsManagement.vue
rename to packages/conv/creditScore/scoreSupermarket/goodsManagement.vue
diff --git a/packages/creditScore/scoreSupermarket/orderManagement.vue b/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
similarity index 100%
rename from packages/creditScore/scoreSupermarket/orderManagement.vue
rename to packages/conv/creditScore/scoreSupermarket/orderManagement.vue
diff --git a/packages/creditScore/scoreSupermarket/storeManagement.vue b/packages/conv/creditScore/scoreSupermarket/storeManagement.vue
similarity index 100%
rename from packages/creditScore/scoreSupermarket/storeManagement.vue
rename to packages/conv/creditScore/scoreSupermarket/storeManagement.vue
diff --git a/packages/2.0.5/AppBroadcast/AppBroadcast.vue b/packages/device/AppBroadcast/AppBroadcast.vue
similarity index 100%
rename from packages/2.0.5/AppBroadcast/AppBroadcast.vue
rename to packages/device/AppBroadcast/AppBroadcast.vue
diff --git a/packages/2.0.5/AppBroadcast/components/Add.vue b/packages/device/AppBroadcast/components/Add.vue
similarity index 100%
rename from packages/2.0.5/AppBroadcast/components/Add.vue
rename to packages/device/AppBroadcast/components/Add.vue
diff --git a/packages/2.0.5/AppBroadcast/components/List.vue b/packages/device/AppBroadcast/components/List.vue
similarity index 100%
rename from packages/2.0.5/AppBroadcast/components/List.vue
rename to packages/device/AppBroadcast/components/List.vue
diff --git a/packages/2.0.5/AppEquipmentManage/AppEquipmentManage.vue b/packages/device/AppEquipmentManage/AppEquipmentManage.vue
similarity index 100%
rename from packages/2.0.5/AppEquipmentManage/AppEquipmentManage.vue
rename to packages/device/AppEquipmentManage/AppEquipmentManage.vue
diff --git a/packages/2.0.5/AppEquipmentManage/components/List.vue b/packages/device/AppEquipmentManage/components/List.vue
similarity index 98%
rename from packages/2.0.5/AppEquipmentManage/components/List.vue
rename to packages/device/AppEquipmentManage/components/List.vue
index 18c63d8b..e9adc8b0 100644
--- a/packages/2.0.5/AppEquipmentManage/components/List.vue
+++ b/packages/device/AppEquipmentManage/components/List.vue
@@ -45,7 +45,7 @@
 
 <script>
 import {mapState} from 'vuex'
-import LocateDialog from "../../../monitor/components/locateDialog";
+import LocateDialog from "../../monitor/components/locateDialog";
 
 export default {
   name: 'List',
diff --git a/packages/2.0.5/AppMediaManage/AppMediaManage.vue b/packages/device/AppMediaManage/AppMediaManage.vue
similarity index 100%
rename from packages/2.0.5/AppMediaManage/AppMediaManage.vue
rename to packages/device/AppMediaManage/AppMediaManage.vue
diff --git a/packages/2.0.5/AppMediaManage/components/Add.vue b/packages/device/AppMediaManage/components/Add.vue
similarity index 100%
rename from packages/2.0.5/AppMediaManage/components/Add.vue
rename to packages/device/AppMediaManage/components/Add.vue
diff --git a/packages/2.0.5/AppMediaManage/components/List.vue b/packages/device/AppMediaManage/components/List.vue
similarity index 100%
rename from packages/2.0.5/AppMediaManage/components/List.vue
rename to packages/device/AppMediaManage/components/List.vue
diff --git a/packages/2.0.5/AppMediaManage/components/Play.vue b/packages/device/AppMediaManage/components/Play.vue
similarity index 100%
rename from packages/2.0.5/AppMediaManage/components/Play.vue
rename to packages/device/AppMediaManage/components/Play.vue
diff --git a/packages/IntelligentSecurity/AppISDevice/AppISDevice.vue b/packages/device/IntelligentSecurity/AppISDevice/AppISDevice.vue
similarity index 100%
rename from packages/IntelligentSecurity/AppISDevice/AppISDevice.vue
rename to packages/device/IntelligentSecurity/AppISDevice/AppISDevice.vue
diff --git a/packages/IntelligentSecurity/AppISManage/AppISManage.vue b/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
similarity index 100%
rename from packages/IntelligentSecurity/AppISManage/AppISManage.vue
rename to packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
diff --git a/packages/IntelligentSecurity/AppISMap/AppISMap.vue b/packages/device/IntelligentSecurity/AppISMap/AppISMap.vue
similarity index 100%
rename from packages/IntelligentSecurity/AppISMap/AppISMap.vue
rename to packages/device/IntelligentSecurity/AppISMap/AppISMap.vue
diff --git a/packages/IntelligentSecurity/components/AiSlwVideo.vue b/packages/device/IntelligentSecurity/components/AiSlwVideo.vue
similarity index 100%
rename from packages/IntelligentSecurity/components/AiSlwVideo.vue
rename to packages/device/IntelligentSecurity/components/AiSlwVideo.vue
diff --git a/packages/IntelligentSecurity/components/PlaybackTime.vue b/packages/device/IntelligentSecurity/components/PlaybackTime.vue
similarity index 100%
rename from packages/IntelligentSecurity/components/PlaybackTime.vue
rename to packages/device/IntelligentSecurity/components/PlaybackTime.vue
diff --git a/packages/IntelligentSecurity/components/Synergy.vue b/packages/device/IntelligentSecurity/components/Synergy.vue
similarity index 100%
rename from packages/IntelligentSecurity/components/Synergy.vue
rename to packages/device/IntelligentSecurity/components/Synergy.vue
diff --git a/packages/IntelligentSecurity/components/Timeline.vue b/packages/device/IntelligentSecurity/components/Timeline.vue
similarity index 100%
rename from packages/IntelligentSecurity/components/Timeline.vue
rename to packages/device/IntelligentSecurity/components/Timeline.vue
diff --git a/packages/IntelligentSecurity/components/deviceSlider.vue b/packages/device/IntelligentSecurity/components/deviceSlider.vue
similarity index 100%
rename from packages/IntelligentSecurity/components/deviceSlider.vue
rename to packages/device/IntelligentSecurity/components/deviceSlider.vue
diff --git a/packages/IntelligentSecurity/components/locateDialog.vue b/packages/device/IntelligentSecurity/components/locateDialog.vue
similarity index 100%
rename from packages/IntelligentSecurity/components/locateDialog.vue
rename to packages/device/IntelligentSecurity/components/locateDialog.vue
diff --git a/packages/IntelligentSecurity/components/settingDialog.vue b/packages/device/IntelligentSecurity/components/settingDialog.vue
similarity index 100%
rename from packages/IntelligentSecurity/components/settingDialog.vue
rename to packages/device/IntelligentSecurity/components/settingDialog.vue
diff --git a/packages/monitor/AppMonitorDevice/AppMonitorDevice.vue b/packages/device/monitor/AppMonitorDevice/AppMonitorDevice.vue
similarity index 100%
rename from packages/monitor/AppMonitorDevice/AppMonitorDevice.vue
rename to packages/device/monitor/AppMonitorDevice/AppMonitorDevice.vue
diff --git a/packages/monitor/AppMonitorManage/AppMonitorManage.vue b/packages/device/monitor/AppMonitorManage/AppMonitorManage.vue
similarity index 100%
rename from packages/monitor/AppMonitorManage/AppMonitorManage.vue
rename to packages/device/monitor/AppMonitorManage/AppMonitorManage.vue
diff --git a/packages/monitor/AppMonitorMap/AppMonitorMap.vue b/packages/device/monitor/AppMonitorMap/AppMonitorMap.vue
similarity index 100%
rename from packages/monitor/AppMonitorMap/AppMonitorMap.vue
rename to packages/device/monitor/AppMonitorMap/AppMonitorMap.vue
diff --git a/packages/monitor/components/deviceSlider.vue b/packages/device/monitor/components/deviceSlider.vue
similarity index 100%
rename from packages/monitor/components/deviceSlider.vue
rename to packages/device/monitor/components/deviceSlider.vue
diff --git a/packages/monitor/components/locateDialog.vue b/packages/device/monitor/components/locateDialog.vue
similarity index 100%
rename from packages/monitor/components/locateDialog.vue
rename to packages/device/monitor/components/locateDialog.vue
diff --git a/packages/monitor/components/settingDialog.vue b/packages/device/monitor/components/settingDialog.vue
similarity index 100%
rename from packages/monitor/components/settingDialog.vue
rename to packages/device/monitor/components/settingDialog.vue
diff --git a/packages/tutelage/AppEarlyWarning/AppEarlyWarning.vue b/packages/device/tutelage/AppEarlyWarning/AppEarlyWarning.vue
similarity index 100%
rename from packages/tutelage/AppEarlyWarning/AppEarlyWarning.vue
rename to packages/device/tutelage/AppEarlyWarning/AppEarlyWarning.vue
diff --git a/packages/tutelage/AppEarlyWarning/components/List.vue b/packages/device/tutelage/AppEarlyWarning/components/List.vue
similarity index 100%
rename from packages/tutelage/AppEarlyWarning/components/List.vue
rename to packages/device/tutelage/AppEarlyWarning/components/List.vue
diff --git a/packages/tutelage/AppSoS/AppSoS.vue b/packages/device/tutelage/AppSoS/AppSoS.vue
similarity index 100%
rename from packages/tutelage/AppSoS/AppSoS.vue
rename to packages/device/tutelage/AppSoS/AppSoS.vue
diff --git a/packages/tutelage/AppSoS/components/List.vue b/packages/device/tutelage/AppSoS/components/List.vue
similarity index 100%
rename from packages/tutelage/AppSoS/components/List.vue
rename to packages/device/tutelage/AppSoS/components/List.vue
diff --git a/packages/tutelage/AppTutlageMap/AppTutlageMap.vue b/packages/device/tutelage/AppTutlageMap/AppTutlageMap.vue
similarity index 100%
rename from packages/tutelage/AppTutlageMap/AppTutlageMap.vue
rename to packages/device/tutelage/AppTutlageMap/AppTutlageMap.vue
diff --git a/packages/tutelage/AppWristband/AppWristband.vue b/packages/device/tutelage/AppWristband/AppWristband.vue
similarity index 100%
rename from packages/tutelage/AppWristband/AppWristband.vue
rename to packages/device/tutelage/AppWristband/AppWristband.vue
diff --git a/packages/tutelage/AppWristband/components/Add.vue b/packages/device/tutelage/AppWristband/components/Add.vue
similarity index 100%
rename from packages/tutelage/AppWristband/components/Add.vue
rename to packages/device/tutelage/AppWristband/components/Add.vue
diff --git a/packages/tutelage/AppWristband/components/List.vue b/packages/device/tutelage/AppWristband/components/List.vue
similarity index 100%
rename from packages/tutelage/AppWristband/components/List.vue
rename to packages/device/tutelage/AppWristband/components/List.vue
diff --git a/packages/tutelage/AppWristband/components/Monitor.vue b/packages/device/tutelage/AppWristband/components/Monitor.vue
similarity index 100%
rename from packages/tutelage/AppWristband/components/Monitor.vue
rename to packages/device/tutelage/AppWristband/components/Monitor.vue
diff --git a/packages/wechat/AppAddressBook/AppAddressBook.vue b/packages/extra/AppAddressBook/AppAddressBook.vue
similarity index 100%
rename from packages/wechat/AppAddressBook/AppAddressBook.vue
rename to packages/extra/AppAddressBook/AppAddressBook.vue
diff --git a/packages/wechat/AppAddressBook/components/Add.vue b/packages/extra/AppAddressBook/components/Add.vue
similarity index 100%
rename from packages/wechat/AppAddressBook/components/Add.vue
rename to packages/extra/AppAddressBook/components/Add.vue
diff --git a/packages/wechat/AppAddressBook/components/List.vue b/packages/extra/AppAddressBook/components/List.vue
similarity index 100%
rename from packages/wechat/AppAddressBook/components/List.vue
rename to packages/extra/AppAddressBook/components/List.vue
diff --git a/packages/wechat/AppCarousel/AppCarousel.vue b/packages/extra/AppCarousel/AppCarousel.vue
similarity index 100%
rename from packages/wechat/AppCarousel/AppCarousel.vue
rename to packages/extra/AppCarousel/AppCarousel.vue
diff --git a/packages/2.0.5/AppCodeGeneration/AppCodeGeneration.vue b/packages/extra/AppCodeGeneration/AppCodeGeneration.vue
similarity index 100%
rename from packages/2.0.5/AppCodeGeneration/AppCodeGeneration.vue
rename to packages/extra/AppCodeGeneration/AppCodeGeneration.vue
diff --git a/packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue b/packages/extra/AppCodeGeneration/app/visit/Visit.vue
similarity index 100%
rename from packages/2.0.5/AppCodeGeneration/app/visit/Visit.vue
rename to packages/extra/AppCodeGeneration/app/visit/Visit.vue
diff --git a/packages/2.0.5/AppCodeGeneration/components/Add.vue b/packages/extra/AppCodeGeneration/components/Add.vue
similarity index 100%
rename from packages/2.0.5/AppCodeGeneration/components/Add.vue
rename to packages/extra/AppCodeGeneration/components/Add.vue
diff --git a/packages/2.0.5/AppCodeGeneration/components/Detail.vue b/packages/extra/AppCodeGeneration/components/Detail.vue
similarity index 99%
rename from packages/2.0.5/AppCodeGeneration/components/Detail.vue
rename to packages/extra/AppCodeGeneration/components/Detail.vue
index ceafe23b..19a3a796 100644
--- a/packages/2.0.5/AppCodeGeneration/components/Detail.vue
+++ b/packages/extra/AppCodeGeneration/components/Detail.vue
@@ -36,7 +36,7 @@
 
 <script>
   import { mapState } from 'vuex'
-  import Visit from './../app/visit/Visit'
+  import Visit from '../app/visit/Visit'
 
   export default {
     name: 'Detail',
@@ -175,7 +175,7 @@
 
       getDictList (listName) {
         this.dict.load(listName.join(',')).then(() => {
-          
+
         })
       },
 
diff --git a/packages/2.0.5/AppCodeGeneration/components/List.vue b/packages/extra/AppCodeGeneration/components/List.vue
similarity index 100%
rename from packages/2.0.5/AppCodeGeneration/components/List.vue
rename to packages/extra/AppCodeGeneration/components/List.vue
diff --git a/packages/system/AppLicence/AppLicence.vue b/packages/extra/AppLicence/AppLicence.vue
similarity index 100%
rename from packages/system/AppLicence/AppLicence.vue
rename to packages/extra/AppLicence/AppLicence.vue
diff --git a/packages/3.0.0/AppNavConfig/AppNavConfig.vue b/packages/extra/AppNavConfig/AppNavConfig.vue
similarity index 100%
rename from packages/3.0.0/AppNavConfig/AppNavConfig.vue
rename to packages/extra/AppNavConfig/AppNavConfig.vue
diff --git a/packages/3.0.0/AppNavConfig/components/List.vue b/packages/extra/AppNavConfig/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppNavConfig/components/List.vue
rename to packages/extra/AppNavConfig/components/List.vue
diff --git a/packages/3.0.0/AppThematicConfig/AppThematicConfig.vue b/packages/extra/AppThematicConfig/AppThematicConfig.vue
similarity index 100%
rename from packages/3.0.0/AppThematicConfig/AppThematicConfig.vue
rename to packages/extra/AppThematicConfig/AppThematicConfig.vue
diff --git a/packages/3.0.0/AppThematicConfig/components/List.vue b/packages/extra/AppThematicConfig/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppThematicConfig/components/List.vue
rename to packages/extra/AppThematicConfig/components/List.vue
diff --git a/packages/2.0.5/AppBuildManage/AppBuildManage.vue b/packages/grid/AppBuildManage/AppBuildManage.vue
similarity index 100%
rename from packages/2.0.5/AppBuildManage/AppBuildManage.vue
rename to packages/grid/AppBuildManage/AppBuildManage.vue
diff --git a/packages/2.0.5/AppBuildManage/components/Add.vue b/packages/grid/AppBuildManage/components/Add.vue
similarity index 100%
rename from packages/2.0.5/AppBuildManage/components/Add.vue
rename to packages/grid/AppBuildManage/components/Add.vue
diff --git a/packages/2.0.5/AppBuildManage/components/BuildMsg.vue b/packages/grid/AppBuildManage/components/BuildMsg.vue
similarity index 100%
rename from packages/2.0.5/AppBuildManage/components/BuildMsg.vue
rename to packages/grid/AppBuildManage/components/BuildMsg.vue
diff --git a/packages/2.0.5/AppBuildManage/components/List.vue b/packages/grid/AppBuildManage/components/List.vue
similarity index 100%
rename from packages/2.0.5/AppBuildManage/components/List.vue
rename to packages/grid/AppBuildManage/components/List.vue
diff --git a/packages/2.0.5/AppBuildMap/AppBuildMap.vue b/packages/grid/AppBuildMap/AppBuildMap.vue
similarity index 100%
rename from packages/2.0.5/AppBuildMap/AppBuildMap.vue
rename to packages/grid/AppBuildMap/AppBuildMap.vue
diff --git a/packages/2.0.5/AppBuildMap/buildingStatistics.vue b/packages/grid/AppBuildMap/buildingStatistics.vue
similarity index 100%
rename from packages/2.0.5/AppBuildMap/buildingStatistics.vue
rename to packages/grid/AppBuildMap/buildingStatistics.vue
diff --git a/packages/2.0.5/AppBuildMap/buildingToolBar.vue b/packages/grid/AppBuildMap/buildingToolBar.vue
similarity index 100%
rename from packages/2.0.5/AppBuildMap/buildingToolBar.vue
rename to packages/grid/AppBuildMap/buildingToolBar.vue
diff --git a/packages/2.0.5/AppBuildMap/toolBar/buildingInfo.vue b/packages/grid/AppBuildMap/toolBar/buildingInfo.vue
similarity index 100%
rename from packages/2.0.5/AppBuildMap/toolBar/buildingInfo.vue
rename to packages/grid/AppBuildMap/toolBar/buildingInfo.vue
diff --git a/packages/2.0.5/AppBuildMap/toolBar/communityOverview.vue b/packages/grid/AppBuildMap/toolBar/communityOverview.vue
similarity index 100%
rename from packages/2.0.5/AppBuildMap/toolBar/communityOverview.vue
rename to packages/grid/AppBuildMap/toolBar/communityOverview.vue
diff --git a/packages/2.0.5/AppBuildMap/toolBar/nearbyGCS.vue b/packages/grid/AppBuildMap/toolBar/nearbyGCS.vue
similarity index 100%
rename from packages/2.0.5/AppBuildMap/toolBar/nearbyGCS.vue
rename to packages/grid/AppBuildMap/toolBar/nearbyGCS.vue
diff --git a/packages/2.0.5/AppBuildMap/toolBar/recentEvents.vue b/packages/grid/AppBuildMap/toolBar/recentEvents.vue
similarity index 100%
rename from packages/2.0.5/AppBuildMap/toolBar/recentEvents.vue
rename to packages/grid/AppBuildMap/toolBar/recentEvents.vue
diff --git a/packages/2.0.5/AppCommunityManage/AppCommunityManage.vue b/packages/grid/AppCommunityManage/AppCommunityManage.vue
similarity index 100%
rename from packages/2.0.5/AppCommunityManage/AppCommunityManage.vue
rename to packages/grid/AppCommunityManage/AppCommunityManage.vue
diff --git a/packages/2.0.5/AppCommunityManage/components/Add.vue b/packages/grid/AppCommunityManage/components/Add.vue
similarity index 100%
rename from packages/2.0.5/AppCommunityManage/components/Add.vue
rename to packages/grid/AppCommunityManage/components/Add.vue
diff --git a/packages/2.0.5/AppCommunityManage/components/List.vue b/packages/grid/AppCommunityManage/components/List.vue
similarity index 100%
rename from packages/2.0.5/AppCommunityManage/components/List.vue
rename to packages/grid/AppCommunityManage/components/List.vue
diff --git a/packages/2.0.5/AppHomesteadManagement/AppHomesteadManagement.vue b/packages/grid/AppHomesteadManagement/AppHomesteadManagement.vue
similarity index 100%
rename from packages/2.0.5/AppHomesteadManagement/AppHomesteadManagement.vue
rename to packages/grid/AppHomesteadManagement/AppHomesteadManagement.vue
diff --git a/packages/2.0.5/AppHomesteadManagement/components/Add.vue b/packages/grid/AppHomesteadManagement/components/Add.vue
similarity index 100%
rename from packages/2.0.5/AppHomesteadManagement/components/Add.vue
rename to packages/grid/AppHomesteadManagement/components/Add.vue
diff --git a/packages/2.0.5/AppHomesteadManagement/components/List.vue b/packages/grid/AppHomesteadManagement/components/List.vue
similarity index 100%
rename from packages/2.0.5/AppHomesteadManagement/components/List.vue
rename to packages/grid/AppHomesteadManagement/components/List.vue
diff --git a/packages/2.0.5/AppHouseMap/AppHouseMap.vue b/packages/grid/AppHouseMap/AppHouseMap.vue
similarity index 100%
rename from packages/2.0.5/AppHouseMap/AppHouseMap.vue
rename to packages/grid/AppHouseMap/AppHouseMap.vue
diff --git a/packages/2.0.5/AppHouseMap/AppPopulationDV.vue b/packages/grid/AppHouseMap/AppPopulationDV.vue
similarity index 100%
rename from packages/2.0.5/AppHouseMap/AppPopulationDV.vue
rename to packages/grid/AppHouseMap/AppPopulationDV.vue
diff --git a/packages/2.0.5/AppHouseMap/buildingStatistics.vue b/packages/grid/AppHouseMap/buildingStatistics.vue
similarity index 100%
rename from packages/2.0.5/AppHouseMap/buildingStatistics.vue
rename to packages/grid/AppHouseMap/buildingStatistics.vue
diff --git a/packages/2.0.5/AppHouseMap/buildingToolBar.vue b/packages/grid/AppHouseMap/buildingToolBar.vue
similarity index 100%
rename from packages/2.0.5/AppHouseMap/buildingToolBar.vue
rename to packages/grid/AppHouseMap/buildingToolBar.vue
diff --git a/packages/2.0.5/AppHouseMap/toolBar/buildingInfo.vue b/packages/grid/AppHouseMap/toolBar/buildingInfo.vue
similarity index 100%
rename from packages/2.0.5/AppHouseMap/toolBar/buildingInfo.vue
rename to packages/grid/AppHouseMap/toolBar/buildingInfo.vue
diff --git a/packages/2.0.5/AppHouseMap/toolBar/communityOverview.vue b/packages/grid/AppHouseMap/toolBar/communityOverview.vue
similarity index 100%
rename from packages/2.0.5/AppHouseMap/toolBar/communityOverview.vue
rename to packages/grid/AppHouseMap/toolBar/communityOverview.vue
diff --git a/packages/2.0.5/AppHouseMap/toolBar/nearbyGCS.vue b/packages/grid/AppHouseMap/toolBar/nearbyGCS.vue
similarity index 100%
rename from packages/2.0.5/AppHouseMap/toolBar/nearbyGCS.vue
rename to packages/grid/AppHouseMap/toolBar/nearbyGCS.vue
diff --git a/packages/2.0.5/AppHouseMap/toolBar/recentEvents.vue b/packages/grid/AppHouseMap/toolBar/recentEvents.vue
similarity index 100%
rename from packages/2.0.5/AppHouseMap/toolBar/recentEvents.vue
rename to packages/grid/AppHouseMap/toolBar/recentEvents.vue
diff --git a/packages/party/partyMember/AppPartyMember.vue b/packages/meta/AppPartyMember/AppPartyMember.vue
similarity index 100%
rename from packages/party/partyMember/AppPartyMember.vue
rename to packages/meta/AppPartyMember/AppPartyMember.vue
diff --git a/packages/party/partyMember/components/Add.vue b/packages/meta/AppPartyMember/components/Add.vue
similarity index 100%
rename from packages/party/partyMember/components/Add.vue
rename to packages/meta/AppPartyMember/components/Add.vue
diff --git a/packages/party/partyMember/components/Detail.vue b/packages/meta/AppPartyMember/components/Detail.vue
similarity index 100%
rename from packages/party/partyMember/components/Detail.vue
rename to packages/meta/AppPartyMember/components/Detail.vue
diff --git a/packages/party/partyMember/components/List.vue b/packages/meta/AppPartyMember/components/List.vue
similarity index 100%
rename from packages/party/partyMember/components/List.vue
rename to packages/meta/AppPartyMember/components/List.vue
diff --git a/packages/party/partyMember/components/neighbourSetting.vue b/packages/meta/AppPartyMember/components/neighbourSetting.vue
similarity index 100%
rename from packages/party/partyMember/components/neighbourSetting.vue
rename to packages/meta/AppPartyMember/components/neighbourSetting.vue
diff --git a/packages/meta/AppVillageCadres/AppVillageCadres.vue b/packages/meta/AppVillageCadres/AppVillageCadres.vue
deleted file mode 100644
index a24949f8..00000000
--- a/packages/meta/AppVillageCadres/AppVillageCadres.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <section class="AppVillageCadres">
-    <functionary-create v-if="isEdit" :instance="instance" :dict="dict" :permissions="permissions"/>
-    <functionary-detail v-else-if="showDetail" :instance="instance" :dict="dict" :permissions="permissions"/>
-    <ai-list v-else>
-      <ai-title slot="title" title="干部档案" isShowArea isShowBottomBorder
-                :instance="instance" v-model="areaId" :hideLevel="hideLevel">
-      </ai-title>
-      <template #content>
-        <cadre-files :instance="instance" :dict="dict" :areaId="areaId"/>
-      </template>
-    </ai-list>
-  </section>
-</template>
-<script>
-import {mapState} from "vuex";
-import CadreFiles from "./cadreFiles";
-import FunctionaryCreate from "./components/functionaryCreate";
-import FunctionaryDetail from "./components/functionaryDetail";
-
-export default {
-  name: "AppVillageCadres",
-  label: "干部档案",
-  components: {FunctionaryDetail, FunctionaryCreate, CadreFiles},
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function
-  },
-  provide() {
-    return {
-      top: this
-    }
-  },
-  data() {
-    return {
-      areaId: ""
-    }
-  },
-  computed: {
-    ...mapState(["user"]),
-    isEdit() {
-      return this.$route.hash == "#add"
-    },
-    showDetail() {
-      return this.$route.query.id
-    },
-    hideLevel() {
-      return this.user.info?.areaList?.length - 1
-    }
-  },
-  methods: {},
-  created() {
-    this.areaId = JSON.parse(JSON.stringify(this.user.info.areaId))
-  }
-
-};
-</script>
-<style lang="scss" scoped>
-.AppVillageCadres {
-  width: 100%;
-  height: 100%;
-
-  ::v-deep .functionaryContent > .el-tabs__content {
-    background: #f3f6f9;
-  }
-}
-</style>
diff --git a/packages/meta/AppVillageCadres/cadreFiles.vue b/packages/meta/AppVillageCadres/cadreFiles.vue
deleted file mode 100644
index c3f3ffcd..00000000
--- a/packages/meta/AppVillageCadres/cadreFiles.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-<template>
-  <section class="cadreFiles">
-    <ai-search-bar>
-      <template #left>
-        <ai-select placeholder="档案状态" v-model="search.status" :selectList="dict.getDict('status')"
-                   @change="page.current=1,getTableData()"/>
-        <ai-select placeholder="性别" v-model="search.gender" :selectList="dict.getDict('sex')"
-                   @change="page.current=1,getTableData()"/>
-        <ai-select placeholder="民族" v-model="search.nation" :selectList="dict.getDict('nation')"
-                   @change="page.current=1,getTableData()"/>
-        <ai-select placeholder="离任状态" v-model="search.outStatus" :selectList="dict.getDict('outStatus')"
-                   @change="page.current=1,getTableData()"/>
-        <el-select
-            v-model="search.servingInfo"
-            size="small"
-            multiple
-            placeholder="职务信息（多选）"
-            clearable
-            @change="page.current=1,getTableData()"
-            collapse-tags>
-          <el-option v-for="(op,i) in dict.getDict('appVillageSearchType')" :key="i"
-                     :label="op.dictName" :value="op.dictValue"/>
-        </el-select>
-        <ai-search label="出生年月">
-          <el-date-picker
-              size="small"
-              v-model="search.birthdayRangeBegin"
-              type="date"
-              placeholder="开始日期"
-              unlink-panels
-              class="border-radius-tl border-radius-br ve-middle"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              @change="page.current=1,getTableData()"
-          />
-          <el-date-picker
-              size="small"
-              v-model="search.birthdayRangeEnd"
-              type="date"
-              placeholder="结束日期"
-              unlink-panels
-              class="border-radius-tl border-radius-br ve-middle"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              @change="page.current=1,getTableData()"
-          />
-        </ai-search>
-        <ai-search label="入党时间">
-          <el-date-picker
-              size="small"
-              v-model="search.membershipTimeRangeBegin"
-              @change="page.current=1,getTableData()"
-              type="date"
-              placeholder="开始日期"
-              unlink-panels
-              class="border-radius-tl border-radius-br ve-middle"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd"/>
-          <el-date-picker
-              size="small"
-              v-model="search.membershipTimeRangeEnd"
-              @change="page.current=1,getTableData()"
-              type="date"
-              placeholder="结束日期"
-              unlink-panels
-              class="border-radius-tl border-radius-br ve-middle"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd"/>
-        </ai-search>
-      </template>
-      <template #right>
-        <el-input
-            v-model="search.param"
-            size="small"
-            placeholder="姓名/身份证号/联系方式"
-            prefix-icon="iconfont iconSearch"
-            clearable
-            @clear="page.current = 1,search.param = '', getTableData()"
-            v-throttle="() => {page.current = 1, getTableData()}"
-        />
-        <el-button
-            type="primary"
-            icon="iconfont iconSearch"
-            style="margin-left:5px;"
-            @click="page.current=1,getTableData()"
-        >查询
-        </el-button>
-        <el-button
-            icon="el-icon-refresh-right"
-            style="margin-left:5px;"
-            @click="resetSearch"
-        >重置
-        </el-button>
-      </template>
-    </ai-search-bar>
-    <ai-search-bar>
-      <template #left>
-        <el-button
-            type="primary"
-            icon="iconfont iconAdd"
-            size="small"
-            v-if="$permissions('app_appvillagecadresnew_edit')"
-            @click="handleShowDetail">添加
-        </el-button>
-        <el-button
-            icon="iconfont iconDelete"
-            size="small"
-            v-if="$permissions('app_appvillagecadresnew_del')"
-            @click="handleDel"
-            class="del-btn-list"
-            :disabled="!hasSelected"
-        >删除
-        </el-button>
-        <ai-download url="/app/appvillagecadresnew/export" :instance="instance"
-                     :params="{areaId,ids:ids.toString()}" fileName="村干部档案"/>
-      </template>
-    </ai-search-bar>
-    <ai-table :tableData="tableData" :colConfigs="colConfigs" :dict="dict" :total="page.total"
-              :current.sync="page.current" :size.sync="page.size"
-              @selection-change="v=>ids=v.map(e=>e.id)"
-              @getList="getTableData">
-      <el-table-column slot="options" prop="operate" label="操作" align="center">
-        <div slot-scope="{row}">
-          <el-button type="text" v-if="$permissions('app_appvillagecadresnew_detail')"
-                     @click="handleShowDetail(row)">详情
-          </el-button>
-        </div>
-      </el-table-column>
-    </ai-table>
-  </section>
-</template>
-
-<script>
-import {mapState} from "vuex";
-
-export default {
-  name: "cadreFiles",
-  inject: ['top'],
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    areaId: {default: ""}
-  },
-  watch: {
-    areaId(v) {
-      v && this.getTableData()
-    }
-  },
-  data() {
-    return {
-      tableData: [],
-      search: {
-        name: "",
-        gender: "",
-        nation: "",
-        birthdayRangeBegin: "",
-        birthdayRangeEnd: "",
-        membershipTimeRangeBegin: "",
-        membershipTimeRangeEnd: "",
-        servingInfo: [],
-        param: "",
-        areaId: ""
-      },
-      page: {current: 1, size: 10, total: 0},
-      ids: []
-    };
-  },
-  methods: {
-    resetSearch() {
-      this.page.current = 1;
-      this.page.size = 10;
-      this.search = {};
-      this.getTableData()
-    },
-    ///请求列表+查询参数
-    getTableData() {
-      this.instance.post(`/app/appvillagecadresnew/list`, {
-        ...this.search, ...this.page,
-        areaId: this.areaId
-      }).then(res => {
-        this.tableData = res.data.records;
-        this.page.total = res.data.total;
-      })
-    },
-    //新增|查看村干部档案
-    handleShowDetail(e) {
-      let {id} = e
-      if (id) {
-        this.$router.push({query: {id}})
-      } else {
-        this.$router.push({hash: "#add"})
-      }
-    },
-    //删除
-    handleDel() {
-      this.$confirm("是否要删除这些村干部档案?").then(() => {
-        this.instance.post("app/appvillagecadresnew/delete", null, {
-          params: {ids: this.ids.toString()}
-        }).then(res => {
-          if (res?.code == 0) {
-            this.getTableData();
-            this.$message.success("删除成功!");
-          }
-        })
-      }).catch(() => 0);
-    },
-    ///导出个人信息
-    exportExcel() {
-      let {areaId} = this.user.info
-      this.instance.post(`/app/appvillagecadresnew/export`, {areaId, ids: this.ids.toString()}).then(res => {
-        if (res?.code == 0) {
-          this.$message.success(res.data);
-        }
-      })
-    },
-  },
-  created() {
-    this.dict.load("cadrePositionType", "sex", "status", "appVillageSearchType", 'outStatus')
-    this.resetSearch();
-  },
-  computed: {
-    ...mapState(["user"]),
-    colConfigs() {
-      return [
-        {type: 'selection'},
-        {prop: "name", label: "姓名", align: 'center'},
-        {prop: "gender", label: "性别", align: 'center', dict: 'sex'},
-        {
-          prop: "idNumber", label: "身份证号",
-          render: (h, {row}) => h('span', null, this.idCardNoUtil.hideId(row.idNumber))
-        },
-        {label: "年龄", align: 'center', render: (h, {row}) => h('span', null, this.$calcAge(row.idNumber))},
-        {
-          prop: "membershipTime", label: "入党时间", align: 'center',
-          render: (h, {row}) => h('span', null, this.$moment(row.membershipTime).format('YYYY-MM-DD')?.replace("Invalid Date", "-"))
-        },
-        {prop: "phone", label: "联系方式", align: 'center'},
-        {prop: "outStatus", label: "离任状态", align: 'center', dict: 'outStatus'},
-        {prop: "status", label: "档案状态", align: 'center', dict: 'status'},
-        {slot: 'options'}
-      ]
-    },
-    hasSelected() {
-      return !!this.ids?.toString()
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.cadreFiles {
-  width: 100%;
-  height: 100%;
-}
-</style>
-
-
diff --git a/packages/meta/AppVillageCadres/components/functionaryCreate.vue b/packages/meta/AppVillageCadres/components/functionaryCreate.vue
deleted file mode 100644
index b7927079..00000000
--- a/packages/meta/AppVillageCadres/components/functionaryCreate.vue
+++ /dev/null
@@ -1,591 +0,0 @@
-<template>
-  <ai-detail class="functionaryCreate">
-    <ai-title slot="title" :title="detailTitle" isShowBottomBorder isShowBack @onBackClick="$router.push({})"/>
-    <template #content>
-      <el-form :model="form" ref="cadresForm" :rules="rules" label-width="160px" size="small">
-        <ai-card title="基本信息">
-          <template #content>
-            <el-row type="flex" class="wrap">
-              <el-form-item layout label-width="0">
-                <el-form-item row label="姓名：" prop="name">
-                  <el-row type="flex" align="middle">
-                    <el-input placeholder="请输入姓名" v-model="form.name" clearable/>
-                    <ai-person-select :instance="instance" @selectPerson="getInfoFromResident"/>
-                  </el-row>
-                </el-form-item>
-                <el-form-item row label="身份证号：" prop="idNumber">
-                  <el-input placeholder="请输入身份证号" clearable v-model="form.idNumber" :maxlength="18"
-                            @change="handleIdNumberInfo"/>
-                </el-form-item>
-                <el-form-item row label="性别：">
-                  <ai-select v-model="form.gender" :selectList="dict.getDict('sex')" disabled/>
-                </el-form-item>
-              </el-form-item>
-              <el-form-item label="个人照片：">
-                <ai-avatar :instance="instance" v-model="form.avatarUrl"/>
-              </el-form-item>
-              <el-form-item label="出生日期：">
-                <el-date-picker placeholder="请选择..." disabled
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                :value="form.birthday" type="date"/>
-              </el-form-item>
-              <el-form-item label="年龄：">
-                <el-input placeholder="请输入年龄" :value="$calcAge(form.idNumber)||null" disabled/>
-              </el-form-item>
-              <el-form-item label="联系方式：" prop="phone">
-                <el-input v-model.number="form.phone" placeholder="请输入联系方式" :maxlength="11"/>
-              </el-form-item>
-              <el-form-item label="民族：">
-                <ai-select v-model="form.nation" :selectList="dict.getDict('nation')"/>
-              </el-form-item>
-              <el-form-item label="文化程度：">
-                <ai-select v-model="form.educationLevel" :selectList="dict.getDict('education_village_rc')"/>
-              </el-form-item>
-              <el-form-item label="政治面貌：" prop="politicalStatus">
-                <ai-select v-model="form.politicalStatus" :selectList="dict.getDict('politicsStatus')"/>
-              </el-form-item>
-              <el-form-item label="入党时间：">
-                <el-date-picker placeholder="选择日期"
-                                value-format="yyyy-MM-dd 00:00:00"
-                                format="yyyy-MM-dd"
-                                v-model="form.membershipTime"
-                                clearable
-                                type="date"/>
-              </el-form-item>
-              <el-form-item label="参加工作时间：">
-                <el-date-picker placeholder="选择日期"
-                                value-format="yyyy-MM-dd 00:00:00"
-                                format="yyyy-MM-dd"
-                                v-model="form.jobTime"
-                                type="date"/>
-              </el-form-item>
-              <el-form-item label="健康状况：" prop="healthCondition">
-                <ai-select v-model="form.healthCondition" :selectList="dict.getDict('healthCondition')"/>
-              </el-form-item>
-              <el-form-item label="职称：">
-                <el-input v-model="form.jobTitle" placeholder="请输入职称" clearable/>
-              </el-form-item>
-              <el-form-item row label="籍贯：" prop="areaId">
-                <ai-area-select
-                    @fullname="v=>form.areaName=v"
-                    clearable
-                    always-show
-                    :instance="instance"
-                    v-model="form.areaId" :areaLevel="3"/>
-              </el-form-item>
-              <el-form-item row label="现住址：" prop="currentAreaId">
-                <ai-area-select
-                    @fullname="v=>form.currentAreaName=v"
-                    clearable
-                    always-show
-                    :instance="instance"
-                    v-model="form.currentAreaId"/>
-                <el-input placeholder="请输入详细地址" clearable v-model="form.currentAddress"/>
-              </el-form-item>
-            </el-row>
-          </template>
-        </ai-card>
-        <ai-card title="学历信息">
-          <template #right>
-            <el-button type="text" icon="iconfont iconAdd" @click="dialog=true">添加学历信息</el-button>
-          </template>
-          <template #content>
-            <el-table :data="form.educations" stripe border header-cell-class-name="table-header" align="center">
-              <el-table-column
-                  align="center"
-                  prop="educationType"
-                  label="学历类型"
-                  width="119"
-                  clearable
-              >
-                <template slot-scope="scope">
-                  <span>{{ dict.getLabel("appVillageCadresEducationType", scope.row.educationType) || '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" prop="educationLevel" label="学历" width="100">
-                <template slot-scope="scope">
-                  <span>{{ dict.getLabel("education_village_rc", scope.row.educationalLevel) || '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" prop="graduatedSchool" label="毕业院校" width="200">
-                <template slot-scope="scope">
-                  <div>{{ scope.row.graduatedSchool || '-' }}</div>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" prop="learnProfession" label="专业" width="160">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.learnProfession || '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" prop="graduationTime" label="毕业时间" width="100">
-                <template slot-scope="scope">
-                  <span>{{ (scope.row.graduationTime) ? (scope.row.graduationTime).substring(0, 10) : '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="操作">
-                <template slot-scope="{row,$index}" v-if="$permissions('app_appvillagecadresnew_edit')">
-                  <el-button type="text" @click="handleEditEducation(row,$index)">编辑</el-button>
-                  <el-button type="text" @click="handleDelEducation($index)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </ai-card>
-        <ai-card title="职务信息">
-          <template #content>
-            <el-row type="flex" class="wrap">
-              <el-form-item row label="任职地区" prop="workAreaId">
-                <ai-area-select clearable @fullname="v=>form.workAreaName=v" always-show :instance="instance"
-                                v-model="form.workAreaId" :disabled-level="disabledLevel"/>
-              </el-form-item>
-              <el-form-item label="任职时间" prop="workTime">
-                <el-date-picker placeholder="选择日期"
-                                value-format="yyyy-MM-dd 00:00:00"
-                                format="yyyy-MM-dd"
-                                v-model="form.workTime"
-                                type="date"/>
-              </el-form-item>
-              <el-form-item label="职务类别" prop="positionType">
-                <ai-select v-model="form.positionType" :selectList="dict.getDict('cadrePositionType')"/>
-              </el-form-item>
-              <el-form-item label="是否镇街下派" prop="isSubordinate">
-                <ai-select v-model="form.isSubordinate" :selectList="dict.getDict('yesOrNo')"/>
-              </el-form-item>
-              <el-form-item label="是否大学生村官" prop="isCollegeOfficer">
-                <ai-select v-model="form.isCollegeOfficer" :selectList="dict.getDict('yesOrNo')"/>
-              </el-form-item>
-              <el-form-item label="是否村(居)委会委员" prop="isVillageMember">
-                <ai-select v-model="form.isVillageMember" :selectList="dict.getDict('yesOrNo')"
-                           @change="form.villageMemberPosition1=''"/>
-              </el-form-item>
-              <el-form-item label="村(居)委会委员职务" prop="villageMemberPosition1"
-                            v-if="form.isVillageMember==1">
-                <ai-select v-model="form.villageMemberPosition1"
-                           :selectList="dict.getDict('appVillageMemberPosition1')"/>
-              </el-form-item>
-              <el-form-item label="是否支委委员" prop="isBranchMember">
-                <ai-select v-model="form.isBranchMember" :selectList="dict.getDict('yesOrNo')"
-                           @change="form.branchMemberPosition1=''"/>
-              </el-form-item>
-              <el-form-item label="支委委员职务" v-if="form.isBranchMember==1"
-                            prop="branchMemberPosition1"
-                            :rules="[{ required: true, message: '请选择支委委员职务', trigger: 'change' }]">
-                <ai-select v-model="form.branchMemberPosition1" :selectList="dict.getDict('appBranchMemberPosition1')"/>
-              </el-form-item>
-              <el-form-item label="是否村(居)务监督委员会成员" prop="isVillageSupervision">
-                <ai-select v-model="form.isVillageSupervision" :selectList="dict.getDict('yesOrNo')"
-                           @change="form.villageSupervisionPosition1=''"/>
-              </el-form-item>
-              <el-form-item label="村(居)务监督委员会职务" v-if="form.isVillageSupervision==1"
-                            :rules="[{ required: true, message: '请选择村(居)务监督委员会职务', trigger: 'change' }]"
-                            prop="villageSupervisionPosition1">
-                <ai-select v-model="form.villageSupervisionPosition1"
-                           :selectList="dict.getDict('appVillageSupervisionPosition1')"/>
-              </el-form-item>
-              <el-form-item label="是否专职干部" prop="isFulltimeCadres">
-                <ai-select v-model="form.isFulltimeCadres" :selectList="dict.getDict('yesOrNo')"
-                           @change="form.fulltimeCadresPosition1='',form.fulltimeCadresTime=''"/>
-              </el-form-item>
-              <el-form-item label="专职干部职务" v-if="form.isFulltimeCadres==1"
-                            prop="fulltimeCadresPosition1"
-                            :rules="[{ required: true, message: '请选择专职干部职务', trigger: 'change' }]">
-                <ai-select v-model="form.fulltimeCadresPosition1"
-                           :selectList="dict.getDict('appFulltimeCadresPosition1')"/>
-              </el-form-item>
-              <el-form-item label="担任专职干部时间" v-if="form.isFulltimeCadres==1" prop="fulltimeCadresTime"
-                            :rules="[{ required: true, message: '请选择担任专职干部时间', trigger: 'change' }]">
-                <el-date-picker placeholder="选择日期"
-                                value-format="yyyy-MM-dd 00:00:00"
-                                format="yyyy-MM-dd"
-                                v-model="form.fulltimeCadresTime"
-                                type="date"/>
-              </el-form-item>
-              <el-form-item label="是否团支部书记" prop="isLeagueSecretary">
-                <ai-select v-model="form.isLeagueSecretary" :selectList="dict.getDict('yesOrNo')"/>
-              </el-form-item>
-              <el-form-item label="是否妇联主席" prop="isWomenChairman">
-                <ai-select v-model="form.isWomenChairman" :selectList="dict.getDict('yesOrNo')"/>
-              </el-form-item>
-              <el-form-item label="是否民兵连长" prop="isMilitiaCommander">
-                <ai-select v-model="form.isMilitiaCommander" :selectList="dict.getDict('yesOrNo')"/>
-              </el-form-item>
-              <el-form-item label="是否村(居)民小组长" prop="isVillageLeader">
-                <ai-select v-model="form.isVillageLeader" :selectList="dict.getDict('yesOrNo')"/>
-              </el-form-item>
-              <el-form-item label="是否网格员" prop="isGridman">
-                <ai-select v-model="form.isGridman" :selectList="dict.getDict('yesOrNo')"/>
-              </el-form-item>
-              <el-form-item label="是否本土人才" prop="isLocalTalent">
-                <ai-select v-model="form.isLocalTalent" :selectList="dict.getDict('yesOrNo')"/>
-              </el-form-item>
-              <el-form-item label="是否异地任职" prop="isWorkDifferent">
-                <ai-select v-model="form.isWorkDifferent" :selectList="dict.getDict('yesOrNo')"/>
-              </el-form-item>
-              <el-form-item label="专业技术职务">
-                <el-input v-model="form.expertisePosition" placeholder="请输入..." clearable/>
-              </el-form-item>
-              <el-form-item label="熟悉专业有何专长">
-                <el-input v-model="form.professionalExpertise" placeholder="请输入..." clearable/>
-              </el-form-item>
-              <el-form-item label="其他职务" prop="workDifferent">
-                <el-input v-model="form.workDifferent " placeholder="请输入..." clearable/>
-              </el-form-item>
-            </el-row>
-          </template>
-        </ai-card>
-        <tabs-card :instance="instance" :dict="dict" :permissions="permissions" :form.sync="form" editable/>
-      </el-form>
-      <ai-dialog :visible.sync="dialog" title="学历信息" width="720px" @onConfirm="handleSubmitEducation"
-                 @closed="educationForm={}">
-        <el-form :rules="rules" ref="educationForm" :model="educationForm" label-width="110px" size="small">
-          <el-form-item label="学历类型" prop="educationType">
-            <ai-select v-model="educationForm.educationType"
-                       :selectList="dict.getDict('appVillageCadresEducationType')"/>
-          </el-form-item>
-          <el-form-item label="毕业院校" prop="graduatedSchool">
-            <el-input v-model="educationForm.graduatedSchool" placeholder="请输入" clearable/>
-          </el-form-item>
-          <el-form-item label="学历" prop="educationalLevel">
-            <ai-select v-model="educationForm.educationalLevel" :selectList="dict.getDict('education_village_rc')"/>
-          </el-form-item>
-          <el-form-item label="专业" prop="learnProfession">
-            <el-input v-model="educationForm.learnProfession" placeholder="请输入" clearable/>
-          </el-form-item>
-          <el-form-item label="毕业时间:" prop="graduationTime">
-            <el-date-picker placeholder="选择毕业日期"
-                            v-model="educationForm.graduationTime"
-                            type="date"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            format="yyyy-MM-dd"/>
-          </el-form-item>
-        </el-form>
-      </ai-dialog>
-    </template>
-    <template #footer>
-      <el-button class="delete-btn" @click="$router.push({})">取消</el-button>
-      <el-button type="primary" @click="handleSubmit">提交</el-button>
-    </template>
-  </ai-detail>
-</template>
-<script>
-import {mapState} from "vuex";
-import TabsCard from "./tabsCard";
-
-export default {
-  name: "functionaryCreate",
-  components: {TabsCard},
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-  },
-  inject: ['top'],
-  computed: {
-    ...mapState(["user"]),
-    detailTitle() {
-      return !this.isEdit ? '添加干部档案' : '编辑干部档案'
-    },
-    isEdit() {
-      return !!this.$route.query.id
-    },
-    disabledLevel() {
-      if (!!this.form.workAreaId) {
-        let code = JSON.parse(JSON.stringify(this.form.workAreaId))
-        if (/0{10}$/g.test(code)) {
-          return 1
-        } else if (/0{8}$/g.test(code)) {
-          return 2
-        } else if (/0{6}$/g.test(code)) {
-          return 3
-        } else if (/0{3}$/g.test(code)) {
-          return 4
-        } else return 5
-      } else return -1
-    },
-    rules() {
-      const IdNumberPass = (rule, value, callback) => {
-        const IDREG = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
-        if (value) {
-          if (IDREG.test(value)) {
-            callback();
-          } else {
-            callback(new Error("身份证号格式错误"));
-          }
-        } else {
-          callback(new Error("请填写身份证号"));
-        }
-      };
-      return {
-        workAreaId: [
-          {required: true, validator: (r, v, cb) => /0{3}$/g.test(v) ? cb('任职地区必须选到村级') : cb(), trigger: "blur"}
-        ],
-        currentAreaId: [
-          {validator: (r, v, cb) => v && /0{3}$/g.test(v) ? cb('任职地区必须选到村级') : cb(), trigger: "blur"}
-        ],
-        positionType: [
-          {required: true, message: "请选择职务类别", trigger: "change"}
-        ],
-        workTime: [
-          {required: true, message: "请选择任职时间", trigger: "change"}
-        ],
-        name: [{required: true, message: "请填写姓名", trigger: "blur"}],
-        idNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"},
-          {min: 18, max: 18, message: "身份证号码为18位数", trigger: "blur"}
-        ],
-        gender: [{required: true, message: "请选择性别", trigger: "blur"}],
-        isSubordinate: [
-          {required: true, message: "请选择是否镇街下派", trigger: "change"}
-        ],
-        isVillageMember: [
-          {
-            required: true,
-            message: "请选择是否村(居)委会委员",
-            trigger: "change"
-          }
-        ],
-        isBranchMember: [
-          {required: true, message: "请选择是否支委委员", trigger: "change"}
-        ],
-        isVillageSupervision: [
-          {required: true, message: "请选择是否村(居)务监督委员会成员", trigger: "change"}
-        ],
-        villageMemberPosition1: [
-          {required: true, message: "请选择村(居)委会委员职务"}
-        ],
-        isFulltimeCadres: [
-          {required: true, message: "请选择是否专职干部", trigger: "change"}
-        ],
-
-        isCollegeOfficer: [
-          {required: true, message: "请选择是否大学生村官", trigger: "change"}
-        ],
-        isLeagueSecretary: [
-          {required: true, message: "请选择是否团支部书记", trigger: "change"}
-        ],
-        isMilitiaCommander: [
-          {required: true, message: "请选择是否民兵连长", trigger: "change"}
-        ],
-        isGridman: [{required: true, message: "请选择是否网格员", trigger: "change"}],
-        isWorkDifferent: [
-          {required: true, message: "请选择是否异地任职", trigger: "change"}
-        ],
-        isWomenChairman: [
-          {required: true, message: "请选择是否妇联主席", trigger: "change"}
-        ],
-        isVillageLeader: [
-          {required: true, message: "请选择是否村(居)民小组长", trigger: "change"}
-        ],
-        isLocalTalent: [
-          {required: true, message: "请选择是否本土人才", trigger: "change"}
-        ],
-        educationType: [
-          {required: true, message: "请选择学历类型", trigger: "blur"}
-        ],
-        graduatedSchool: [
-          {required: true, message: "请输入毕业院校", trigger: "blur"}
-        ],
-        educationalLevel: [
-          {required: true, message: "请选择学历", trigger: "blur"}
-        ],
-        learnProfession: [
-          {required: true, message: "请输入专业", trigger: "blur"}
-        ],
-        graduationTime: [
-          {required: true, message: "请选择毕业时间", trigger: "blur"}
-        ]
-      }
-    },
-  },
-  data() {
-    return {
-      dialog: false,
-      form: {
-        families: [],
-        serves: [],
-        negatives: [],
-        assessments: [],
-        educations: [],
-        status: 1,
-
-        isSubordinate: '0',
-        isCollegeOfficer: '0',
-        isVillageMember: '0',
-        villageMemberPosition1: null,
-        isBranchMember: '0',
-        branchMemberPosition1: null,
-        isVillageSupervision: '0',
-        villageSupervisionPosition1: null,
-        isFulltimeCadres: '0',
-        fulltimeCadresPosition1: null,
-        fulltimeCadresTime: null,
-        isLeagueSecretary: '0',
-        isWomenChairman: '0',
-        isMilitiaCommander: '0',
-        isVillageLeader: '0',
-        isGridman: '0',
-        isLocalTalent: '0',
-        isWorkDifferent: '0',
-      },
-      educationForm: {},
-    }
-  },
-  methods: {
-    getDetail() {
-      let {id} = this.$route.query
-      this.instance.post(`/app/appvillagecadresnew/queryDetailById`, null, {
-        params: {id}
-      }).then(res => {
-        if (res?.data) {
-          let {idNumber, enterPartyTime, enterWorkTime} = res.data
-          let {birthday} = this.idCardNoUtil.getIdCardInfo(idNumber)
-          this.form = {
-            ...res.data, birthday,
-            enterPartyTimeShow: this.$dateFormat(enterPartyTime),
-            enterWorkTimeShow: this.$dateFormat(enterWorkTime),
-            age: this.$calcAge(idNumber)
-          }
-        }
-      })
-    },
-    // 确认按钮
-    handleSubmitEducation() {
-      this.$refs.educationForm.validate(v => {
-        if (v) {
-          if (this.educationForm?.index > -1) {
-            this.form.educations.splice(this.educationForm.index, 1, this.educationForm)
-          } else {
-            this.form.educations.push(this.educationForm)
-          }
-          this.dialog = false
-        }
-      })
-    },
-    //编辑 学历记录记录
-    handleEditEducation(row, index) {
-      this.educationForm = JSON.parse(JSON.stringify({...row, index}))
-      this.dialog = true
-    },
-    //删除学历记录记录
-    handleDelEducation(i) {
-      this.form.educations.splice(i, 1)
-    },
-    getInfoFromResident(val) {
-      this.form.idNumber = val.idNumber;
-      this.form.name = val.name;
-      this.form.avatarUrl = val.photo;
-      this.form.age = val.age
-      this.form.gender = val.sex
-      this.form.birthday = this.$dateFormat(this.idCardNoUtil.getIdCardInfo(val.idNumber)?.birthday, "YYYY-MM-DD 00:00:00")
-      this.$forceUpdate()
-    },
-    handleSubmit() {
-      this.$refs.cadresForm.validate(v => {
-        if (v) {
-          this.instance.post("/app/appvillagecadresnew/addOrUpdate", {
-            ...this.form,
-            birthday: this.$dateFormat(this.form.birthday, 'YYYY-MM-DD 00:00:00')
-          }).then(res => {
-            if (res?.code == 0) {
-              this.$message.success("提交成功!")
-              if (this.isEdit) {
-                this.$router.push({query: this.$route.query})
-              } else {
-                this.$router.push({})
-              }
-            }
-          })
-        }
-      })
-    },
-    handleIdNumberInfo(v) {
-      if (this.idCardNoUtil.checkIdCardNo(v)) {
-        let {birthday, sex} = this.idCardNoUtil.getIdCardInfo(v)
-        this.form.birthday = birthday
-        this.form.gender = sex
-        this.$forceUpdate()
-      }
-    }
-  },
-  created() {
-    this.dict.load(
-        "education_village_rc",
-        "cadrePositionType",
-        "healthCondition",
-        "politicsStatus",
-        "householdRelation",
-        "presentPost",
-        "partyPosition",
-        "sex",
-        "faithType",
-        "nation",
-        "appVillageSubsidyForm",
-        "yesOrNo",
-        "appFulltimeCadresPosition1",
-        "appVillageCadresAssessmentResult",
-        "appVillageSupervisionPosition1",
-        "appBranchMemberPosition1",
-        "appVillageCadresEducationType",
-        "appVillageMemberPosition1"
-    )
-    this.form.workAreaId = JSON.parse(JSON.stringify(this.top.areaId))
-    this.isEdit && this.getDetail()
-  },
-}
-</script>
-<style lang="scss" scoped>
-.functionaryCreate {
-  height: 100%;
-  position: relative;
-
-  ::v-deep .el-button--text {
-    .iconfont {
-      color: inherit;
-      font-size: inherit;
-    }
-  }
-
-  .wrap {
-    flex-wrap: wrap;
-  }
-
-  .el-form-item {
-    .el-input, .el-select, .el-date-editor {
-      width: 100%;
-    }
-  }
-
-  ::v-deep .ai-card__body {
-    .el-form-item {
-      width: 50%;
-      flex-shrink: 0;
-
-      &[row] {
-        width: 100%;
-      }
-
-      &[column] {
-        height: 100%;
-      }
-
-      &[layout] {
-        margin-bottom: 0;
-      }
-
-      .AiPersonSelect {
-        margin-left: 8px;
-      }
-    }
-  }
-
-  ::v-deep .el-table__empty-text {
-    height: 88px;
-    line-height: 88px;
-  }
-
-
-  .el-icon-delete:hover {
-    color: #f46;
-  }
-}
-</style>
diff --git a/packages/meta/AppVillageCadres/components/functionaryDetail.vue b/packages/meta/AppVillageCadres/components/functionaryDetail.vue
deleted file mode 100644
index 1dd1ccbf..00000000
--- a/packages/meta/AppVillageCadres/components/functionaryDetail.vue
+++ /dev/null
@@ -1,318 +0,0 @@
-<template>
-  <ai-detail class="functionaryDetail">
-    <ai-title slot="title" :title="detailTitle" isShowBottomBorder isShowBack @onBackClick="$router.push({})">
-      <template #rightBtn>
-        <el-row type="flex" align="middle" class="operationBtns">
-          <el-button icon="iconfont iconEdit" type="primary"
-                     @click="$router.replace({query:$route.query,hash:'#add'})">编辑
-          </el-button>
-          <el-button icon="iconfont iconPerson_Transfered" v-if="$permissions('app_appvillagecadresnew_edit')&&!hasOut"
-                     @click="handleOutgoing">
-            离任
-          </el-button>
-          <el-button icon="iconfont iconPrint" @click="handlePrint()" v-if="form.status == 1">打印档案
-          </el-button>
-          <el-button icon="iconfont iconLogout" type="danger" plain @click="handleLogout" v-if="form.status == 1">
-            注销档案
-          </el-button>
-          <el-button icon="iconfont iconDelete" type="danger" plain @click="handleDelFile"
-                     v-if="$permissions('app_appvillagecadresnew_del')">
-            删除人员
-          </el-button>
-        </el-row>
-      </template>
-    </ai-title>
-    <template #content>
-      <ai-card :title="form.name">
-        <template #content>
-          <el-row type="flex" justify="space-between">
-            <ai-wrapper>
-              <ai-info-item label="性别" :value="dict.getLabel('sex', form.gender)"/>
-              <ai-info-item label="身份证号">
-                <ai-id mode="show" v-model="form.idNumber" right-btn/>
-              </ai-info-item>
-              <ai-info-item label="出生日期" :value="getDateFormat(form.birthday)"/>
-              <ai-info-item label="年龄" :value="form.age"/>
-              <ai-info-item label="联系方式" :value="form.phone"/>
-              <ai-info-item label="民族" :value="dict.getLabel('nation', form.nation)"/>
-              <ai-info-item label="文化程度" :value="dict.getLabel('education_village_rc', form.educationLevel)"/>
-              <ai-info-item label="政治面貌" :value="dict.getLabel('politicsStatus', form.politicalStatus)"/>
-              <ai-info-item label="入党时间" :value="getDateFormat(form.membershipTime)"/>
-              <ai-info-item label="参加工作时间" :value="getDateFormat(form.jobTime)"/>
-              <ai-info-item label="健康状况" :value="dict.getLabel('healthCondition', form.healthCondition)"/>
-              <ai-info-item label="职称" :value="form.jobTitle"/>
-            </ai-wrapper>
-            <ai-avatar v-model="form.avatarUrl" :editable="false"/>
-          </el-row>
-          <ai-wrapper>
-            <ai-info-item isLine label="籍贯" :value="form.areaName"/>
-            <ai-info-item isLine label="现住址" :value="[form.currentAreaName,form.currentAddress].join('')"/>
-          </ai-wrapper>
-        </template>
-      </ai-card>
-      <ai-card title="学历信息">
-        <template #content>
-          <el-table
-              :data="form.educations"
-              stripe
-              style="width: 100%"
-              border
-              header-cell-class-name="table-header"
-              align="center"
-          >
-            <el-table-column
-                align="center"
-                prop="educationType"
-                label="学历类型"
-                width="119"
-                clearable
-            >
-              <template slot-scope="scope">
-                <span>{{ dict.getLabel("appVillageCadresEducationType", scope.row.educationType) || '-' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="educationLevel" label="学历" width="100">
-              <template slot-scope="scope">
-                <span>{{ dict.getLabel("education_village_rc", scope.row.educationalLevel) || '-' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="graduatedSchool" label="毕业院校" width="200">
-              <template slot-scope="scope">
-                <div>{{ scope.row.graduatedSchool || '-' }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="learnProfession" label="专业" width="160">
-              <template slot-scope="scope">
-                <span>{{ scope.row.learnProfession || '-' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="graduationTime" label="毕业时间" width="100">
-              <template slot-scope="scope">
-                <span>{{ (scope.row.graduationTime) ? (scope.row.graduationTime).substring(0, 10) : '-' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="操作">
-              <template slot-scope="scope" v-if="$permissions('app_appvillagecadresnew_edit')">
-                      <span
-                          class="iconfont iconEdit"
-                          @click="editServingxl(scope)"
-                          style="cursor: pointer;margin-right:8px"
-                      />
-                <span
-                    class="el-icon-delete"
-                    @click="delServingxl(scope)"
-                    style="cursor: pointer"
-                />
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </ai-card>
-      <ai-card title="职务信息">
-        <template #content>
-          <ai-wrapper label-width="220px">
-            <ai-info-item label="任职地区" :value="form.workAreaName" isLine/>
-            <ai-info-item label="任职时间" :value="getDateFormat(form.workTime)"/>
-            <ai-info-item label="职务类别" :value="dict.getLabel('cadrePositionType', form.positionType)"/>
-            <ai-info-item label="镇街下派 是否下派" :value="dict.getLabel('yesOrNo', form.isSubordinate)"/>
-            <ai-info-item label="大学生村官 是否任职" :value="dict.getLabel('yesOrNo', form.isCollegeOfficer)"/>
-            <ai-info-item label="村(居)委会委员 是否任职" :value="dict.getLabel('yesOrNo', form.isVillageMember)"/>
-            <ai-info-item label="担任职务"
-                          :value="dict.getLabel('appVillageMemberPosition1', form.villageMemberPosition1)"/>
-            <ai-info-item label="支委委员 是否任职" :value="dict.getLabel('yesOrNo', form.isBranchMember)"/>
-            <ai-info-item label="担任职务" :value="dict.getLabel('appBranchMemberPosition1', form.branchMemberPosition1)"/>
-            <ai-info-item label="村(居)务监督委员会成员 是否任职" :value="dict.getLabel('yesOrNo', form.isVillageSupervision)"/>
-            <ai-info-item label="担任职务"
-                          :value="dict.getLabel('appVillageSupervisionPosition1', form.villageSupervisionPosition1)"/>
-            <ai-info-item label="专职干部 是否任职" :value="dict.getLabel('yesOrNo', form.isFulltimeCadres)"/>
-            <ai-info-item label="担任职务"
-                          :value="dict.getLabel('appFulltimeCadresPosition1', form.fulltimeCadresPosition1)"/>
-            <ai-info-item label="担任时间" :value="form.fulltimeCadresTime" isLine/>
-            <ai-info-item label="团支部书记 是否任职" :value="dict.getLabel('yesOrNo', form.isLeagueSecretary)"/>
-            <ai-info-item label="妇联主席 是否任职" :value="dict.getLabel('yesOrNo', form.isWomenChairman)"/>
-            <ai-info-item label="民兵连长 是否任职" :value="dict.getLabel('yesOrNo', form.isMilitiaCommander)"/>
-            <ai-info-item label="村(居)民小组长 是否任职" :value="dict.getLabel('yesOrNo', form.isVillageLeader)"/>
-            <ai-info-item label="网格员 是否任职" :value="dict.getLabel('yesOrNo', form.isGridman)"/>
-            <ai-info-item label="本土人才 是否任职" :value="dict.getLabel('yesOrNo', form.isLocalTalent)"/>
-            <ai-info-item label="异地任职 是否任职" :value="dict.getLabel('yesOrNo', form.isWorkDifferent)"/>
-            <ai-info-item label="专业技术职务" :value="form.expertisePosition"/>
-            <ai-info-item label="熟悉专业有何专长" :value="form.professionalExpertise"/>
-            <ai-info-item label="其他职务" :value="form.workDifferent"/>
-          </ai-wrapper>
-        </template>
-      </ai-card>
-      <tabs-card :instance="instance" :dict="dict" :permissions="permissions" :form.sync="form"/>
-      <print-tpl v-if="print" :info="form" :dict="dict"/>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-import printJS from "print-js";
-import PrintTpl from "./printTpl";
-import TabsCard from "./tabsCard";
-
-export default {
-  name: "functionaryDetail",
-  components: {TabsCard, PrintTpl},
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-  },
-  data() {
-    return {
-      form: {
-        educations: []
-      },
-      print: false,
-    }
-  },
-  computed: {
-    detailTitle() {
-      return !this.isEdit ? '添加干部档案' : '干部档案资料'
-    },
-    isEdit() {
-      return !!this.$route.query.id
-    },
-    hasOut() {
-      return this.form.outStatus != 0
-    },
-  },
-  methods: {
-    getDetail() {
-      let {id} = this.$route.query
-      this.instance.post(`/app/appvillagecadresnew/queryDetailById`, null, {
-        params: {id}
-      }).then(res => {
-        if (res?.data) {
-          let {idNumber, enterPartyTime, enterWorkTime} = res.data
-          let {birthday} = this.idCardNoUtil.getIdCardInfo(idNumber)
-          this.form = {
-            ...res.data, birthday,
-            enterPartyTimeShow: this.getDateFormat(enterPartyTime),
-            enterWorkTimeShow: this.getDateFormat(enterWorkTime),
-            age: this.$calcAge(idNumber)
-          }
-        }
-      })
-    },
-    getDateFormat(v) {
-      return this.$moment(v).format('YYYY-MM-DD')?.replace("Invalid Date", "-")
-    },
-    handleOutgoing() {
-      let submitOutgoing = (outStatus) => {
-        let {id} = this.$route.query
-        id && this.instance.post("/app/appvillagecadresnew/outgoing", null, {
-          params: {id, outStatus}
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$message.success("修改成功!")
-            this.$router.push({})
-          }
-        })
-      }
-      this.$confirm("请选择一种离任方式", {
-        distinguishCancelAndClose: true,
-        confirmButtonText: '正常离任',
-        cancelButtonText: '非正常离任'
-      }).then(() => {
-        submitOutgoing(1)
-      }).catch(err => {
-        if (err == 'cancel') {
-          submitOutgoing(2)
-        }
-      })
-    },
-    handlePrint() {
-      this.print = true;
-      setTimeout(() => {
-        printJS({
-          printable: "printAll",
-          type: "html",
-          targetStyles: "*"
-        })
-      }, 1000)
-    },
-    handleLogout() {
-      this.$confirm(
-          `<div class="title_del">注销后，<span style="color:#26f">${[
-            this.form.name,
-            this.form.phone
-          ].join("-")}</span>的历史数据将会保留，是否确定注销该人员档案？</div>`,
-          {
-            title: "档案注销"
-          }
-      ).then(() => {
-        let {id} = this.form
-        this.instance.post(`/app/appvillagecadresnew/cancellation`, null, {
-          params: {id, status: 0}
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$message({message: "注销档案成功", type: "success"});
-            this.$router.push({})
-          }
-        });
-      }).catch(() => 0);
-    },
-    handleDelFile() {
-      this.$confirm(
-          `<div class="title_del">删除后，<span style="color:#26f">${[
-            this.form.name,
-            this.form.phone
-          ].join("-")}
-          </span>的历史相关信息可能无法追溯查看，是否确定删除该人员档案？</div>`,
-          {
-            type: "error",
-            title: "档案删除"
-          }
-      ).then(() => {
-        let {id: ids} = this.form
-        this.instance.post(`/app/appvillagecadresnew/delete`, null, {
-          params: {ids}
-        })
-        .then(res => {
-          if (res?.code == 0) {
-            this.$message.success("干部档案删除成功");
-            this.$router.push({})
-          }
-        })
-      }).catch(() => 0)
-    },
-  },
-  created() {
-    this.dict.load(
-        "education_village_rc",
-        "cadrePositionType",
-        "healthCondition",
-        "politicsStatus",
-        "householdRelation",
-        "presentPost",
-        "partyPosition",
-        "sex",
-        "faithType",
-        "nation",
-        "appVillageSubsidyForm",
-        "yesOrNo",
-        "appFulltimeCadresPosition1",
-        "appVillageCadresAssessmentResult",
-        "appVillageSupervisionPosition1",
-        "appBranchMemberPosition1",
-        "appVillageCadresEducationType",
-        "appVillageMemberPosition1",
-    )
-    this.isEdit && this.getDetail()
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.functionaryDetail {
-  height: 100%;
-  position: relative;
-
-  ::v-deep .ai-info-item {
-    line-height: 32px;
-  }
-}
-</style>
diff --git a/packages/meta/AppVillageCadres/components/printTpl.vue b/packages/meta/AppVillageCadres/components/printTpl.vue
deleted file mode 100644
index 3e6548f3..00000000
--- a/packages/meta/AppVillageCadres/components/printTpl.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <section class="printTpl">
-    <div class="exectl" id="printAll"><p class="printHeader">{{ info.workAreaName }}干部基本情况表</p>
-      <table cellpadding="7" cellspacing="0" border="1">
-        <tr>
-          <td height="29"><p>姓名</p></td>
-          <td colspan="2" width="60"><p class="colors"> {{ info.name || '' }} </p></td>
-          <td width="65"><p>性别</p></td>
-          <td colspan="3" width="84"><p class="colors"> {{ dict.getLabel('sex', info.gender) || '' }} </p></td>
-          <td width="79"><p> 出生年月 </p></td>
-          <td width="91"><p class="colors">              <!-- 8888 -->{{ $dateFormat(info.birthday) }} </p>
-          </td>
-          <td rowspan="4" width="107"><img v-if="info.avatarUrl" :src="info.avatarUrl" width="150" height="230" alt=""/>
-          </td>
-        </tr>
-        <tr>
-          <td height="24"><p>民族</p></td>
-          <td colspan="2" width="60"><p class="colors">{{ dict.getLabel('nation', info.nation) || '' }}</p></td>
-          <td width="65"><p>籍贯</p></td>
-          <td colspan="3" width="84"><p class="colors">{{ info.areaName || '' }}</p></td>
-          <td width="79"><p>联系电话</p></td>
-          <td width="91"><p class="colors">{{ info.phone || '' }}</p></td>
-        </tr>
-        <tr>
-          <td height="24"><p>入党时间</p></td>
-          <td colspan="2" width="60"><p class="colors">
-            {{ $dateFormat(info.membershipTime) }}</p></td>
-          <td width="65"><p>参加工作时间</p></td>
-          <td colspan="3" width="84"><p class="colors">{{ $dateFormat(info.jobTime) }}</p></td>
-          <td width="79"><p>职称</p></td>
-          <td width="91"><p class="colors">{{ info.jobTitle || '' }}</p></td>
-        </tr>
-        <tr>
-          <td height="24"><p>家庭住址</p></td>
-          <td colspan="4" width="139"><p class="colors">{{ info.currentAreaName + info.currentAddress || '' }}</p></td>
-          <td width="90"><p>身份证号</p></td>
-          <td colspan="3"><p class="colors">{{ info.idNumber || '' }}</p></td>
-        </tr>
-        <tr v-for="(item,index) in educations" :key="index">
-          <td v-if="index==0" :rowspan="index==0 ? educations.length:''"><p>学历学位</p></td>
-          <td width="80"><p>{{ dict.getLabel("appVillageCadresEducationType", item.educationType) || '' }}</p></td>
-          <td colspan="2" width="10"><p class="colors">
-            {{ dict.getLabel("education_village_rc", item.educationalLevel) || '' }}</p></td>
-          <td width="100"><p>毕业院校系及专业</p></td>
-          <td colspan="5" width="280"><p class="colors" v-if="educations.length">
-            {{ item.graduatedSchool + "," + item.learnProfession }}</p></td>
-        </tr>
-        <tr v-for="(xl,idx) in serves" :key="idx">
-          <td v-if="idx==0" align="center" height="194"
-              :rowspan="idx==0?serves.length:''"><p>简历</p></td>
-          <td colspan="10" width="557" valign="top"><p class="colors" v-if="serves.length">
-            {{ $dateFormat(xl.careerBeginTime) + "-" + $dateFormat(xl.careerEndTime) + " 在" + xl.workAreaName + "担任" }}
-            {{ dict.getLabel('partyPosition', xl.position) }}</p>
-          </td>
-        </tr>
-        <tr v-for="(cf,ix) in negatives" :key="ix">
-          <td height="32" v-if="ix==0" :rowspan="ix==0?negatives.length:''"><p
-              align="center">奖惩情况</p></td>
-          <td colspan="10" width="557"><p class="colors" v-if="negatives.length">{{ $dateFormat(cf.punishTime) }}
-            因{{ cf.punishContent }}给予警告处分</p></td>
-        </tr>
-        <tr>
-          <td rowspan="8" height="18"><p>家庭主要成员</p></td>
-          <td width="49"><p>称谓</p></td>
-          <td colspan="2" width="66"><p>姓名</p></td>
-          <td colspan="2" width="28"><p>年龄</p></td>
-          <td width="80"><p>政治面貌</p></td>
-          <td colspan="4" width="316"><p>工作单位及职位</p></td>
-        </tr>
-        <tr v-for="(fm,index) in families" :key="index">
-          <td><p class="colors">{{ dict.getLabel('householdRelation', fm.relateType) || '' }}</p></td>
-          <td colspan="2" width="66"><p class="colors">{{ fm.name || '' }}</p></td>
-          <td colspan="2" width="28"><p class="colors">{{ $calcAge(fm.idNumber) || '' }}</p></td>
-          <td width="41"><p class="colors">群众</p></td>
-          <td colspan="4" width="316"><p class="colors">{{ fm.workUnit || "" }}</p></td>
-        </tr>
-      </table>
-    </div>
-  </section>
-</template>
-<script>
-export default {
-  name: "printTpl",
-  props: {
-    info: {
-      default: () => {
-      }
-    },
-    dict: Object
-  },
-  computed: {
-    families() {
-      return this.info.families?.length > 0 ? this.info.families : 1
-    },
-    negatives() {
-      return this.info.negatives?.length > 0 ? this.info.negatives : 1
-    },
-    serves() {
-      return this.info.serves?.length > 0 ? this.info.serves : 1
-    },
-    educations() {
-      return this.info.educations?.length > 0 ? this.info.educations : 1
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>.printTpl {
-  .exectl {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: -1;
-    margin: auto;
-    height: auto;
-    background: #fff;
-
-    .printHeader {
-      font-size: 24px;
-      text-align: center;
-      height: 60px;
-      margin: auto;
-    }
-
-    table {
-      width: 100%;
-      font-size: 14px;
-      text-align: center;
-    }
-
-    .colors {
-      color: #000000;
-    }
-
-    tr {
-      line-height: 50px;
-
-      td {
-        height: 50px;
-        line-height: 30px !important;
-        text-align: center !important;
-
-        &:first-of-type {
-          width: 50px;
-        }
-      }
-    }
-  }
-}</style>
diff --git a/packages/meta/AppVillageCadres/components/tabsCard.vue b/packages/meta/AppVillageCadres/components/tabsCard.vue
deleted file mode 100644
index b6604e7d..00000000
--- a/packages/meta/AppVillageCadres/components/tabsCard.vue
+++ /dev/null
@@ -1,407 +0,0 @@
-<template>
-  <section class="tabsCard">
-    <ai-list isTabs class="others">
-      <template #tabs>
-        <el-tabs v-model="currentTab">
-          <el-tab-pane label="家庭成员" name="families" lazy>
-            <ai-card title="家庭成员">
-              <template #right v-if="editable">
-                <el-button type="text" icon="iconfont iconAdd" @click="dialog.families=true">添加家庭成员</el-button>
-              </template>
-              <template #content>
-                <el-table :data="form.families"
-                          stripe
-                          border
-                          header-cell-class-name="table-header"
-                          empty-text="家庭成员信息为空，点击标题右侧添加按钮进行添加">
-                  <el-table-column align="center" prop="name" label="家属姓名" width="100">
-                    <template slot-scope="scope">
-                      <span>{{ scope.row.name || '-' }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" label="身份证号" width="200">
-                    <template slot-scope="{row}">
-                      {{ row.idNumber ? row.idNumber.replace(/(\d{10})\d{6}(\d{2})/g, '$1******$2') : '-' }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" prop="age" label="年龄" width="80">
-                    <template slot-scope="scope">
-                      <div>{{ $calcAge(scope.row.idNumber) || '-' }}</div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" prop="relateType" label="与本人关系" width="100">
-                    <template slot-scope="scope">
-                      <span>{{ dict.getLabel('householdRelation', scope.row.relateType) || '-' }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" prop="workUnit" label="工作单位及职位" width="184">
-                    <template slot-scope="scope">
-                      <span>{{ scope.row.workUnit || '-' }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" label="操作">
-                    <template slot-scope="{row,$index}" v-if="$permissions('app_appvillagecadresnew_edit')">
-                      <el-button type="text" @click="handleEdit('families',row,$index)">编辑</el-button>
-                      <el-button type="text" @click="handleDel('families',$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </template>
-            </ai-card>
-          </el-tab-pane>
-          <el-tab-pane label="任职经历" name="serves" lazy>
-            <ai-card title="任职经历">
-              <template #right v-if="editable">
-                <el-button type="text" icon="iconfont iconAdd" @click="dialog.serves=true">添加任职经历</el-button>
-              </template>
-              <template #content>
-                <el-table :data="form.serves" stripe border
-                          header-cell-class-name="table-header"
-                          empty-text="任职经历信息为空，点击标题右侧添加按钮进行添加">
-                  <el-table-column
-                      align="center"
-                      prop="careerBeginTime"
-                      label="任职时间"
-                      width="113">
-                    <template slot-scope="{row}">
-                      {{ [getDateFormat(row.careerBeginTime), getDateFormat(row.careerEndTime)].join('至') }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" prop="workAreaName" label="工作地点" width="144"/>
-                  <el-table-column align="center" prop="workUnit" label="工作单位" width="150"/>
-                  <el-table-column align="center" prop="position" label="职务" width="89">
-                    <template slot-scope="scope">
-                      <span>{{ dict.getLabel('partyPosition', scope.row.position) }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                      align="center"
-                      prop="workContent"
-                      label="主要工作内容"
-                      width="168"
-                  />
-                  <el-table-column align="center" label="操作">
-                    <template slot-scope="{row,$index}" v-if="$permissions('app_appvillagecadresnew_edit')">
-                      <el-button type="text" @click="handleEdit('serves',row,$index)">编辑</el-button>
-                      <el-button type="text" @click="handleDel('serves',$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </template>
-            </ai-card>
-          </el-tab-pane>
-          <el-tab-pane label="负面记录" name="negatives" lazy>
-            <ai-card title="负面记录">
-              <template #right v-if="editable">
-                <el-button type="text" icon="iconfont iconAdd" @click="dialog.negatives=true">添加负面记录</el-button>
-              </template>
-              <template #content>
-                <el-table :data="form.negatives" stripe border
-                          header-cell-class-name="table-header"
-                          empty-text="负面记录为空，点击标题右侧添加按钮进行添加">
-                  <el-table-column align="center" prop="punishTime" label="处罚日期" width="144">
-                    <template slot-scope="{row}">
-                      {{ getDateFormat(row.punishTime) }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                      align="center"
-                      prop="punishContent"
-                      label="处罚事由"
-                      width="242"/>
-                  <el-table-column align="center" prop="createTime" label="登记日期" width="141">
-                    <template slot-scope="{row}">
-                      {{ getDateFormat(row.createTime) }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" prop="createUser" label="登记人" width="137">
-                    <template slot-scope="scope">
-                      <span>{{ scope.row.createUser || '-' }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" label="操作">
-                    <template slot-scope="{row,$index}" v-if="$permissions('app_appvillagecadresnew_edit')">
-                      <el-button type="text" @click="handleEdit('negatives',row,$index)">编辑</el-button>
-                      <el-button type="text" @click="handleDel('negatives',$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </template>
-            </ai-card>
-          </el-tab-pane>
-          <el-tab-pane label="年度考核" name="assessments" lazy>
-            <ai-card title="年度考核">
-              <template #right v-if="editable">
-                <el-button type="text" icon="iconfont iconAdd" @click="dialog.assessments=true">添加考核评价</el-button>
-              </template>
-              <template #content>
-                <el-table
-                    :data="form.assessments"
-                    stripe
-                    border
-                    header-cell-class-name="table-header"
-                    empty-text="考核信息为空，点击标题右侧添加按钮进行添加">
-                  <el-table-column align="center" prop="year" label="考核年度" width="120">
-                    <template slot-scope="scope">
-                      <span>{{ scope.row.year }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                      align="center"
-                      prop="assessmentResult"
-                      label="评价结果"
-                      width="160"
-                  >
-                    <template slot-scope="scope">
-                          <span>{{
-                              dict.getLabel('appVillageCadresAssessmentResult', scope.row.assessmentResult) || '-'
-                            }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column align="center" prop="remark" label="备注" width="384"/>
-                  <el-table-column align="center" label="操作">
-                    <template slot-scope="{row,$index}" v-if="$permissions('app_appvillagecadresnew_edit')">
-                      <el-button type="text" @click="handleEdit('assessments',row,$index)">编辑</el-button>
-                      <el-button type="text" @click="handleDel('assessments',$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </template>
-            </ai-card>
-          </el-tab-pane>
-        </el-tabs>
-      </template>
-    </ai-list>
-    <ai-dialog :visible.sync="dialog.families" title="家庭成员" width="720px" @onConfirm="handleSubmit('families')"
-               @closed="familiesForm={}">
-      <el-form :rules="rules" ref="familiesForm" :model="familiesForm" size="small" label-width="140px">
-        <el-form-item label="家属姓名：" prop="name">
-          <el-input v-model="familiesForm.name" placeholder="请输入家属姓名" maxlength="15"/>
-        </el-form-item>
-        <el-form-item label="身份证号：">
-          <el-input placeholder="请输入身份证号" clearable
-                    v-model="familiesForm.idNumber" maxlength="18"
-                    @change="familiesForm.age=$calcAge(familiesForm.idNumber)"/>
-        </el-form-item>
-        <el-form-item label="与本人关系：">
-          <ai-select v-model="familiesForm.relateType" :selectList="dict.getDict('householdRelation')"/>
-        </el-form-item>
-        <el-form-item label="工作单位及职位：">
-          <el-input v-model="familiesForm.workUnit" placeholder="请输入工作单位及职位" clearable/>
-        </el-form-item>
-      </el-form>
-    </ai-dialog>
-    <ai-dialog :visible.sync="dialog.serves" title="任职经历" width="800px" @onConfirm="handleSubmit('serves')"
-               @closed="servesForm={}">
-      <el-form :rules="rules" ref="servesForm" :model="servesForm" size="small" label-width="120px">
-        <el-form-item label="任职时间：" required>
-          <el-form-item prop="careerBeginTime" class="mar-b0">
-            <el-date-picker
-                v-model="servesForm.careerBeginTime"
-                type="date"
-                placeholder="选择开始日期"
-                class="input-172 mar-r16"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd"
-            />
-          </el-form-item>
-          <el-form-item prop="careerEndTime" class="mar-b0">
-            <el-date-picker
-                v-model="servesForm.careerEndTime"
-                type="date"
-                placeholder="选择结束日期"
-                class="input-172"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd"
-            />
-          </el-form-item>
-        </el-form-item>
-        <el-form-item label="工作地点：" prop="workAreaId" class="area">
-          <ai-area-select placeholder="请选择工作地点"
-                          clearable
-                          @fullname="v=>servesForm.workAreaName=v"
-                          always-show
-                          :instance="instance"
-                          v-model="servesForm.workAreaId"/>
-        </el-form-item>
-        <el-form-item label="工作单位：" prop="workUnit">
-          <el-input v-model="servesForm.workUnit" placeholder="请输入工作单位" clearable/>
-        </el-form-item>
-        <el-form-item label="职务：" prop="position" class="user select-240">
-          <ai-select v-model="servesForm.position" :selectList="dict.getDict('partyPosition')"/>
-        </el-form-item>
-        <el-form-item label="主要工作内容：" prop="workContent" class="user mar-b0">
-          <el-input v-model="servesForm.workContent" placeholder="请输入主要工作内容" clearable/>
-        </el-form-item>
-      </el-form>
-    </ai-dialog>
-    <ai-dialog :visible.sync="dialog.negatives" title="负面记录" width="720px" @onConfirm="handleSubmit('negatives')"
-               @closed="negativesForm={}">
-      <el-form :rules="rules" ref="negativesForm" :model="negativesForm" size="small" label-width="100px">
-        <el-form-item label="处罚日期" prop="punishTime">
-          <el-date-picker placeholder="选择处罚日期"
-                          v-model="negativesForm.punishTime"
-                          type="date"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          format="yyyy-MM-dd"/>
-        </el-form-item>
-        <el-form-item label="处罚事由" prop="punishContent">
-          <el-input v-model="negativesForm.punishContent" placeholder="请输入处罚事由" clearable/>
-        </el-form-item>
-      </el-form>
-    </ai-dialog>
-    <ai-dialog :visible.sync="dialog.assessments" title="年度考核" width="720px" @onConfirm="handleSubmit('assessments')"
-               @closed="assessmentsForm={}">
-      <el-form :rules="rules" ref="assessmentsForm" :model="assessmentsForm" size="small" label-width="100px">
-        <el-form-item label="考核年度：" prop="year">
-          <el-input v-model="assessmentsForm.year" placeholder="请输入" clearable/>
-        </el-form-item>
-        <el-form-item label="评价结果：" prop="assessmentResult">
-          <ai-select v-model="assessmentsForm.assessmentResult"
-                     :selectList="dict.getDict('appVillageCadresAssessmentResult')"/>
-        </el-form-item>
-        <el-form-item label="备注：" prop="remark">
-          <el-input v-model="assessmentsForm.remark" placeholder="请输入备注" clearable/>
-        </el-form-item>
-      </el-form>
-    </ai-dialog>
-  </section>
-</template>
-
-<script>
-import {mapState} from "vuex";
-
-export default {
-  name: "tabsCard",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    form: {
-      default: () => {
-      }
-    },
-    editable: Boolean
-  },
-  computed: {
-    ...mapState(['user']),
-    rules() {
-      const IdNumberPass = (rule, value, callback) => {
-        const IDREG = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
-        if (value) {
-          if (IDREG.test(value)) {
-            callback();
-          } else {
-            callback(new Error("身份证号格式错误"));
-          }
-        } else {
-          callback(new Error("请填写身份证号"));
-        }
-      };
-      ///结束时间
-      const endTimePass = (rule, value, callback) => {
-        if (value) {
-          if (this.$moment(value).unix() - this.$moment(this.servesForm.careerBeginTime).unix() > 0) {
-            callback();
-          } else {
-            callback(new Error("结束时间要大于开始时间"));
-          }
-        } else {
-          callback(new Error("请填写结束时间"));
-        }
-      };
-      return {
-        careerBeginTime: [
-          {required: true, message: "请选择任职开始时间", trigger: "blur"}
-        ],
-        careerEndTime: [
-          {required: true, validator: endTimePass, trigger: "blur"}
-        ],
-        workAreaId: [
-          {required: true, message: "请选择工作地点", trigger: "blur"}
-        ],
-        workUnit: [
-          {required: true, message: "请输入工作单位", trigger: "blur"}
-        ],
-        position: [{required: true, message: "请选择职务", trigger: "blur"}],
-        workContent: [
-          {required: true, message: "请输入主要工作内容", trigger: "blur"}
-        ],
-        punishTime: [
-          {required: true, message: "请选择处罚日期", trigger: "blur"}
-        ],
-        punishContent: [
-          {required: true, message: "请输入处罚事由", trigger: "blur"}
-        ],
-        name: [{required: true, message: "请输入家属姓名", trigger: "blur"}],
-        idNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
-        ],
-        relateType: [
-          {required: true, message: "请选择与本人关系", trigger: "change"}
-        ],
-        remark: [{required: true, message: "请输入备注", trigger: "blur"}],
-        assessmentResult: [
-          {required: true, message: "请输入评价结果", trigger: "blur"}
-        ],
-        year: [{required: true, message: "请输入考核年度", trigger: "blur"}]
-      }
-    }
-  },
-  data() {
-    return {
-      currentTab: 'families',
-      dialog: {families: false, serves: false, negatives: false, assessments: false},
-      familiesForm: {},
-      servesForm: {},
-      negativesForm: {},
-      assessmentsForm: {}
-    }
-  },
-  methods: {
-    getDateFormat(v) {
-      return this.$moment(v).format('YYYY-MM-DD')?.replace("Invalid Date", "-")
-    },
-    handleDel(prop, index) {
-      let origin = JSON.parse(JSON.stringify(this.form))
-      origin?.[prop]?.splice(index, 1)
-      this.$emit('update:form', origin)
-    },
-    handleEdit(prop, row, index) {
-      this[`${prop}Form`] = JSON.parse(JSON.stringify({...row, index}))
-      this.dialog[prop] = true
-    },
-    handleSubmit(prop) {
-      this.$refs?.[`${prop}Form`]?.validate(v => {
-        if (v) {
-          let origin = JSON.parse(JSON.stringify(this.form)),
-              form = this[`${prop}Form`]
-          if (form?.index > -1) {
-            origin?.[prop]?.splice(form.index, 1, form)
-          } else {
-            origin?.[prop]?.push(form)
-          }
-          form.createUser = this.user.info.name
-          this.$emit('update:form', origin)
-          this.dialog[prop] = false
-        }
-      })
-    }
-  },
-  created() {
-    this.dict.load('appVillageCadresAssessmentResult', 'partyPosition', 'householdRelation')
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tabsCard {
-  ::v-deep .others {
-    padding: 0;
-
-    .el-tabs__content {
-      padding: 10px 1px 0;
-    }
-  }
-}
-</style>
diff --git a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue b/packages/party/AppMeetingChinaunion/AppMeetingChinaunion.vue
similarity index 100%
rename from packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
rename to packages/party/AppMeetingChinaunion/AppMeetingChinaunion.vue
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/add.vue b/packages/party/AppMeetingChinaunion/components/add.vue
similarity index 100%
rename from packages/3.0.0/AppMeetingChinaunion/components/add.vue
rename to packages/party/AppMeetingChinaunion/components/add.vue
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/appThreeMeetingUser.vue b/packages/party/AppMeetingChinaunion/components/appThreeMeetingUser.vue
similarity index 100%
rename from packages/3.0.0/AppMeetingChinaunion/components/appThreeMeetingUser.vue
rename to packages/party/AppMeetingChinaunion/components/appThreeMeetingUser.vue
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue b/packages/party/AppMeetingChinaunion/components/meetingDetail.vue
similarity index 100%
rename from packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
rename to packages/party/AppMeetingChinaunion/components/meetingDetail.vue
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/meetingSet.vue b/packages/party/AppMeetingChinaunion/components/meetingSet.vue
similarity index 100%
rename from packages/3.0.0/AppMeetingChinaunion/components/meetingSet.vue
rename to packages/party/AppMeetingChinaunion/components/meetingSet.vue
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/pieChart.vue b/packages/party/AppMeetingChinaunion/components/pieChart.vue
similarity index 100%
rename from packages/3.0.0/AppMeetingChinaunion/components/pieChart.vue
rename to packages/party/AppMeetingChinaunion/components/pieChart.vue
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/supplement.vue b/packages/party/AppMeetingChinaunion/components/supplement.vue
similarity index 100%
rename from packages/3.0.0/AppMeetingChinaunion/components/supplement.vue
rename to packages/party/AppMeetingChinaunion/components/supplement.vue
diff --git a/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue b/packages/party/AppPartyHistoryClass/AppPartyHistoryClass.vue
similarity index 100%
rename from packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
rename to packages/party/AppPartyHistoryClass/AppPartyHistoryClass.vue
diff --git a/packages/3.0.0/AppPartyHistoryClass/components/partyClassAdd.vue b/packages/party/AppPartyHistoryClass/components/partyClassAdd.vue
similarity index 100%
rename from packages/3.0.0/AppPartyHistoryClass/components/partyClassAdd.vue
rename to packages/party/AppPartyHistoryClass/components/partyClassAdd.vue
diff --git a/packages/3.0.0/AppPartyHistoryClass/components/seriesAdd.vue b/packages/party/AppPartyHistoryClass/components/seriesAdd.vue
similarity index 100%
rename from packages/3.0.0/AppPartyHistoryClass/components/seriesAdd.vue
rename to packages/party/AppPartyHistoryClass/components/seriesAdd.vue
diff --git a/packages/3.0.0/AppPartyHistoryClass/components/seriesManage.vue b/packages/party/AppPartyHistoryClass/components/seriesManage.vue
similarity index 100%
rename from packages/3.0.0/AppPartyHistoryClass/components/seriesManage.vue
rename to packages/party/AppPartyHistoryClass/components/seriesManage.vue
diff --git a/packages/3.0.0/AppQuestionBank/AppQuestionBank.vue b/packages/party/AppQuestionBank/AppQuestionBank.vue
similarity index 100%
rename from packages/3.0.0/AppQuestionBank/AppQuestionBank.vue
rename to packages/party/AppQuestionBank/AppQuestionBank.vue
diff --git a/packages/3.0.0/AppQuestionBank/components/questionBankAdd.vue b/packages/party/AppQuestionBank/components/questionBankAdd.vue
similarity index 100%
rename from packages/3.0.0/AppQuestionBank/components/questionBankAdd.vue
rename to packages/party/AppQuestionBank/components/questionBankAdd.vue
diff --git a/packages/3.0.0/AppContentInfo/AppContentInfo.vue b/packages/publicity/AppContentInfo/AppContentInfo.vue
similarity index 100%
rename from packages/3.0.0/AppContentInfo/AppContentInfo.vue
rename to packages/publicity/AppContentInfo/AppContentInfo.vue
diff --git a/packages/3.0.0/AppContentInfo/components/Add.vue b/packages/publicity/AppContentInfo/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppContentInfo/components/Add.vue
rename to packages/publicity/AppContentInfo/components/Add.vue
diff --git a/packages/3.0.0/AppContentInfo/components/Audit.vue b/packages/publicity/AppContentInfo/components/Audit.vue
similarity index 100%
rename from packages/3.0.0/AppContentInfo/components/Audit.vue
rename to packages/publicity/AppContentInfo/components/Audit.vue
diff --git a/packages/3.0.0/AppContentInfo/components/Detail.vue b/packages/publicity/AppContentInfo/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppContentInfo/components/Detail.vue
rename to packages/publicity/AppContentInfo/components/Detail.vue
diff --git a/packages/3.0.0/AppContentInfo/components/List.vue b/packages/publicity/AppContentInfo/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppContentInfo/components/List.vue
rename to packages/publicity/AppContentInfo/components/List.vue
diff --git a/packages/3.0.0/AppContentManage/AppContentManage.vue b/packages/publicity/AppContentManage/AppContentManage.vue
similarity index 100%
rename from packages/3.0.0/AppContentManage/AppContentManage.vue
rename to packages/publicity/AppContentManage/AppContentManage.vue
diff --git a/packages/3.0.0/AppContentManage/components/Add.vue b/packages/publicity/AppContentManage/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppContentManage/components/Add.vue
rename to packages/publicity/AppContentManage/components/Add.vue
diff --git a/packages/3.0.0/AppContentManage/components/Detail.vue b/packages/publicity/AppContentManage/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppContentManage/components/Detail.vue
rename to packages/publicity/AppContentManage/components/Detail.vue
diff --git a/packages/3.0.0/AppContentManage/components/List.vue b/packages/publicity/AppContentManage/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppContentManage/components/List.vue
rename to packages/publicity/AppContentManage/components/List.vue
diff --git a/packages/wechat/AppHotTopic/AppHotTopic.vue b/packages/publicity/AppHotTopic/AppHotTopic.vue
similarity index 100%
rename from packages/wechat/AppHotTopic/AppHotTopic.vue
rename to packages/publicity/AppHotTopic/AppHotTopic.vue
diff --git a/packages/wechat/AppHotTopic/components/addHot.vue b/packages/publicity/AppHotTopic/components/addHot.vue
similarity index 100%
rename from packages/wechat/AppHotTopic/components/addHot.vue
rename to packages/publicity/AppHotTopic/components/addHot.vue
diff --git a/packages/wechat/AppHotTopic/components/hotDetail.vue b/packages/publicity/AppHotTopic/components/hotDetail.vue
similarity index 100%
rename from packages/wechat/AppHotTopic/components/hotDetail.vue
rename to packages/publicity/AppHotTopic/components/hotDetail.vue
diff --git a/packages/wechat/AppJob/AppJob.vue b/packages/publicity/AppJob/AppJob.vue
similarity index 100%
rename from packages/wechat/AppJob/AppJob.vue
rename to packages/publicity/AppJob/AppJob.vue
diff --git a/packages/wechat/AppJob/components/Add.vue b/packages/publicity/AppJob/components/Add.vue
similarity index 100%
rename from packages/wechat/AppJob/components/Add.vue
rename to packages/publicity/AppJob/components/Add.vue
diff --git a/packages/wechat/AppJob/components/AddJob.vue b/packages/publicity/AppJob/components/AddJob.vue
similarity index 100%
rename from packages/wechat/AppJob/components/AddJob.vue
rename to packages/publicity/AppJob/components/AddJob.vue
diff --git a/packages/wechat/AppJob/components/JobList.vue b/packages/publicity/AppJob/components/JobList.vue
similarity index 100%
rename from packages/wechat/AppJob/components/JobList.vue
rename to packages/publicity/AppJob/components/JobList.vue
diff --git a/packages/wechat/AppJob/components/List.vue b/packages/publicity/AppJob/components/List.vue
similarity index 100%
rename from packages/wechat/AppJob/components/List.vue
rename to packages/publicity/AppJob/components/List.vue
diff --git a/packages/3.0.0/AppNotice/AppNotice.vue b/packages/publicity/AppNotice/AppNotice.vue
similarity index 100%
rename from packages/3.0.0/AppNotice/AppNotice.vue
rename to packages/publicity/AppNotice/AppNotice.vue
diff --git a/packages/3.0.0/AppNotice/components/Add.vue b/packages/publicity/AppNotice/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppNotice/components/Add.vue
rename to packages/publicity/AppNotice/components/Add.vue
diff --git a/packages/3.0.0/AppNotice/components/Detail.vue b/packages/publicity/AppNotice/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppNotice/components/Detail.vue
rename to packages/publicity/AppNotice/components/Detail.vue
diff --git a/packages/3.0.0/AppNotice/components/List.vue b/packages/publicity/AppNotice/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppNotice/components/List.vue
rename to packages/publicity/AppNotice/components/List.vue
diff --git a/packages/wechat/AppPressCenter/AppPressCenter.vue b/packages/publicity/AppPressCenter/AppPressCenter.vue
similarity index 100%
rename from packages/wechat/AppPressCenter/AppPressCenter.vue
rename to packages/publicity/AppPressCenter/AppPressCenter.vue
diff --git a/packages/wechat/AppPressCenter/components/addArticle.vue b/packages/publicity/AppPressCenter/components/addArticle.vue
similarity index 100%
rename from packages/wechat/AppPressCenter/components/addArticle.vue
rename to packages/publicity/AppPressCenter/components/addArticle.vue
diff --git a/packages/wechat/AppPressCenter/components/addVideo.vue b/packages/publicity/AppPressCenter/components/addVideo.vue
similarity index 100%
rename from packages/wechat/AppPressCenter/components/addVideo.vue
rename to packages/publicity/AppPressCenter/components/addVideo.vue
diff --git a/packages/wechat/AppPressCenter/components/commentList.vue b/packages/publicity/AppPressCenter/components/commentList.vue
similarity index 100%
rename from packages/wechat/AppPressCenter/components/commentList.vue
rename to packages/publicity/AppPressCenter/components/commentList.vue
diff --git a/packages/wechat/AppPressCenter/components/index.js b/packages/publicity/AppPressCenter/components/index.js
similarity index 100%
rename from packages/wechat/AppPressCenter/components/index.js
rename to packages/publicity/AppPressCenter/components/index.js
diff --git a/packages/wechat/AppPressCenter/components/newsDetail.vue b/packages/publicity/AppPressCenter/components/newsDetail.vue
similarity index 100%
rename from packages/wechat/AppPressCenter/components/newsDetail.vue
rename to packages/publicity/AppPressCenter/components/newsDetail.vue
diff --git a/packages/wechat/AppPressCenter/components/newsList.vue b/packages/publicity/AppPressCenter/components/newsList.vue
similarity index 100%
rename from packages/wechat/AppPressCenter/components/newsList.vue
rename to packages/publicity/AppPressCenter/components/newsList.vue
diff --git a/packages/wechat/AppPressCenter/components/videoDetail.vue b/packages/publicity/AppPressCenter/components/videoDetail.vue
similarity index 100%
rename from packages/wechat/AppPressCenter/components/videoDetail.vue
rename to packages/publicity/AppPressCenter/components/videoDetail.vue
diff --git a/packages/jianping/AppPublicizeInformation/Add.vue b/packages/publicity/AppPublicizeInformation/Add.vue
similarity index 100%
rename from packages/jianping/AppPublicizeInformation/Add.vue
rename to packages/publicity/AppPublicizeInformation/Add.vue
diff --git a/packages/jianping/AppPublicizeInformation/AppPublicizeInformation.vue b/packages/publicity/AppPublicizeInformation/AppPublicizeInformation.vue
similarity index 100%
rename from packages/jianping/AppPublicizeInformation/AppPublicizeInformation.vue
rename to packages/publicity/AppPublicizeInformation/AppPublicizeInformation.vue
diff --git a/packages/jianping/AppPublicizeInformation/List.vue b/packages/publicity/AppPublicizeInformation/List.vue
similarity index 100%
rename from packages/jianping/AppPublicizeInformation/List.vue
rename to packages/publicity/AppPublicizeInformation/List.vue
diff --git a/packages/wechat/AppRuralTourism/AppRuralTourism.vue b/packages/publicity/AppRuralTourism/AppRuralTourism.vue
similarity index 100%
rename from packages/wechat/AppRuralTourism/AppRuralTourism.vue
rename to packages/publicity/AppRuralTourism/AppRuralTourism.vue
diff --git a/packages/wechat/AppRuralTourism/components/addProducts.vue b/packages/publicity/AppRuralTourism/components/addProducts.vue
similarity index 100%
rename from packages/wechat/AppRuralTourism/components/addProducts.vue
rename to packages/publicity/AppRuralTourism/components/addProducts.vue
diff --git a/packages/wechat/AppRuralTourism/components/addRural.vue b/packages/publicity/AppRuralTourism/components/addRural.vue
similarity index 100%
rename from packages/wechat/AppRuralTourism/components/addRural.vue
rename to packages/publicity/AppRuralTourism/components/addRural.vue
diff --git a/packages/wechat/AppRuralTourism/components/ruralList.vue b/packages/publicity/AppRuralTourism/components/ruralList.vue
similarity index 100%
rename from packages/wechat/AppRuralTourism/components/ruralList.vue
rename to packages/publicity/AppRuralTourism/components/ruralList.vue
diff --git a/packages/3.0.0/AppShowProduce/AppShowProduce.vue b/packages/publicity/AppShowProduce/AppShowProduce.vue
similarity index 100%
rename from packages/3.0.0/AppShowProduce/AppShowProduce.vue
rename to packages/publicity/AppShowProduce/AppShowProduce.vue
diff --git a/packages/3.0.0/AppShowProduce/components/List.vue b/packages/publicity/AppShowProduce/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppShowProduce/components/List.vue
rename to packages/publicity/AppShowProduce/components/List.vue
diff --git a/packages/3.0.0/AppVillageAuxiliarPolice/AppVillageAuxiliarPolice.vue b/packages/publicity/AppVillageAuxiliarPolice/AppVillageAuxiliarPolice.vue
similarity index 100%
rename from packages/3.0.0/AppVillageAuxiliarPolice/AppVillageAuxiliarPolice.vue
rename to packages/publicity/AppVillageAuxiliarPolice/AppVillageAuxiliarPolice.vue
diff --git a/packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue b/packages/publicity/AppVillageAuxiliarPolice/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue
rename to packages/publicity/AppVillageAuxiliarPolice/components/Add.vue
diff --git a/packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue b/packages/publicity/AppVillageAuxiliarPolice/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue
rename to packages/publicity/AppVillageAuxiliarPolice/components/List.vue
diff --git a/packages/wechat/AppVillageInfo/AppVillageInfo.vue b/packages/publicity/AppVillageInfo/AppVillageInfo.vue
similarity index 100%
rename from packages/wechat/AppVillageInfo/AppVillageInfo.vue
rename to packages/publicity/AppVillageInfo/AppVillageInfo.vue
diff --git a/packages/wechat/AppVillageInfo/components/Add.vue b/packages/publicity/AppVillageInfo/components/Add.vue
similarity index 100%
rename from packages/wechat/AppVillageInfo/components/Add.vue
rename to packages/publicity/AppVillageInfo/components/Add.vue
diff --git a/packages/wechat/AppVillageInfo/components/Comments.vue b/packages/publicity/AppVillageInfo/components/Comments.vue
similarity index 100%
rename from packages/wechat/AppVillageInfo/components/Comments.vue
rename to packages/publicity/AppVillageInfo/components/Comments.vue
diff --git a/packages/wechat/AppVillageInfo/components/Detail.vue b/packages/publicity/AppVillageInfo/components/Detail.vue
similarity index 100%
rename from packages/wechat/AppVillageInfo/components/Detail.vue
rename to packages/publicity/AppVillageInfo/components/Detail.vue
diff --git a/packages/wechat/AppVillageInfo/components/Event.vue b/packages/publicity/AppVillageInfo/components/Event.vue
similarity index 100%
rename from packages/wechat/AppVillageInfo/components/Event.vue
rename to packages/publicity/AppVillageInfo/components/Event.vue
diff --git a/packages/3.0.0/AppVillageIntroduction/AppVillageIntroduction.vue b/packages/publicity/AppVillageIntroduction/AppVillageIntroduction.vue
similarity index 100%
rename from packages/3.0.0/AppVillageIntroduction/AppVillageIntroduction.vue
rename to packages/publicity/AppVillageIntroduction/AppVillageIntroduction.vue
diff --git a/packages/3.0.0/AppVillageIntroduction/components/Add.vue b/packages/publicity/AppVillageIntroduction/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppVillageIntroduction/components/Add.vue
rename to packages/publicity/AppVillageIntroduction/components/Add.vue
diff --git a/packages/3.0.0/AppVillageIntroduction/components/Detail.vue b/packages/publicity/AppVillageIntroduction/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppVillageIntroduction/components/Detail.vue
rename to packages/publicity/AppVillageIntroduction/components/Detail.vue
diff --git a/packages/3.0.0/AppVillageIntroduction/components/List.vue b/packages/publicity/AppVillageIntroduction/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppVillageIntroduction/components/List.vue
rename to packages/publicity/AppVillageIntroduction/components/List.vue
diff --git a/packages/3.0.0/AppVillageRegulations/AppVillageRegulations.vue b/packages/publicity/AppVillageRegulations/AppVillageRegulations.vue
similarity index 100%
rename from packages/3.0.0/AppVillageRegulations/AppVillageRegulations.vue
rename to packages/publicity/AppVillageRegulations/AppVillageRegulations.vue
diff --git a/packages/3.0.0/AppVillageRegulations/components/Add.vue b/packages/publicity/AppVillageRegulations/components/Add.vue
similarity index 100%
rename from packages/3.0.0/AppVillageRegulations/components/Add.vue
rename to packages/publicity/AppVillageRegulations/components/Add.vue
diff --git a/packages/3.0.0/AppVillageRegulations/components/Detail.vue b/packages/publicity/AppVillageRegulations/components/Detail.vue
similarity index 100%
rename from packages/3.0.0/AppVillageRegulations/components/Detail.vue
rename to packages/publicity/AppVillageRegulations/components/Detail.vue
diff --git a/packages/3.0.0/AppVillageRegulations/components/List.vue b/packages/publicity/AppVillageRegulations/components/List.vue
similarity index 100%
rename from packages/3.0.0/AppVillageRegulations/components/List.vue
rename to packages/publicity/AppVillageRegulations/components/List.vue
diff --git a/packages/wechat/AppAsk/AppAsk.vue b/packages/wechat/AppAsk/AppAsk.vue
deleted file mode 100644
index 46d74cb9..00000000
--- a/packages/wechat/AppAsk/AppAsk.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<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 Detail from './components/Detail'
-  import List from './components/List'
-
-  export default {
-    name: 'AppAsk',
-    label: '随心问',
-
-    props: {
-      instance: Function,
-      dict: Object
-    },
-
-    data () {
-      return {
-        component: 'List',
-        params: {},
-        include: []
-      }
-    },
-
-    components: {
-      Detail,
-      List
-    },
-
-    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/packages/wechat/AppAsk/components/Detail.vue b/packages/wechat/AppAsk/components/Detail.vue
deleted file mode 100644
index 72692977..00000000
--- a/packages/wechat/AppAsk/components/Detail.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<template>
-  <ai-detail>
-    <template slot="title">
-      <ai-title title="随心问详情" isShowBack isShowBottomBorder @onBackClick="cancel(true)">
-        <template slot="rightBtn">
-          <el-button
-              @click="close"
-              size="small"
-              v-if="info.status !== '2'"
-              icon="iconfont iconReject">
-            关闭留言
-          </el-button>
-          <el-button
-              size="small"
-              type="primary"
-              v-if="info.status !== '2'"
-              icon="iconfont iconRegister"
-              @click="isShow = true">
-            回复留言
-          </el-button>
-        </template>
-      </ai-title>
-    </template>
-    <template slot="content">
-      <ai-card title="基本信息">
-        <template #content>
-          <ai-wrapper
-              label-width="56px">
-            <ai-info-item label="标题" isLine>{{ info.title }}</ai-info-item>
-            <ai-info-item label="提问状态">
-              <span :style="{color: info.status === '0' ? '#F79300' : '#222'}">{{
-                  dict.getLabel('leaveMessageStatus', info.status)
-                }}</span>
-            </ai-info-item>
-            <ai-info-item label="提问编号">{{ info.msgCode }}</ai-info-item>
-            <ai-info-item label="提问人">{{ info.leaveName }}</ai-info-item>
-            <ai-info-item label="提问时间">{{ info.createTime }}</ai-info-item>
-            <ai-info-item label="提问内容" isLine>{{ info.content }}</ai-info-item>
-          </ai-wrapper>
-        </template>
-      </ai-card>
-      <ai-card title="沟通记录">
-        <template #content>
-          <div class="comments">
-            <div class="comments-item" v-for="(item, index) in info.appLeaveMessageReplyList" :key="index"
-                 :class="[item.userType === '1' ? 'comments-item__replay' : '']">
-              <div class="comments-item__body">
-                <div class="comments-item__top">
-                  <img class="comments-item__avatar" v-if="item.headPortrait" :src="item.headPortrait">
-                  <span v-else>{{ item.createUserName.substr(item.createUserName.length - 2) }}</span>
-                  <div class="comments-item__middle">
-                    <div class="comments-item__middle--top">
-                      <h2 v-if="item.userType === '0'">{{ item.createUserName }}</h2>
-                      <h3 v-if="item.userType === '1'">{{ item.createUnitName }}</h3>
-                      <h2 v-if="item.userType === '1'">回复</h2>
-                    </div>
-                    <p v-if="item.userType === '1'">操作员：{{ item.createUserName }}{{ item.createUserPhone }}</p>
-                  </div>
-                  <i class="comment-item__date">{{ item.createTime }}</i>
-                </div>
-                <div class="comments-item__content">
-                  <p>{{ item.content }}</p>
-                  <ai-uploader :instance="instance" :disabled="true" v-model="item.images"></ai-uploader>
-                </div>
-              </div>
-            </div>
-            <div slot="empty" class="no-data" style="height:160px;" v-if="!info.appLeaveMessageReplyList.length"></div>
-          </div>
-        </template>
-      </ai-card>
-      <ai-dialog
-          :visible.sync="isShow"
-          width="800px"
-          title="回复留言"
-          @close="onClose"
-          @onConfirm="confirm">
-        <el-form label-width="90px" :model="form" ref="form">
-          <el-form-item label="回复内容" prop="content" :rules="[{required: true, message: '请输入回复内容', trigger: 'blur'}]">
-            <el-input :maxlength="500" show-word-limit type="textarea" :rows="5" v-model="form.content"
-                      placeholder="请输入回复内容"></el-input>
-          </el-form-item>
-          <el-form-item label="图片附件" prop="imgs">
-            <ai-uploader :instance="instance" v-model="form.images" :limit="9"></ai-uploader>
-          </el-form-item>
-        </el-form>
-      </ai-dialog>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-import {mapState} from 'vuex'
-
-export default {
-  name: 'detail',
-
-  props: {
-    instance: Function,
-    dict: Object,
-    params: Object
-  },
-
-  data() {
-    return {
-      isShow: false,
-      info: {
-        appLeaveMessageReplyList: []
-      },
-      form: {
-        explain: '',
-        images: []
-      },
-      imgs: []
-    }
-  },
-
-  computed: {
-    ...mapState(['user'])
-  },
-  created() {
-    this.getInfo(this.params.id)
-  },
-  methods: {
-    getInfo(id) {
-      this.instance.post(`/app/appleavemessage/queryDetailById?id=${id}`).then(res => {
-        if (res?.data) {
-          this.info = res.data
-          this.info.appLeaveMessageReplyList = res.data.appLeaveMessageReplyList.map(item => {
-            item.images = JSON.parse(item.images).map(e => ({
-              ...e,
-              url: e.accessUrl || e.url || e?.file?.accessUrl
-            }))
-            return item
-          })
-        }
-      })
-    },
-    onClose() {
-      this.form.explain = ''
-    },
-    close() {
-      this.$confirm('确定关闭该数据？').then(() => {
-        this.instance.post(`/app/appleavemessage/addOrUpdate`, {
-          id: this.params.id,
-          status: 2
-        }).then(res => {
-          if (res.code == 0) {
-            this.$message.success('关闭成功！')
-            this.cancel(true)
-          }
-        })
-      })
-    },
-    confirm() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.instance.post(`/app/appleavemessagereply/addOrUpdate`, {
-            content: this.form.content,
-            msgCode: this.info.msgCode,
-            userType: '1',
-            createUnitId: this.user.info.unitId,
-            createUnitName: this.user.info.unitName,
-            images: this.form.images.length ? JSON.stringify(this.form.images) : '[]'
-          }).then(res => {
-            if (res.code == 0) {
-              this.isShow = false
-              this.$message.success('回复成功')
-              this.getInfo(this.params.id)
-            }
-          })
-        }
-      })
-    },
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'list',
-        isRefresh: !!isRefresh
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.comments {
-  .comments-item__body, .comments-replay__item {
-    margin-bottom: 24px;
-    padding: 16px 40px 10px 16px;
-  }
-
-  .comments-item__replay {
-    background: #F5F6F9;
-  }
-
-  .comments-item__top {
-    display: flex;
-    align-items: center;
-
-    .comments-item__middle {
-      flex: 1;
-      margin-bottom: 6px;
-
-      .comments-item__middle--top {
-        display: flex;
-        align-items: center;
-
-        h2, h3 {
-          font-size: 14px;
-          font-weight: 700;
-          color: #222;
-        }
-
-        h3 {
-          margin-right: 6px;
-          color: #2266FF;
-        }
-      }
-
-      p {
-        margin-top: 4px;
-        color: #888888;
-        font-size: 12px;
-      }
-    }
-
-    .comment-item__date {
-      color: #888888;
-      font-size: 14px;
-      font-style: normal;
-    }
-
-    .comments-item__avatar, span {
-      flex-shrink: 1;
-      width: 40px;
-      height: 40px;
-      line-height: 40px;
-      margin-right: 8px;
-      text-align: center;
-      border-radius: 50%;
-      color: #fff;
-      font-size: 14px;
-      background: #2266FF;
-    }
-  }
-
-  .comments-item__content {
-    padding-left: 48px;
-
-    p {
-      margin-bottom: 16px;
-      line-height: 22px;
-      color: #222222;
-      font-size: 14px;
-    }
-  }
-
-  .comments-item__body {
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-}
-</style>
diff --git a/packages/wechat/AppAsk/components/List.vue b/packages/wechat/AppAsk/components/List.vue
deleted file mode 100644
index 2dec4beb..00000000
--- a/packages/wechat/AppAsk/components/List.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-<template>
-  <ai-list class="AppAsk">
-    <template slot="title">
-      <ai-title title="随心问" isShowBottomBorder></ai-title>
-    </template>
-    <template slot="content">
-      <ai-search-bar class="search-bar">
-        <template #left>
-          <el-radio-group size="small" v-model="search.status" @change="search.current = 1, getList()">
-            <el-radio-button  
-              v-for="(item, index) in dict.getDict('leaveMessageStatus')"
-              :key="index"
-              :label="item.dictValue"
-              size="small">
-              {{ item.dictName }}
-            </el-radio-button>
-          </el-radio-group>
-        </template>
-        <template slot="right">
-          <el-input
-            v-model="search.title"
-            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="options" width="120px" fixed="right" label="操作" align="center">
-          <template slot-scope="{ row }">
-            <span class="table-btn" title="详情" @click="toDetail(row.id)">详情</span>
-          </template>
-        </el-table-column>
-        <el-table-column slot="publicity" width="120px" fixed="right" label="是否公示" align="center">
-          <template slot-scope="{ row }">
-            <el-switch v-model="row.isPublic" active-value="1" @change="() => onSwitchChange(row.id, row.isPublic)"></el-switch>
-          </template>
-        </el-table-column>
-      </ai-table>
-    </template>
-  </ai-list>
-</template>
-
-<script>
-  export default {
-    name: 'List',
-
-    props: {
-      instance: Function,
-      dict: Object
-    },
-
-    data () {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          status: 0,
-          title: ''
-        },
-        currIndex: 0,
-        total: 10,
-        colConfigs: [
-          { prop: 'msgCode',  label: '编号' },
-          { prop: 'title', label: '标题' },
-          { prop: 'type', label: '类型', align: 'center', formart: v => this.dict.getLabel('leaveMessageType', v) },
-          { prop: 'leaveName', label: '提问人', align: 'center' },
-          { prop: 'createTime', label: '提问时间' },
-          { prop: 'lastReplyTime', label: '最后回复时间' },
-          { slot: 'publicity', label: '是否公示' },
-          { slot: 'options', label: '操作' }
-        ],
-        tableData: []
-      }
-    },
-
-    mounted () {
-      this.dict.load(['leaveMessageType', 'leaveMessageStatus']).then(() => {
-        this.getList()
-      })
-    },
-
-    methods: {
-      getList() {
-        this.instance.post(`/app/appleavemessage/list`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
-
-      onSwitchChange (id) {
-        this.instance.post(`/app/appleavemessage/public?id=${id}`).then(res => {
-          if (res.code == 0) {
-            this.getList()
-          }
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'detail',
-          params: {
-            id
-          }
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .ai-tabs {
-    display: flex;
-    align-items: center;
-    height: 40px;
-    margin-bottom: 16px;
-    border-bottom: 1px solid #eee;
-
-    span {
-      height: 100%;
-      line-height: 40px;
-      padding: 0 16px;
-      color: #888888;
-      font-size: 14px;
-      cursor: pointer;
-      user-select: none;
-      border-bottom: 1px solid transparent;
-
-      &.ai-tabs__active {
-        color: #222;
-        border-bottom: 2px solid #2266FF;
-      }
-    }
-  }
-
-  .AppAsk {
-    .table-btn {
-      margin-right: 16px;
-      color: #2266FF;
-      font-size: 14px;
-      cursor: pointer;
-
-      &:hover {
-        opacity: 0.5;
-      }
-
-      &:last-child {
-        margin-right: 0;
-      }
-    }
-  }
-</style>
diff --git a/packages/wechat/AppProjectActivities/AppProjectActivities.vue b/packages/wechat/AppProjectActivities/AppProjectActivities.vue
deleted file mode 100644
index 7f877e63..00000000
--- a/packages/wechat/AppProjectActivities/AppProjectActivities.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <ai-list v-if="!isShowDetail">
-    <template slot="title">
-      <ai-title title="专题活动" :isShowBottomBorder="false" :instance="instance" :isShowArea="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)" :is="tab.comp" v-if="currIndex === String(i)" @change="onChange" :instance="instance" :dict="dict" :permissions="permissions"/>
-        </el-tab-pane>
-      </el-tabs>
-    </template>
-  </ai-list>
-  <component v-else :is="componentName" @change="onChange" :params="params" :instance="instance" :dict="dict" :permissions="permissions"></component>
-</template>
-
-<script>
-  import Event from './components/Event'
-  import Comments from './components/Comments'
-  import Add from './components/Add'
-  import Detail from './components/Detail'
-  import { mapState } from 'vuex'
-
-  export default {
-    name: 'AppProjectActivities',
-    label: '专题活动',
-
-    components: {
-      Add,
-      Detail,
-      Event,
-      Comments
-    },
-
-    props: {
-      instance: Function,
-      dict: Object,
-      permissions: Function
-    },
-
-    computed: {
-      ...mapState(['user']),
-
-      tabs () {
-        const tabList = [
-          {label: '内容管理', name: 'Event', comp: Event, permission: 'app_appvillageinfo'},
-          {label: '评论管理', name: 'Comments', comp: Comments, permission: 'app_appvillageinfocomment'}
-        ].filter(item => {
-          return this.permissions(item.permission)
-        })
-
-        return tabList
-      }
-    },
-
-    data () {
-      return {
-        activeName: 'Event',
-        currIndex: '0',
-        componentName: '',
-        params: {},
-        isHasPermiss: true,
-        isShowDetail: false
-      }
-    },
-
-    created () {
-    },
-
-    methods: {
-      areaChange () {
-        console.log(this.$refs[this.currIndex])
-        this.$refs[this.currIndex][0].getList()
-      },
-
-      onChange (data) {
-        if (data.type === 'detail') {
-          this.componentName = 'Detail'
-          this.isShowDetail = true
-          this.params = data.params
-        }
-
-        if (data.type === 'add') {
-          this.componentName = 'Add'
-          this.isShowDetail = true
-          this.params = data.params
-        }
-
-        if (data.type === 'list') {
-          this.isShowDetail = false
-
-          this.$nextTick(() => {
-            if (data.isRefresh) {
-              // this.$refs[this.currIndex].getList()
-            }
-          })
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .no-permission__wrapper {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-    height: 100%;
-    padding-bottom: 100px;
-    font-size: 16px;
-    color: #333;
-
-    h2 {
-      font-size: 16px;
-      color: #333;
-    }
-
-    i {
-      font-style: normal;
-      color: #2771ff;
-    }
-
-    .no-permission {
-      width: 120px;
-      margin-top: 0;
-    }
-  }
-</style>
diff --git a/packages/wechat/AppProjectActivities/components/Add.vue b/packages/wechat/AppProjectActivities/components/Add.vue
deleted file mode 100644
index d51ae4be..00000000
--- a/packages/wechat/AppProjectActivities/components/Add.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <ai-detail class="add-detail">
-    <template slot="title">
-      <ai-title :title="params.id ? '编辑活动' : '添加活动'" :isShowBack="true" @onBackClick="cancel"
-                :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="title" :rules="[{required: true, message: '请输入标题', trigger: 'blur'}]">
-              <el-input v-model="form.title" clearable placeholder="请输入..." size="small" maxlength="30"
-                        show-word-limit></el-input>
-            </el-form-item>
-            <el-form-item label="活动" prop="type" :rules="[{required: true, message: '请选择活动', trigger: 'blur'}]">
-              <ai-select
-                v-model="form.type"
-                placeholder="请选择活动"
-                :selectList="$dict.getDict('activityAirticleType')"
-              ></ai-select>
-            </el-form-item>
-            <el-form-item label="摘要" prop="description" :rules="[{required: true, message: '请输入摘要', trigger: 'blur'}]">
-              <el-input v-model="form.description" clearable placeholder="请输入..." size="small" maxlength="50"
-                        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">
-              <ai-uploader
-                :isShowTip="true"
-                :instance="instance"
-                v-model="form.thumbUrl"
-                :limit="1"
-                :cropOps="cropOps"
-                is-crop>
-              </ai-uploader>
-            </el-form-item>
-          </el-form>
-        </template>
-      </ai-card>
-    </template>
-    <template slot="footer">
-      <el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
-      <el-button type="primary" size="small" v-if="!params.id" @click="onSubmit(2)">发布</el-button>
-      <el-button size="small" @click="onSubmit(1)">保存</el-button>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-  import {mapState} from 'vuex'
-
-  export default {
-    name: 'Add',
-
-    props: {
-      dict: Object,
-      params: Object,
-      instance: Function,
-      areaId: String
-    },
-
-    data() {
-      return {
-        form: {
-          title: '',
-          type: '',
-          description: "",
-          content: '',
-          thumbUrl: []
-        },
-        isDetail: true,
-      }
-    },
-
-    computed: {
-      ...mapState(['user']),
-      cropOps(){
-        return {
-          width: "336px",
-          height: "210px"
-        }
-      }
-    },
-
-    created() {
-      if (!!this.params.id) {
-        this.getInfo()
-      }
-    },
-
-    methods: {
-      getInfo() {
-        this.instance.post(`/app/appactivity/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) : []
-          }
-        })
-      },
-
-      onSubmit(index) {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            if (!this.id) {
-              if (index == 2) {
-                this.form.status = 1
-              } else {
-                this.form.status = 0
-              }
-            }
-            this.instance.post(`/app/appactivity/addOrUpdate`, {
-              ...this.form,
-              areaId: this.areaId,
-              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 ? '编辑成功' : ( index==1 ? "保存成功" : "发布成功"))
-                setTimeout(() => {
-                  this.cancel(true)
-                }, 800)
-              }
-            })
-          }
-        })
-      },
-
-      cancel(isRefresh) {
-        this.$emit('change', {
-          type: 'list',
-          isRefresh: isRefresh ? true : false
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .add-detail {
-    height: 100%;
-    overflow: hidden;
-  }
-</style>
diff --git a/packages/wechat/AppProjectActivities/components/Comments.vue b/packages/wechat/AppProjectActivities/components/Comments.vue
deleted file mode 100644
index 491fc93e..00000000
--- a/packages/wechat/AppProjectActivities/components/Comments.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <ai-list class="comments" :isTabs="true">
-    <template slot="content">
-      <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 prop="type" slot="options" label="评论明细">
-            <div slot-scope="scope">
-              <el-row type="flex" justify="space-between">
-                <p class="comment_p">来自《{{ scope.row.title }}》</p>
-                <span title="删除" style="cursor: pointer;color: #26f;user-select: none;" @click="remove(scope.row.id)">删除</span>
-              </el-row>
-              <div style="display: flex;">
-                <b slot="label">回复内容:</b>
-                <ai-audio single-play v-if="scope.row.audioFile" :src="scope.row.audioFile"/>
-                <div v-html="scope.row.content" style="white-space: pre-wrap;"></div>
-              </div>
-              <p style="float:left;padding-right:8px;"><span style="font-weight:bold;padding-right:8px;">回复人:</span>{{ scope.row.createUser }}
-              </p>
-              <p style="float:left;">{{ scope.row.createDate }}</p>
-            </div>
-          </el-table-column>
-        </ai-table>
-      </div>
-    </template>
-  </ai-list>
-</template>
-
-<script>
-  import { mapState } from 'vuex'
-
-  export default {
-    name: 'JoinEvent',
-
-    props: {
-      instance: Function,
-      dict: Object,
-      areaId: String,
-      permissions: Function
-    },
-
-    computed: {
-      ...mapState(['user']),
-
-      colConfigs() {
-        return [
-          { slot: 'options' }
-        ]
-      }
-    },
-
-    data () {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          status: ''
-        },
-        total: 0,
-        ids: [],
-        tableData: [],
-        orderDetail: {}
-      }
-    },
-
-    created () {
-      this.getList()
-    },
-
-    methods: {
-      getList () {
-        this.instance.post(`/app/appactivitycomment/list`, null, {
-          params: {
-            ...this.search,
-            areaId: this.areaId
-          }
-        }).then(res => {
-          if (res.data) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
-
-      remove (id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appactivitycomment/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .join-event {
-    ::v-deep th {
-      font-weight: bold!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/packages/wechat/AppProjectActivities/components/Detail.vue b/packages/wechat/AppProjectActivities/components/Detail.vue
deleted file mode 100644
index 69826738..00000000
--- a/packages/wechat/AppProjectActivities/components/Detail.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<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">活动：{{ dict.getLabel("activityAirticleType",info.type)}}</p>
-        </template>
-        <template #content>
-          <p class="wrap">摘要：{{info.description}}</p>
-          <ai-article :value="info.content"></ai-article>
-          <ai-file-list v-if="info.files && info.files.length" :fileList="info.files"
-                        :fileOps="{name: 'fileName', size: 'postfix'}"></ai-file-list>
-        </template>
-      </ai-card>
-      <ai-card title="封面信息" v-if="info.thumbUrl">
-        <template slot="content">
-          <ai-wrapper label-width="40px">
-            <ai-info-item label="封面">
-              <img class="cover" :src="info.thumbUrl[0].url" v-viewer>
-            </ai-info-item>
-          </ai-wrapper>
-        </template>
-      </ai-card>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-  import Viewer from 'v-viewer' ;
-  import Vue from 'vue' ;
-
-  Vue.use(Viewer);
-  export default {
-    name: 'detail',
-
-    props: {
-      instance: Function,
-      dict: Object,
-      permissions: Function,
-      params: Object
-    },
-
-    data() {
-      return {
-        info: {}
-      }
-    },
-
-    mounted() {
-      this.dict.load("activityAirticleType").then(() => this.getInfo())
-    },
-
-    methods: {
-      getInfo() {
-        this.instance.post(`/app/appactivity/queryDetailById?id=${this.params.id}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            if (res.data.thumbUrl) {
-              this.info.thumbUrl = JSON.parse(res.data.thumbUrl)
-            }
-          }
-        })
-      },
-
-      onBack() {
-        this.$emit('change', {
-          type: 'list'
-        })
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .cover {
-    display: block;
-    width: 320px;
-    height: 180px;
-  }
-
-  .wrap {
-    font-size: 16px;
-    color: #2D4C86;
-    line-height: 32px;
-    background: #F5F6F9;
-    box-sizing: border-box;
-    padding: 24px 40px;
-  }
-
-  .subTitle {
-    text-align: center;
-    font-size: 12px;
-    font-weight: normal;
-  }
-</style>
diff --git a/packages/wechat/AppProjectActivities/components/Event.vue b/packages/wechat/AppProjectActivities/components/Event.vue
deleted file mode 100644
index 08542643..00000000
--- a/packages/wechat/AppProjectActivities/components/Event.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <ai-list class="join-event" :isTabs="true">
-    <template slot="content">
-      <ai-search-bar>
-        <template slot="left">
-          <el-button :disabled="!permissions('app_appactivity_edit')" icon="iconfont iconAdd" type="primary" size="small" @click="add">添加</el-button>
-        </template>
-        <template slot="right">
-          <el-input
-            placeholder="请输入标题"
-            size="small"
-            clearable
-            v-model="search.title"
-            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 }">
-              <div class="table-options">
-                <el-button
-                  type="text"
-                  @click="publish(row)"
-                  :title="row.status === '1' ? '取消发布' : '发布'"
-                  :disabled="!permissions('app_appvillageinfo_edit')">
-                  {{ row.status === '1' ? '取消发布' : '发布' }}
-                </el-button>
-                <el-button
-                  type="text"
-                  title="详情"
-                  @click="toDetail(row.id)"
-                  :disabled="!permissions('app_appactivity_detail')">
-                  详情
-                </el-button>
-                <el-button
-                  type="text"
-                  title="编辑"
-                  @click="toAdd(row.id)"
-                  :disabled="!permissions('app_appactivity_edit')">
-                  编辑
-                </el-button>
-                <el-button
-                  @click="remove(row.id)"
-                  type="text"
-                  title="删除"
-                  :disabled="!permissions('app_appactivity_del')">
-                  删除
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </ai-table>
-      </div>
-    </template>
-  </ai-list>
-</template>
-
-<script>
-  import { mapState } from 'vuex'
-
-  export default {
-    name: 'ReportEvent',
-    props: {
-      instance: Function,
-      dict: Object,
-      areaId: String,
-      permissions: Function
-    },
-
-    computed: {
-      ...mapState(['user']),
-
-      colConfigs() {
-        return [
-          { prop: 'title', label: '标题'},
-          { prop: 'type', label: '活动名称',render:(h,{row})=>[<span>{this.dict.getLabel('activityAirticleType', row.type)}</span>]},
-          { prop: 'readCount', label: '浏览数', align: 'center' },
-          { prop: 'commentCount', label: '评论数', align: 'center' },
-          { prop: 'createDate', label: '创建时间'},
-          { prop: 'status', label: '发布状态',render:(h,{row})=>[<span>{this.dict.getLabel('villInfoStatus', row.status)}</span>]},
-          { slot: 'options', label: '操作' }
-        ]
-      }
-    },
-
-    data () {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          title: ''
-        },
-        total: 0,
-        ids: [],
-        tableData: [],
-      }
-    },
-
-    created () {
-      this.dict.load("activityAirticleType",'villInfoStatus').then(() => this.getList())
-    },
-
-    methods: {
-      getList () {
-        this.instance.post(`/app/appactivity/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.$confirm(`是否${params.status === '1' ? '取消发布' : '发布'}该条数据?`).then(() => {
-          this.instance.post(`/app/appactivity/updateCountYardstatus`, {
-            id: params.id,
-            status: params.status === '1' ? 0 : 1
-          }).then(res => {
-            if (res.code == 0) {
-              this.$message.success(`${params.status === '1' ? '取消发布' : '发布'}成功！`)
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toAdd (id) {
-        this.$emit('change', {
-          type: 'add',
-          params: {
-            id
-          }
-        })
-      },
-
-      add () {
-        this.$emit('change', {
-          type: 'add',
-          params: {
-            id: ''
-          }
-        })
-      },
-
-      toEdit (id) {
-        this.$emit('change', {
-          type: 'add',
-          params: {
-            type: 'ReportAdd',
-            id
-          }
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'detail',
-          params: {
-            type: 'eventDetail',
-            id
-          }
-        })
-      },
-
-      remove (id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appactivity/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .join-event {
-    height: 100%;
-  }
-</style>
diff --git a/packages/wechat/AppReportServe/AppReportServe.vue b/packages/wechat/AppReportServe/AppReportServe.vue
deleted file mode 100644
index a50f0b3d..00000000
--- a/packages/wechat/AppReportServe/AppReportServe.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <ai-list class="AppReportServe" v-if="showList">
-    <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" :name="String(i)">
-          <component :is="tab.comp" v-if="currIndex === String(i)" :ref="currIndex" :instance="instance" :dict="dict" @change="changeDetail"></component>
-        </el-tab-pane>
-      </el-tabs>
-    </template>
-  </ai-list>
-
-  <component v-else @change="changeDetail" :is="componentName" :params="params" :instance="instance" :dict="dict"></component>
-</template>
-
-<script>
-import ActiveList from './components/ActiveList.vue'
-import ActiveAdd from './components/ActiveAdd.vue'
-import ActiveEdit from './components/ActiveEdit.vue'
-import ActiveDetail from './components/ActiveDetail.vue'
-import DataList from './components/DataList.vue'
-
-export default {
-  label: '报到服务',
-  name: 'AppReportServe',
-  // 组件
-  components: {
-    ActiveList,
-    ActiveAdd,
-    ActiveEdit,
-    ActiveDetail,
-    
-    DataList,
-  },
-  props: {
-    instance: Function,
-    permissions: Function,
-    dict: Object,
-  },
-  data() {
-    return {
-      currIndex: '0',
-      showList: true,
-      componentName: '',
-      params: {},
-    }
-  },
-  // 计算
-  computed: {
-    tabs() {
-      return [
-        {
-          label: '活动管理',
-          name: 'ActiveList',
-          comp: ActiveList,
-        },
-        {
-          label: '报到数据',
-          name: 'DataList',
-          comp: DataList,
-        },
-      ]
-    },
-  },
-  // 监听
-  watch: {},
-  // 实例创建后
-  created() {},
-  // 实例渲染后
-  mounted() {},
-  // 方法
-  methods: {
-    changeDetail(data) {
-      if (data.type === 'ActiveList') {
-        this.showList = false
-        this.componentName = 'ActiveList'
-        this.params = data.params
-      }
-      if (data.type === 'ActiveAdd') {
-        this.showList = false
-        this.componentName = 'ActiveAdd'
-        this.params = data.params
-      }
-
-      if (data.type === 'ActiveEdit') {
-        this.showList = false
-        this.componentName = 'ActiveEdit'
-        this.params = data.params
-      }
-      if (data.type === 'ActiveDetail') {
-        this.showList = false
-        this.componentName = 'ActiveDetail'
-        this.params = data.params
-      }
-
-      if (data.type === 'DataList') {
-        this.showList = false
-        this.componentName = 'DataList'
-        this.params = data.params
-      }
-
-      if (data.type === 'list') {
-        this.showList = true
-        this.$nextTick(() => {
-          // if (data.isRefresh) {
-          // }
-        })
-      }
-    },
-  },
-}
-</script>
-
-<style lang="scss">
-.AppReportServe {
-  width: 100%;
-  height: 100%;
-}
-</style>
diff --git a/packages/wechat/AppReportServe/components/ActiveAdd.vue b/packages/wechat/AppReportServe/components/ActiveAdd.vue
deleted file mode 100644
index 1623a73a..00000000
--- a/packages/wechat/AppReportServe/components/ActiveAdd.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-<template>
-  <ai-detail class="ActiveAdd">
-    <!-- 返回按钮 -->
-    <template #title>
-      <ai-title title="发起活动" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
-    </template>
-
-    <!-- 内容 -->
-    <template #content>
-      <el-form class="el-form" :model="formData" ref="ruleForm" :rules="formRules" label-width="100px" label-suffix="：" align-items="center">
-        <ai-card title="活动信息">
-          <div slot="content" class="ai-content">
-            <!-- 发布地区 -->
-            <el-form-item label="发布地区" prop="areaId" class="line">
-              <ai-area-select always-show clearable :instance="instance" v-model="formData.areaId" :areaLevel="5" size="small" @fullname="(name) => (areaName = name)" :disabled-level="user.info.areaList.length"> </ai-area-select>
-            </el-form-item>
-
-            <!-- 标题 -->
-            <el-form-item label="标题" prop="title" class="line">
-              <el-input placeholder="请输入..." v-model="formData.title" show-word-limit maxlength="60" size="small" clearable></el-input>
-            </el-form-item>
-
-            <div class="float">
-              <!-- 活动时间 -->
-              <el-form-item label="活动时间" prop="beginTime">
-                <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="formData.beginTime" type="datetime" placeholder="选择日期时间" size="small"> </el-date-picker>
-              </el-form-item>
-
-              <!-- 至 -->
-              <el-form-item label="至" prop="endTime">
-                <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="formData.endTime" type="datetime" placeholder="选择日期" size="small"> </el-date-picker>
-              </el-form-item>
-            </div>
-
-            <!-- 活动地点 -->
-            <el-form-item label="活动地点" prop="address" class="line">
-              <el-input placeholder="请输入..." v-model="formData.address" show-word-limit maxlength="20" size="small" clearable></el-input>
-            </el-form-item>
-
-            <!-- 参与名额 -->
-            <el-form-item label="参与名额" prop="total" class="width">
-              <el-input placeholder="请输入..." v-model="formData.total" size="small" clearable oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-              <span class="text">"0"表示不限制活动报名人数</span>
-            </el-form-item>
-
-            <!-- 截止日期 -->
-            <el-form-item label="截止日期" prop="stopSignupTime" class="line">
-              <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="formData.stopSignupTime" type="datetime" placeholder="选择日期" size="small"> </el-date-picker>
-            </el-form-item>
-
-            <div class="float">
-              <!-- 联系人 -->
-              <el-form-item label="联系人" prop="contactPerson" class="width">
-                <el-input placeholder="请输入..." v-model="formData.contactPerson" size="small" clearable></el-input>
-              </el-form-item>
-
-              <!-- 联系电话 -->
-              <el-form-item label="联系电话" prop="contactPhone" class="phonenumber">
-                <el-input placeholder="联系电话..." v-model.number="formData.contactPhone" size="small" clearable></el-input>
-              </el-form-item>
-            </div>
-
-            <!-- 活动介绍 -->
-            <el-form-item label="活动介绍" prop="content" class="line">
-              <ai-editor v-model="formData.content" :instance="instance" />
-            </el-form-item>
-
-            <!-- 略缩图 -->
-            <el-form-item label="略缩图" prop="imgUrl" class="line">
-              <ai-uploader :isShowTip="true" :instance="instance" v-model="formData.imgUrl" :limit="1" :cropOps="cropOps" is-crop>
-                <template slot="tips">
-                  <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
-                  <p>图片比例：1.6：1</p>
-                </template>
-              </ai-uploader>
-            </el-form-item>
-          </div>
-          <!-- / -->
-        </ai-card>
-      </el-form>
-    </template>
-
-    <!-- 底部按钮 -->
-    <template #footer>
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="confirm('ruleForm')">提交</el-button>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-
-export default {
-  name: 'ActiveAdd',
-  components: {},
-  props: { instance: Function, dict: Object, params: Object, disabledLevel: Number },
-  data() {
-    return {
-      formData: {
-        areaId: '',
-        title: '',
-        beginTime: '',
-        endTime: '',
-        address: '',
-        stopSignupTime: '',
-        total: '',
-        contactPerson: '',
-        contactPhone: '',
-        content: '',
-        imgUrl: [],
-      },
-      id: '',
-    }
-  },
-  computed: {
-    ...mapState(['user']),
-
-    isEdit() {
-      return !!this.params.id
-    },
-
-    cropOps() {
-      return {
-        width: '336px',
-        height: '210px',
-      }
-    },
-
-    formRules() {
-      return {
-        areaId: [
-          { required: true, message: '请选择发布地区', trigger: 'change' },
-          {
-            validator: (r, v, cb) => (/0{3}$/g.test(v) ? cb('请选择到村') : cb()),
-          },
-        ],
-        title: [{ required: true, message: '请输入标题', trigger: 'change' }],
-        beginTime: [{ required: true, message: '请选择活动时间', trigger: 'change' }],
-        endTime: [{ required: true, message: '请选择至', trigger: 'change' }],
-        address: [{ required: true, message: '请输入活动地点', trigger: 'change' }],
-        stopSignupTime: [{ required: true, message: '请选择截止日期', trigger: 'change' }],
-        total: [{ required: true, message: '请输入参与名额', trigger: 'change' }],
-        contactPerson: [{ required: true, message: '请输入联系人', trigger: 'change' }],
-        contactPhone: [{ required: true, message: '请输入联系电话', trigger: 'change' }],
-        content: [{ required: true, message: '请输入活动介绍', trigger: 'change' }],
-        imgUrl: [{ required: true, message: '请上传图片', trigger: 'change' }],
-      }
-    },
-  },
-  watch: {},
-  created() {
-    this.formData.areaId = this.user.info.areaId
-  },
-  mounted() {},
-  methods: {
-    // 确定新增
-    confirm() {
-      this.$refs['ruleForm'].validate((valid) => {
-        if (valid) {
-          this.instance
-            .post(`/app/apppartyreport/addOrUpdate`, {
-              areaId: this.formData.areaId,
-              title: this.formData.title,
-              beginTime: this.formData.beginTime,
-              endTime: this.formData.endTime,
-              address: this.formData.address,
-
-              stopSignupTime: this.formData.stopSignupTime,
-              total: this.formData.total,
-              contactPerson: this.formData.contactPerson,
-              contactPhone: this.formData.contactPhone,
-              content: this.formData.content,
-              imgUrl: this.formData.imgUrl[0].url,
-            })
-            .then((res) => {
-              if (res.code == 0) {
-                this.$message.success('提交成功')
-                setTimeout(() => {
-                  this.cancel(true)
-                }, 1000)
-              }
-            })
-        }
-      })
-    },
-
-    // 返回按钮
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'list',
-        isRefresh: isRefresh ? true : false,
-      })
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.ActiveAdd {
-  .el-form {
-    .ai-card {
-      .ai-content {
-        .width {
-          .text {
-            margin-left: 50px;
-            color: #adadad;
-          }
-          .el-form-item__content {
-            .el-input {
-              width: 220px;
-            }
-          }
-        }
-        .float {
-          .width {
-            .el-form-item__content {
-              .el-input {
-                width: 220px;
-              }
-            }
-          }
-          display: flex;
-          .phonenumber {
-            margin-left: 45px;
-          }
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/packages/wechat/AppReportServe/components/ActiveDetail.vue b/packages/wechat/AppReportServe/components/ActiveDetail.vue
deleted file mode 100644
index 86117f22..00000000
--- a/packages/wechat/AppReportServe/components/ActiveDetail.vue
+++ /dev/null
@@ -1,391 +0,0 @@
-<template>
-  <ai-detail class="ActiveDetail">
-    <template #title>
-      <ai-title title="活动详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
-    </template>
-
-    <template #content>
-      <el-tabs v-model="activeName" tabPosition="left">
-        <el-tab-pane label="活动信息" name="active">
-          <div class="title">
-            <div class="hint">{{ formData.title }}</div>
-            <ai-wrapper label-width="60px" :columnsNumber="2">
-              <ai-info-item label="创建时间">
-                <span>{{ formData.createDate }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="创建人">
-                <span>{{ formData.createUserName }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="发布地区" style="width:100%">
-                <span>{{ formData.areaName }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="报名状态">
-                <span style="color:green" v-if="formData.signupStatus == 0">{{ dict.getLabel('partyReportSignupStatus', formData.signupStatus) }}</span>
-
-                <span style="color:red" v-else>{{ dict.getLabel('partyReportSignupStatus', formData.signupStatus) }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="活动状态">
-                <span style="color:#FDB27B" v-if="formData.actionStatus == 0">{{ dict.getLabel('partyReportActionStatus', formData.actionStatus) }}</span>
-
-                <span style="color:#588BFB" v-else-if="formData.actionStatus == 1">{{ dict.getLabel('partyReportActionStatus', formData.actionStatus) }}</span>
-
-                <span style="color:#B0B0B0" v-else>{{ dict.getLabel('partyReportActionStatus', formData.actionStatus) }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="活动时间" style="width:100%">
-                <span>{{ formData.beginTime }}至{{ formData.endTime }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="活动地点">
-                <span>{{ formData.address }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="参与名额" style="width:100%">
-                <span v-if="formData.total == '0'">不限</span>
-                <span v-else>{{ formData.total }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="截止时间">
-                <span>{{ formData.stopSignupTime }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="报名人数">
-                <span>{{ formData.signupCount }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="联系人">
-                <span>{{ formData.contactPerson }}</span>
-              </ai-info-item>
-
-              <ai-info-item label="联系电话">
-                <span>{{ formData.contactPhone }}</span>
-              </ai-info-item>
-            </ai-wrapper>
-          </div>
-
-          <div class="content">
-            <div class="hint">活动介绍</div>
-            <div class="presentation" v-html="formData.content"></div>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="报名情况" name="apply">
-          <div class="hint">报名情况</div>
-
-          <div>
-            <div class="total">
-              共<span class="Number">&nbsp; {{ totals.total }} &nbsp;</span>人报名
-            </div>
-
-            <ai-table class="ai-table" :tableData="formes" :col-configs="colConfiges" :total="total" :border="true" :current.sync="page.current" :size.sync="page.size" @getList="getInfoList" :dict="dict">
-              <el-table-column slot="signupTime" label="报名时间" align="center">
-                <template slot-scope="{ row }">{{ row.signupTime.substring(0, 10) }} </template>
-              </el-table-column>
-
-              <el-table-column slot="remark" label="报名备注" width="150px" align="center">
-                <template slot-scope="{ row }">
-                  <el-tooltip>
-                    <div slot="content" style="max-width: 850px;">{{ row.remark }}</div>
-                    <div style=" overflow: hidden;text-overflow: ellipsis; white-space: nowrap;">
-                      {{ row.remark }}
-                    </div>
-                  </el-tooltip>
-                </template>
-              </el-table-column>
-
-              <el-table-column slot="partyName" label="报名人员资料" width="200px">
-                <template slot-scope="{ row }">
-                  <span v-if="row.partyName">{{ row.partyName }}-{{ row.phone }} <br />{{ row.partyOrgName }}</span>
-                  <span v-else>{{ row.residentName }}-{{ row.phone }}<br />{{ row.partyOrgName }}</span>
-                </template>
-              </el-table-column>
-
-              <el-table-column slot="options" label="操作" fixed="right" width="100">
-                <template slot-scope="{ row }">
-                  <el-button type="text" @click="check(row.id)" v-if="row.logStatus == 1">审核日志</el-button>
-                </template>
-              </el-table-column>
-            </ai-table>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-
-      <ai-dialog title="查看活动日志" :visible.sync="dialogVisible" @onConfirm="report(forms.id)" @onCancel="onCancel" width="35%">
-        <ai-wrapper>
-          <div class="con">
-            <ai-info-item label="提交人">
-              <span v-if="forms.partyName">{{ forms.partyName }}</span>
-              <span v-else>{{ forms.residentName }}</span>
-            </ai-info-item>
-
-            <ai-info-item label="提交时间">
-              <span>{{ forms.submitTime }}</span>
-            </ai-info-item>
-          </div>
-
-          <ai-info-item label="活动总结">
-            <span>{{ forms.content }}</span>
-          </ai-info-item>
-
-          <ai-info-item label="活动照片" style="width:100%" class="photos">
-            <div v-viewer="{ movable: true }">
-              <img v-for="(item, i) in forms.files" :key="i" :src="item.accessUrl" style="width: 100px;height: 100px;margin-left: 5px;" />
-            </div>
-          </ai-info-item>
-
-          <ai-info-item label="审核结果">
-            <el-radio-group v-model="logStatus">
-              <el-radio :label="2">合格</el-radio>
-              <el-radio :label="3">不合格</el-radio>
-            </el-radio-group>
-          </ai-info-item>
-        </ai-wrapper>
-      </ai-dialog>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-export default {
-  name: 'ActiveDetail',
-  components: {},
-  props: {
-    instance: Function,
-    dict: Object,
-    params: Object,
-  },
-  data() {
-    return {
-      logStatus: 2,
-      activeName: 'active',
-      formData: [],
-      form: [],
-      forms: {},
-      totalList: '',
-      dialogVisible: false,
-      id: '',
-      formes: [],
-      colConfiges: [
-        { slot: 'signupTime', align: 'center' },
-        {
-          slot: 'partyName',
-          align: 'left',
-        },
-        { prop: 'reportType', label: '活动报道类型', align: 'center', dict: 'partyReportSignupReportType' },
-        { slot: 'remark', align: 'center' },
-        {
-          prop: 'status',
-          label: '报名状态',
-          align: 'center',
-          dict: 'partyReportPersonSignupStatus',
-        },
-        {
-          prop: 'logStatus',
-          label: '活动日志',
-          align: 'center',
-          dict: 'partyReportSignupLogStatus',
-        },
-      ],
-      page: {
-        size: 10,
-        current: 1,
-      },
-      total: 0,
-      totals: [],
-    }
-  },
-  computed: {},
-  watch: {},
-  created() {
-    this.dict.load('partyReportSignupStatus', 'partyReportActionStatus', 'partyReportSignupReportType', 'partyReportPersonSignupStatus', 'partyReportSignupLogStatus').then(() => {})
-
-    if (this.params && this.params.id) {
-      this.id = this.params.id
-      this.getList()
-      this.getInfoList()
-    }
-  },
-  mounted() {},
-  methods: {
-    getList() {
-      this.instance.post(`/app/apppartyreport/queryDetailById?id=${this.id}`).then((res) => {
-        if (res.code == 0) {
-          this.formData = res.data
-        }
-      })
-    },
-
-    getInfoList() {
-      this.instance
-        .post(`/app/apppartyreport/signupInfoPage`, null, {
-          params: {
-            ...this.page,
-            id: this.id,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.formes = res.data.records
-            this.total = res.data.total
-            this.totals = res.data
-            if (this.formes) {
-              this.formes.map((item) => {
-                item.signupTime = item.signupTime.substring(0, 10)
-              })
-            }
-          }
-        })
-    },
-
-    check(id) {
-      this.instance.post(`/app/apppartyreport/log?id=${id}`).then((res) => {
-        if (res.code == 0) {
-          this.forms = res.data
-          this.dialogVisible = true
-        }
-      })
-    },
-
-    report(id) {
-      this.instance
-        .post(`/app/apppartyreport/log-check`, {
-          id,
-          logStatus: this.logStatus,
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.form = res.data
-            this.getInfoList()
-            this.dialogVisible = false
-          }
-        })
-    },
-
-    onCancel() {
-      this.dialogVisible = false
-    },
-
-    // 返回按钮
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'list',
-        isRefresh: isRefresh ? true : false,
-      })
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.ActiveDetail {
-  .el-tabs {
-    margin-top: 20px;
-    ::v-deep.el-tabs__header {
-      .el-tabs__nav-wrap {
-        .el-tabs__nav {
-          border: 1px solid #d7d8db;
-          .el-tabs__item {
-            margin-right: 50px;
-          }
-        }
-      }
-    }
-    ::v-deep.el-tabs__content {
-      margin-left: 50px;
-      .el-tab-pane:first-child {
-        margin-bottom: 100px;
-        .title {
-          background-color: #fff;
-          padding: 0 16px 16px 16px;
-          box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
-          border-radius: 2px;
-          .hint {
-            height: 50px;
-            line-height: 50px;
-            color: #000;
-            border-bottom: 1px solid #d8dce3;
-            font-weight: 800;
-          }
-          .ai-wrapper {
-            margin-top: 10px;
-          }
-        }
-        .content {
-          margin-top: 15px;
-          background-color: #fff;
-          padding: 0 16px 16px 16px;
-          box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
-          border-radius: 2px;
-          .hint {
-            height: 50px;
-            line-height: 50px;
-            color: #000;
-            border-bottom: 1px solid #d8dce3;
-            font-weight: 800;
-          }
-          .presentation {
-            padding: 5px;
-            border-bottom: none;
-            line-height: 40px;
-            color: #000;
-            img {
-              display: block;
-            }
-          }
-        }
-      }
-
-      .el-tab-pane:nth-child(2) {
-        background-color: #fff;
-        padding: 16px;
-        box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
-        border-radius: 2px;
-        margin-bottom: 16px;
-        .total {
-          line-height: 30px;
-          font-size: 14px;
-          color: #adadad;
-          .Number {
-            color: #719ffc;
-          }
-        }
-        .ai-table {
-          .el-table {
-            .el-table__body-wrapper {
-              .el-table__body {
-                tr {
-                  td:first-child {
-                    .cell {
-                      padding-left: 0 !important;
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  .ai-dialog__wrapper {
-    ::v-deep.el-dialog {
-      .el-dialog__body {
-        .ai-wrapper {
-          .con {
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-          }
-          .ai-info-item {
-            width: 100% !important;
-          }
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/packages/wechat/AppReportServe/components/ActiveEdit.vue b/packages/wechat/AppReportServe/components/ActiveEdit.vue
deleted file mode 100644
index 4adfa215..00000000
--- a/packages/wechat/AppReportServe/components/ActiveEdit.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<template>
-  <ai-detail class="ActiveAdd">
-    <!-- 返回按钮 -->
-    <template #title>
-      <ai-title title="发起活动" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
-    </template>
-
-    <!-- 内容 -->
-    <template #content>
-      <el-form class="el-form" :model="formData" ref="ruleForm" :rules="formRules" label-width="100px" label-suffix="：" align-items="center">
-        <ai-card title="活动信息">
-          <div slot="content" class="ai-content">
-            <!-- 发布地区 -->
-            <el-form-item label="发布地区" prop="areaId" class="line">
-              <ai-area-select always-show clearable :instance="instance" v-model="formData.areaId" :areaLevel="5" size="small" @fullname="(name) => (areaName = name)" :disabled-level="user.info.areaList.length"> </ai-area-select>
-            </el-form-item>
-
-            <!-- 标题 -->
-            <el-form-item label="标题" prop="title" class="line">
-              <el-input placeholder="请输入..." v-model="formData.title" show-word-limit maxlength="60" size="small" clearable></el-input>
-            </el-form-item>
-
-            <div class="float">
-              <!-- 活动时间 -->
-              <el-form-item label="活动时间" prop="beginTime">
-                <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="formData.beginTime" type="datetime" placeholder="选择日期时间" size="small"> </el-date-picker>
-              </el-form-item>
-
-              <!-- 至 -->
-              <el-form-item label="至" prop="endTime">
-                <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="formData.endTime" type="datetime" placeholder="选择日期" size="small"> </el-date-picker>
-              </el-form-item>
-            </div>
-
-            <!-- 活动地点 -->
-            <el-form-item label="活动地点" prop="address" class="line">
-              <el-input placeholder="请输入..." v-model="formData.address" show-word-limit maxlength="20" size="small" clearable></el-input>
-            </el-form-item>
-
-            <!-- 参与名额 -->
-            <el-form-item label="参与名额" prop="total" class="width">
-              <el-input placeholder="请输入..." v-model="formData.total" size="small" clearable></el-input>
-              <span class="text">"0"表示不限制活动报名人数</span>
-            </el-form-item>
-
-            <!-- 截止日期 -->
-            <el-form-item label="截止日期" prop="stopSignupTime" class="line">
-              <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="formData.stopSignupTime" type="datetime" placeholder="选择日期" size="small"> </el-date-picker>
-            </el-form-item>
-
-            <div class="float">
-              <!-- 联系人 -->
-              <el-form-item label="联系人" prop="contactPerson" class="width">
-                <el-input placeholder="请输入..." v-model="formData.contactPerson" size="small" clearable></el-input>
-              </el-form-item>
-
-              <!-- 联系电话 -->
-              <el-form-item label="联系电话" prop="contactPhone" class="phonenumber">
-                <el-input placeholder="联系电话..." v-model="formData.contactPhone" size="small" clearable></el-input>
-              </el-form-item>
-            </div>
-
-            <!-- 活动介绍 -->
-            <el-form-item label="活动介绍" prop="content" class="line">
-              <ai-editor v-model="formData.content" :instance="instance" />
-            </el-form-item>
-
-            <!-- 略缩图 -->
-            <el-form-item label="略缩图" prop="imgUrl" class="line" v-if="isEdit != true">
-              <ai-uploader :isShowTip="true" :instance="instance" v-model="formData.imgUrl" :limit="1" :cropOps="cropOps" is-crop>
-                <template slot="tips">
-                  <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
-                  <p>图片比例：1.6：1</p>
-                </template>
-              </ai-uploader>
-            </el-form-item>
-          </div>
-          <!-- / -->
-        </ai-card>
-      </el-form>
-    </template>
-
-    <!-- 底部按钮 -->
-    <template #footer>
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="confirm('ruleForm')">提交</el-button>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-
-export default {
-  name: 'ActiveAdd',
-  components: {},
-  props: { instance: Function, dict: Object, params: Object, disabledLevel: Number },
-  data() {
-    return {
-      formData: {
-        areaId: '',
-        title: '',
-        beginTime: '',
-        endTime: '',
-        address: '',
-        stopSignupTime: '',
-        total: '',
-        contactPerson: '',
-        contactPhone: '',
-        content: '',
-        imgUrl: [],
-      },
-      id: '',
-    }
-  },
-  computed: {
-    ...mapState(['user']),
-
-    isEdit() {
-      return !!this.params.id
-    },
-
-    cropOps() {
-      return {
-        width: '336px',
-        height: '210px',
-      }
-    },
-
-    formRules() {
-      return {
-        areaId: [
-          { required: true, message: '请选择发布地区', trigger: 'change' },
-          {
-            validator: (r, v, cb) => (/0{3}$/g.test(v) ? cb('请选择到村') : cb()),
-          },
-        ],
-        title: [{ required: true, message: '请输入标题', trigger: 'change' }],
-        beginTime: [{ required: true, message: '请选择活动时间', trigger: 'change' }],
-        endTime: [{ required: true, message: '请选择至', trigger: 'change' }],
-        address: [{ required: true, message: '请输入活动地点', trigger: 'change' }],
-        stopSignupTime: [{ required: true, message: '请选择截止日期', trigger: 'change' }],
-        total: [{ required: true, message: '请输入参与名额', trigger: 'change' }],
-        contactPerson: [{ required: true, message: '请输入联系人', trigger: 'change' }],
-        contactPhone: [{ required: true, message: '请输入联系电话', trigger: 'change' }],
-        content: [{ required: true, message: '请输入活动介绍', trigger: 'change' }],
-        imgUrl: [{ required: true, message: '请上传图片', trigger: 'change' }],
-      }
-    },
-  },
-  watch: {},
-  created() {
-    this.formData.areaId = this.user.info.areaId
-    
-    if (this.params && this.params.id) {
-      this.id = this.params.id
-    }
-
-    this.getEdit()
-  },
-  mounted() {},
-  methods: {
-    getEdit() {
-      this.instance.post(`/app/apppartyreport/queryDetailById?id=${this.id}`).then((res) => {
-        if (res.code == 0) {
-          this.formData = res.data
-        }
-      })
-    },
-
-    // 确定新增
-    confirm() {
-      this.$refs['ruleForm'].validate((valid) => {
-        if (valid) {
-          this.instance
-            .post(`/app/apppartyreport/addOrUpdate`, {
-              areaId: this.formData.areaId,
-              title: this.formData.title,
-              beginTime: this.formData.beginTime,
-              endTime: this.formData.endTime,
-              address: this.formData.address,
-
-              stopSignupTime: this.formData.stopSignupTime,
-              total: this.formData.total,
-              contactPerson: this.formData.contactPerson,
-              contactPhone: this.formData.contactPhone,
-              content: this.formData.content,
-              imgUrl: this.formData.imgUrl[0].url,
-              id: this.id,
-            })
-            .then((res) => {
-              if (res.code == 0) {
-                this.$message.success('提交成功')
-                setTimeout(() => {
-                  this.cancel(true)
-                }, 1000)
-              }
-            })
-        }
-      })
-    },
-
-    // 返回按钮
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'list',
-        isRefresh: isRefresh ? true : false,
-      })
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.ActiveAdd {
-  .el-form {
-    .ai-card {
-      .ai-content {
-        .width {
-          .text {
-            margin-left: 50px;
-            color: #adadad;
-          }
-          .el-form-item__content {
-            .el-input {
-              width: 220px;
-            }
-          }
-        }
-        .float {
-          .width {
-            .el-form-item__content {
-              .el-input {
-                width: 220px;
-              }
-            }
-          }
-          display: flex;
-          .phonenumber {
-            margin-left: 45px;
-          }
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/packages/wechat/AppReportServe/components/ActiveList.vue b/packages/wechat/AppReportServe/components/ActiveList.vue
deleted file mode 100644
index a838f3c7..00000000
--- a/packages/wechat/AppReportServe/components/ActiveList.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
-  <ai-list class="ActiveList" isTabs>
-    <template #content>
-      <ai-search-bar>
-        <template #left>
-          <el-button class="btn" type="primary" icon="iconfont iconAdd" size="small" @click="AddActive(id)">发起活动
-          </el-button>
-          <ai-select v-model="search.actionStatus" placeholder="活动状态" clearable @change=";(page.current = 1), getList()"
-                     :selectList="dict.getDict('partyReportActionStatus')"></ai-select>
-          <ai-select v-model="search.signupStatus" placeholder="报名状态" clearable @change=";(page.current = 1), getList()"
-                     :selectList="dict.getDict('partyReportSignupStatus')"></ai-select>
-        </template>
-
-        <template #right>
-          <el-input v-model="search.title" size="small" placeholder="活动发布名称/发布地区" suffix-icon="iconfont iconSearch"
-                    clearable @change="page.current=1, getList()"/>
-        </template>
-      </ai-search-bar>
-
-      <ai-table class="ai-table" :tableData="tableData" :col-configs="colConfigs" :total="total"
-                :current.sync="page.current" :size.sync="page.size" @getList="getList" :dict="dict">
-        <el-table-column slot="signupStatus" label="报名状态">
-          <template slot-scope="{ row }">
-            <span style="color:green"
-                  v-if="row.signupStatus == 0">{{ dict.getLabel('partyReportSignupStatus', row.signupStatus) }}</span>
-
-            <span style="color:red"
-                  v-if="row.signupStatus == 1">{{ dict.getLabel('partyReportSignupStatus', row.signupStatus) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column slot="actionStatus" label="活动状态">
-          <template slot-scope="{ row }">
-            <span style="color:#FDB27B"
-                  v-if="row.actionStatus == 0">{{ dict.getLabel('partyReportActionStatus', row.actionStatus) }}</span>
-
-            <span style="color:#588BFB"
-                  v-if="row.actionStatus == 1">{{ dict.getLabel('partyReportActionStatus', row.actionStatus) }}</span>
-
-            <span style="color:#B0B0B0"
-                  v-if="row.actionStatus == 2">{{ dict.getLabel('partyReportActionStatus', row.actionStatus) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column slot="options" label="操作" fixed="right" align="center" width="180">
-          <template slot-scope="{ row }">
-            <el-button type="text" v-if="row.actionStatus!=2"  @click="toEdit(row.id)">编辑</el-button>
-            <el-button type="text" @click="DetailActive(row.id)">详情</el-button>
-            <el-button type="text" @click="toDelete(row.id)">删除</el-button>
-          </template>
-        </el-table-column>
-      </ai-table>
-    </template>
-  </ai-list>
-</template>
-
-<script>
-import {mapState} from 'vuex'
-
-export default {
-  name: 'ActiveList',
-  components: {},
-  props: {instance: Function, dict: Object, params: Object},
-  data() {
-    return {
-      tableData: [],
-      colConfigs: [
-        {prop: 'title', label: '活动名称', width: '270'},
-        {
-          prop: 'areaName',
-          label: '发布地区',
-          width: '200',
-        },
-        {prop: 'beginTime', label: '活动时间', width: '300'},
-        {prop: 'signupCount', label: '报名人数', align: 'center'},
-        {
-          slot: 'signupStatus',
-          align: 'center',
-        },
-        {
-          slot: 'actionStatus',
-          align: 'center',
-        },
-        {
-          slot: 'options',
-        },
-      ],
-      id: '',
-      page: {
-        size: 10,
-        current: 1,
-      },
-      total: 0,
-      search: {
-        actionStatus: '',
-        signupStatus: '',
-        title: '',
-      },
-    }
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  watch: {},
-  created() {
-    this.dict.load('partyReportActionStatus', 'partyReportSignupStatus').then(() => {
-      this.getList()
-    })
-  },
-  methods: {
-    getList() {
-      this.instance
-      .post(`/app/apppartyreport/list`, null, {
-        params: {
-          ...this.page,
-          ...this.search,
-        },
-      })
-      .then((res) => {
-        if (res.code == 0) {
-          this.tableData = res.data.records
-          this.total = res.data.total
-          res.data.records.map((item) => {
-            if (item.beginTime && item.endTime) {
-              item.beginTime = item.beginTime + '至' + item.endTime
-            }
-          })
-        }
-      })
-    },
-
-    // 编辑
-    toEdit(id) {
-      this.$emit('change', {
-        type: 'ActiveEdit',
-        params: {
-          id: id || '',
-        },
-      })
-    },
-
-    // 发起活动
-    AddActive(id) {
-      this.$emit('change', {
-        type: 'ActiveAdd',
-        params: {
-          id: id || '',
-        },
-      })
-    },
-
-    // 详情
-    DetailActive(id) {
-      this.$emit('change', {
-        type: 'ActiveDetail',
-        params: {
-          id,
-        },
-      })
-    },
-
-    // 删除
-    toDelete(id) {
-      this.$confirm('删除后不可恢复，确定删除该数据？').then(() => {
-        this.instance.post(`/app/apppartyreport/delete?ids=${id}`).then((res) => {
-          if (res.code == 0) {
-            this.$message.success('删除成功！')
-            this.getList()
-          }
-        })
-      })
-    },
-
-    // 重置
-    reset() {
-      Object.keys(this.search).forEach((e) => {
-        this.search[e] = ''
-      })
-      this.getList()
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.ActiveList {
-  height: 100%;
-  overflow: auto;
-}
-</style>
diff --git a/packages/wechat/AppReportServe/components/DataList.vue b/packages/wechat/AppReportServe/components/DataList.vue
deleted file mode 100644
index d22eee58..00000000
--- a/packages/wechat/AppReportServe/components/DataList.vue
+++ /dev/null
@@ -1,485 +0,0 @@
-<template>
-  <section class="DataDetail">
-    <ai-detail>
-      <template #content>
-        <ai-tree-menu title="应报到党组织名单" @search="(v) => $refs.gridTree.filter(v)" searchPlaceholder="请输入党组织...">
-          <ai-party-tree :instance="instance" :root="user.info.organizationId" @node-click="handleSelectGrid" :filter-node-method="handleTreeFilter" ref="gridTree"></ai-party-tree>
-        </ai-tree-menu>
-
-        <div class="echarts-content">
-          <div class="mainPane">
-            <!-- 近12个月党员活动参与情况统计 -->
-            <el-row>
-              <div class="cardPane">
-                <ai-title title="近12个月党员活动参与情况统计" />
-                <div id="numMonthsCountListChart" />
-              </div>
-            </el-row>
-
-            <!-- 总体统计和学员报到类型比例统计 -->
-            <div class="data-flex">
-              <el-date-picker type="month" size="small" v-model="search.time" value-format="yyyy-MM" clearables @change="getList().then(() => getChartData())" />
-
-              <!-- 总体统计 -->
-              <el-row class="card" type="flex">
-                <el-row class="totals" type="flex">
-                  <div class="cards eventCountMap" v-for="v in eventCountMap" :key="v.key">
-                    <b class="name-cards">{{ v.name }}</b>
-                    <b class="count" v-if="v.v1 == 'NaN%'">0</b>
-                    <b class="count" v-else>
-                      <span v-if="v.name == '活动实际参与率'">
-                        {{ v.v1.toString().replace(/(?=(?!\b)(\d{3})+$)/g, ',') }}
-                        <span class="ren">%</span>
-                      </span>
-                      <span v-else>
-                        {{ v.v1.toString().replace(/(?=(?!\b)(\d{3})+$)/g, ',') }}
-                        <span class="ren">人</span>
-                      </span>
-                    </b>
-                  </div>
-                </el-row>
-
-                <!-- 学员报到类型比例 -->
-                <el-row class="ceharts">
-                  <div>
-                    <ai-title title="学员报到类型比例" />
-                    <div id="typesofStudentReportsListChart" />
-                  </div>
-                </el-row>
-              </el-row>
-            </div>
-
-            <!-- 党员活动记录列表 -->
-            <div class="table">
-              <div class="records"><span class="record">党员活动记录</span></div>
-              <div class="template">
-                <div class="left">
-                  <el-date-picker placeholder="年/月" size="small" v-model="searchObj.time" value-format="yyyy-MM-01" type="month" clearables @change=";(page.current = 1), getInfoList().then(() => getChartData())" />
-
-                  <ai-download :instance="instance" url="/app/apppartyreport/export-signup" :params="param" fileName="党员活动记录模板" />
-                </div>
-
-                <div class="right">
-                  <el-input v-model="searchObj.name" size="small" placeholder="姓名" prefix-icon="iconfont iconSearch" clearable @change=";(page.current = 1), getInfoList()" />
-                  <el-button class="el-button" type="primary" icon="el-icon-search" size="small" @click=";(page.current = 1), getInfoList()">查询</el-button>
-                  <el-button class="el-button" icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                </div>
-              </div>
-              <ai-table :tableData="tableData" :col-configs="colConfigs" :total="total" :current.sync="page.current" :size.sync="page.size" @getList="getInfoList" :dict="dict" @selection-change="(v) => (ids = v.map((e) => e.id))"> </ai-table>
-            </div>
-          </div>
-        </div>
-      </template>
-    </ai-detail>
-  </section>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import * as echarts from 'echarts'
-
-export default {
-  name: 'DataList',
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-  },
-  computed: {
-    ...mapState(['user']),
-
-    chartOps() {
-      if (!this.meta) return
-
-      // 近12个月党员活动参与情况统计
-      let MonthsCount = this.meta['趋势分析'].map((e) => [e.time, e.count, e.total, e.active]),
-        //
-        // 学员报到类型比例
-        reportsType = Object.keys(this.meta['类别分析']).map((e) => [e, this.meta['类别分析'][e] || 0])
-
-      return {
-        // 近12个月党员活动参与情况统计
-        numMonthsCountList: {
-          tooltip: { trigger: 'axis' },
-          legend: { icon: 'rect', itemWidth: 8, itemHeight: 8 },
-          color: ['#EC4461', '#38A4F8', '#02A499'],
-          grid: {
-            left: 82,
-            right: 40,
-            bottom: 80,
-            top: 56,
-          },
-          xAxis: {
-            type: 'category',
-            boundaryGap: false,
-            axisLine: { lineStyle: { color: '#D8DDE8' } },
-            axisTick: {
-              //坐标轴刻度相关设置
-              show: true, //是否显示坐标轴刻度。
-              // inside: false, //坐标轴刻度是否朝内，默认朝外。
-              length: 7, //坐标轴刻度的长度。
-            },
-            axisLabel: { color: '#666', margin: 19 },
-          },
-          yAxis: {
-            name: '',
-            nameTextStyle: {
-              color: '#666',
-              borderColor: '#000',
-              padding: [0, 60, 0, 0],
-            },
-            type: 'value',
-            axisLine: { show: true, lineStyle: { color: '#333', type: 'solid' } },
-            min: 0,
-            minInterval: 1,
-            axisLabel: { color: '#666', margin: 19, show: true },
-            splitLine: { show: true, lineStyle: { color: '#D8DDE8', type: 'solid' } },
-            axisTick: {
-              show: true,
-              length: 7,
-            },
-          },
-          series: [
-            { type: 'line', name: '本组织党员人数' },
-            { type: 'line', name: '报名活动人数' },
-            { type: 'line', name: '实际参与活动人数' },
-          ],
-          dataset: {
-            source: MonthsCount,
-          },
-        },
-
-        // 学员报到类型比例
-        typesofStudentReportsList: {
-          legend: {
-            orient: 'vertical',
-            left: 370,
-            y: 'center',
-            itemGap: 12,
-            itemWidth: 18,
-            itemHeight: 12,
-            tooltip: { show: true },
-            textStyle: {
-              rich: {
-                a: { color: '#666', width: 120, fontSize: 14, lineHeight: 22 },
-                b: {
-                  fontWeight: 'bold',
-                  align: 'right',
-                  color: '#333',
-                  padding: [0, 50, 0, 0],
-                  fontSize: 14,
-                  width: 80,
-                  lineHeight: 22,
-                },
-              },
-            },
-          },
-          tooltip: {},
-          color: ['#FDA94F', '#4F8AFA', '#EC4461'],
-          series: {
-            name: '学员报到类型比例',
-            center: [160, '50%'],
-            radius: [40, 80],
-            type: 'pie',
-            minShowLabelAngle: 1,
-            label: {
-              normal: {
-                position: 'inner',
-                formatter: '{d}%',
-                color: '#fff',
-              },
-            },
-            itemStyle: { borderColor: '#fff', borderWidth: 0 },
-          },
-          dataset: {
-            source: reportsType,
-          },
-        },
-      }
-    },
-
-    param() {
-      let params = {}
-      //导出搜索条件
-      if (this.ids.length) {
-        params = {
-          ...params,
-          time: this.searchObj.time,
-        }
-      } else {
-        params = {
-          ...params,
-          time: this.searchObj.time,
-          name: this.searchObj.name,
-          partyOrgId: this.user.info.organizationId,
-        }
-      }
-      return params
-    },
-  },
-  data() {
-    return {
-      tableData: [],
-      colConfigs: [
-        { prop: 'name', label: '姓名', align: 'center' },
-        {
-          prop: 'sex',
-          label: '性别',
-          dict: 'sex',
-          align: 'center',
-        },
-        { prop: 'partyOrg', label: '所属组织', align: 'center' },
-        { prop: 'signupCount', label: '报名次数', align: 'center' },
-        { prop: 'partakeCount', label: '参与次数', align: 'center' },
-      ],
-      page: {
-        size: 10,
-        current: 1,
-      },
-      total: 0,
-      searchObj: {
-        name: '',
-        time: '',
-      },
-      search: {
-        time: '',
-      },
-      partyId: '', // 党组织id
-      treeData: [],
-      meta: {},
-      charts: {
-        numMonthsCountList: null, // 近12个月党员活动参与情况统计
-        typesofStudentReportsList: null, // 学员报到类型比例
-      },
-      ids: [],
-      eventCountMap: [
-        { name: '本组织党员人数', v1: 0 },
-        { name: '本月报名活动人数', v1: 0 },
-        { name: '实际参与活动人数', v1: 0 },
-        { name: '活动实际参与率', v1: 0 },
-      ],
-    }
-  },
-  methods: {
-    getList() {
-      let partyOrgId = this.user.info.organizationId
-      if (this.partyId) {
-        partyOrgId = this.partyId
-      }
-      return this.instance
-        .post('/app/apppartyreport/statistic', null, {
-          params: {
-            partyOrgId,
-            time: this.search.time + '-01',
-          },
-        })
-        .then((res) => {
-          if (res?.data) {
-            this.meta = res.data
-
-            this.eventCountMap[0].v1 = this.meta['总体分析'].count.toString().replace(/(?=(?!\b)(\d{3})+$)/g, ',')
-            this.eventCountMap[1].v1 = this.meta['总体分析'].total.toString().replace(/(?=(?!\b)(\d{3})+$)/g, ',')
-            this.eventCountMap[2].v1 = this.meta['总体分析'].active.toString().replace(/(?=(?!\b)(\d{3})+$)/g, ',')
-
-            if (this.meta['总体分析'].active > 0) {
-              this.eventCountMap[3].v1 = (this.meta['总体分析'].active / this.meta['总体分析'].total).toFixed(2) * 100
-            } else {
-              this.eventCountMap[3].v1 = 0
-            }
-
-            window.console.log('100000001001011141000'.toString().replace(/(?=(?!\b)(\d{3})+$)/g, ','))
-          }
-        })
-    },
-
-    getInfoList() {
-      let partyOrgId = this.user.info.organizationId
-      if (this.partyId) {
-        partyOrgId = this.partyId
-      }
-      this.instance
-        .post(`/app/apppartyreport/list-signup`, null, {
-          params: {
-            ...this.page,
-            name: this.searchObj.name,
-            time: this.searchObj.time,
-            partyOrgId,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-    },
-
-    handleTreeFilter(v, data) {
-      return data?.name.indexOf(v) > -1
-    },
-
-    handleSelectGrid(data) {
-      this.partyId = data?.id
-      this.getList().then(() => this.getChartData())
-      this.getInfoList()
-    },
-
-    initEcharts() {
-      Object.keys(this.charts).map((id) => {
-        let ref = document.getElementById(id + 'Chart')
-        if (ref) this.charts[id] = echarts.init(ref)
-      })
-    },
-
-    getChartData() {
-      Object.keys(this.charts).map((e) => {
-        this.charts[e]?.setOption(this.chartOps?.[e])
-      })
-    },
-
-    // 重置
-    reset() {
-      this.searchObj.name = ''
-      this.getInfoList()
-    },
-  },
-  created() {
-    var date = new Date()
-    var year = date.getFullYear()
-    var mon = date.getMonth() + 1
-    var month = mon < 10 ? '0' + mon : mon
-    this.searchObj.time = year + '-' + month + '-01'
-    this.search.time = year + '-' + month
-
-    this.handleSelectGrid(this.user.info.organizationId)
-
-    this.dict.load('sex').then(() => {})
-
-    this.getInfoList()
-  },
-  mounted() {
-    this.initEcharts()
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.DataDetail {
-  height: 100%;
-  font-size: 14px;
-  .ai-detail {
-    ::v-deep .ai-detail__content {
-      .ai-detail__content--wrapper {
-        min-width: 100%;
-        display: flex;
-        .AiTreeMenu {
-          width: 16%;
-        }
-        .echarts-content {
-          width: 83%;
-          padding: 0 10px 0 0;
-          margin-left: 10px;
-          .mainPane {
-            .el-row {
-              width: 100%;
-              gap: 16px;
-              height: auto;
-              .cardPane {
-                flex: 1;
-                padding: 0 10px 10px 10px;
-                background: #ffffff;
-                box-shadow: 0 0 4px 0 rgba(20, 16, 16, 0.05);
-                border-radius: 4px;
-              }
-            }
-
-            .data-flex {
-              margin-top: 15px;
-              padding: 10px;
-              background-color: #fff;
-              .card {
-                margin-top: 20px;
-                .totals {
-                  width: 50%;
-                  flex-wrap: wrap;
-                  .cards {
-                    display: flex;
-                    flex-direction: column;
-                    padding: 15px 0 0 15px;
-                    width: 45%;
-                    background-color: #f9f9f9;
-                    .name-cards {
-                      font-size: 16px;
-                    }
-                    .count {
-                      line-height: 4;
-                      color: #2a6cfb;
-                      font-size: 22px;
-                      .ren {
-                        color: #9f9fa0;
-                        font-size: 12px;
-                      }
-                    }
-                  }
-                }
-                .ceharts {
-                  background-color: #f9f9f9;
-                  width: 50%;
-                  padding: 5px 0 0 15px;
-                }
-              }
-            }
-
-            .table {
-              padding: 0 10px 10px 10px;
-              margin-top: 15px;
-              background-color: #fff;
-              .records {
-                width: 140px;
-                line-height: 40px;
-                border-bottom: 2px solid #296bfb;
-                .record {
-                  margin-left: 25px;
-                  color: #2c6dfb;
-                  font-size: 14px;
-                  font-weight: 800;
-                }
-              }
-              .template {
-                margin-top: 10px;
-                display: flex;
-                justify-content: space-between;
-                .left {
-                  display: flex;
-                  .ai-download {
-                    margin-left: 10px;
-                  }
-                }
-                .right {
-                  display: flex;
-                  .el-input {
-                    margin-right: 10px;
-                  }
-                }
-              }
-              .ai-table {
-                margin-top: 10px;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    #numMonthsCountListChart {
-      width: 100%;
-      height: 290px;
-    }
-
-    #typesofStudentReportsListChart {
-      width: 100%;
-      height: 240px;
-    }
-  }
-}
-</style>
diff --git a/packages/wechat/AppWhereabouts/AppWhereabouts.vue b/packages/wechat/AppWhereabouts/AppWhereabouts.vue
deleted file mode 100644
index 5421efb5..00000000
--- a/packages/wechat/AppWhereabouts/AppWhereabouts.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<template>
-  <section class="AppWhereabouts">
-    <ai-list>
-      <ai-title slot="title" title="工作去向" isShowBottomBorder/>
-
-      <template #custom>
-        <el-row type="flex" class="staDataPane">
-          <div class="boxItem" v-for="(op,i) in staData" :key="i">
-            <div>{{ op.name }}</div>
-            <b>{{ op.v1 }}</b>
-          </div>
-        </el-row>
-
-        <div class="mainPane">
-          <ai-search-bar>
-            <template #left>
-              <!--              <el-select v-model="search.village" placeholder="请选择联村" size="small"-->
-              <!--                         @change="page.current=1,getTableData()" clearable>-->
-              <!--                <el-option v-for="(op,i) in dict.getDict('villageCadresDirectionArea')" :key="i" :label="op.dictName"-->
-              <!--                           :value="op.dictValue"/>-->
-              <!--              </el-select>-->
-              <ai-select placeholder="请选择工作去向" v-model="search.direction"
-                         :selectList="dict.getDict('villageCadresDirectionChoice')"
-                         @change="page.current=1,getTableData()"/>
-            </template>
-            <template #right>
-              <el-input suffix-icon="iconfont iconSearch" v-model="search.name" placeholder="姓名/手机号码" clearable
-                      @clear="page.current = 1,search.name = '', getTableData()"
-                        v-throttle="() => {page.current = 1, getTableData()}" size="small"/>
-            </template>
-          </ai-search-bar>
-
-          <ai-search-bar>
-            <template #left>
-              <el-button type="primary" icon="iconfont iconAdd" size="small" @click="dialog=true">添加</el-button>
-              <el-button icon="iconfont iconDelete" size="small" @click="handleDelete()" :disabled="ids.length==0">删除
-              </el-button>
-            </template>
-            <template #right>
-              <ai-import :instance="instance" :dict="dict" type="appvillagecadresdirection" name="工作去向"
-                         @success="getTableData()">
-                <el-button icon="iconfont iconImport">导入</el-button>
-              </ai-import>
-              <ai-download :instance="instance" url="/app/appvillagecadresdirection/listExport" :params="params"
-                           fileName="工作去向数据导出"/>
-            </template>
-          </ai-search-bar>
-
-          <ai-table :tableData="tableData" :colConfigs="colConfigs" :total="page.total"
-                    @selection-change="v=>ids=v.map(e=>e.id)"
-                    :current.sync="page.current" :size.sync="page.size" @getList="getTableData">
-            <el-table-column slot="options" label="操作" align="center">
-              <div class="tableOptions" slot-scope="{row}">
-                <el-button type="text" @click="editItem(row)">编辑</el-button>
-                <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
-              </div>
-            </el-table-column>
-          </ai-table>
-        </div>
-      </template>
-    </ai-list>
-
-
-    <ai-dialog :visible.sync="dialog" title="工作去向" @closed="form={},getTableData(),getStaData()"
-               @onConfirm="submitForm" @opened="$refs.WhereaboutsConfigForm.clearValidate()">
-      <el-form size="small" ref="WhereaboutsConfigForm" :model="form" :rules="rules" label-suffix="："
-               label-width="100px">
-        <el-row type="flex" class="WhereaboutsConfigForm" justify="space-between">
-          <el-form-item v-for="(op,i) in colConfigs.slice(1,9)" :key="i" v-bind="op" style="width: 48%">
-
-            <!--            <el-select v-if="op.prop=='village'" v-model="form[op.prop]" placeholder="请选择联村" clearable multiple>-->
-            <!--              <el-option v-for="(op,i) in dict.getDict('villageCadresDirectionArea')" :key="i" :label="op.dictName"-->
-            <!--                         :value="op.dictValue"/>-->
-            <!--            </el-select>-->
-            <ai-select v-if="op.prop=='direction'" placeholder="请选择工作去向" v-model="form[op.prop]"
-                       :selectList="dict.getDict('villageCadresDirectionChoice')"/>
-            <el-input v-else v-model="form[op.prop]" placeholder="请输入"/>
-          </el-form-item>
-        </el-row>
-      </el-form>
-    </ai-dialog>
-  </section>
-</template>
-
-<script>
-export default {
-  name: "AppWhereabouts",
-  label: "工作去向",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function
-  },
-  computed: {
-    colConfigs() {
-      const required = true
-      return [
-        {type: "selection"},
-        {label: "姓名", prop: "name", align: "center", required},
-        {
-          label: "联村", prop: "village", align: "center", required,
-          render: (h, {row}) => h('span', null, row?.village?.split(",")
-          ?.map(e => this.dict.getLabel("villageCadresDirectionArea", e)).join(","))
-        },
-        {label: "联系片", prop: "connect", align: "center"},
-        {label: "包保网络", prop: "net", align: "center"},
-        {label: "手机号码", prop: "phone", align: "center", required},
-        {label: "备注", prop: "remark", align: "center"},
-        {
-          label: "工作去向", prop: "direction", align: "center", required,
-          render: (h, {row}) => h('span', null, this.dict.getLabel("villageCadresDirectionChoice", row?.direction))
-        },
-        {label: "排序编号", prop: "sort", align: "center"},
-        {slot: "options"},
-      ]
-    },
-    params() {
-      let params = {}
-      //导出搜索条件
-      if (this.ids.length) {
-        params = {
-          ...params,
-          ids: this.ids
-        }
-      } else {
-        params = {
-          ...params,
-          ...this.search
-        }
-      }
-      return params
-    },
-    formConfigs() {
-      return this.colConfigs.slice(1, 9).map(e => ({
-        ...e, comp: ['village', 'direction'].includes(e.prop) ? 'select' : 'input'
-      }))
-    },
-    rules() {
-      let rules = {}
-      //调整columns要慎重
-      this.formConfigs.filter(e => e.required).map(e => {
-        rules[e.prop] = [
-          {message: `请${e.comp == 'select' ? '选择' : '输入'}${e.label}`, required: true}
-        ]
-        if (e.prop == 'phone') {
-          rules[e.prop]?.push({pattern: /^1[1356789][0-9]\d{8}$/, message: '手机格式有误!'})
-        }
-      })
-      return rules
-    }
-  },
-  data() {
-    return {
-      staData: [],
-      search: {name: null, direction: null, village: null},
-      page: {size: 10, current: 1, total: 0},
-      dialog: false,
-      tableData: [],
-      form: {},
-      ids: []
-    }
-  },
-  methods: {
-    getStaData() {
-      this.instance.post("/app/appvillagecadresdirection/queryDataStatistics").then(res => {
-        if (res?.data) {
-          this.staData = res.data
-        }
-      })
-    },
-    getTableData() {
-      this.instance.post("/app/appvillagecadresdirection/list", null, {
-        params: {...this.search, ...this.page}
-      }).then(res => {
-        if (res?.data) {
-          this.tableData = res.data.records
-          this.page.total = res.data.total
-        }
-      })
-    },
-    submitForm() {
-      this.$refs.WhereaboutsConfigForm.validate(v => {
-        if (v) {
-          this.instance.post("/app/appvillagecadresdirection/addOrUpdate", {
-            ...this.form
-          }).then(res => {
-            if (res?.code == 0) {
-              this.$message.success("提交成功!")
-              this.dialog = false
-            }
-          })
-        }
-      })
-    },
-    handleDelete(id) {
-      this.$confirm("是否删除该联村镇干?").then(() => {
-        this.instance.post("/app/appvillagecadresdirection/delete", null, {
-          params: {ids: id || this.ids.join(",")}
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$message.success("删除成功!")
-            this.getTableData()
-            this.getStaData()
-          }
-        })
-      }).catch(() => 0)
-    },
-    editItem(row) {
-      this.dialog = true
-      this.form = JSON.parse(JSON.stringify({...row}))
-    }
-  },
-  created() {
-    this.dict.load("villageCadresDirectionChoice", "villageCadresDirectionArea")
-    this.getStaData()
-    this.getTableData()
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.AppWhereabouts {
-  height: 100%;
-
-  ::v-deep .ai-list__content {
-    padding: 0 16px 16px !important;
-    box-sizing: border-box;
-
-    .ai-list__content--wrapper {
-      display: flex;
-      flex-direction: column;
-      gap: 10px;
-    }
-  }
-
-  ::v-deep .staDataPane {
-    width: 100%;
-    gap: 16px;
-    padding-top: 16px;
-
-    .boxItem {
-      flex: 1;
-      min-width: 0;
-      height: 64px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 0 16px;
-      font-size: 14px;
-      color: #333;
-      border: 1px solid #eee;
-      background: #fff;
-
-      b {
-        font-size: 20px;
-        font-family: DINAlternate-Bold, DINAlternate, serif;
-      }
-    }
-  }
-
-  ::v-deep .mainPane {
-    background: #fff;
-    border: 1px solid #eee;
-    padding: 12px 16px;
-  }
-
-  .WhereaboutsConfigForm {
-    flex-wrap: wrap;
-
-    .el-select {
-      width: 100%;
-
-      ::v-deep .el-tag__close.el-icon-close {
-        background: transparent;
-      }
-    }
-  }
-}
-</style>
diff --git a/packages/wechat/AppWorkTask/AppWorkTask.vue b/packages/wechat/AppWorkTask/AppWorkTask.vue
deleted file mode 100644
index fe4c0f17..00000000
--- a/packages/wechat/AppWorkTask/AppWorkTask.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-  <ai-list v-if="showlist">
-    <template slot="title">
-      <ai-title title="工作任务"> </ai-title>
-    </template>
-
-    <template slot="tabs" class="tabs">
-      <el-tabs v-model="currIndex" @tab-click="handleClick">
-        <el-tab-pane
-          v-for="(tab, i) in tabList"
-          :key="i"
-          :label="tab.label"
-          :name="String(i)"
-        >
-          <component
-            :is="tab.comp"
-            v-if="currIndex === String(i)"
-            :ref="currIndex"
-            :instance="instance"
-            :dict="dict"
-            @change="changePage"
-            :params="params"
-            :taskRole="taskRole" 
-          ></component>
-        </el-tab-pane>
-      </el-tabs>
-    </template>
-  </ai-list>
-
-  <component
-    v-else
-    @change="changePage"
-    :is="componentName"
-    :params="params"
-    :instance="instance"
-    :dict="dict"
-    :detailType="detailType"
-  ></component>
-</template>
-
-<script>
-import ExecuteList from './components/ExecuteList'
-import InitiatorList from './components/InitiatorList.vue'
-import Add from './components/Add.vue'
-import Detail from './components/Detail.vue'
-import SonDetail from './components/SonDetail.vue'
-
-export default {
-  label: '工作任务',
-  name: 'AppWorkTask',
-  // 组件
-  components: {
-    ExecuteList,
-    InitiatorList,
-    Add,
-    Detail,
-    SonDetail
-  },
-  props: {
-    instance: Function,
-    dict: Object
-  },
-  data() {
-    return {
-      showlist: true,
-      currIndex: '0',
-      taskRole: '',
-      componentName: '',
-      params: {
-        taskRole: ''
-      },
-      detailType: '0', //0我执行详情 1我发起详情
-    }
-  },
-  // 计算
-  computed: {
-    tabList() {
-      return [
-        {
-          label: '我执行的',
-          name: 'ExecuteList',
-          comp: ExecuteList,
-          taskRole: '1'
-        },
-        {
-          label: '我发起的',
-          name: 'InitiatorList',
-          comp: InitiatorList,
-          taskRole: '0'
-        },
-        {
-          label: '我督办的',
-          name: 'ExecuteList',
-          comp: InitiatorList,
-          taskRole: '2'
-        },
-        {
-          label: '抄送我的',
-          name: 'ExecuteList',
-          comp: InitiatorList,
-          taskRole: '3'
-        },
-      ]
-    }
-  },
-  // 监听
-  watch: {},
-  // 实例创建后
-  created() {},
-  // 实例渲染后
-  mounted() {},
-  // 方法
-  methods: {
-    handleClick() {
-      this.taskRole = this.tabList[this.currIndex].taskRole
-    },
-    changePage(data) {
-      if (data.type == 'Add') {
-        this.componentName = 'Add'
-        this.showlist = false
-        this.params = data.params
-      }
-      if (data.type == 'Detail') {
-        this.componentName = 'Detail'
-        this.showlist = false
-        this.params = data.params,
-        this.detailType = this.currIndex
-      }
-      if (data.type == 'SonDetail') {
-        this.componentName = 'SonDetail'
-        this.showlist = false
-        this.params = data.params,
-        this.detailType = this.currIndex
-      }
-      if (data.type == 'list') {
-        this.showlist = true
-        this.componentName = ''
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss"></style>
diff --git a/packages/wechat/AppWorkTask/components/Add.vue b/packages/wechat/AppWorkTask/components/Add.vue
deleted file mode 100644
index a73dd830..00000000
--- a/packages/wechat/AppWorkTask/components/Add.vue
+++ /dev/null
@@ -1,290 +0,0 @@
-<template>
-  <ai-detail>
-    <template #title>
-      <ai-title :title="parentTaskCode ? '创建子任务' : '创建任务'" isShowBottomBorder isShowBack @onBackClick="onBack(true)"> </ai-title>
-    </template>
-    <template #content>
-      <ai-card title="任务信息">
-        <template slot="content">
-          <el-form ref="formData" :rules="rules" :model="formData" label-width="90px">
-            <!-- 任务类型 -->
-            <el-form-item label="任务类型:" prop="type" style="width: 30%">
-              <ai-select v-model="formData.type" placeholder="任务类型" :selectList="$dict.getDict('workTaskType')"></ai-select>
-            </el-form-item>
-
-            <!-- 发起人 -->
-            <!-- <div class="especial">
-              <span class="icon">*</span>
-              <span class="people">发起人:</span>
-              <ai-wechat-selecter isShowUser :instance="instance" v-model="formData.sponsorUserList" :isMultiple="false" :disable="sponsorUserListDisable">
-              </ai-wechat-selecter>
-              <span class="hint">(只能选择一人)</span>
-            </div> -->
-
-            <!-- 任务标题 -->
-            <el-form-item label="任务标题:" prop="taskTitle">
-              <el-input v-model="formData.taskTitle" placeholder="请输入任务标题" clearable :maxlength="30" show-word-limit></el-input>
-            </el-form-item>
-
-            <!-- 任务说明 -->
-            <el-form-item label="任务说明:" prop="taskDescription">
-              <el-input v-model="formData.taskDescription" placeholder="请输入任务说明" clearable :maxlength="1000" type="textarea" show-word-limit :rows="3"></el-input>
-            </el-form-item>
-
-            <!-- 截止日期 -->
-            <el-form-item label="截止日期:" prop="lastTime">
-              <el-date-picker v-model="formData.lastTime"  :picker-options="pickerOptions0" type="date" placeholder="请选择"  value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-            </el-form-item>
-
-            <!-- 任务通知 -->
-            <el-form-item label="任务通知:" prop="isNofity">
-              <el-radio-group v-model="formData.isNofity">
-                <el-radio :label="item.label" v-for="(item, i) in isNofityList" :key="i">{{ item.name }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-
-            <!-- 任务文件 -->
-            <el-form-item label="任务文件:" prop="taskFiles">
-              <ai-uploader :instance="instance" @change="handleChange" isShowTip fileType="file"
-                           acceptType=".zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt,.jpg,.png" :limit="9"></ai-uploader>
-            </el-form-item>
-
-            <!-- 执行人 -->
-            <div class="especial">
-              <span class="icon">*</span>
-              <span class="people">执行人:</span>
-              <ai-wechat-selecter slot="append" isShowUser :instance="instance" v-model="formData.userInfoList" :disable="userInfoListDisable"></ai-wechat-selecter>
-            </div>
-
-            <!-- 督办人 -->
-            <div class="especial">
-              <span class="icon">&nbsp;</span>
-              <span class="people">督办人:</span>
-              <ai-wechat-selecter slot="append" isShowUser :instance="instance" v-model="formData.checkUserList" :disable="checkUserListDisable"></ai-wechat-selecter>
-            </div>
-
-            <div class="especial">
-              <span class="icon">&nbsp;</span>
-              <span class="people">抄送人:</span>
-              <ai-wechat-selecter slot="append" isShowUser :instance="instance" v-model="formData.sendUserList" :disable="sendUserListDisable"></ai-wechat-selecter>
-            </div>
-          </el-form>
-        </template>
-      </ai-card>
-    </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>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-export default {
-  name: 'Add',
-  // 组件
-  components: {},
-  props: {
-    instance: Function,
-    params: Object,
-    dict: Object,
-    parentTaskCode: String, //创建子任务 父任务code
-  },
-  data() {
-    return {
-      formData: {
-        type: '',
-        taskTitle: '',
-        taskDescription: '',
-        lastTime: '',
-        isNofity: '0',
-        taskFiles: [],
-        checkUserList: [], //督办人
-        id: '',
-        parentTaskCode: '', //上级任务编号
-        sponsorUserList: [], // 发起人列表
-        userInfoList: [], // 执行人列表
-        sendUserList: [], //抄送人列表
-      },
-      rules: {
-        type: [{ required: true, message: '请输入任务标题', trigger: 'change' }],
-        taskTitle: [{ required: true, message: '请输入任务标题', trigger: 'change' }],
-        taskDescription: [{ required: true, message: '请输入任务说明', trigger: 'change' }],
-        lastTime: [{required: true, message: '请选择', trigger: 'change'}],
-        isNofity: [{ required: true, message: '请选择任务通知', trigger: 'change' }],
-      },
-      isAdd: true,
-      showDetail: false,
-      pickerOptions0: {
-        disabledDate(time) {
-          return time.getTime() < Date.now() - 8.64e7;
-        }
-      },
-      showEdit1: false
-    }
-  },
-  // 计算
-  computed: {
-    isNofityList() {
-      return [
-        { name: '是', label: '1' },
-        { name: '否', label: '0' },
-      ]
-    },
-    sponsorUserListDisable() {
-      return this.formData.userInfoList.concat(this.formData.checkUserList).concat(this.formData.sendUserList)
-    },
-    userInfoListDisable() {
-      return this.formData.sponsorUserList.concat(this.formData.checkUserList).concat(this.formData.sendUserList)
-    },
-    checkUserListDisable() {
-      return this.formData.userInfoList.concat(this.formData.sponsorUserList).concat(this.formData.sendUserList)
-    },
-    sendUserListDisable() {
-      return this.formData.userInfoList.concat(this.formData.checkUserList).concat(this.formData.sponsorUserList)
-    }
-  },
-  // 监听
-  watch: {},
-  // 实例创建后
-  created() {
-    this.dict.load('workTaskType').then(() => {})
-  },
-  mounted() {
-    if(this.params.id) {
-      this.getDetail()
-    }
-  },
-  // 方法
-  methods: {
-    handleChange(e) {
-      this.formData.taskFiles = e
-    },
-    // 提交
-    submit() {
-      var fileIds = []
-      if(this.formData.taskFiles.length) {
-        this.formData.taskFiles.map((item) => {
-          fileIds.push(item.id)
-        })
-      }
-      this.$refs['formData'].validate((valid) => {
-        if (valid) {
-          if(!this.formData.userInfoList.length) {
-            this.$message.error('请选择执行人')
-            return
-          }
-          this.formData.lastTime =this.formData.lastTime?this.formData.lastTime.substring(0,10) + ' 23:59:59':"";
-          this.instance.post(`/app/appworktaskinfo/addOrUpdate`, {
-            ...this.formData,
-            fileIds: fileIds,
-            taskFiles: '',
-            id: null,
-            parentTaskCode: this.parentTaskCode || ''
-          }).then((res) => {
-            if (res.code == 0) {
-              this.$message.success('提交成功')
-              setTimeout(() => {
-                this.onBack(true)
-              }, 600)
-            }
-          })
-        }
-      })
-    },
-    getDetail() {
-      this.instance.post(`/app/appworktaskinfo/queryDetailById?id=${this.params.id}`, null).then((res) => {
-        if (res.code == 0) {
-          this.showDetail = true
-          this.formData = {...res.data}
-          this.formData.taskFiles = this.formData.fileList || []
-
-          //选人置空 避免字段不一致
-          this.formData.checkUserList = []
-          this.formData.sponsorUserList = []
-          this.formData.userInfoList = []
-          this.formData.sendUserList = []
-          this.formData.isNofity = '0'
-        }
-      });
-    },
-
-    // 返回按钮
-    onBack(isRefresh) {
-      if(this.parentTaskCode) {
-        this.$emit('back')
-      }else {
-        this.$emit('change', {
-          type: 'list',
-          isRefresh: !!isRefresh,
-        })
-      }
-    },
-    downFileAll () {
-      if (this.form.files.length > 0) {
-        this.instance.post('/app/appofficialdocumentinfo/downLoadAllFileForDetail', null, {
-          responseType: 'blob',
-          params: {
-            id: this.form.id
-          }
-        }).then((res) => {
-          const link = document.createElement('a')
-          let blob = new Blob([res], { type: 'application/vnd.ms-excel' })
-          link.style.display = 'none'
-          link.href = URL.createObjectURL(blob)
-          var num = ''
-          for (let i = 0; i < 10; i++) {
-            num += Math.ceil(Math.random() * 10)
-          }
-          link.setAttribute('download', '公文文件' + '.zip')
-          document.body.appendChild(link)
-          link.click()
-          document.body.removeChild(link)
-        })
-      } else {
-        this.$message.error('暂无附件提供下载')
-      }
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-  .especial {
-    margin-bottom: 12px;
-    .icon {
-      vertical-align: top;
-      display: inline-block;
-      padding-top: 5px;
-      margin-left: 20px;
-      color: #f46;
-    }
-    .people {
-      display: inline-block;
-      font-size: 14px;
-      color: #666;
-      margin-right: 16px;
-      vertical-align: top;
-    }
-    .AiWechatSelecter {
-      display: inline-block;
-      margin-left: 3px;
-    }
-    .hint {
-      font-size: 14px;
-      color: #999;
-      margin-left: 16px;
-    }
-    .mar-r40{
-      margin-right: 40px;
-    }
-    .w80{
-      width: 80px;
-      text-align: right;
-      color: #888;
-    }
-  }
-  .AiWechatSelecter{
-    width: calc(100% - 120px);
-  }
-</style>
diff --git a/packages/wechat/AppWorkTask/components/Detail.vue b/packages/wechat/AppWorkTask/components/Detail.vue
deleted file mode 100644
index 0f8c1de8..00000000
--- a/packages/wechat/AppWorkTask/components/Detail.vue
+++ /dev/null
@@ -1,378 +0,0 @@
-<template>
-  <div style="height:100%;">
-    <ai-detail v-if="!showAdd && !showSonDetail">
-      <template #title>
-        <ai-title title="任务详情" isShowBottomBorder isShowBack @onBackClick="onBack(true)">
-          <template #rightBtn>
-            <template v-if="detailType == 0 && formData.status == 0">
-              <el-button type="primary" icon="iconfont iconEdit"  @click="taskProcess=true,processForm.percent=myUserInfo.percent">更新进度</el-button>
-            </template>
-          </template>
-        </ai-title>
-      </template>
-      <template #content>
-        <ai-card title="任务进度">
-          <template slot="content">
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2" v-if="detailType == 1">
-              <ai-info-item label="任务状态：" :class="{color1:formData.status==0,color2:formData.status==1,color3:formData.status==2}"><span>{{dict.getLabel('workTaskStatus',formData.status)||'-'}}</span></ai-info-item>
-              <ai-info-item label="当前进度："><span>{{formData.percent+'%'}}</span></ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2" v-if="detailType == 0">
-              <ai-info-item label="任务状态：" :class="{color1:myUserInfo.doStatus==0,color2:myUserInfo.doStatus==1,color3:myUserInfo.doStatus==2}"><span>{{dict.getLabel('workTaskStatus',myUserInfo.doStatus)||'-'}}</span></ai-info-item>
-              <ai-info-item label="当前进度："><span>{{myUserInfo.percent+'%'}}</span></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-        <ai-card title="任务信息">
-          <template slot="content">
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2">
-              <ai-info-item label="发起人："><span>{{formData.sponsorUserName}}</span></ai-info-item>
-              <ai-info-item label="创建人："><span>{{formData.createUserName}}</span></ai-info-item>
-              <ai-info-item label="创建时间："><span>{{formData.createTime}}</span></ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2">
-              <ai-info-item label="任务状态：">
-                <span v-if="detailType == 0">{{dict.getLabel('workTaskStatus',formData.status)||'-'}}</span>
-                <span v-if="detailType == 1">{{dict.getLabel('workTaskStatus',formData.status)||'-'}}</span>
-              </ai-info-item>
-              <ai-info-item label="任务类型："><span>{{$dict.getLabel("workTaskType", formData.type) || '-'}}</span></ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2">
-              <ai-info-item label="截止日期：">
-                <span>{{formData.lastTime}}<i  :style="formData.isOverTime==0?'color:#FF8822;':'color:#FF4466;'" style="margin-left:8px;font-style:inherit" v-if="formData.overTimeStatus">({{formData.overTimeStatus}})</i></span>
-              </ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper label-width="80px" :columnsNumber="1">
-              <ai-info-item label="任务说明："><span>{{formData.taskDescription}}</span></ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper label-width="80px" :columnsNumber="1" v-if="detailType == 0">
-              <ai-info-item label="执行说明："><span>{{myUserInfo.doDescription}}</span></ai-info-item>
-            </ai-wrapper>
-            <ai-bar title="附件" >
-              <template slot="right" v-if="formData.fileList && formData.fileList.length">
-                <span class="Edit" @click="downFileAll"><i class="iconfont iconDownload"></i>下载全部</span>
-              </template>
-            </ai-bar>
-            <ai-file-list v-if="formData.fileList && formData.fileList.length"
-              :fileList="formData.fileList"
-              :fileOps="{ name: 'name', size: 'fileSizeStr' }"
-            ></ai-file-list>
-          </template>
-        </ai-card>
-
-         <ai-card title="任务执行情况" v-if="formData.userInfoList">
-          <template slot="content">
-            <ai-table :isShowPagination="false"
-              class="ai-table"
-              :tableData="formData.userInfoList"
-              :col-configs="userInfoListColConfigs"
-              :dict="dict"
-            >
-              <el-table-column slot="percent" label="完成进度" align="center">
-                <template slot-scope="{ row }">
-                  <span>{{ row.percent + "%" }}</span>
-                </template>
-              </el-table-column>
-            </ai-table>
-          </template>
-        </ai-card>
-        <ai-card title="子任务进度">
-          <template slot="content">
-            <el-row type="flex" justify="space-between" align="center" style="margin-bottom:8px;">
-              <el-col :span="16">
-                <el-radio-group v-model="sonListType" size="small" @change="getList">
-                  <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button label="0">进行中</el-radio-button>
-                  <el-radio-button label="1">已完成</el-radio-button>
-                  <el-radio-button label="2">已关闭</el-radio-button>
-                </el-radio-group>
-              </el-col >
-              <el-col :span="8" class="icon add-icon">
-                <i class="iconfont iconAdd" style="color:#5088FF;" @click="gotoCreate" v-if="formData.status==0">&nbsp;&nbsp;创建子任务</i>
-              </el-col>
-            </el-row>
-            <ai-table class="ai-table" :tableData="workList" :col-configs="colConfigs" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getList" :dict="dict">
-              <el-table-column slot="percent" label="当前进度" align="center">
-                <template slot-scope="{ row }">
-                  <span>{{row.percent+'%'}}</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" @click="toSonDetail(row)">详情</el-button>
-                  </div>
-                </template>
-              </el-table-column>
-            </ai-table>
-          </template>
-        </ai-card>
-        <ai-dialog
-          title="更新进度"
-          :visible.sync="taskProcess"
-          @onConfirm="updateProcess('processForm')"
-          @onCancel="taskProcess=false"
-          width="580px">
-          <div style="width:480px;margin:auto;padding:8px 0;">
-            <el-form :model="processForm" label-width="100px" ref='processForm' :rules="processRules">
-              <el-form-item label="选择进度：" prop="percent" :rules="[{ required: true, message: '请选择进度', trigger: 'change' },]">
-              <el-slider v-model="processForm.percent" show-input></el-slider>
-              </el-form-item>
-              <el-form-item label="更新说明：" prop="remarks">
-                <el-input type="textarea" :rows="4" maxlength="1000" show-word-limit placeholder="请输入..." v-model="processForm.remarks"></el-input>
-              </el-form-item>  
-            </el-form>
-          </div>
-        </ai-dialog>
-      </template>
-    </ai-detail>
-    <add v-if="showAdd" :parentTaskCode="parentTaskCode" :instance="instance" :dict="dict" @back="comBack" :params="formData"></add>
-    <son-detail v-if="showSonDetail" :instance="instance" :dict="dict" @back="comBack" :params="sonDetailParams" :detailType="'detail'"></son-detail>
-  </div>
-</template>
-
-<script>
-
-import Add from './Add.vue'
-import SonDetail from './SonDetail.vue'
-
-import {mapState} from 'vuex'
-export default {
-  name: 'Detail',
-  // 组件
-  components: {
-    Add,
-    SonDetail
-  },
-  props: {
-    instance: Function,
-    params: Object,
-    dict: Object,
-    detailType: String,
-  },
-  data() {
-    return {
-      formData: {},
-      myUserInfo: {},
-      workList:[],
-      page:{
-        size:10,
-        current:1,
-        total:null
-      },
-      sonListType: '',
-      colConfigs: [
-        { prop: 'taskTitle', label: '任务标题' },
-        { prop: 'createTime', label: '创建日期' },
-        { prop: 'lastTime', label: '截止日期' },
-        {
-          prop: "status",
-          label: "任务状态",
-          width: 120,
-          align: "center",
-          formart: (status) =>
-            this.$dict.getLabel("workTaskStatus", status),
-        },
-        { slot: 'percent', label: '当前进度' },
-        { slot: 'options', label: '操作' },
-      ],
-      taskProcess: false,
-      processForm:{
-        remarks: '',
-        percent: 0
-      },
-      showAdd: false,
-      parentTaskCode: '',
-      showSonDetail: false,
-      sonDetailParams: {},
-      processRules: {
-        remarks: [{ required: true, message: '请输入更新说明', trigger: 'change' }],
-      },
-      userInfoListColConfigs: [
-        { prop: "userName", label: "执行人" },
-        { prop: "unitName", label: "所属部门" },
-        {
-          prop: "doStatus",
-          label: "执行状态",
-          width: 120,
-          align: "center",
-          formart: (doStatus) =>
-            this.$dict.getLabel("workTaskStatus", doStatus),
-        },
-        { prop: "finishTime", label: "完成时间" },
-        { prop: "finishDescription", label: "完成说明" },
-      ],
-    }
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  mounted() {
-    this.dict.load('workTaskType', 'workTaskStatus', 'workTaskFinishStatus').then(() => {
-      this.getDetail()
-    })
-    
-  },
-  methods: {
-    getDetail() {
-      // /app/appworktaskinfo/queryDetailById
-      this.instance.post(`/app/appworktaskinfo/queryDetailById?id=${this.params.id}`, null).then((res) => {
-        if (res.code == 0) {
-          this.formData = {...res.data}
-          this.formData.lastTime = this.formData.lastTime.substring(0, 10)
-          this.myUserInfo = res.data.myUserInfo
-          this.getList()
-        }
-      });
-    },
-
-    // 子任务列表
-    getList(){
-      this.instance.post(`/app/appworktaskinfo/list`, null,{
-        params: {
-          parentTaskCode: this.formData.taskCode,
-          ...this.page,
-          status: this.sonListType,
-          taskRole: '0'
-        }
-      }).then(res => {
-        if (res && res.code == 0) {
-          this.workList = res.data.records;
-          this.page.total = res.data.total;
-        }
-      });
-    },
-
-    toSonDetail(item) {
-      this.showSonDetail = true
-      this.sonDetailParams = item
-    },
-
-    // 创建子任务
-    gotoCreate() {
-      this.showAdd = true
-      this.parentTaskCode = this.formData.taskCode
-    },
-
-    // 更新进度
-    updateProcess(formName){
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.instance.post(`/app/appworktaskprocess/addOrUpdate`, {...this.processForm, taskCode:this.formData.taskCode}, null).then(res => {
-            if (res && res.code == 0) {
-              this.taskProcess = false
-              this.getDetail()
-            }
-          });
-        } else {
-          console.log('error submit!!');
-          return false;
-        }
-      });
-    },
-
-    onBack(isRefresh) {
-      if(this.params.fromType == 'SonDetail' && this.params.sonDetailId) {
-        this.$emit('change', {
-          type: 'SonDetail',
-          params: {
-            type: 'SonDetail',
-            id: this.params.sonDetailId
-          }
-        })
-      }else {
-        this.$emit('change', {
-          type: 'list',
-          isRefresh: isRefresh ? true : false,
-        })
-      }
-    },
-    comBack() {
-      this.showSonDetail = false
-      this.showAdd = false
-      this.getDetail()
-    },
-    downFileAll () {
-      if (this.formData.fileList.length > 0) {
-        this.instance.post('/app/appworktaskinfo/downLoadAllFileForDetail', null, {
-          responseType: 'blob',
-          params: {
-            id: this.formData.id
-          }
-        }).then((res) => {
-          const link = document.createElement('a')
-          let blob = new Blob([res], { type: 'application/vnd.ms-excel' })
-          link.style.display = 'none'
-          link.href = URL.createObjectURL(blob)
-          var num = ''
-          for (let i = 0; i < 10; i++) {
-            num += Math.ceil(Math.random() * 10)
-          }
-          link.setAttribute('download', '工作文件' + '.zip')
-          document.body.appendChild(link)
-          link.click()
-          document.body.removeChild(link)
-        })
-      } else {
-        this.$message.error('暂无附件提供下载')
-      }
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-  .especial {
-    margin-bottom: 12px;
-    .icon {
-      vertical-align: top;
-      display: inline-block;
-      padding-top: 5px;
-      margin-left: 20px;
-      color: #f46;
-    }
-    .people {
-      display: inline-block;
-      font-size: 14px;
-      color: #666;
-      margin-right: 16px;
-      vertical-align: top;
-    }
-    .AiWechatSelecter {
-      display: inline-block;
-      margin-left: 3px;
-    }
-    .hint {
-      font-size: 14px;
-      color: #999;
-      margin-left: 16px;
-    }
-    .mar-r40{
-      margin-right: 40px;
-    }
-    .w80{
-      width: 80px;
-      text-align: right;
-      color: #888;
-    }
-  }
-  .add-icon{
-    text-align: right;
-    cursor: pointer;
-    i{
-      font-size: 14px;
-    }
-  }
-  .color1{
-    color:#4B87FE;
-  }
-  .color2{
-    color:#2EA222;
-  }
-  .color3{
-    color:#999999;
-  }
-  .AiWechatSelecter{
-    width: calc(100% - 150px);
-  }
-</style>
diff --git a/packages/wechat/AppWorkTask/components/ExecuteList.vue b/packages/wechat/AppWorkTask/components/ExecuteList.vue
deleted file mode 100644
index 8d1c8c76..00000000
--- a/packages/wechat/AppWorkTask/components/ExecuteList.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-<template>
-  <ai-list isTabs>
-    <template slot="content">
-      <ai-search-bar class="ai-search">
-        <template slot="left">
-          <ai-select v-model="search.status" placeholder="请选择状态" clearable @change=";(page.current = 1), getList()"
-                     :selectList="dict.getDict('workTaskDoStatus')"></ai-select>
-          <el-row class="dateRange" type="flex" align="middle">
-            <span class="dateLabel">创建日期</span>
-            <el-date-picker size="small" v-model="search.startTime" placeholder="开始日期"
-                            @change=";(page.current = 1), getList()" value-format="yyyy-MM-dd"/>
-            <el-date-picker size="small" v-model="search.lastTime" placeholder="结束日期"
-                            @change=";(page.current = 1), getList()" value-format="yyyy-MM-dd"/>
-          </el-row>
-        </template>
-        <template slot="right">
-          <el-input placeholder="任务标题" v-model="search.taskTitle" size="small" @change="(page.current = 1), getList()"
-                    clearable prefix-icon="iconfont iconSearch"/>
-        </template>
-      </ai-search-bar>
-      <el-button style="margin-bottom: 10px;" class="el-button" type="primary" icon="iconfont iconAdd" size="small"
-                 @click="toDetail('', 'Add')">创建任务
-      </el-button>
-      <ai-table class="ai-table" :tableData="tableData" :col-configs="colConfigs" :total="page.total"
-                :current.sync="page.current" :size.sync="page.size" @getList="getList" :dict="dict">
-        <el-table-column slot="lastTime" label="截止日期" width="240">
-          <template slot-scope="{ row }">
-            <span>{{ row.lastTime }}<i :style="row.isOverTime==0?'color:#FF8822;':'color:#FF4466;'"
-                                       style="margin-left:8px;font-style:inherit"
-                                       v-if="row.overTimeStatus">({{ row.overTimeStatus }})</i></span>
-          </template>
-        </el-table-column>
-        <el-table-column slot="percent" label="当前进度" align="center" width="120">
-          <template slot-scope="{ row }">
-            <div>{{ row.percent + '%' }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column slot="options" label="操作" align="center" width="200">
-          <template slot-scope="{ row }">
-            <div class="table-options">
-              <el-button type="text" @click="toDetail(row.id, 'Detail')">详情</el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </ai-table>
-    </template>
-  </ai-list>
-</template>
-
-<script>
-export default {
-  name: 'ExecuteList',
-  components: {},
-  props: {
-    instance: Function,
-    dict: Object,
-    params: Object,
-  },
-  data() {
-    return {
-      tableData: [],
-      colConfigs: [
-        {prop: 'taskTitle', label: '任务标题'},
-        {
-          prop: "type",
-          label: "任务类型",
-          width: 120,
-          align: "center",
-          formart: (type) =>
-              this.$dict.getLabel("workTaskType", type),
-        },
-        {prop: 'createTime', label: '创建日期', width: 120},
-        {slot: 'lastTime', label: '截止日期'},
-        {
-          prop: "doStatus",
-          label: "任务状态",
-          width: 120,
-          align: "center",
-          formart: (doStatus) =>
-              this.$dict.getLabel("workTaskDoStatus", doStatus),
-        },
-        {slot: 'percent', label: '当前进度', align: "center"},
-      ],
-      page: {
-        size: 10,
-        current: 1,
-        total: 0,
-      },
-      search: {
-        status: '',
-        startTime: '',
-        lastTime: '',
-        taskTitle: '',
-      },
-    }
-  },
-  created() {
-    this.dict.load('workTaskDoStatus', 'workTaskType').then(() => {
-      this.getList()
-    })
-  },
-  methods: {
-    getList() {
-      this.instance
-      .post(`/app/appworktaskinfo/list`, null, {
-        params: {
-          ...this.page,
-          ...this.search,
-          taskRole: 1,
-        },
-      })
-      .then((res) => {
-        if (res.code == 0) {
-          this.tableData = res.data.records
-          this.page.total = res.data.total
-          if (this.tableData.length) {
-            this.tableData.map((item) => {
-              if (item.createTime) {
-                item.createTime = item.createTime.substring(0, 10)
-              }
-              if (item.lastTime) {
-                item.lastTime = item.lastTime.substring(0, 10)
-              }
-            })
-          }
-        }
-      })
-    },
-    toDetail(id, type) {
-      this.$emit('change', {
-        type: type,
-        params: {
-          type: type,
-          taskRole: '1',
-          id,
-        }
-      })
-    },
-    // changePage(){}
-
-    reset() {
-      Object.keys(this.search).forEach((e) => {
-        this.search[e] = ''
-      })
-      this.search.startTime = null
-      this.search.lastTime = null
-      this.getList()
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.ai-search {
-  ::v-deep .dateRange {
-    display: flex;
-
-    .dateLabel {
-      height: 32px;
-      border: 1px solid #d0d4dc;
-      line-height: 32px;
-      padding: 0 8px;
-      background: #f5f5f5;
-      font-size: 14px;
-    }
-  }
-}
-</style>
diff --git a/packages/wechat/AppWorkTask/components/InitiatorList.vue b/packages/wechat/AppWorkTask/components/InitiatorList.vue
deleted file mode 100644
index 561e3224..00000000
--- a/packages/wechat/AppWorkTask/components/InitiatorList.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-  <ai-list isTabs>
-    <template slot="content">
-      <ai-search-bar class="ai-search">
-        <template slot="left">
-          <ai-select v-model="search.status" placeholder="请选择状态" clearable @change=";(page.current = 1), getList()" :selectList="dict.getDict('workTaskStatus')"></ai-select>
-          <el-row class="dateRange" type="flex" align="middle">
-            <span class="dateLabel">创建日期</span>
-            <el-date-picker size="small" v-model="search.startTime" placeholder="开始日期" @change=";(page.current = 1), getList()" value-format="yyyy-MM-dd" />
-            <el-date-picker size="small" v-model="search.lastTime" placeholder="结束日期" @change=";(page.current = 1), getList()" value-format="yyyy-MM-dd" />
-          </el-row>
-        </template>
-        <template slot="right">
-           <el-input placeholder="任务标题"  v-model="search.taskTitle"  size="small" @change="(page.current = 1), getList()"  clearable prefix-icon="iconfont iconSearch"/>
-        </template>
-      </ai-search-bar>
-      <el-button style="margin-bottom: 10px;" class="el-button" type="primary" icon="iconfont iconAdd" size="small" @click="toAdd('', 'Add')">创建任务</el-button>
-      
-      <ai-table class="ai-table" :tableData="tableData" :col-configs="colConfigs" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getList" :dict="dict">
-        <el-table-column slot="taskTitle" label="任务标题">
-          <template slot-scope="{ row }">
-            <span>{{row.parentTaskCode ? '[子任务]' + row.taskTitle : row.taskTitle}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column slot="lastTime" label="截止日期" width="240">
-          <template slot-scope="{ row }">
-            <span>{{row.lastTime}}<i  :style="row.isOverTime==0?'color:#FF8822;':'color:#FF4466;'" style="margin-left:8px;font-style:inherit" v-if="row.overTimeStatus">({{row.overTimeStatus}})</i></span>
-          </template>
-        </el-table-column>
-        <el-table-column slot="percent" label="当前进度" align="center" width="120">
-          <template slot-scope="{ row }">
-            <div>{{row.percent + '%'}}</div>
-          </template>
-        </el-table-column>
-        <el-table-column slot="options" label="操作" align="center" width="200">
-          <template slot-scope="{ row }">
-            <div class="table-options">
-              <el-button type="text" @click="toDetail(row)">详情</el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </ai-table>
-    </template>
-  </ai-list>
-</template>
-
-<script>
-export default {
-  name: 'InitiatorList',
-  components: {},
-  props: {
-    instance: Function,
-    dict: Object,
-    params: Object,
-    taskRole: String
-  },
-  data() {
-    return {
-      tableData: [],
-      colConfigs: [
-        { slot: 'taskTitle', label: '任务标题'},
-        {
-          prop: "type",
-          label: "任务类型",
-          width: 120,
-          align: "center",
-          formart: (type) =>
-            this.$dict.getLabel("workTaskType", type),
-        },
-        { prop: 'createTime', label: '创建日期', width: 120},
-        { slot: 'lastTime', label: '截止日期'},
-        {
-          prop: "status",
-          label: "任务状态",
-          width: 120,
-          align: "center",
-          formart: (status) =>
-            this.$dict.getLabel("workTaskStatus", status),
-        },
-        { slot: 'percent', label: '当前进度',align: "center" },
-      ],
-      page: {
-        size: 10,
-        current: 1,
-        total: 0,
-      },
-      search: {
-        status: '',
-        startTime: '',
-        lastTime: '',
-        taskTitle: '',
-      },
-    }
-  },
-  mounted() {
-    this.dict.load('workTaskStatus', 'workTaskType').then(() => {
-      this.getList()
-    })
-  },
-  methods: {
-    getList() {
-      this.instance
-        .post(`/app/appworktaskinfo/list`, null, {
-          params: {
-            ...this.page,
-            ...this.search,
-            taskRole: this.taskRole,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.page.total = res.data.total
-            if(this.tableData.length) {
-              this.tableData.map((item) => {
-                if(item.createTime) {
-                  item.createTime = item.createTime.substring(0, 10)
-                }
-                if(item.lastTime) {
-                  item.lastTime = item.lastTime.substring(0, 10)
-                }
-              })
-            }
-          }
-        })
-    },
-    toDetail(item) {
-      this.$emit('change', {
-        type: 'SonDetail',
-        params: item
-      })
-    },
-    toAdd() {
-      this.$emit('change', {
-        type: 'Add',
-        params: {
-          type: 'Add',
-          taskRole: '1',
-          id: '',
-        }
-      })
-    },
-    // changePage(){}
-
-    reset() {
-      Object.keys(this.search).forEach((e) => {
-        this.search[e] = ''
-      })
-      this.search.startTime = null
-      this.search.lastTime = null
-      this.getList()
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.ai-search {
-  ::v-deep .dateRange {
-    display: flex;
-    .dateLabel {
-      height: 32px;
-      border: 1px solid #d0d4dc;
-      line-height: 32px;
-      padding: 0 8px;
-      background: #f5f5f5;
-      font-size: 14px;
-    }
-  }
-}
-</style>
diff --git a/packages/wechat/AppWorkTask/components/SonDetail.vue b/packages/wechat/AppWorkTask/components/SonDetail.vue
deleted file mode 100644
index db4c3bc3..00000000
--- a/packages/wechat/AppWorkTask/components/SonDetail.vue
+++ /dev/null
@@ -1,1065 +0,0 @@
-<template>
-  <div style="height:100%">
-    <ai-detail>
-      <template #title>
-        <ai-title
-          :title="basicInfo.parentTaskCode ? '子任务详情' : '任务详情'"
-          isShowBottomBorder
-          isShowBack
-          @onBackClick="onBack()"
-        >
-          <template #rightBtn v-if="detailType == 1">
-            <el-button
-              type="primary"
-              icon="iconfont iconReject"
-              v-if="basicInfo.status == 0"
-              @click="closeWork()">关闭任务</el-button
-            >
-            <el-button
-              type="primary"
-              icon="iconfont iconCorrect"
-              v-if="basicInfo.status == 0"
-              @click="markCompleted('1')"
-              >确认完成</el-button
-            >
-            <el-button
-              icon="iconfont iconDelete"
-              class="del-btn-list"
-              v-if="basicInfo.status == 1 || basicInfo.status == 2"
-              @click="deleteTask()"
-              >删除任务</el-button
-            >
-          </template>
-        </ai-title>
-      </template>
-      <template #content>
-        <ai-card title="任务进度">
-          <template #right v-if="basicInfo.parentTaskCode && detailType != 2 && detailType != 3">
-            <el-button type="primary" @click="toParent()">查看父级任务</el-button>
-          </template>
-          <template slot="content">
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2">
-              <ai-info-item
-                label="任务状态："
-                :class="{
-                  color1: basicInfo.status == 0,
-                  color2: basicInfo.status == 1,
-                  color3: basicInfo.status == 2,
-                }"
-                ><span>{{
-                  dict.getLabel("workTaskStatus", basicInfo.status) || "-"
-                }}</span></ai-info-item
-              >
-              <ai-info-item label="当前进度："
-                ><span>{{ basicInfo.percent + "%" }}</span></ai-info-item
-              >
-            </ai-wrapper>
-            <div class="echart" id="echart"></div>
-          </template>
-        </ai-card>
-        <ai-card title="任务执行情况">
-          <template slot="content">
-            <el-row
-              type="flex"
-              justify="space-between"
-              align="center"
-              style="margin-bottom: 8px"
-            >
-              <el-col :span="16">
-                <el-radio-group
-                  v-model="ListType"
-                  size="small"
-                  @change="ListTypeChange"
-                >
-                  <el-radio-button label="userInfoList">执行人</el-radio-button>
-                  <el-radio-button label="checkUserList">督办人</el-radio-button>
-                  <el-radio-button label="sendUserList">抄送人</el-radio-button>
-                </el-radio-group>
-                <el-input
-                  v-model="listName"
-                  placeholder="姓名"
-                  size="small"
-                  style="width: 160px; margin-left: 8px"
-                  @input="filterData"
-                ></el-input>
-              </el-col>
-              <el-col
-                :span="8"
-                class="icon add-icon"
-                v-if="basicInfo.status == 0"
-              >
-                <ai-wechat-selecter style="display: inline-block;"  v-if="ListType == 'userInfoList' && detailType == 1"
-                :instance="instance"
-                v-model="addUserList"
-                :disable="appReportTaskDoInfoList"
-                :isAdd="false"
-                @change="confirmAdd(1)"
-                >
-                  <i
-                    class="iconfont iconAdd"
-                    style="color: #5088ff"
-                    >添加执行人</i
-                  >
-                </ai-wechat-selecter>
-
-                <ai-wechat-selecter style="display: inline-block;"  v-if="ListType == 'checkUserList' && detailType == 1"
-                :instance="instance"
-                :disable="appReportTaskDoInfoList"
-                v-model="addUserList"
-                :isAdd="false"
-                @change="confirmAdd(2)"
-                >
-                  <i
-                  class="iconfont iconAdd"
-                  style="color: #5088ff"
-                  >添加督办人</i
-                >
-                </ai-wechat-selecter>
-
-                <ai-wechat-selecter style="display: inline-block;" v-if="ListType == 'sendUserList' && detailType == 1"
-                :instance="instance"
-                v-model="addUserList"
-                :disable="appReportTaskDoInfoList"
-                :isAdd="false"
-                @change="confirmAdd(3)"
-                >
-                  <i
-                  class="iconfont iconAdd"
-                  style="color: #5088ff"
-                  >添加抄送人</i
-                  >
-                </ai-wechat-selecter>
-
-                <i
-                  class="iconfont iconClock"
-                  style="color: #5088ff; margin-left: 8px"
-                  :style="isAll ? 'opacity:0.5' : ''"
-                  v-if="ListType == 'userInfoList' && detailType != 3"
-                  @click="urgeMessageAll()"
-                  >一键催办</i
-                >
-              </el-col>
-            </el-row>
-            <ai-table :isShowPagination="false"
-              class="ai-table"
-              :tableData="basicInfo[ListType]"
-              :col-configs="colConfigs"
-              :dict="dict"
-            >
-              <el-table-column slot="status" label="任务状态" align="center" v-if="ListType == 'userInfoList'">
-                <template slot-scope="{ row }">
-                  <span >{{$dict.getLabel("workTaskStatus", row.doStatus)}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column slot="percent" label="完成时间" align="center" v-if="ListType == 'userInfoList'">
-                <template slot-scope="{ row }">
-                  <span >{{ row.finishTime|| '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column slot="percent" label="完成进度" align="center" v-if="ListType == 'userInfoList'">
-                <template slot-scope="{ row }">
-                  <span>{{ row.percent + '%'}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                slot="options"
-                label="操作"
-                align="center"
-                fixed="right"
-                width="200"
-              >
-                <template slot-scope="{ row }">
-                  <div>
-                    <i
-                      class="iconfont iconClock icon-color89B"
-                      title="催办"
-                      :style="
-                        row.doStatus == 0
-                          ? row.isSend
-                            ? 'opacity:0.5'
-                            : ''
-                          : 'opacity:0.5'
-                      "
-                      style="cursor: pointer"
-                      v-if="ListType == 'userInfoList' && basicInfo.status == 0 && detailType != 3"
-                      @click="urgeMessage(row)"
-                    ></i>
-                    <span
-                      class="iconfont iconShow icon-color89B"
-                      title="详情"
-                      v-if="ListType == 'userInfoList'"
-                      style="cursor: pointer; margin-left: 8px"
-                      @click="getExecute(row)"
-                    ></span>
-                    <span
-                      class="iconfont iconRevoke icon-color89B"
-                      title="删除"
-                      style="margin-left: 8px; cursor: pointer"
-                      v-if="basicInfo.status == 0 && detailType == 1"
-                      @click="deleteUnit(row)"
-                    ></span>
-                  </div>
-                </template>
-              </el-table-column>
-            </ai-table>
-          </template>
-        </ai-card>
-        <ai-card title="任务信息">
-          <template slot="content">
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2">
-              <ai-info-item label="发起人："
-                ><span>{{ basicInfo.sponsorUserName }}</span></ai-info-item
-              >
-              <ai-info-item label="创建人："
-                ><span>{{ basicInfo.createUserName }}</span></ai-info-item
-              >
-              <ai-info-item label="创建时间："
-                ><span>{{ basicInfo.createTime }}</span></ai-info-item
-              >
-            </ai-wrapper>
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2">
-              <ai-info-item label="任务状态：">
-                <span>{{
-                  dict.getLabel("workTaskStatus", basicInfo.status) || "-"
-                }}</span>
-              </ai-info-item>
-              <ai-info-item label="任务类型："
-                ><span>{{
-                  $dict.getLabel("workTaskType", basicInfo.type) || "-"
-                }}</span></ai-info-item
-              >
-            </ai-wrapper>
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2">
-              <ai-info-item label="截止时间：">
-                <span
-                  >{{ basicInfo.lastTime
-                  }}<i
-                    :style="
-                      basicInfo.isOverTime == 0
-                        ? 'color:#FF8822;'
-                        : 'color:#FF4466;'
-                    "
-                    style="margin-left: 8px; font-style: inherit"
-                    v-if="basicInfo.overTimeStatus"
-                    >({{ basicInfo.overTimeStatus }})</i
-                  ></span
-                >
-              </ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper label-width="80px" :columnsNumber="1">
-              <ai-info-item label="任务说明："
-                ><span>{{ basicInfo.taskDescription }}</span></ai-info-item
-              >
-            </ai-wrapper>
-            <ai-bar title="附件">
-              <template
-                slot="right"
-                v-if="basicInfo.fileList && basicInfo.fileList.length"
-              >
-                <span class="Edit" @click="downFileAll"
-                  ><i class="iconfont iconDownload"></i>下载全部</span
-                >
-              </template>
-            </ai-bar>
-            <ai-file-list
-              v-if="basicInfo.fileList && basicInfo.fileList.length"
-              :fileList="basicInfo.fileList"
-              :fileOps="{ name: 'name', size: 'fileSizeStr' }"
-            ></ai-file-list>
-          </template>
-        </ai-card>
-        <ai-card title="人员信息">
-          <template slot="content">
-            <div class="especial">
-              <span class="people mar-r40 w80">执行人：</span>
-              <ai-wechat-selecter
-                slot="append"
-                isShowUser
-                :instance="instance"
-                v-model="basicInfo.userInfoList"
-                :isAdd="false"
-              ></ai-wechat-selecter>
-            </div>
-            <div class="especial">
-              <span class="people mar-r40 w80">督办人：</span>
-              <ai-wechat-selecter
-                slot="append"
-                isShowUser
-                :instance="instance"
-                v-model="basicInfo.checkUserList"
-                :isAdd="false"
-              ></ai-wechat-selecter>
-            </div>
-            <div class="especial">
-              <span class="people mar-r40 w80">抄送人：</span>
-              <ai-wechat-selecter
-                slot="append"
-                isShowUser
-                :instance="instance"
-                v-model="basicInfo.sendUserList"
-                :isAdd="false"
-              ></ai-wechat-selecter>
-            </div>
-          </template>
-        </ai-card>
-        <el-dialog
-          class="deleteStyle mask execute"
-          :visible.sync="executeDialog"
-          width="800px"
-          title="执行情况"
-          :close-on-click-modal="false"
-        >
-          <el-dialog
-            width="520px"
-            title="执行说明："
-            class="deleteStyle mask execute"
-            :visible.sync="innerVisible"
-            @close="getExecute(executeInfo)"
-            :close-on-click-modal="false"
-            append-to-body
-          >
-            <div style="width: 480px; margin: auto; padding: 8px 0">
-              <el-form
-                :model="sayInfo"
-                ref="numberValidateForm"
-                label-width="100px"
-                class="demo-ruleForm"
-              >
-                <el-form-item label="执行说明：" prop="doDescription">
-                  <el-input
-                    maxlength="1000"
-                    show-word-limit
-                    type="textarea"
-                    :rows="3"
-                    v-model="sayInfo.doDescription"
-                    autocomplete="off"
-                  ></el-input>
-                </el-form-item>
-              </el-form>
-            </div>
-            <div slot="footer" style="text-align: center">
-              <el-button
-                style="width: 92px"
-                size="small"
-                @click="(innerVisible = false), getExecute(executeInfo)"
-                >取 消</el-button
-              >
-              <el-button
-                style="width: 92px"
-                type="primary"
-                size="small"
-                @click="updateDescription()"
-                >确 认</el-button
-              >
-            </div>
-          </el-dialog>
-          <div
-            style="
-              width: 740px;
-              margin: auto;
-              padding: 8px 0;
-              max-height: 600px;
-              overflow: auto;
-            "
-          >
-            <ai-wrapper class="mar-t16" label-width="80px" :columnsNumber="2">
-              <ai-info-item label="执行人："><span>{{ executeInfo.userName }}</span></ai-info-item>
-              <ai-info-item label="手机号："><span>{{ executeInfo.phone }}</span></ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper label-width="80px" :columnsNumber="1">
-              <ai-info-item label="所属部门："><span>{{ executeInfo.unitName }}</span></ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper label-width="80px" :columnsNumber="2">
-              <ai-info-item label="执行状态：">
-                <p v-if="executeInfo.doStatus == 0" style="color: #ff8822">
-                  未完成
-                </p>
-                <p v-if="executeInfo.doStatus == 1" style="color: #2ea222">
-                  已完成
-                </p>
-                <p v-if="executeInfo.doStatus == 2">已终止</p>
-                <p v-if="executeInfo.doStatus == 3">进行中</p>
-                <p v-if="executeInfo.doStatus == 4">已关闭</p>
-                <p v-if="executeInfo.doStatus == null">-</p>
-              </ai-info-item>
-              <ai-info-item label="完成时间：">
-                <i style="display: block; font-style: normal">{{
-                  executeInfo.finishTime || "-"
-                }}</i>
-                <i
-                  style="color: #ff4466; display: block; font-style: normal"
-                  v-if="executeInfo.overTimeStatus && executeInfo.doStatus == 1"
-                  >({{ executeInfo.overTimeStatus }})</i
-                >
-              </ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper label-width="80px" :columnsNumber="1">
-              <ai-info-item label="当前进度："><span>{{ executeInfo.percent + "%" }}</span></ai-info-item>
-            </ai-wrapper>
-            <ai-wrapper label-width="80px" :columnsNumber="1">
-              <ai-info-item label="执行说明："><span>{{ executeInfo.doDescription }}</span></ai-info-item>
-            </ai-wrapper>
-
-            <div class="step">
-              <!-- <el-steps direction="vertical" :active="null" >
-                  <el-step icon="iconfont iconSteps_Finished" v-for="(e,index) in executeInfo.processList" :key="index">
-                      <template v-slot:title>
-                          <p style="color:#333333;">{{e.remarks}}</p>
-                      </template>
-                      <template v-slot:description>
-                          <p style="color:#999999;">完成到 <span :style="e.percent<100 ? 'color:#5088FF':'color:#2EA222' ">{{e.percent}}%</span>  |  {{e.createDate}}</p>
-                      </template>
-                  </el-step>
-                  
-              </el-steps> -->
-              <el-timeline>
-                <el-timeline-item
-                  v-for="(e, index) in executeInfo.processList"
-                  :key="index"
-                >
-                  <p style="color: #333333">{{ e.remarks }}</p>
-                  <p style="color: #999999">
-                    完成到
-                    <span
-                      :style="e.percent < 100 ? 'color:#5088FF' : 'color:#2EA222'"
-                      >{{ e.percent }}%</span
-                    >
-                    | {{ e.createDate }}
-                  </p>
-                </el-timeline-item>
-              </el-timeline>
-            </div>
-          </div>
-          <div slot="footer" style="text-align: center">
-            <el-button
-              style="width: 92px"
-              size="small"
-              @click="executeDialog = false"
-              >关 闭</el-button
-            >
-            <el-button
-              style="width: 148px"
-              type="primary"
-              size="small"
-              @click="
-                (innerVisible = true),
-                  (sayInfo.doDescription = executeInfo.doDescription)
-              "
-              v-if="basicInfo.status == 0"
-              >编辑执行说明</el-button
-            >
-          </div>
-        </el-dialog>
-      </template>
-    </ai-detail>
-    <!-- <detail v-else :instance="instance" :dict="dict" @back="showDetail=false" :params="parentInfo" fromType="SonDetail" detailType="1"></detail> -->
-  </div>
-</template>
-
-<script>
-
-import * as echarts from "echarts";
-import { mapState } from "vuex";
-export default {
-  name: "SonDetail",
-  props: {
-    instance: Function,
-    params: Object,
-    dict: Object,
-    detailType: String
-  },
-  data() {
-    return {
-      basicInfo: {
-        userInfoList: [],
-        checkUserList: [],
-        sendUserList: [],
-      },
-      ListType: "userInfoList",
-      listName: "",
-      saveList: [],
-      suspendDialog: false,
-      REttitle: "",
-      writeInfo: {
-        finishDescription: "",
-      },
-      appReportTaskDoInfoList: [],
-      taskRole: "1",
-      checkName: "",
-      sendName: "",
-      userName: "",
-      executeDialog: false,
-      executeInfo: {},
-      sayInfo: {
-        doDescription: "",
-      },
-      isAll: false,
-      colConfigs: [
-        { prop: "userName", label: "姓名" },
-        { prop: "phone", label: "手机号码" },
-        { prop: "unitName", label: "所属部门" },
-        { slot: "status"},
-        { slot: "percent", label: "完成进度" },
-        { slot: "finishTime"},
-        { slot: "options", label: "操作" },
-      ],
-      addUserList: [],
-      innerVisible: false,
-      showDetail: false,
-      parentInfo: {}
-    };
-  },
-  computed: {
-    ...mapState(["user"]),
-  },
-  mounted() {
-    this.dict
-      .load("workTaskType", "workTaskStatus", "workTaskFinishStatus")
-      .then(() => {
-        this.searchDetail();
-      });
-  },
-  methods: {
-    //查详情
-    searchDetail() {
-      this.sendName = "";
-      this.checkName = "";
-      this.userName = "";
-      this.instance
-        .post("/app/appworktaskinfo/queryDetailById", null, {
-          params: { id: this.params.id },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.basicInfo = res.data;
-
-            this.basicInfo.userInfoList.map((item) => {
-              item.detailId = item.id
-              item.name = item.userName
-              item.id = item.userId
-            })
-
-            if(this.basicInfo.checkUserList.length) {
-              this.basicInfo.checkUserList.map((item) => {
-              item.detailId = item.id
-              item.name = item.userName
-              item.id = item.userId
-              })
-            }
-
-            if(this.basicInfo.sponsorUserList.length) {
-              this.basicInfo.sponsorUserList.map((item) => {
-              item.detailId = item.id
-              item.name = item.userName
-              item.id = item.userId
-              })
-            }
-
-            if(this.basicInfo.sendUserList.length) {
-              this.basicInfo.sendUserList.map((item) => {
-              item.detailId = item.id
-              item.name = item.userName
-              item.id = item.userId
-              })
-            }
-            
-            
-            this.parentInfo = res.data.parentTask
-            this.saveList = JSON.stringify(this.basicInfo[this.ListType]);
-
-            if (this.basicInfo.checkUserList.length) {
-              this.basicInfo.checkUserList.forEach((v) => {
-                this.checkName += v.userName + "、";
-              });
-              this.checkName = this.checkName.substring(
-                0,
-                this.checkName.length - 1
-              );
-            }
-
-            if (this.basicInfo.userInfoList.length) {
-              this.basicInfo.userInfoList.forEach((v, index) => {
-                this.userName += v.userName + "、";
-                this.basicInfo.userInfoList[index].isSend = false;
-              });
-              this.userName = this.userName.substring(
-                0,
-                this.userName.length - 1
-              );
-            }
-
-            if (this.basicInfo.sendUserList.length) {
-              this.basicInfo.sendUserList.forEach((v) => {
-                this.sendName += v.userName + "、";
-              });
-              this.sendName = this.sendName.substring(
-                0,
-                this.sendName.length - 1
-              );
-            }
-
-            //人员选择器去重
-            this.appReportTaskDoInfoList = [
-              ...this.basicInfo.userInfoList,
-              ...this.basicInfo.checkUserList,
-              ...this.basicInfo.sendUserList,
-              ...this.basicInfo.sponsorUserList,
-            ];
-            this.showEchartScale();
-          }
-        });
-    },
-    showEchartScale() {
-      let myChart = echarts.init(document.getElementById("echart"));
-      let legendData = ["未完成", "已完成", "逾期完成"];
-      let seriesData = [
-        { value: this.basicInfo.unFinished, name: "未完成" },
-        { value: this.basicInfo.finishedOnTime, name: "按时完成" },
-        { value: this.basicInfo.finishedOutOfTime, name: "逾期完成" },
-      ];
-      let option = {
-        backgroundColor: "#fff",
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b} : {c} ({d}%)",
-        },
-        legend: {
-          orient: "vertical",
-          right: 340,
-          top: 70,
-          bottom: 20,
-          itemWidth: 8,
-          itemHeight: 8,
-          formatter: (name) => {
-            let item = seriesData.find((e) => e.name == name);
-            return `{title|${name}}{content|${
-              item ? item.value.toLocaleString() : 0
-            }}`;
-          },
-          // data: legendData
-          textStyle: {
-            fontSize: 14,
-            rich: {
-              title: {
-                width: 100,
-                color: "#AAA",
-                paddingLeft: 6,
-                fontSize: 14,
-              },
-              content: {
-                color: "#333",
-                width: 50,
-                align: "right",
-                fontSize: 14,
-              },
-            },
-          },
-        },
-        series: [
-          {
-            name: "完成情况比例",
-            type: "pie",
-            radius: ["40%", "75%"],
-            center: ["14%", "45%"],
-            avoidLabelOverlap: false,
-            label: {
-              position: "inside",
-              formatter: (params) => {
-                if (params.value == 0) {
-                  return "";
-                } else {
-                  return `${params.percent}%`;
-                }
-              },
-            },
-            data: seriesData,
-            itemStyle: {
-              normal: {
-                color: function (params) {
-                  //自定义颜色
-                  var colorList = ["#FFAA44", "#2EA222", "#3D94FB"];
-                  return colorList[params.dataIndex];
-                },
-              },
-            },
-          },
-        ],
-      };
-      myChart.setOption(option);
-    },
-    ListTypeChange(val) {
-      this.saveList = JSON.stringify(this.basicInfo[val]);
-      this.listName = "";
-      if (val == "userInfoList") this.taskRole = "1";
-      if (val == "checkUserList") this.taskRole = "2";
-      if (val == "sendUserList") this.taskRole = "3";
-      this.searchDetail(this.params.id);
-    },
-    //删除任务
-    deleteTask() {
-      this.$confirm("是否确认删除本次任务，删除后无法恢复？", {
-        type: "error",
-      }).then(() => {
-        this.instance
-          .post("/app/appworktaskinfo/delete", null, {
-            params: {
-              id: this.params.id,
-            },
-          })
-          .then((res) => {
-            if (res.code == 0) {
-              this.$message.success("删除成功");
-              this.onBack();
-            }
-          });
-      });
-    },
-    filterData(val) {
-      if (val) {
-        let list = JSON.parse(this.saveList).filter(
-          (e) => e.userName.indexOf(val) !== -1
-        );
-        this.$set(this.basicInfo, this.ListType, list);
-      } else {
-        this.$set(this.basicInfo, this.ListType, JSON.parse(this.saveList));
-      }
-    },
-    //催办多人
-    urgeMessageAll() {
-      if (!this.isAll) {
-        this.$confirm("是否向全部执行人发送催办提醒？", {
-          type: "warning",
-          title: "发送催办提醒",
-        }).then(() => {
-          this.instance
-            .post("/app/appworktaskuserinfo/sendMesage", null, {
-              params: {
-                id: this.params.id,
-              },
-            })
-            .then((res) => {
-              if (res.code == 0) {
-                this.$message.success("催办消息已发送");
-                this.isAll = true;
-                this.basicInfo.userInfoList.forEach((e, index) => {
-                  e.isSend = true;
-                  this.$set(this.basicInfo.userInfoList, index, e);
-                });
-              }
-            });
-        });
-      }
-    },
-    //催办单人
-    urgeMessage(row) {
-      if (row.doStatus == 0 && !row.isSend) {
-        this.$confirm(`是否向【执行人：${row.userName}】发送催办提醒？`, {
-          type: "warning",
-          title: "发送催办提醒",
-        }).then(() => {
-          this.instance
-            .post("/app/appworktaskuserinfo/sendMesageOne", null, {
-              params: {
-                id: row.detailId,
-              },
-            })
-            .then((res) => {
-              if (res.code == 0) {
-                this.$message.success("催办消息已发送");
-                row.isSend = true;
-                let index = this.basicInfo.userInfoList.findIndex(
-                  (e) => e.id == row.id
-                );
-                if (index > -1)
-                  this.$set(this.basicInfo.userInfoList, index, row);
-              }
-            });
-        });
-      }
-    },
-    //执行情况
-    getExecute(row) {
-      this.instance
-        .post("/app/appworktaskuserinfo/queryDetailById", null, {
-          params: {
-            id: row.detailId,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.executeDialog = true;
-            this.executeInfo = res.data;
-            this.executeInfo.detailId = this.executeInfo.id
-          }
-        });
-    },
-    updateDescription() {
-      this.instance
-        .post(`/app/appworktaskuserinfo/updateDoDescription`, {
-          id: this.executeInfo.detailId,
-          doDescription: this.sayInfo.doDescription,
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.innerVisible = false;
-          }
-        });
-    },
-    //中止任务-取消任务-退回任务
-    overTask(formName) {
-      let url = ``;
-      if (this.REttitle == "任务完成情况") {
-        url = `/app/appworktaskuserinfo/confirm`;
-        var obj = {
-          taskCode: this.params.taskCode,
-          finishDescription: this.writeInfo.finishDescription,
-          lastTime: this.basicInfo.lastTime,
-        };
-      } else if (this.REttitle == "关闭任务") {
-        url = `/app/appworktaskinfo/stopOrFinish`;
-        var obj = {
-          id: this.params.id,
-          status: "2",
-          closeDescription: this.writeInfo.finishDescription,
-        };
-      } else if (this.REttitle == "取消任务") {
-        url = `/app/appreporttaskinfo/cancelTaskById`;
-        var obj = {
-          id: this.params.id,
-          ...this.writeInfo,
-        };
-      }
-      this.instance
-        .post(
-          url,
-          {
-            ...obj,
-          },
-          null
-        )
-        .then((res) => {
-          if (res.code == 0) {
-            this.$message.success(this.REttitle + "成功");
-            if (this.REttitle == "退回任务") {
-              this.searchDetail(this.params.id);
-            } else {
-              this.onBack();
-            }
-            this.suspendDialog = false;
-          }
-        });
-    },
-
-    //确认完成
-    markCompleted(type) {
-      this.$confirm(
-        "标记完成后，本次任务变成已完成，任务结果将锁定无法修改，请确保所有执行人已经完成任务，是否继续？",
-        {
-          type: "success",
-          title: "标记完成",
-        }
-      ).then(() => {
-        this.instance
-          .post(
-            "/app/appworktaskinfo/stopOrFinish",
-            {
-              id: this.params.id,
-              status: type,
-            },
-            null
-          )
-          .then((res) => {
-            if (res.code == 0) {
-              this.$message.success("已标记完成");
-              this.onBack();
-            }
-          });
-      });
-    },
-    //删掉执行单位
-    deleteUnit(row) {
-      this.$confirm("是否确认删除此人？", {
-        type: "warning",
-      }).then(() => {
-        this.instance
-          .post("/app/appworktaskuserinfo/delete", null, {
-            params: {
-              ids: row.detailId,
-            },
-          })
-          .then((res) => {
-            if (res.code == 0) {
-              this.$message.success("删除成功");
-              this.searchDetail(this.params.id);
-            }
-          });
-      });
-    },
-    surePersonalFn() {
-      this.lastPersonalList = this.tags;
-      this.lastPersonalList.forEach((item, index) => {
-        this.lastPersonalList[index].taskCode = this.params.taskCode;
-        this.lastPersonalList[index].taskRole = this.taskRole;
-      });
-      if (this.lastPersonalList.length > 0) {
-        this.instance
-          .post(
-            `/app/appworktaskuserinfo/addUserInfos`,
-
-            this.lastPersonalList
-          )
-          .then((res) => {
-            if (res.code == 0) {
-              this.$message.success("保存成功");
-              this.showSelectPer = false;
-              this.searchDetail(this.params.id);
-            }
-          });
-      } else {
-        this.$message.error("增加人数不能为空");
-      }
-    },
-    surePersonal() {
-      debounce(this.surePersonalFn(), 3000);
-    },
-    downFileAll () {
-      if (this.basicInfo.fileList.length > 0) {
-        this.instance.post('/app/appofficialdocumentinfo/downLoadAllFileForDetail', null, {
-          responseType: 'blob',
-          params: {
-            id: this.basicInfo.id
-          }
-        }).then((res) => {
-          const link = document.createElement('a')
-          let blob = new Blob([res], { type: 'application/vnd.ms-excel' })
-          link.style.display = 'none'
-          link.href = URL.createObjectURL(blob)
-          var num = ''
-          for (let i = 0; i < 10; i++) {
-            num += Math.ceil(Math.random() * 10)
-          }
-          link.setAttribute('download', '工作文件' + '.zip')
-          document.body.appendChild(link)
-          link.click()
-          document.body.removeChild(link)
-        })
-      } else {
-        this.$message.error('暂无附件提供下载')
-      }
-    },
-    downFile(item) {
-      window.open(item.url);
-    },
-    onBack() {
-      if(this.detailType == 'detail') { //从父任务
-        this.$emit("back");
-      }else { //列表
-        this.$emit('change', {
-          type: 'list',
-        })
-      }
-      
-    },
-    toParent() {
-      if(this.detailType == 'detail') { //从父任务
-        this.$emit("back");
-      }else { //列表
-        this.$emit('change', {
-          type: 'Detail',
-          params: {
-            type: 'Detail',
-            id: this.parentInfo.id,
-            fromType: 'SonDetail',
-            sonDetailId: this.params.id
-          }
-        })
-      }
-    },
-    confirmAdd(type) {
-      if(this.addUserList.length>0){
-        this.addUserList.map((item) => {
-          item.taskRole = type
-          item.taskCode = this.basicInfo.taskCode;
-        })
-        this.instance.post(`/app/appworktaskuserinfo/addUserInfos`,this.addUserList).then(res => {
-          if(res.code==0){
-            this.addUserList = []
-            this.$message.success('保存成功');
-            this.searchDetail();
-          }
-        });
-      }else{
-        this.$message.error("增加人数不能为空")
-      }
-    },
-    closeWork() {
-      this.$confirm("任务关闭后无法恢复，确定关闭？", {
-        type: "error",
-      }).then(() => {
-        this.REttitle = "关闭任务"
-        this.overTask()
-      });
-    }
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.especial {
-  margin-bottom: 12px;
-  .icon {
-    vertical-align: top;
-    display: inline-block;
-    padding-top: 5px;
-    margin-left: 20px;
-    color: #f46;
-  }
-  .people {
-    display: inline-block;
-    font-size: 14px;
-    color: #666;
-    margin-right: 16px;
-    vertical-align: top;
-  }
-  .AiWechatSelecter {
-    display: inline-block;
-    margin-left: 3px;
-  }
-  .hint {
-    font-size: 14px;
-    color: #999;
-    margin-left: 16px;
-  }
-  .mar-r40 {
-    margin-right: 40px;
-  }
-  .w80 {
-    width: 80px;
-    text-align: right;
-    color: #888;
-  }
-}
-.add-icon {
-  text-align: right;
-  cursor: pointer;
-  i {
-    font-size: 14px;
-  }
-}
-.color1 {
-  color: #4b87fe;
-}
-.color2 {
-  color: #2ea222;
-}
-.color3 {
-  color: #999999;
-}
-.echart {
-  width: 100%;
-  height: 240px;
-}
-.AiWechatSelecter{
-  width: calc(100% - 150px);
-}
-</style>
diff --git a/packages/jianping/AppApprover/AppApprover.vue b/packages/work/AppApprover/AppApprover.vue
similarity index 100%
rename from packages/jianping/AppApprover/AppApprover.vue
rename to packages/work/AppApprover/AppApprover.vue
diff --git a/packages/jianping/AppApprover/components/Add.vue b/packages/work/AppApprover/components/Add.vue
similarity index 100%
rename from packages/jianping/AppApprover/components/Add.vue
rename to packages/work/AppApprover/components/Add.vue
diff --git a/packages/jianping/AppApprover/components/List.vue b/packages/work/AppApprover/components/List.vue
similarity index 100%
rename from packages/jianping/AppApprover/components/List.vue
rename to packages/work/AppApprover/components/List.vue
diff --git a/packages/wechat/AppAskForm/AppAskForm.vue b/packages/work/AppAskForm/AppAskForm.vue
similarity index 100%
rename from packages/wechat/AppAskForm/AppAskForm.vue
rename to packages/work/AppAskForm/AppAskForm.vue
diff --git a/packages/wechat/AppAskForm/components/Add.vue b/packages/work/AppAskForm/components/Add.vue
similarity index 100%
rename from packages/wechat/AppAskForm/components/Add.vue
rename to packages/work/AppAskForm/components/Add.vue
diff --git a/packages/wechat/AppAskForm/components/FormList.vue b/packages/work/AppAskForm/components/FormList.vue
similarity index 100%
rename from packages/wechat/AppAskForm/components/FormList.vue
rename to packages/work/AppAskForm/components/FormList.vue
diff --git a/packages/wechat/AppAskForm/components/Statistics.vue b/packages/work/AppAskForm/components/Statistics.vue
similarity index 100%
rename from packages/wechat/AppAskForm/components/Statistics.vue
rename to packages/work/AppAskForm/components/Statistics.vue
diff --git a/packages/wechat/AppAskForm/components/Template.vue b/packages/work/AppAskForm/components/Template.vue
similarity index 100%
rename from packages/wechat/AppAskForm/components/Template.vue
rename to packages/work/AppAskForm/components/Template.vue
diff --git a/packages/wechat/AppAskForm/components/config.js b/packages/work/AppAskForm/components/config.js
similarity index 100%
rename from packages/wechat/AppAskForm/components/config.js
rename to packages/work/AppAskForm/components/config.js
diff --git a/packages/jianping/AppAssessment/AppAssessment.vue b/packages/work/AppAssessment/AppAssessment.vue
similarity index 100%
rename from packages/jianping/AppAssessment/AppAssessment.vue
rename to packages/work/AppAssessment/AppAssessment.vue
diff --git a/packages/jianping/AppAssessment/components/List.vue b/packages/work/AppAssessment/components/List.vue
similarity index 100%
rename from packages/jianping/AppAssessment/components/List.vue
rename to packages/work/AppAssessment/components/List.vue
diff --git a/packages/jianping/AppAssessment/components/Statistics.vue b/packages/work/AppAssessment/components/Statistics.vue
similarity index 100%
rename from packages/jianping/AppAssessment/components/Statistics.vue
rename to packages/work/AppAssessment/components/Statistics.vue
diff --git a/packages/wechat/AppConference/AppConference.vue b/packages/work/AppConference/AppConference.vue
similarity index 100%
rename from packages/wechat/AppConference/AppConference.vue
rename to packages/work/AppConference/AppConference.vue
diff --git a/packages/wechat/AppConference/addMeeting.vue b/packages/work/AppConference/addMeeting.vue
similarity index 100%
rename from packages/wechat/AppConference/addMeeting.vue
rename to packages/work/AppConference/addMeeting.vue
diff --git a/packages/wechat/AppConference/detail.vue b/packages/work/AppConference/detail.vue
similarity index 100%
rename from packages/wechat/AppConference/detail.vue
rename to packages/work/AppConference/detail.vue
diff --git a/packages/wechat/AppConference/list.vue b/packages/work/AppConference/list.vue
similarity index 100%
rename from packages/wechat/AppConference/list.vue
rename to packages/work/AppConference/list.vue
diff --git a/packages/wechat/AppDispatchManagement/AppDispatchManagement.vue b/packages/work/AppDispatchManagement/AppDispatchManagement.vue
similarity index 100%
rename from packages/wechat/AppDispatchManagement/AppDispatchManagement.vue
rename to packages/work/AppDispatchManagement/AppDispatchManagement.vue
diff --git a/packages/wechat/AppDispatchManagement/components/Add.vue b/packages/work/AppDispatchManagement/components/Add.vue
similarity index 100%
rename from packages/wechat/AppDispatchManagement/components/Add.vue
rename to packages/work/AppDispatchManagement/components/Add.vue
diff --git a/packages/wechat/AppDispatchManagement/components/Detail.vue b/packages/work/AppDispatchManagement/components/Detail.vue
similarity index 100%
rename from packages/wechat/AppDispatchManagement/components/Detail.vue
rename to packages/work/AppDispatchManagement/components/Detail.vue
diff --git a/packages/wechat/AppDispatchManagement/components/List.vue b/packages/work/AppDispatchManagement/components/List.vue
similarity index 100%
rename from packages/wechat/AppDispatchManagement/components/List.vue
rename to packages/work/AppDispatchManagement/components/List.vue
diff --git a/packages/wechat/AppDispatchManagement/components/statistics.vue b/packages/work/AppDispatchManagement/components/statistics.vue
similarity index 100%
rename from packages/wechat/AppDispatchManagement/components/statistics.vue
rename to packages/work/AppDispatchManagement/components/statistics.vue
diff --git a/packages/2.0.5/AppForm/AppForm.vue b/packages/work/AppForm/AppForm.vue
similarity index 100%
rename from packages/2.0.5/AppForm/AppForm.vue
rename to packages/work/AppForm/AppForm.vue
diff --git a/packages/2.0.5/AppForm/components/Add.vue b/packages/work/AppForm/components/Add.vue
similarity index 100%
rename from packages/2.0.5/AppForm/components/Add.vue
rename to packages/work/AppForm/components/Add.vue
diff --git a/packages/2.0.5/AppForm/components/BasicInfo.vue b/packages/work/AppForm/components/BasicInfo.vue
similarity index 100%
rename from packages/2.0.5/AppForm/components/BasicInfo.vue
rename to packages/work/AppForm/components/BasicInfo.vue
diff --git a/packages/2.0.5/AppForm/components/FormConfig.vue b/packages/work/AppForm/components/FormConfig.vue
similarity index 100%
rename from packages/2.0.5/AppForm/components/FormConfig.vue
rename to packages/work/AppForm/components/FormConfig.vue
diff --git a/packages/2.0.5/AppForm/components/FormLayout.vue b/packages/work/AppForm/components/FormLayout.vue
similarity index 100%
rename from packages/2.0.5/AppForm/components/FormLayout.vue
rename to packages/work/AppForm/components/FormLayout.vue
diff --git a/packages/2.0.5/AppForm/components/List.vue b/packages/work/AppForm/components/List.vue
similarity index 100%
rename from packages/2.0.5/AppForm/components/List.vue
rename to packages/work/AppForm/components/List.vue
diff --git a/packages/2.0.5/AppForm/components/config.js b/packages/work/AppForm/components/config.js
similarity index 100%
rename from packages/2.0.5/AppForm/components/config.js
rename to packages/work/AppForm/components/config.js
diff --git a/packages/jianping/AppHelpedResident/AppHelpedResident.vue b/packages/work/AppHelpedResident/AppHelpedResident.vue
similarity index 100%
rename from packages/jianping/AppHelpedResident/AppHelpedResident.vue
rename to packages/work/AppHelpedResident/AppHelpedResident.vue
diff --git a/packages/jianping/AppHelpedResident/detail/hrLog.vue b/packages/work/AppHelpedResident/detail/hrLog.vue
similarity index 100%
rename from packages/jianping/AppHelpedResident/detail/hrLog.vue
rename to packages/work/AppHelpedResident/detail/hrLog.vue
diff --git a/packages/jianping/AppHelpedResident/detail/hrMeasure.vue b/packages/work/AppHelpedResident/detail/hrMeasure.vue
similarity index 100%
rename from packages/jianping/AppHelpedResident/detail/hrMeasure.vue
rename to packages/work/AppHelpedResident/detail/hrMeasure.vue
diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/work/AppHelpedResident/hrAdd.vue
similarity index 100%
rename from packages/jianping/AppHelpedResident/hrAdd.vue
rename to packages/work/AppHelpedResident/hrAdd.vue
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/work/AppHelpedResident/hrDetail.vue
similarity index 100%
rename from packages/jianping/AppHelpedResident/hrDetail.vue
rename to packages/work/AppHelpedResident/hrDetail.vue
diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/work/AppHelpedResident/hrList.vue
similarity index 100%
rename from packages/jianping/AppHelpedResident/hrList.vue
rename to packages/work/AppHelpedResident/hrList.vue
diff --git a/packages/jianping/AppRiskWarning/AppRiskWarning.vue b/packages/work/AppRiskWarning/AppRiskWarning.vue
similarity index 100%
rename from packages/jianping/AppRiskWarning/AppRiskWarning.vue
rename to packages/work/AppRiskWarning/AppRiskWarning.vue
diff --git a/packages/jianping/AppRiskWarning/components/Add.vue b/packages/work/AppRiskWarning/components/Add.vue
similarity index 100%
rename from packages/jianping/AppRiskWarning/components/Add.vue
rename to packages/work/AppRiskWarning/components/Add.vue
diff --git a/packages/jianping/AppRiskWarning/components/Detail.vue b/packages/work/AppRiskWarning/components/Detail.vue
similarity index 100%
rename from packages/jianping/AppRiskWarning/components/Detail.vue
rename to packages/work/AppRiskWarning/components/Detail.vue
diff --git a/packages/jianping/AppRiskWarning/components/List.vue b/packages/work/AppRiskWarning/components/List.vue
similarity index 100%
rename from packages/jianping/AppRiskWarning/components/List.vue
rename to packages/work/AppRiskWarning/components/List.vue
diff --git a/packages/jianping/AppVisitToVerify/AppVisitToVerify.vue b/packages/work/AppVisitToVerify/AppVisitToVerify.vue
similarity index 100%
rename from packages/jianping/AppVisitToVerify/AppVisitToVerify.vue
rename to packages/work/AppVisitToVerify/AppVisitToVerify.vue
diff --git a/packages/jianping/AppVisitToVerify/components/Detail.vue b/packages/work/AppVisitToVerify/components/Detail.vue
similarity index 100%
rename from packages/jianping/AppVisitToVerify/components/Detail.vue
rename to packages/work/AppVisitToVerify/components/Detail.vue
diff --git a/packages/jianping/AppVisitToVerify/components/List.vue b/packages/work/AppVisitToVerify/components/List.vue
similarity index 100%
rename from packages/jianping/AppVisitToVerify/components/List.vue
rename to packages/work/AppVisitToVerify/components/List.vue
diff --git a/packages/2.0.5/AppVisitVondolence/AppVisitVondolence.vue b/packages/work/AppVisitVondolence/AppVisitVondolence.vue
similarity index 100%
rename from packages/2.0.5/AppVisitVondolence/AppVisitVondolence.vue
rename to packages/work/AppVisitVondolence/AppVisitVondolence.vue
diff --git a/packages/2.0.5/AppVisitVondolence/components/Detail.vue b/packages/work/AppVisitVondolence/components/Detail.vue
similarity index 100%
rename from packages/2.0.5/AppVisitVondolence/components/Detail.vue
rename to packages/work/AppVisitVondolence/components/Detail.vue
diff --git a/packages/2.0.5/AppVisitVondolence/components/List.vue b/packages/work/AppVisitVondolence/components/List.vue
similarity index 100%
rename from packages/2.0.5/AppVisitVondolence/components/List.vue
rename to packages/work/AppVisitVondolence/components/List.vue
diff --git a/packages/processManagement/approvalManage/AppApprovalManage.vue b/packages/work/processManagement/approvalManage/AppApprovalManage.vue
similarity index 100%
rename from packages/processManagement/approvalManage/AppApprovalManage.vue
rename to packages/work/processManagement/approvalManage/AppApprovalManage.vue
diff --git a/packages/processManagement/approvalManage/components/approvalDetail.vue b/packages/work/processManagement/approvalManage/components/approvalDetail.vue
similarity index 100%
rename from packages/processManagement/approvalManage/components/approvalDetail.vue
rename to packages/work/processManagement/approvalManage/components/approvalDetail.vue
diff --git a/packages/processManagement/approvalManage/components/forMyApproval.vue b/packages/work/processManagement/approvalManage/components/forMyApproval.vue
similarity index 100%
rename from packages/processManagement/approvalManage/components/forMyApproval.vue
rename to packages/work/processManagement/approvalManage/components/forMyApproval.vue
diff --git a/packages/processManagement/approvalManage/components/svgIcon.vue b/packages/work/processManagement/approvalManage/components/svgIcon.vue
similarity index 100%
rename from packages/processManagement/approvalManage/components/svgIcon.vue
rename to packages/work/processManagement/approvalManage/components/svgIcon.vue
diff --git a/packages/processManagement/corporateSeal/AppCorporateSeal.vue b/packages/work/processManagement/corporateSeal/AppCorporateSeal.vue
similarity index 100%
rename from packages/processManagement/corporateSeal/AppCorporateSeal.vue
rename to packages/work/processManagement/corporateSeal/AppCorporateSeal.vue
diff --git a/packages/processManagement/corporateSeal/sealDetail.vue b/packages/work/processManagement/corporateSeal/sealDetail.vue
similarity index 100%
rename from packages/processManagement/corporateSeal/sealDetail.vue
rename to packages/work/processManagement/corporateSeal/sealDetail.vue
diff --git a/packages/processManagement/examinationApproval/AppExaminationApproval.vue b/packages/work/processManagement/examinationApproval/AppExaminationApproval.vue
similarity index 100%
rename from packages/processManagement/examinationApproval/AppExaminationApproval.vue
rename to packages/work/processManagement/examinationApproval/AppExaminationApproval.vue
diff --git a/packages/processManagement/examinationApproval/components/addClassification.vue b/packages/work/processManagement/examinationApproval/components/addClassification.vue
similarity index 100%
rename from packages/processManagement/examinationApproval/components/addClassification.vue
rename to packages/work/processManagement/examinationApproval/components/addClassification.vue
diff --git a/packages/processManagement/massesMessage/AppMassesMessage.vue b/packages/work/processManagement/massesMessage/AppMassesMessage.vue
similarity index 100%
rename from packages/processManagement/massesMessage/AppMassesMessage.vue
rename to packages/work/processManagement/massesMessage/AppMassesMessage.vue
diff --git a/packages/processManagement/massesMessage/components/alreadyList.vue b/packages/work/processManagement/massesMessage/components/alreadyList.vue
similarity index 100%
rename from packages/processManagement/massesMessage/components/alreadyList.vue
rename to packages/work/processManagement/massesMessage/components/alreadyList.vue
diff --git a/packages/processManagement/massesMessage/components/messageDetail.vue b/packages/work/processManagement/massesMessage/components/messageDetail.vue
similarity index 100%
rename from packages/processManagement/massesMessage/components/messageDetail.vue
rename to packages/work/processManagement/massesMessage/components/messageDetail.vue
diff --git a/packages/processManagement/mattersConfig/AppMattersConfig.vue b/packages/work/processManagement/mattersConfig/AppMattersConfig.vue
similarity index 100%
rename from packages/processManagement/mattersConfig/AppMattersConfig.vue
rename to packages/work/processManagement/mattersConfig/AppMattersConfig.vue
diff --git a/packages/processManagement/mattersConfig/components/addConfig.vue b/packages/work/processManagement/mattersConfig/components/addConfig.vue
similarity index 100%
rename from packages/processManagement/mattersConfig/components/addConfig.vue
rename to packages/work/processManagement/mattersConfig/components/addConfig.vue
diff --git a/packages/processManagement/mattersConfig/components/applyForm.vue b/packages/work/processManagement/mattersConfig/components/applyForm.vue
similarity index 100%
rename from packages/processManagement/mattersConfig/components/applyForm.vue
rename to packages/work/processManagement/mattersConfig/components/applyForm.vue
diff --git a/packages/processManagement/mattersConfig/components/attachmentMaterial.vue b/packages/work/processManagement/mattersConfig/components/attachmentMaterial.vue
similarity index 100%
rename from packages/processManagement/mattersConfig/components/attachmentMaterial.vue
rename to packages/work/processManagement/mattersConfig/components/attachmentMaterial.vue
diff --git a/packages/processManagement/mattersConfig/components/baseInfo.vue b/packages/work/processManagement/mattersConfig/components/baseInfo.vue
similarity index 100%
rename from packages/processManagement/mattersConfig/components/baseInfo.vue
rename to packages/work/processManagement/mattersConfig/components/baseInfo.vue
diff --git a/packages/processManagement/mattersConfig/components/config.js b/packages/work/processManagement/mattersConfig/components/config.js
similarity index 100%
rename from packages/processManagement/mattersConfig/components/config.js
rename to packages/work/processManagement/mattersConfig/components/config.js
diff --git a/packages/processManagement/mattersConfig/components/configList.vue b/packages/work/processManagement/mattersConfig/components/configList.vue
similarity index 100%
rename from packages/processManagement/mattersConfig/components/configList.vue
rename to packages/work/processManagement/mattersConfig/components/configList.vue
diff --git a/packages/processManagement/mattersConfig/components/guidance.vue b/packages/work/processManagement/mattersConfig/components/guidance.vue
similarity index 100%
rename from packages/processManagement/mattersConfig/components/guidance.vue
rename to packages/work/processManagement/mattersConfig/components/guidance.vue
diff --git a/packages/processManagement/mattersConfig/components/index.js b/packages/work/processManagement/mattersConfig/components/index.js
similarity index 100%
rename from packages/processManagement/mattersConfig/components/index.js
rename to packages/work/processManagement/mattersConfig/components/index.js
diff --git a/packages/processManagement/mattersConfig/components/processApproval.vue b/packages/work/processManagement/mattersConfig/components/processApproval.vue
similarity index 100%
rename from packages/processManagement/mattersConfig/components/processApproval.vue
rename to packages/work/processManagement/mattersConfig/components/processApproval.vue
diff --git a/packages/processManagement/personalSignature/AppPersonalSignature.vue b/packages/work/processManagement/personalSignature/AppPersonalSignature.vue
similarity index 100%
rename from packages/processManagement/personalSignature/AppPersonalSignature.vue
rename to packages/work/processManagement/personalSignature/AppPersonalSignature.vue
diff --git a/packages/processManagement/personalSignature/drawInPhone.vue b/packages/work/processManagement/personalSignature/drawInPhone.vue
similarity index 100%
rename from packages/processManagement/personalSignature/drawInPhone.vue
rename to packages/work/processManagement/personalSignature/drawInPhone.vue
diff --git a/packages/wechat/AppBuddyMessage/AppBuddyMessage.vue b/packages/wxwork/AppBuddyMessage/AppBuddyMessage.vue
similarity index 100%
rename from packages/wechat/AppBuddyMessage/AppBuddyMessage.vue
rename to packages/wxwork/AppBuddyMessage/AppBuddyMessage.vue
diff --git a/packages/wechat/AppBuddyMessage/components/Add.vue b/packages/wxwork/AppBuddyMessage/components/Add.vue
similarity index 100%
rename from packages/wechat/AppBuddyMessage/components/Add.vue
rename to packages/wxwork/AppBuddyMessage/components/Add.vue
diff --git a/packages/wechat/AppBuddyMessage/components/List.vue b/packages/wxwork/AppBuddyMessage/components/List.vue
similarity index 100%
rename from packages/wechat/AppBuddyMessage/components/List.vue
rename to packages/wxwork/AppBuddyMessage/components/List.vue
diff --git a/packages/wechat/AppClientMassTextin/AppClientMassTextin.vue b/packages/wxwork/AppClientMassTextin/AppClientMassTextin.vue
similarity index 100%
rename from packages/wechat/AppClientMassTextin/AppClientMassTextin.vue
rename to packages/wxwork/AppClientMassTextin/AppClientMassTextin.vue
diff --git a/packages/wechat/AppClientMassTextin/components/NewClientMass.vue b/packages/wxwork/AppClientMassTextin/components/NewClientMass.vue
similarity index 100%
rename from packages/wechat/AppClientMassTextin/components/NewClientMass.vue
rename to packages/wxwork/AppClientMassTextin/components/NewClientMass.vue
diff --git a/packages/wechat/AppClientMassTextin/components/TableList.vue b/packages/wxwork/AppClientMassTextin/components/TableList.vue
similarity index 100%
rename from packages/wechat/AppClientMassTextin/components/TableList.vue
rename to packages/wxwork/AppClientMassTextin/components/TableList.vue
diff --git a/packages/wechat/AppMsgTemplate/AppMsgTemplate.vue b/packages/wxwork/AppMsgTemplate/AppMsgTemplate.vue
similarity index 100%
rename from packages/wechat/AppMsgTemplate/AppMsgTemplate.vue
rename to packages/wxwork/AppMsgTemplate/AppMsgTemplate.vue
diff --git a/packages/wechat/AppMsgTemplate/components/Detail.vue b/packages/wxwork/AppMsgTemplate/components/Detail.vue
similarity index 100%
rename from packages/wechat/AppMsgTemplate/components/Detail.vue
rename to packages/wxwork/AppMsgTemplate/components/Detail.vue
diff --git a/packages/wechat/AppMsgTemplate/components/commonList.vue b/packages/wxwork/AppMsgTemplate/components/commonList.vue
similarity index 100%
rename from packages/wechat/AppMsgTemplate/components/commonList.vue
rename to packages/wxwork/AppMsgTemplate/components/commonList.vue
diff --git a/packages/wechat/AppMsgTemplate/components/detailSystem.vue b/packages/wxwork/AppMsgTemplate/components/detailSystem.vue
similarity index 100%
rename from packages/wechat/AppMsgTemplate/components/detailSystem.vue
rename to packages/wxwork/AppMsgTemplate/components/detailSystem.vue
diff --git a/packages/wechat/AppMsgTemplate/components/systemList.vue b/packages/wxwork/AppMsgTemplate/components/systemList.vue
similarity index 100%
rename from packages/wechat/AppMsgTemplate/components/systemList.vue
rename to packages/wxwork/AppMsgTemplate/components/systemList.vue
diff --git a/packages/wechat/AppNotification/AppNotification.vue b/packages/wxwork/AppNotification/AppNotification.vue
similarity index 100%
rename from packages/wechat/AppNotification/AppNotification.vue
rename to packages/wxwork/AppNotification/AppNotification.vue
diff --git a/packages/wechat/AppNotification/components/add.vue b/packages/wxwork/AppNotification/components/add.vue
similarity index 100%
rename from packages/wechat/AppNotification/components/add.vue
rename to packages/wxwork/AppNotification/components/add.vue
diff --git a/packages/wechat/AppNotification/components/detail.vue b/packages/wxwork/AppNotification/components/detail.vue
similarity index 100%
rename from packages/wechat/AppNotification/components/detail.vue
rename to packages/wxwork/AppNotification/components/detail.vue
diff --git a/packages/wechat/AppNotification/components/manageDetail.vue b/packages/wxwork/AppNotification/components/manageDetail.vue
similarity index 100%
rename from packages/wechat/AppNotification/components/manageDetail.vue
rename to packages/wxwork/AppNotification/components/manageDetail.vue
diff --git a/packages/wechat/AppNotification/components/noticeManage.vue b/packages/wxwork/AppNotification/components/noticeManage.vue
similarity index 100%
rename from packages/wechat/AppNotification/components/noticeManage.vue
rename to packages/wxwork/AppNotification/components/noticeManage.vue
diff --git a/packages/wechat/AppNotification/components/recentNotice.vue b/packages/wxwork/AppNotification/components/recentNotice.vue
similarity index 100%
rename from packages/wechat/AppNotification/components/recentNotice.vue
rename to packages/wxwork/AppNotification/components/recentNotice.vue
diff --git a/packages/wechat/AppResidentGroupManage/AppResidentGroupManage.vue b/packages/wxwork/AppResidentGroupManage/AppResidentGroupManage.vue
similarity index 100%
rename from packages/wechat/AppResidentGroupManage/AppResidentGroupManage.vue
rename to packages/wxwork/AppResidentGroupManage/AppResidentGroupManage.vue
diff --git a/packages/wechat/AppResidentGroupManage/components/Detail.vue b/packages/wxwork/AppResidentGroupManage/components/Detail.vue
similarity index 100%
rename from packages/wechat/AppResidentGroupManage/components/Detail.vue
rename to packages/wxwork/AppResidentGroupManage/components/Detail.vue
diff --git a/packages/wechat/AppResidentGroupManage/components/List.vue b/packages/wxwork/AppResidentGroupManage/components/List.vue
similarity index 100%
rename from packages/wechat/AppResidentGroupManage/components/List.vue
rename to packages/wxwork/AppResidentGroupManage/components/List.vue
diff --git a/packages/wechat/AppResidentGroupManage/components/Statistics.vue b/packages/wxwork/AppResidentGroupManage/components/Statistics.vue
similarity index 100%
rename from packages/wechat/AppResidentGroupManage/components/Statistics.vue
rename to packages/wxwork/AppResidentGroupManage/components/Statistics.vue
diff --git a/packages/wechat/AppResidentGroupManage/components/Tags.vue b/packages/wxwork/AppResidentGroupManage/components/Tags.vue
similarity index 100%
rename from packages/wechat/AppResidentGroupManage/components/Tags.vue
rename to packages/wxwork/AppResidentGroupManage/components/Tags.vue
diff --git a/packages/wechat/AppResidentManage/AppResidentManage.vue b/packages/wxwork/AppResidentManage/AppResidentManage.vue
similarity index 100%
rename from packages/wechat/AppResidentManage/AppResidentManage.vue
rename to packages/wxwork/AppResidentManage/AppResidentManage.vue
diff --git a/packages/wechat/AppResidentManage/components/Detail.vue b/packages/wxwork/AppResidentManage/components/Detail.vue
similarity index 100%
rename from packages/wechat/AppResidentManage/components/Detail.vue
rename to packages/wxwork/AppResidentManage/components/Detail.vue
diff --git a/packages/wechat/AppResidentManage/components/List.vue b/packages/wxwork/AppResidentManage/components/List.vue
similarity index 100%
rename from packages/wechat/AppResidentManage/components/List.vue
rename to packages/wxwork/AppResidentManage/components/List.vue
diff --git a/packages/wechat/AppResidentManage/components/Statistics.vue b/packages/wxwork/AppResidentManage/components/Statistics.vue
similarity index 100%
rename from packages/wechat/AppResidentManage/components/Statistics.vue
rename to packages/wxwork/AppResidentManage/components/Statistics.vue
diff --git a/packages/wechat/AppResidentManage/components/Tags.vue b/packages/wxwork/AppResidentManage/components/Tags.vue
similarity index 100%
rename from packages/wechat/AppResidentManage/components/Tags.vue
rename to packages/wxwork/AppResidentManage/components/Tags.vue
diff --git a/packages/wechat/AppVerbalTrick/AppVerbalTrick.vue b/packages/wxwork/AppVerbalTrick/AppVerbalTrick.vue
similarity index 100%
rename from packages/wechat/AppVerbalTrick/AppVerbalTrick.vue
rename to packages/wxwork/AppVerbalTrick/AppVerbalTrick.vue
diff --git a/packages/wechat/AppVillageCode/AppVillageCode.vue b/packages/wxwork/AppVillageCode/AppVillageCode.vue
similarity index 100%
rename from packages/wechat/AppVillageCode/AppVillageCode.vue
rename to packages/wxwork/AppVillageCode/AppVillageCode.vue
diff --git a/packages/wechat/AppVillageCode/components/Add.vue b/packages/wxwork/AppVillageCode/components/Add.vue
similarity index 100%
rename from packages/wechat/AppVillageCode/components/Add.vue
rename to packages/wxwork/AppVillageCode/components/Add.vue
diff --git a/packages/wechat/AppVillageCode/components/List.vue b/packages/wxwork/AppVillageCode/components/List.vue
similarity index 100%
rename from packages/wechat/AppVillageCode/components/List.vue
rename to packages/wxwork/AppVillageCode/components/List.vue
diff --git a/project/dv/apps/AppHomesteadDV.vue b/project/dv/apps/AppHomesteadDV.vue
index 7404a22b..9e82dfdb 100644
--- a/project/dv/apps/AppHomesteadDV.vue
+++ b/project/dv/apps/AppHomesteadDV.vue
@@ -187,7 +187,7 @@
 
 <script>
 import {mapState} from "vuex";
-import BuildingStatistics from "../../../packages/2.0.5/AppHouseMap/buildingStatistics";
+import BuildingStatistics from "../../../packages/grid/AppHouseMap/buildingStatistics";
 
 export default {
   name: "AppHomesteadDV",