From 87618a57f0a6e478b044c5c7b635853d77c2fb08 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 9 Nov 2022 14:42:47 +0800
Subject: [PATCH] 111

---
 .../epidemic/travelPanshi/travelPanshi.vue    | 101 ++++++++++++------
 .../travelPanshi/travelPanshiDetail.vue       |  12 +++
 .../travelPanshi/travelPanshiForm.vue         |  24 +++++
 3 files changed, 105 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
index b0f12aa69..23918787d 100644
--- a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
@@ -39,23 +39,6 @@
             </el-input>
 
           </el-form-item>
-          <el-form-item label="7天内旅居情况"
-                        prop="idCard">
-            <el-select class="list_item_width_1"
-                       v-model.trim="formData.sojournHistory"
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in dangerLevelList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-
-        </div>
-        <div>
 
           <el-form-item label="来源地"
                         prop="sourceAddress">
@@ -83,6 +66,36 @@
 
           </el-form-item>
 
+          <el-form-item label="7天内旅居情况"
+                        prop="idCard">
+            <el-select class="list_item_width_1"
+                       v-model.trim="formData.sojournHistory"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in dangerLevelList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="隔离状态"
+                        prop="idCard">
+            <el-select class="list_item_width_1"
+                       v-model.trim="formData.isolateType"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in isolateTypeList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
           <el-button style="margin-left:30px"
                      size="small"
                      class="diy-button--search"
@@ -179,16 +192,14 @@
                          label="证件号"
                          width="180">
         </el-table-column>
-        <el-table-column prop="registeredResidence"
+        <!-- <el-table-column prop="registeredResidence"
                          header-align="center"
                          align="center"
                          label="户籍地"
                          show-overflow-tooltip
                          min-width="160">
-          <!-- <template slot-scope="scope">
-            {{scope.row.presentAddress + scope.row.detailAddress}}
-          </template> -->
-        </el-table-column>
+      
+        </el-table-column> -->
         <el-table-column prop="sourceAddress"
                          header-align="center"
                          align="center"
@@ -196,7 +207,7 @@
                          show-overflow-tooltip
                          min-width="180">
         </el-table-column>
-        <el-table-column prop="describeContent"
+        <!-- <el-table-column prop="describeContent"
                          header-align="center"
                          align="center"
                          label="来曹事由"
@@ -209,7 +220,7 @@
                          label="48小时核酸"
                          show-overflow-tooltip
                          min-width="100">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="arriveDate"
                          header-align="center"
                          align="center"
@@ -222,12 +233,12 @@
                          label="在曹居住地点"
                          width="160">
         </el-table-column>
-        <el-table-column prop="trafficTypeName"
+        <!-- <el-table-column prop="trafficTypeName"
                          header-align="center"
                          align="center"
                          label="返回方式"
                          width="100">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="sojournHistoryName"
                          header-align="center"
                          align="center"
@@ -240,19 +251,25 @@
                          label="隔离状态"
                          width="100">
         </el-table-column>
-        <el-table-column prop="latestNoticeTime"
+        <el-table-column prop="controlMeasures"
+                         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"
+        </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> -->
 
         <el-table-column label="操作"
                          fixed="right"
@@ -428,8 +445,27 @@ export default {
         sourceAddressCode: '',
         startDate: '',
         endDate: '',
-        sojournHistory: ''
+        sojournHistory: '',
+        isolateType: '',
       },
+      isolateTypeList: [
+        {
+          value: '0',
+          label: '集中隔离'
+        },
+        {
+          value: '1',
+          label: '居家隔离'
+        },
+        {
+          value: '2',
+          label: '居家健康监测'
+        },
+        {
+          value: '4',
+          label: '不需要隔离'
+        },
+      ],
 
       dangerLevelList: [],
 
@@ -825,7 +861,8 @@ export default {
         sourceAddressCode: '',
         startDate: '',
         endDate: '',
-        sojournHistory: ''
+        sojournHistory: '',
+        isolateType: '',
       }
 
       this.searchAreacode = []
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
index 41866e7f0..2f4f172a9 100644
--- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
@@ -32,6 +32,10 @@
             <span class="info-title-3">来源地：</span>
             <span>{{ formData.sourceAddress||'--'  }}</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.sourceDetailAddress||'--'  }}</span>
@@ -92,10 +96,18 @@
             <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>
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
index c136bce6a..ad0f5ff16 100644
--- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
@@ -117,6 +117,15 @@
                     v-model="formData.sourceDetailAddress">
           </el-input>
         </el-form-item>
+        <el-form-item label="7天内到达或途经"
+                      prop="passBy"
+                      style="display: block">
+          <el-input class="item_width_4"
+                    placeholder="行程卡来源地为多个时，请增加行程"
+                    clearable
+                    v-model="formData.passBy">
+          </el-input>
+        </el-form-item>
         <el-form-item label="来曹事由"
                       prop="describeContent"
                       style="display: block">
@@ -274,6 +283,19 @@
           </el-date-picker>
         </el-form-item>
 
+        <el-form-item label="管控措施"
+                      prop="controlMeasures"
+                      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.controlMeasures"></el-input>
+        </el-form-item>
+
         <el-form-item label="类型"
                       prop="tripDataType">
           <el-select class="item_width_4"
@@ -413,6 +435,8 @@ export default {
         isArrive: '',//是否达到曹县  0:否  1:是 【磐石】	 （非必填）
         reportingTime: '',//上报时间（非必填）
         tripDataType: '',//行程记录类型，字典表(trip_data_type)【磐石】	（非必填）
+        controlMeasures: '',//管控措施【磐石】
+        passBy: '',//7天内到达或途经【磐石】
 
       },