From 76372f79c71b4e146fbf415f13a6395a8fb95d60 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 7 Nov 2022 09:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=80=89=E6=8B=A9=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E5=85=B3=E8=81=94=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/epidemic/travelForm.vue      | 83 +++++++------------
 .../travelPanshi/travelPanshiForm.vue         |  3 -
 2 files changed, 30 insertions(+), 56 deletions(-)

diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index 637a5ec9b..95f59e153 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -5,7 +5,6 @@
                :inline="true"
                :model="formData"
                :rules="dataRule"
-               :disabled="formType==='detail'"
                class="form">
 
         <el-form-item v-if="formType==='add'"
@@ -66,7 +65,6 @@
           <el-input class="item_width_4"
                     placeholder="请输入姓名"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.name"
                     style="margin-right:10px;">
           </el-input>
@@ -80,7 +78,6 @@
           <el-input class="item_width_4"
                     placeholder="请输入手机号"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.mobile">
           </el-input>
         </el-form-item>
@@ -91,7 +88,6 @@
           <el-input class="item_width_4"
                     placeholder="请输入身份证号或证件号"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.idCard">
           </el-input>
         </el-form-item>
@@ -99,19 +95,12 @@
                       prop="presentAddress"
                       style="display: block"
                       label-width="150px">
-          <el-input v-if="formType == 'detail'"
-                    class="item_width_4"
-                    placeholder="请输入现居地"
-                    clearable
-                    :disabled="isFromResi"
-                    :style="'width: ' + computedWd(formData.presentAddress)"
-                    v-model="formData.presentAddress" />
-          <template v-else>
+
+          <template>
             <el-input v-if="isFromResi"
                       class="item_width_4 mw180"
                       placeholder="请输入现居地"
                       clearable
-                      :disabled="isFromResi"
                       v-model="formData.presentAddress" />
             <el-cascader v-else
                          ref="nowArea"
@@ -129,7 +118,6 @@
           <el-input class="item_width_4"
                     placeholder="请输入详细地址"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.detailAddress">
           </el-input>
         </el-form-item>
@@ -163,16 +151,8 @@
                       prop="sourceAddress"
                       style="display: block"
                       label-width="150px">
-          <el-input v-if="formType == 'detail'"
-                    class="item_width_4"
-                    placeholder=""
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.sourceAddress"
-                    :style="'width: ' + computedWd(formData.sourceAddress)">
-          </el-input>
-          <el-cascader v-else
-                       ref="sourceArea"
+
+          <el-cascader ref="sourceArea"
                        v-model="sourceAllCode"
                        class="item_width_4"
                        :props="areaProps"
@@ -264,43 +244,40 @@
                     v-model="formData.remark"></el-input>
         </el-form-item>
 
-        <template v-if="formType != 'detail'">
-          <el-form-item label="通知渠道"
-                        prop="channel"
-                        label-width="150px"
-                        style="display: block">
-            <el-checkbox-group v-model="formData.channel">
-              <el-checkbox key="0"
-                           label="0">小程序通知</el-checkbox>
-              <!-- <el-checkbox key="1"
+        <el-form-item label="通知渠道"
+                      prop="channel"
+                      label-width="150px"
+                      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"
-                        label-width="150px"
-                        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-checkbox-group>
+        </el-form-item>
+
+        <el-form-item v-show="formData.channel.length > 0"
+                      label="通知内容"
+                      prop="content"
+                      label-width="150px"
+                      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>
 
       </el-form>
     </div>
     <div class="form_div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
-                 size="small"
+      <el-button size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm('ref_form')">确 定</el-button>
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
index a5372bbb5..c136bce6a 100644
--- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
@@ -62,7 +62,6 @@
           <el-input class="item_width_4"
                     placeholder="请输入姓名"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.name"
                     style="margin-right:10px;">
           </el-input>
@@ -75,7 +74,6 @@
           <el-input class="item_width_4"
                     placeholder="请输入手机号"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.mobile">
           </el-input>
         </el-form-item>
@@ -85,7 +83,6 @@
           <el-input class="item_width_4"
                     placeholder="请输入身份证号或证件号"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.idCard">
           </el-input>
         </el-form-item>