feat: 智能推送 - 推送分组 - 单企微新增"企微主体"选项

project/src/components/assembly/screen/selectCorp.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="common-screen-item">
-    <label class="common-screen-label">{{ labelName }}</label>
+    <label v-if="labelName" class="common-screen-label">{{ labelName }}</label>
     <!-- 系统管理员 -->
-    <el-cascader v-if="isSuperManage" v-model="system_enterprise_res" size="small" :options="enterpriseList" :props="{value:'self_id',label:'self_name',children:'manage_corp_list'}" @change="onChangeCorpidSystem" clearable filterable :placeholder="placeholder" class="select-cls cascader" />
+    <el-cascader v-if="isSuperManage" v-model="system_enterprise_res" size="small" :options="enterpriseList" :props="{value:'self_id',label:'self_name',children:'manage_corp_list'}" @change="onChangeCorpidSystem" :clearable="clearable" filterable :placeholder="placeholder" class="select-cls cascader" :style="{width: width ? width + 'px' : '210px'}" />
     <!-- 非系统管理员 -->
-    <el-select v-else v-model="enterprise_res" size="small" filterable :placeholder="placeholder" @change="onChangeCorpid" clearable class="select-cls">
+    <el-select v-else v-model="enterprise_res" size="small" filterable :placeholder="placeholder" @change="onChangeCorpid" :clearable="clearable" class="select-cls" :style="{width: width ? width + 'px' : '210px'}">
       <el-option v-for="(item, index) in enterpriseList" :key="index+'enterpriseList'" :label="item.corp_name?item.corp_name:item.corp_full_name?item.corp_full_name:item.corpid" :value="item.corpid" />
     </el-select>
   </div>
@@ -25,6 +25,14 @@ export default {
       type: String,
       default: () => '请选择'
     },
+    width: {
+      type: Number | String,
+      default: () => '',
+    },
+    clearable: {
+      type: Boolean,
+      default: () => true
+    },
   },
   data() {
     return {
@@ -125,7 +133,7 @@ export default {
 <style lang="scss" scoped>
 .select-cls {
   /deep/ .el-input__inner {
-    width: 210px;
+    width: 100%;
   }
   /deep/ &.el-select .el-input.is-focus .el-input__inner,
   /deep/ &.el-select .el-input__inner:focus,

project/src/components/smartPushV3/pushGroupDialog.vue

@@ -14,7 +14,8 @@
         <span class="lable required">分组名称</span>
         <el-input v-model="form.title" size="small" placeholder="请输入" />
       </div>
-      <!-- S 分组名称 -->
+      <!-- E 分组名称 -->
+
       <!-- S 选择模式 -->
       <div class="form-item">
         <span class="lable required">选择模式:</span>
@@ -24,6 +25,16 @@
         </div>
       </div>
       <!-- E 选择模式 -->
+
+      <!-- S 企微主体 - 单个企微主体 模式 -->
+      <div v-show="form.operate_type == 1" class="form-item">
+        <span class="lable required">企微主体:</span>
+        <div class="flex-align-center">
+          <selfSelectCorp v-model="form.corpid" :labelName="''" :width="300" :clearable="false" @change="onChangeCorpid" />
+        </div>
+      </div>
+      <!-- E 企微主体 - 单个企微主体 模式 -->
+
       <!-- S 使用员工 - 单个企微主体 模式 -->
       <div v-show="form.operate_type == 1" class="form-item flex-align-start">
         <span class="lable required">使用员工:</span>
@@ -36,7 +47,7 @@
             v-if="form.is_all == 0"
             title='' width="300px"
             :afferent_users='form.user_id_list'
-            :corpid="customerserviceCorpid"
+            :corpid="form.corpid"
             @customerDefine="(val) => { form.user_id_list = val; }"
           />
         </div>
@@ -71,10 +82,11 @@ import selfChannel from '@/components/assembly/screen/channel.vue'
 import selfCustomerservice from '@/components/assembly/screen/customerService.vue'
 import customerServiceCorpV2 from '@/components/assembly/screen/customerServiceCorpV2.vue'
 import { isJSON } from '@/assets/js/common'
+import selfSelectCorp from '@/components/assembly/screen/selectCorp.vue'
 
 export default {
   name: "pushGroupDialog",
-  components: { selfChannel, selfCustomerservice, customerServiceCorpV2 },
+  components: { selfChannel, selfCustomerservice, customerServiceCorpV2, selfSelectCorp },
   props: {
     // 控制弹框是否显示
     dialogVisible: {
@@ -93,7 +105,6 @@ export default {
     return {
       loading: false,
       isShowForm: false,
-      customerserviceCorpid: '',
       form: {
         title: '',
         is_all: 1, // 使用员工：1全部员工 0部分员工
@@ -103,6 +114,8 @@ export default {
         operator_group_id: '', // 运营组id
         afferent_multiple_senders: [], // 多个主体时选择的客服成员 [{ user_id: 888, corpid: 666 }]
         multiple_senders: [], // 多个主体时选择的客服成员结果
+
+        corpid: '', // 单企微模式传用户选择的企微，多企微模式不传(默认传全局缓存的数据)
       }
     }
   },
@@ -141,6 +154,11 @@ export default {
           operator_group_id: (operate_type == 2 && is_operation == 1) ? operator_group_id : '',
           multiple_senders: (operate_type == 2 && is_operation == 0 && multiple_senders.length) ? JSON.stringify(multiple_senders) : '',
         }
+
+        if (operate_type == 1) { // 单企微模式传用户选择的企微id，多企微模式默认传全局缓存的数据
+          params.corpid = this.form.corpid
+        }
+
         this.loading = true
         const { data: res = {} } = await this.$axios.post(url, params)
         if (res && res.errno == 0) {
@@ -163,10 +181,14 @@ export default {
     // 执行表单校验
     handleFormValidate() {
       return new Promise((resolve, reject) => {
-        const { title, operate_type, is_all, user_id_list, is_operation, operator_group_id, multiple_senders } = this.form
+        const { title, operate_type, is_all, user_id_list, is_operation, operator_group_id, multiple_senders, corpid } = this.form
         if (!title) {
           this.$message.warning('请输入分组名称')
           reject('表单校验未通过')
+        } else if ((operate_type == 1) && (!corpid || corpid == '')) {
+          // 单主体判空
+          this.$message.warning('请选择企微主体')
+          reject('表单校验未通过')
         } else if ((operate_type == 1) && (is_all == 0) && (!user_id_list || !user_id_list.length)) {
           // 单主体判空
           this.$message.warning('请选择使用员工！')
@@ -202,6 +224,7 @@ export default {
       this.form.operator_group_id = ''
       this.form.afferent_multiple_senders = []
       this.form.multiple_senders = []
+      this.form.corpid = ''
     },
 
     // 监听运营组选择
@@ -219,6 +242,15 @@ export default {
       }
     },
 
+    // 监听企微主体筛选变化
+    async onChangeCorpid(corp) {
+      console.log('corp => ', corp)
+      this.form.user_id_list = []
+      this.loading = true
+      await this.$nextTick()
+      this.loading = false
+    },
+
     async handleGetGroupDetail() {
       try {
         const url = `${this.URL.BASEURL}${this.URL.smartPushV3_groupDetail}`
@@ -237,7 +269,7 @@ export default {
           if (this.form.operate_type == 1) { // 单企微字段回显
             this.form.user_id_list = (detailInfo.senders && !isJSON(detailInfo.senders)) ? detailInfo.senders.split(',') : [];
             this.form.is_all = (detailInfo.is_all || detailInfo.is_all === 0) ? detailInfo.is_all : 1
-            this.customerserviceCorpid = detailInfo.corpid
+            this.form.corpid = detailInfo.corpid
           }
 
           if (this.form.operate_type == 2) { // 多企微字段回显
@@ -260,7 +292,6 @@ export default {
               })
               this.form.afferent_multiple_senders = [...arr]
             }
-            this.customerserviceCorpid = ''
           }
 
           this.isShowForm = true