diff --git a/src/views/emis/emisDestination/index.vue b/src/views/emis/emisDestination/index.vue
index f03ba0ca..ac360653 100644
--- a/src/views/emis/emisDestination/index.vue
+++ b/src/views/emis/emisDestination/index.vue
@@ -1,15 +1,39 @@
 <template>
   <div class="app-container">
+    <el-row :gutter="20" type='flex'>
+      <el-col :span="5" :xs="5">
+      <div class="head-container">
+        <el-row :gutter="10">
+          <el-col :span="15" :xs="15">
+            <el-input
+            v-model="countryName"
+            placeholder="国家名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+            />
+          </el-col>
+        </el-row>
+      </div>
+      <div class="head-container">
+        <el-tree
+          ref="tree"
+          class="filter-tree tree"
+          :data="countryTree"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          node-key="id"
+          highlight-current
+          default-expand-all
+          @node-click="handleNodeClick"
+        >
+        </el-tree>
+      </div>
+      </el-col>
+      <el-col :span="20" :xs="20">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
-      <el-form-item label="" prop="destCode">
-        <el-input
-          v-model="queryParams.destCode"
-          placeholder="目的地编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="" prop="destName">
         <el-input
           v-model="queryParams.destName"
@@ -18,37 +42,54 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="province">
+      <el-form-item label="" prop="destCode">
         <el-input
-          v-model="queryParams.province"
-          placeholder="省"
+          v-model="queryParams.destCode"
+          placeholder="目的地编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="city">
-        <el-input
-          v-model="queryParams.city"
-          placeholder="市"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="" prop="country">
+        <el-select v-model="queryParams.country" placeholder="国家" clearable>
+          <el-option
+            v-for="dict in countryIdsOptions"
+            :key="dict.label"
+            :label="dict.label"
+            :value="dict.label"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="" prop="county">
-        <el-input
-          v-model="queryParams.county"
-          placeholder="区"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item label="" prop="regionType">
+        <el-select v-model="queryParams.regionType" placeholder="服务网点" clearable>
+          <el-option
+            v-for="dict in dict.type.emis_region_level_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="" prop="town">
-        <el-input
-          v-model="queryParams.town"
-          placeholder="乡镇"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="" prop="regionType">
+        <el-select v-model="queryParams.regionType" placeholder="是否偏远地" clearable>
+          <el-option
+            v-for="dict in dict.type.emis_region_level_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="" prop="status">
+        <el-select v-model="queryParams.status" placeholder="是否启用" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -143,17 +184,23 @@
 
       <el-table-column label="目的地编码" align="center" prop="destCode" min-width="100" />
       <el-table-column label="目的地名称" align="center" prop="destName" min-width="100" />
-      <el-table-column label="英文名称" align="center" prop="destNameEn" min-width="100" />
-      <el-table-column label="启用状态" align="center" prop="status" min-width="100" />
-      <el-table-column label="所属国家" align="center" prop="country" min-width="100" />
-      <el-table-column label="所属线路" align="center" prop="transLineCode" min-width="100" />
-      <el-table-column label="所属线路名称" align="center" prop="transLine" min-width="100" />
-      <el-table-column label="服务网点编号" align="center" prop="siteCode" min-width="100" />
-      <el-table-column label="服务网点名称" align="center" prop="siteName" min-width="100" />
+      <el-table-column label="国家" align="center" prop="country" min-width="100" />
+      <el-table-column label="网点名称" align="center" prop="siteName" min-width="100" />
       <el-table-column label="省" align="center" prop="province" min-width="100" />
       <el-table-column label="市" align="center" prop="city" min-width="100" />
       <el-table-column label="区" align="center" prop="county" min-width="100" />
       <el-table-column label="乡镇" align="center" prop="town" min-width="100" />
+      <el-table-column label="是否偏远地" align="center" prop="far" min-width="100" />
+      <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.status"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -189,8 +236,8 @@
     <!-- 添加或修改目的地对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
       <el-row :gutter="0">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-col :span="8">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-col :span="24">
             <el-form-item label="目的地编码" prop="destCode">
               <el-input v-model="form.destCode" placeholder="请输入目的地编码" />
             </el-form-item>
@@ -205,9 +252,16 @@
               <el-input v-model="form.destNameEn" placeholder="请输入英文名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="所属国家" prop="country">
-              <el-input v-model="form.country" placeholder="请输入所属国家" />
+              <el-select v-model="form.country" placeholder="所属国家" clearable filterable>
+                  <el-option
+                    v-for="item in countryIdsOptions"
+                    v-bind:key="item.label"
+                    v-bind:label="item.label"
+                    v-bind:value="item.label"
+                  />
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -235,6 +289,28 @@
               <el-input v-model="form.town" placeholder="请输入乡镇" />
             </el-form-item>
           </el-col>
+        <el-col :span="24">
+              <el-form-item label="是否启用" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+              <el-form-item label="是否偏远区" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -265,12 +341,14 @@
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  append-to-body>
         <emisDestinationView :id="id" ></EmisDestinationView>
     </el-dialog>
-
+  </el-col>
+  </el-row>
   </div>
 </template>
 
 <script>
-import { listEmisDestination, getEmisDestination, delEmisDestination, addEmisDestination, updateEmisDestination } from "@/api/emis/emisDestination";
+import { listEmisDestination, getEmisDestination, delEmisDestination, addEmisDestination, updateEmisDestination, changeDescStatus } from "@/api/emis/emisDestination";
+import { listEmisCountry, getEmisCountry, delEmisCountry, addEmisCountry, updateEmisCountry } from "@/api/emis/emisCountry";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisDestinationView from '@/views/emis/emisDestination/emisDestinationView';
 import emisDestinationForm from '@/views/emis/emisDestination/emisDestinationForm';
@@ -285,6 +363,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      currentId:null,
+      countryName:null,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -299,8 +379,14 @@ export default {
       total: 0,
       // 目的地表格数据
       emisDestinationList: [],
+      countryTree:[],
+      countryIdsOptions:[],
       // 弹出层标题
       title: "",
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       // 是否显示弹出层
       open: false,
 
@@ -335,6 +421,8 @@ export default {
         county: null,
         town: null,
         remark: null,
+        countryId:null,
+        country:null,
       },
       // 表单参数
       form: {},
@@ -372,8 +460,28 @@ export default {
   },
   created() {
     this.getList();
+    this.getCountryList();
+  },
+  watch: {
+    // 根据名称筛选部门树
+    countryName(val) {
+      this.$refs.tree.filter(val);
+    }
   },
   methods: {
+    handleStatusChange(row) {
+     
+     let text = row.status === "0" ? "启用" : "停用";
+     this.$modal.confirm('确认要"' + text + '""' + row.lineName + '"目的地吗？').then(function() {
+      //改变线路的启用状态
+       return changeDescStatus(row.id, row.status);
+     }).then(() => {
+       this.$modal.msgSuccess(text + "成功");
+     }).catch(function() {
+       row.status = row.status === "0" ? "1" : "0";
+     });
+     
+   },
     /** 查询目的地列表 */
     getList() {
       this.loading = true;
@@ -392,11 +500,46 @@ export default {
         this.loading = false;
       });
     },
+    getCountryList() {
+      this.loading = true;
+      listEmisCountry(this.queryParams).then(response => {
+         this.loading = false;
+		      this.countryTree = [];
+          this.countryIdsOptions = [];
+          var cTree={"id":"","label":"国家列表","children":[]};
+          cTree.children.push({"id":40,"label":"中国"});
+          this.countryIdsOptions.push({"value":40,"label":"中国"})
+          //var lastContinentId = -1;
+          response.rows.forEach(item =>{
+            if(item.id != 40){
+              var optItem={value:item.id,label:item.name};
+              this.countryIdsOptions.push(optItem)
+
+              var treeItem={"id":item.id,"label":item.name};
+              cTree.children.push(treeItem);
+            }
+              //lastContinentId = item.id;
+          });
+          this.queryParams.countryId = this.currentCountryId;
+          this.countryTree.push(cTree);
+          //this.getAreaList();
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
     },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+        this.queryParams.country = data.label;
+        this.handleQuery();
+    },
     // 表单重置
     reset() {
       this.form = {