coys

src/components/checkPeople/index.vue

@@ -13,25 +13,9 @@
     <van-action-sheet class="bigsheetbox" v-model="show" position="bottom" title="选择人员">
       <van-row>
         <van-col span="24"
-          ><van-field
-            v-model="orgName"
-            is-link
-            label-width="4em"
-            clearable
-            label="组织机构"
-            placeholder=""
-            @click="showcascader = true"
-          />
-          <van-popup v-model="showcascader" round position="bottom" :close-on-click-overlay="false">
-            <van-cascader
-              v-model="cascaderValue"
-              title="组织机构"
-              :options="options"
-              @close="closeDialog"
-              @change="changeCascader"
-              :field-names="fieldNames"
-            />
-          </van-popup>
+          >
+          <org-tree v-model="orgId" @change="getDataList"></org-tree>
+
         </van-col>
       </van-row>
       <van-row>
@@ -64,7 +48,7 @@
                 
               >
                 <template #right-icon>
-                  <van-checkbox :name="item.id" ref="checkboxes" />
+                  <van-checkbox :name="item.id"  ref="checkboxes" />
                 </template>
               </van-cell>
             </van-cell-group>
@@ -82,10 +66,23 @@
 <script>
 import { deptTreeList } from '@/api/toConsult.js'
 import { getOrgPeople } from '@/api/public.js'
-
+import OrgTree from '@/components/orgTree'
 export default {
   name: 'SocAppIndex',
+  components:{
+    OrgTree
+  },
   props: {
+    userList:{
+      type:Array,
+      default:()=>{
+        return []
+      }
+    },
+    organizationId:{//机构ID
+      type:String,
+      default:''
+    },
     isRequired:{//是否必填
       type:Boolean,
       default:false
@@ -108,6 +105,7 @@ export default {
   },
   data() {
     return {
+      orgId:this.organizationId||'',
       show: false,
       value1: '',
       showcascader: false,
@@ -119,48 +117,36 @@ export default {
       peopleList: [], //人员列表
       peopleListCpoy: [], //人员列表2
       orgName: '', //机构名称
+      peoplesId: '', //人员ID
       peoples: '' //人员列表
     }
   },
   created() {
-    this.getOrgList()
+    
   },
   mounted() {},
 
   methods: {
+   
     onLoad() {},
-    closeDialog() {
-      this.showcascader = false
-      this.orgName = this.value1
-      getOrgPeople(this.cascaderValue).then(res=>{
+    getpeople() {
+     
+      
+      getOrgPeople(this.orgId).then(res=>{
         
         let { code, data, msg } = res
         if (code == 200) {
           this.peopleList= data
           this.peopleListCpoy= JSON.parse(JSON.stringify(this.peopleList))
+          this.peopleListCpoy.forEach(item=>{
+            this.$set(item,'checked',false)
+          })
         }
       })
     },
-    //级联选择当前任意层级触发
-    changeCascader(val) {
-      console.log(val)
-      let { selectedOptions } = val
-      //级联值
-      this.cascaderValue = selectedOptions[selectedOptions.length - 1].id
-      //输入框值
-      this.value1 = selectedOptions[selectedOptions.length - 1].name
-    },
-    getOrgList() {
-      //获取组织机构数据
-      deptTreeList().then(res => {
-        let { code, data, msg } = res
-        if (code == 200) {
-          this.options = data
-        }
-      })
-    },
+   
     onSearch(val) {
-      console.log(val)
+      
      this.peopleListCpoy= this.peopleList.filter(item=>{
         if(item.name.indexOf(val)!=-1){
           return item

src/components/orgTree/index.vue

@@ -1,45 +1,46 @@
 <template>
   <div class="orgTree">
-      <tree-select
-        @select="onSelect"
-        v-model="orgId"
-        :options="treeData"
-        placeholder="请选择归属机构"
-        :normalizer="tenantIdnormalizer"
-        :show-count="true" >
-      </tree-select>
+    <tree-select
+      @select="onSelect"
+      v-model="orgId"
+      :options="treeData"
+      placeholder="请选择归属机构"
+      :normalizer="tenantIdnormalizer"
+      :show-count="true"
+    >
+    </tree-select>
   </div>
 </template>
 <script>
-import TreeSelect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {deptTreeList} from "@/api/public";
+import TreeSelect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { deptTreeList } from '@/api/public'
 
 export default {
-  components:{
+  components: {
     TreeSelect
   },
-  props:{
-    value:{
+  props: {
+    value: {
       type: String,
-      default: null,
-    },
+      default: null
+    }
   },
   data() {
     return {
       treeData: [],
-      orgId:null,
+      orgId: null
     }
   },
   created() {
-    this.getTreeList();
+    this.getTreeList()
   },
-  watch:{
-    value:{
-      handler (val) {
-        this.orgId = val;
+  watch: {
+    value: {
+      handler(val) {
+        this.orgId = val
       }
-    },
+    }
   },
   methods: {
     /** treeSelect组件自定义数据*/
@@ -54,64 +55,68 @@ export default {
       }
     },
     //获取机构树
-    getTreeList(){
-      deptTreeList(this.orgId).then(res=>{
-        this.$nextTick(()=>{
-          this.treeData = res.data;
+    getTreeList() {
+      deptTreeList(this.orgId).then(res => {
+        this.$nextTick(() => {
+          this.treeData = res.data
         })
-        console.log(res,'3333')
+        console.log(res, '3333')
       })
     },
-    onSelect(value){
-      console.log(value,'tttttt')
-      this.$emit('change',value.id);
+    onSelect(value) {
+      this.$emit('change', value.id)
+      this.$emit('changeItem', value)
     }
   },
-  model:{
-    prop:'orgId',
-    event:'change'
+  model: {
+    prop: 'orgId',
+    event: 'change'
   }
 }
 </script>
+<style>
 
+</style>
 <style lang="scss">
-  .orgTree {
-    font-size: 28px;
-    svg {
-      background-size: 22px 22px;
-      width: 22px;
-      height: 22px;
-    }
-
-    .vue-treeselect__control {
-      width: 100%;
-      height: 90px;
-      padding: 0 20px;
-      border-radius: 0;
-      border: none;
-      border-bottom: 1px solid #dcdfe6;
-    }
+.orgTree {
+  font-size: 28px;
+  height: 100%;
+  svg {
+    background-size: 22px 22px;
+    width: 22px;
+    height: 22px;
+  }
+  
+  .vue-treeselect__control {
+    width: 100%;
+    height: 90px;
+    padding: 0 20px;
+    border-radius: 0;
+    border: none;
+    border-bottom: 1px solid #dcdfe6;
+  }
 
-    .vue-treeselect__placeholder, .vue-treeselect__single-value {
-      height: 90px;
-      line-height: 90px;
-    }
+  .vue-treeselect__placeholder,
+  .vue-treeselect__single-value {
+    height: 90px;
+    line-height: 90px;
+  }
 
-    .vue-treeselect__menu {
-      padding: 20px;
-    }
-    .vue-treeselect__label {
-      padding: 15px 20px;
-    }
-    .vue-treeselect__x-container{
-      width:  50px;
-    }
-    .vue-treeselect__control-arrow-container {
-      width: 50px;
-    }
-    .vue-treeselect--single .vue-treeselect__option--selected{
-      font-weight: 500;
-      color: #589eec;
-    }
+  .vue-treeselect__menu {
+    padding: 20px;
   }
+  .vue-treeselect__label {
+    padding: 15px 20px;
+  }
+  .vue-treeselect__x-container {
+    width: 50px;
+  }
+  .vue-treeselect__control-arrow-container {
+    width: 50px;
+  }
+  .vue-treeselect--single .vue-treeselect__option--selected {
+    font-weight: 500;
+    color: #589eec;
+  }
+}
 </style>

src/components/peopleList/index.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <van-field
+      readonly
+      clickable
+      name="datetimePicker"
+      :value="peoples"
+      :required="isRequired"
+      :label="inpitLabel"
+      placeholder="请选择人员"
+      @click="show = true"
+    />
+    <van-action-sheet class="bigsheetbox" v-model="show" position="bottom" title="选择人员">
+      <van-row>
+        <van-col span="24">
+          <van-search
+            v-model="searchVal"
+            show-action
+            placeholder="请输入搜索关键词"
+            @search="onSearch"
+            @cancel="onCancel"
+          />
+        </van-col>
+      </van-row>
+
+      <van-row>
+        <van-col span="24">
+          <van-checkbox-group v-model="peoplesId">
+            <van-cell-group>
+              <van-cell v-for="item in peopleListCpoy" clickable :key="item.id" :title="`${item.name}`">
+                <template #right-icon>
+                  <van-checkbox :name="item.id"   />
+                </template>
+              </van-cell>
+            </van-cell-group>
+          </van-checkbox-group>
+        </van-col>
+      </van-row>
+      <van-row class="bottomdiv">
+        <van-col span="24">
+          <van-button class="btns" size="small" type="info" @click="submitHandler">确认</van-button>
+        </van-col>
+      </van-row>
+    </van-action-sheet>
+  </div>
+</template>
+<script>
+import { deptTreeList } from '@/api/toConsult.js'
+import { getOrgPeople } from '@/api/public.js'
+import OrgTree from '@/components/orgTree'
+export default {
+  name: 'SocAppIndex',
+  components: {
+    OrgTree
+  },
+
+  props: {
+    organizationId: {
+      //机构ID
+      type: Number,
+      default: 0
+    },
+    userList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    isRequired: {
+      //是否必填
+      type: Boolean,
+      default: false
+    },
+    inpitLabel: {
+      type: String,
+      default: '参与人员'
+    },
+    fieldNames: {
+      //树行配置映射项
+      type: Object,
+      default: () => {
+        return {
+          text: 'name',
+          value: 'id',
+          children: 'children'
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      orgId: this.organizationId || '',
+      show: false,
+      value1: '',
+      showcascader: false,
+      cascaderValue: '',
+      loading: false,
+      options: [], //机构列表
+      peoplesId: [], //人员ID集合
+      searchVal: '', //搜索值
+      peopleList: [], //人员列表
+      peopleListCpoy: [], //人员列表2
+      orgName: '', //机构名称
+      peoples: '' //人员列表
+    }
+  },
+  watch: {
+    organizationId(val) {
+      this.orgId = val + ''
+      this.getpeople()
+    },
+    //监听人员数组变化
+    userList(val) {
+      this.peoples = val.map(item => item.userName).join(',')
+      this.peoplesId = [val.map(item => item.userId).join(',')]
+    }
+  },
+
+  created() {},
+  mounted() {},
+
+  methods: {
+    onLoad() {},
+    getpeople() {
+      getOrgPeople(this.orgId).then(res => {
+        let { code, data, msg } = res
+        if (code == 200) {
+          this.peopleList = data
+          this.peopleListCpoy = JSON.parse(JSON.stringify(this.peopleList))
+         
+          this.peopleListCpoy.forEach(item => {
+            this.peoplesId.forEach(i => {
+              if (item.userId === i) {
+                this.$set(item, 'checked', true)
+              }else{
+                this.$set(item, 'checked', false)
+              }
+            })
+          })
+        }
+      })
+    },
+
+    onSearch(val) {
+      this.peopleListCpoy = this.peopleList.filter(item => {
+        if (item.name.indexOf(val) != -1) {
+          return item
+        }
+      })
+    },
+    onCancel() {
+      this.searchVal = ''
+      this.peopleListCpoy = this.peopleList
+    },
+    submitHandler() {
+      let list = []
+      this.peopleListCpoy.filter(item => {
+        this.peoplesId.forEach(r => {
+          if (r == item.id) {
+            list.push(item)
+          }
+        })
+      })
+      this.show = false
+      this.peoples = list.map(item => item.name).join(',')
+
+      // 抛出已选择人员信息
+      this.$emit('userList', list)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.van-action-sheet {
+  min-height: 90%;
+}
+.btns {
+  width: 100%;
+}
+.bottomdiv {
+  width: 100%;
+  bottom: 0%;
+  position: fixed;
+}
+.bigsheetbox {
+  height: calc(100vh - 100px);
+}
+.line {
+  width: 100%;
+  height: 3px;
+  background-color: #1989fa;
+}
+</style>

src/utils/request.js

@@ -53,7 +53,8 @@ let success = response => {
     return  Promise.reject(res.msg);
   }
   if (res.code === 500) {
-    Toast.fail('请求错误');
+    // Toast.fail('请求错误');
+    Toast.fail(res.msg);
     return  Promise.reject(res.msg);
   }
   Toast.fail(res.msg);

src/views/menu/monitoringCall/index.vue

@@ -2,8 +2,9 @@
   <div>
     <NavBar />
     <van-row>
-      <van-col span="24"
-        ><van-field
+      <van-col span="24">
+        <org-tree v-model="cascaderValue" @change="getDataList"></org-tree>
+        <!-- <van-field
           v-model="value1"
           is-link
           label-width="3em"
@@ -22,7 +23,7 @@
             @finish="onFinish"
             :field-names="fieldNames"
           />
-        </van-popup>
+        </van-popup> -->
       </van-col>
     </van-row>
     <van-row>
@@ -113,6 +114,7 @@ import NavBar from '@/components/NavBar'
 import { Col, Row, Cascader, Dialog, DatetimePicker, Icon, Picker } from 'vant'
 import { deptTreeList, selectListApp, registration } from '@/api/toConsult.js'
 import { Toast } from 'vant'
+import OrgTree from '@/components/orgTree'
 import { newDateMonth } from '@/utils/date.js'
 import scandialog from '@/components/nfcPopup/alone.vue'
 import { base64ToBlob } from '@/utils/base64TurnImg.js'
@@ -128,7 +130,7 @@ export default {
       monitor: ['monitor', 'monitored', 'monitoring', 'waringtoring'], //状态样式
       value1: JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME')) || '', //输入框model
       currentDate: newDateMonth(),
-      presentDate:  '', //当前时间
+      presentDate: '', //当前时间
       cascaderValue: JSON.parse(sessionStorage.getItem('SET_USER_ORGID')) || '',
       columns: ['全部'],
       statusList: [], //调阅状态字典数组
@@ -149,6 +151,7 @@ export default {
   },
   components: {
     NavBar,
+    OrgTree,
     scandialog,
     Dialog,
     Icon,
@@ -175,16 +178,20 @@ export default {
   },
   created() {
     this.init()
-    this.presentDate=this.presentDateCpd
+    this.presentDate = this.presentDateCpd
   },
-  computed:{
-    presentDateCpd(){
-      return new Date(+newDateMonth().split('-')[0],+newDateMonth().split('-')[1]-1)
-       
+  computed: {
+    presentDateCpd() {
+      return new Date(+newDateMonth().split('-')[0], +newDateMonth().split('-')[1] - 1)
     }
   },
   mounted() {},
   methods: {
+    //机构变化
+    getDataList(v) {
+      this.cascaderValue = v
+      this.selectListAppHandler()
+    },
     //onLoad下拉刷新
     onLoad() {
       if (this.pageNum == 1) {
@@ -211,13 +218,6 @@ export default {
     },
     //初始化
     init() {
-      //获取组织机构数据
-      deptTreeList().then(res => {
-        let { code, data, msg } = res
-        if (code == 200) {
-          this.options = data
-        }
-      })
       //获取调阅状态字典
       this.getDictHandler('retrieval_task_status', res => {
         this.statusList = res
@@ -227,7 +227,10 @@ export default {
       })
       this.selectListAppHandler()
     },
-    selectListAppHandler(type=0,callBack = () => {}) {
+    selectListAppHandler(type = 0, callBack = () => {}) {
+      if (!type) {
+        this.pageNum = 1
+      }
       //获取任务列表
       selectListApp({
         pageNum: this.pageNum,
@@ -238,18 +241,18 @@ export default {
       }).then(res => {
         let { code, rows, msg } = res
         if (code == 200) {
-          if(type){
+          if (type) {
             this.taskList.push(...rows)
-          if(rows.length==0){
-            //已加载完全部数据
-            this.finished=true
-            return
+            if (rows.length == 0) {
+              //已加载完全部数据
+              this.finished = true
+            }
+            callBack()
+          } else {
+            this.finished = false
+            this.taskList = rows
           }
-          callBack()
-          }else{
-            this.taskList=rows
-          }
-          
+
           // if(num===1){
           //   this.loading = false
           //   this.pageNum++

src/views/menu/training/components/addTraining.vue

@@ -78,10 +78,11 @@
       />
 
       <!-- 参与人员 -->
+     
       <!-- 必填 -->
-      <CheckPeople :isRequired="true" @userList="userListHandler"></CheckPeople>
+      <CheckPeople ref="checkPeople" :userList="userPeopleList" :organizationId="trainingData.orgId" :isRequired="true" @userList="userListHandler"></CheckPeople>
       <!-- 缺席人员 -->
-      <CheckPeople @userList="lackUserListHandler" :inpitLabel="'缺席人员'"></CheckPeople>
+      <CheckPeople ref="checkPeople" :userList="lackPeopleList" :inpitLabel="'缺席人员'" :organizationId="trainingData.orgId" :isRequired="true" @userList="lackUserListHandler"></CheckPeople>
       <!-- 上传 -->
       <van-field readonly clickable name="uploader" label="上传图片">
         <template #input>
@@ -97,7 +98,7 @@
 </template>
 <script>
 import NavBar from '@/components/NavBar'
-import CheckPeople from '@/components/checkPeople/index.vue'
+import CheckPeople from '@/components/peopleList/index.vue'
 import Upload from '@/components/upload/index.vue'
 import { gettrainingInfo, edittrainingInfo } from '@/api/training.js'
 import { newDateTime } from '@/utils/date.js'
@@ -105,7 +106,7 @@ import { Dialog, Toast } from 'vant'
 export default {
   name: 'SocAppAddTraining',
   components: {
-    NavBar,
+    NavBar, 
     Upload,
     CheckPeople
   },
@@ -144,8 +145,27 @@ export default {
         }
         if(!data.imageList){
           data.imageList=[]
+        }else{
+          data.imageList=[data.imageList]
         }
         Object.assign(this.form, data)
+        // checkPeople
+        
+        this.form.taskUserList.map(item=>{
+          if(item.type===1){
+            this.userPeopleList.push(item)
+            return item.userName
+          }
+        }).join(',')
+
+        this.form.taskUserList.map(item=>{
+          if(item.type===2){
+            this.lackPeopleList.push(item)
+            return item.userName
+          }
+        }).join(',')
+       
+        
       }
     })
   },
@@ -192,6 +212,7 @@ export default {
       this.showEndDate = false
     },
     userListHandler(list) {
+      
       list.forEach(item => {
         ;(item.type = 1), (item.userId = item.id)
         item.userName = item.username
@@ -271,12 +292,17 @@ export default {
         id: this.trainingData.id,
         type: this.trainingData.type,
         submitType: type,
-        submitType: 2,
+      
         ...obj
       }).then(res => {
         let { code, msg } = res
-        Toast('登记成功')
-        this.$router.push('/training')
+        if(code==200){
+
+          Toast('登记成功')
+          this.$router.push('/training')
+        }else{
+          Toast(msg)
+        }
       })
     }
   }

src/views/menu/training/index.vue

@@ -4,27 +4,20 @@
       <NavBar />
 
       <van-row>
-        <van-col span="24"
-          ><van-field
+        <van-col span="24">
+          <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
+          <!-- <van-field
             v-model="orgName"
             is-link
             label-width="4em"
             clearable
             label="组织机构"
             placeholder=""
-            @click="show = true"
+            @click="orgShow = true"
           />
-          <van-popup v-model="show" round position="bottom" :close-on-click-overlay="false">
-            <van-cascader
-              v-model="cascaderValue"
-              title="组织机构"
-              :options="options"
-              @close="closeDialog"
-              @change="changeCascader"
-              @finish="onFinish"
-              :field-names="fieldNames"
-            />
-          </van-popup>
+          <van-popup v-model="orgShow" class="popup" round position="bottom">
+            
+          </van-popup> -->
         </van-col>
       </van-row>
       <van-row>
@@ -159,10 +152,13 @@ import { Col, Row, Cascader, Dialog, DatetimePicker, Icon, Picker } from 'vant'
 import { gettrainingList, getsignUserList } from '@/api/training.js'
 import { deptTreeList } from '@/api/toConsult.js'
 import { Toast } from 'vant'
+import OrgTree from '@/components/orgTree'
 import { newDateMonth } from '@/utils/date.js'
 export default {
   data() {
     return {
+      orgName: '',
+      orgShow: false,
       presentDate: '', //默认时间
       pageNum: 1,
       loading: false, //加载状态
@@ -178,7 +174,7 @@ export default {
       orgName: JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME')) || '', //机构名称
       cascaderValue: JSON.parse(sessionStorage.getItem('SET_USER_ORGID')) || '', //机构ID
       show: false, //机构弹框显示隐藏
-      options: [], //机构数组
+
       fieldNames: {
         text: 'name',
         value: 'id',
@@ -188,7 +184,7 @@ export default {
       typeValue: ' ', //类型值
       typeName: '全部', //类型名称
       value1: JSON.parse(sessionStorage.getItem('SET_USER_ID')) || '', //输入框model
-     
+
       typeStatus: false, //类型显示隐藏
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
@@ -197,13 +193,12 @@ export default {
       columns: ['全部', '待记录', '待签名', '已完成'], //状态数组
       typeColumns: ['每月安全培训教育', '专项安全培训教育'], //类型数组
       currentDate: newDateMonth(), //月份值
-      conditionShow: false, //机构弹框显示隐藏
-      show: false, //机构弹框显示隐藏
-      show: false //机构弹框显示隐藏
+      conditionShow: false //机构弹框显示隐藏
     }
   },
   components: {
     NavBar,
+    OrgTree,
     Dialog,
     Icon,
     DatetimePicker,
@@ -248,6 +243,13 @@ export default {
     }
   },
   methods: {
+    //机构搜索
+    getDataList(val) {
+      
+      this.cascaderValue = val.id
+      this.orgName = val.name
+      this.selectListAppHandler()
+    },
     //判断是否展示签名按钮
     isSignature(list) {
       let falg = false
@@ -260,20 +262,19 @@ export default {
         let endDate = Date.parse(new Date(list.endDate))
 
         if (date >= startDate && date <= endDate) {
-          console.log(list.id,'ssss');
+          console.log(list.id, 'ssss')
           timefalg = true
         }
       }
       list.userList?.forEach(item => {
-        console.log(this.value1,'sss');
+        console.log(this.value1, 'sss')
         if (this.value1 == item.userId && item.sign === 0) {
-          console.log(list.id,'fff');
+          console.log(list.id, 'fff')
           falg = true
         }
       })
 
       if (falg && timefalg) {
-        
         return true
       }
     },
@@ -288,7 +289,6 @@ export default {
         let startDate = Date.parse(new Date(list.startDate))
         let endDate = Date.parse(new Date(list.endDate))
         if (date >= startDate && date <= endDate) {
-         
           timefalg = true
         }
       }
@@ -322,13 +322,6 @@ export default {
 
     //初始化
     init() {
-      //获取组织机构数据
-      deptTreeList().then(res => {
-        let { code, data, msg } = res
-        if (code == 200) {
-          this.options = data
-        }
-      })
       this.selectListAppHandler()
     },
     selectListAppHandler(type = 0, callback = () => {}) {
@@ -339,7 +332,7 @@ export default {
       }
       if (!type) {
         obj.pageNum = 1
-        this.pageNum=1
+        this.pageNum = 1
       }
       if (this.statusValue) {
         obj.status = this.statusValue
@@ -363,7 +356,6 @@ export default {
             if (rows.length == 0) {
               //已加载完全部数据
               this.finished = true
-              
             }
             callback()
           } else {
@@ -374,12 +366,6 @@ export default {
       })
     },
 
-    //关闭弹框事件
-    closeDialog() {
-      this.selectListAppHandler()
-      this.show = false
-      this.orgName = this.value1
-    },
     // 开始调阅事件
     startMonitorHandler(taskId) {
       this.taskId = taskId
@@ -393,16 +379,6 @@ export default {
       this.$router.push('/consultInfo/' + taskId)
     },
 
-    //级联选择当前任意层级触发
-    changeCascader(val) {
-      console.log(val)
-      let { selectedOptions } = val
-      //级联值
-      this.cascaderValue = selectedOptions[selectedOptions.length - 1].id
-      //输入框值
-      this.value1 = selectedOptions[selectedOptions.length - 1].name
-    },
-    onFinish() {},
     //搜索选择状态时触发
     onConfirm(value, index) {
       this.fieldValue = value
@@ -514,6 +490,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.popup{
+  height: 40vh;
+}
 .navBarclas {
   height: calc(100vh - 380px);
   overflow: scroll;