Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/components/common/cascaderSelect.vue

 <template>
-  <a-cascader v-model="selected" :style="{width:'80%'}" :options="options" :show-search="{ filter }" :display-render="displayRender" expand-trigger="hover" placeholder="请选择学科代码" @change="onChange" />
+  <a-cascader v-model="selected" :style="{width:'80%'}" :options="options" v-if="changeOnSelect" :changeOnSelect="changeOnSelect" :show-search="{ filter }" slot-scope="{labels, selectedOptions}" expand-trigger="hover" placeholder="请选择学科代码" @change="onChange" />
+  <a-cascader v-model="selected" :style="{width:'80%'}" :options="options" v-else :changeOnSelect="changeOnSelect" :show-search="{ filter }" :display-render="displayRender" expand-trigger="hover" placeholder="请选择学科代码" @change="onChange" />
 </template>
 <script>
 //import { specList, getSpecArray } from "@/views/components/common/config"
@@ -19,6 +20,12 @@ export default {
         return null
       }
     },
+    changeOnSelect: {
+      type: Boolean,
+      default () {
+        return false
+      }
+    },
   },
   created () {
     this.loadSpecList()
@@ -45,7 +52,7 @@ export default {
         }
       })
     },
-    getSpecInfo(key) {
+    getSpecInfo (key) {
       let newArray = this.specArray.filter(
         function (el) {
           return el.key == key
@@ -58,8 +65,9 @@ export default {
     },
     onChange (value, selectedOptions) {
       this.selected = value
-      if (!!this.selected && this.selected.length == 3) {
-        this.$emit("input", this.selected[2])
+      if (!!this.selected && this.selected.length > 0) {
+        var len = this.selected.length - 1
+        this.$emit("input", this.selected[len])
         this.$emit("change");
       }
     },