Merge branch 'dev4.6.3' of http://192.168.3.207:8080/qmx/jy into dev4.6.3

src/web/staticres/js/ent-search-index-pc.js

@@ -213,7 +213,7 @@ var vm = new Vue({
             endDate:'',
             thisStartTime:'',
             thisEndTime:'',
-            industryShow: false
+            indusShow: false
         }
     },
     watch: {
@@ -270,7 +270,6 @@ var vm = new Vue({
         },
     },
     created: function () {
-        this.industryTab()
         this.getPower()
         this.initPageData()
         this.initProvinceMapList()
@@ -281,6 +280,7 @@ var vm = new Vue({
         this.$refs.searchType.setState(this.filterState.searchType)
         // 全选按钮逻辑
         // this.searchTypeChange([], true)
+        this.industryTab()
     },
     methods: {
         industryTab() {
@@ -290,9 +290,9 @@ var vm = new Vue({
                 url:'/entnicheNew/buy/whetherbuy',
                 success:function (res) {
                   if (res.data.isNew) {
-                    _this.industryShow = true
+                    $('#tab-cgdw').css('display', 'inline-block')
                   } else {
-                    _this.industryShow = false
+                    $('#tab-cgdw').css('display', 'none')
                   }
                 }
             })

src/web/staticres/js/pur-search-index-pc.js

@@ -205,7 +205,7 @@ var vm = new Vue({
             this.entArea = {}
             this.indusList = []
             this.indusList1 = []
-            this.industryListMap = []
+            this.industryExp = []
             this.qyCheck = []
             this.doSearch()
         },
@@ -420,7 +420,6 @@ var vm = new Vue({
             }
             this.listState.loading = true
             this.listState.loaded = false
-            this.listState.list = []
             const _this = this
             let arrs = [], arr1 = []
             $.ajax({
@@ -450,6 +449,7 @@ var vm = new Vue({
                         if (res.error_msg) {
                             toastFn(res.error_msg, 2000)
                         }
+                        this.listState.list = []
                     }
                 }.bind(this),
                 complete: function () {
@@ -591,10 +591,7 @@ var vm = new Vue({
                 success: function (res) {
                     if (res.data == false) {
                         if (res.error_msg) {
-                            _this.$message({
-                                message: res.error_msg,
-                                type: 'warning'
-                            })
+                            toastFn(res.error_msg, 2000)
                         }
                     } else {
                         _this.getList(_this.listState.pageNum)
@@ -658,19 +655,23 @@ var vm = new Vue({
             }
         },
         guanAndren(item, type, index) {
-            if (!item.claim1) {
-                var top = 91 * (index + 1) + 'px'
-                this.datas = item.Buyer
-                $('.tags-box').slideToggle(function () {
-                    window.activeTags = []
-                    $('.tag-labels').empty()
-                    $('.clear-input').val('')
-                    $('.tags-list').find('.tags-item').removeClass('tags-active')
-                    $('.tag-placeholder').show()
-                }).css({
-                    top: top,
-                    right: 0
-                })
+            if (type == 1) {
+                if (!item.claim1) {
+                    var top = 91 * (index + 1) + 'px'
+                    this.datas = item.Buyer
+                    $('.tags-box').slideToggle(function () {
+                        window.activeTags = []
+                        $('.tag-labels').empty()
+                        $('.clear-input').val('')
+                        $('.tags-list').find('.tags-item').removeClass('tags-active')
+                        $('.tag-placeholder').show()
+                    }).css({
+                        top: top,
+                        right: 0
+                    })
+                } else {
+                    this.attention(item, type, '')
+                }
             } else {
                 this.attention(item, type, '')
             }
@@ -901,11 +902,11 @@ var vm = new Vue({
                 }
                 console.log(params)
                 // 执行保存绑定标签操作
-                if (params.label !== '') {
+                // if (params.label !== '') {
                   saveChooseTags(params, function () {
                     $('.tags-footer .button-cancel').trigger('click')
                   })
-                }
+                // }
               }
             })
       
@@ -1011,6 +1012,10 @@ var vm = new Vue({
                     _this.$toast('认领成功！')
                     _this.$emit('updatelist', true)
                     callback && callback()
+                  } else {
+                    if (r.error_msg) {
+                        toastFn(r.error_msg, 2000)
+                    }
                   }
                 }
               })

src/web/templates/pc/entsearchindex.html

@@ -125,6 +125,9 @@
                 top: 5px;
                 opacity: 0;
             }
+            .tab-cgdw {
+                display: none;
+            }
         </style>
 	</head>
 
@@ -181,7 +184,7 @@
                         <el-tabs v-model="tabActive">
                             <el-tab-pane label="招标搜索" name="zb"></el-tab-pane>
                             <el-tab-pane label="企业搜索" name="qy"></el-tab-pane>
-                            <el-tab-pane label="采购单位搜索" name="cgdw" v-show="industryShow"></el-tab-pane>
+                            <el-tab-pane label="采购单位搜索" name="cgdw"></el-tab-pane>
                         </el-tabs>
                     </div>
                 </div>