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

src/views/enterprise/salutatory.vue

@@ -54,14 +54,9 @@
           <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">
-                <div class="popoverBox">
-                  {{ row.suitDepartmentName.join('，') }}
-                </div>
-                <div slot="reference">
-                  {{ row.suitDepartmentName.join('，').slice(0, 40) + '...' }}
-                </div>
-              </el-popover>
+              <div v-if="row.suitDepartmentName.join('，').length > 40">
+                {{ row.suitDepartmentName.join('，').slice(0, 40) + '...' }}
+              </div>
               <div v-else>
                 {{ row.suitDepartmentName.join('，') }}
               </div>

src/views/enterprise/salutatorySet.vue

@@ -69,7 +69,7 @@
             </div>
             <span @click="openScopeDialog" class="color-2f54eb cursor-pointer" style="margin-left:8px;"> {{ form.suitDepartmentAddList.length ? '修改使用范围' : '请选择使用范围' }}</span>
           </el-form-item>
-          <el-button type="primary" style="margin-left:117px;" :loading="submitbtnLoading" @click="submit">保存</el-button>
+          <el-button type="primary" style="margin-left:117px;margin-bottom:20px" :loading="submitbtnLoading" @click="submit">保存</el-button>
         </el-form>
         <div class="iphone">
           <div class="infoList">
@@ -120,7 +120,7 @@
             <el-input v-model="accountName" @keyup.enter.native="addAcountName"></el-input>
           </el-form-item>
         </el-form>
-        <div slot="footer" class="dialog-footer">
+        <div slot="footer" class="">
           <el-button @click="addReplayDialog = false">取消</el-button>
           <el-button type="primary" @click="addAcountName">确定</el-button>
         </div>
@@ -132,7 +132,7 @@
             <span style="font-size:12px;color:#909399;">以http或https开头</span>
           </el-form-item>
         </el-form>
-        <div slot="footer" class="dialog-footer">
+        <div slot="footer" class="">
           <el-button @click="urlDialogVisible = false">取消</el-button>
           <el-button type="primary" @click="addUrl">确认添加</el-button>
         </div>
@@ -328,7 +328,7 @@ export default {
           this.$refs.tree.store._getAllNodes()[0].expanded = true;
         });
         this.selectedTreeData = [];
-      });
+      }, 500);
     },
     handleSelectedDataCancel(item, index) {
       // 删除 右侧 被选中部门树的数据