Merge remote-tracking branch 'origin/dev4.5' into dev4.5

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -93,16 +93,16 @@ var vEntSearchComponent = new Vue({
             checked: false,
             key: 'B'
           },
-          {
-            title: '股东',
-            checked: false,
-            key: 'C'
-          },
-          {
-            title: '高管',
-            checked: false,
-            key: 'D'
-          },
+          // {
+          //   title: '股东',
+          //   checked: false,
+          //   key: 'C'
+          // },
+          // {
+          //   title: '高管',
+          //   checked: false,
+          //   key: 'D'
+          // },
           {
             title: '中标项目/标的物',
             disabled: true,
@@ -259,7 +259,7 @@ var vEntSearchComponent = new Vue({
     },
     changePower (type) {
       this.entTabs[6].disabled = type
-      this.conditionMap[1][4].disabled = type
+      this.conditionMap[1][2].disabled = type
     },
     getMoreListToStr (key) {
       if (typeof this.conditionMap[key] !== "undefined" && this.conditionMap[key].length) {
@@ -941,21 +941,21 @@ var vMainSearchComponent = new Vue({
     },
     removeFixedScroll () {
       $("#selLable").show()
-      // $(".app-layout-content-b").scrollTop(0)
+      $(".app-layout-content-b").scrollTop(0)
       $(".app-layout-content-b").removeClass('ent-stop-scroll')
       $("#v-search-group .ent-search-list").css({height: 'unset'})
       $("#v-search-group .ent-search-pop").css({height: 'unset'})
     },
     fixedScroll () {
       $("#selLable").hide()
-      // $(".app-layout-content-b").scrollTop(0)
+      $(".app-layout-content-b").scrollTop(0)
       $(".app-layout-content-b").addClass('ent-stop-scroll')
       var isMaxHeight = $(".app-layout-content-b").height()  - $("#v-search-group .van-tabs.van-tabs--line").height()
       $("#v-search-group .ent-search-list").css({height: isMaxHeight})
       $("#v-search-group .ent-search-pop").css({height: isMaxHeight})
     },
     updateScrollTop () {
-      // $(".app-layout-content-b").scrollTop(0)
+      $(".app-layout-content-b").scrollTop(0)
     },
     selectEnt (ent) {
       console.log(ent)