Browse Source

feat: 群聊选项列表 - 新增"is_active"

zhengxy 1 year ago
parent
commit
3505a984ab

+ 10 - 1
project/src/components/customOperate/chatGroup/components/chatGroupOptions.vue

@@ -91,6 +91,10 @@ export default {
91 91
       type: Array,
92 92
       default: () => []
93 93
     },
94
+    isOnJobUser: {
95
+      type: Boolean,
96
+      default: () => false
97
+    },
94 98
   },
95 99
   data() {
96 100
     return {
@@ -128,8 +132,13 @@ export default {
128 132
       try {
129 133
         this.loading = true
130 134
         this.chatList = []
135
+        const params = { keyword: this.keyword, owner: this.owner }
136
+        if (this.isOnJobUser) {
137
+          params.is_active = 1
138
+        }
139
+
131 140
         const { data: res = {} } = await this.$axios.get(this.URL.BASEURL + this.URL.groupCode_chatGroupList, {
132
-          params: { keyword: this.keyword, owner: this.owner }
141
+          params,
133 142
         })
134 143
         if (res && res.errno == 0) {
135 144
           this.chatList = res.rst.map(item => ({

+ 1 - 1
project/src/components/customOperate/chatGroup/createMsg.vue

@@ -56,7 +56,7 @@
56 56
             <el-radio v-model="isAllGroupChat" :label="1" :disabled="!editFlag">全部群聊</el-radio>
57 57
             <el-radio v-model="isAllGroupChat" :label="0" :disabled="!editFlag">部分群聊</el-radio>
58 58
           </div> -->
59
-          <chatGroupOptions ref="chatGroupOptions" style="margin-top: 0;" width="300px" :chatListResult="chat_groups" @change="onChangeChatGroup" />
59
+          <chatGroupOptions ref="chatGroupOptions" style="margin-top: 0;" width="300px" :isOnJobUser="true" :chatListResult="chat_groups" @change="onChangeChatGroup" />
60 60
         </div>
61 61
       </div>
62 62
       <!-- E 使用群聊 -->

+ 13 - 5
project/src/components/manage/InviteIntoGroup/chatGroupOptions.vue

@@ -91,6 +91,10 @@ export default {
91 91
       type: Boolean,
92 92
       default: () => false
93 93
     },
94
+    isOnJobUser: {
95
+      type: Boolean,
96
+      default: () => false
97
+    },
94 98
     isDataIdx: { // 是否开启数据索引
95 99
       type: Boolean,
96 100
       default: () => false
@@ -140,12 +144,16 @@ export default {
140 144
       try {
141 145
         this.loading = true
142 146
         this.chatList = []
147
+        const params = {
148
+          keyword: this.keyword,
149
+          owner: this.owner,
150
+          has_room_id: this.isHasRoomId ? true : false,
151
+        }
152
+        if (this.isOnJobUser) {
153
+          params.is_active = 1
154
+        }
143 155
         const { data: res = {} } = await this.$axios.get(this.URL.BASEURL + this.URL.groupCode_chatGroupList, {
144
-          params: {
145
-            keyword: this.keyword,
146
-            owner: this.owner,
147
-            has_room_id: this.isHasRoomId ? true : false,
148
-          }
156
+          params
149 157
         })
150 158
         if (res && res.errno == 0) {
151 159
           this.chatList = res.rst.map(item => ({

+ 1 - 1
project/src/components/manage/InviteIntoGroup/createData.vue

@@ -73,7 +73,7 @@
73 73
       <!-- 选择群聊 -->
74 74
       <div class="regulations">
75 75
         <label><em>*</em>选择群聊:</label>
76
-        <chatGroupOptions ref="chatGroupOptionsMain" width="300px" :isHasRoomId="true" :chatListResult="main_msg_data.chat_group_config" @change="onChangeGlobalChatGroup" />
76
+        <chatGroupOptions ref="chatGroupOptionsMain" width="300px" :isHasRoomId="true" :isOnJobUser="true" :chatListResult="main_msg_data.chat_group_config" @change="onChangeGlobalChatGroup" />
77 77
       </div>
78 78
       <!-- 进群方式 -->
79 79
       <div class="regulations" style="margin-top: 20px;">