Browse Source

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

zhengxy 1 year ago
parent
commit
084c2fe024

+ 8 - 1
project/src/components/assembly/screen/channelV2.vue

505
         this.options = [
505
         this.options = [
506
           ...licenseTaskStatusOptions
506
           ...licenseTaskStatusOptions
507
         ]
507
         ]
508
-      } else {
508
+      } else if (this.type == 'enableStatus') { // 启用 禁用
509
+        this.options = [
510
+          { key: 1, val: '启用' },
511
+          { key: 0, val: '禁用' },
512
+        ]
513
+        this.placeholderVal = '请选择'
514
+      }
515
+      else {
509
         this.init()
516
         this.init()
510
       }
517
       }
511
     },
518
     },

+ 1 - 1
project/src/components/feedback/index.vue

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

+ 16 - 2
project/src/components/manage/InviteIntoGroup/deviceBind/index.vue

2
   <div v-loading="loading">
2
   <div v-loading="loading">
3
     <div class="screenBox" style="align-items: center;padding-right:16px">
3
     <div class="screenBox" style="align-items: center;padding-right:16px">
4
       <div class="flex-align-center" style="flex:1">
4
       <div class="flex-align-center" style="flex:1">
5
-        <selfInputV2 style="margin-left: -20px;"  :labelWidth="true" v-model="keyword" label_name="标题" placeholder="请输入" @change="onChangeKeyword" />
5
+        <selfInputV2 style="width: auto;margin-left:-20px;" :labelWidth="true" v-model="keyword" label_name="标题" placeholder="请输入" @change="onChangeKeyword" />
6
+        <!-- 关联客服 -->
7
+        <serviceSingle style="width: auto;" title="关联客服" placeholder="请选择" @customerDefine="onChangeUser" />
6
       </div>
8
       </div>
7
       <el-button type="primary" size="mini" @click="onClickBind">设备绑定</el-button>
9
       <el-button type="primary" size="mini" @click="onClickBind">设备绑定</el-button>
8
     </div>
10
     </div>
40
 </template>
42
 </template>
41
 <script>
43
 <script>
42
 import selfInputV2 from '@/components/assembly/screen/inputV2.vue'
44
 import selfInputV2 from '@/components/assembly/screen/inputV2.vue'
45
+import serviceSingle from '@/components/assembly/screen/serviceSingle.vue'
43
 import deviceBindDialog from './deviceBindDialog.vue'
46
 import deviceBindDialog from './deviceBindDialog.vue'
47
+
44
 export default {
48
 export default {
45
-  components: { selfInputV2, deviceBindDialog, },
49
+  components: {
50
+    serviceSingle,
51
+    selfInputV2,
52
+    deviceBindDialog,
53
+  },
46
   data () {
54
   data () {
47
     return {
55
     return {
48
       bindDialogVisible: false,
56
       bindDialogVisible: false,
55
       height: '',
63
       height: '',
56
       currentDeviceId: '',
64
       currentDeviceId: '',
57
       keyword: '',
65
       keyword: '',
66
+      user_id: '',
58
     }
67
     }
59
   },
68
   },
60
   created () {
69
   created () {
85
       this.keyword = val
94
       this.keyword = val
86
       this.init(1)
95
       this.init(1)
87
     },
96
     },
97
+    onChangeUser(val) {
98
+      this.user_id = val ? val.user_id : ''
99
+      this.init(1)
100
+    },
88
     // 获取列表数据
101
     // 获取列表数据
89
     async init (page, type) {
102
     async init (page, type) {
90
       if (type != 'export') {
103
       if (type != 'export') {
103
         const url = `${this.URL.BASEURL}${this.URL.deviceBind_deviceList}`
116
         const url = `${this.URL.BASEURL}${this.URL.deviceBind_deviceList}`
104
         const params = {
117
         const params = {
105
           keyword: this.keyword,
118
           keyword: this.keyword,
119
+          user_id: this.user_id,
106
           page: type == 'export' ? 1 : this.page,
120
           page: type == 'export' ? 1 : this.page,
107
           page_size: type == 'export' ? this.$store.state.exportNumber : this.page_size,
121
           page_size: type == 'export' ? this.$store.state.exportNumber : this.page_size,
108
         }
122
         }

+ 27 - 6
project/src/components/manage/InviteIntoGroup/inviteRuleList.vue

3
     <div class="screenBox" style="align-items: center;padding-right:16px">
3
     <div class="screenBox" style="align-items: center;padding-right:16px">
4
       <div class="flex-align-center" style="flex:1">
4
       <div class="flex-align-center" style="flex:1">
5
         <!-- 搜索配置 -->
5
         <!-- 搜索配置 -->
6
-        <self-input label_name='关键词'
7
-                    :hasLabel="false"
8
-                    :noMarLeft="true"
9
-                    @inputChange='(val)=>{keyword = val;init(1)}'></self-input>
6
+        <self-input style="width: auto;" label_name='关键词' :hasLabel="false" :noMarLeft="true" @inputChange='(val)=>{keyword = val;init(1)}' />
7
+        <!-- 关联客服 -->
8
+        <serviceSingle style="width: auto;" title="关联客服" placeholder="请选择" @customerDefine="onChangeUser" />
9
+        <!-- 状态 -->
10
+        <selfChannelV2 v-model="status" type="enableStatus" title="规则状态" :labelWidth="true" @change="onChangeStatus" />
10
       </div>
11
       </div>
11
       <el-button type="primary" size="mini" @click="createdMassMsg">新建配置</el-button>
12
       <el-button type="primary" size="mini" @click="createdMassMsg">新建配置</el-button>
12
     </div>
13
     </div>
62
 <script>
63
 <script>
63
 import createData from './createData.vue'
64
 import createData from './createData.vue'
64
 import selfInput from '@/components/assembly/screen/input.vue'
65
 import selfInput from '@/components/assembly/screen/input.vue'
66
+import serviceSingle from '@/components/assembly/screen/serviceSingle.vue'
67
+import selfChannelV2 from '@/components/assembly/screen/channelV2.vue'
68
+
65
 export default {
69
 export default {
66
-  components: { selfInput,createData },
70
+  components: {
71
+    selfInput,
72
+    createData,
73
+    serviceSingle,
74
+    selfChannelV2,
75
+  },
67
   data () {
76
   data () {
68
     return {
77
     return {
69
       massMsgFlag: false,
78
       massMsgFlag: false,
76
       height: '',
85
       height: '',
77
       detail_rule_id: '',
86
       detail_rule_id: '',
78
       keyword:'',
87
       keyword:'',
88
+      user_id: '',
89
+      status: '',
79
     }
90
     }
80
   },
91
   },
81
   created () {
92
   created () {
174
         params: {
185
         params: {
175
           page: type == 'export' ? 1 : this.page,
186
           page: type == 'export' ? 1 : this.page,
176
           page_size: type == 'export' ? this.$store.state.exportNumber : this.page_size,
187
           page_size: type == 'export' ? this.$store.state.exportNumber : this.page_size,
177
-          keyword: this.keyword
188
+          keyword: this.keyword,
189
+          user_id: this.user_id,
190
+          status: this.status,
178
         }
191
         }
179
       }).then((res) => {
192
       }).then((res) => {
180
         var res = res.data
193
         var res = res.data
200
     handleCurrentChange (val) {
213
     handleCurrentChange (val) {
201
       this.init(val)
214
       this.init(val)
202
     },
215
     },
216
+    onChangeUser(val) {
217
+      this.user_id = val ? val.user_id : ''
218
+      this.init(1)
219
+    },
220
+    onChangeStatus(val) {
221
+      this.status = val
222
+      this.init(1)
223
+    },
203
     exportEvent (data) {
224
     exportEvent (data) {
204
       let list = data;
225
       let list = data;
205
       let tHeader = ['标题', '创建人', '拉群类型', '规则状态']
226
       let tHeader = ['标题', '创建人', '拉群类型', '规则状态']