update: 完成

src/api/api.js

@@ -66,12 +66,12 @@ Vue.axios.interceptors.response.use(
     removePending(data.config); //在一个ajax响应后再执行一下取消操作，把已经完成的请求从pending中移除
     // console.log(data);
     if (data.status && data.status == 200 && data.data.errorCode != 1) {
-      // if (data.data.errorCode == 4) {
-      //   if (window.location.href.indexOf('gic-error') != -1) {
-      //     return false;
-      //   }
-      //   window.location.href = local + '/haoban-3/#/login';
-      // }
+      if (data.data.errorCode == 4) {
+        if (window.location.href.indexOf('gic-error') != -1) {
+          return false;
+        }
+        window.location.href = local + '/haoban-3/#/login';
+      }
 
       if (data.data.errorCode == 10 || data.data.errorCode == 7) {
         window.location.href = local + '/haoban-3/#/index';
@@ -81,14 +81,14 @@ Vue.axios.interceptors.response.use(
     return data;
   },
   err => {
-    // if (err.response.status == 502) {
-    //   window.location.href = local + '/haoban-3/#/login';
-    //   Message.error({ message: '服务异常⊙﹏⊙∥' });
-    // }
-    // if (err.response.status != 403) {
-    //   window.location.href = local + '/haoban-3/#/login';
-    //   Message.error({ message: '登录失效!' });
-    // }
+    if (err.response.status == 502) {
+      window.location.href = local + '/haoban-3/#/login';
+      Message.error({ message: '服务异常⊙﹏⊙∥' });
+    }
+    if (err.response.status != 403) {
+      window.location.href = local + '/haoban-3/#/login';
+      Message.error({ message: '登录失效!' });
+    }
     return Promise.resolve(err);
   }
 );

src/common/js/error.js

@@ -17,10 +17,10 @@ export default {
       local = 'http://www.gicdev.com';
     } */
     if (response.errorCode != 1) {
-      // if (response.errorCode == 4) {
-      //   window.location.href = local + '/haoban-3/#/login';
-      //   return false;
-      // }
+      if (response.errorCode == 4) {
+        window.location.href = local + '/haoban-3/#/login';
+        return false;
+      }
       if (response.errorCode == 10) {
         window.location.href = local + '/haoban-3/#/index';
         return false;

src/components/vue-office-header.vue

@@ -224,7 +224,7 @@ export default {
                   type: 'success'
                 });
                 // 跳转登录页
-                // window.location.href = window.location.origin + '/haoban-3/#/login';
+                window.location.href = window.location.origin + '/haoban-3/#/login';
                 return;
               }
               that.$message.error({

src/views/enterprise/salutatory.vue

@@ -33,7 +33,7 @@
           </el-table-column>
           <el-table-column label="附件">
             <template slot-scope="{ row }">
-              <el-popover placement="top-start" trigger="click">
+              <el-popover placement="top-start" trigger="hover">
                 <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>
@@ -49,7 +49,9 @@
             <template slot-scope="{ row }">{{ row.updateTime }}</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> </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>
           <el-table-column label="操作" width="180">
             <template slot-scope="{ row }">
               <el-button type="text" @click="changeRoute(row)">编辑</el-button>
@@ -59,10 +61,14 @@
         </el-table>
       </div>
     </div>
-    <el-dialog title="加好友配置" :visible.sync="dialogVisible" width="570px" :before-close="handleClose">
-      <el-form label-width="100px">
+    <el-dialog title="加好友配置" :visible.sync="dialogVisible" width="590px" :before-close="handleClose">
+      <span class="tips">好办欢迎语支持文字、图片、视频、文件、链接及小程序</span>
+      <el-form label-width="100px" style="margin-top:20px">
         <el-form-item label="加好友配置">
-          <el-radio :label="Number(key)" v-model="type" v-for="(val, key) in friendSettingTypeOption" :key="key">{{ val }}</el-radio>
+          <div v-for="(val, key) in friendSettingTypeOption" :key="key">
+            <el-radio :label="Number(key)" v-model="type">{{ val }}</el-radio>
+            <el-tag size="small" v-show="key == 1">推荐使用</el-tag>
+          </div>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -98,38 +104,7 @@ export default {
         3: 'iconwenjianleixing-wenjian',
         4: 'iconwenjianleixing-lianjie'
       },
-      tableData: [
-        {
-          title: '华东区欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎语',
-          welcomeContent: '华东区欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎语华东区欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎欢迎语',
-          welcomeMediaList: [
-            {
-              welcomeMediaId: '121',
-              mediaTitle: '图片名称图片名称图片名称图片名称图片名称',
-              mediaType: 1
-            },
-            {
-              welcomeMediaId: '11',
-              mediaTitle: '视频名称视频名称视频名称视频名称视频名称视频名称视频名称视频名称视频名称视频名称',
-              mediaType: 2
-            },
-            {
-              welcomeMediaId: '12',
-              mediaTitle: '文件名称文件名称文件名称文件名称文件名称文件名称文件名称文件名称文件名称文件名称文件名称',
-              mediaType: 3
-            },
-            {
-              welcomeMediaId: '13',
-              mediaTitle: 'http://baidusadsssssssssssssssssssssssssssssssasasa.com',
-              mediaType: 4
-            }
-          ],
-          updateTime: '2021-12-12 12:11:00',
-          operatorName: '稻米',
-          g1: '百度一下你就知道',
-          suitDepartmentName: '华东分部'
-        }
-      ]
+      tableData: []
     };
   },
   mounted() {
@@ -194,7 +169,7 @@ export default {
      * 跳转
      */
     changeRoute(row) {
-      this.$router.push({ path: '/salutatorySet', query: { id: row.welcomeId } });
+      this.$router.push({ path: '/salutatorySet', query: { id: row.welcomeId, type: this.friendSettingType } });
     },
 
     /**
@@ -206,6 +181,14 @@ export default {
           let resData = res.data;
           if (resData.code == 0 && resData.result) {
             this.tableData = resData.result;
+            this.tableData.forEach(item => {
+              item.suitDepartmentName = [];
+              if (item.suitDepartmentList && item.suitDepartmentList.length) {
+                item.suitDepartmentList.forEach(ele => {
+                  item.suitDepartmentName.push(ele.departmentName);
+                });
+              }
+            });
           }
         })
         .catch(error => {
@@ -275,6 +258,9 @@ export default {
     }
   }
 }
+.el-radio {
+  margin-right: 0;
+}
 .el-radio + .el-radio {
   margin-left: 0;
 }