diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
index 1f244ef6..03d829dc 100644
--- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
+++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
@@ -71,7 +71,7 @@
           <p>{{item.phone}}</p>
           <p>{{item.registerInfo.startAreaName}}-{{item.registerInfo.arriveAreaName}}</p>
           <p v-if="item.lastRiskDisposal && item.lastRiskDisposal.handleType != 7 && item.lastRiskDisposal.handleType  != null">处置意见：<span :class="'type-'+item.lastRiskDisposal.handleType">{{$dict.getLabel('EP_handleType', item.lastRiskDisposal.handleType)}}</span></p>
-          <div class="btn" v-if="item.status == 0" @click.stop="toEdit(item.registerInfo.id)">管理</div>
+          <div class="btn" v-if="item.status == 0">管理</div>
           <div class="btn" v-if="item.status == 1" @click.stop="toManage(item.id)">排查</div>
           <img src="./components/img/status-img.png" alt="" class="status-img" v-if="item.status == 2">
         </div>
@@ -84,6 +84,7 @@
       </div>
     </div>
     <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+    <AiAdd @add="add"/>
     <u-calendar v-model="showDate" mode="range" @change="changeDate"></u-calendar>
     <u-select v-model="showTypeSelect" :list="registerTypeList" label-name="dictName" value-name="dictValue" @confirm="typeConfirm"></u-select>
   </div>
@@ -197,12 +198,15 @@ export default {
         uni.navigateTo({url: `./Detail?id=${id}`})
       }
     },
-    toEdit(id) {
-      uni.navigateTo({url: `./Edit?id=${id}&fromType=2`})
-    },
+    // toEdit(id) {
+    //   uni.navigateTo({url: `./Edit?id=${id}&fromType=2`})
+    // },
     toManage(id) {
       uni.navigateTo({url: `./ManageDetail?id=${id}`})
     },
+    add() {
+      uni.navigateTo({url: `./Edit?fromType=0`})
+    },
     change(index) {
       this.keyword = ''
       this.currentTabs = index
diff --git a/src/project/pingchang/AppCommunityManagement/Edit.vue b/src/project/pingchang/AppCommunityManagement/Edit.vue
index c1b98795..dc8100ce 100644
--- a/src/project/pingchang/AppCommunityManagement/Edit.vue
+++ b/src/project/pingchang/AppCommunityManagement/Edit.vue
@@ -2,7 +2,7 @@
   <div class="Edit">
     <div class="header-tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
     <div class="form-info">
-      <div class="info mar-b16" v-if="fromType == 2">
+      <div class="info mar-b16" v-if="fromType == 2 || fromType == 0">
         <div class="title">基本信息</div>
         <div class="item solid">
           <div class="label">
@@ -170,6 +170,7 @@ export default {
       travelTypeList: [],
       travelType: [],
       fromType: '', //1编辑行程信息 2纳入管理
+      titleList: ['新增待管理', '编辑行程信息', '纳入管理']
     }
   },
   computed: {
@@ -178,18 +179,21 @@ export default {
   onLoad(option) {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
+    this.fromType = option.fromType
     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.fromType = option.fromType
+      if(option.id) {
+        this.id = option.id
+        this.getDetail()
+      }
       this.travelTypeList = this.$dict.getDict('EP_travelType')
-      this.getDetail()
       this.getCropAreaId()
     })
 
   },
   onShow() {
-    document.title = this.fromType == 2 ? '纳入管理' : '编辑行程信息'
+    console.log(this.fromType)
+    document.title = this.titleList[this.fromType]
   },
   methods: {
     submit() {
@@ -224,7 +228,8 @@ export default {
       this.form.startTime = this.form.startTime + ':00',
       this.form.arriveTime = this.form.arriveTime + ':00',
       this.form.travelType = this.travelType.join(',')
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/updateForAdmin`, this.form).then((res) => {
+      var url = this.fromType == 0 ? '/app/appepidemicpreventionregisterinfo/addForCM' : '/app/appepidemicpreventionregisterinfo/updateForAdmin'
+      this.$http.post(url, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('updateDetail')
diff --git a/src/project/pingchang/AppCommunityManagement/HandleDetail.vue b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue
index 57f60328..160af1d1 100644
--- a/src/project/pingchang/AppCommunityManagement/HandleDetail.vue
+++ b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue
@@ -117,7 +117,7 @@
     <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 class="confirm" @click="changeStatus()">纳入管理</div>
     </div>
     <!-- <div class="footer" v-if="info.haveOnlyTransferBtn" @click="toChangeUser">移交人员</div> -->
   </div>
@@ -216,6 +216,19 @@ export default {
       }).catch((err) => {
         this.$u.toast(err)
       })
+    },
+    changeStatus() {
+      this.$confirm(`是否将${this.info.name}纳入管理`).then(() => {
+        this.$http.post(`/app/appepidemicpreventioncommunitymanagement/cancel?id=${this.id}`, ).then((res) => {
+          if (res.code == 0) {
+            this.$u.toast('操作成功')
+            uni.$emit('updateList')
+            setTimeout(() => {
+              uni.navigateBack()
+            }, 600)
+          }
+        })
+      })
     }
   },
 }