feat: 安卓工具配置 - 筛选逻辑

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

@@ -505,7 +505,14 @@ export default {
         this.options = [
           ...licenseTaskStatusOptions
         ]
-      } else {
+      } else if (this.type == 'enableStatus') { // 启用 禁用
+        this.options = [
+          { key: 1, val: '启用' },
+          { key: 0, val: '禁用' },
+        ]
+        this.placeholderVal = '请选择'
+      }
+      else {
         this.init()
       }
     },

project/src/components/feedback/index.vue

@@ -7,7 +7,7 @@
       </div>
       <el-button type="primary" size="mini" @click="onClickGetUserLink">获取反馈链接</el-button>
       <!-- 使用说明 -->
-      <instructions doc="feedback" style="margin-left:20px;"></instructions>
+      <!-- <instructions doc="feedback" style="margin-left:20px;"></instructions> -->
     </div>
     <el-table :height="height" :data="list" tooltip-effect="dark" style="width: 100%;margin-top:10px">
       <el-table-column label="客服" prop="user_name" min-width="160" align="center" fixed="left" />

project/src/components/manage/InviteIntoGroup/deviceBind/index.vue

@@ -2,7 +2,9 @@
   <div v-loading="loading">
     <div class="screenBox" style="align-items: center;padding-right:16px">
       <div class="flex-align-center" style="flex:1">
-        <selfInputV2 style="margin-left: -20px;"  :labelWidth="true" v-model="keyword" label_name="标题" placeholder="请输入" @change="onChangeKeyword" />
+        <selfInputV2 style="width: auto;margin-left:-20px;" :labelWidth="true" v-model="keyword" label_name="标题" placeholder="请输入" @change="onChangeKeyword" />
+        <!-- 关联客服 -->
+        <serviceSingle style="width: auto;" title="关联客服" placeholder="请选择" @customerDefine="onChangeUser" />
       </div>
       <el-button type="primary" size="mini" @click="onClickBind">设备绑定</el-button>
     </div>
@@ -40,9 +42,15 @@
 </template>
 <script>
 import selfInputV2 from '@/components/assembly/screen/inputV2.vue'
+import serviceSingle from '@/components/assembly/screen/serviceSingle.vue'
 import deviceBindDialog from './deviceBindDialog.vue'
+
 export default {
-  components: { selfInputV2, deviceBindDialog, },
+  components: {
+    serviceSingle,
+    selfInputV2,
+    deviceBindDialog,
+  },
   data () {
     return {
       bindDialogVisible: false,
@@ -55,6 +63,7 @@ export default {
       height: '',
       currentDeviceId: '',
       keyword: '',
+      user_id: '',
     }
   },
   created () {
@@ -85,6 +94,10 @@ export default {
       this.keyword = val
       this.init(1)
     },
+    onChangeUser(val) {
+      this.user_id = val ? val.user_id : ''
+      this.init(1)
+    },
     // 获取列表数据
     async init (page, type) {
       if (type != 'export') {
@@ -103,6 +116,7 @@ export default {
         const url = `${this.URL.BASEURL}${this.URL.deviceBind_deviceList}`
         const params = {
           keyword: this.keyword,
+          user_id: this.user_id,
           page: type == 'export' ? 1 : this.page,
           page_size: type == 'export' ? this.$store.state.exportNumber : this.page_size,
         }

project/src/components/manage/InviteIntoGroup/inviteRuleList.vue

@@ -3,10 +3,11 @@
     <div class="screenBox" style="align-items: center;padding-right:16px">
       <div class="flex-align-center" style="flex:1">
         <!-- 搜索配置 -->
-        <self-input label_name='关键词'
-                    :hasLabel="false"
-                    :noMarLeft="true"
-                    @inputChange='(val)=>{keyword = val;init(1)}'></self-input>
+        <self-input style="width: auto;" label_name='关键词' :hasLabel="false" :noMarLeft="true" @inputChange='(val)=>{keyword = val;init(1)}' />
+        <!-- 关联客服 -->
+        <serviceSingle style="width: auto;" title="关联客服" placeholder="请选择" @customerDefine="onChangeUser" />
+        <!-- 状态 -->
+        <selfChannelV2 v-model="status" type="enableStatus" title="规则状态" :labelWidth="true" @change="onChangeStatus" />
       </div>
       <el-button type="primary" size="mini" @click="createdMassMsg">新建配置</el-button>
     </div>
@@ -62,8 +63,16 @@
 <script>
 import createData from './createData.vue'
 import selfInput from '@/components/assembly/screen/input.vue'
+import serviceSingle from '@/components/assembly/screen/serviceSingle.vue'
+import selfChannelV2 from '@/components/assembly/screen/channelV2.vue'
+
 export default {
-  components: { selfInput,createData },
+  components: {
+    selfInput,
+    createData,
+    serviceSingle,
+    selfChannelV2,
+  },
   data () {
     return {
       massMsgFlag: false,
@@ -76,6 +85,8 @@ export default {
       height: '',
       detail_rule_id: '',
       keyword:'',
+      user_id: '',
+      status: '',
     }
   },
   created () {
@@ -174,7 +185,9 @@ export default {
         params: {
           page: type == 'export' ? 1 : this.page,
           page_size: type == 'export' ? this.$store.state.exportNumber : this.page_size,
-          keyword: this.keyword
+          keyword: this.keyword,
+          user_id: this.user_id,
+          status: this.status,
         }
       }).then((res) => {
         var res = res.data
@@ -200,6 +213,14 @@ export default {
     handleCurrentChange (val) {
       this.init(val)
     },
+    onChangeUser(val) {
+      this.user_id = val ? val.user_id : ''
+      this.init(1)
+    },
+    onChangeStatus(val) {
+      this.status = val
+      this.init(1)
+    },
     exportEvent (data) {
       let list = data;
       let tHeader = ['标题', '创建人', '拉群类型', '规则状态']