Merge branch 'mergeBranch' into redUrgent

src/HManagement/marketing2/saler/area/modules/areaListNew.vue

@@ -5,23 +5,28 @@
         width="400"
         trigger="click"
         v-model="visible">
-      <el-tree
-          :data="areaList"
-          node-key="id"
-          default-expand-all
-          highlight-current
-          :expand-on-click-node="false"
-          @node-click="nodeClick"
-      >
+      <div style="overflow: auto;max-height: 550px">
+        <el-tree
+            :data="areaList"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            :expand-on-click-node="false"
+            @node-click="nodeClick"
+        >
                   <span class="custom-tree-node" slot-scope="{ node, data }">
                     <span>{{ node.label }}</span>
                     <span>
 <!--                      <el-button size="small" type="text" @click="selectArea(data,visible=false)" v-if="data.areaname === pointValue" style="color: #FFFFFF">选 择</el-button>-->
-                      <el-button size="small" type="text" @click="selectArea(data,visible=false)" >选 择</el-button>
+<!--                      <el-button size="small" type="text" @click="selectArea(data,visible=false)" >选 择</el-button>-->
+                       <el-button size="small" type="text" @click="selectArea(data,visible=false)" v-if="data.sa_saleareaid === pointValue" style="color: #FFFFFF">选 择</el-button>
+                        <el-button size="small" type="text" @click="selectArea(data,visible=false)" v-else >选 择</el-button>
                     </span>
                   </span>
-      </el-tree>
-            <el-input slot="reference" v-model="areaname" readonly placeholder="请选择" autocomplete="off" @focus="onClick"></el-input>
+        </el-tree>
+
+      </div>
+      <el-input slot="reference" v-model="areaname" readonly placeholder="请选择" autocomplete="off" @focus="onClick"></el-input>
     </el-popover>
   </div>
 </template>
@@ -44,12 +49,10 @@ export default {
   },
   methods:{
     onClick(){
-      console.log('点击')
       this.listData()
     },
     async listData(){
       const res = await this.$api.requested(this.param)
-      console.log(res.data,'区域列表')
       this.areaList = this.createMenu(res.data)
       this.$emit('areaList',res.data)
     },
@@ -79,10 +82,9 @@ export default {
       return arr
     },
     nodeClick(val){
-      this.pointValue = val.areaname
+      this.pointValue = val.sa_saleareaid
     },
     selectArea(data){
-      console.log(data,'选择区域')
       this.$emit('selectArea',data)
     }
   },