Merge branch 'feature/2月迭代' into dev

src/views/enterprise/salutatory.vue

@@ -54,16 +54,16 @@
           <el-table-column prop="operatorName" label="操作人" width="120" show-overflow-tooltip> </el-table-column>
           <el-table-column prop="suitDepartmentName" label="适用范围" min-width="80">
             <template slot-scope="{ row }">
-              <el-popover placement="top-start" trigger="hover" v-if="row.suitDepartmentName.join(',').length > 40">
+              <el-popover placement="top-start" trigger="hover" v-if="row.suitDepartmentName.join('，').length > 40">
                 <div class="popoverBox">
-                  {{ row.suitDepartmentName.join(',') }}
+                  {{ row.suitDepartmentName.join('，') }}
                 </div>
                 <div slot="reference">
-                  {{ row.suitDepartmentName.join(',').slice(0, 40) + '...' }}
+                  {{ row.suitDepartmentName.join('，').slice(0, 40) + '...' }}
                 </div>
               </el-popover>
               <div v-else>
-                {{ row.suitDepartmentName.join(',') }}
+                {{ row.suitDepartmentName.join('，') }}
               </div>
             </template>
           </el-table-column>

src/views/enterprise/salutatorySet.vue

@@ -141,7 +141,7 @@
         <div class="scopeBox">
           <div class="left">
             <el-input placeholder="请输入部门名称" maxlength="50" v-model="filterText" style="width: 398px;" clearable @clear="handlefilterTextClear" @keyup.native="value => toInput(value, searchInput)"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
-            <el-tree v-loading="loading" ref="tree" :data="treeData" :check-on-click-node="true" show-checkbox node-key="departmentId" :props="defaultProps" :expand-on-click-node="false" class="tree" @check-change="handleCheckChange" @check="handleCheck">
+            <el-tree v-loading="loading" ref="tree" :data="treeData" :check-on-click-node="true" show-checkbox node-key="departmentId" :props="defaultProps" :expand-on-click-node="false" class="tree" :render-after-expand="false" @check-change="handleCheckChange" @check="handleCheck">
               <span class="custom-tree-node" slot-scope="{ node }">
                 <span class="font-14  color-2f54eb opacity80 iconfont-hb3  iconqiye-tianchong"></span>
                 <span>{{ node.label }}</span>