update: 欢迎语开关

src/views/enterprise/salutatory.vue

@@ -18,13 +18,15 @@
           <p class="left">欢迎语标题 {{ form.title || '系统默认' }}</p>
           <p class="right">
             <span class="date">最近编辑时间：{{ form.updateTime | formatTimeStamp }}</span
-            ><el-button type="text" @click="changeRoute">编辑</el-button>
+            ><el-button type="text" style="margin-right:43px;" @click="changeRoute">编辑</el-button><el-switch v-model="openFlag" :active-value="1" :inactive-value="0" @change="setWelcome"> </el-switch>
           </p>
         </div>
         <p class="line"></p>
         <div class="bottom">
           <el-form label-width="70px" ref="form" :model="form">
-            <el-form-item label="文本内容"> {{ form.welcomeContent || '你好，&lt; 微信昵称 &gt;' }}</el-form-item>
+            <el-form-item label="文本内容"
+              ><p class="welcome-text">{{ form.welcomeContent || '你好，&lt; 微信昵称 &gt;' }}</p></el-form-item
+            >
             <!-- <el-form-item label="附件"></el-form-item> -->
           </el-form>
         </div>
@@ -41,7 +43,8 @@ export default {
   props: {},
   data() {
     return {
-      form: {}
+      form: {},
+      openFlag: 0
     };
   },
   filters: {},
@@ -58,12 +61,41 @@ export default {
      */
     getData() {
       const that = this;
-
       getRequest('/haoban-manage3-web/get-welcome', {})
         .then(res => {
           let resData = res.data;
           if (resData.errorCode == 1 && resData.result) {
             that.form = { ...resData.result };
+            that.openFlag = resData.result.openFlag;
+          }
+          errMsg.errorMsg(resData);
+        })
+        .catch(function(error) {
+          that.$message.error({
+            duration: 1000,
+            message: error.message
+          });
+        });
+    },
+    setWelcome(val) {
+      const that = this;
+      that.$refs.form.validate(value => {
+        if (value) {
+          this.$confirm('是否确定修改欢迎语启用状态？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+            .then(() => {
+              getRequest('/haoban-manage3-web/set-welcome', { openFlag: val })
+                .then(res => {
+                  let resData = res.data;
+                  if (resData.errorCode == 1) {
+                    that.$message.success({
+                      duration: 1000,
+                      message: '设置成功'
+                    });
+                    window.location.reload();
                   }
                   errMsg.errorMsg(resData);
                 })
@@ -73,6 +105,12 @@ export default {
                     message: error.message
                   });
                 });
+            })
+            .catch(() => {
+              that.openFlag = that.openFlag === 1 ? 0 : 1;
+            });
+        }
+      });
     }
   },
   watch: {},
@@ -157,7 +195,7 @@ export default {
   }
 }
 .salutatory-wrap {
-  height: 160px;
+  // height: 160px;
   background: #f5f7fa;
   .top {
     display: flex;
@@ -187,9 +225,8 @@ export default {
     border-style: none none solid none;
   }
   .bottom {
-    padding: 16px 20px 0 29px;
+    padding: 16px 20px 21px 29px;
     .el-form-item {
-      margin-bottom: 13px;
       >>> .el-form-item__label {
         padding: 0;
       }
@@ -203,4 +240,12 @@ export default {
     }
   }
 }
+.welcome-text {
+  text-align: left;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
 </style>

src/views/enterprise/salutatorySet.vue

@@ -13,7 +13,7 @@
                     <img :src="item.gifUrl" alt="" @click="selectEmoji(item)" />
                   </li>
                 </ul>
-                <p slot="reference" style="cursor:pointer;">
+                <p slot="reference" style="cursor:pointer;height:24px;">
                   <svg-icon iconname="iconbiaoqing" size="20"> </svg-icon>
                 </p>
               </el-popover>
@@ -82,7 +82,6 @@ export default {
     submit() {
       const that = this;
       that.$refs.form.validate(value => {
-        console.log(value);
         if (value) {
           this.$confirm('是否保存此欢迎语？', '提示', {
             confirmButtonText: '确定',
@@ -90,9 +89,7 @@ export default {
             type: 'warning'
           })
             .then(() => {
-              const para = {
-                ...that.form
-              };
+              const para = { ...that.form };
               getRequest('/haoban-manage3-web/save-welcome', para)
                 .then(res => {
                   let resData = res.data;