Merge branch 'dev-fangyi' into test

src/views/modules/base/epidemic/natFocus/nfVisiteList.vue

@@ -226,7 +226,7 @@ export default {
       let params = {
         idCard: this.formData.idCard,
         name: this.formData.name,
-        origin: '2'
+        origin: this.formData.origin
       }
 
       app.ajax.exportFilePost(

src/views/modules/base/epidemic/travel.vue

@@ -220,7 +220,7 @@
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-popover popper-class="btn-popper"
+            <!-- <el-popover popper-class="btn-popper"
                         placement="bottom"
                         style="margin-left:10px"
                         width="20"
@@ -249,7 +249,35 @@
                          size="small"
                          class="div-table-button--more"
                          slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
-            </el-popover>
+            </el-popover> -->
+            <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>
+                  <el-button 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>
@@ -620,7 +648,7 @@ export default {
     },
 
     handleDetail (row) {
-      this.formTitle = '详情'
+      this.formTitle = '行程详情'
       this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('detail', row)
@@ -628,7 +656,7 @@ export default {
     },
 
     handleAdd () {
-      this.formTitle = '新增'
+      this.formTitle = '新增行程'
       this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', '')

src/views/modules/base/epidemic/travelForm.vue

@@ -144,6 +144,7 @@
                       label-width="150px">
           <el-date-picker class="item_width_2"
                           v-model="formData.arriveDate"
+                          :picker-options="pickerOptions"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
@@ -178,32 +179,34 @@
                     v-model="formData.remark"></el-input>
         </el-form-item>
 
-        <el-form-item label="通知渠道"
+        <template v-if="formType != 'detail'">
+          <el-form-item label="通知渠道"
                       prop="channel"
                       label-width="150px"
-                      style="display: block">
+                        style="display: block">
-          <el-checkbox-group v-model="formData.channel">
+            <el-checkbox-group v-model="formData.channel">
-            <el-checkbox key="0"
+              <el-checkbox key="0"
-                         label="0">小程序通知</el-checkbox>
+                          label="0">小程序通知</el-checkbox>
-            <!-- <el-checkbox key="1"
+              <!-- <el-checkbox key="1"
-                         label="1">短信通知</el-checkbox> -->
+                          label="1">短信通知</el-checkbox> -->
-
+
-          </el-checkbox-group>
+            </el-checkbox-group>
-        </el-form-item>
+          </el-form-item>
-
+
-        <el-form-item label="通知内容"
+          <el-form-item label="通知内容"
-                      prop="content"
+                        prop="content"
-                      label-width="150px"
+                        label-width="150px"
-                      style="display: block">
+                        style="display: block">
-          <el-input class="item_width_1"
+            <el-input class="item_width_1"
-                    type="textarea"
+                      type="textarea"
-                    maxlength="500"
+                      maxlength="500"
-                    show-word-limit
+                      show-word-limit
-                    :autosize="{ minRows: 4, maxRows: 10 }"
+                      :autosize="{ minRows: 4, maxRows: 10 }"
-                    clearable
+                      clearable
-                    placeholder="请输入通知内容"
+                      placeholder="请输入通知内容"
-                    v-model="formData.content"></el-input>
+                      v-model="formData.content"></el-input>
-        </el-form-item>
+          </el-form-item>
+        </template>
 
       </el-form>
     </div>
@@ -259,7 +262,11 @@ export default {
 
       gridList: [],
       personList: [],
-
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
       btnDisable: false,
       sourceAllCode: [], // 来源地全 code
       nowAllCode: [], // 现居地全 code
@@ -371,6 +378,7 @@ export default {
         this.isFromResi = false
         this.formData.userType = 'input'
       }
+      this.resetData()
 
     },
     handleSourceArea(val) {
@@ -381,6 +389,7 @@ export default {
         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 = ''
@@ -396,6 +405,8 @@ export default {
         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 = ''