From 0e0fdb14de1745e7a0f23b015e3095289b879e17 Mon Sep 17 00:00:00 2001
From: liuye <yanran200830@163.com>
Date: Thu, 24 Nov 2022 14:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AE=A1=E7=90=86=E5=BE=85?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCheckpointRegistration/Edit.vue        | 250 +++----------
 .../AppCommunityManagement.vue                |   5 +-
 .../AppCommunityManagement/ChangeArea.vue     | 180 +---------
 .../pingchang/AppCommunityManagement/Edit.vue | 331 +++++++-----------
 .../AppCommunityManagement/HandleDetail.vue   |  43 ++-
 5 files changed, 219 insertions(+), 590 deletions(-)

diff --git a/src/project/pingchang/AppCheckpointRegistration/Edit.vue b/src/project/pingchang/AppCheckpointRegistration/Edit.vue
index 12ad274a..053e2e67 100644
--- a/src/project/pingchang/AppCheckpointRegistration/Edit.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/Edit.vue
@@ -1,25 +1,9 @@
 <template>
   <div class="Edit">
+    <div class="header-tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
     <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="title">行程信息</div>
         <div class="item solid">
           <div class="label">
             <span class="tips">*</span>出发时间
@@ -50,16 +34,30 @@
         <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="type-select solid ai-radio">
+          <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 solid">
+          <u-input v-model="form.trainNo" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="100" />
+        </div>
         <div class="item">
           <div class="label">
             <span class="tips"></span>行程描述
           </div>
         </div>
-        <div class="item-textarea">
+        <div class="item-textarea solid">
           <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>抵平时间
@@ -87,7 +85,7 @@
             <span class="tips"></span>目的地详址
           </div>
         </div>
-        <div class="item-textarea">
+        <div class="item-textarea solid">
           <u-input v-model="form.arriveAddress" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="50" />
         </div>
       </div>
@@ -226,194 +224,13 @@ export default {
 .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;
-    }
+  .header-tips{
+    line-height: 1.3;
+    padding: 32px 32px;
+    color: #FF883C;
+    font-size: 30px;
+    text-align: justify;
+    background: #FFF8F3;
   }
   .item-textarea {
     width: calc(100% - 32px);
@@ -448,6 +265,15 @@ export default {
     .info {
       padding-left: 32px;
       background-color: #fff;
+      .title{
+        line-height: 116px;
+        background: #FFF;
+        font-size: 38px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        overflow: hidden;
+      }
       .item {
         padding-left: 0;
       }
@@ -494,6 +320,10 @@ export default {
       }
     }
   }
+  .ai-radio {
+    width:100%;
+    padding-bottom: 32px;
+  }
 
   .mar-b16 {
     margin-bottom: 16px;
diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
index 905b8dbb..5951b51b 100644
--- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
+++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
@@ -73,7 +73,7 @@
           <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 == 0" @click.stop="toEdit(item.id)">管理</div>
-          <div class="btn" v-if="item.status == 1" @click.stop="toEdit(item.id)">排查</div>
+          <div class="btn" v-if="item.status == 1" @click.stop="toAdd(item.id)">排查</div>
           <img src="./components/img/status-img.png" alt="" class="status-img" v-if="item.status == 2">
         </div>
         <div class="bottom">
@@ -198,6 +198,9 @@ export default {
       }
     },
     toEdit(id) {
+      uni.navigateTo({url: `./Edit?id=${id}&fromType=2`})
+    },
+    toAdd(id) {
       uni.navigateTo({url: `./Add?id=${id}`})
     },
     change(index) {
diff --git a/src/project/pingchang/AppCommunityManagement/ChangeArea.vue b/src/project/pingchang/AppCommunityManagement/ChangeArea.vue
index f0d538bd..b7d3a7d1 100644
--- a/src/project/pingchang/AppCommunityManagement/ChangeArea.vue
+++ b/src/project/pingchang/AppCommunityManagement/ChangeArea.vue
@@ -1,101 +1,23 @@
 <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>出发地
+            <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>
+            <AiAreaPicker v-model="areaId" :areaId="cropAreaId" @select="areaSelect" :name.sync="areaName" style="color: #666">
+              <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</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>
 
@@ -106,63 +28,23 @@ 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: []
+      areaId: '',
+      areaName: '',
+      cropAreaId: ''
     }
   },
-  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()
-    })
-
+    this.getCropAreaId()
+    this.areaId = option.areaId
+    this.areaName = option.areaName
+    this.id = option.id
   },
   onShow() {
-    document.title = '编辑行程信息'
+    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) => {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/changeAreaId?id=${this.id}&areaId=${this.areaId}&areaName=${this.areaName}`).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('updateDetail')
@@ -174,26 +56,8 @@ export default {
       }).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) {
@@ -201,22 +65,8 @@ export default {
         }
       })
     },
-    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
+    areaSelect(e) {
+      this.areaId = e
     },
   },
 }
diff --git a/src/project/pingchang/AppCommunityManagement/Edit.vue b/src/project/pingchang/AppCommunityManagement/Edit.vue
index 12ad274a..91b90980 100644
--- a/src/project/pingchang/AppCommunityManagement/Edit.vue
+++ b/src/project/pingchang/AppCommunityManagement/Edit.vue
@@ -1,25 +1,37 @@
 <template>
   <div class="Edit">
+    <div class="header-tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
     <div class="form-info">
-      <div class="info mar-b16">
+      <div class="info mar-b16" v-if="fromType == 2">
+        <div class="title">基本信息</div>
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>身份证号
+          </div>
+          <div class="value">
+            <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="18" v-model="form.idNumber" :custom-style="{'font-size': '17px'}"  @blur="idNumberChange" />
+          </div>
+        </div>
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>姓名
+          </div>
+          <div class="value">
+            <u-input placeholder="请输入" type="text" input-align="right" height="32" maxlength="6" v-model="form.name" :custom-style="{'font-size': '17px'}" />
+
+          </div>
+        </div>
         <div class="item">
           <div class="label">
-            <span class="tips">*</span>出行方式
+            <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 class="value">
+            <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.phone" :custom-style="{'font-size': '17px'}" />
           </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="title">行程信息</div>
         <div class="item solid">
           <div class="label">
             <span class="tips">*</span>出发时间
@@ -50,16 +62,30 @@
         <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="type-select solid ai-radio">
+          <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 solid">
+          <u-input v-model="form.trainNo" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="100" />
+        </div>
         <div class="item">
           <div class="label">
             <span class="tips"></span>行程描述
           </div>
         </div>
-        <div class="item-textarea">
+        <div class="item-textarea solid">
           <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>抵平时间
@@ -87,10 +113,31 @@
             <span class="tips"></span>目的地详址
           </div>
         </div>
-        <div class="item-textarea">
+        <div class="item-textarea solid">
           <u-input v-model="form.arriveAddress" type="textarea" placeholder="请输入"  height="200" :custom-style="{'font-size': '17px'}" maxlength="50" />
         </div>
       </div>
+      <div class="info mar-b16" v-if="fromType == 2">
+        <div class="title">健康状况</div>
+        <div class="item">
+          <div class="label" style="width:100%;">
+            <span class="tips">*</span>是否有风险旅居史
+          </div>
+        </div>
+        <AiRadio class="solid ai-radio" v-model="form.fromHighRiskArea" dict="yesOrNo"/>
+        <div class="item">
+          <div class="label" style="width:100%;">
+            <span class="tips">*</span>近七日是否接触新冠确诊或疑似患者？
+          </div>
+        </div>
+        <AiRadio class="solid ai-radio" v-model="form.contactPatients" dict="epidemicTouchInFourteen"/>
+        <div class="item">
+          <div class="label" style="width:100%;">
+            <span class="tips"></span>是否有健康异常状况？
+          </div>
+        </div>
+        <AiRadio class="ai-radio" v-model="form.abnormalHealth" dict="yesOrNo"/>
+      </div>
     </div>
     <div class="btn-height"></div>
     <div class="footer" @click="submit">提交</div>
@@ -121,7 +168,8 @@ export default {
         minute: true
       },
       travelTypeList: [],
-      travelType: []
+      travelType: [],
+      fromType: '', //1编辑行程信息 2纳入管理
     }
   },
   computed: {
@@ -133,6 +181,7 @@ export default {
     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
       this.travelTypeList = this.$dict.getDict('EP_travelType')
       this.getDetail()
       this.getCropAreaId()
@@ -140,10 +189,22 @@ export default {
 
   },
   onShow() {
-    document.title = '编辑行程信息'
+    document.title = this.fromType == 2 ? '纳入管理' : '编辑行程信息'
   },
   methods: {
     submit() {
+      if (!this.form.idNumber) {
+        return this.$toast('请输入身份证号')
+      }
+      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)) {
+        return this.$toast('请输入正确的身份证账号')
+      }
+      if (!this.form.phone) {
+        return this.$toast('请输入手机号码')
+      }
+      if (!this.form.name) {
+        return this.$toast('请输入姓名')
+      }
       if(!this.travelType.length) {
         return this.$u.toast('请选择出行方式')
       }
@@ -218,6 +279,31 @@ export default {
     areaSelectArrive(e) {
       this.arriveAreaId = e
     },
+    idNumberChange(e) {
+      if(e.detail.value.length) {
+        this.getOwnerInfo(e.detail.value)
+      }
+    },
+    // 获取个人信息
+    getOwnerInfo(idNumber) {
+      this.$instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailByIdNumber`, null, {
+        params: {
+          idNumber: idNumber,
+        }
+      }).then(res => {
+        if(res?.data) {
+          this.form.name = res.data.name || ''
+          this.form.phone = res.data.phone || ''
+          this.form.startAreaId = res.data.startAreaId
+          this.form.startAreaName = res.data.startAreaName
+          this.form.description = res.data.description || ''
+          this.form.arriveAreaId = res.data.arriveAreaId
+          this.form.arriveAreaName = res.data.arriveAreaName
+          this.form.startAddress = res.data.startAddress || ''
+          this.form.arriveAddress = res.data.arriveAddress || ''
+        }
+      })
+    },
   },
 }
 </script>
@@ -226,195 +312,15 @@ export default {
 .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;
-    }
+  .header-tips{
+    line-height: 1.3;
+    padding: 32px 32px;
+    color: #FF883C;
+    font-size: 30px;
+    text-align: justify;
+    background: #FFF8F3;
   }
+
   .item-textarea {
     width: calc(100% - 32px);
   }
@@ -448,6 +354,15 @@ export default {
     .info {
       padding-left: 32px;
       background-color: #fff;
+      .title{
+        line-height: 116px;
+        background: #FFF;
+        font-size: 38px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        overflow: hidden;
+      }
       .item {
         padding-left: 0;
       }
@@ -494,6 +409,10 @@ export default {
       }
     }
   }
+  .ai-radio {
+    width: 100%;
+    padding-bottom: 32px;
+  }
 
   .mar-b16 {
     margin-bottom: 16px;
diff --git a/src/project/pingchang/AppCommunityManagement/HandleDetail.vue b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue
index 6857cb0d..57f60328 100644
--- a/src/project/pingchang/AppCommunityManagement/HandleDetail.vue
+++ b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue
@@ -10,14 +10,17 @@
       </div>
     </div>
     <div class="info">
-      <div class="title">基本信息</div>
+      <div class="title">基本信息<span @click="changeIdNumber" style="color:#4181FF;">{{ isIdNumberInput ? '保存' : '编辑' }}</span></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 class="value">
+          <u-input v-if="isIdNumberInput" type="number" input-align="right" height="32" maxlength="18" v-model="info.idNumber" :custom-style="{'font-size': '17px'}"  />
+          <span v-else>{{info.idNumberText}}</span>
+        </div>
       </div>
       <div class="item-flex">
         <div class="label">联系方式</div>
@@ -36,7 +39,7 @@
     </div>
     <div class="line-bg"></div>
     <div class="info">
-      <div class="title">行程信息<span @click="toEdit()" style="color:#4181FF;">编辑</span></div>
+      <div class="title">行程信息<span @click="toEdit(1)" style="color:#4181FF;">编辑</span></div>
       <div class="item-flex">
         <div class="label">出行方式</div>
         <div class="value">
@@ -128,7 +131,8 @@ export default {
     return {
       id: '',
       info: {},
-      status: ''
+      status: '',
+      isIdNumberInput: false, //true保存 false编辑
       // haveHomeQuarantineBtn: false, // 是否重新处置 true屏蔽居家两种隔离
     }
   },
@@ -181,15 +185,38 @@ export default {
       uni.setStorageSync('checkPointContent', i)
       uni.navigateTo({url: './ChangeUser?delta=1'})
     },
-    toEdit() {
-      uni.navigateTo({url: `./Edit?id=${this.info.id}`})
+    toEdit(fromType) {
+      uni.navigateTo({url: `./Edit?id=${this.info.id}&fromType=${fromType}`})
     },
     toChangeArea() {
-      uni.navigateTo({url:'./ChangeArea'})
+      uni.navigateTo({url: `./ChangeArea?id=${this.id}&areaId=${this.info.arriveAreaId}&areaName=${this.info.arriveAreaName}`})
     },
     toManageAdd() {
-      // uni.navigateTo({url:'./ChangeArea'})
+      this.toEdit(2)
     },
+    changeIdNumber() {
+      this.isIdNumberInput = !this.isIdNumberInput
+      if(!this.isIdNumberInput) {
+        this.changeIdNumberConfirm()
+      }
+    },
+    changeIdNumberConfirm() {
+      if (!this.info.idNumber) {
+        return this.$toast('请输入身份证号')
+      }
+      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.info.idNumber)) {
+        return this.$toast('请输入正确的身份证账号')
+      }
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/updateForAdmin`, this.info).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('保存成功')
+          uni.$emit('updateList')
+          this.getDetail()
+        }
+      }).catch((err) => {
+        this.$u.toast(err)
+      })
+    }
   },
 }
 </script>