diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
index 692d4f72..905b8dbb 100644
--- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
+++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
@@ -5,16 +5,24 @@
         inactive-color="#A1C1E8" :bar-style="barStyle" :active-item-style="activeStyle" active-color="#ffffff " @change="change">
       </u-tabs>
       <div class="header">
-        <div class="tab-item">
-          <h2 style="color:#5AAD6A;">{{totalInfo['今日登记']}}</h2>
-          <p>今日返乡</p>
+        <div class="tab-item" v-if="!currentTabs">
+          <h2 style="color:#5AAD6A;">{{totalInfo['待管理']}}</h2>
+          <p>待管理</p>
+        </div>
+        <div class="tab-item" v-if="currentTabs == 1">
+          <h2 style="color:#5AAD6A;">{{totalInfo['管理中']}}</h2>
+          <p>管理中</p>
+        </div>
+        <div class="tab-item" v-if="currentTabs == 2">
+          <h2 style="color:#5AAD6A;">{{totalInfo['已解除']}}</h2>
+          <p>已解除</p>
         </div>
         <div class="tab-item">
-          <h2 style="color:#F5A319;">{{totalInfo['今日风险']}}</h2>
+          <h2 style="color:#F5A319;">{{totalInfo['今日新增']}}</h2>
           <p>今日新增</p>
         </div>
         <div class="tab-item">
-          <h2 style="color:#CD413A;border-right:0;">{{totalInfo['风险处理']}}</h2>
+          <h2 style="color:#CD413A;border-right:0;">{{totalInfo['新增风险']}}</h2>
           <p>新增风险</p>
         </div>
       </div>
@@ -34,25 +42,20 @@
       </div>
       <div class="top-select">
         <div class="item" @click="showDate=true">
-          <!-- <AiAreaPicker v-model="areaId" :areaId="cropAreaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
-            <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
-            <span v-else style="color:#999;">地区选择</span>
-            <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
-          </AiAreaPicker> -->
           <span v-if="!dateList.length" style="color:#999;">选择日期</span>
           <span v-else>{{ dateList[0] }}-{{dateList[1]}}</span>
           <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
           <u-calendar v-model="showDate" mode="range" @change="changeDate"></u-calendar>
         </div>
         <div class="item" @click="showTypeSelect=true">
-          <span v-if="infoType === ''" style="color:#999;">处置意见</span>
-          <span v-else>{{ $dict.getLabel('EP_handleType', infoType) }}</span>
+          <span v-if="handleType === ''" style="color:#999;">处置意见</span>
+          <span v-else>{{ $dict.getLabel('EP_handleType', handleType) }}</span>
           <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
         </div>
       </div>
     </AiTopFixed>
     <div class="data-list" v-if="list && list.length">
-      <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item.id)">
+      <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item.status, item.id)">
         <div class="top">
           <div class="title">
             <div class="name">
@@ -67,15 +70,16 @@
           </div>
           <p> {{item.idNumberText}}</p>
           <p>{{item.phone}}</p>
-          <p> 出发地-目的地</p>
+          <p>{{item.registerInfo.startAreaName}}-{{item.registerInfo.arriveAreaName}}</p>
           <p> 处置意见：<span :class="'type-'+item.lastRiskDisposal.handleType">{{$dict.getLabel('EP_handleType', item.lastRiskDisposal.handleType)}}</span></p>
-          <div class="btn" v-if="item.status != 2" @click.stop="toEdit(item.id)">管理</div>
-          <img src="./components/img/status-img.png" alt="" class="status-img" v-else>
+          <div class="btn" v-if="item.status == 0" @click.stop="toEdit(item.id)">管理</div>
+          <div class="btn" v-if="item.status == 1" @click.stop="toEdit(item.id)">排查</div>
+          <img src="./components/img/status-img.png" alt="" class="status-img" v-if="item.status == 2">
         </div>
         <div class="bottom">
           <div class="text">
             <!-- 管控人：<span> {{item.controllerUserName}}</span>  -->
-            抵平时间：{{item.createTime}}
+            抵平时间：{{item.registerInfo.arriveTime}}
           </div>
         </div>
       </div>
@@ -97,7 +101,7 @@ export default {
       current: 1,
       keyword: '',
       currentTabs: 0,
-      infoType: '',
+      handleType: '',
       showTypeSelect: false,
       tabList: [
         {
@@ -131,8 +135,8 @@ export default {
     ...mapState(['user']),
   },
   onLoad() {
-    // this.areaId = this.user.areaId
-    // this.areaName = this.user.areaName
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
     this.$dict.load('EP_CM_status', 'EP_registerInfoType', 'EP_handleType').then(() => {
       this.registerTypeList = this.$dict.getDict('EP_handleType')
       this.registerTypeList.unshift({dictValue: '', dictName: '全部'})
@@ -163,8 +167,8 @@ export default {
       this.getList()
     },
     getList() {
-      var startDate = this.dateList[0] + ' 00:00:00'
-      var endDate = this.dateList[1] + ' 00:00:00'
+      var startDate = this.dateList.length ? this.dateList[0] + ' 00:00:00' : ''
+      var endDate = this.dateList.length ? this.dateList[1] + ' 00:00:00' : ''
       this.$http.post('/app/appepidemicpreventioncommunitymanagement/list', null, {
         params: {
           size: 10,
@@ -172,7 +176,9 @@ export default {
           status: this.currentTabs,
           areaId: this.areaId, name:
           this.keyword,
-          infoType: this.infoType
+          queryBeginTime: startDate,
+          queryEndTime: endDate,
+          handleType: this.handleType
         },
       }).then((res) => {
         if (res.code == 0) {
@@ -183,8 +189,13 @@ export default {
         }
       })
     },
-    toDetail(id) {
-      uni.navigateTo({url: `./Detail?id=${id}`})
+    toDetail(status, id) {
+      console.log(status, id)
+      if(status == 0) {
+        uni.navigateTo({url: `./HandleDetail?id=${id}`})
+      }else{
+        uni.navigateTo({url: `./Detail?id=${id}`})
+      }
     },
     toEdit(id) {
       uni.navigateTo({url: `./Add?id=${id}`})
@@ -197,15 +208,16 @@ export default {
     areaSelect(e) {
       this.areaId = e
       this.getListInit()
+      this.getTotal()
     },
     typeConfirm(e) {
-      this.infoType = e[0].value
+      this.handleType = e[0].value
       this.getListInit()
     },
 
 
     getTotal() {
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/listStatistics?areaId=${this.areaId}&infoType=0`).then((res) => {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/listStatistics?areaId=${this.areaId}`).then((res) => {
         if (res.code == 0) {
           this.totalInfo = res.data
         }
@@ -381,7 +393,7 @@ export default {
           border-radius: 4px;
           box-sizing: border-box;
           position: absolute;
-          bottom: 32px;
+          bottom: 16px;
           right: 32px;
           font-family: PingFangSC-Regular;
           font-size: 28px;
diff --git a/src/project/pingchang/AppCommunityManagement/ChangeArea.vue b/src/project/pingchang/AppCommunityManagement/ChangeArea.vue
new file mode 100644
index 00000000..f0d538bd
--- /dev/null
+++ b/src/project/pingchang/AppCommunityManagement/ChangeArea.vue
@@ -0,0 +1,520 @@
+<template>
+  <div class="ChangeArea">
+    <div class="form-info">
+      <div class="info mar-b16">
+        <div class="item">
+          <div class="label">
+            <span class="tips">*</span>出行方式
+          </div>
+        </div>
+        <div class="type-select solid">
+          <div class="type-item" :class="[travelType.includes(v.dictValue)? 'active':'']"  v-for="(v, index) in travelTypeList" :key="index" @click="travelTypeSelect(v.dictValue)">{{v.dictName}}</div>
+        </div>
+        <div class="item">
+          <div class="label" style="width:100%;">
+            <span class="tips"></span>车次/车牌/航班
+          </div>
+        </div>
+        <div class="item-textarea">
+          <u-input v-model="form.trainNo" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="100" />
+        </div>
+      </div>
+      <div class="info mar-b16">
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>出发时间
+          </div>
+          <div class="value" @click="showDateSelect=true;dateType='startTime'">
+            <span class="color-999" v-if="!form.startTime">请选择</span>
+            <span v-else>{{form.startTime}}</span>
+            <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+          </div>
+        </div>
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>出发地
+          </div>
+          <div class="value">
+            <AiAreaPicker v-model="form.startAreaId" all @select="areaSelectStart" :name.sync="form.startAreaName" style="color: #666">
+              <span style="margin-left: 4px" v-if="form.startAreaName">{{ form.startAreaName }}</span>
+              <span v-else>请选择</span>
+              <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+            </AiAreaPicker>
+          </div>
+        </div>
+        <div class="item">
+          <div class="label">
+            <span class="tips"></span>出发地详址
+          </div>
+        </div>
+        <div class="item-textarea solid">
+          <u-input v-model="form.startAddress" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="50" />
+        </div>
+        <div class="item">
+          <div class="label">
+            <span class="tips"></span>行程描述
+          </div>
+        </div>
+        <div class="item-textarea">
+          <u-input v-model="form.description" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="500" />
+        </div>
+      </div>
+      <div class="info mar-b16">
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>抵平时间
+          </div>
+          <div class="value" @click="showDateSelect=true;dateType='arriveTime'">
+            <span class="color-999" v-if="!form.arriveTime">请选择</span>
+            <span v-else>{{form.arriveTime}}</span>
+            <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+          </div>
+        </div>
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>目的地
+          </div>
+          <div class="value">
+            <AiAreaPicker v-model="form.arriveAreaId" :areaId="cropAreaId" @select="areaSelectArrive" :name.sync="form.arriveAreaName" style="color: #666" selectRoot>
+              <span style="margin-left: 4px" v-if="form.arriveAreaName">{{ form.arriveAreaName }}</span>
+              <span v-else>请选择</span>
+              <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+            </AiAreaPicker>
+          </div>
+        </div>
+        <div class="item">
+          <div class="label">
+            <span class="tips"></span>目的地详址
+          </div>
+        </div>
+        <div class="item-textarea">
+          <u-input v-model="form.arriveAddress" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="50" />
+        </div>
+      </div>
+    </div>
+    <div class="btn-height"></div>
+    <div class="footer" @click="submit">提交</div>
+    <u-picker mode="time" :params="params" v-model="showDateSelect" @confirm="dateConfirm"></u-picker>
+    <u-select v-model="showDictSelect" :list="$dict.getDict(selectDictName)" label-name="dictName" value-name="dictValue" @confirm="dictConfirm"></u-select>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data() {
+    return {
+      id: '',
+      form: {},
+      showDateSelect: false,
+      showDictSelect: false,
+      selectDictName: '',
+      selectFormName: '',
+      dateType: '',
+      cropAreaId: '',
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true
+      },
+      travelTypeList: [],
+      travelType: []
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen',
+      'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_controlMethod').then(() => {
+      this.id = option.id
+      this.travelTypeList = this.$dict.getDict('EP_travelType')
+      this.getDetail()
+      this.getCropAreaId()
+    })
+
+  },
+  onShow() {
+    document.title = '编辑行程信息'
+  },
+  methods: {
+    submit() {
+      if(!this.travelType.length) {
+        return this.$u.toast('请选择出行方式')
+      }
+      if(!this.form.startTime) {
+        return this.$u.toast('请选择出发时间')
+      }
+      if(!this.form.startAreaId) {
+        return this.$u.toast('请选择出发地')
+      }
+      if(!this.form.arriveTime) {
+        return this.$u.toast('请选择抵平时间')
+      }
+      if(!this.form.arriveAreaId) {
+        return this.$u.toast('请选择目的地')
+      }
+
+      this.form.startTime = this.form.startTime + ':00',
+      this.form.arriveTime = this.form.arriveTime + ':00',
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/updateForAdmin`, this.form).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('提交成功')
+          uni.$emit('updateDetail')
+          uni.$emit('updateList')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 600)
+        }
+      }).catch((err) => {
+        this.$u.toast(err)
+      })
+
+    },
+    travelTypeSelect(value) {
+      const index = this.travelType.indexOf(value)
+      if (index === -1) {
+        this.travelType.push(value)
+      } else {
+        this.travelType.splice(index, 1)
+      }
+    },
+    getDetail() {
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.form = res.data
+          this.travelType = res.data.travelType?.split(',')
+          this.form.startTime = res.data.startTime.substr(0, res.data.startTime.length - 3)
+          this.form.arriveTime = res.data.arriveTime.substr(0, res.data.arriveTime.length - 3)
+        }
+      })
+    },
+    getCropAreaId() {
+      this.$http.post(`/app/appdvcpconfig/getCorpArea`).then((res) => {
+        if (res.code == 0) {
+          this.cropAreaId = res.data
+        }
+      })
+    },
+    dateConfirm(e) {
+      this.form[this.dateType] = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+    },
+    dictSelectClick(dictName, formName) {
+      this.selectDictName = dictName
+      this.selectFormName = formName
+      this.showDictSelect = true
+    },
+    dictConfirm(e) {
+      this.form[this.selectFormName] = e[0].value
+    },
+    areaSelectStart(e) {
+      this.startAreaId = e
+    },
+    areaSelectArrive(e) {
+      this.arriveAreaId = e
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.ChangeArea {
+  background-color: #F3F6F9;
+  padding-top: 16px;
+  .user-info {
+    .user-list{
+      margin-bottom: 24px;
+      .item{
+        padding: 32px 32px 24px;
+        background-color: #fff;
+        .name{
+          font-size: 36px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 50px;
+          margin-bottom: 8px;
+          .status{
+            float: right;
+            font-size: 28px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #FF4466;
+            line-height: 40px;
+          }
+        }
+        p{
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 40px;
+          margin-bottom: 8px;
+          img{
+            width: 32px;
+            height: 32px;
+            margin-right: 18px;
+            vertical-align: top;
+          }
+        }
+        .color-999{
+          margin-bottom: 24px;
+          color: #999;
+        }
+        .start-name{
+          display: inline-block;
+          width: calc(100% - 50px);
+        }
+      }
+    }
+    .info{
+      background-color: #fff;
+      padding: 0 32px;
+      .title{
+        line-height: 116px;
+        background: #FFF;
+        font-size: 38px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        overflow: hidden;
+        span {
+          float: right;
+          font-family: PingFangSC-Regular;
+          font-size: 32px;
+          color: #999;
+          font-weight: 400;
+        }
+      }
+      .item-flex{
+        padding: 34px 0;
+        border-bottom: 1px solid #ddd;
+        display: flex;
+        justify-content: space-between;
+        line-height: 44px;
+        font-size: 32px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        .label{
+          width: 206px;
+          color: #999;
+        }
+        .value{
+          width: calc(100% - 206px);
+          word-break: break-all;
+          color: #333;
+          text-align: right;
+          .phone-icon{
+            width: 40px;
+            height: 40px;
+            vertical-align: middle;
+            margin-right: 8px;
+          }
+        }
+        .color-0{
+          color: #42D784;
+        }
+        .color-1{
+          color: #f46;
+        }
+        .color-2{
+          color: #1365DD;
+        }
+
+        .address-color2 {
+          color: #f46;
+        }
+        .address-color1 {
+          color: #ff6200;
+        }
+      }
+      .img-list{
+        padding-bottom: 32px;
+        img{
+          width: 320px;
+          height: 320px;
+        }
+      }
+      .item-flex:nth-last-of-type(1){
+        border-bottom: 0;
+      }
+      .error-list {
+        .item {
+          width: 100%;
+          background: #f4f7fe;
+          border-radius: 8px;
+          padding: 24px 24px 18px 24px;
+          box-sizing: border-box;
+          margin-bottom: 16px;
+          p {
+            font-size: 28px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #343d65;
+            line-height: 40px;
+            word-break: break-all;
+            margin-bottom: 12px;
+          }
+          div {
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #666;
+            line-height: 34px;
+            span {
+              display: inline-block;
+              margin-left: 32px;
+            }
+          }
+        }
+      }
+      .text-p{
+        line-height: 44px;
+        color: #333;
+        padding-bottom: 16px;
+      }
+    }
+    .table-content {
+      padding: 32px 0 48px 0;
+      .item {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ccc;
+        border-right: 1px solid #ccc;
+        box-sizing: border-box;
+        div {
+          flex: 1;
+          padding: 16px 48px;
+          line-height: 40px;
+          font-family: PingFangSC-Regular;
+          font-size: 28px;
+          color: #333;
+          border-left: 1px solid #ccc;
+          box-sizing: border-box;
+        }
+      }
+      .table-header {
+        background: #F7F7F7;
+        border: 1px solid #ccc;
+        border-left: none;
+      }
+    }
+    .line-bg{
+      width: 100%;
+      height: 24px;
+      background-color: #F3F6F9;
+    }
+    .border-none{
+      border-bottom: 0!important;
+    }
+    .line-text {
+      line-height: 80px;
+      border-bottom: 1px solid #ddd;
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      color: #333;
+    }
+  }
+  .item-textarea {
+    width: calc(100% - 32px);
+  }
+  .type-select {
+    .type-item {
+      display: inline-block;
+      width: calc(100% - 32px);
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #FFF;
+      border: 1px solid #CCC;
+      border-radius: 16px;
+      font-family: PingFangSC-Regular;
+      font-size: 28px;
+      color: #333;
+      margin: 0 16px 16px 0;
+      box-sizing: border-box;
+    }
+    .active {
+      background: #4181FF;
+      border: none;
+      color: #fff;
+    }
+  }
+
+  ::v-deep uni-textarea{
+    width: calc(100% - 32px);
+  }
+  .form-info {
+    .info {
+      padding-left: 32px;
+      background-color: #fff;
+      .item {
+        padding-left: 0;
+      }
+      .solid {
+        border-bottom: 1px solid #ddd;
+        box-sizing: border-box;
+      }
+    }
+    .item {
+      background-color: #fff;
+      display: flex;
+      padding: 40px 0 40px 32px;
+      .label {
+        width: 220px;
+        line-height: 48px;
+        font-family: PingFangSC-Medium;
+        font-weight: 500;
+        font-size: 34px;
+        color: #666;
+        .tips {
+          display: inline-block;
+          font-family: PingFangSC-Medium;
+          font-weight: 700;
+          font-size: 34px;
+          color: #F46;
+          margin-right: 8px;
+          vertical-align: text-top;
+        }
+      }
+      .value {
+        width: calc(100% - 220px);
+        padding-right: 32px;
+        text-align: right;
+        font-family: PingFangSC-Regular;
+        font-size: 34px;
+        color: #333;
+        .color-999 {
+          color: #999;
+          font-size: 30px;
+        }
+      }
+      textarea {
+        width: 100%;
+      }
+    }
+  }
+
+  .mar-b16 {
+    margin-bottom: 16px;
+  }
+  .btn-height{
+    height: 130px;
+  }
+  .footer{
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #1365DD;
+    box-shadow: inset 0px 1px 0px 0px #EEEEEE;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFF;
+    text-align: center;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppCommunityManagement/Edit.vue b/src/project/pingchang/AppCommunityManagement/Edit.vue
new file mode 100644
index 00000000..12ad274a
--- /dev/null
+++ b/src/project/pingchang/AppCommunityManagement/Edit.vue
@@ -0,0 +1,520 @@
+<template>
+  <div class="Edit">
+    <div class="form-info">
+      <div class="info mar-b16">
+        <div class="item">
+          <div class="label">
+            <span class="tips">*</span>出行方式
+          </div>
+        </div>
+        <div class="type-select solid">
+          <div class="type-item" :class="[travelType.includes(v.dictValue)? 'active':'']"  v-for="(v, index) in travelTypeList" :key="index" @click="travelTypeSelect(v.dictValue)">{{v.dictName}}</div>
+        </div>
+        <div class="item">
+          <div class="label" style="width:100%;">
+            <span class="tips"></span>车次/车牌/航班
+          </div>
+        </div>
+        <div class="item-textarea">
+          <u-input v-model="form.trainNo" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="100" />
+        </div>
+      </div>
+      <div class="info mar-b16">
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>出发时间
+          </div>
+          <div class="value" @click="showDateSelect=true;dateType='startTime'">
+            <span class="color-999" v-if="!form.startTime">请选择</span>
+            <span v-else>{{form.startTime}}</span>
+            <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+          </div>
+        </div>
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>出发地
+          </div>
+          <div class="value">
+            <AiAreaPicker v-model="form.startAreaId" all @select="areaSelectStart" :name.sync="form.startAreaName" style="color: #666">
+              <span style="margin-left: 4px" v-if="form.startAreaName">{{ form.startAreaName }}</span>
+              <span v-else>请选择</span>
+              <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+            </AiAreaPicker>
+          </div>
+        </div>
+        <div class="item">
+          <div class="label">
+            <span class="tips"></span>出发地详址
+          </div>
+        </div>
+        <div class="item-textarea solid">
+          <u-input v-model="form.startAddress" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="50" />
+        </div>
+        <div class="item">
+          <div class="label">
+            <span class="tips"></span>行程描述
+          </div>
+        </div>
+        <div class="item-textarea">
+          <u-input v-model="form.description" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="500" />
+        </div>
+      </div>
+      <div class="info mar-b16">
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>抵平时间
+          </div>
+          <div class="value" @click="showDateSelect=true;dateType='arriveTime'">
+            <span class="color-999" v-if="!form.arriveTime">请选择</span>
+            <span v-else>{{form.arriveTime}}</span>
+            <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+          </div>
+        </div>
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>目的地
+          </div>
+          <div class="value">
+            <AiAreaPicker v-model="form.arriveAreaId" :areaId="cropAreaId" @select="areaSelectArrive" :name.sync="form.arriveAreaName" style="color: #666" selectRoot>
+              <span style="margin-left: 4px" v-if="form.arriveAreaName">{{ form.arriveAreaName }}</span>
+              <span v-else>请选择</span>
+              <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+            </AiAreaPicker>
+          </div>
+        </div>
+        <div class="item">
+          <div class="label">
+            <span class="tips"></span>目的地详址
+          </div>
+        </div>
+        <div class="item-textarea">
+          <u-input v-model="form.arriveAddress" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="50" />
+        </div>
+      </div>
+    </div>
+    <div class="btn-height"></div>
+    <div class="footer" @click="submit">提交</div>
+    <u-picker mode="time" :params="params" v-model="showDateSelect" @confirm="dateConfirm"></u-picker>
+    <u-select v-model="showDictSelect" :list="$dict.getDict(selectDictName)" label-name="dictName" value-name="dictValue" @confirm="dictConfirm"></u-select>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data() {
+    return {
+      id: '',
+      form: {},
+      showDateSelect: false,
+      showDictSelect: false,
+      selectDictName: '',
+      selectFormName: '',
+      dateType: '',
+      cropAreaId: '',
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true
+      },
+      travelTypeList: [],
+      travelType: []
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen',
+      'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_controlMethod').then(() => {
+      this.id = option.id
+      this.travelTypeList = this.$dict.getDict('EP_travelType')
+      this.getDetail()
+      this.getCropAreaId()
+    })
+
+  },
+  onShow() {
+    document.title = '编辑行程信息'
+  },
+  methods: {
+    submit() {
+      if(!this.travelType.length) {
+        return this.$u.toast('请选择出行方式')
+      }
+      if(!this.form.startTime) {
+        return this.$u.toast('请选择出发时间')
+      }
+      if(!this.form.startAreaId) {
+        return this.$u.toast('请选择出发地')
+      }
+      if(!this.form.arriveTime) {
+        return this.$u.toast('请选择抵平时间')
+      }
+      if(!this.form.arriveAreaId) {
+        return this.$u.toast('请选择目的地')
+      }
+
+      this.form.startTime = this.form.startTime + ':00',
+      this.form.arriveTime = this.form.arriveTime + ':00',
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/updateForAdmin`, this.form).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('提交成功')
+          uni.$emit('updateDetail')
+          uni.$emit('updateList')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 600)
+        }
+      }).catch((err) => {
+        this.$u.toast(err)
+      })
+
+    },
+    travelTypeSelect(value) {
+      const index = this.travelType.indexOf(value)
+      if (index === -1) {
+        this.travelType.push(value)
+      } else {
+        this.travelType.splice(index, 1)
+      }
+    },
+    getDetail() {
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.form = res.data
+          this.travelType = res.data.travelType?.split(',')
+          this.form.startTime = res.data.startTime.substr(0, res.data.startTime.length - 3)
+          this.form.arriveTime = res.data.arriveTime.substr(0, res.data.arriveTime.length - 3)
+        }
+      })
+    },
+    getCropAreaId() {
+      this.$http.post(`/app/appdvcpconfig/getCorpArea`).then((res) => {
+        if (res.code == 0) {
+          this.cropAreaId = res.data
+        }
+      })
+    },
+    dateConfirm(e) {
+      this.form[this.dateType] = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+    },
+    dictSelectClick(dictName, formName) {
+      this.selectDictName = dictName
+      this.selectFormName = formName
+      this.showDictSelect = true
+    },
+    dictConfirm(e) {
+      this.form[this.selectFormName] = e[0].value
+    },
+    areaSelectStart(e) {
+      this.startAreaId = e
+    },
+    areaSelectArrive(e) {
+      this.arriveAreaId = e
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.Edit {
+  background-color: #F3F6F9;
+  padding-top: 16px;
+  .user-info {
+    .user-list{
+      margin-bottom: 24px;
+      .item{
+        padding: 32px 32px 24px;
+        background-color: #fff;
+        .name{
+          font-size: 36px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 50px;
+          margin-bottom: 8px;
+          .status{
+            float: right;
+            font-size: 28px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #FF4466;
+            line-height: 40px;
+          }
+        }
+        p{
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 40px;
+          margin-bottom: 8px;
+          img{
+            width: 32px;
+            height: 32px;
+            margin-right: 18px;
+            vertical-align: top;
+          }
+        }
+        .color-999{
+          margin-bottom: 24px;
+          color: #999;
+        }
+        .start-name{
+          display: inline-block;
+          width: calc(100% - 50px);
+        }
+      }
+    }
+    .info{
+      background-color: #fff;
+      padding: 0 32px;
+      .title{
+        line-height: 116px;
+        background: #FFF;
+        font-size: 38px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        overflow: hidden;
+        span {
+          float: right;
+          font-family: PingFangSC-Regular;
+          font-size: 32px;
+          color: #999;
+          font-weight: 400;
+        }
+      }
+      .item-flex{
+        padding: 34px 0;
+        border-bottom: 1px solid #ddd;
+        display: flex;
+        justify-content: space-between;
+        line-height: 44px;
+        font-size: 32px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        .label{
+          width: 206px;
+          color: #999;
+        }
+        .value{
+          width: calc(100% - 206px);
+          word-break: break-all;
+          color: #333;
+          text-align: right;
+          .phone-icon{
+            width: 40px;
+            height: 40px;
+            vertical-align: middle;
+            margin-right: 8px;
+          }
+        }
+        .color-0{
+          color: #42D784;
+        }
+        .color-1{
+          color: #f46;
+        }
+        .color-2{
+          color: #1365DD;
+        }
+
+        .address-color2 {
+          color: #f46;
+        }
+        .address-color1 {
+          color: #ff6200;
+        }
+      }
+      .img-list{
+        padding-bottom: 32px;
+        img{
+          width: 320px;
+          height: 320px;
+        }
+      }
+      .item-flex:nth-last-of-type(1){
+        border-bottom: 0;
+      }
+      .error-list {
+        .item {
+          width: 100%;
+          background: #f4f7fe;
+          border-radius: 8px;
+          padding: 24px 24px 18px 24px;
+          box-sizing: border-box;
+          margin-bottom: 16px;
+          p {
+            font-size: 28px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #343d65;
+            line-height: 40px;
+            word-break: break-all;
+            margin-bottom: 12px;
+          }
+          div {
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #666;
+            line-height: 34px;
+            span {
+              display: inline-block;
+              margin-left: 32px;
+            }
+          }
+        }
+      }
+      .text-p{
+        line-height: 44px;
+        color: #333;
+        padding-bottom: 16px;
+      }
+    }
+    .table-content {
+      padding: 32px 0 48px 0;
+      .item {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ccc;
+        border-right: 1px solid #ccc;
+        box-sizing: border-box;
+        div {
+          flex: 1;
+          padding: 16px 48px;
+          line-height: 40px;
+          font-family: PingFangSC-Regular;
+          font-size: 28px;
+          color: #333;
+          border-left: 1px solid #ccc;
+          box-sizing: border-box;
+        }
+      }
+      .table-header {
+        background: #F7F7F7;
+        border: 1px solid #ccc;
+        border-left: none;
+      }
+    }
+    .line-bg{
+      width: 100%;
+      height: 24px;
+      background-color: #F3F6F9;
+    }
+    .border-none{
+      border-bottom: 0!important;
+    }
+    .line-text {
+      line-height: 80px;
+      border-bottom: 1px solid #ddd;
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      color: #333;
+    }
+  }
+  .item-textarea {
+    width: calc(100% - 32px);
+  }
+  .type-select {
+    .type-item {
+      display: inline-block;
+      width: calc(100% - 32px);
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #FFF;
+      border: 1px solid #CCC;
+      border-radius: 16px;
+      font-family: PingFangSC-Regular;
+      font-size: 28px;
+      color: #333;
+      margin: 0 16px 16px 0;
+      box-sizing: border-box;
+    }
+    .active {
+      background: #4181FF;
+      border: none;
+      color: #fff;
+    }
+  }
+
+  ::v-deep uni-textarea{
+    width: calc(100% - 32px);
+  }
+  .form-info {
+    .info {
+      padding-left: 32px;
+      background-color: #fff;
+      .item {
+        padding-left: 0;
+      }
+      .solid {
+        border-bottom: 1px solid #ddd;
+        box-sizing: border-box;
+      }
+    }
+    .item {
+      background-color: #fff;
+      display: flex;
+      padding: 40px 0 40px 32px;
+      .label {
+        width: 220px;
+        line-height: 48px;
+        font-family: PingFangSC-Medium;
+        font-weight: 500;
+        font-size: 34px;
+        color: #666;
+        .tips {
+          display: inline-block;
+          font-family: PingFangSC-Medium;
+          font-weight: 700;
+          font-size: 34px;
+          color: #F46;
+          margin-right: 8px;
+          vertical-align: text-top;
+        }
+      }
+      .value {
+        width: calc(100% - 220px);
+        padding-right: 32px;
+        text-align: right;
+        font-family: PingFangSC-Regular;
+        font-size: 34px;
+        color: #333;
+        .color-999 {
+          color: #999;
+          font-size: 30px;
+        }
+      }
+      textarea {
+        width: 100%;
+      }
+    }
+  }
+
+  .mar-b16 {
+    margin-bottom: 16px;
+  }
+  .btn-height{
+    height: 130px;
+  }
+  .footer{
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #1365DD;
+    box-shadow: inset 0px 1px 0px 0px #EEEEEE;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFF;
+    text-align: center;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppCommunityManagement/HandleDetail.vue b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue
new file mode 100644
index 00000000..6857cb0d
--- /dev/null
+++ b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue
@@ -0,0 +1,420 @@
+<template>
+  <div class="UserInfo">
+    <div class="user-list">
+      <div class="item">
+        <h2 class="name">{{info.name}}的返乡登记信息</h2>
+        <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{info.startAreaName}}</span></p>
+        <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{info.arriveAreaName}}</span></p>
+        <p><img src="./components/img/time-icon.png" alt="">{{info.arriveTime}}</p>
+        <p><img src="./components/img/point-icon.png" alt="">{{info.gatewayName}}</p>
+      </div>
+    </div>
+    <div class="info">
+      <div class="title">基本信息</div>
+      <div class="item-flex">
+        <div class="label">姓名</div>
+        <div class="value">{{info.name}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">身份证号</div>
+        <div class="value">{{info.idNumberText}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">联系方式</div>
+        <div class="value" style="color:#4181FF;" @click="callPhone(info.phone)">
+          <img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
+          {{info.phone}}</div>
+      </div>
+      <!-- <div class="item-flex">
+        <div class="label">人员类别</div>
+        <div class="value">{{$dict.getLabel('EP_registerPersonType', info.type)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">高危行业</div>
+        <div class="value">{{$dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)}}</div>
+      </div> -->
+    </div>
+    <div class="line-bg"></div>
+    <div class="info">
+      <div class="title">行程信息<span @click="toEdit()" style="color:#4181FF;">编辑</span></div>
+      <div class="item-flex">
+        <div class="label">出行方式</div>
+        <div class="value">
+           <span v-for="(item, index) in info.travelTypeList" :key="index"><span v-if="index>0">;</span>{{$dict.getLabel('EP_travelType',item)}}</span>
+        </div>
+      </div>
+      <div class="item-flex border-none" v-if="info.trainNo">
+        <div style="color:#999;">车次/车牌/航班</div>
+      </div>
+      <p class="line-text" v-if="info.trainNo">{{info.trainNo}}</p>
+      <div class="item-flex">
+        <div class="label">出发时间</div>
+        <div class="value" v-if="info.startTime">{{info.startTime.substring(0, 16)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">出发地</div>
+        <div class="value" :class="`address-color`+info.riskLevel">{{info.startAreaName}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">出发地详址</div>
+        <div class="value">{{info.startAddress}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">行程描述</div>
+        <div class="value">{{info.description}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">抵平时间</div>
+        <div class="value" v-if="info.arriveTime">{{info.arriveTime.substring(0, 16)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">目的地</div>
+        <div class="value">{{info.arriveAreaName}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">目的地详址</div>
+        <div class="value">{{info.arriveAddress}}</div>
+      </div>
+    </div>
+    <div class="line-bg"></div>
+    <div class="info">
+      <div class="title">健康状况</div>
+      <div class="item-flex">
+        <div class="label">是否有风险旅居史</div>
+        <div class="value" v-if="info.fromHighRiskArea != 1">否</div>
+        <div class="value" style="color:#f46;" v-else>{{info.highRiskAreaName}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label" style="width:360px;">7天内是否接触新冠确诊或疑似患者</div>
+        <div class="value" :style="info.contactPatients == 1 ? 'color:#f46;' : ''">{{$dict.getLabel('epidemicTouchInFourteen', info.contactPatients)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">当前健康状况</div>
+        <div class="value" >
+          <span v-if="info.abnormalHealth != 1">没有异常</span>
+          <span v-else style="color:#FF4466;">{{$dict.getLabel('EP_abnormalType', info.abnormalType)}}</span>
+        </div>
+      </div>
+    </div>
+    <div class="line-bg" v-if="info.companionList && info.companionList.length"></div>
+    <div class="info" v-if="info.companionList && info.companionList.length">
+      <div class="title">同行情况<span>共{{info.companionCount}}人同行</span></div>
+      <div class="table-content">
+        <div class="item table-header">
+          <div>姓名</div>
+          <div>手机号码</div>
+        </div>
+        <div class="item" v-for="(item, index) in info.companionList" :key="index">
+          <div>{{item.name}}</div>
+          <div>{{item.phone}}</div>
+        </div>
+      </div>
+    </div>
+
+    <div class="line-bg" style="padding-bottom: 56px;"></div>
+    <div class="footer" v-if="status == 0">
+      <div class="cancel" @click="toChangeArea()">变更管理地</div>
+      <div class="confirm" @click="toManageAdd()">纳入管理</div>
+    </div>
+    <!-- <div class="footer" v-if="info.haveOnlyTransferBtn" @click="toChangeUser">移交人员</div> -->
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data() {
+    return {
+      id: '',
+      info: {},
+      status: ''
+      // haveHomeQuarantineBtn: false, // 是否重新处置 true屏蔽居家两种隔离
+    }
+  },
+  computed: { ...mapState(['user']) },
+  onShow() {
+    document.title = '管理详情'
+  },
+  onLoad(option) {
+    this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen', 'EP_highRiskIndustries', 'EP_handleType',
+    'EP_quarantineAddress', 'EP_homeStatus', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_handoverObject', 'EP_handoverMethod').then(() => {
+      this.id = option.id
+      // this.haveHomeQuarantineBtn = option.operation == 'reDisposal' ? true : false
+      this.getDetail()
+    })
+    uni.$on('updateDetail', () => {
+      this.getDetail()
+    })
+    uni.$emit('updateList')
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.status = res.data.status
+          this.info = res.data.registerInfo
+          this.info.travelTypeList = this.info.travelType.split(',')
+          this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+        }
+      })
+    },
+    callPhone(phone) {
+      uni.makePhoneCall({phoneNumber: phone})
+    },
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
+    toContent() {
+      var haveHomeQuarantineBtn = this.info.haveHomeQuarantineBtn ? 1 : 0
+      uni.navigateTo({url: `./ManagementContent?id=${this.id}&idNumber=${this.info.idNumber}&haveHomeQuarantineBtn=${haveHomeQuarantineBtn}`})
+    },
+    toChangeUser() {
+      var i = {
+        registerId: this.info.id,
+        registerIdNumber: this.info.idNumber,
+        handleType: this.info.handleType
+      }
+      uni.setStorageSync('checkPointContent', i)
+      uni.navigateTo({url: './ChangeUser?delta=1'})
+    },
+    toEdit() {
+      uni.navigateTo({url: `./Edit?id=${this.info.id}`})
+    },
+    toChangeArea() {
+      uni.navigateTo({url:'./ChangeArea'})
+    },
+    toManageAdd() {
+      // uni.navigateTo({url:'./ChangeArea'})
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.UserInfo {
+  .user-list{
+    margin-bottom: 24px;
+    .item{
+      padding: 32px 32px 24px;
+      background-color: #fff;
+      .name{
+        font-size: 36px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 50px;
+        margin-bottom: 8px;
+        .status{
+          float: right;
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #FF4466;
+          line-height: 40px;
+        }
+      }
+      p{
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #333;
+        line-height: 40px;
+        margin-bottom: 8px;
+        img{
+          width: 32px;
+          height: 32px;
+          margin-right: 18px;
+          vertical-align: top;
+        }
+      }
+      .color-999{
+        margin-bottom: 24px;
+        color: #999;
+      }
+      .start-name{
+        display: inline-block;
+        width: calc(100% - 50px);
+      }
+    }
+  }
+  .info{
+    background-color: #fff;
+    padding: 0 32px;
+    .title{
+      line-height: 116px;
+      background: #FFF;
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      overflow: hidden;
+      span {
+        float: right;
+        font-family: PingFangSC-Regular;
+        font-size: 32px;
+        color: #999;
+        font-weight: 400;
+      }
+    }
+    .item-flex{
+      padding: 34px 0;
+      border-bottom: 1px solid #ddd;
+      display: flex;
+      justify-content: space-between;
+      line-height: 44px;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      .label{
+        width: 206px;
+        color: #999;
+      }
+      .value{
+        width: calc(100% - 206px);
+        word-break: break-all;
+        color: #333;
+        text-align: right;
+        .phone-icon{
+          width: 40px;
+          height: 40px;
+          vertical-align: middle;
+          margin-right: 8px;
+        }
+      }
+      .color-0{
+        color: #42D784;
+      }
+      .color-1{
+        color: #f46;
+      }
+      .color-2{
+        color: #1365DD;
+      }
+
+      .address-color2 {
+        color: #f46;
+      }
+      .address-color1 {
+        color: #ff6200;
+      }
+    }
+    .img-list{
+      padding-bottom: 32px;
+      img{
+        width: 320px;
+        height: 320px;
+        margin-right: 8px;
+      }
+    }
+    .item-flex:nth-last-of-type(1){
+      border-bottom: 0;
+    }
+    .error-list {
+      .item {
+        width: 100%;
+        background: #f4f7fe;
+        border-radius: 8px;
+        padding: 24px 24px 18px 24px;
+        box-sizing: border-box;
+        margin-bottom: 16px;
+        p {
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #343d65;
+          line-height: 40px;
+          word-break: break-all;
+          margin-bottom: 12px;
+        }
+        div {
+          font-size: 24px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #666;
+          line-height: 34px;
+          span {
+            display: inline-block;
+            margin-left: 32px;
+          }
+        }
+      }
+    }
+    .text-p{
+      line-height: 44px;
+      color: #333;
+      padding-bottom: 16px;
+    }
+  }
+  .table-content {
+    padding: 32px 0 48px 0;
+    .item {
+      width: 100%;
+      display: flex;
+      border-bottom: 1px solid #ccc;
+      border-right: 1px solid #ccc;
+      box-sizing: border-box;
+      div {
+        flex: 1;
+        padding: 16px 48px;
+        line-height: 40px;
+        font-family: PingFangSC-Regular;
+        font-size: 28px;
+        color: #333;
+        border-left: 1px solid #ccc;
+        box-sizing: border-box;
+      }
+    }
+    .table-header {
+      background: #F7F7F7;
+      border: 1px solid #ccc;
+      border-left: none;
+    }
+  }
+  .line-bg{
+    width: 100%;
+    height: 24px;
+    background-color: #F3F6F9;
+  }
+  .footer{
+    width: 100%;
+    height: 128px;
+    background: #FFF;
+    box-shadow: inset 0 0 0 0 #D4D4D4;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    div {
+      flex: 1;
+      height: 80px;
+      line-height: 80px;
+      background: #FFF;
+      border-radius: 8px;
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      text-align: center;
+    }
+    .cancel {
+      color: #1365DD;
+      line-height: 76px;
+      border: 1px solid #CCCCCC;
+      box-sizing: border-box;
+      margin-right: 32px;
+    }
+    .confirm {
+      background-color: #1365DD;
+      color: #fff;
+    }
+  }
+  .border-none{
+    border-bottom: 0!important;
+  }
+  .line-text {
+    line-height: 80px;
+    border-bottom: 1px solid #ddd;
+    font-family: PingFangSC-Regular;
+    font-size: 32px;
+    color: #333;
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue
new file mode 100644
index 00000000..e6d6e8b3
--- /dev/null
+++ b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue
@@ -0,0 +1,289 @@
+<template>
+  <div class="ManageDetail">
+    <div class="info">
+      <div class="title">基本信息<span class="title-right-text" @click="toNucleAcidDetail">点击查看核酸采样记录</span></div>
+      <div class="item-flex">
+        <div class="label">管理区域</div>
+        <div class="value">{{info.areaName}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">管理对象</div>
+        <div class="value">{{info.name}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">身份证号</div>
+        <div class="value">{{info.idNumberText}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">手机号码</div>
+        <div class="value" style="color:#4181FF;" @click="callPhone(info.phone)">
+          <img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
+          {{info.phone}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">处置意见</div>
+        <div class="value" :class="'type-'+info.lastRiskDisposal.handleType">{{$dict.getLabel('EP_handleType', info.lastRiskDisposal.handleType)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">居家状态</div>
+        <div class="value">{{$dict.getLabel('EP_homeStatus2', info.homeStatus)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">隔离时间</div>
+        <div class="value" v-if="info.quarantineBeginTime">{{info.quarantineBeginTime.substring(0, 10)}} 至 {{info.quarantineEndTime.substring(0, 10)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">隔离策略</div>
+        <div class="value">{{$dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}</div>
+      </div>
+      <div class="item-flex" v-if="info.status != 0">
+        <div class="label">管控人</div>
+        <div class="value">{{info.controllerUserName}}</div>
+      </div>
+      <div class="item-flex" v-if="info.status != 0">
+        <div class="label">联系方式</div>
+        <div class="value">{{info.controllerUserPhone}}</div>
+      </div>
+    </div>
+    <div class="line-bg"></div>
+    <div class="info" v-if="info.status != 0">
+      <div  v-if="info.controllerContent">
+        <div class="item-flex border-none">
+          <div class="label">管控内容</div>
+        </div>
+        <p style="padding-bottom: 24px;">{{info.controllerContent}}</p>
+      </div>
+      <div v-if="info.fileList && info.fileList.length">
+        <div class="item-flex border-none" >
+          <div class="label">图片</div>
+        </div>
+        <div class="img-list" v-for="(item, index) in info.fileList" :key="index">
+          <img :src="item.accessUrl" alt="" @click="previewImage(info.fileList, item.accessUrl)">
+        </div>
+      </div>
+    </div>
+
+    <div class="info" v-if="info.status == 2 && info.proveFileList.length">
+      <div class="item-flex border-none" >
+        <div class="label">核酸证明</div>
+      </div>
+      <div class="img-list" v-for="(item, index) in info.proveFileList" :key="index">
+        <img :src="item.accessUrl" alt="" @click="previewImage(info.proveFileList, item.accessUrl)">
+      </div>
+    </div>
+
+    <div class="info" v-if="info.lastRiskDisposal && info.lastRiskDisposal.remarks">
+      <div class="item-flex border-none">
+        <div style="color:#999;">备注</div>
+      </div>
+      <p style="padding-bottom: 12px;">{{info.lastRiskDisposal.remarks}}</p>
+    </div>
+
+    <div class="line-bg" style="padding-bottom: 56px;" v-if="info.status == 1"></div>
+    <div class="footer" v-if="info.status == 1">
+      <div class="cancel" @click="toEdit()">编辑</div>
+      <div class="confirm" @click="changeStatus()">解除管理</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data() {
+    return {
+      id: '',
+      info: {},
+    }
+  },
+  computed: { ...mapState(['user']) },
+  onShow() {
+    document.title = '管理信息'
+  },
+  onLoad(option) {
+    this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy', 'EP_handleType').then(() => {
+      this.id = option.id
+      this.getDetail()
+    })
+    uni.$on('updateDetail', () => {
+      this.getDetail()
+    })
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.info = res.data
+          this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+        }
+      })
+    },
+    changeStatus() {
+      this.info.status = 2
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/troubleshooting`, this.info).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('提交成功')
+          uni.$emit('updateList')
+          this.getDetail()
+        }
+      })
+    },
+    callPhone(phone) {
+      uni.makePhoneCall({phoneNumber: phone})
+    },
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
+    toEdit() {
+      uni.navigateTo({url: `./Add?id=${this.id}`})
+    },
+    toNucleAcidDetail() {
+      uni.navigateTo({url: `../AppNucleicAcidSampling/Detail?id=${this.id}&isHideBtn=1`})
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.ManageDetail {
+  .info{
+    background-color: #fff;
+    padding: 0 32px;
+    .title{
+      line-height: 116px;
+      background: #FFF;
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      overflow: hidden;
+      .title-right-text {
+        color: #1365DD;
+        font-size: 28px;
+        float: right;
+        font-weight: 400;
+      }
+    }
+    .item-flex{
+      padding: 34px 0;
+      border-bottom: 1px solid #ddd;
+      display: flex;
+      justify-content: space-between;
+      line-height: 44px;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      .label{
+        width: 206px;
+        color: #999;
+      }
+      .value{
+        width: calc(100% - 206px);
+        word-break: break-all;
+        color: #333;
+        text-align: right;
+        .phone-icon{
+          width: 40px;
+          height: 40px;
+          vertical-align: middle;
+          margin-right: 8px;
+        }
+      }
+      .color-0,
+      .type-1,
+      .type-5{
+        color: #42D784;
+      }
+      .color-1,
+      .type-2,
+      .type-3{
+        color: #f46;
+      }
+      .color-2{
+        color: #1365DD;
+      }
+      .type-4{
+        color: #FFA938;
+      }
+    }
+    .img-list{
+      padding-bottom: 32px;
+      img{
+        width: 320px;
+        height: 320px;
+      }
+    }
+    .item-flex:nth-last-of-type(1){
+      border-bottom: 0;
+    }
+    .error-list {
+      padding-bottom: 48px;
+      .item {
+        width: 100%;
+        background: #f4f7fe;
+        border-radius: 8px;
+        padding: 24px 24px 18px 24px;
+        box-sizing: border-box;
+        margin-bottom: 16px;
+        color: #343d65;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        line-height: 40px;
+        div {
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 16px;
+        }
+      }
+    }
+    .text-p{
+      line-height: 44px;
+      color: #333;
+      padding-bottom: 16px;
+    }
+  }
+  .line-bg{
+    width: 100%;
+    height: 24px;
+    background-color: #F3F6F9;
+  }
+  .footer {
+    width: 100%;
+    height: 128px;
+    background: #FFF;
+    box-shadow: inset 0 0 0 0 #D4D4D4;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    div {
+      flex: 1;
+      height: 80px;
+      line-height: 80px;
+      background: #FFF;
+      border-radius: 8px;
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      text-align: center;
+    }
+    .cancel {
+      color: #333;
+      line-height: 76px;
+      border: 1px solid #CCCCCC;
+      box-sizing: border-box;
+      margin-right: 32px;
+    }
+    .confirm {
+      background-color: #1365DD;
+      color: #fff;
+    }
+  }
+  .border-none{
+    border-bottom: 0!important;
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/address-icon.png b/src/project/pingchang/AppCommunityManagement/components/img/address-icon.png
new file mode 100644
index 00000000..1994dc16
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/address-icon.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/blue-icon.png b/src/project/pingchang/AppCommunityManagement/components/img/blue-icon.png
new file mode 100644
index 00000000..db08e4d0
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/blue-icon.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/fxry.png b/src/project/pingchang/AppCommunityManagement/components/img/fxry.png
new file mode 100644
index 00000000..16c7e3c8
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/fxry.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/idnumber-icon.png b/src/project/pingchang/AppCommunityManagement/components/img/idnumber-icon.png
new file mode 100644
index 00000000..06ab7d26
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/idnumber-icon.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/jkjc.png b/src/project/pingchang/AppCommunityManagement/components/img/jkjc.png
new file mode 100644
index 00000000..36c789cd
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/jkjc.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/org-icon.png b/src/project/pingchang/AppCommunityManagement/components/img/org-icon.png
new file mode 100644
index 00000000..93c85c58
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/org-icon.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/phone-icon.png b/src/project/pingchang/AppCommunityManagement/components/img/phone-icon.png
new file mode 100644
index 00000000..3f374d30
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/phone-icon.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/phone2@.png b/src/project/pingchang/AppCommunityManagement/components/img/phone2@.png
new file mode 100644
index 00000000..0cc0c1ca
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/phone2@.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/point-icon.png b/src/project/pingchang/AppCommunityManagement/components/img/point-icon.png
new file mode 100644
index 00000000..0b1024b8
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/point-icon.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/status0.png b/src/project/pingchang/AppCommunityManagement/components/img/status0.png
new file mode 100644
index 00000000..29a2c7c3
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/status0.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/status1.png b/src/project/pingchang/AppCommunityManagement/components/img/status1.png
new file mode 100644
index 00000000..5f3ae938
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/status1.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/status2.png b/src/project/pingchang/AppCommunityManagement/components/img/status2.png
new file mode 100644
index 00000000..c4e99d04
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/status2.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/status3.png b/src/project/pingchang/AppCommunityManagement/components/img/status3.png
new file mode 100644
index 00000000..6ebc8e14
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/status3.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/status4.png b/src/project/pingchang/AppCommunityManagement/components/img/status4.png
new file mode 100644
index 00000000..9d690eb4
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/status4.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/status5.png b/src/project/pingchang/AppCommunityManagement/components/img/status5.png
new file mode 100644
index 00000000..e28e4976
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/status5.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/status6.png b/src/project/pingchang/AppCommunityManagement/components/img/status6.png
new file mode 100644
index 00000000..3e9c12a0
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/status6.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/time-icon.png b/src/project/pingchang/AppCommunityManagement/components/img/time-icon.png
new file mode 100644
index 00000000..d7b3df68
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/time-icon.png differ
diff --git a/src/project/pingchang/AppCommunityManagement/components/img/user-img.png b/src/project/pingchang/AppCommunityManagement/components/img/user-img.png
new file mode 100644
index 00000000..ae49d85f
Binary files /dev/null and b/src/project/pingchang/AppCommunityManagement/components/img/user-img.png differ