diff --git a/project/pidu/app/AppGoods/AppGoods.vue b/project/pidu/app/AppGoods/AppGoods.vue
new file mode 100644
index 00000000..e7e440ca
--- /dev/null
+++ b/project/pidu/app/AppGoods/AppGoods.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="doc-circulation">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List'
+  import Detail from './components/Detail'
+
+  export default {
+    name: 'AppGoods',
+    label: '商品管理',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        include: []
+      }
+    },
+
+    components: {
+      Detail,
+      List
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.params = data.params
+        }
+
+        if (data.type === 'List') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .doc-circulation {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/project/pidu/app/AppGoods/components/Detail.vue b/project/pidu/app/AppGoods/components/Detail.vue
new file mode 100644
index 00000000..ba60b08e
--- /dev/null
+++ b/project/pidu/app/AppGoods/components/Detail.vue
@@ -0,0 +1,188 @@
+ <template>
+  <ai-detail isHasSidebar v-loading="isLoading">
+    <template slot="title">
+      <ai-title title="返乡报备详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
+      <div v-show="currIndex === 0">
+        <ai-card title="基本信息" v-show="currIndex === 0">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
+              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
+              <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="行程信息">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="出发时间" :value="info.startTime"></ai-info-item>
+              <ai-info-item label="出发地" >
+                <span  :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
+              </ai-info-item>
+              <ai-info-item label="出发地详址" isLine :value="info.startAddress"></ai-info-item>
+              <ai-info-item label="出行方式" :value="info.travelTypeNames"></ai-info-item>
+              <ai-info-item label="车次/航班" isLine :value="info.trainNo"></ai-info-item>
+              <ai-info-item label="行程描述" :value="info.description"></ai-info-item>
+              <ai-info-item label="抵平卡口" :value="info.gatewayName"></ai-info-item>
+              <ai-info-item label="抵平时间" :value="info.arriveTime"></ai-info-item>
+              <ai-info-item label="目的地" :value="info.arriveAreaName"></ai-info-item>
+              <ai-info-item label="目的地详址" isLine :value="info.arriveAddress"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="健康状况">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="是否有风险旅居史" v-if="info.fromHighRiskArea === '1'">
+                <span style="color: red">{{ info.highRiskAreaName }}</span>
+              </ai-info-item>
+              <ai-info-item label="是否有风险旅居史" v-else value="否"></ai-info-item>
+              <ai-info-item label="7天内是否接触新冠确诊或疑似患者">
+                <span :style="{color: info.contactPatients === '1' ? 'red' : ''}">{{ dict.getLabel('yesOrNo', info.contactPatients) }}</span>
+              </ai-info-item>
+              <ai-info-item label="当前健康状况" v-if="info.abnormalHealth === '1'">
+                <span style="color: red">{{ dict.getLabel('EP_abnormalType', info.abnormalType) }}</span>
+              </ai-info-item>
+              <ai-info-item label="当前健康状况" v-else value="否"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </div>
+      <div v-show="currIndex === 1">
+        <ai-card title="风险处置">
+          <template #right>
+            <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
+          </template>
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
+              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
+              <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="风险处理意见">
+          <template #content>
+            <ai-table
+              :isShowPagination="false"
+              tableSize="small"
+              border
+              :tableData="info.riskDisposalList"
+              :col-configs="colConfigs"
+              @getList="() => {}">
+            </ai-table>
+          </template>
+        </ai-card>
+        <ai-card title="社区初排" v-if="info.cmAdvanceDisposal">
+          <template #content>
+            <ai-wrapper
+              style="margin-bottom: 20px;"
+              label-width="120px">
+              <ai-info-item label="处置意见" :value="dict.getLabel('EP_communityHandleType', info.cmAdvanceDisposal.communityHandleType)"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="居家状态" :value="dict.getLabel('EP_homeStatus2', info.cmAdvanceDisposal.homeStatus)"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="隔离时间" :value="info.cmAdvanceDisposal.quarantineBeginTime + ' - ' + info.cmAdvanceDisposal.quarantineEndTime"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="隔离策略" :value="dict.getLabel('EP_quarantineStrategy', info.cmAdvanceDisposal.quarantineStrategy)"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="管控方式" :value="dict.getLabel('EP_controlMethod', info.cmAdvanceDisposal.controlMethod)"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="图片" isLine>
+                <ai-uploader
+                  :instance="instance"
+                  :value="info.cmAdvanceDisposal.fileList"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '2'" label="风险解除证明文件" isLine>
+                <ai-uploader
+                  :instance="instance"
+                  :value="info.cmAdvanceDisposal.proveFileList"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+            </ai-wrapper>
+            <ai-empty style="margin-bottom: 60px;" v-if="!info.cmAdvanceDisposal"></ai-empty>
+          </template>
+        </ai-card>
+      </div>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {},
+        isShow: false,
+        currIndex: 0,
+        isLoading: false,
+        tableData: [],
+        colConfigs: [
+          {prop: 'remarks', label: '异常记录', align: 'center' },
+          {prop: 'createTime', label: '创建时间', align: 'center'},
+          {prop: 'createUserName', label: '记录人', align: 'center' }
+        ],
+        tabList: ['基本信息', '风险处置']
+      }
+    },
+
+    created () {
+      this.isLoading = true
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => {
+          this.getInfo(this.params.id)
+        })
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.info.travelTypeNames = res.data.travelType.split(',').map(v => {
+              return this.dict.getLabel('EP_travelType', v)
+            }).join('，')
+          }
+
+          this.isLoading = false
+        }).catch(() => {
+          this.isLoading = false
+        })
+      },
+
+      cancel () {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: true
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
new file mode 100644
index 00000000..a42ac258
--- /dev/null
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -0,0 +1,295 @@
+<template>
+  <ai-list class="list">
+    <ai-title slot="title" title="商品管理" isShowBottomBorder :instance="instance" v-if="search.arriveAreaId" isShowArea v-model="search.arriveAreaId" @change="changeArea"></ai-title>
+    <template slot="content">
+      <div class="statistics-top">
+        <div class="statistics-top__item">
+          <span>登记人数</span>
+          <h2 style="color: #2266FF;">{{ info['登记人数'] }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>今日新增返乡</span>
+          <h2 style="color: #22AA99;">{{ info['今日新增返乡'] }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>风险人数</span>
+          <h2 style="color: #F8B425">{{ info['风险人数'] }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>今日风险人数</span>
+          <h2 style="color: red">{{ info['今日风险人数'] }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>风险处理</span>
+          <h2 style="color: red">{{ info['风险处理'] }}</h2>
+        </div>
+      </div>
+      <div class="content">
+        <ai-search-bar bottomBorder>
+          <template #left>
+            <ai-select
+              v-model="search.riskStatus"
+              clearable
+              placeholder="请选择风险状态"
+              :selectList="dict.getDict('EP_riskStatus')"
+              @change="search.current = 1, getList()">
+            </ai-select>
+            <ai-select
+              v-model="search.source"
+              clearable
+              placeholder="请选择数据来源"
+              :selectList="dict.getDict('EP_source')"
+              @change="search.current = 1, getList()">
+            </ai-select>
+            <el-date-picker
+              v-model="search.queryBeginTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始日期"
+              @change="search.current = 1, getList()">
+            </el-date-picker>
+            <el-date-picker
+              v-model="search.queryEndTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-dd"
+              placeholder="选择结束日期"
+              @change="search.current = 1, getList()">
+            </el-date-picker>
+            <ai-download :instance="instance" url="/app/appepidemicpreventionregisterinfo/export" :params="search" fileName="返乡报备" :disabled="tableData.length == 0">
+              <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
+            </ai-download>
+          </template>
+          <template #right>
+            <el-input
+              v-model="search.name"
+              size="small"
+              placeholder="请输入姓名、手机号"
+              clearable
+              v-throttle="() => {search.current = 1, getList()}"
+              @clear="search.current = 1, search.name = '', getList()"
+              suffix-icon="iconfont iconSearch">
+            </el-input>
+          </template>
+        </ai-search-bar>
+        <ai-table
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          v-loading="loading"
+          style="margin-top: 16px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
+          <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+                <el-button type="text" @click="remove(row.id)">删除</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </div>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          name: '',
+          gatewayId: '',
+          status: '',
+          riskStatus: '',
+          arriveAreaId: '',
+          queryBeginTime: '',
+          queryEndTime: '',
+          infoType: 1,
+          source: ''
+        },
+        info: {},
+        colConfigs: [
+          { prop: 'name', label: '姓名' },
+          { prop: 'phone', align: 'center', label: '手机号码' },
+          { prop: 'startTime', align: 'center', label: '出发时间' },
+          { prop: 'startAreaName', align: 'center', label: '出发地区' },
+          {
+            prop: 'arriveTime',
+            align: 'center',
+            label: '抵平时间'
+          },
+          {
+            prop: 'arriveAreaName',
+            align: 'center',
+            label: '到达地区'
+          },
+          { prop: 'source',
+            align: 'center',
+            label: '数据来源',
+            formart: v => this.dict.getLabel('EP_source', v) },
+          {
+            prop: 'riskStatus',
+            align: 'center',
+            label: '风险状态',
+            formart: v => this.dict.getLabel('EP_riskStatus', v)
+          }
+        ],
+        ids: [],
+        tableData: [],
+        total: 0,
+        loading: false,
+        disabledLevel: 0
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      this.disabledLevel = this.user.info.areaList.length - 1
+      this.loading = true
+
+      this.instance.post(`/app/appdvcpconfig/getCorpArea`).then(res => {
+        if (res.code == 0) {
+          this.search.arriveAreaId = res.data
+          this.getTotalInfo()
+          this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType', 'EP_riskStatus', 'EP_source']).then(() => {
+            this.getList()
+          })
+        }
+      })
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
+          params: {
+            ...this.search,
+            arriveAreaId: this.search.arriveAreaId,
+            queryBeginTime: this.search.queryBeginTime ? this.search.queryBeginTime + ' 00:00:00' : '',
+            queryEndTime: this.search.queryEndTime ? this.search.queryEndTime + ' 23:59:59' : ''
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        }).catch(() => {
+          this.loading = false
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      changeArea () {
+        this.search.current = 1
+
+        this.$nextTick(() => {
+          this.getList()
+          this.getTotalInfo()
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getTotalInfo()
+              this.getList()
+            }
+          })
+        })
+      },
+
+
+      getTotalInfo () {
+        this.instance.post(`/app/appepidemicpreventionregisterinfo/listStatistics`, null, {
+          params: {
+            areaId: this.search.arriveAreaId,
+            infoType: 1
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.info = res.data
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .list {
+    ::v-deep .ai-list__content {
+      .ai-list__content--right-wrapper {
+        background: transparent!important;
+        box-shadow: none!important;
+        margin: 0!important;
+        padding: 0 0 0!important;
+      }
+    }
+    .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;
+        }
+      }
+    }
+
+    .content {
+      padding: 16px;
+      background: #FFFFFF;
+      box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
+    }
+  }
+</style>
diff --git a/project/pidu/app/AppOrder/AppOrder.vue b/project/pidu/app/AppOrder/AppOrder.vue
new file mode 100644
index 00000000..50e59e33
--- /dev/null
+++ b/project/pidu/app/AppOrder/AppOrder.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="doc-circulation">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List'
+  import Detail from './components/Detail'
+
+  export default {
+    name: 'AppOrder',
+    label: '订单管理',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        include: []
+      }
+    },
+
+    components: {
+      Detail,
+      List
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.params = data.params
+        }
+
+        if (data.type === 'List') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .doc-circulation {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/project/pidu/app/AppOrder/components/Detail.vue b/project/pidu/app/AppOrder/components/Detail.vue
new file mode 100644
index 00000000..ba60b08e
--- /dev/null
+++ b/project/pidu/app/AppOrder/components/Detail.vue
@@ -0,0 +1,188 @@
+ <template>
+  <ai-detail isHasSidebar v-loading="isLoading">
+    <template slot="title">
+      <ai-title title="返乡报备详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
+      <div v-show="currIndex === 0">
+        <ai-card title="基本信息" v-show="currIndex === 0">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
+              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
+              <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="行程信息">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="出发时间" :value="info.startTime"></ai-info-item>
+              <ai-info-item label="出发地" >
+                <span  :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
+              </ai-info-item>
+              <ai-info-item label="出发地详址" isLine :value="info.startAddress"></ai-info-item>
+              <ai-info-item label="出行方式" :value="info.travelTypeNames"></ai-info-item>
+              <ai-info-item label="车次/航班" isLine :value="info.trainNo"></ai-info-item>
+              <ai-info-item label="行程描述" :value="info.description"></ai-info-item>
+              <ai-info-item label="抵平卡口" :value="info.gatewayName"></ai-info-item>
+              <ai-info-item label="抵平时间" :value="info.arriveTime"></ai-info-item>
+              <ai-info-item label="目的地" :value="info.arriveAreaName"></ai-info-item>
+              <ai-info-item label="目的地详址" isLine :value="info.arriveAddress"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="健康状况">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="是否有风险旅居史" v-if="info.fromHighRiskArea === '1'">
+                <span style="color: red">{{ info.highRiskAreaName }}</span>
+              </ai-info-item>
+              <ai-info-item label="是否有风险旅居史" v-else value="否"></ai-info-item>
+              <ai-info-item label="7天内是否接触新冠确诊或疑似患者">
+                <span :style="{color: info.contactPatients === '1' ? 'red' : ''}">{{ dict.getLabel('yesOrNo', info.contactPatients) }}</span>
+              </ai-info-item>
+              <ai-info-item label="当前健康状况" v-if="info.abnormalHealth === '1'">
+                <span style="color: red">{{ dict.getLabel('EP_abnormalType', info.abnormalType) }}</span>
+              </ai-info-item>
+              <ai-info-item label="当前健康状况" v-else value="否"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </div>
+      <div v-show="currIndex === 1">
+        <ai-card title="风险处置">
+          <template #right>
+            <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
+          </template>
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
+              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
+              <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="风险处理意见">
+          <template #content>
+            <ai-table
+              :isShowPagination="false"
+              tableSize="small"
+              border
+              :tableData="info.riskDisposalList"
+              :col-configs="colConfigs"
+              @getList="() => {}">
+            </ai-table>
+          </template>
+        </ai-card>
+        <ai-card title="社区初排" v-if="info.cmAdvanceDisposal">
+          <template #content>
+            <ai-wrapper
+              style="margin-bottom: 20px;"
+              label-width="120px">
+              <ai-info-item label="处置意见" :value="dict.getLabel('EP_communityHandleType', info.cmAdvanceDisposal.communityHandleType)"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="居家状态" :value="dict.getLabel('EP_homeStatus2', info.cmAdvanceDisposal.homeStatus)"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="隔离时间" :value="info.cmAdvanceDisposal.quarantineBeginTime + ' - ' + info.cmAdvanceDisposal.quarantineEndTime"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="隔离策略" :value="dict.getLabel('EP_quarantineStrategy', info.cmAdvanceDisposal.quarantineStrategy)"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="管控方式" :value="dict.getLabel('EP_controlMethod', info.cmAdvanceDisposal.controlMethod)"></ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="图片" isLine>
+                <ai-uploader
+                  :instance="instance"
+                  :value="info.cmAdvanceDisposal.fileList"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '2'" label="风险解除证明文件" isLine>
+                <ai-uploader
+                  :instance="instance"
+                  :value="info.cmAdvanceDisposal.proveFileList"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+            </ai-wrapper>
+            <ai-empty style="margin-bottom: 60px;" v-if="!info.cmAdvanceDisposal"></ai-empty>
+          </template>
+        </ai-card>
+      </div>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {},
+        isShow: false,
+        currIndex: 0,
+        isLoading: false,
+        tableData: [],
+        colConfigs: [
+          {prop: 'remarks', label: '异常记录', align: 'center' },
+          {prop: 'createTime', label: '创建时间', align: 'center'},
+          {prop: 'createUserName', label: '记录人', align: 'center' }
+        ],
+        tabList: ['基本信息', '风险处置']
+      }
+    },
+
+    created () {
+      this.isLoading = true
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => {
+          this.getInfo(this.params.id)
+        })
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.info.travelTypeNames = res.data.travelType.split(',').map(v => {
+              return this.dict.getLabel('EP_travelType', v)
+            }).join('，')
+          }
+
+          this.isLoading = false
+        }).catch(() => {
+          this.isLoading = false
+        })
+      },
+
+      cancel () {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: true
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/project/pidu/app/AppOrder/components/List.vue b/project/pidu/app/AppOrder/components/List.vue
new file mode 100644
index 00000000..d971f3ef
--- /dev/null
+++ b/project/pidu/app/AppOrder/components/List.vue
@@ -0,0 +1,227 @@
+<template>
+  <ai-list class="list">
+    <ai-title slot="title" title="订单管理" isShowBottomBorder>
+      <template #sub>
+        <span>可查看并核销网格员在积分超市中兑换的商品订单</span>
+      </template>
+    </ai-title>
+    <template slot="content">
+      <ai-search-bar bottomBorder>
+        <template #left>
+          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+            <div class="userSelcet">
+              <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
+              <span v-else>兑换人</span>
+              <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
+              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
+            </div>
+          </ai-user-selecter>
+          <ai-select
+            v-model="search.source"
+            clearable
+            placeholder="请选择订单状态"
+            :selectList="dict.getDict('EP_source')"
+            @change="search.current = 1, getList()">
+          </ai-select>
+          <el-date-picker
+            v-model="search.queryBeginTime"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="选择兑换开始日期"
+            @change="search.current = 1, getList()">
+          </el-date-picker>
+          <el-date-picker
+            v-model="search.queryEndTime"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="选择兑换结束日期"
+            @change="search.current = 1, getList()">
+          </el-date-picker>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.name"
+            size="small"
+            placeholder="请输入商品名称"
+            clearable
+            v-throttle="() => {search.current = 1, getList()}"
+            @clear="search.current = 1, search.name = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-search-bar style="margin-top: 12px" bottomBorder>
+        <template #left>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">订单核销</el-button>
+          <ai-download :instance="instance" url="/app/appepidemicpreventionregisterinfo/export" :params="search" fileName="订单" :disabled="tableData.length == 0">
+            <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出订单</el-button>
+          </ai-download>
+        </template>
+        <template #right>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        v-loading="loading"
+        style="margin-top: 16px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="goods" width="240px" label="商品" align="left">
+          <template slot-scope="{ row }">
+            <div class="goods">
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" width="100px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="remove(row.id)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          name: '',
+          createUserId: ''
+        },
+        name: '',
+        info: {},
+        colConfigs: [
+          { slot: 'goods', label: '商品' },
+          { prop: 'phone', align: 'center', label: '单价/数量' },
+          { prop: 'startTime', align: 'center', label: '消耗积分' },
+          { prop: 'startAreaName', align: 'center', label: '兑换人' },
+          {
+            prop: 'arriveTime',
+            align: 'center',
+            label: '兑换时间'
+          },
+          {
+            prop: 'arriveAreaName',
+            align: 'center',
+            label: '状态'
+          }
+        ],
+        ids: [],
+        tableData: [],
+        total: 0,
+        loading: false,
+        disabledLevel: 0
+      }
+    },
+
+    created () {
+      this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType', 'EP_riskStatus', 'EP_source']).then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
+          params: {
+            ...this.search,
+            arriveAreaId: this.search.arriveAreaId,
+            queryBeginTime: this.search.queryBeginTime ? this.search.queryBeginTime + ' 00:00:00' : '',
+            queryEndTime: this.search.queryEndTime ? this.search.queryEndTime + ' 23:59:59' : ''
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .list {
+    .userSelcet {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 215px;
+      height: 32px;
+      line-height: 32px;
+      border-radius: 4px;
+      border: 1px solid #d0d4dc;
+      overflow: hidden;
+      cursor: pointer;
+      transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+
+      &:hover {
+        border-color: $placeholderColor;
+      }
+
+      i {
+        display: flex;
+        position: relative;
+        align-items: center;
+        justify-content: center;
+        width: 30px;
+        height: 100%;
+        line-height: 32px;
+        font-size: 14px;
+        text-align: center;
+        color: #d0d4dc;
+        transform: rotateZ(180deg);
+      }
+
+      .el-icon-circle-close:hover {
+        opacity: 0.6;
+      }
+
+      span {
+        flex: 1;
+        padding: 0 15px;
+        font-size: 12px;
+        color: $placeholderColor;
+      }
+    }
+  }
+</style>
diff --git a/project/pingchang/apps/AppInterview/components/Detail.vue b/project/pingchang/apps/AppInterview/components/Detail.vue
new file mode 100644
index 00000000..9aaf8b8c
--- /dev/null
+++ b/project/pingchang/apps/AppInterview/components/Detail.vue
@@ -0,0 +1,77 @@
+ <template>
+  <ai-detail isHasSidebar v-loading="isLoading">
+    <template slot="title">
+      <ai-title title="调查走访详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <ai-wrapper
+            label-width="120px">
+            <ai-info-item label="标题" isLine :value="info.title"></ai-info-item>
+            <ai-info-item label="描述" isLine :value="info.description"></ai-info-item>
+            <ai-info-item label="图片">
+              <ai-uploader
+                :instance="instance"
+                :value="info.files"
+                disabled
+                :limit="9">
+              </ai-uploader>
+            </ai-info-item>
+            <ai-info-item label="慰问对象" :value="info.name"></ai-info-item>
+            <ai-info-item label="联系方式" :value="info.phone"></ai-info-item>
+            <ai-info-item label="走访区域" :value="info.areaName"></ai-info-item>
+            <ai-info-item label="所在位置" :value="info.address"></ai-info-item>
+            <ai-info-item label="走访人" :value="info.name"></ai-info-item>
+            <ai-info-item label="走访时间" :value="info.visitTime"></ai-info-item>
+          </ai-wrapper>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {}
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appvisitvondolencepingchang/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+          }
+        })
+      },
+
+      cancel () {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: true
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/project/pingchang/apps/AppInterview/components/List.vue b/project/pingchang/apps/AppInterview/components/List.vue
new file mode 100644
index 00000000..e873dfc8
--- /dev/null
+++ b/project/pingchang/apps/AppInterview/components/List.vue
@@ -0,0 +1,120 @@
+<template>
+  <ai-list class="list">
+    <ai-title slot="title" title="调查走访" isShowBottomBorder ></ai-title>
+    <template slot="content">
+      <ai-search-bar bottomBorder>
+        <template #left>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.title"
+            size="small"
+            placeholder="标题、慰问对象、走访人"
+            clearable
+            v-throttle="() => {search.current = 1, getList()}"
+            @clear="search.current = 1, search.title = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 16px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="remove(row.id)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          title: ''
+        },
+        colConfigs: [
+          { prop: 'title', label: '标题' },
+          { prop: 'visitTime', align: 'center', label: '走访时间' },
+          { prop: 'name', align: 'center', label: '慰问对象' },
+          { prop: 'phone', align: 'center', label: '联系方式' },
+          {
+            prop: 'address',
+            align: 'center',
+            label: '所在位置'
+          },
+          {
+            prop: 'createUserName',
+            align: 'center',
+            label: '走访人'
+          }
+        ],
+        tableData: [],
+        total: 0
+      }
+    },
+
+    created () {
+      this.getList()
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appvisitvondolencepingchang/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      remove (id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appvisitvondolencepingchang/delete?id=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>