Browse Source

Merge branch master into develop

zhengxy 1 year ago
parent
commit
4268125ecc
32 changed files with 95 additions and 27 deletions
  1. 1 1
      index.html
  2. 1 0
      project/src/components/Index/header.vue
  3. 13 0
      project/src/components/assembly/screen/channel.vue
  4. 13 0
      project/src/components/assembly/screen/channelMultiple.vue
  5. 13 0
      project/src/components/assembly/screen/channelV2.vue
  6. 31 3
      project/src/components/manage/systemMsg.vue
  7. 1 1
      static/css/app.010d6b9653f79644ab23288b4ecfbe73.css
  8. 2 2
      static/js/0.e684351dff0076186deb.js
  9. 1 0
      static/js/11.aa725877257fb3345e54.js
  10. 0 1
      static/js/12.18250565e8fae187e2cc.js
  11. 1 1
      static/js/11.b86d3f6370a5dbc7360f.js
  12. 1 0
      static/js/38.2daf73379a39c910aa44.js
  13. 1 1
      static/js/38.6089eb93fca48ae88e3b.js
  14. 1 1
      static/js/39.7833784a65f0ee025360.js
  15. 1 1
      static/js/40.20003d5c0066fb97f37a.js
  16. 1 1
      static/js/41.b284b72fc4f85baba9aa.js
  17. 1 1
      static/js/42.4151d1504e1aa21819ba.js
  18. 1 1
      static/js/43.d7094d3af714a02d041b.js
  19. 1 1
      static/js/44.52a154d3b675e391cbc0.js
  20. 1 1
      static/js/45.e1035c53f9f1e764bb57.js
  21. 0 1
      static/js/47.021d16f0aa92f778bf78.js
  22. 1 1
      static/js/46.6a579a964304568f5cb6.js
  23. 0 1
      static/js/84.7875ea25b542520c9f97.js
  24. 1 1
      static/js/85.7c36dc8168dd3b60d5ae.js
  25. 1 1
      static/js/86.5d4611c2d85f1048a0f5.js
  26. 1 1
      static/js/87.f79ed858488a4aa63844.js
  27. 1 1
      static/js/88.bbe1fb1ad34bbcae33ae.js
  28. 1 0
      static/js/88.9fd03a9fa820f467473a.js
  29. 1 0
      static/js/9.149ead6962e1985ffe12.js
  30. 0 1
      static/js/9.afc4132ced28715eee46.js
  31. 1 1
      static/js/app.2e73dbd6be2161b32ce3.js
  32. 1 1
      static/js/manifest.1fe52fb2fe1a885a206e.js

+ 1 - 1
index.html

@@ -7,4 +7,4 @@
7 7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 8
         var s = document.getElementsByTagName("script")[0];
9 9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.010d6b9653f79644ab23288b4ecfbe73.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.1fe52fb2fe1a885a206e.js></script><script type=text/javascript src=./static/js/app.2e73dbd6be2161b32ce3.js></script></body></html>
10
+      })();</script><link href=./static/css/app.08c2f4669dc6e6e16fb818b5a6631c4d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.2d457ee27831d7761f7b.js></script><script type=text/javascript src=./static/js/app.faff319472cafd755a22.js></script></body></html>

+ 1 - 0
project/src/components/Index/header.vue

@@ -257,6 +257,7 @@ export default {
257 257
         const params = {
258 258
           sys_group_id,
259 259
           corp_id: '',
260
+          send_status: 1, // 1待发送 2已发送
260 261
           page: 1,
261 262
           page_size: 5,
262 263
         }

+ 13 - 0
project/src/components/assembly/screen/channel.vue

@@ -284,6 +284,19 @@ export default {
284 284
         { key: 0, val: '禁用' },
285 285
       ]
286 286
       this.placeholderVal = '请选择'
287
+    } else if (this.type == 'msgSendStatus') { // 消息提醒-发送状态
288
+      this.options = [
289
+        { key: 1, val: '待发送' },
290
+        { key: 2, val: '已发送' },
291
+      ]
292
+      this.placeholderVal = '发送状态'
293
+    } else if (this.type == 'msgType') { // 消息提醒-消息类型
294
+      this.options = [
295
+        { key: 1, val: '客户群发消息' },
296
+        { key: 2, val: '客户群群发消息' },
297
+        { key: 3, val: '智能群发消息' },
298
+      ]
299
+      this.placeholderVal = '消息类型'
287 300
     } else {
288 301
       this.init()
289 302
     }

+ 13 - 0
project/src/components/assembly/screen/channelMultiple.vue

@@ -264,6 +264,19 @@ export default {
264 264
         { key: 0, val: '禁用' },
265 265
       ]
266 266
       this.placeholderVal = '请选择'
267
+    } else if (this.type == 'msgSendStatus') { // 消息提醒-发送状态
268
+      this.options = [
269
+        { key: 1, val: '待发送' },
270
+        { key: 2, val: '已发送' },
271
+      ]
272
+      this.placeholderVal = '发送状态'
273
+    } else if (this.type == 'msgType') { // 消息提醒-消息类型
274
+      this.options = [
275
+        { key: 1, val: '客户群发消息' },
276
+        { key: 2, val: '客户群群发消息' },
277
+        { key: 3, val: '智能群发消息' },
278
+      ]
279
+      this.placeholderVal = '消息类型'
267 280
     } else {
268 281
       this.init()
269 282
     }

+ 13 - 0
project/src/components/assembly/screen/channelV2.vue

@@ -527,6 +527,19 @@ export default {
527 527
           { key: 0, val: '禁用' },
528 528
         ]
529 529
         this.placeholderVal = '请选择'
530
+      } else if (this.type == 'msgSendStatus') { // 消息提醒-发送状态
531
+        this.options = [
532
+          { key: 1, val: '待发送' },
533
+          { key: 2, val: '已发送' },
534
+        ]
535
+        this.placeholderVal = '发送状态'
536
+      } else if (this.type == 'msgType') { // 消息提醒-消息类型
537
+        this.options = [
538
+          { key: 1, val: '客户群发消息' },
539
+          { key: 2, val: '客户群群发消息' },
540
+          { key: 3, val: '智能群发消息' },
541
+        ]
542
+        this.placeholderVal = '消息类型'
530 543
       } else {
531 544
         this.init()
532 545
       }

+ 31 - 3
project/src/components/manage/systemMsg.vue

@@ -9,6 +9,8 @@
9 9
       <!-- 成员 -->
10 10
       <selfInputV2 style="margin-left: -20px;"  :labelWidth="true" v-model="filter.user_name" label_name="成员" placeholder="请输入" @change="onChangeUserName" />
11 11
       <!-- <selfChannelV2 v-model="filter.platform_id" title="平台" type="platform" labelWidth multiple collapseTags :multipleLimit="3" @change="onChangePlatform" /> -->
12
+      <selfChannelV2 v-model="filter.msg_type" title="消息类型" type="msgType" labelWidth @change="onChangeMsgType" />
13
+      <selfChannelV2 v-model="filter.send_status" title="发送状态" type="msgSendStatus" labelWidth @change="onChangeSendStatus" />
12 14
       <div class="reset" @click="onClickReset">重置</div>
13 15
     </div>
14 16
     <!-- E 筛选区 -->
@@ -25,7 +27,11 @@
25 27
             </div>
26 28
           </template>
27 29
           <template v-slot="{ row }">
28
-            <span>{{ (row[item.column] || row[item.column] == 0) ? $formatNum(row[item.column]) : '-' }}</span>
30
+            <template v-if="item.column == 'send_status_text'">
31
+              <span v-if="row['send_status'] == 1" class="c-FE9">{{ row[item.column] }}</span>
32
+              <span v-else class="c-00b38a">{{ row[item.column] }}</span>
33
+            </template>
34
+            <span v-else>{{ (row[item.column] || row[item.column] == 0) ? $formatNum(row[item.column]) : '-' }}</span>
29 35
           </template>
30 36
         </ux-table-column>
31 37
       </ux-grid>
@@ -41,14 +47,14 @@
41 47
 import selfInputV2 from '@/components/assembly/screen/inputV2.vue'
42 48
 import selfSelectCorp from '@/components/assembly/screen/selectCorp.vue'
43 49
 import datePicker from '@/components/assembly/screen/datePicker.vue'
44
-// import selfChannelV2 from '@/components/assembly/screen/channelV2.vue'
50
+import selfChannelV2 from '@/components/assembly/screen/channelV2.vue'
45 51
 
46 52
 export default {
47 53
   components: {
48 54
     selfInputV2,
49 55
     selfSelectCorp,
50 56
     datePicker,
51
-    // selfChannelV2,
57
+    selfChannelV2,
52 58
   },
53 59
   data() {
54 60
     const DEFAULT_TIME = [this.$getDay(-30, false), this.$getDay(0, false)]
@@ -62,6 +68,8 @@ export default {
62 68
         { column: 'create_time', name: '时间', 'min_width': 140, fixed: 'left', },
63 69
         { column: 'corp_name', name: '企微主体', 'min_width': 200, fixed: '', },
64 70
         { column: 'user_name', name: '成员', 'min_width': 140, fixed: '', },
71
+        { column: 'msg_type_text', name: '消息类型', 'min_width': 140, fixed: '', },
72
+        { column: 'send_status_text', name: '发送状态', 'min_width': 140, fixed: '', },
65 73
         { column: 'notice', name: '消息内容', 'min_width': 400, fixed: '', },
66 74
       ],
67 75
       pagination: {
@@ -76,6 +84,8 @@ export default {
76 84
         corpid: '', // 企微主体
77 85
         user_name: '', // 成员
78 86
         // platform_id: [], // 平台
87
+        send_status: 1,
88
+        msg_type: '',
79 89
       },
80 90
     }
81 91
   },
@@ -97,6 +107,8 @@ export default {
97 107
           end_date: this.filter.time[1],
98 108
           corp_id: this.filter.corpid,
99 109
           user_name: this.filter.user_name,
110
+          send_status: this.filter.send_status,
111
+          msg_type: this.filter.msg_type,
100 112
           // platform_id: this.filter.platform_id,
101 113
           page: this.pagination.page,
102 114
           page_size: this.pagination.page_size,
@@ -152,12 +164,28 @@ export default {
152 164
     //   this.pagination.page = 1
153 165
     //   this.handleGetData()
154 166
     // },
167
+    // 发送状态
168
+    onChangeSendStatus(val) {
169
+      console.log('onChangeSendStatus => ', val)
170
+      this.filter.send_status = val
171
+      this.pagination.page = 1
172
+      this.handleGetData()
173
+    },
174
+    // 消息类型
175
+    onChangeMsgType(val) {
176
+      console.log('onChangeSendStatus => ', val)
177
+      this.filter.msg_type = val
178
+      this.pagination.page = 1
179
+      this.handleGetData()
180
+    },
155 181
     // 监听点击"重置"按钮
156 182
     onClickReset() {
157 183
       this.reset = !this.reset
158 184
       this.filter.time = this.default_time
159 185
       this.filter.corpid = ''
160 186
       this.filter.user_name = ''
187
+      this.filter.send_status = 1
188
+      this.filter.msg_type = ''
161 189
       // this.filter.platform_id = []
162 190
       this.pagination.page = 1
163 191
       this.handleGetData()

File diff suppressed because it is too large
+ 1 - 1
static/css/app.010d6b9653f79644ab23288b4ecfbe73.css


File diff suppressed because it is too large
+ 2 - 2
static/js/0.e684351dff0076186deb.js


File diff suppressed because it is too large
+ 1 - 0
static/js/11.aa725877257fb3345e54.js


File diff suppressed because it is too large
+ 0 - 1
static/js/12.18250565e8fae187e2cc.js


File diff suppressed because it is too large
+ 1 - 1
static/js/11.b86d3f6370a5dbc7360f.js


File diff suppressed because it is too large
+ 1 - 0
static/js/38.2daf73379a39c910aa44.js


File diff suppressed because it is too large
+ 1 - 1
static/js/38.6089eb93fca48ae88e3b.js


File diff suppressed because it is too large
+ 1 - 1
static/js/39.7833784a65f0ee025360.js


File diff suppressed because it is too large
+ 1 - 1
static/js/40.20003d5c0066fb97f37a.js


File diff suppressed because it is too large
+ 1 - 1
static/js/41.b284b72fc4f85baba9aa.js


File diff suppressed because it is too large
+ 1 - 1
static/js/42.4151d1504e1aa21819ba.js


File diff suppressed because it is too large
+ 1 - 1
static/js/43.d7094d3af714a02d041b.js


File diff suppressed because it is too large
+ 1 - 1
static/js/44.52a154d3b675e391cbc0.js


File diff suppressed because it is too large
+ 1 - 1
static/js/45.e1035c53f9f1e764bb57.js


File diff suppressed because it is too large
+ 0 - 1
static/js/47.021d16f0aa92f778bf78.js


File diff suppressed because it is too large
+ 1 - 1
static/js/46.6a579a964304568f5cb6.js


File diff suppressed because it is too large
+ 0 - 1
static/js/84.7875ea25b542520c9f97.js


File diff suppressed because it is too large
+ 1 - 1
static/js/85.7c36dc8168dd3b60d5ae.js


File diff suppressed because it is too large
+ 1 - 1
static/js/86.5d4611c2d85f1048a0f5.js


File diff suppressed because it is too large
+ 1 - 1
static/js/87.f79ed858488a4aa63844.js


File diff suppressed because it is too large
+ 1 - 1
static/js/88.bbe1fb1ad34bbcae33ae.js


File diff suppressed because it is too large
+ 1 - 0
static/js/88.9fd03a9fa820f467473a.js


File diff suppressed because it is too large
+ 1 - 0
static/js/9.149ead6962e1985ffe12.js


File diff suppressed because it is too large
+ 0 - 1
static/js/9.afc4132ced28715eee46.js


File diff suppressed because it is too large
+ 1 - 1
static/js/app.2e73dbd6be2161b32ce3.js


File diff suppressed because it is too large
+ 1 - 1
static/js/manifest.1fe52fb2fe1a885a206e.js