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

src/views/enterprise/salutatory.vue

@@ -27,13 +27,13 @@
           <el-button type="primary" @click="changeRoute">新建欢迎语</el-button>
         </div>
         <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }">
-          <el-table-column prop="title" label="标题" width="220" show-overflow-tooltip>
+          <el-table-column prop="title" label="标题" width="200" show-overflow-tooltip>
             <template slot-scope="{ row }">{{ row.title }}</template>
           </el-table-column>
-          <el-table-column prop="welcomeContent" label="内容" show-overflow-tooltip>
+          <el-table-column prop="welcomeContent" label="内容" show-overflow-tooltip min-width="200">
             <template slot-scope="{ row }">{{ row.welcomeContent }}</template>
           </el-table-column>
-          <el-table-column label="附件">
+          <el-table-column label="附件" width="200">
             <template slot-scope="{ row }">
               <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">
@@ -52,12 +52,12 @@
             <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="适用范围" min-width="80">
+          <el-table-column prop="suitDepartmentName" label="适用范围" width="300">
             <template slot-scope="{ row }">
-              <div v-if="row.suitDepartmentName.join('，').length > 40">
+              <div class="wrapText" v-if="row.suitDepartmentName.join('，').length > 40">
                 {{ row.suitDepartmentName.join('，').slice(0, 40) + '...' }}
               </div>
-              <div v-else>
+              <div class="wrapText" v-else>
                 {{ row.suitDepartmentName.join('，') }}
               </div>
             </template>
@@ -295,11 +295,7 @@ export default {
 .el-radio + .el-radio {
   margin-left: 0;
 }
-.flexBox {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  .wrapText {
+.wrapText {
   width: 90%;
   text-align: left;
   text-overflow: ellipsis;
@@ -307,7 +303,12 @@ export default {
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   overflow: hidden;
-  }
+}
+.flexBox {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+
   .popverText {
     font-size: 12px;
     width: 90%;

src/views/enterprise/salutatorySet.vue

@@ -70,6 +70,7 @@
             <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;margin-bottom:20px" :loading="submitbtnLoading" @click="submit">保存</el-button>
+          <el-button style="margin-bottom:20px" @click="$router.go(-1)">返回</el-button>
         </el-form>
         <div class="iphone">
           <div class="infoList">