feat: 智能推送 - 推送分组 - "新建分组"逻辑

project/src/components/smartPushV3/detailList.vue

@@ -23,6 +23,7 @@
         </div>
       </div>
       <div class="flex">
+        <el-button type="primary" size="mini" @click="onClickCreatedRule">新建智能推送</el-button>
         <el-button type="primary" plain size="mini" @click="onClickBatchGroup">批量设置分组</el-button>
         <el-button type="primary" plain size="mini" @click="init(1,'export')">导出Excel</el-button>
       </div>
@@ -170,6 +171,12 @@ export default {
       }
       this.massMsgFlag = false
     },
+    // 监听点击"新建智能推送"规则
+    onClickCreatedRule () {
+      this.detail_rule_id = ''
+      this.isCopy = false
+      this.massMsgFlag = true
+    },
     // 监听点击"编辑"智能推送规则
     onClickEditRule (data) {
       this.detail_rule_id = data.rule_id;

project/src/components/smartPushV3/pushGroupDialog.vue

@@ -27,7 +27,7 @@
       <!-- S 使用员工 - 单个企微主体 模式 -->
       <div v-show="form.operate_type == 1" class="form-item flex-align-start">
         <span class="lable required">使用员工:</span>
-        <div>
+        <div v-if="!loading">
           <div class="flex-align-center">
             <el-radio v-model="form.is_all" :label="1">全部员工</el-radio>
             <el-radio v-model="form.is_all" :label="0">部分员工</el-radio>
@@ -40,7 +40,7 @@
       <!-- S 使用员工 - 多个企微主体 模式 -->
       <div v-show="form.operate_type == 2" class="form-item flex-align-start">
         <span class="lable required">使用员工:</span>
-        <div>
+        <div v-if="!loading">
           <div class="flex-align-center">
             <el-radio v-model="form.is_operation" :label="1">运营组</el-radio>
             <el-radio v-model="form.is_operation" :label="0">选择成员</el-radio>
@@ -86,6 +86,7 @@ export default {
   data() {
     return {
       loading: false,
+      isShowForm: false,
       form: {
         title: '',
         is_all: 1, // 使用员工：1全部员工 0部分员工
@@ -127,7 +128,7 @@ export default {
           group_id: this.isEdit ? this.groupInfo.group_id : '',
           title,
           operate_type,
-          is_all,
+          is_all: operate_type == 2 ? 0 : is_all, // 多企微时传0
           senders: (operate_type == 1 && is_all == 0) ? user_id_list.join(',') : '',
           is_operation: operate_type == 1 ? 0 : is_operation, // 单主体模式 该字段传0
           operator_group_id: (operate_type == 2 && is_operation == 1) ? operator_group_id : '',
@@ -139,7 +140,7 @@ export default {
         if (res && res.errno == 0) {
           this.$message.success('操作成功')
           this.handleClearFormData()
-          this.$emit('confirm')
+          this.$emit('confirm', { isEdit: this.isEdit })
         } else if (res.errno != 4002) {
           this.$message.warning(res.err || '操作失败')
         }
@@ -221,6 +222,8 @@ export default {
         this.loading = true
         const { data: res = {} } = await this.$axios.get(url, { params })
         if (res && res.errno == 0) {
+          this.isShowForm = false
+
           const detailInfo = res.rst || {}
           this.form.title = detailInfo.title
           this.form.operate_type = detailInfo.operate_type ? detailInfo.operate_type : 1
@@ -251,6 +254,8 @@ export default {
               this.form.afferent_multiple_senders = [...arr]
             }
           }
+
+          this.isShowForm = true
         } else if (res.errno != 4002) {
           this.$message.warning(res.err || '操作失败')
         }

project/src/components/smartPushV3/pushGroupList.vue

@@ -1,11 +1,12 @@
 <template>
   <div v-loading="loading">
-    <div class="screenBox" style="align-items: center;padding-right:16px">
+    <div class="screenBox" style="align-items: center;padding-right:16px;min-width:1120px;">
       <div class="flex-align-center" style="flex:1">
         <datePicker title="创建时间" :reset="resetFlag" @changeTime="onChangeTime" />
         <selfChannel title="创建人" :reset="resetFlag" type="circleCreate" :labelWidth="true" @channelDefine="onChangeCreatorId" />
-        <selfInputV2 v-model="keyword" label_name="搜索" placeholder="请输入" @change="onChangeKeyword" />
+        <selfInputV2 v-model="keyword" label_name="搜索" placeholder="请输入" :labelWidth="true" @change="onChangeKeyword" />
       </div>
+      <el-button type="primary" size="mini" @click="onClickCreateGroup">新建分组</el-button>
       <el-button type="primary" size="mini" @click="onClickCreatedRule">新建智能推送</el-button>
     </div>
     <el-table ref="multipleTable" :height="height" :data="tableData" tooltip-effect="dark" style="width:100%;margin-top:10px;">
@@ -94,6 +95,8 @@ export default {
     this.init(1)
   },
   methods: {
+
+
     detailClose (val) {
       if (val == 'update') {//编辑
         this.init(this.page)
@@ -273,13 +276,22 @@ export default {
       this.$exportOrder({ excelDatas, name: `智能推送-分组列表（导出时间：${this.$getDay(0)}）` })
     },
 
-    // 监听点击"编辑"智能推送规则
+    // 监听点击"新建分组"
+    onClickCreateGroup() {
+      this.currentGroupInfo = {}
+      this.pushGroupVisible = true
+    },
+    // 监听点击"编辑分组"
     onClickEditGroup({ group_id, title }) {
       this.currentGroupInfo = { group_id, title }
       this.pushGroupVisible = true
     },
-    onConfirmGroup() {
-      this.init()
+    onConfirmGroup({ isEdit }) {
+      if (isEdit) {
+        this.init()
+      } else {
+        this.init(1)
+      }
       this.currentGroupInfo = {}
       this.pushGroupVisible = false
     },