调整我的欢迎语，部门欢迎语

src/views/qw/friendWelcome/deptFriendWelcome.vue

@@ -66,6 +66,8 @@
 
 
     <el-table v-loading="loading" :data="friendWelcomeList" @selection-change="handleSelectionChange" border>
+      <el-table-column label="id" align="center" prop="id" width="180"/>
+      <el-table-column label="标题" align="center" prop="welcomeTitle"/>
       <el-table-column label="消息内容" align="left" prop="welcomeText"  width="400px" >
         <template slot-scope="scope">
           <span style="color:rgb(19, 154, 50);" v-if="scope.row.isDayparting==='1'">[共 {{JSON.parse(scope.row.daypartingItemlist).length+1}} 时段]</span>
@@ -160,6 +162,16 @@
               </el-tag>
             </div>
           </el-form-item>
+          <!-- 新增整体标题 -->
+          <el-form-item label="标题：" prop="welcomeTitle">
+            <el-input v-model="form.welcomeTitle" placeholder="请输入欢迎语标题"/>
+            <el-alert style="margin-top: 8px;height: 30px"
+                      title="此标题仅用于欢迎语的用途区分"
+                      type="info"
+                      :closable="false"
+                      show-icon>
+            </el-alert>
+          </el-form-item>
           <el-form-item label="是否发送欢迎语">
             <el-switch
               v-model="form.isSendMsg"
@@ -731,7 +743,7 @@ export default {
     //选择群发的企业成员账号
     handlelistUser(){
       setTimeout(() => {
-        this.$refs.QwUserList.getDetails(this.queryParams.corpId);
+        this.$refs.QwUserList.getDetails(this.queryParams.corpId,"2");
       }, 1);
       this.listUser.title="选择企业成员"
       this.listUser.open=true;

src/views/qw/friendWelcome/myWelcome.vue

@@ -66,6 +66,8 @@
 
 
     <el-table v-loading="loading" :data="friendWelcomeList" @selection-change="handleSelectionChange" border>
+      <el-table-column label="id" align="center" prop="id" width="180"/>
+      <el-table-column label="标题" align="center" prop="welcomeTitle"/>
       <el-table-column label="消息内容" align="left" prop="welcomeText"  width="400px" >
         <template slot-scope="scope">
           <span style="color:rgb(19, 154, 50);" v-if="scope.row.isDayparting==='1'">[共 {{JSON.parse(scope.row.daypartingItemlist).length+1}} 时段]</span>
@@ -138,7 +140,6 @@
           </el-alert>
         </div>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-
           <el-form-item label="选择使用成员：" prop="qwUserIds" style="margin-top: 2%">
             <div>
               <el-button
@@ -160,6 +161,16 @@
               </el-tag>
             </div>
           </el-form-item>
+          <!-- 新增整体标题 -->
+          <el-form-item label="标题：" prop="welcomeTitle">
+            <el-input v-model="form.welcomeTitle" placeholder="请输入欢迎语标题"/>
+            <el-alert style="margin-top: 8px;height: 30px"
+                      title="此标题仅用于欢迎语的用途区分"
+                      type="info"
+                      :closable="false"
+                      show-icon>
+            </el-alert>
+          </el-form-item>
           <el-form-item label="是否发送欢迎语">
             <el-switch
               v-model="form.isSendMsg"
@@ -731,7 +742,7 @@ export default {
     //选择群发的企业成员账号
     handlelistUser(){
       setTimeout(() => {
-        this.$refs.QwUserList.getDetails(this.queryParams.corpId);
+        this.$refs.QwUserList.getDetails(this.queryParams.corpId,"1");
       }, 1);
       this.listUser.title="选择企业成员"
       this.listUser.open=true;

src/views/qw/user/qwUserList.vue

@@ -102,7 +102,7 @@ export default {
   },
   methods: {
 
-    getDetails(corpId,type,sendType){
+    getDetails(corpId,isRemark,type,sendType){
       this.type=type;
       this.sendType=sendType;
       if (type!=null&&sendType!=null){
@@ -110,6 +110,7 @@ export default {
         this.queryParams.sendType=sendType;
       }
       this.queryParams.corpId=corpId;
+      this.queryParams.isRemark=isRemark;
       this.getList();
     },
     /** 查询企微用户列表 */