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

src/views/enterprise/salutatory.vue

@@ -35,7 +35,7 @@
           </el-table-column>
           <el-table-column label="附件">
             <template slot-scope="{ row }">
-              <el-popover placement="top-start" trigger="hover">
+              <el-popover placement="top-start" trigger="hover" v-if="row.welcomeMediaList && row.welcomeMediaList.length">
                 <div class="flexBox" v-for="item in row.welcomeMediaList" :key="item.welcomeMediaId">
                   <svg-icon :iconname="iconType[item.mediaType]" size="16" style="margin-right: 13px;"> </svg-icon>
                   <span class="popverText">{{ item.mediaTitle }}</span>
@@ -45,14 +45,27 @@
                   <span class="wrapText"> {{ row.welcomeMediaList[0].mediaTitle }}</span>
                 </div>
               </el-popover>
+              <div v-else>--</div>
             </template>
           </el-table-column>
           <el-table-column prop="updateTime" label="更新时间" width="180" show-overflow-tooltip>
             <template slot-scope="{ row }">{{ row.updateTime | formatTimeStamp }}</template>
           </el-table-column>
           <el-table-column prop="operatorName" label="操作人" width="120" show-overflow-tooltip> </el-table-column>
-          <el-table-column prop="suitDepartmentName" label="适用范围" width="120" show-overflow-tooltip>
-            <template slot-scope="{ row }">{{ row.suitDepartmentName.join(',') }}</template>
+          <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-else>
+                {{ row.suitDepartmentName.join(',') }}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column label="操作" width="180">
             <template slot-scope="{ row }">
@@ -311,4 +324,10 @@ export default {
 .flexBox + .flexBox {
   margin-top: 10px;
 }
+.popoverBox {
+  max-height: 300px;
+  overflow-y: auto;
+  max-width: 500px;
+  line-height: 28px;
+}
 </style>

src/views/enterprise/salutatorySet.vue

@@ -67,7 +67,7 @@
                 <!-- <i class="el-icon-close" style="margin-left: 20px;cursor: pointer;"></i> -->
               </div>
             </div>
-            <span @click="openScopeDialog" class="color-2f54eb cursor-pointer" style="margin-left:8px;"> 请选择使用范围</span>
+            <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="btnLoading" @click="submit">保存</el-button>
         </el-form>
@@ -129,7 +129,7 @@
         <el-form label-position="right" ref="form" :model="{}" label-width="100px" @submit.native.prevent>
           <el-form-item label="链接地址">
             <el-input v-model="url" @keyup.enter.native="addUrl"></el-input>
-            <span class="tips">以http或https开头</span>
+            <span style="font-size:12px;color:#909399;">以http或https开头</span>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -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" show-checkbox node-key="departmentId" :props="defaultProps" :expand-on-click-node="false" class="tree" :check-strictly="false" :render-after-expand="false" @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" @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>
@@ -152,8 +152,7 @@
             <div class="right-top">
               <span>已选：{{ selectedTreeData.length }}个部门</span><span @click="clearAllSelectedData" class="color-2f54eb cursor-pointer">清空</span>
             </div>
-            <el-descriptions v-loading="dialogLoading"> </el-descriptions>
-            <ul v-if="selectedTreeData.length">
+            <ul v-if="selectedTreeData.length" class="right-content">
               <li class="contact-li" v-for="(item, index) in selectedTreeData" :key="index + 'gic'">
                 <div class="li-cell cursor-pointer">
                   <div>
@@ -954,19 +953,31 @@ export default {
       margin-top: 20px;
       height: 454px;
       overflow-y: auto;
+      >>> .el-tree-node__content {
+        height: 32px;
+      }
     }
   }
   .right {
     width: 50%;
     border-left: 1px solid #dcdfe6;
-    padding: 20px 15px;
-    height: 454px;
+    height: 522px;
     overflow-y: auto;
     .right-top {
-      margin-bottom: 15px;
+      padding: 10px 15px;
       display: flex;
       justify-content: space-between;
       color: #303133;
+      position: fixed;
+      box-sizing: border-box;
+      line-height: 20px;
+      z-index: 1000;
+      width: 400px;
+      background: #fff;
+    }
+    .right-content {
+      padding: 40px 15px;
+      overflow-x: auto;
     }
     .contact-li {
       .li-cell {