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

src/views/enterprise/salutatory.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="warp">
       <h2>加好友配置</h2>
-      <span class="echoData" v-show="friendSettingType && friendSettingType != 4">{{ echoFriendData }}</span>
+      <span class="echoData" v-show="friendSettingType">{{ echoFriendData }}</span>
       <el-button type="text" style="margin-left: 20px;" @click="openDialog">去配置</el-button>
     </div>
     <div class="daily-set-wrap">
@@ -54,11 +54,16 @@
           <el-table-column prop="operatorName" label="操作人" width="120" show-overflow-tooltip> </el-table-column>
           <el-table-column prop="suitDepartmentName" label="适用范围" width="300">
             <template slot-scope="{ row }">
-              <div class="wrapText" v-if="row.suitDepartmentName.join('，').length > 40">
-                {{ row.suitDepartmentName.join('，').slice(0, 40) + '...' }}
+              <div v-if="row.defaultWelcomeFlag">
+                <div>全体成员</div>
               </div>
-              <div class="wrapText" v-else>
-                {{ row.suitDepartmentName.join('，') }}
+              <div v-else>
+                <div class="wrapText" v-if="row.suitDepartmentName.join('，').length > 40">
+                  {{ row.suitDepartmentName.join('，').slice(0, 40) + '...' }}
+                </div>
+                <div class="wrapText" v-else>
+                  {{ row.suitDepartmentName.join('，') }}
+                </div>
               </div>
             </template>
           </el-table-column>
@@ -102,7 +107,7 @@ export default {
       title: '',
       wxEnterpriseId: localStorage.getItem('userInfos') ? JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId : '',
       friendSettingType: '',
-      type: 2,
+      type: 1,
       friendSettingId: '',
       btnLoading: false,
       dialogVisible: false,
@@ -156,7 +161,7 @@ export default {
         if (resData.code == 0 && resData.result) {
           const { friendSettingId, friendSettingType } = resData.result;
           this.friendSettingId = friendSettingId;
-          this.type = friendSettingType ? friendSettingType : 2;
+          this.type = friendSettingType ? friendSettingType : 1;
           this.friendSettingType = friendSettingType;
         }
       });
@@ -186,7 +191,7 @@ export default {
      * 跳转
      */
     changeRoute(row) {
-      this.$router.push({ path: '/salutatorySet', query: { id: row.welcomeId, type: this.friendSettingType } });
+      this.$router.push({ path: '/salutatorySet', query: { id: row.welcomeId, type: this.friendSettingType, isDefalut: row.defaultWelcomeFlag } });
     },
     remove(row) {
       this.$confirm(' 是否删除本条欢迎语?', '提示', {

src/views/enterprise/salutatorySet.vue

@@ -60,14 +60,22 @@
             </div>
           </el-form-item>
           <el-form-item label="使用范围" required>
-            <div v-show="form.suitDepartmentAddList.length" class="scopeContainer">
-              <div class="wwTag" v-for="item in form.suitDepartmentAddList" :key="item.departmentId">
+            <div v-if="isDefalut" class="scopeContainer">
+              <div class="wwTag">
                 <span class="font-14 color-2f54eb opacity80 iconfont-hb3  iconqiye-tianchong"></span>
-                {{ item.departmentName }}
-                <!-- <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;"> {{ form.suitDepartmentAddList.length ? '修改使用范围' : '请选择使用范围' }}</span>
+            <div v-else>
+              <div v-show="form.suitDepartmentAddList.length" class="scopeContainer">
+                <div class="wwTag" v-for="item in form.suitDepartmentAddList" :key="item.departmentId">
+                  <span class="font-14 color-2f54eb opacity80 iconfont-hb3  iconqiye-tianchong"></span>
+                  {{ item.departmentName }}
+                  <!-- <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;"> {{ form.suitDepartmentAddList.length ? '修改使用范围' : '请选择使用范围' }}</span>
+            </div>
           </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>
@@ -243,7 +251,8 @@ export default {
       submitbtnLoading: false,
       selectedTreeData: [],
       friendSettingType: '',
-      showTree: true
+      showTree: true,
+      isDefalut: 0
     };
   },
   watch: {
@@ -270,7 +279,7 @@ export default {
     const that = this;
     that.$emit('showTab', 4);
     document.documentElement.style.backgroundColor = '#f0f2f5';
-    const { id, type } = this.$route.query;
+    const { id, type, isDefalut } = this.$route.query;
     if (id) {
       that.getData();
     }
@@ -278,6 +287,7 @@ export default {
       this.friendSettingType = type;
       this.getAppData();
     }
+    this.isDefalut = isDefalut;
   },
   destroyed() {
     document.documentElement.style.backgroundColor = '#fff';
@@ -588,7 +598,7 @@ export default {
         });
     },
     submit() {
-      if (!this.form.suitDepartmentAddList.length) {
+      if (!this.isDefalut && !this.form.suitDepartmentAddList.length) {
         this.$message.error('请选择使用范围');
         return;
       }