瀏覽代碼

Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

coys 2 年之前
父節點
當前提交
e6e8cef8f9
共有 1 個文件被更改,包括 15 次插入9 次删除
  1. 15 9
      src/views/menu/protection/index.vue

+ 15 - 9
src/views/menu/protection/index.vue

@@ -1,19 +1,24 @@
 <template>
   <div class="protection_list">
     <nav-bar></nav-bar>
-    <van-search v-model="search.key" placeholder="请输入搜索关键词" maxlength="50" />
+    <van-row>
+      <van-col span="24">
+        <org-tree v-model="search.orgId" @changeItem="changeTree"></org-tree>
+      </van-col>
+    </van-row>
+    <!-- <van-search v-model="search.key" placeholder="请输入搜索关键词" maxlength="50" /> -->
     <van-dropdown-menu>
-      <van-dropdown-item :title="selectedOrgName" @open="onItemClick" />
+      <!-- <van-dropdown-item :title="selectedOrgName" @open="onItemClick" /> -->
       <van-dropdown-item v-model="search.status" :options="statusOptions" />
       <van-dropdown-item v-model="search.hour" :options="hourOptions" />
     </van-dropdown-menu>
     <!-- <div>
       <van-picker show-toolbar title="选择" :columns="statusOptions"/>
     </div> -->
-    <van-popup v-model="showOrg" round position="bottom">
+    <!-- <van-popup v-model="showOrg" round position="bottom">
       <van-cascader v-model="search.orgId" title="选择机构" :options="options" @close="showOrg = false" @change="changeTree"
         @finish="onFinish" :field-names="fieldNames" />
-    </van-popup>
+    </van-popup> -->
     <div class="container">
       <k-list :list="list" :params="search" :auto="false" ref="list">
         <template slot-scope="{ data }">
@@ -32,8 +37,9 @@ import { deptTreeList } from '@/api/public'
 import { list } from '@/api/protection.js'
 import KList from '@/components/list/index.vue'
 import Item from './components/item.vue'
+import OrgTree from '@/components/orgTree'
 export default {
-  components: { NavBar, KList, Item },
+  components: { NavBar, KList, Item ,OrgTree},
   data() {
     return {
       options: [],
@@ -128,12 +134,12 @@ export default {
       this.showOrg = true
     },
     //改变机构后将重新发起请求
-    changeTree({ selectedOptions }) {
+    changeTree(node) {
       // console.log(selectedOptions,'aaaaaa')
       // this.search.orgId = selectedOptions[selectedOptions.length-1].id;
-      let option = selectedOptions[selectedOptions.length - 1]
-      this.search.orgId = option.id
-      this.selectedOrgName = option.name
+      // let option = selectedOptions[selectedOptions.length - 1]
+      this.search.orgId = node.id
+      this.selectedOrgName = node.shortName
     },
     onFinish({ selectedOptions }) {
       this.showOrg = false