From 8309d0d1002a5c9cbbb8c563cbc78611cb51d355 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 22 Nov 2022 09:45:49 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/huji/immigration/edit.vue    | 597 ++++++++----------
 1 file changed, 258 insertions(+), 339 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index f90baa11b..9ba26be26 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -1,366 +1,285 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form
-        ref="ref_form"
-        :inline="true"
-        :model="fmData"
-        :rules="dataRule"
-        :disabled="formType === 'detail'"
-        class="form"
-      >
-        <el-form-item
-          label="所属网格	"
-          prop="gridId"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.gridId"
-            placeholder="请选择"
-            size="small"
-            clearable
-            class="item_width_1"
-            :disabled="formType === 'edit'"
-            @change="handleChangeGrid"
-          >
-            <el-option
-              v-for="item in optionsG"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="fmData"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="form">
+        <el-form-item label="所属网格	"
+                      prop="gridId"
+                      label-width="150px"
+                      style="display: block">
+          <el-select v-model.trim="fmData.gridId"
+                     placeholder="请选择"
+                     size="small"
+                     clearable
+                     class="item_width_1"
+                     :disabled="formType === 'edit'"
+                     @change="handleChangeGrid">
+            <el-option v-for="item in optionsG"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item
-          label="所属房屋	"
-          prop="homeId"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            v-if="formType == 'detail'"
-            class="item_width_2"
-            placeholder="请输入来源地"
-            disabled
-            v-model="fmData.allName"
-          />
+        <el-form-item label="所属房屋	"
+                      prop="homeId"
+                      label-width="150px"
+                      style="display: block">
+          <el-input v-if="formType == 'detail'"
+                    class="item_width_2"
+                    placeholder="请输入来源地"
+                    disabled
+                    v-model="fmData.allName" />
           <template v-else>
-            <el-select
-              v-model.trim="fmData.villageId"
-              placeholder="请选择小区"
-              size="small"
-              clearable
-              class="resi-cell-select"
-              @clear="handleClearVillage"
-              @change="handleChangeV"
-              :disabled="formType === 'edit'"
-              style="margin-right: 8px; width: 120px"
-            >
-              <el-option
-                v-for="item in optionsV"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model.trim="fmData.villageId"
+                       placeholder="请选择小区"
+                       size="small"
+                       clearable
+                       class="resi-cell-select"
+                       @clear="handleClearVillage"
+                       @change="handleChangeV"
+                       :disabled="formType === 'edit'"
+                       style="margin-right: 8px; width: 120px">
+              <el-option v-for="item in optionsV"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
-            <el-select
-              v-model.trim="fmData.buildId"
-              placeholder="楼号"
-              size="small"
-              clearable
-              style="margin-right: 8px; width: 120px"
-              class="resi-cell-select"
-              :disabled="changeVDisabled || formType === 'edit'"
-              @clear="handleClearBuild"
-              @change="handleChangeB"
-            >
-              <el-option
-                v-for="item in optionsB"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model.trim="fmData.buildId"
+                       placeholder="楼号"
+                       size="small"
+                       clearable
+                       style="margin-right: 8px; width: 120px"
+                       class="resi-cell-select"
+                       :disabled="changeVDisabled || formType === 'edit'"
+                       @clear="handleClearBuild"
+                       @change="handleChangeB">
+              <el-option v-for="item in optionsB"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
-            <el-select
-              v-model.trim="fmData.unitId"
-              :disabled="changeBDisabled || formType === 'edit'"
-              placeholder="单元"
-              size="small"
-              clearable
-              style="margin-right: 8px; width: 120px"
-              class="resi-cell-select"
-              @click="handleClearDan"
-              @change="handleChangeD"
-            >
-              <el-option
-                v-for="item in optionsD"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model.trim="fmData.unitId"
+                       :disabled="changeBDisabled || formType === 'edit'"
+                       placeholder="单元"
+                       size="small"
+                       clearable
+                       style="margin-right: 8px; width: 120px"
+                       class="resi-cell-select"
+                       @click="handleClearDan"
+                       @change="handleChangeD">
+              <el-option v-for="item in optionsD"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
-            <el-select
-              v-model.trim="fmData.homeId"
-              :disabled="changeDDisabled || formType === 'edit'"
-              placeholder="房号"
-              size="small"
-              clearable
-              @change="handleChangeH"
-              style="width: 120px"
-              class="resi-cell-select"
-            >
-              <el-option
-                v-for="item in optionsH"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model.trim="fmData.homeId"
+                       :disabled="changeDDisabled || formType === 'edit'"
+                       placeholder="房号"
+                       size="small"
+                       clearable
+                       @change="handleChangeH"
+                       style="width: 120px"
+                       class="resi-cell-select">
+              <el-option v-for="item in optionsH"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </template>
         </el-form-item>
 
-        <el-form-item
-          label="姓名"
-          prop="name"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            style="margin-right: 20px"
-            placeholder="请输入姓名	"
-            v-model="fmData.name"
-            :disabled="formType === 'edit'"
-            maxlength="30"
-          >
+        <el-form-item label="姓名"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    style="margin-right: 20px"
+                    placeholder="请输入姓名	"
+                    v-model="fmData.name"
+                    :disabled="formType === 'edit'"
+                    maxlength="30">
           </el-input>
 
-          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0">享受福利</el-checkbox>
+          <el-checkbox v-model="fmData.isWelfare"
+                       true-label="1"
+                       false-label="0">享受福利</el-checkbox>
           <template v-if="formType === 'edit'">
-            <el-checkbox
-              v-model="fmData.isCheck"
-              true-label="1"
-              false-label="0"
-              :disabled="initCheck == 1"
-              @change="checkResiAvailable"
-              >补充居民信息</el-checkbox
-            >
+            <el-checkbox v-model="fmData.isCheck"
+                         true-label="1"
+                         false-label="0"
+                         :disabled="initCheck == 1"
+                         @change="checkResiAvailable">补充居民信息</el-checkbox>
           </template>
 
-          <el-checkbox
-            v-else
-            v-model="fmData.isCheck"
-            true-label="1"
-            false-label="0"
-            @change="checkResiAvailable"
-            >补充居民信息</el-checkbox
-          >
+          <el-checkbox v-else
+                       v-model="fmData.isCheck"
+                       true-label="1"
+                       false-label="0"
+                       @change="checkResiAvailable">补充居民信息</el-checkbox>
         </el-form-item>
 
-        <el-form-item
-          label="手机号"
-          prop="mobile"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="number"
-            maxlength="11"
-            show-word-limit
-            placeholder="请输入手机号	"
-            :disabled="formType === 'edit'"
-            v-model="fmData.mobile"
-          >
+        <el-form-item label="手机号"
+                      prop="mobile"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="number"
+                    maxlength="11"
+                    show-word-limit
+                    placeholder="请输入手机号	"
+                    :disabled="formType === 'edit'"
+                    v-model="fmData.mobile">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="证件号"
-          prop="idCard"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入身份证号或护照号"
-            v-model="fmData.idCard"
-            :disabled="formType === 'edit'"
-            @blur="handleBlurId"
-          ></el-input>
+        <el-form-item label="证件号"
+                      prop="idCard"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入身份证号或护照号"
+                    v-model="fmData.idCard"
+                    :disabled="formType === 'edit'"
+                    @blur="handleBlurId"></el-input>
         </el-form-item>
 
-        <el-form-item
-          label="性别"
-          prop="principalName"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.gender"
-            placeholder="性别"
-            size="small"
-            clearable
-            class="item_width_1"
-            :disabled="true"
-          >
-            <el-option
-              v-for="item in optionsGender"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="性别"
+                      prop="principalName"
+                      label-width="150px"
+                      style="display: block">
+          <el-select v-model.trim="fmData.gender"
+                     placeholder="性别"
+                     size="small"
+                     clearable
+                     class="item_width_1"
+                     :disabled="true">
+            <el-option v-for="item in optionsGender"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="年龄"
-          prop="age"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="number"
-            show-word-limit
-            placeholder="请输入"
-            v-model="fmData.age"
-            :disabled="true"
-          >
+        <el-form-item label="年龄"
+                      prop="age"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="number"
+                    show-word-limit
+                    placeholder="请输入"
+                    v-model="fmData.age"
+                    :disabled="true">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="迁入日期"
-          prop="inTime"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-date-picker
-            v-model="fmData.inTime"
-            type="date"
-            placeholder="迁入时间"
-            value-format="yyyy-MM-dd"
-            class="item_width_1"
-            :disabled="formType === 'edit'"
-          >
+        <el-form-item label="迁入日期"
+                      prop="inTime"
+                      label-width="150px"
+                      style="display: block">
+          <el-date-picker v-model="fmData.inTime"
+                          type="date"
+                          placeholder="迁入时间"
+                          value-format="yyyy-MM-dd"
+                          class="item_width_1"
+                          :disabled="formType === 'edit'">
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item
-          label="迁入原因"
-          prop="inReason"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            type="textarea"
-            class="item_width_2"
-            placeholder="请输入迁入原因"
-            v-model="fmData.inReason"
-          >
+        <el-form-item label="迁入原因"
+                      prop="inReason"
+                      label-width="150px"
+                      style="display: block">
+          <el-input type="textarea"
+                    class="item_width_2"
+                    placeholder="请输入迁入原因"
+                    v-model="fmData.inReason">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="来源地"
-          prop="sourceAddress"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            v-if="formType == 'detail'"
-            class="item_width_2"
-            placeholder="请输入来源地"
-            disabled
-            v-model="fmData.sourceAddress"
-          />
-          <el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps"
-            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+        <el-form-item label="来源地"
+                      prop="sourceAddress"
+                      label-width="150px"
+                      style="display: block">
+          <el-input v-if="formType == 'detail'"
+                    class="item_width_2"
+                    placeholder="请输入来源地"
+                    disabled
+                    v-model="fmData.sourceAddress" />
+          <el-cascader v-else
+                       ref="nowArea"
+                       class="item_width_1"
+                       :props="areaProps"
+                       v-model="nowAllCode"
+                       clearable
+                       @change="handleNowArea"></el-cascader>
 
         </el-form-item>
-        <el-form-item
-          label="详细地址"
-          prop="address"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入详细地址"
-            v-model="fmData.address"
-          >
+        <el-form-item label="详细地址"
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入详细地址"
+                    v-model="fmData.address">
           </el-input>
         </el-form-item>
-        <el-form-item
-          label="迁移证号码"
-          prop="moveNumber"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入迁移证号码"
-            v-model="fmData.moveNumber"
-          >
+        <el-form-item label="迁移证号码"
+                      prop="moveNumber"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入迁移证号码"
+                    v-model="fmData.moveNumber">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="户主姓名"
-          prop="householderName"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入户主姓名"
-            v-model="fmData.householderName"
-          >
+        <el-form-item label="户主姓名"
+                      prop="householderName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入户主姓名"
+                    v-model="fmData.householderName">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="与户主关系"
-          prop="householderRelation"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.householderRelation"
-            placeholder="与户主关系"
-            size="small"
-            clearable
-            class="item_width_1"
-          >
-            <el-option
-              v-for="item in optionsRelation"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="与户主关系"
+                      prop="householderRelation"
+                      label-width="150px"
+                      style="display: block">
+          <el-select v-model.trim="fmData.householderRelation"
+                     placeholder="与户主关系"
+                     size="small"
+                     clearable
+                     class="item_width_1">
+            <el-option v-for="item in optionsRelation"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
       </el-form>
     </div>
     <div class="div_btn resi-btns">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        v-if="formType != 'detail'"
-        type="primary"
-        size="small"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'detail'"
+                 type="primary"
+                 size="small"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
     </div>
   </div>
 </template>
@@ -371,7 +290,7 @@ import formVltHelper from 'dai-js/tools/formVltHelper'
 import { computedCard } from '@/utils/index'
 import { isCard, isMobile } from '@/utils/validate'
 
-function iniFmData() {
+function iniFmData () {
   return {
     gridId: '',
     villageId: '',
@@ -400,7 +319,7 @@ function iniFmData() {
 }
 
 export default {
-  data() {
+  data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
 
@@ -436,7 +355,7 @@ export default {
   },
   components: {},
   computed: {
-    dataRule() {
+    dataRule () {
       let checkIdCard = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入证件号'))
@@ -469,26 +388,26 @@ export default {
         sourceAddress: [
           { required: true, message: '来源地不能为空', trigger: 'blur' }
         ],
-        address: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' }
-        ]
+        // address: [
+        //   { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        // ]
       }
     },
 
-    changeVDisabled() {
+    changeVDisabled () {
       return !this.fmData.villageId
     },
-    changeBDisabled() {
+    changeBDisabled () {
       return !this.fmData.buildId
     },
-    changeDDisabled() {
+    changeDDisabled () {
       return !this.fmData.unitId
     }
   },
   props: {},
   watch: {},
 
-  async mounted() {
+  async mounted () {
     console.log('mounted-----我执行了')
     await this.getGridList()
 
@@ -496,13 +415,13 @@ export default {
   },
 
   methods: {
-    lzayLoadArea(node, resolve) {
+    lzayLoadArea (node, resolve) {
       // this.getArea(node, resolve)
       setTimeout(() => {
         this.getArea(node, resolve)
       }, 200)
     },
-    async checkResiAvailable() {
+    async checkResiAvailable () {
       const {
         fmData: { idCard, isResiUser }
       } = this
@@ -528,7 +447,7 @@ export default {
         }
       }
     },
-    handleNowArea(val) {
+    handleNowArea (val) {
       console.log('val-----', val)
       console.log('label-----', this.$refs.nowArea.getCheckedNodes())
       if (val.length > 0) {
@@ -544,7 +463,7 @@ export default {
         this.fmData.sourceAddressPathCode = ''
       }
     },
-    handleBlurId(val) {
+    handleBlurId (val) {
       const { sex, age } = computedCard(this.fmData.idCard)
       if (val) {
         this.fmData.age = age
@@ -553,20 +472,20 @@ export default {
       }
     },
 
-    handleClearVillage() {
+    handleClearVillage () {
       this.fmData.buildId = ''
       this.fmData.homeId = ''
     },
-    handleClearBuild() {
+    handleClearBuild () {
       this.fmData.buildId = ''
       this.fmData.unitId = ''
       this.fmData.homeId = ''
     },
-    handleClearDan() {
+    handleClearDan () {
       this.fmData.unitId = ''
       this.fmData.homeId = ''
     },
-    handleChangeGrid(val) {
+    handleChangeGrid (val) {
       console.log('val', val)
       this.fmData.villageId = ''
       this.fmData.buildId = ''
@@ -576,7 +495,7 @@ export default {
       this.fmData.householderRelation = ''
       this.getValiheList()
     },
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log('val', val)
       this.fmData.buildId = ''
       this.fmData.unitId = ''
@@ -585,7 +504,7 @@ export default {
       this.fmData.householderRelation = ''
       this.getBuildList()
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log('val', val)
       this.fmData.unitId = ''
       this.fmData.homeId = ''
@@ -593,14 +512,14 @@ export default {
       this.fmData.householderRelation = ''
       this.getUniList()
     },
-    handleChangeD(val) {
+    handleChangeD (val) {
       console.log('val', val)
       this.fmData.homeId = ''
       this.fmData.householderName = ''
       this.fmData.householderRelation = ''
       this.getHouseList()
     },
-    handleChangeH(val) {
+    handleChangeH (val) {
       console.log('val', val)
       this.getHouseMaster()
     },
@@ -629,7 +548,7 @@ export default {
       }
 
     },
-    getRelationList() {
+    getRelationList () {
       const { user } = this.$store.state
       this.$http
         .post('/sys/dict/data/relationship', {
@@ -648,7 +567,7 @@ export default {
         })
     },
 
-    getGridList() {
+    getGridList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/customergrid/gridoption', {
@@ -667,7 +586,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
@@ -687,7 +606,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post('/gov/org/icbuilding/buildingoption', {
           neighborHoodId: this.fmData.villageId
@@ -704,7 +623,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post('/gov/org/icbuildingunit/unitoption', {
           buildingId: this.fmData.buildId
@@ -721,7 +640,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post('/gov/org/ichouse/houseoption', { unitId: this.fmData.unitId })
         .then(({ data: res }) => {
@@ -737,7 +656,7 @@ export default {
         })
     },
 
-    getHouseMaster() {
+    getHouseMaster () {
       const { homeId } = this.fmData
       if (!homeId) return (this.alreadyHaveMaster = false)
 
@@ -763,7 +682,7 @@ export default {
         })
     },
 
-    async initForm(type, id) {
+    async initForm (type, id) {
       this.$refs.ref_form.resetFields()
 
       this.formType = type
@@ -778,7 +697,7 @@ export default {
         this.getHouseList()
       }
     },
-    async getDatail(moveInId) {
+    async getDatail (moveInId) {
       let url = '/epmetuser/icMoveIn/detail'
 
       const params = {
@@ -792,7 +711,7 @@ export default {
       } else this.$message.error(msg)
     },
 
-    async handleComfirm() {
+    async handleComfirm () {
 
       // setTimeout(() => {
       //   this.btnDisable = false
@@ -834,7 +753,7 @@ export default {
       })
     },
 
-    async submit() {
+    async submit () {
 
       let url = ''
       if (this.formType === 'add') {
@@ -861,11 +780,11 @@ export default {
       }
     },
 
-    handleCancle() {
+    handleCancle () {
       this.resetData()
       this.$emit('dialogCancle')
     },
-    resetData() {
+    resetData () {
       this.orgId = ''
       this.nowAllCode = []
       this.btnDisable = false

From 1b19495cf3ec374d8dd5774be34e9a669c0629ea Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 22 Nov 2022 11:18:29 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=A3=90=E7=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/people.scss    |   4 +
 .../houseStatic/houseStaticPanshi.vue         | 750 ++++++++++++++++++
 src/views/modules/visual/basicinfo/people.vue |  43 +-
 3 files changed, 785 insertions(+), 12 deletions(-)
 create mode 100644 src/views/modules/visual/basicinfo/houseStatic/houseStaticPanshi.vue

diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss
index f774466cf..179af7ece 100644
--- a/src/assets/scss/modules/visual/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@@ -375,6 +375,10 @@
         height: 78px;
         width: 128px;
       }
+      .rel-bg-panshi {
+        height: 68px;
+        width: 128px;
+      }
 
       .rel-text {
         @include toe;
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStaticPanshi.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStaticPanshi.vue
new file mode 100644
index 000000000..8cf156b0a
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStaticPanshi.vue
@@ -0,0 +1,750 @@
+<template>
+  <div class="warning-box">
+    <!-- 组织路由 -->
+    <div class="div_top">
+      <div class="router_line"></div>
+      <div class="div_router">
+        <span class="router_parents"
+              v-for="(item,index) in runAgencyArray"
+              @click="handleClickAgency(index)"
+              :key="index">{{item.orgName}}<span class="arrow">></span></span>
+
+        <span class="router_child">{{orgName}}</span>
+      </div>
+    </div>
+    <cpt-card v-if="!showHouseList&&!showPeopleList"
+              :min-full-screen="true">
+      <div class="card-title">
+        <img class="title-icon"
+             src="@/assets/img/shuju/title-tip.png" />
+        <div class="title-label">
+          人房概览数据统计
+
+        </div>
+      </div>
+      <div class="card-left-title">本级人房概览数据统计</div>
+      <div class="card-echart">
+
+        <div class="card-left">
+          <div v-if="!dataLoading"
+               class="div-chart">
+            <screen-echarts-frame class="echart-wr"
+                                  @myChartMethod="housePieInitOk"
+                                  ref="housePieChart"></screen-echarts-frame>
+
+            <div class="div-tip">
+              <div :class="['legend_item',{'item_last':index===legendArray.length-1}]"
+                   v-for="(item,index) in legendArray"
+                   :key="index">
+                <div class="item_name">{{item.name}}</div>
+                <img :src="item.url" />
+
+              </div>
+            </div>
+
+          </div>
+
+          <div v-if="!dataLoading"
+               class="pie-table">
+            <div class="pie-table-total"
+                 @click="handleClickHouse('')">
+              <div class="pie-table-total-count">{{houseData.houseTotal}}</div>
+              <div class="pie-table-title">房屋总数</div>
+            </div>
+            <div class="pie-table-line"></div>
+            <div class="pie-table-total "
+                 @click="handleClickHouse('0')">
+              <div class="pie-table-total-count zz">{{houseData.zzHouseTotal}}</div>
+              <div class="pie-table-title">自住房屋数</div>
+            </div>
+            <div class="pie-table-total "
+                 @click="handleClickHouse('1')">
+              <div class="pie-table-total-count cz">{{houseData.czHouseTotal}}</div>
+              <div class="pie-table-title">出租房屋数</div>
+            </div>
+            <div class="pie-table-total "
+                 @click="handleClickHouse('2')">
+              <div class="pie-table-total-count xz">{{houseData.xzHouseTotal}}</div>
+              <div class="pie-table-title">闲置房屋数</div>
+            </div>
+            <div class="pie-table-total "
+                 @click="handleClickHouse('3')">
+              <div class="pie-table-total-count wsc">{{houseData.wscHouseTotal}}</div>
+              <div class="pie-table-title">未出售房屋数</div>
+            </div>
+          </div>
+
+          <div class="loading-status"
+               v-if="dataLoading">
+            <screen-loading>加载中</screen-loading>
+          </div>
+
+        </div>
+
+        <div class="card-left">
+          <div v-if="!dataLoading"
+               class="div-chart">
+            <screen-echarts-frame class="echart-wr"
+                                  @myChartMethod="userPieInitOk"
+                                  ref="userPieChart"></screen-echarts-frame>
+
+            <div class="div-tip2">
+              <div class="cz-tip">
+                <div class="cz-tip-dot"></div>
+                <span>常住人口数</span>
+              </div>
+              <div class="ld-tip">
+                <div class="ld-tip-dot"></div>
+                <span>流动人口数</span>
+              </div>
+            </div>
+
+          </div>
+
+          <div v-if="!dataLoading"
+               class="pie-table">
+            <div class="pie-table-total"
+                 @click="handleClickPeople('all')">
+              <div class="pie-table-total-count">{{userData.userTotal}}</div>
+              <div class="pie-table-title">居民总数</div>
+            </div>
+            <div class="pie-table-line"></div>
+            <div class="pie-table-total "
+                 @click="handleClickPeople('cz')">
+              <div class="pie-table-total-count zz">{{userData.czUserTotal}}</div>
+              <div class="pie-table-title">常住人口数</div>
+            </div>
+            <div class="pie-table-total "
+                 @click="handleClickPeople('ld')">
+              <div class="pie-table-total-count cz">{{userData.ldUserTotal}}</div>
+              <div class="pie-table-title">流动人口数</div>
+            </div>
+
+          </div>
+
+          <div class="loading-status"
+               v-if="dataLoading">
+            <screen-loading>加载中</screen-loading>
+          </div>
+
+        </div>
+      </div>
+      <div v-if="orgType!=='village'">
+
+        <div class="card-left-title">下级人房概览数据统计</div>
+
+        <div v-if="subList.length>0"
+             class="card-table">
+          <div v-for="(item,index) in subList"
+               :key="index"
+               :class="['table_item',index%2 === 0?'item_dark':'']">
+            <div class="item_name"
+                 @click="handleToSubAgency(item)">
+              <img src="@/assets/img/shuju/logo1.png" />
+              <span>{{item.orgName}}</span>
+            </div>
+
+            <div class="item_data">
+              <div class="item_left">
+                <div class="pie-table-total">
+                  <div class="pie-table-total-count"
+                       @click="handleClickHouse('',item)">{{item.houseTotal}}</div>
+                  <div class="pie-table-title">房屋总数</div>
+                </div>
+                <div class="pie-table-line"></div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickHouse('0',item)">{{item.zzHouseTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.zzHouseRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">自住房屋数</div>
+                </div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickHouse('1',item)">{{item.czHouseTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.czHouseRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">出租房屋数</div>
+                </div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickHouse('2',item)">{{item.xzHouseTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.xzHouseRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">闲置房屋数</div>
+                </div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickHouse('3',item)">{{item.wscHouseTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.wscHouseRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">未出售房屋数</div>
+                </div>
+              </div>
+              <div class="item_right">
+                <div class="pie-table-total">
+                  <div class="pie-table-total-count"
+                       @click="handleClickPeople('all',item)">{{item.userTotal}}</div>
+                  <div class="pie-table-title">居民总数</div>
+                </div>
+                <div class="pie-table-line"></div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickPeople('cz',item)">{{item.czUserTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.czUserRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">常住人口数</div>
+                </div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickPeople('ld',item)">{{item.ldUserTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.ldUserRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">流动人口数</div>
+                </div>
+
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div v-if="subList.length===0"
+             class="no-data">
+
+          <img src="@/assets/img/modules/visual/noData.png"
+               class="no-data-img" />
+
+        </div>
+
+      </div>
+
+    </cpt-card>
+
+    <house-list v-if="showHouseList "
+                :orgId="selOrgId"
+                :orgType="selOrgType"
+                :rentType="rentType"
+                @close="showHouseList = false">
+
+    </house-list>
+    <people-list v-if="showPeopleList "
+                 :orgId="selOrgId"
+                 :orgType="selOrgType"
+                 :type="type"
+                 @close="showPeopleList = false">
+
+    </people-list>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import screenTable from "../../components/screen-table/index";
+import cptCard from "@/views/modules/visual/cpts/card";
+import nextTick from "dai-js/tools/nextTick";
+import screenEchartsFrame from "../../components/screen-echarts-frame";
+import ScreenLoading from "@/views/modules/visual/components/screen-loading";
+import { housePieOption } from './options'
+import { userPieOption } from './userOptions'
+import houseList from './houseList'
+import peopleList from './peopleList'
+
+import * as echarts from 'echarts';
+export default {
+  name: "warning-box",
+  components: {
+    cptCard,
+    screenTable,
+    screenEchartsFrame,
+    ScreenLoading,
+    houseList,
+    peopleList
+  },
+  data () {
+    return {
+      dataLoading: true,
+      orgId: '',
+      orgType: '',
+      orgName: this.$store.state.user.agencyName,
+      // orgShowName: this.$store.state.user.agencyName,//面包屑显示当前组织名称
+
+
+      housePieChartS: null,
+      housePieChart: '',
+      housePieOption: {},
+      housePieInitState: false,
+      houseData: {
+        orgId: '',//组织、网格、小区Id	
+        orgType: '',//组织、网格、小区类型 agency  grid   village	
+        houseTotal: 198000,//房屋总数	
+        zzHouseTotal: 2000,//房屋自住总数	
+        zzHouseRatio: '90%',//房屋自住总数占比（保留两位小数，带百分号的）	
+        czHouseTotal: 30,//房屋出租总数		
+        czHouseRatio: '5%',//房屋出租总数占比（保留两位小数，带百分号的）	
+        xzHouseTotal: 200,//房屋闲置总数		
+        xzHouseRatio: '70%',//房屋闲置总数占比（保留两位小数，带百分号的）	
+        wscHouseTotal: 100,//房屋未售出总数
+        wscHouseRatio: '20%',//房屋未售出总数占比
+      },
+      houseColorArray: ['#3dda83', '#e43c26', '#fac126', '#fc8452'],
+      housePieData: [],
+
+      legendArray: [
+        {
+          name: '自住房屋数',
+          url: require('../../../../../assets/img/shuju/measure/lv@2x.png')
+        },
+        {
+          name: '出租房屋数',
+          url: require('../../../../../assets/img/shuju/measure/hong@2x.png')
+        },
+        {
+          name: '闲置房屋数',
+          url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
+        },
+        {
+          name: '未出售房屋数',
+          url: require('../../../../../assets/img/shuju/measure/cheng.png')
+        }
+      ],
+
+      userPieChartS: null,
+      userPieChart: '',
+      userPieOption: {},
+      userPieInitState: false,
+      userData: {
+        orgId: '',//组织、网格、小区Id	
+        orgType: '',//组织、网格、小区类型 agency  grid   village	
+        userTotal: 198000,//居民总数	
+        czUserTotal: 2000,//常住居民总数	
+        czUserRatio: '90%',//常住居民总数占比	
+        ldUserTotal: 30,//流动居民总数		
+        ldUserRatio: '5%',//流动居民总数占比	
+
+      },
+      userColorArray: ['#3dda83', '#e43c26'],
+      userPieData: [],
+
+      subList: [],
+
+      //下钻层级记录
+      runNum: 0,
+      runAgencyArray: [],
+      selUserId: '',
+      center: [],
+      zoom: null,
+      parentPolygon: [],
+
+      rentType: '',//点击房屋数类型
+      type: '',//点击人员数类型
+      showPeopleList: false,
+      showHouseList: false,
+      selOrgId: '',
+      selOrgType: '',
+
+    };
+  },
+  async mounted () {
+
+    await this.getApiData()
+
+  },
+  methods: {
+    async getApiData () {
+      this.dataLoading = true
+
+      this.housePieInitState = false
+      this.userPieInitState = false
+      await this.getHousechart()
+      await this.getUserchart()
+      await this.getSubuserhouselist()
+      this.dataLoading = false
+
+      await nextTick(500)
+
+      this.getHousePie()
+      this.getUserPie()
+
+    },
+
+    //点击房屋数
+    handleClickHouse (rentType, item) {
+      if (item) {
+        this.selOrgId = item.orgId
+        this.selOrgType = item.orgType
+      } else {
+        this.selOrgId = this.houseData.orgId
+        this.selOrgType = this.houseData.orgType
+      }
+      this.toSubAgency('house')
+      this.rentType = rentType
+      this.showHouseList = true
+    },
+    //点击人员数
+    handleClickPeople (type, item) {
+      if (item) {
+        this.selOrgId = item.orgId
+        this.selOrgType = item.orgType
+      } else {
+        this.selOrgId = this.houseData.orgId
+        this.selOrgType = this.houseData.orgType
+      }
+      this.toSubAgency('people')
+      this.type = type
+      this.showPeopleList = true
+    },
+
+    housePieInitOk (dom) {
+      console.log('pie准备好了', dom)
+      this.housePieChartS = dom
+      // this.housePieInitState = true
+
+    },
+    userPieInitOk (dom) {
+      console.log('pie准备好了', dom)
+      this.userPieChartS = dom
+      // this.userPieInitState = true
+
+    },
+
+    async getHousechart (node, resolve) {
+      if (this.$refs.housePieChart) {
+        this.$refs.housePieChart.showLoading()
+      }
+
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/house/housechart";
+      const url = '/gov/org/house/housechart'
+      let params = {
+        orgId: this.orgId,
+        orgType: this.orgType
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.houseData = data
+        if (this.$refs.housePieChart) {
+          this.$refs.housePieChart.hideLoading()
+        }
+
+      } else {
+        this.houseData = {}
+        this.$message.error(msg);
+      }
+      this.housePieInitState = true
+    },
+
+    getHousePie () {
+      if (this.housePieInitState) {
+        this.assignHousePieChart()
+      } else {
+        setTimeout(() => {
+          this.getHousePie()
+        }, 500)
+      }
+    },
+
+    assignHousePieChart () {
+
+      if (this.houseData) {
+        this.$refs.housePieChart.setNoData(false)
+        this.$refs.housePieChart.clear()
+        this.housePieData = []
+
+        const _that = this
+        // 获取pieChart配置
+        this.housePieOption = housePieOption(this.housePieChartS)
+        // let maxValue = this.housePieData[0].total
+        // let maxIndex = 0
+
+        let obj1 = {
+          name: '自住房屋数',
+          value: this.houseData.zzHouseRatio,
+          selected: true
+        }
+        let obj2 = {
+          name: '出租房屋数',
+          value: this.houseData.czHouseRatio
+        }
+        let obj3 = {
+          name: '闲置房屋数',
+          value: this.houseData.xzHouseRatio
+        }
+        let obj4 = {
+          name: '未出售房屋数',
+          value: this.houseData.wscHouseRatio
+        }
+
+        this.housePieData.push(obj1)
+        this.housePieData.push(obj2)
+        this.housePieData.push(obj3)
+        this.housePieData.push(obj4)
+
+        this.housePieOption.title.text = this.houseData.houseTotal
+        this.housePieOption.series[1].itemStyle = {
+          color: function (params) {
+            return _that.houseColorArray[params.dataIndex]
+          }
+        }
+
+        let fun = function (params) {
+          _that.clickHousePie(params.dataIndex)
+
+        }
+        this.$refs.housePieChart.handleClick(fun)
+        this.clickHousePie(0)
+      } else {
+        this.$refs.housePieChart.setNoData(true)
+      }
+    },
+
+    async getUserchart (node, resolve) {
+      if (this.$refs.userPieChart) {
+        this.$refs.userPieChart.showLoading()
+      }
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icresiuser/userchart";
+      const url = '/epmetuser/icresiuser/userchart'
+      let params = {
+        orgId: this.orgId,
+        orgType: this.orgType
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.userData = data
+        if (this.$refs.userPieChart) {
+          this.$refs.userPieChart.hideLoading()
+        }
+      } else {
+        this.userData = {}
+        this.$message.error(msg);
+      }
+      this.userPieInitState = true
+    },
+
+    getUserPie () {
+      if (this.userPieInitState) {
+        this.assignUserPieChart()
+      } else {
+        setTimeout(() => {
+          this.getUserPie()
+        }, 500)
+      }
+    },
+
+    assignUserPieChart () {
+
+      if (this.userData) {
+        this.$refs.userPieChart.setNoData(false)
+        this.$refs.userPieChart.clear()
+        this.userPieData = []
+
+        const _that = this
+        // 获取pieChart配置
+        this.userPieOption = userPieOption(this.userPieChartS)
+        // let maxValue = this.userPieData[0].total
+        // let maxIndex = 0
+
+        let obj1 = {
+          name: '常住人口数',
+          value: this.userData.czUserRatio,
+          selected: true
+        }
+        let obj2 = {
+          name: '流动人口数',
+          value: this.userData.ldUserRatio
+        }
+
+        this.userPieData.push(obj1)
+        this.userPieData.push(obj2)
+
+        this.userPieOption.title.text = this.userData.userTotal
+        this.userPieOption.series[1].itemStyle = {
+          color: function (params) {
+            return _that.userColorArray[params.dataIndex]
+          }
+        }
+
+        let fun = function (params) {
+          _that.clickUserPie(params.dataIndex)
+
+        }
+        this.$refs.userPieChart.handleClick(fun)
+        this.clickUserPie(0)
+      } else {
+        this.$refs.userPieChart.setNoData(true)
+      }
+    },
+
+    async getSubuserhouselist (node, resolve) {
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/house/subuserhouselist";
+      const url = '/gov/org/house/subuserhouselist'
+      let params = {
+        orgId: this.orgId,
+        orgType: this.orgType
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.subList = data
+
+
+      } else {
+      }
+    },
+
+    async clickHousePie (seriesIndex) {
+      this.housePieData.forEach((element, index) => {
+        if (index === seriesIndex) {
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zhilma')
+
+        } else {
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.housePieOption.series[1].data = this.housePieData
+      // this.$refs.housePieChart.hideLoading()
+      this.$refs.housePieChart.setOption(this.housePieOption)
+
+
+    },
+
+    async clickUserPie (seriesIndex) {
+      this.userPieData.forEach((element, index) => {
+        if (index === seriesIndex) {
+          element.label = {
+            show: true,
+
+          };
+          element.labelLine = {
+            show: true,
+            lineStyle: {
+              opacity: 1,
+            }
+
+          };
+          console.log('zhilma')
+
+        } else {
+          element.label = {
+            show: false,
+
+          };
+          element.labelLine = {
+            show: false,
+            lineStyle: {
+              opacity: 0,
+              color: 'rgba(255,255,255,0)'
+            }
+
+          };
+
+        }
+      });
+      this.userPieOption.series[1].data = this.userPieData
+      // this.$refs.userPieChart.hideLoading()
+      this.$refs.userPieChart.setOption(this.userPieOption)
+
+      // this.getTable()
+    },
+
+    async handleToSubAgency (item) {
+      if (!this.dataLoading) {
+        this.toSubAgency('subAgency', item)
+
+        await this.getApiData()
+      }
+
+    },
+
+    //下钻到下一级 
+    async toSubAgency (type, item) {
+      this.runNum++
+      let obj = {
+        orgId: this.orgId,
+        orgType: this.orgType,
+        orgName: this.orgName,
+        type: type
+      }
+      this.runAgencyArray.push(obj)
+
+      if (type === 'subAgency') {
+
+        this.orgId = item.orgId
+        this.orgType = item.orgType
+        this.orgName = item.orgName
+
+      } else if (type === 'house') {
+
+        this.orgName = '房屋列表'
+      } else if (type === 'people') {
+        this.orgName = '人员列表'
+      }
+
+    },
+
+
+    //返回所选组织
+    handleClickAgency (index) {
+
+
+      const cutNum = this.runAgencyArray.length - index//要减去的长度
+      this.runNum = this.runNum - cutNum
+
+      let orgData = this.runAgencyArray[index]
+      console.log('----------------', orgData)
+
+      for (let i = 0; i < cutNum; i++) {
+        this.runAgencyArray.pop()
+      }
+
+      this.orgId = orgData.orgId
+      this.orgType = orgData.orgType
+      this.orgName = orgData.orgName
+      this.showHouseList = false
+      this.showPeopleList = false
+      // if (orgData.type === 'house') {
+      //   this.showHouseList = false
+      // }
+      // if (orgData.type === 'people') {
+      //   this.showPeopleList = false
+      // }
+
+      this.getApiData()
+
+
+    },
+
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/warning.scss"
+  scoped
+></style>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/basicInfoMain.scss"
+  scoped
+></style>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/houseStatic.scss"
+  scoped
+></style>
+
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 91dfd3100..0434a7594 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -148,7 +148,7 @@
               <div class="rel z-zuo-2"
                    @click="toUserInfo(houseInfo.userList[0].userId)"
                    v-if="houseInfo.userList[0]">
-                <img class="rel-bg"
+                <img :class="['rel-bg',{'rel-bg-panshi':isPanshi}]"
                      src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" />
                 <img class="rel-line"
                      src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
@@ -160,7 +160,8 @@
                   <div class="rel-name">
                     {{ houseInfo.userList[0].userName }}
                   </div>
-                  <div class="rel-name">
+                  <div v-if="!isPanshi"
+                       class="rel-name">
                     {{ houseInfo.userList[0].renHuCondition }}
                   </div>
                 </div>
@@ -169,7 +170,7 @@
               <div class="rel z-you-2"
                    @click="toUserInfo(houseInfo.userList[1].userId)"
                    v-if="houseInfo.userList[1]">
-                <img class="rel-bg"
+                <img :class="['rel-bg',{'rel-bg-panshi':isPanshi}]"
                      src="@/assets/img/shuju/people/huzhu-kuang-you.png" />
                 <img class="rel-line"
                      src="@/assets/img/shuju/people/huzhu-line/you2.png" />
@@ -181,7 +182,8 @@
                   <div class="rel-name">
                     {{ houseInfo.userList[1].userName }}
                   </div>
-                  <div class="rel-name">
+                  <div v-if="!isPanshi"
+                       class="rel-name">
                     {{ houseInfo.userList[1].renHuCondition }}
                   </div>
                 </div>
@@ -190,7 +192,7 @@
               <div class="rel z-zuo-1"
                    @click="toUserInfo(houseInfo.userList[2].userId)"
                    v-if="houseInfo.userList[2]">
-                <img class="rel-bg"
+                <img :class="['rel-bg',{'rel-bg-panshi':isPanshi}]"
                      src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" />
                 <img class="rel-line"
                      src="@/assets/img/shuju/people/huzhu-line/zuo1.png" />
@@ -202,7 +204,8 @@
                   <div class="rel-name">
                     {{ houseInfo.userList[2].userName }}
                   </div>
-                  <div class="rel-name">
+                  <div v-if="!isPanshi"
+                       class="rel-name">
                     {{ houseInfo.userList[2].renHuCondition }}
                   </div>
                 </div>
@@ -211,7 +214,7 @@
               <div class="rel z-you-1"
                    @click="toUserInfo(houseInfo.userList[3].userId)"
                    v-if="houseInfo.userList[3]">
-                <img class="rel-bg"
+                <img :class="['rel-bg',{'rel-bg-panshi':isPanshi}]"
                      src="@/assets/img/shuju/people/huzhu-kuang-you.png" />
                 <img class="rel-line"
                      src="@/assets/img/shuju/people/huzhu-line/you1.png" />
@@ -223,7 +226,8 @@
                   <span class="rel-name">{{
                     houseInfo.userList[3].userName
                   }}</span>
-                  <div class="rel-name">
+                  <div v-if="!isPanshi"
+                       class="rel-name">
                     {{ houseInfo.userList[3].renHuCondition }}
                   </div>
                 </div>
@@ -232,7 +236,7 @@
               <div class="rel z-zuo-3"
                    @click="toUserInfo(houseInfo.userList[4].userId)"
                    v-if="houseInfo.userList[4]">
-                <img class="rel-bg"
+                <img :class="['rel-bg',{'rel-bg-panshi':isPanshi}]"
                      src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" />
                 <img class="rel-line"
                      src="@/assets/img/shuju/people/huzhu-line/zuo3.png" />
@@ -244,7 +248,8 @@
                   <div class="rel-name">
                     {{ houseInfo.userList[4].userName }}
                   </div>
-                  <div class="rel-name">
+                  <div v-if="!isPanshi"
+                       class="rel-name">
                     {{ houseInfo.userList[4].renHuCondition }}
                   </div>
                 </div>
@@ -253,7 +258,7 @@
               <div class="rel z-you-3"
                    @click="toUserInfo(houseInfo.userList[5].userId)"
                    v-if="houseInfo.userList[5]">
-                <img class="rel-bg"
+                <img :class="['rel-bg',{'rel-bg-panshi':isPanshi}]"
                      src="@/assets/img/shuju/people/huzhu-kuang-you.png" />
                 <img class="rel-line"
                      src="@/assets/img/shuju/people/huzhu-line/you3.png" />
@@ -265,7 +270,8 @@
                   <div class="rel-name">
                     {{ houseInfo.userList[5].userName }}
                   </div>
-                  <div class="rel-name">
+                  <div v-if="!isPanshi"
+                       class="rel-name">
                     {{ houseInfo.userList[5].renHuCondition }}
                   </div>
                 </div>
@@ -590,6 +596,10 @@ export default {
         showedInfo: false,
         currentIndex: 0,
       },
+
+      isPanshi: false,
+      customerId: '',
+
     };
   },
 
@@ -628,6 +638,15 @@ export default {
   },
 
   async mounted () {
+    //磐石街道：1580460084738760705
+    this.customerId = localStorage.getItem("customerId");
+    this.isPanshi = false
+
+    if (this.customerId === '1580460084738760705') {
+      this.isPanshi = true
+
+    }
+
     this.userId = this.uid;
     console.log(this.$router);
     this.getApiData();

From 0e21ae74c288117664e222f80d48c0be22f57520 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 22 Nov 2022 14:58:20 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E7=83=9F=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/travelYantai/travelYantai.vue    | 1084 +++++++++++++++++
 .../travelYantai/travelYantaiDetail.vue       |  340 ++++++
 .../travelYantai/travelYantaiForm.vue         | 1016 +++++++++++++++
 3 files changed, 2440 insertions(+)
 create mode 100644 src/views/modules/base/epidemic/travelYantai/travelYantai.vue
 create mode 100644 src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
 create mode 100644 src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue

diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantai.vue b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
new file mode 100644
index 000000000..a272438d5
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
@@ -0,0 +1,1084 @@
+<template>
+  <div class="div_main">
+    <div ref="div_search"
+         class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'120px'">
+        <div>
+
+          <el-form-item label="姓名"
+                        prop="name">
+            <el-input v-model="formData.name"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="手机号"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入手机号">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="证件号"
+                        prop="idCard">
+            <el-input v-model="formData.idCard"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证号或证件号">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="来自地区"
+                        prop="sourceAddress">
+            <el-input v-model="formData.sourceAddress"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入地区">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="来到本地时间"
+                        prop="startDate">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            @change="handleScheduledTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button v-if="btnAuths.tripreport_add"
+                   class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <!-- <el-button v-if="btnAuths.tripreport_import"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload v-if="btnAuths.tripreport_import"
+                   :headers="$getElUploadHeaders()"
+                   ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadHttpRequest">
+          <el-button size="small"
+                     style="margin-left: 10px"
+                     class="diy-button--delete"
+                     :loading="importLoading">{{importBtnTitle}}</el-button>
+        </el-upload> -->
+
+        <el-button v-if="btnAuths.tripreport_export"
+                   style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   :loading="exportBtn"
+                   @click="handleExport">{{ exportBtnTitle }}</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleSendNotice">发送通知</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--delete"
+                   size="small"
+                   @click="handleAttention">加入重点人群关注</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleDeletes">取消重点人群关注</el-button>
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleTiming()">更新数据</el-button>
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%"
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection"
+                         width="55"
+                         fixed="left"></el-table-column>
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"
+                         fixed="left"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="100"
+                         fixed="left">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="证件号"
+                         width="180">
+        </el-table-column>
+        <!-- <el-table-column prop="registeredResidence"
+                         header-align="center"
+                         align="center"
+                         label="户籍地"
+                         show-overflow-tooltip
+                         min-width="160">
+      
+        </el-table-column> -->
+
+        <el-table-column prop="detailAddress"
+                         header-align="center"
+                         align="center"
+                         label="现居地"
+                         width="160">
+        </el-table-column>
+        <el-table-column prop="sourceAddress"
+                         header-align="center"
+                         align="center"
+                         label="来自地区"
+                         show-overflow-tooltip
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="trafficTypeName"
+                         header-align="center"
+                         align="center"
+                         label="返回方式"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="arriveDate"
+                         header-align="center"
+                         align="center"
+                         label="来到本地时间"
+                         width="160">
+        </el-table-column>
+
+        <el-table-column prop="natOutcomeName"
+                         header-align="center"
+                         align="center"
+                         label="48小时核酸"
+                         show-overflow-tooltip
+                         min-width="100">
+        </el-table-column>
+
+        <el-table-column prop="jian"
+                         header-align="center"
+                         align="center"
+                         label="健康码异常"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="jian"
+                         header-align="center"
+                         align="center"
+                         label="行程码异常"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="latestNoticeTime"
+                         header-align="center"
+                         align="center"
+                         label="最近一次通知时间"
+                         width="140">
+        </el-table-column>
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         min-width="120">
+        </el-table-column>
+        <el-table-column prop="heSuanCheckDesc"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="重点关注"
+                         min-width="120">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button v-if="btnAuths.tripreport_view"
+                       type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+
+            <el-button v-if="btnAuths.tripreport_update"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-dropdown trigger="hover">
+              <span class="el-dropdown-link"
+                    style="margin-left:10px;">
+                <el-button type="text"
+                           size="small"
+                           class="div-table-button--more"
+                           slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <el-button type="text"
+                             class="div-table-button--detail--noline"
+                             size="small"
+                             @click="handleNoticeList(scope.row)">通知记录</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-button type="text"
+                             class="div-table-button--detail--noline"
+                             size="small"
+                             @click="handleVisiteList(scope.row) ">随访记录</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item v-if=" agencyId===scope.row.agencyId">
+                  <el-button v-if="btnAuths.tripreport_del"
+                             type="text"
+                             class="div-table-button--delete--noline "
+                             size="small"
+                             @click="handleDelete(scope.row)">删除</el-button>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <travel-yantai-form v-if="formShow"
+                          ref="ref_form"
+                          @dialogCancle="addFormCancle"
+                          @dialogOk="addFormOk"></travel-yantai-form>
+    </el-dialog>
+    <!-- 详情弹出框 -->
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'详情'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <travel-yantai-detail v-if="detailShow"
+                            :view_real_data="btnAuths.tripreport_view_real_data"
+                            @dialogCancle="addFormCancle"
+                            ref="ref_detail"></travel-yantai-detail>
+    </el-dialog>
+    <!-- 发送通知弹出框 -->
+    <el-dialog :visible.sync="sendNoticeFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="发送通知"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nf-send-notice ref="ref_sendnotice"
+                      @dialogOk="addFormOk"
+                      @dialogCancle="diaClose"></nf-send-notice>
+    </el-dialog>
+    <!-- 通知记录弹出框 -->
+    <el-dialog :visible.sync="noticeListFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="通知记录"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nf-notice-list ref="ref_noticelist"
+                      @dialogCancle="diaClose"></nf-notice-list>
+    </el-dialog>
+    <!-- 随访记录弹出框 -->
+    <el-dialog :visible.sync="visiteListFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="随访记录"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nf-visite-list ref="ref_visitelist"
+                      @dialogCancle="diaClose"></nf-visite-list>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import travelYantaiForm from './travelYantaiForm'
+import travelYantaiDetail from './travelYantaiDetail'
+import nfNoticeList from './../natFocus/nfNoticeList'
+import nfSendNotice from './../natFocus/nfSendNotice'
+import nfVisiteList from './../natFocus/nfVisiteList'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      sendNoticeFormShow: false,
+      visiteListFormShow: false,
+      noticeListFormShow: false,
+      exportBtn: false,
+      exportBtnTitle: '导出',
+      importBtnTitle: '导入',
+      importLoading: false,
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      sHeight: 0,
+      searchAreacode: [],
+      agencyId: '',
+      selectionAll: [],
+      timeRange: [],
+      formData: {
+        name: '',//负责人
+        mobile: '',//联系电话
+        idCard: '',
+        sourceAddress: '',
+        sourceAddressCode: '',
+        startDate: '',
+        endDate: '',
+
+      },
+
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      detailShow: false,
+      formTitle: '新增',
+      areaProps: {
+        lazy: true,
+        checkStrictly: true,
+        lazyLoad: this.lzayLoadArea
+      },
+
+      btnAuths: {
+        tripreport_add: true, //新增
+        tripreport_import: true, //导入
+        tripreport_export: true, //导出
+        tripreport_del: true, //删除
+        tripreport_view: true, //查看
+        tripreport_update: true, //修改
+        tripreport_view_real_data: true, //显示脱敏信息
+      },
+
+    }
+  },
+  components: {
+    travelYantaiForm,
+    travelYantaiDetail,
+    nfNoticeList,
+    nfSendNotice,
+    nfVisiteList
+  },
+  async created () {
+
+  },
+  async mounted () {
+    this.updateBtnAuths();
+
+    const { user } = this.$store.state
+    console.log('user-----', user)
+    this.agencyId = user.agencyId
+
+    await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
+  },
+
+  methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+
+    lzayLoadArea (node, resolve) {
+      this.getArea(node, resolve)
+      // setTimeout(() => {
+
+      // }, 1000)
+    },
+    handleSearch () {
+      this.loadTable()
+    },
+
+    handleSelectionChange (val) {
+      console.log('val----', val)
+      this.selectionAll = val
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/epmetuser/tripreport/page"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        // this.tableData.forEach(item => {
+        //   if (item.time) {
+        //     let timeArray = item.time.split(' ')
+        //     item.time = timeArray[0]
+        //   }
+
+        // });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+    handleAreaChange (val) {
+
+      if (val.length > 0) {
+        const len = val.length - 1
+        this.formData.sourceAddressCode = val[len]
+      } else this.formData.sourceAddressCode = ''
+    },
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.startDate = time[0]
+        this.formData.endDate = time[1]
+
+      } else {
+        this.formData.startDate = ''
+        this.formData.endDate = ''
+
+      }
+
+    },
+
+    diaClose () {
+      // this.$refs.ref_form.resetData()
+      this.formShow = false
+      this.sendNoticeFormShow = false
+      this.noticeListFormShow = false
+      this.visiteListFormShow = false
+    },
+    handleNoticeList (row) {
+      this.noticeListFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_noticelist.initTable(row.realIdCard, '0')
+      })
+
+    },
+    handleVisiteList (row) {
+
+      this.visiteListFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_visitelist.initTable(row, '0')
+
+      })
+
+    },
+    handleSendNotice () {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要通知的人员')
+        return false
+      }
+      this.sendNoticeFormShow = true
+      this.$nextTick(() => {
+        const arr = this.selectionAll.map(item => {
+
+          return {
+            userId: item.userId,
+            idCard: item.idCard,
+            realIdCard: item.realIdCard,
+            mobile: item.mobile,
+            id: item.id
+          }
+        })
+        this.$refs.ref_sendnotice.initForm(arr, '0')
+      })
+
+    },
+    handleAttention (row) {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要加入关注的名单')
+        return false
+      }
+      this.$confirm("确认选择的名单加入关注?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.saveFocus(row)
+        })
+        .catch(err => {
+          console.log('err-----', err)
+
+        });
+    },
+
+    async handleDeletes (row) {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要取消关注的名单')
+        return false
+      }
+      this.$confirm("确认取消关注选择的名单?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteFocus(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+    async saveFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-add"
+      // let idCards = []
+
+      // this.selectionAll.forEach(element => {
+      //   idCards.push(element.idCard)
+      // });
+      let params = {
+        list: this.selectionAll.map(item => {
+          return {
+            name: item.name,
+            mobile: item.realMobile,
+            idCard: item.realIdCard,
+            attentionType: 2,
+            // isolatedState: item.isolateType
+          }
+        })
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async deleteFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+      let ids = []
+
+      this.selectionAll.forEach(element => {
+        if (element.epidemicId !== '' && element.epidemicId !== null && element.epidemicId !== undefined) {
+          ids.push(element.epidemicId)
+        }
+      });
+      let params = {
+        attentionType: 2,
+        ids: ids
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleDetail (row) {
+      // this.formTitle = '行程详情'
+      this.detailShow = true
+      this.$nextTick(() => {
+
+        this.$refs.ref_detail.initForm(row)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增行程'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', '')
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row)
+      })
+    },
+
+    addFormCancle () {
+      this.detailShow = false
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.sendNoticeFormShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/epmetuser/tripreport/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = [row.id]
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleTiming (row) {
+
+      this.$confirm("确认执行更新数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.timingTravel(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async timingTravel (row) {
+      const url = "/epmetuser/dataSyncConfig/submitSyncJob"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
+
+      let params = {
+        isSync: '1',
+        dataCode: 'yimiaojiezhong',
+        jobType: 'vaccine',
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        // this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+
+      this.formData = {
+        name: '',//负责人
+        mobile: '',//联系电话
+        idCard: '',
+        sourceAddress: '',
+        sourceAddressCode: '',
+        startDate: '',
+        endDate: '',
+
+      }
+
+      this.searchAreacode = []
+      this.timeRange = []
+      // this.pageSize = 20
+      this.pageNo = 1
+      // this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
+      let params = {
+        ...this.formData
+      }
+
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      // await axios({
+      //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/tripreport/export',
+      //   // url: 'epmetuser/icresiuser/exportExcel',
+      //   method: 'post',
+      //   data: params,
+      //   responseType: 'blob'
+      // })
+      await this.$http({
+        method: 'POST',
+        url: '/epmetuser/tripreport/psexport',
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log('获取导出情失败', err)
+          this.$message.error('获取导出失败')
+        })
+      this.exportBtnTitle = '导出'
+      this.exportBtn = false
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    async handleExportModule () {
+
+
+      const url = "/epmetuser/tripreport/psdownloadtemplate"
+      let params = {}
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('res----dddd', res)
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+            console.log('filename', fileName)
+            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            var url = window.URL.createObjectURL(blob)
+            var aLink = document.createElement('a')
+            aLink.style.display = 'none'
+            aLink.href = url
+            aLink.setAttribute('download', fileName)
+            document.body.appendChild(aLink)
+            aLink.click()
+            document.body.removeChild(aLink) //下载完成移除元素
+            window.URL.revokeObjectURL(url) //释放掉blob对象
+          } else this.$message.error('下载失败')
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+
+    // 上传文件之前的钩子
+    beforeUpload (file) {
+      this.files = file;
+
+      const isText = file.type === 'application/vnd.ms-excel'
+      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+      if (!isText && !isTextComputer) {
+        this.$message.error('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+    async uploadHttpRequest (file) {
+      this.importLoading = true
+      this.importBtnTitle = '正在上传中...'
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append('file', file.file) //添加文件对象
+      await this.$http
+        .post('/epmetuser/tripreport/psimport', formData).then(res => {
+          console.log('res-up', res)
+          if (res.data.code == 0 && res.data.msg == 'success') {
+            // this.$message.success('导入成功')
+            this.loadTable()
+          } else this.$message.error(res.data.msg)
+        }).catch(err => {
+          console.log('失败', err)
+          file.onError() //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        })
+      this.importLoading = false
+      this.importBtnTitle = '导入'
+      this.$refs.upload.clearFiles()
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/gov/org/house/houseimport'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      this.importRoomLoading = true
+      window.app.ajax.post2(url, fileFormData,
+        (data, rspMsg) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit('refreshTree')
+          this.loadTable()
+          this.importRoomLoading = false
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    }
+  },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
new file mode 100644
index 000000000..915d8ff91
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
@@ -0,0 +1,340 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div v-if="view_real_data"
+           class="div_tuomin">
+        <el-button size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-3">姓名：</span>
+            <span>{{ formData.name||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">手机号：</span>
+            <span>{{ formData.showMobile||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">证件号：</span>
+            <span>{{ formData.showIdCard||'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">户籍地：</span>
+            <span>{{ formData.registeredResidence||'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">来源地：</span>
+            <span>{{ formData.sourceAddress||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">详细地址：</span>
+            <span>{{ formData.sourceDetailAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">7天内到达或途经：</span>
+            <span>{{ formData.passBy||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">来曹事由：</span>
+            <span>{{ formData.describeContent||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">48小时核酸：</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">来到本地时间：</span>
+            <span>{{ formData.arriveDate||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">在曹居住地点：</span>
+            <span>{{ formData.presentAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">详细地址：</span>
+            <span>{{ formData.detailAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">返回方式：</span>
+            <span>{{ formData.trafficTypeName||'--'  }}</span>
+          </div>
+          <div v-if="formData.trafficTypeExplain"
+               class="info-prop">
+            <span class="info-title-3">具体方式：</span>
+            <span>{{ formData.trafficTypeExplain||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">7天内旅居史情况：</span>
+            <span>{{ formData.sojournHistoryName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">隔离状态：</span>
+            <span>{{ formData.isolateTypeName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">备注：</span>
+            <span>{{ formData.remark||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">是否落实"落地检"：</span>
+            <span>{{ formData.isArriveCheckName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">是否到达曹县：</span>
+            <span>{{ formData.isArriveName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">上报时间：</span>
+            <span>{{ formData.reportingTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">管控措施：</span>
+            <span>{{ formData.controlMeasures||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">类型：</span>
+            <span>{{ formData.tripDataTypeName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">上报人：</span>
+            <span>{{ formData.createdByName||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm('ref_form')">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+import { isCard, isMobile } from '@/utils/validate'
+
+let loading // 加载动画
+export default {
+  data () {
+
+    return {
+
+      initLoading: false,
+
+      selId: '',
+      formData: {},
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    // await this.loadGrid()
+  },
+  destroyed () {
+    this.nowAllCode = []
+  },
+  methods: {
+
+    async initForm (row) {
+      console.log('row----', row)
+
+      this.formData.agencyId = this.agencyId
+      this.selId = row.id
+      await this.loadFormData(row.id)
+
+      this.initLoading = true
+
+
+    },
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.selId,
+        type: "routeFollow",
+      });
+
+      if (code === 0) {
+        this.$set(this.formData, 'showMobile', data.mobile)
+        this.$set(this.formData, 'showIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelGrid (value) {
+
+      const url = "/epmetuser/icresiuser/demandusers"
+
+      let params = {
+        agencyId: this.agencyId,
+        gridId: value
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.personList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelAddress (value) {
+
+      const url = "/gov/org/house/gethouseinfo/" + value
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        this.formData.presentAddress = data.agencyPathName
+        this.formData.presentAddressCode = data.areaCode
+        this.formData.detailAddress = data.allName
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelPerson (personItem) {
+      this.formData.userId = personItem.demandUserId
+      this.formData.name = personItem.demandUserName
+      this.formData.mobile = personItem.demandUserMobile
+      this.formData.idCard = personItem.idCard
+      this.handleSelAddress(personItem.houseId)
+    },
+
+    async loadFormData (id) {
+
+      const url = '/epmetuser/tripreport/detail'
+      let params = {
+        id,
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        console.log('deda-------', data)
+        this.formData = { ...data, channel: [], content: '' }
+        this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
+
+        if (data.userType == 'icresi') this.isFromResi = true
+        else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      // this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  props: {
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  },
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+  z-index: 1000;
+}
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
new file mode 100644
index 000000000..c78d99d6a
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
@@ -0,0 +1,1016 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               label-width="150px"
+               class="form">
+
+        <el-form-item v-if="formType==='add'"
+                      label="录入方式"
+                      style="display: block">
+          <el-radio-group v-model="enterType"
+                          @change="handleChangeEnterType">
+
+            <el-radio :label="'1'">手动输入</el-radio>
+            <el-radio :label="'2'">选择居民</el-radio>
+
+          </el-radio-group>
+
+        </el-form-item>
+
+        <el-form-item v-if="formType==='add'"
+                      label="所属网格"
+                      style="display: block">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.gridId"
+                     placeholder="请选择"
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in gridList"
+                       @click.native="handleSelGrid(item.value)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="formType==='add'"
+                      label="居民"
+                      prop="userId"
+                      style="display: block">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.userId"
+                     placeholder="请选择"
+                     filterable
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in personList"
+                       @click.native="handleSelPerson(item)"
+                       :key="item.demandUserId"
+                       :label="item.label"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="姓名"
+                      prop="name"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入姓名"
+                    clearable
+                    v-model="formData.name"
+                    style="margin-right:10px;">
+          </el-input>
+          <el-checkbox v-model="formData.heSuanCheck">添加到核酸检测关注名单</el-checkbox>
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="mobile"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入手机号"
+                    clearable
+                    v-model="formData.mobile">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="证件号"
+                      prop="idCard"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入身份证号或证件号"
+                    clearable
+                    v-model="formData.idCard">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="现居地"
+                      prop="presentAddress"
+                      style="display: block">
+
+          <template>
+
+            <el-cascader ref="nowArea"
+                         class="item_width_5"
+                         :props="areaProps"
+                         v-model="nowAllCode"
+                         clearable
+                         @change="handleNowArea"></el-cascader>
+          </template>
+        </el-form-item>
+        <el-form-item label="详细地址"
+                      prop="detailAddress"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入详细地址"
+                    clearable
+                    v-model="formData.detailAddress">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="来自地区"
+                      prop="sourceAddress"
+                      style="display: block">
+
+          <el-cascader ref="sourceArea"
+                       v-model="sourceAllCode"
+                       class="item_width_5"
+                       :props="areaProps"
+                       @change="handleSourceArea"
+                       clearable></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="详细地址"
+                      prop="sourceDetailAddress"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入详细地址"
+                    clearable
+                    v-model="formData.sourceDetailAddress">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="来到本地时间"
+                      style="display: block"
+                      prop="arriveDate">
+          <el-date-picker class="item_width_4"
+                          v-model="formData.arriveDate"
+                          :picker-options="pickerOptions"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="返回方式"
+                      style="display: block"
+                      prop="trafficType">
+          <el-select class="item_width_4"
+                     v-model.trim="formData.trafficType"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in trafficTypeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item v-if="formData.trafficType==='5'"
+                      label="具体方式"
+                      style="display: block"
+                      prop="trafficTypeExplain">
+          <el-input class="item_width_4"
+                    placeholder="请输入具体方式"
+                    clearable
+                    v-model="formData.trafficTypeExplain">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="班次"
+                      prop="banci"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入班次"
+                    clearable
+                    v-model="formData.banci">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="48小时核酸"
+                      prop="natOutcome"
+                      style="display: block">
+          <el-radio v-model="formData.natOutcome"
+                    label="0">阴性</el-radio>
+          <el-radio v-model="formData.natOutcome"
+                    label="1">阳性</el-radio>
+        </el-form-item>
+
+        <el-form-item label="健康码"
+                      prop="jiankangma"
+                      style="display: block">
+          <el-radio v-model="formData.jiankangma"
+                    label="1">正常</el-radio>
+          <el-radio v-model="formData.jiankangma"
+                    label="0">异常</el-radio>
+        </el-form-item>
+        <el-form-item label="行程码"
+                      prop="xingcheng"
+                      style="display: block">
+          <el-radio v-model="formData.xingcheng"
+                    label="1">正常</el-radio>
+          <el-radio v-model="formData.xingcheng"
+                    label="0">异常</el-radio>
+        </el-form-item>
+        <el-form-item label="核酸检测报告"
+                      prop="hesuan"
+                      style="display: block">
+          <el-radio v-model="formData.hesuan"
+                    label="1">正常</el-radio>
+          <el-radio v-model="formData.hesuan"
+                    label="0">异常</el-radio>
+        </el-form-item>
+        <el-form-item label="两码一报告"
+                      prop="liangma"
+                      style="display: block">
+          <el-radio v-model="formData.liangma"
+                    label="1">正常</el-radio>
+          <el-radio v-model="formData.liangma"
+                    label="0">异常</el-radio>
+        </el-form-item>
+
+        <el-form-item label="是否有外地旅居史"
+                      prop="waidi"
+                      style="display: block">
+          <el-radio v-model="formData.waidi"
+                    label="1">是</el-radio>
+          <el-radio v-model="formData.waidi"
+                    label="0">否</el-radio>
+        </el-form-item>
+
+        <el-form-item label="途径地区"
+                      prop="tujing"
+                      style="display: block">
+
+          <el-cascader ref="tujingArea"
+                       v-model="tujingAllCode"
+                       class="item_width_5"
+                       :props="areaProps"
+                       @change="handleTujingArea"
+                       clearable></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="同行人"
+                      prop="tongxing"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入同行人"
+                    clearable
+                    v-model="formData.tongxing">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="户籍地"
+                      prop="huji"
+                      style="display: block">
+
+          <el-cascader ref="hujiArea"
+                       v-model="hujiAllCode"
+                       class="item_width_5"
+                       :props="areaProps"
+                       @change="handleHujiArea"
+                       clearable></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="详细地址"
+                      prop="registeredResidence"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入户籍地详细地址"
+                    clearable
+                    v-model="formData.registeredResidence">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="是否带车"
+                      prop="daiche"
+                      style="display: block">
+          <el-radio v-model="formData.daiche"
+                    label="1">是</el-radio>
+          <el-radio v-model="formData.daiche"
+                    label="0">否</el-radio>
+        </el-form-item>
+        <el-form-item label="带车车牌号"
+                      prop="chepaihao"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入带车车牌号"
+                    clearable
+                    v-model="formData.chepaihao">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="车辆颜色"
+                      prop="yanse"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入车辆颜色"
+                    clearable
+                    v-model="formData.yanse">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="目的地交通场站"
+                      prop="changzhan"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="请输入目的地交通场站"
+                    clearable
+                    v-model="formData.changzhan">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="入鲁时间"
+                      style="display: block"
+                      prop="rulu">
+          <el-date-picker class="item_width_4"
+                          v-model="formData.rulu"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          type="date"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="行程码"
+                      label-width="150px"
+                      style="display: block">
+          <el-upload :headers="$getElUploadHeaders()"
+                     :class="['avatar-uploader', { hide: hideUploadBtn }]"
+                     ref="uploadPic"
+                     :action="uploadUlr"
+                     list-type="picture-card"
+                     :on-exceed="exceedPic"
+                     :on-remove="removePic"
+                     :file-list="replayImgList"
+                     :on-change="handleEditChange"
+                     :on-success="handleSuccess"
+                     :limit="3">
+            <span class="font-14">选择图片</span>
+            <div slot="tip"
+                 class="upload_tip">
+              最多上传3张图片，图片支持jpg、jpeg、bmp、git或png格式
+            </div>
+          </el-upload>
+        </el-form-item>
+
+        <el-form-item label="离开本地时间"
+                      style="display: block"
+                      prop="likai">
+          <el-date-picker class="item_width_4"
+                          v-model="formData.likai"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          type="date"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="备注"
+                      prop="remark"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入内容"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+
+        <template>
+          <el-form-item label="通知渠道"
+                        prop="channel"
+                        style="display: block">
+            <el-checkbox-group v-model="formData.channel">
+              <el-checkbox key="0"
+                           label="0">小程序通知</el-checkbox>
+              <!-- <el-checkbox key="1"
+                          label="1">短信通知</el-checkbox> -->
+
+            </el-checkbox-group>
+          </el-form-item>
+
+          <el-form-item v-show="formData.channel.length > 0"
+                        label="通知内容"
+                        prop="content"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :autosize="{ minRows: 4, maxRows: 10 }"
+                      clearable
+                      placeholder="请输入通知内容"
+                      v-model="formData.content"></el-input>
+          </el-form-item>
+        </template>
+
+      </el-form>
+    </div>
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm('ref_form')">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+import { isCard, isMobile } from '@/utils/validate'
+
+let loading // 加载动画
+export default {
+  data () {
+    let checkMObile = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('手机号不能为空'))
+      } else {
+        if (!isMobile(value)) {
+          callback(new Error('手机号格式不正确'))
+        }
+        callback()
+      }
+    }
+    let checkIdCard = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('证件号不能为空'))
+      } else {
+        if (!isCard(value)) {
+          callback(new Error('请输入正确的身份证号或护照号'))
+        }
+        callback()
+      }
+    }
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      hideUploadEdit: false, // 隐藏'上传按钮'
+      limitNum: 1,
+      enterType: '1',//录入方式1 手动输入  2  选择居民
+      isFromResi: false,//是否从已有居民信息中选择
+
+      gridList: [],
+      personList: [],
+      pickerOptions: {
+        disabledDate (time) {
+          return time.getTime() > Date.now();
+        }
+      },
+      btnDisable: false,
+      sourceAllCode: [], // 来源地全 code
+      nowAllCode: [], // 现居地全 code
+      tujingAllCode: [], // 现居地全 code
+      hujiAllCode: [], // 现居地全 code
+      icNatId: '',
+      formData: {
+        gridId: '',
+        agencyId: '',//当前网格所属组织Id
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
+        name: '',
+        idCard: '',
+        mobile: '',
+        heSuanCheck: false,
+        presentAddress: '',
+        presentAddressCode: '',
+        detailAddress: '',
+        sourceAddressCode: '',
+        presentAddressPathCode: '',
+        sourceAddress: '',
+        sourceAddressPathCode: '',
+        arriveDate: '',
+        remark: '',
+        leaveDate: '',
+        userType: 'input',
+        content: '',
+        channel: [],
+
+        registeredResidence: '',//户籍地详细地址（必填）
+        sourceDetailAddress: '',//来源地--详细地址（必填）
+        natOutcome: '',//48小时核酸  0 阴性  1 阳性（必填）
+        trafficType: '',//交通方式，来源字典表(traffic_type)	  （必填）
+
+        banci: '',
+        jiankangma: '',
+        xingchengma: '',
+        hesuan: '',
+        liangma: '',
+        waidi: '',
+
+        tujing: '',
+        tujingCode: '',
+        tujingPathCode: '',
+
+        tongxing: '',
+
+        huji: '',
+        hujiCode: '',
+        hujiPathCode: '',
+
+        daiche: '',
+        chepaihao: '',
+        yanse: '',
+        changzhan: '',
+        rulu: '',
+        likai: '',
+        imageList: [],
+
+      },
+
+      trafficTypeList: [],
+
+      yesOrNoList: [
+        {
+          value: '0',
+          label: '是'
+        },
+        {
+          value: '1',
+          label: '否'
+        }
+      ],
+
+
+      dataRule: {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'change' }
+        ],
+
+        mobile: [
+          { required: true, validator: checkMObile, trigger: 'change' },
+        ],
+        idCard: [
+          { required: true, validator: checkIdCard, trigger: 'change' }
+        ],
+
+
+        sourceAddress: [
+          { required: true, message: '来自地区不能为空', trigger: 'change' },
+        ],
+        sourceDetailAddress: [
+          { required: true, message: '来自地区详细地址不能为空', trigger: 'change' },
+        ],
+        arriveDate: [
+          { required: true, message: '来到本地时间不能为空', trigger: 'change' },
+        ],
+        trafficType: [
+          { required: true, message: '返回方式不能为空', trigger: 'change' },
+        ],
+        natOutcome: [
+          { required: true, message: '48小时核酸不能为空', trigger: 'change' },
+        ],
+
+
+
+      },
+      areaProps: {
+        // checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      },
+
+      hideUploadBtn: false,
+      //图片相关  oss/file/uploadvariedfile
+      dialogImageUrl: "oss/file/uploadvariedfile",
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+      //  upload_url: '', // 上传URL
+      upload_name: "", // 图片或视频名称
+      replayImgList: [],
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+
+    this.getTrafficType()
+    // this.getIsolateType()
+    this.getTripDataType()
+  },
+  destroyed () {
+    this.nowAllCode = []
+  },
+  methods: {
+    computedWd (val) {
+      const len = val.length
+      const wd = len * 18
+      let w = ''
+      if (wd > 220) w = wd
+      else w = 220
+      return w + 'px'
+    },
+    lzayLoadArea (node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+    async initForm (type, row) {
+      console.log('row----', row)
+      this.formType = type
+      this.formData.agencyId = this.agencyId
+      if (type != 'add') {
+        // this.formData = { ...row, channel: [], content: '' }
+        await this.loadFormData(row.id)
+
+
+      } else {
+        const { user } = this.$store.state
+        //默认：山东省37-菏泽市3717-曹县371721
+        this.nowAllCode = ['37', '3717', '371721']
+      }
+      // this.$refs['ref_form'].resetFields();
+
+      console.log('formtype', type)
+
+    },
+
+    handleChangeEnterType (value) {
+      this.formData.name = ''
+      this.formData.mobile = ''
+      this.formData.idCard = ''
+      this.formData.gridId = ''
+      this.formData.userId = ''
+      this.resetData()
+      if (value === '2') {
+        this.isFromResi = true
+        this.formData.userType = 'icresi'
+      } else {
+        this.isFromResi = false
+        this.formData.userType = 'input'
+        const { user } = this.$store.state
+        // this.nowAllCode = user.areaCodePath
+      }
+
+
+    },
+    handleSourceArea (val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.sourceArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
+        this.formData.sourceAddressCode = val[val.length - 1]
+        this.formData.sourceAddress = labels.join('-')
+        this.formData.sourceAddressPathCode = val.join(',')
+        this.$refs.ref_form.clearValidate('sourceAddress')
+      } else {
+        this.formData.sourceAddressCode = ''
+        this.formData.sourceAddress = ''
+        this.formData.sourceAddressPathCode = ''
+      }
+
+    },
+    handleNowArea (val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.nowArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
+        this.formData.presentAddressCode = val[val.length - 1]
+        this.formData.presentAddress = labels.join('-')
+        this.formData.presentAddressPathCode = val.join(',')
+        console.log('presentAddress', this.formData.presentAddress)
+        this.$refs.ref_form.clearValidate('presentAddress')
+      } else {
+        this.formData.presentAddressCode = ''
+        this.formData.presentAddress = ''
+        this.formData.presentAddressPathCode = ''
+      }
+    },
+    handleTujingArea (val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.tujingArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.tujingArea.getCheckedNodes()[0].pathLabels
+        this.formData.tujingCode = val[val.length - 1]
+        this.formData.tujing = labels.join('-')
+        this.formData.tujingPathCode = val.join(',')
+        this.$refs.ref_form.clearValidate('tujing')
+      } else {
+        this.formData.tujingCode = ''
+        this.formData.tujing = ''
+        this.formData.tujingPathCode = ''
+      }
+
+    },
+    handleHujiArea (val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.hujiArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.hujiArea.getCheckedNodes()[0].pathLabels
+        this.formData.hujiCode = val[val.length - 1]
+        this.formData.huji = labels.join('-')
+        this.formData.hujiPathCode = val.join(',')
+        this.$refs.ref_form.clearValidate('huji')
+      } else {
+        this.formData.hujiCode = ''
+        this.formData.huji = ''
+        this.formData.hujiPathCode = ''
+      }
+
+    },
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelGrid (value) {
+
+      const url = "/epmetuser/icresiuser/demandusers"
+
+      let params = {
+        agencyId: this.agencyId,
+        gridId: value
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.personList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelAddress (value) {
+
+      const url = "/gov/org/house/gethouseinfo/" + value
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        this.formData.presentAddress = data.agencyPathName
+        this.formData.presentAddressCode = data.areaCode
+        // this.formData.detailAddress = data.allName
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelPerson (personItem) {
+      this.formData.userId = personItem.demandUserId
+      this.formData.name = personItem.demandUserName
+      this.formData.mobile = personItem.demandUserMobile
+      this.formData.idCard = personItem.idCard
+      this.handleSelAddress(personItem.houseId)
+    },
+
+    async loadFormData (id) {
+
+      const url = '/epmetuser/tripreport/detail'
+      let params = {
+        id,
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        console.log('deda-------', data)
+        this.formData = { ...data, channel: [], content: '' }
+        this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
+        this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+
+        if (data.userType == 'icresi') this.isFromResi = true
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+    async handleComfirm (formName) {
+      this.$refs[formName].validate(async (valid) => {
+        if (valid) {
+          if (this.formData.channel.length > 0 && !this.formData.content) {
+            this.$message({
+              type: 'warning',
+              message: '请填写通知内容'
+            })
+            return false;
+          }
+
+          this.btnDisable = true
+          setTimeout(() => {
+            this.btnDisable = false
+          }, 5000)
+
+          let url = ''
+          if (this.formType === 'add') url = '/epmetuser/tripreport/save'
+          else url = '/epmetuser/tripreport/update'
+
+          console.log(' this.formData', this.formData)
+          // return false
+          const { data, code, msg } = await requestPost(url, this.formData)
+
+          if (code === 0) {
+            this.$message({
+              type: 'success',
+              message: '操作成功'
+            })
+            this.resetData()
+            this.$emit('dialogOk')
+            this.btnDisable = false
+
+          } else {
+            this.btnDisable = false
+            this.$message.error(msg)
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.$refs.ref_form.resetFields()
+      this.formData.sourceAddressCode = ''
+      this.formData.presentAddressCode = ''
+      this.formData.sourceAddressPathCode = ''
+      this.formData.presentAddressPathCode = ''
+      this.sourceAllCode = []
+      this.nowAllCode = []
+      this.tujingAllCode = []
+      this.hujiAllCode = []
+
+
+    },
+
+    removePic (file, fileList) {
+      this.formData.imageList.splice(
+        this.formData.imageList.findIndex((item) => item === file.url),
+        1
+      );
+      this.replayImgList.splice(
+        this.replayImgList.findIndex((item) => item.uid === file.uid),
+        1
+      );
+      this.hideUploadBtn = fileList.length >= 3;
+    },
+    // 最多上传3张图，超过时隐藏上传按钮
+    handleEditChange (file, fileList) {
+      this.hideUploadBtn = fileList.length >= 3;
+    },
+    exceedPic () {
+      this.$message.warning("最多上传3张预览图片");
+    },
+    handleSuccess (response, file, fileList) {
+      this.replayImgList.push(file);
+      this.formData.imageList.push(response.data.url);
+    },
+
+
+    async getTrafficType () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "traffic_type",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.trafficTypeList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getIsolateType () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        // dictType: "isolatedState",
+        dictType: "isolate_type",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.isolateTypeList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getTripDataType () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "trip_data_type",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.tripDataTypeList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+
+.epidemic-form {
+  .mw180 {
+    min-width: 260px;
+  }
+}
+</style>
+
+<style lang='scss'>
+// 隐藏上传按钮
+.hide .el-upload--picture-card {
+  display: none;
+}
+// 添加/删除文件时去掉动画过渡
+.el-upload-list__item {
+  transition: none !important;
+}
+</style>
+
+
+

From 51a4350fc915638fcfa892251196626dd49e0269 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 23 Nov 2022 11:14:12 +0800
Subject: [PATCH 4/8] 11

---
 .../travelYantai/travelYantaiDetail.vue       | 110 +++--
 .../travelYantai/travelYantaiForm.vue         | 422 +++++++++---------
 2 files changed, 278 insertions(+), 254 deletions(-)

diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
index 915d8ff91..e778252e4 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
@@ -24,12 +24,18 @@
             <span class="info-title-3">证件号：</span>
             <span>{{ formData.showIdCard||'--' }}</span>
           </div>
+
           <div class="info-prop">
-            <span class="info-title-3">户籍地：</span>
-            <span>{{ formData.registeredResidence||'--' }}</span>
+            <span class="info-title-3">现居地：</span>
+            <span>{{ formData.presentAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">详细地址：</span>
+            <span>{{ formData.detailAddress||'--'  }}</span>
           </div>
+
           <div class="info-prop">
-            <span class="info-title-3">来源地：</span>
+            <span class="info-title-3">来自地区：</span>
             <span>{{ formData.sourceAddress||'--'  }}</span>
           </div>
 
@@ -37,77 +43,107 @@
             <span class="info-title-3">详细地址：</span>
             <span>{{ formData.sourceDetailAddress||'--'  }}</span>
           </div>
+
           <div class="info-prop">
-            <span class="info-title-3">7天内到达或途经：</span>
-            <span>{{ formData.passBy||'--'  }}</span>
+            <span class="info-title-3">来到本地时间：</span>
+            <span>{{ formData.arriveDate||'--'  }}</span>
           </div>
+
           <div class="info-prop">
-            <span class="info-title-3">来曹事由：</span>
-            <span>{{ formData.describeContent||'--'  }}</span>
+            <span class="info-title-3">返回方式：</span>
+            <span>{{ formData.trafficTypeName||'--'  }}</span>
           </div>
+          <div v-if="formData.trafficTypeExplain"
+               class="info-prop">
+            <span class="info-title-3">具体方式：</span>
+            <span>{{ formData.trafficTypeExplain||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">班次：</span>
+            <span>{{ formData.trafficTypeName||'--'  }}</span>
+          </div>
+
           <div class="info-prop">
             <span class="info-title-3">48小时核酸：</span>
             <span>{{ formData.natOutcomeName||'--'  }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">来到本地时间：</span>
-            <span>{{ formData.arriveDate||'--'  }}</span>
+            <span class="info-title-3">健康码：</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">在曹居住地点：</span>
-            <span>{{ formData.presentAddress||'--'  }}</span>
+            <span class="info-title-3">行程码：</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
           </div>
+
           <div class="info-prop">
-            <span class="info-title-3">详细地址：</span>
-            <span>{{ formData.detailAddress||'--'  }}</span>
+            <span class="info-title-3">核酸检测报告：</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">两码一报告：</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
           </div>
+
           <div class="info-prop">
-            <span class="info-title-3">返回方式：</span>
-            <span>{{ formData.trafficTypeName||'--'  }}</span>
+            <span class="info-title-3">是否有外地旅居史：</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
           </div>
-          <div v-if="formData.trafficTypeExplain"
-               class="info-prop">
-            <span class="info-title-3">具体方式：</span>
-            <span>{{ formData.trafficTypeExplain||'--'  }}</span>
+
+          <div class="info-prop">
+            <span class="info-title-3">途径地区：</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">7天内旅居史情况：</span>
-            <span>{{ formData.sojournHistoryName||'--'  }}</span>
+            <span class="info-title-3">同行人：</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
           </div>
+
           <div class="info-prop">
-            <span class="info-title-3">隔离状态：</span>
-            <span>{{ formData.isolateTypeName||'--'  }}</span>
+            <span class="info-title-3">户籍地：</span>
+            <span>{{ formData.registeredResidence||'--' }}</span>
           </div>
+
           <div class="info-prop">
-            <span class="info-title-3">备注：</span>
-            <span>{{ formData.remark||'--'  }}</span>
+            <span class="info-title-3">户籍详细地址：</span>
+            <span>{{ formData.passBy||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">是否带车：</span>
+            <span>{{ formData.describeContent||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">带车车牌号：</span>
+            <span>{{ formData.describeContent||'--'  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">是否落实"落地检"：</span>
-            <span>{{ formData.isArriveCheckName||'--'  }}</span>
+            <span class="info-title-3">车辆颜色：</span>
+            <span>{{ formData.describeContent||'--'  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">是否到达曹县：</span>
-            <span>{{ formData.isArriveName||'--'  }}</span>
+            <span class="info-title-3">目的地交通场站：</span>
+            <span>{{ formData.describeContent||'--'  }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">上报时间：</span>
-            <span>{{ formData.reportingTime||'--'  }}</span>
+            <span class="info-title-3">入鲁时间：</span>
+            <span>{{ formData.sojournHistoryName||'--'  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">管控措施：</span>
-            <span>{{ formData.controlMeasures||'--'  }}</span>
+            <span class="info-title-3">行程码：</span>
+            <span>{{ formData.isolateTypeName||'--'  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">类型：</span>
-            <span>{{ formData.tripDataTypeName||'--'  }}</span>
+            <span class="info-title-3">离开本地时间：</span>
+            <span>{{ formData.isolateTypeName||'--'  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-3">上报人：</span>
-            <span>{{ formData.createdByName||'--'  }}</span>
+            <span class="info-title-3">备注：</span>
+            <span>{{ formData.remark||'--'  }}</span>
           </div>
 
         </div>
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
index c78d99d6a..58466b902 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
@@ -123,12 +123,12 @@
         </el-form-item>
 
         <el-form-item label="详细地址"
-                      prop="sourceDetailAddress"
+                      prop="comeAreaFull"
                       style="display: block">
           <el-input class="item_width_4"
                     placeholder="请输入详细地址"
                     clearable
-                    v-model="formData.sourceDetailAddress">
+                    v-model="formData.comeAreaFull">
           </el-input>
         </el-form-item>
 
@@ -138,8 +138,8 @@
           <el-date-picker class="item_width_4"
                           v-model="formData.arriveDate"
                           :picker-options="pickerOptions"
-                          format="yyyy-MM-dd HH:mm"
-                          value-format="yyyy-MM-dd HH:mm"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
                           type="datetime"
                           clearable
                           placeholder="选择时间">
@@ -162,167 +162,155 @@
 
         </el-form-item>
 
-        <el-form-item v-if="formData.trafficType==='5'"
-                      label="具体方式"
-                      style="display: block"
-                      prop="trafficTypeExplain">
-          <el-input class="item_width_4"
-                    placeholder="请输入具体方式"
-                    clearable
-                    v-model="formData.trafficTypeExplain">
-          </el-input>
-
-        </el-form-item>
-
         <el-form-item label="班次"
-                      prop="banci"
+                      prop="shift"
                       style="display: block">
           <el-input class="item_width_4"
                     placeholder="请输入班次"
                     clearable
-                    v-model="formData.banci">
+                    v-model="formData.shift">
           </el-input>
         </el-form-item>
 
         <el-form-item label="48小时核酸"
-                      prop="natOutcome"
+                      prop="carryHesuanProof"
                       style="display: block">
-          <el-radio v-model="formData.natOutcome"
-                    label="0">阴性</el-radio>
-          <el-radio v-model="formData.natOutcome"
-                    label="1">阳性</el-radio>
+          <el-radio v-model="formData.carryHesuanProof"
+                    label="是">是</el-radio>
+          <el-radio v-model="formData.carryHesuanProof"
+                    label="否">否</el-radio>
         </el-form-item>
 
-        <el-form-item label="健康码"
-                      prop="jiankangma"
+        <el-form-item label="健康码异常"
+                      prop="healthCodeAbnormal"
                       style="display: block">
-          <el-radio v-model="formData.jiankangma"
-                    label="1">正常</el-radio>
-          <el-radio v-model="formData.jiankangma"
-                    label="0">异常</el-radio>
+          <el-radio v-model="formData.healthCodeAbnormal"
+                    label="是">是</el-radio>
+          <el-radio v-model="formData.healthCodeAbnormal"
+                    label="否">否</el-radio>
         </el-form-item>
-        <el-form-item label="行程码"
-                      prop="xingcheng"
+        <el-form-item label="行程码异常"
+                      prop="travelCodeAbnormal"
                       style="display: block">
-          <el-radio v-model="formData.xingcheng"
-                    label="1">正常</el-radio>
-          <el-radio v-model="formData.xingcheng"
-                    label="0">异常</el-radio>
+          <el-radio v-model="formData.travelCodeAbnormal"
+                    label="是">是</el-radio>
+          <el-radio v-model="formData.travelCodeAbnormal"
+                    label="否">否</el-radio>
         </el-form-item>
-        <el-form-item label="核酸检测报告"
-                      prop="hesuan"
+        <el-form-item label="核酸检测报告异常"
+                      prop="detectionAbnormal"
                       style="display: block">
-          <el-radio v-model="formData.hesuan"
-                    label="1">正常</el-radio>
-          <el-radio v-model="formData.hesuan"
-                    label="0">异常</el-radio>
+          <el-radio v-model="formData.detectionAbnormal"
+                    label="是">是</el-radio>
+          <el-radio v-model="formData.detectionAbnormal"
+                    label="否">否</el-radio>
         </el-form-item>
-        <el-form-item label="两码一报告"
-                      prop="liangma"
+        <el-form-item label="两码一报告状态"
+                      prop="twoCodeOneReportStatus"
                       style="display: block">
-          <el-radio v-model="formData.liangma"
-                    label="1">正常</el-radio>
-          <el-radio v-model="formData.liangma"
-                    label="0">异常</el-radio>
+          <el-radio v-model="formData.twoCodeOneReportStatus"
+                    label="正常">正常</el-radio>
+          <el-radio v-model="formData.twoCodeOneReportStatus"
+                    label="异常">异常</el-radio>
         </el-form-item>
 
         <el-form-item label="是否有外地旅居史"
-                      prop="waidi"
+                      prop="nonlocalResidenceHistory"
                       style="display: block">
-          <el-radio v-model="formData.waidi"
-                    label="1">是</el-radio>
-          <el-radio v-model="formData.waidi"
-                    label="0">否</el-radio>
+          <el-radio v-model="formData.nonlocalResidenceHistory"
+                    label="是">是</el-radio>
+          <el-radio v-model="formData.nonlocalResidenceHistory"
+                    label="否">否</el-radio>
         </el-form-item>
 
         <el-form-item label="途径地区"
-                      prop="tujing"
+                      prop="viaProvince"
                       style="display: block">
 
           <el-cascader ref="tujingArea"
                        v-model="tujingAllCode"
                        class="item_width_5"
-                       :props="areaProps"
+                       :props="areaPropsLevel2"
                        @change="handleTujingArea"
                        clearable></el-cascader>
         </el-form-item>
 
         <el-form-item label="同行人"
-                      prop="tongxing"
+                      prop="travelPersonnel"
                       style="display: block">
           <el-input class="item_width_4"
                     placeholder="请输入同行人"
                     clearable
-                    v-model="formData.tongxing">
+                    v-model="formData.travelPersonnel">
           </el-input>
         </el-form-item>
 
         <el-form-item label="户籍地"
-                      prop="huji"
+                      prop="registeredResidenceCity"
                       style="display: block">
 
           <el-cascader ref="hujiArea"
                        v-model="hujiAllCode"
                        class="item_width_5"
-                       :props="areaProps"
+                       :props="areaPropsLevel2"
                        @change="handleHujiArea"
                        clearable></el-cascader>
         </el-form-item>
 
         <el-form-item label="详细地址"
-                      prop="registeredResidence"
+                      prop="registeredResidenceAddress"
                       style="display: block">
           <el-input class="item_width_4"
                     placeholder="请输入户籍地详细地址"
                     clearable
-                    v-model="formData.registeredResidence">
+                    v-model="formData.registeredResidenceAddress">
           </el-input>
         </el-form-item>
 
         <el-form-item label="是否带车"
-                      prop="daiche"
+                      prop="carryVehicle"
                       style="display: block">
-          <el-radio v-model="formData.daiche"
-                    label="1">是</el-radio>
-          <el-radio v-model="formData.daiche"
-                    label="0">否</el-radio>
+          <el-radio v-model="formData.carryVehicle"
+                    label="是">是</el-radio>
+          <el-radio v-model="formData.carryVehicle"
+                    label="否">否</el-radio>
         </el-form-item>
         <el-form-item label="带车车牌号"
-                      prop="chepaihao"
+                      prop="carryVehicleNumber"
                       style="display: block">
           <el-input class="item_width_4"
                     placeholder="请输入带车车牌号"
                     clearable
-                    v-model="formData.chepaihao">
+                    v-model="formData.carryVehicleNumber">
           </el-input>
         </el-form-item>
         <el-form-item label="车辆颜色"
-                      prop="yanse"
+                      prop="carryVehiclenumberColor"
                       style="display: block">
           <el-input class="item_width_4"
                     placeholder="请输入车辆颜色"
                     clearable
-                    v-model="formData.yanse">
+                    v-model="formData.carryVehiclenumberColor">
           </el-input>
         </el-form-item>
         <el-form-item label="目的地交通场站"
-                      prop="changzhan"
+                      prop="destinationStation"
                       style="display: block">
           <el-input class="item_width_4"
                     placeholder="请输入目的地交通场站"
                     clearable
-                    v-model="formData.changzhan">
+                    v-model="formData.destinationStation">
           </el-input>
         </el-form-item>
 
         <el-form-item label="入鲁时间"
                       style="display: block"
-                      prop="rulu">
+                      prop="arriveLuTime">
           <el-date-picker class="item_width_4"
-                          v-model="formData.rulu"
-                          format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"
-                          type="date"
+                          v-model="formData.arriveLuTime"
+                          format="yyyy-MM-dd HH:mm:ss"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          type="datetime"
                           clearable
                           placeholder="选择时间">
           </el-date-picker>
@@ -341,23 +329,23 @@
                      :file-list="replayImgList"
                      :on-change="handleEditChange"
                      :on-success="handleSuccess"
-                     :limit="3">
+                     :limit="1">
             <span class="font-14">选择图片</span>
             <div slot="tip"
                  class="upload_tip">
-              最多上传3张图片，图片支持jpg、jpeg、bmp、git或png格式
+              最多上传1张图片，图片支持jpg、jpeg、bmp、git或png格式
             </div>
           </el-upload>
         </el-form-item>
 
         <el-form-item label="离开本地时间"
                       style="display: block"
-                      prop="likai">
+                      prop="invalidTime">
           <el-date-picker class="item_width_4"
-                          v-model="formData.likai"
-                          format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"
-                          type="date"
+                          v-model="formData.invalidTime"
+                          format="yyyy-MM-dd HH:mm:ss	"
+                          value-format="yyyy-MM-dd HH:mm:ss	"
+                          type="datetime"
                           clearable
                           placeholder="选择时间">
           </el-date-picker>
@@ -467,73 +455,103 @@ export default {
       nowAllCode: [], // 现居地全 code
       tujingAllCode: [], // 现居地全 code
       hujiAllCode: [], // 现居地全 code
-      icNatId: '',
+
       formData: {
         gridId: '',
         agencyId: '',//当前网格所属组织Id
         userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
-        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
+        userType: 'input',//从居民信息里选择居民时:icresi；默认传：input	
         name: '',
         idCard: '',
         mobile: '',
         heSuanCheck: false,
         presentAddress: '',
         presentAddressCode: '',
+        presentAddressPathCode: '',
         detailAddress: '',
+
         sourceAddressCode: '',
-        presentAddressPathCode: '',
         sourceAddress: '',
         sourceAddressPathCode: '',
-        arriveDate: '',
-        remark: '',
-        leaveDate: '',
-        userType: 'input',
-        content: '',
-        channel: [],
-
-        registeredResidence: '',//户籍地详细地址（必填）
-        sourceDetailAddress: '',//来源地--详细地址（必填）
-        natOutcome: '',//48小时核酸  0 阴性  1 阳性（必填）
-        trafficType: '',//交通方式，来源字典表(traffic_type)	  （必填）
-
-        banci: '',
-        jiankangma: '',
-        xingchengma: '',
-        hesuan: '',
-        liangma: '',
-        waidi: '',
-
-        tujing: '',
-        tujingCode: '',
-        tujingPathCode: '',
+        comeAreaFull: '',//来源地--详细地址（必填）
 
-        tongxing: '',
+        arriveDate: '',//来到本地时间
+        remark: '',//备注
 
-        huji: '',
-        hujiCode: '',
-        hujiPathCode: '',
+        content: '',
+        channel: [],
 
-        daiche: '',
-        chepaihao: '',
-        yanse: '',
-        changzhan: '',
-        rulu: '',
-        likai: '',
-        imageList: [],
+        trafficType: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表	
+        shift: '',//班次
+        carryHesuanProof: '',//48小时核算	，传是/否
+        healthCodeAbnormal: '',//健康码异常，传是/否	
+        travelCodeAbnormal: '',//行程码异常，传是/否	
+        detectionAbnormal: '',//核酸检测报告异常，传是/否	
+        twoCodeOneReportStatus: '',//两码一报告状态，传正常/异常	
+        nonlocalResidenceHistory: '',//是否有外地旅居史，传是/否	
+
+        viaProvince: '',//途径地-省	
+        viaCity: '',//途径地-市	
+        viaCounty: '',//途径地-县	
+        viaCode: '',//途径地
+        viaPathCode: '',//途径地
+
+        travelPersonnel: '',//同行人
+
+        registeredResidenceCity: '',//户籍地	
+        registeredResidenceCode: '',//户籍地	
+        registeredResidencePathCode: '',//户籍地	
+        registeredResidenceAddress: '',//户籍详细地址
+
+        carryVehicle: '',//是否带车，传是/否	
+        carryVehicleNumber: '',//带车车牌号	
+        carryVehiclenumberColor: '',//车辆颜色	
+        destinationStation: '',//目的地交通场站
+        arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss
+
+        travelCodeImg: '',//行程码url	
+        invalidTime: '',//离开本地时间yyyy-MM-dd HH:mm:ss	
 
       },
 
-      trafficTypeList: [],
 
-      yesOrNoList: [
+      trafficTypeList: [
         {
-          value: '0',
-          label: '是'
+          value: '船',
+          label: '船'
         },
         {
-          value: '1',
-          label: '否'
-        }
+          value: '飞机',
+          label: '飞机'
+        },
+        {
+          value: '火车',
+          label: '火车'
+        },
+        {
+          value: '民航',
+          label: '民航'
+        },
+        {
+          value: '其他',
+          label: '其他'
+        },
+        {
+          value: '汽车',
+          label: '汽车'
+        },
+        {
+          value: '铁路',
+          label: '铁路'
+        },
+        {
+          value: '长途客运',
+          label: '长途客运'
+        },
+        {
+          value: '自驾包车',
+          label: '自驾包车'
+        },
       ],
 
 
@@ -550,10 +568,18 @@ export default {
         ],
 
 
+        presentAddress: [
+          { required: true, message: '现居地不能为空', trigger: 'change' },
+        ],
+
+        detailAddress: [
+          { required: true, message: '现居地详细地址不能为空', trigger: 'change' },
+        ],
+
         sourceAddress: [
           { required: true, message: '来自地区不能为空', trigger: 'change' },
         ],
-        sourceDetailAddress: [
+        comeAreaFull: [
           { required: true, message: '来自地区详细地址不能为空', trigger: 'change' },
         ],
         arriveDate: [
@@ -562,7 +588,7 @@ export default {
         trafficType: [
           { required: true, message: '返回方式不能为空', trigger: 'change' },
         ],
-        natOutcome: [
+        carryHesuanProof: [
           { required: true, message: '48小时核酸不能为空', trigger: 'change' },
         ],
 
@@ -574,6 +600,11 @@ export default {
         lazy: true,
         lazyLoad: this.lzayLoadArea
       },
+      areaPropsLevel2: {
+        // checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadAreaLevel2
+      },
 
       hideUploadBtn: false,
       //图片相关  oss/file/uploadvariedfile
@@ -592,9 +623,6 @@ export default {
     //获取网格下拉框数据
     await this.loadGrid()
 
-    this.getTrafficType()
-    // this.getIsolateType()
-    this.getTripDataType()
   },
   destroyed () {
     this.nowAllCode = []
@@ -609,9 +637,15 @@ export default {
       return w + 'px'
     },
     lzayLoadArea (node, resolve) {
-      // this.getArea(node, resolve)
+
       setTimeout(() => {
-        this.getArea(node, resolve)
+        this.getArea(node, resolve, 4)
+      }, 200)
+    },
+    lzayLoadAreaLevel2 (node, resolve) {
+
+      setTimeout(() => {
+        this.getArea(node, resolve, 2)
       }, 200)
     },
     async initForm (type, row) {
@@ -690,14 +724,25 @@ export default {
       console.log('label-----', this.$refs.tujingArea.getCheckedNodes())
       if (val.length > 0) {
         const labels = this.$refs.tujingArea.getCheckedNodes()[0].pathLabels
-        this.formData.tujingCode = val[val.length - 1]
+        this.formData.viaCode = val[val.length - 1]
         this.formData.tujing = labels.join('-')
-        this.formData.tujingPathCode = val.join(',')
-        this.$refs.ref_form.clearValidate('tujing')
+        if (labels.length > 0) {
+          this.formData.viaProvince = labels[0]
+        }
+        if (labels.length > 1) {
+          this.formData.viaCity = labels[1]
+        }
+        if (labels.length > 2) {
+          this.formData.viaCounty = labels[2]
+        }
+        this.formData.viaPathCode = val.join(',')
+        this.$refs.ref_form.clearValidate('viaProvince')
       } else {
-        this.formData.tujingCode = ''
-        this.formData.tujing = ''
-        this.formData.tujingPathCode = ''
+        this.formData.viaCode = ''
+        this.formData.viaProvince = ''
+        this.formData.viaCity = ''
+        this.formData.viaCounty = ''
+        this.formData.viaPathCode = ''
       }
 
     },
@@ -706,14 +751,14 @@ export default {
       console.log('label-----', this.$refs.hujiArea.getCheckedNodes())
       if (val.length > 0) {
         const labels = this.$refs.hujiArea.getCheckedNodes()[0].pathLabels
-        this.formData.hujiCode = val[val.length - 1]
-        this.formData.huji = labels.join('-')
-        this.formData.hujiPathCode = val.join(',')
-        this.$refs.ref_form.clearValidate('huji')
+        this.formData.registeredResidenceCode = val[val.length - 1]
+        this.formData.registeredResidenceCity = labels.join('-')
+        this.formData.registeredResidencePathCode = val.join(',')
+        this.$refs.ref_form.clearValidate('registeredResidenceCity')
       } else {
-        this.formData.hujiCode = ''
-        this.formData.huji = ''
-        this.formData.hujiPathCode = ''
+        this.formData.registeredResidenceCode = ''
+        this.formData.registeredResidenceCity = ''
+        this.formData.registeredResidencePathCode = ''
       }
 
     },
@@ -753,7 +798,7 @@ export default {
       }
 
     },
-    async getArea (node, resolve) {
+    async getArea (node, resolve, levelNum) {
 
       const url = "/commonservice/areacode/nextarea"
       let params = {
@@ -769,7 +814,7 @@ export default {
           label: item.areaName,
           code: item.areaCode,
           level: item.level,
-          leaf: node.level >= 4 // 5层级
+          leaf: node.level >= levelNum // 5层级
         }))
         resolve(nodes)
 
@@ -824,6 +869,9 @@ export default {
 
 
     async handleComfirm (formName) {
+      console.log(' this.formData', this.formData)
+      console.log(' this.replayImgList', this.replayImgList)
+      return false
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
           if (this.formData.channel.length > 0 && !this.formData.content) {
@@ -843,8 +891,7 @@ export default {
           if (this.formType === 'add') url = '/epmetuser/tripreport/save'
           else url = '/epmetuser/tripreport/update'
 
-          console.log(' this.formData', this.formData)
-          // return false
+
           const { data, code, msg } = await requestPost(url, this.formData)
 
           if (code === 0) {
@@ -890,84 +937,25 @@ export default {
     },
 
     removePic (file, fileList) {
-      this.formData.imageList.splice(
-        this.formData.imageList.findIndex((item) => item === file.url),
-        1
-      );
+
       this.replayImgList.splice(
         this.replayImgList.findIndex((item) => item.uid === file.uid),
         1
       );
-      this.hideUploadBtn = fileList.length >= 3;
+      this.formData.travelCodeImg = '';
+      this.hideUploadBtn = fileList.length >= 1;
     },
-    // 最多上传3张图，超过时隐藏上传按钮
+    // 最多上传1张图，超过时隐藏上传按钮
     handleEditChange (file, fileList) {
-      this.hideUploadBtn = fileList.length >= 3;
+      this.hideUploadBtn = fileList.length >= 1;
     },
     exceedPic () {
-      this.$message.warning("最多上传3张预览图片");
+      this.$message.warning("最多上传1张图片");
     },
     handleSuccess (response, file, fileList) {
-      this.replayImgList.push(file);
-      this.formData.imageList.push(response.data.url);
-    },
-
-
-    async getTrafficType () {
 
-      const url = "/sys/dict/data/dictlist";
-
-      let params = {
-        dictType: "traffic_type",
-      };
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.trafficTypeList = data
-
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async getIsolateType () {
-
-      const url = "/sys/dict/data/dictlist";
-
-      let params = {
-        // dictType: "isolatedState",
-        dictType: "isolate_type",
-      };
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.isolateTypeList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async getTripDataType () {
-
-      const url = "/sys/dict/data/dictlist";
-
-      let params = {
-        dictType: "trip_data_type",
-      };
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.tripDataTypeList = data
-
-
-      } else {
-        this.$message.error(msg)
-      }
+      this.replayImgList.push(file);
+      this.formData.travelCodeImg = response.data.url;
 
     },
 

From 41d22b52840d72ece8152f146f8dfcea784b6281 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 23 Nov 2022 14:11:46 +0800
Subject: [PATCH 5/8] 11

---
 .../epidemic/travelYantai/travelYantai.vue    |  16 +-
 .../travelYantai/travelYantaiDetail.vue       | 181 ++++++------------
 .../travelYantai/travelYantaiForm.vue         |  99 ++++++++--
 3 files changed, 149 insertions(+), 147 deletions(-)

diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantai.vue b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
index a272438d5..329626f4c 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
@@ -187,7 +187,7 @@
                          show-overflow-tooltip
                          min-width="180">
         </el-table-column>
-        <el-table-column prop="trafficTypeName"
+        <el-table-column prop="comeMode"
                          header-align="center"
                          align="center"
                          label="返回方式"
@@ -200,7 +200,7 @@
                          width="160">
         </el-table-column>
 
-        <el-table-column prop="natOutcomeName"
+        <el-table-column prop="carryHesuanProof"
                          header-align="center"
                          align="center"
                          label="48小时核酸"
@@ -208,13 +208,13 @@
                          min-width="100">
         </el-table-column>
 
-        <el-table-column prop="jian"
+        <el-table-column prop="healthCodeAbnormal"
                          header-align="center"
                          align="center"
                          label="健康码异常"
                          width="100">
         </el-table-column>
-        <el-table-column prop="jian"
+        <el-table-column prop="travelCodeAbnormal"
                          header-align="center"
                          align="center"
                          label="行程码异常"
@@ -517,7 +517,7 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/epmetuser/tripreport/page"
+      const url = "/epmetuser/tripreport/yt-page"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
       let params = {
         pageSize: this.pageSize,
@@ -805,8 +805,8 @@ export default {
 
       let params = {
         isSync: '1',
-        dataCode: 'yimiaojiezhong',
-        jobType: 'vaccine',
+        // dataCode: 'yimiaojiezhong',
+        jobType: 'trip_report',
         agencyId: this.agencyId
       }
 
@@ -874,7 +874,7 @@ export default {
       // })
       await this.$http({
         method: 'POST',
-        url: '/epmetuser/tripreport/psexport',
+        url: 'epmetuser/tripreport/yt-export',
         responseType: 'blob',
         data: params
       })
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
index e778252e4..a943b1d6b 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
@@ -41,7 +41,7 @@
 
           <div class="info-prop">
             <span class="info-title-3">详细地址：</span>
-            <span>{{ formData.sourceDetailAddress||'--'  }}</span>
+            <span>{{ formData.comeAreaFull||'--'  }}</span>
           </div>
 
           <div class="info-prop">
@@ -51,95 +51,105 @@
 
           <div class="info-prop">
             <span class="info-title-3">返回方式：</span>
-            <span>{{ formData.trafficTypeName||'--'  }}</span>
-          </div>
-          <div v-if="formData.trafficTypeExplain"
-               class="info-prop">
-            <span class="info-title-3">具体方式：</span>
-            <span>{{ formData.trafficTypeExplain||'--'  }}</span>
+            <span>{{ formData.comeMode||'--'  }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-3">班次：</span>
-            <span>{{ formData.trafficTypeName||'--'  }}</span>
+            <span>{{ formData.shift||'--'  }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-3">48小时核酸：</span>
-            <span>{{ formData.natOutcomeName||'--'  }}</span>
+            <span>{{ formData.carryHesuanProof||'--'  }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">健康码：</span>
-            <span>{{ formData.natOutcomeName||'--'  }}</span>
+            <span class="info-title-3">健康码异常：</span>
+            <span>{{ formData.healthCodeAbnormal||'--'  }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">行程码：</span>
-            <span>{{ formData.natOutcomeName||'--'  }}</span>
+            <span class="info-title-3">行程码异常：</span>
+            <span>{{ formData.travelCodeAbnormal||'--'  }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">核酸检测报告：</span>
-            <span>{{ formData.natOutcomeName||'--'  }}</span>
+            <span class="info-title-3">核酸检测报告异常：</span>
+            <span>{{ formData.detectionAbnormal||'--'  }}</span>
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">两码一报告：</span>
-            <span>{{ formData.natOutcomeName||'--'  }}</span>
+            <span class="info-title-3">两码一报告状态：</span>
+            <span>{{ formData.twoCodeOneReportStatus||'--'  }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-3">是否有外地旅居史：</span>
-            <span>{{ formData.natOutcomeName||'--'  }}</span>
+            <span>{{ formData.nonlocalResidenceHistory||'--'  }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-3">途径地区：</span>
-            <span>{{ formData.natOutcomeName||'--'  }}</span>
+            <span>{{ formData.viaAddressShow||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">同行人：</span>
-            <span>{{ formData.natOutcomeName||'--'  }}</span>
+            <span>{{ formData.travelPersonnel||'--'  }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-3">户籍地：</span>
-            <span>{{ formData.registeredResidence||'--' }}</span>
+            <span>{{ formData.registeredResidenceCity||'--' }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-3">户籍详细地址：</span>
-            <span>{{ formData.passBy||'--'  }}</span>
+            <span>{{ formData.registeredResidenceAddress||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">是否带车：</span>
-            <span>{{ formData.describeContent||'--'  }}</span>
+            <span>{{ formData.carryVehicle||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">带车车牌号：</span>
-            <span>{{ formData.describeContent||'--'  }}</span>
+            <span>{{ formData.carryVehicleNumber||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">车辆颜色：</span>
-            <span>{{ formData.describeContent||'--'  }}</span>
+            <span>{{ formData.carryVehicleNumberColor||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">目的地交通场站：</span>
-            <span>{{ formData.describeContent||'--'  }}</span>
+            <span>{{ formData.destinationStation||'--'  }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-3">入鲁时间：</span>
-            <span>{{ formData.sojournHistoryName||'--'  }}</span>
+            <span>{{ formData.arriveLuTime||'--'  }}</span>
           </div>
-          <div class="info-prop">
+          <div v-if="!formData.travelCodeImg"
+               class="info-prop">
             <span class="info-title-3">行程码：</span>
-            <span>{{ formData.isolateTypeName||'--'  }}</span>
+            <span>{{ '--'  }}</span>
+          </div>
+
+          <div class="info-prop"
+               v-if="formData.travelCodeImg">
+            <span class="info-title-3">行程码：</span>
+
+            <div class="info-pics">
+
+              <img style="width:80px;height:80px"
+                   :src="formData.travelCodeImg"
+                   @click="watchImg(formData.travelCodeImg)">
+
+            </div>
           </div>
+
           <div class="info-prop">
             <span class="info-title-3">离开本地时间：</span>
-            <span>{{ formData.isolateTypeName||'--'  }}</span>
+            <span>{{ formData.invalidTime||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">备注：</span>
@@ -187,11 +197,10 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-    //获取网格下拉框数据
-    // await this.loadGrid()
+
   },
   destroyed () {
-    this.nowAllCode = []
+
   },
   methods: {
 
@@ -223,94 +232,9 @@ export default {
 
     },
 
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
-
-      let params = {
-        agencyId: this.agencyId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.gridList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async handleSelGrid (value) {
-
-      const url = "/epmetuser/icresiuser/demandusers"
-
-      let params = {
-        agencyId: this.agencyId,
-        gridId: value
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.personList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async getArea (node, resolve) {
-
-      const url = "/commonservice/areacode/nextarea"
-      let params = {
-        parentLevel: node.data ? node.data.level : '',
-        parentAreaCode: node.data ? node.data.code : ''
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        const nodes = data.map(item => ({
-          value: item.areaCode, //
-          label: item.areaName,
-          code: item.areaCode,
-          level: item.level,
-          leaf: node.level >= 4 // 5层级
-        }))
-        resolve(nodes)
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async handleSelAddress (value) {
-
-      const url = "/gov/org/house/gethouseinfo/" + value
-
-      const { data, code, msg } = await requestPost(url)
-
-      if (code === 0) {
-        this.formData.presentAddress = data.agencyPathName
-        this.formData.presentAddressCode = data.areaCode
-        this.formData.detailAddress = data.allName
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async handleSelPerson (personItem) {
-      this.formData.userId = personItem.demandUserId
-      this.formData.name = personItem.demandUserName
-      this.formData.mobile = personItem.demandUserMobile
-      this.formData.idCard = personItem.idCard
-      this.handleSelAddress(personItem.houseId)
-    },
-
     async loadFormData (id) {
 
-      const url = '/epmetuser/tripreport/detail'
+      const url = '/epmetuser/tripreport/yt-detail '
       let params = {
         id,
       }
@@ -318,15 +242,28 @@ export default {
       if (code === 0) {
         console.log('deda-------', data)
         this.formData = { ...data, channel: [], content: '' }
-        this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
 
         if (data.userType == 'icresi') this.isFromResi = true
-        else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+
+        this.formData.viaAddressShow = ''
+        if (this.formData.viaProvince) {
+          this.formData.viaAddressShow = this.formData.viaAddressShow + this.formData.viaProvince
+        }
+        if (this.formData.viaCity) {
+          this.formData.viaAddressShow = this.formData.viaAddressShow + '-' + this.formData.viaCity
+        }
+        if (this.formData.viaCounty) {
+          this.formData.viaAddressShow = this.formData.viaAddressShow + '-' + this.formData.viaCounty
+        }
+
+
       } else {
         this.$message.error(msg)
       }
     },
-
+    watchImg (src) {
+      window.open(src);
+    },
     handleCancle () {
       // this.resetData()
       this.$emit('dialogCancle')
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
index 58466b902..662137b1b 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
@@ -148,9 +148,9 @@
 
         <el-form-item label="返回方式"
                       style="display: block"
-                      prop="trafficType">
+                      prop="comeMode">
           <el-select class="item_width_4"
-                     v-model.trim="formData.trafficType"
+                     v-model.trim="formData.comeMode"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in trafficTypeList"
@@ -285,12 +285,12 @@
           </el-input>
         </el-form-item>
         <el-form-item label="车辆颜色"
-                      prop="carryVehiclenumberColor"
+                      prop="carryVehicleNumberColor"
                       style="display: block">
           <el-input class="item_width_4"
                     placeholder="请输入车辆颜色"
                     clearable
-                    v-model="formData.carryVehiclenumberColor">
+                    v-model="formData.carryVehicleNumberColor">
           </el-input>
         </el-form-item>
         <el-form-item label="目的地交通场站"
@@ -481,7 +481,7 @@ export default {
         content: '',
         channel: [],
 
-        trafficType: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表	
+        comeMode: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表	
         shift: '',//班次
         carryHesuanProof: '',//48小时核算	，传是/否
         healthCodeAbnormal: '',//健康码异常，传是/否	
@@ -505,7 +505,7 @@ export default {
 
         carryVehicle: '',//是否带车，传是/否	
         carryVehicleNumber: '',//带车车牌号	
-        carryVehiclenumberColor: '',//车辆颜色	
+        carryVehicleNumberColor: '',//车辆颜色	
         destinationStation: '',//目的地交通场站
         arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss
 
@@ -585,7 +585,7 @@ export default {
         arriveDate: [
           { required: true, message: '来到本地时间不能为空', trigger: 'change' },
         ],
-        trafficType: [
+        comeMode: [
           { required: true, message: '返回方式不能为空', trigger: 'change' },
         ],
         carryHesuanProof: [
@@ -660,7 +660,7 @@ export default {
       } else {
         const { user } = this.$store.state
         //默认：山东省37-菏泽市3717-曹县371721
-        this.nowAllCode = ['37', '3717', '371721']
+        // this.nowAllCode = ['37', '3717', '371721']
       }
       // this.$refs['ref_form'].resetFields();
 
@@ -674,7 +674,7 @@ export default {
       this.formData.idCard = ''
       this.formData.gridId = ''
       this.formData.userId = ''
-      this.resetData()
+
       if (value === '2') {
         this.isFromResi = true
         this.formData.userType = 'icresi'
@@ -849,7 +849,7 @@ export default {
 
     async loadFormData (id) {
 
-      const url = '/epmetuser/tripreport/detail'
+      const url = '/epmetuser/tripreport/yt-detail '
       let params = {
         id,
       }
@@ -859,9 +859,22 @@ export default {
         this.formData = { ...data, channel: [], content: '' }
         this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
         this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+        this.tujingAllCode = data.viaPathCode && data.viaPathCode.split(',')
+        this.hujiAllCode = data.registeredResidencePathCode && data.registeredResidencePathCode.split(',')
 
         if (data.userType == 'icresi') this.isFromResi = true
 
+        if (this.formData.travelCodeImg) {
+          let obj = {
+            id: "111",
+            url: this.formData.travelCodeImg,
+          };
+
+          this.replayImgList = [];
+          this.replayImgList.push(obj);
+          this.hideUploadBtn = true
+        }
+
       } else {
         this.$message.error(msg)
       }
@@ -871,7 +884,7 @@ export default {
     async handleComfirm (formName) {
       console.log(' this.formData', this.formData)
       console.log(' this.replayImgList', this.replayImgList)
-      return false
+      // return false
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
           if (this.formData.channel.length > 0 && !this.formData.content) {
@@ -888,8 +901,8 @@ export default {
           }, 5000)
 
           let url = ''
-          if (this.formType === 'add') url = '/epmetuser/tripreport/save'
-          else url = '/epmetuser/tripreport/update'
+          if (this.formType === 'add') url = '/epmetuser/tripreport/yt-save'
+          else url = '/epmetuser/tripreport/yt-update'
 
 
           const { data, code, msg } = await requestPost(url, this.formData)
@@ -924,10 +937,62 @@ export default {
 
     resetData () {
       this.$refs.ref_form.resetFields()
-      this.formData.sourceAddressCode = ''
-      this.formData.presentAddressCode = ''
-      this.formData.sourceAddressPathCode = ''
-      this.formData.presentAddressPathCode = ''
+      this.formData = {
+        gridId: '',
+        agencyId: '',//当前网格所属组织Id
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+        userType: 'input',//从居民信息里选择居民时:icresi；默认传：input	
+        name: '',
+        idCard: '',
+        mobile: '',
+        heSuanCheck: false,
+        presentAddress: '',
+        presentAddressCode: '',
+        presentAddressPathCode: '',
+        detailAddress: '',
+
+        sourceAddressCode: '',
+        sourceAddress: '',
+        sourceAddressPathCode: '',
+        comeAreaFull: '',//来源地--详细地址（必填）
+
+        arriveDate: '',//来到本地时间
+        remark: '',//备注
+
+        content: '',
+        channel: [],
+
+        comeMode: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表	
+        shift: '',//班次
+        carryHesuanProof: '',//48小时核算	，传是/否
+        healthCodeAbnormal: '',//健康码异常，传是/否	
+        travelCodeAbnormal: '',//行程码异常，传是/否	
+        detectionAbnormal: '',//核酸检测报告异常，传是/否	
+        twoCodeOneReportStatus: '',//两码一报告状态，传正常/异常	
+        nonlocalResidenceHistory: '',//是否有外地旅居史，传是/否	
+
+        viaProvince: '',//途径地-省	
+        viaCity: '',//途径地-市	
+        viaCounty: '',//途径地-县	
+        viaCode: '',//途径地
+        viaPathCode: '',//途径地
+
+        travelPersonnel: '',//同行人
+
+        registeredResidenceCity: '',//户籍地	
+        registeredResidenceCode: '',//户籍地	
+        registeredResidencePathCode: '',//户籍地	
+        registeredResidenceAddress: '',//户籍详细地址
+
+        carryVehicle: '',//是否带车，传是/否	
+        carryVehicleNumber: '',//带车车牌号	
+        carryVehicleNumberColor: '',//车辆颜色	
+        destinationStation: '',//目的地交通场站
+        arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss
+
+        travelCodeImg: '',//行程码url	
+        invalidTime: '',//离开本地时间yyyy-MM-dd HH:mm:ss	
+      }
       this.sourceAllCode = []
       this.nowAllCode = []
       this.tujingAllCode = []

From f03171c50b27cc38062432e304bea72f199b6f96 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 25 Nov 2022 09:53:08 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=9D=A5=E5=88=B0=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/travelYantai/travelYantai.vue     |  2 +-
 .../travelYantai/travelYantaiDetail.vue        |  2 +-
 .../epidemic/travelYantai/travelYantaiForm.vue | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantai.vue b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
index 329626f4c..f3ad9f351 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
@@ -193,7 +193,7 @@
                          label="返回方式"
                          width="100">
         </el-table-column>
-        <el-table-column prop="arriveDate"
+        <el-table-column prop="arriveTime"
                          header-align="center"
                          align="center"
                          label="来到本地时间"
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
index a943b1d6b..5e5c1bcd7 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
@@ -46,7 +46,7 @@
 
           <div class="info-prop">
             <span class="info-title-3">来到本地时间：</span>
-            <span>{{ formData.arriveDate||'--'  }}</span>
+            <span>{{ formData.arriveTime||'--'  }}</span>
           </div>
 
           <div class="info-prop">
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
index 662137b1b..86e51bd0a 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
@@ -134,12 +134,12 @@
 
         <el-form-item label="来到本地时间"
                       style="display: block"
-                      prop="arriveDate">
+                      prop="arriveTime">
           <el-date-picker class="item_width_4"
-                          v-model="formData.arriveDate"
+                          v-model="formData.arriveTime"
                           :picker-options="pickerOptions"
-                          format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd HH:mm:ss"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           type="datetime"
                           clearable
                           placeholder="选择时间">
@@ -343,8 +343,8 @@
                       prop="invalidTime">
           <el-date-picker class="item_width_4"
                           v-model="formData.invalidTime"
-                          format="yyyy-MM-dd HH:mm:ss	"
-                          value-format="yyyy-MM-dd HH:mm:ss	"
+                          format="yyyy-MM-dd HH:mm:ss"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           type="datetime"
                           clearable
                           placeholder="选择时间">
@@ -475,7 +475,7 @@ export default {
         sourceAddressPathCode: '',
         comeAreaFull: '',//来源地--详细地址（必填）
 
-        arriveDate: '',//来到本地时间
+        arriveTime: '',//抵烟时间yyyy-MM-dd HH:mm:ss
         remark: '',//备注
 
         content: '',
@@ -582,7 +582,7 @@ export default {
         comeAreaFull: [
           { required: true, message: '来自地区详细地址不能为空', trigger: 'change' },
         ],
-        arriveDate: [
+        arriveTime: [
           { required: true, message: '来到本地时间不能为空', trigger: 'change' },
         ],
         comeMode: [
@@ -956,7 +956,7 @@ export default {
         sourceAddressPathCode: '',
         comeAreaFull: '',//来源地--详细地址（必填）
 
-        arriveDate: '',//来到本地时间
+        arriveTime: '',//来到本地时间
         remark: '',//备注
 
         content: '',

From ba487efe835f105b7deb5b67245883ed116b901a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 25 Nov 2022 09:59:11 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E7=A6=BB=E5=BC=80=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/epidemic/travelYantai/travelYantaiDetail.vue     | 2 +-
 .../base/epidemic/travelYantai/travelYantaiForm.vue       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
index 5e5c1bcd7..fb0a4903a 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
@@ -149,7 +149,7 @@
 
           <div class="info-prop">
             <span class="info-title-3">离开本地时间：</span>
-            <span>{{ formData.invalidTime||'--'  }}</span>
+            <span>{{ formData.leaveTheRiskAreaTime||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">备注：</span>
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
index 86e51bd0a..f3336c69a 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
@@ -340,9 +340,9 @@
 
         <el-form-item label="离开本地时间"
                       style="display: block"
-                      prop="invalidTime">
+                      prop="leaveTheRiskAreaTime">
           <el-date-picker class="item_width_4"
-                          v-model="formData.invalidTime"
+                          v-model="formData.leaveTheRiskAreaTime"
                           format="yyyy-MM-dd HH:mm:ss"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           type="datetime"
@@ -510,7 +510,7 @@ export default {
         arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss
 
         travelCodeImg: '',//行程码url	
-        invalidTime: '',//离开本地时间yyyy-MM-dd HH:mm:ss	
+        leaveTheRiskAreaTime: '',//离开本地时间yyyy-MM-dd HH:mm:ss	
 
       },
 
@@ -991,7 +991,7 @@ export default {
         arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss
 
         travelCodeImg: '',//行程码url	
-        invalidTime: '',//离开本地时间yyyy-MM-dd HH:mm:ss	
+        leaveTheRiskAreaTime: '',//离开本地时间yyyy-MM-dd HH:mm:ss	
       }
       this.sourceAllCode = []
       this.nowAllCode = []

From 5df733be6f720dc3badb5700aef040e81d5d92d9 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 25 Nov 2022 13:22:54 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/epidemic/travelYantai/travelYantai.vue    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantai.vue b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
index f3ad9f351..f5a6932e2 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue
@@ -432,13 +432,13 @@ export default {
       },
 
       btnAuths: {
-        tripreport_add: true, //新增
-        tripreport_import: true, //导入
-        tripreport_export: true, //导出
-        tripreport_del: true, //删除
-        tripreport_view: true, //查看
-        tripreport_update: true, //修改
-        tripreport_view_real_data: true, //显示脱敏信息
+        tripreport_add: false, //新增
+        tripreport_import: false, //导入
+        tripreport_export: false, //导出
+        tripreport_del: false, //删除
+        tripreport_view: false, //查看
+        tripreport_update: false, //修改
+        tripreport_view_real_data: false, //显示脱敏信息
       },
 
     }