Domů Procházet Nápověda
Registrovat se Přihlásit se
xiuli.gao
/
playlet
Sledovat 1
Oblíbit 0
Rozštěpit 0

3 Revize 2ba8ea7bc5 ... ca8c81fe2b

Autor SHA1 Zpráva Datum
  zhengxy ca8c81fe2b build: PC %!s(int64=7) %!d(string=před) měsíci
  zhengxy f0168af991 build: PC %!s(int64=7) %!d(string=před) měsíci
  zhengxy 3244f191b9 feat: 客户群发 - 多企微标签 %!s(int64=7) %!d(string=před) měsíci
27 změnil soubory, kde provedl 173 přidání a 72 odebrání
Jednotný pohled Ukázat statistiku rozdílových dat
  1. 1 1
      index.html
  2. 0 3
      project/src/components/assembly/screen/customerServiceCorp.vue
  3. 39 10
      project/src/components/assembly/screen/enterpriseTag.vue
  4. 86 10
      project/src/components/customOperate/createMassMsg.vue
  5. 33 24
      project/src/components/customOperate/massMsgDetail/index.vue
  6. 0 1
      project/src/components/dataBoard/sendData/khqf.vue
  7. 0 1
      project/src/components/dataBoard/sendData/khqqf.vue
  8. 0 1
      project/src/components/dataBoard/sendData/znqf.vue
  9. 0 4
      project/src/components/welcomeGroup/detail.vue
  10. 0 3
      project/src/components/welcomeGroup/index.vue
  11. 1 1
      static/css/app.4dc0f7c85d73201a2089135be6560587.css
  12. 2 2
      static/js/0.542b30f7250656307c6c.js
  13. 1 0
      static/js/18.46c751fca9d2e5083a33.js
  14. 0 1
      static/js/18.74463c93886f8ede41f7.js
  15. 1 0
      static/js/34.b58f95b2c4aeae44e9a9.js
  16. 1 1
      static/js/34.7596de1bf20a9a05278d.js
  17. 0 1
      static/js/35.cf3bb78301cc47f29a4f.js
  18. 0 1
      static/js/53.6e50428fdd93d55cd91b.js
  19. 1 1
      static/js/54.a459417d7b0589311788.js
  20. 1 1
      static/js/55.48267e0d336f9bfcfbdd.js
  21. 1 1
      static/js/56.6599c18103d1d009472e.js
  22. 1 1
      static/js/57.14d5048510d645a37c3e.js
  23. 1 0
      static/js/57.0ab60cecb9a1875c2a1e.js
  24. 0 1
      static/js/6.00e48f6387b2fed2b2c8.js
  25. 1 0
      static/js/6.85504740d1426d273da9.js
  26. 1 1
      static/js/app.73a8a1aac6ee8612f755.js
  27. 1 1
      static/js/manifest.4ef729e5beb7f679902e.js

+ 1 - 1
index.html
Zobrazit soubor

7 
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
 7 
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 
         var s = document.getElementsByTagName("script")[0];
 8 
         var s = document.getElementsByTagName("script")[0];
9 
         s.parentNode.insertBefore(hm, s);
 9 
         s.parentNode.insertBefore(hm, s);
10 
-      })();</script><link href=./static/css/app.4dc0f7c85d73201a2089135be6560587.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4ef729e5beb7f679902e.js></script><script type=text/javascript src=./static/js/app.73a8a1aac6ee8612f755.js></script></body></html>
10 
+      })();</script><link href=./static/css/app.7a16a90fab7404bb27dab0ee34fbe833.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d235d63a3d9573c9c779.js></script><script type=text/javascript src=./static/js/app.d01917c18b5392e82556.js></script></body></html>

+ 0 - 3
project/src/components/assembly/screen/customerServiceCorp.vue
Zobrazit soubor

175 
         let final_result = JSON.parse(JSON.stringify(selectUser))
 175 
         let final_result = JSON.parse(JSON.stringify(selectUser))
176 
         let tmp = {};
 176 
         let tmp = {};
177 
         final_result = final_result.reduce((list, item) => {
 177 
         final_result = final_result.reduce((list, item) => {
178 
-          console.log('isUniqueUserid => ', isUniqueUserid)
179 
           if (isUniqueUserid) {
 178 
           if (isUniqueUserid) {
180 
             tmp[item.user_id] ? '' : (tmp[item.user_id] = list.push(item));
 179 
             tmp[item.user_id] ? '' : (tmp[item.user_id] = list.push(item));
181 
           } else {
 180 
           } else {
324 
         let brr = user_arr.user_list[user_index]
 323 
         let brr = user_arr.user_list[user_index]
325 
         if (brr.is_select) {
 324 
         if (brr.is_select) {
326 
           selectUser = selectUser.filter((v) => {
 325 
           selectUser = selectUser.filter((v) => {
327 
-            console.log('isUniqueUserid => ', isUniqueUserid)
328 
             if (isUniqueUserid) {
 326 
             if (isUniqueUserid) {
329 
               return v.user_id != brr.user_id
 327 
               return v.user_id != brr.user_id
330 
             } else {
 328 
             } else {
339 
       // 去重
 337 
       // 去重
340 
       let tmp = {};
 338 
       let tmp = {};
341 
       selectUser = selectUser.reduce((list, item) => {
 339 
       selectUser = selectUser.reduce((list, item) => {
342 
-        console.log('isUniqueUserid => ', isUniqueUserid)
343 
         if (isUniqueUserid) {
 340 
         if (isUniqueUserid) {
344 
           tmp[item.user_id] ? '' : (tmp[item.user_id] = list.push(item));
 341 
           tmp[item.user_id] ? '' : (tmp[item.user_id] = list.push(item));
345 
         } else {
 342 
         } else {

+ 39 - 10
project/src/components/assembly/screen/enterpriseTag.vue
Zobrazit soubor

81 
     disabled: {
 81 
     disabled: {
82 
       type: Boolean,
 82 
       type: Boolean,
83 
       default: false
 83 
       default: false
84 
-    }
84 
+    },
85 
+    isTagName: {
86 
+      type: Boolean,
87 
+      default: false,
88 
+    },
85 
   },
 89 
   },
86 
   watch: {
 90 
   watch: {
87 
     reset () {
 91 
     reset () {
196 
           this.old_tag_list = res.rst;
 200 
           this.old_tag_list = res.rst;
197 
           this.tagList = res.rst;
 201 
           this.tagList = res.rst;
198 
           // 回显
 202 
           // 回显
199 
-          let arr = [];
200 
-          this.tagList.forEach((item) => {
201 
-            item.tag_list.forEach((it) => {
202 
-              if (this.tag_id_list.indexOf(it.tag_id) != -1) {
203 
-                arr.push(it.tag_name)
204 
-              }
203 
+          if (this.isTagName) { // 按标签name回显
204 
+            let arr = [];
205 
+            this.tagList.forEach((item) => {
206 
+              item.tag_list.forEach((it) => {
207 
+                if (this.tag_id_list.indexOf(it.tag_name) != -1) {
208 
+                  arr.push(it.tag_name)
209 
+                }
210 
+              })
205 
             })
 211 
             })
206 
-          })
207 
-          this.tag_name_list = arr;
208 
-          this.oldObj.tag_name_list = arr;
212 
+            this.tag_name_list = arr;
213 
+            this.oldObj.tag_name_list = arr;
214 
+
215 
+            // 根据标签name 反查出标签id
216 
+            let idArr = []
217 
+            this.tagList.forEach((item) => {
218 
+              item.tag_list.forEach((it) => {
219 
+                if (this.tag_name_list.indexOf(it.tag_name) != -1) {
220 
+                  idArr.push(it.tag_id)
221 
+                }
222 
+              })
223 
+            })
224 
+            this.tag_id_list = idArr
225 
+            this.oldObj.tag_id_list = idArr
226 
+          } else { // 默认按标签id回显
227 
+            let arr = [];
228 
+            this.tagList.forEach((item) => {
229 
+              item.tag_list.forEach((it) => {
230 
+                if (this.tag_id_list.indexOf(it.tag_id) != -1) {
231 
+                  arr.push(it.tag_name)
232 
+                }
233 
+              })
234 
+            })
235 
+            this.tag_name_list = arr;
236 
+            this.oldObj.tag_name_list = arr;
237 
+          }
209 
         } else if (res.errno != 4002) {
 238 
         } else if (res.errno != 4002) {
210 
           this.$message({
 239 
           this.$message({
211 
             message: res.err,
 240 
             message: res.err,

+ 86 - 10
project/src/components/customOperate/createMassMsg.vue
Zobrazit soubor

67 
             <el-radio v-model="customer_filter" :disabled="!editFlag" :label="0" @change="changeEvent">全部客户</el-radio>
 67 
             <el-radio v-model="customer_filter" :disabled="!editFlag" :label="0" @change="changeEvent">全部客户</el-radio>
68 
             <el-radio v-model="customer_filter" :disabled="!editFlag" :label="1" @change="changeEvent">筛选客户</el-radio>
 68 
             <el-radio v-model="customer_filter" :disabled="!editFlag" :label="1" @change="changeEvent">筛选客户</el-radio>
69 
           </div>
 69 
           </div>
70 
-          <div class="screeningCustomers" v-if="customer_filter == 1">
70 
+          <div class="screeningCustomers" v-show="customer_filter == 1">
71 
             <div class="screeningItem">
 71 
             <div class="screeningItem">
72 
               <label>性别：</label>
 72 
               <label>性别：</label>
73 
               <el-checkbox-group class="checkboxGroup" v-model="gender" :disabled="!editFlag" @change="changeEvent">
 73 
               <el-checkbox-group class="checkboxGroup" v-model="gender" :disabled="!editFlag" @change="changeEvent">
108 
               </div>
 108 
               </div>
109 
             </div>
 109 
             </div>
110
110
111 
-            <!-- S 标签相关 单主体模式时显示 -->
112 
-            <div v-show="operate_type == 1" class="screeningItem">
111 
+            <!-- S 标签相关 单主体模式时传id 多主体模式时传name -->
112 
+            <div class="screeningItem">
113 
               <label>标签：</label>
 113 
               <label>标签：</label>
114 
-              <enterprise-tag title="" width="355px" :disabled="!editFlag" :afferent_obj='afferent_tag_obj' :reset='resetFlag' @tagDefine="tagDefine" style="margin:0" />
114 
+              <enterprise-tag :isTagName="isTagName" title="" width="355px" :disabled="!editFlag" :afferent_obj='afferent_tag_obj' :reset='resetFlag' @tagDefine="tagDefine" style="margin:0" />
115 
             </div>
 115 
             </div>
116 
-            <div v-show="operate_type == 1" class="screeningItem" style="align-items: flex-start;">
116 
+            <div class="screeningItem" style="align-items: flex-start;">
117 
               <label>排除客户：</label>
 117 
               <label>排除客户：</label>
118 
               <div style="flex:1">
 118 
               <div style="flex:1">
119 
-                <enterprise-tag title="" width="355px" :disabled="!editFlag" :afferent_obj='afferent_exclude_tag_obj' :excludeFlag="true" :reset='resetFlag' @tagDefine="exclude_tagDefine" style="margin:0" />
119 
+                <enterprise-tag :isTagName="isTagName" title="" width="355px" :disabled="!editFlag" :afferent_obj='afferent_exclude_tag_obj' :excludeFlag="true" :reset='resetFlag' @tagDefine="exclude_tagDefine" style="margin:0" />
120 
                 <p class="screening-hint">可根据标签选择客户，群发时将不会发送给该标签内的客户。若选择了排除的客户，需要较长时间创建本条群发消息哦～</p>
 120 
                 <p class="screening-hint">可根据标签选择客户，群发时将不会发送给该标签内的客户。若选择了排除的客户，需要较长时间创建本条群发消息哦～</p>
121 
               </div>
 121 
               </div>
122 
             </div>
 122 
             </div>
251 
       name: '',//群发标题
 251 
       name: '',//群发标题
252 
       tag_info: {},//标签
 252 
       tag_info: {},//标签
253 
       exclude_tag_info: {},//排除标签
 253 
       exclude_tag_info: {},//排除标签
254 
+      isTagName: false,
254 
       is_for_all: 1,
 255 
       is_for_all: 1,
255 
       user_id_list: [],
 256 
       user_id_list: [],
256 
       customerMatchCountLoading: false,
 257 
       customerMatchCountLoading: false,
313 
           }
 314 
           }
314 
           this.isLookCount = false;
 315 
           this.isLookCount = false;
315 
           this.gender = res.rst.gender ? res.rst.gender.split(',') : [];
 316 
           this.gender = res.rst.gender ? res.rst.gender.split(',') : [];
317 
+          this.isTagName = res.rst.operate_type == 2
316 
           this.afferent_tag_obj = {
 318 
           this.afferent_tag_obj = {
319 
+            tag_name_list: res.rst.tag_list ? res.rst.tag_list.split(',') : [],
317 
             tag_id_list: res.rst.tag_list ? res.rst.tag_list.split(',') : [],
 320 
             tag_id_list: res.rst.tag_list ? res.rst.tag_list.split(',') : [],
318 
             tag: res.rst.tag_screen_type
 321 
             tag: res.rst.tag_screen_type
319 
           }
 322 
           }
320 
           this.afferent_exclude_tag_obj.tag_id_list = res.rst.exclude_tag_list ? res.rst.exclude_tag_list.split(',') : [];
 323 
           this.afferent_exclude_tag_obj.tag_id_list = res.rst.exclude_tag_list ? res.rst.exclude_tag_list.split(',') : [];
324 
+          this.afferent_exclude_tag_obj.tag_name_list = res.rst.exclude_tag_list ? res.rst.exclude_tag_list.split(',') : [];
321
325
322 
           // this.tag_info = this.afferent_tag_obj;
 326 
           // this.tag_info = this.afferent_tag_obj;
323 
           this.tag_info = {
 327 
           this.tag_info = {
326 
           }
 330 
           }
327
331
328 
           this.exclude_tag_info = this.afferent_exclude_tag_obj
 332 
           this.exclude_tag_info = this.afferent_exclude_tag_obj
333 
+          if(this.isTagName && (res.rst.tag_list || res.rst.exclude_tag_list)) { // 根据标签名 反差标签id
334 
+            this.handleSetTagIdInfo()
335 
+          } else if (!this.isTagName && (res.rst.tag_list || res.rst.exclude_tag_list)) { // 根据标签id 反差标签名
336 
+            this.handleSetTagNameInfo()
337 
+          }
338 
+
329 
           this.send_type = res.rst.send_type;
 339 
           this.send_type = res.rst.send_type;
330 
           this.send_type == 2 ? this.send_time = {
 340 
           this.send_type == 2 ? this.send_time = {
331 
             date: res.rst.send_time.split(' ')[0],
 341 
             date: res.rst.send_time.split(' ')[0],
463 
         })
 473 
         })
464 
         return
 474 
         return
465 
       }
 475 
       }
466 
-      this.$loading(this.$loadingConfig)
467 
       let params = {
 476 
       let params = {
468 
         rule_id: this.is_copy ? '' : this.rule_id ? this.rule_id : '',
 477 
         rule_id: this.is_copy ? '' : this.rule_id ? this.rule_id : '',
469 
         name: this.name,
 478 
         name: this.name,
496 
         params.add_time_end = this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[1] : '';
 505 
         params.add_time_end = this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[1] : '';
497 
       }
 506 
       }
498
507
499 
-      if (this.operate_type == 1) { // 单主体支持标签 多主体不支持
508 
+      if (this.operate_type == 1) { // 单主体支持标签 传标签id
500 
         params.tag_screen_type = this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0
 509 
         params.tag_screen_type = this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0
501 
         params.tag_list = this.tag_info && this.tag_info.tag_id_list ? this.tag_info.tag_id_list.join(',') : ''
 510 
         params.tag_list = this.tag_info && this.tag_info.tag_id_list ? this.tag_info.tag_id_list.join(',') : ''
502 
         params.exclude_tag_list = this.exclude_tag_info && this.exclude_tag_info.tag_id_list ? this.exclude_tag_info.tag_id_list.join(',') : ''
 511 
         params.exclude_tag_list = this.exclude_tag_info && this.exclude_tag_info.tag_id_list ? this.exclude_tag_info.tag_id_list.join(',') : ''
512 
+      } else if (this.operate_type == 2) { // 多主体 传标签name
513 
+        params.tag_screen_type = this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0
514 
+        params.tag_list = this.tag_info && this.tag_info.tag_name_list ? this.tag_info.tag_name_list.join(',') : ''
515 
+        params.exclude_tag_list = this.exclude_tag_info && this.exclude_tag_info.tag_name_list ? this.exclude_tag_info.tag_name_list.join(',') : ''
503 
       }
 516 
       }
504 
-
517 
+      this.$loading(this.$loadingConfig)
505 
       this.$axios.post(this.URL.BASEURL + this.URL.massMsg_set, params).then((res) => {
 518 
       this.$axios.post(this.URL.BASEURL + this.URL.massMsg_set, params).then((res) => {
506 
         var res = res.data
 519 
         var res = res.data
507 
         this.$loading(this.$loadingConfig).close()
 520 
         this.$loading(this.$loadingConfig).close()
535 
       if (data.tag == 1 || data.tag == 2) {
 548 
       if (data.tag == 1 || data.tag == 2) {
536 
         if (data.tag_id_list && data.tag_id_list.length != 0) {
 549 
         if (data.tag_id_list && data.tag_id_list.length != 0) {
537 
           this.tag_info = {
 550 
           this.tag_info = {
551 
+            tag_name_list: data.tag_name_list,
538 
             tag_id_list: data.tag_id_list,
 552 
             tag_id_list: data.tag_id_list,
539 
             tag_type: data.tag
 553 
             tag_type: data.tag
540 
           }
 554 
           }
541 
         } else {
 555 
         } else {
542 
           this.tag_info = {
 556 
           this.tag_info = {
557 
+            tag_name_list: [],
543 
             tag_id_list: [],
 558 
             tag_id_list: [],
544 
             tag_type: 0
 559 
             tag_type: 0
545 
           }
 560 
           }
546 
         }
 561 
         }
547 
       } else {
 562 
       } else {
548 
         this.tag_info = {
 563 
         this.tag_info = {
564 
+          tag_name_list: [],
549 
           tag_id_list: [],
 565 
           tag_id_list: [],
550 
           tag_type: data.tag
 566 
           tag_type: data.tag
551 
         }
 567 
         }
556 
       if (data.tag == 1 || data.tag == 2) {
 572 
       if (data.tag == 1 || data.tag == 2) {
557 
         if (data.tag_id_list && data.tag_id_list.length != 0) {
 573 
         if (data.tag_id_list && data.tag_id_list.length != 0) {
558 
           this.exclude_tag_info = {
 574 
           this.exclude_tag_info = {
575 
+            tag_name_list: data.tag_name_list,
559 
             tag_id_list: data.tag_id_list,
 576 
             tag_id_list: data.tag_id_list,
560 
             tag_type: data.tag
 577 
             tag_type: data.tag
561 
           }
 578 
           }
562 
         } else {
 579 
         } else {
563 
           this.exclude_tag_info = {
 580 
           this.exclude_tag_info = {
581 
+            tag_name_list: [],
564 
             tag_id_list: [],
 582 
             tag_id_list: [],
565 
             tag_type: 0
 583 
             tag_type: 0
566 
           }
 584 
           }
567 
         }
 585 
         }
568 
       } else {
 586 
       } else {
569 
         this.exclude_tag_info = {
 587 
         this.exclude_tag_info = {
588 
+          tag_name_list: [],
570 
           tag_id_list: [],
 589 
           tag_id_list: [],
571 
           tag_type: data.tag
 590 
           tag_type: data.tag
572 
         }
 591 
         }
596 
       }
 615 
       }
597 
       if (this.customer_filter == 1) {//筛选客户
 616 
       if (this.customer_filter == 1) {//筛选客户
598 
         params.gender = this.gender && this.gender.join(',');
 617 
         params.gender = this.gender && this.gender.join(',');
599 
-        if (this.operate_type == 1) { // 单主体支持标签 多主体不支持
618 
+        if (this.operate_type == 1) { // 单主体支持标签 传标签id
600 
           params.tag_screen_type = this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0;
 619 
           params.tag_screen_type = this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0;
601 
           params.tag_list = this.tag_info && this.tag_info.tag_id_list ? this.tag_info.tag_id_list.join(',') : '';
 620 
           params.tag_list = this.tag_info && this.tag_info.tag_id_list ? this.tag_info.tag_id_list.join(',') : '';
602 
           params.exclude_tag_list = this.exclude_tag_info && this.exclude_tag_info.tag_id_list ? this.exclude_tag_info.tag_id_list.join(',') : '';
 621 
           params.exclude_tag_list = this.exclude_tag_info && this.exclude_tag_info.tag_id_list ? this.exclude_tag_info.tag_id_list.join(',') : '';
622 
+        } else if (this.operate_type == 2) { // 多主体标签 传标签name
623 
+          params.tag_screen_type = this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0;
624 
+          params.tag_list = this.tag_info && this.tag_info.tag_name_list ? this.tag_info.tag_name_list.join(',') : '';
625 
+          params.exclude_tag_list = this.exclude_tag_info && this.exclude_tag_info.tag_name_list ? this.exclude_tag_info.tag_name_list.join(',') : '';
603 
         }
 626 
         }
604 
         params.pay_status = this.payInfo.pay_status || this.payInfo.pay_status == 0 ? this.payInfo.pay_status : '';
 627 
         params.pay_status = this.payInfo.pay_status || this.payInfo.pay_status == 0 ? this.payInfo.pay_status : '';
605 
         params.pay_num_min = this.payInfo.pay_num_min || this.payInfo.pay_num_min == 0 ? this.payInfo.pay_num_min : '';
 628 
         params.pay_num_min = this.payInfo.pay_num_min || this.payInfo.pay_num_min == 0 ? this.payInfo.pay_num_min : '';
676 
       // }
 699 
       // }
677 
       this.changeEvent()
 700 
       this.changeEvent()
678 
     },
 701 
     },
702 
+
703 
+    handleSetTagIdInfo() {
704 
+      this.$axios.get(this.URL.BASEURL + this.URL.tagList, {}).then((res) => {
705 
+        var res = res.data
706 
+        if (res && res.errno == 0) {
707 
+          const allTagList = res.rst;
708 
+          const tagIdArr = []
709 
+          const tagIdArrExclude = []
710 
+          allTagList.forEach(allTag => {
711 
+            allTag.tag_list.forEach(tag => {
712 
+              const res = this.tag_info.tag_name_list.find(item => item === tag.tag_name)
713 
+              if (res) tagIdArr.push(tag.tag_id)
714 
+              const resExclude = this.exclude_tag_info.tag_name_list.find(item => item === tag.tag_name)
715 
+              if (resExclude) tagIdArrExclude.push(tag.tag_id)
716 
+            })
717 
+          })
718 
+          this.tag_info.tag_id_list = [...tagIdArr]
719 
+          this.exclude_tag_info.tag_id_list = [...tagIdArrExclude]
720 
+        } else if (res.errno != 4002) {
721 
+          this.$message({
722 
+            message: res.err,
723 
+            type: "warning"
724 
+          })
725 
+        }
726 
+      }).catch((err) => {
727 
+      });
728 
+    },
729 
+    handleSetTagNameInfo() {
730 
+      this.$axios.get(this.URL.BASEURL + this.URL.tagList, {}).then((res) => {
731 
+        var res = res.data
732 
+        if (res && res.errno == 0) {
733 
+          const allTagList = res.rst;
734 
+          const tagNameArr = []
735 
+          const tagNameArrExclude = []
736 
+          allTagList.forEach(allTag => {
737 
+            allTag.tag_list.forEach(tag => {
738 
+              const res = this.tag_info.tag_id_list.find(item => item === tag.tag_id)
739 
+              if (res) tagNameArr.push(tag.tag_name)
740 
+              const resExclude = this.exclude_tag_info.tag_id_list.find(item => item === tag.tag_id)
741 
+              if (resExclude) tagNameArrExclude.push(tag.tag_name)
742 
+            })
743 
+          })
744 
+          this.tag_info.tag_name_list = [...tagNameArr]
745 
+          this.exclude_tag_info.tag_name_list = [...tagNameArrExclude]
746 
+        } else if (res.errno != 4002) {
747 
+          this.$message({
748 
+            message: res.err,
749 
+            type: "warning"
750 
+          })
751 
+        }
752 
+      }).catch((err) => {
753 
+      });
754 
+    },
679 
   }
 755 
   }
680 
 }
 756 
 }
681 
 </script>
 757 
 </script>

+ 33 - 24
project/src/components/customOperate/massMsgDetail/index.vue
Zobrazit soubor

202
202
203 
     async handleGetTagInfo({ tag_screen_type, tag_list, exclude_tag_list }) {
 203 
     async handleGetTagInfo({ tag_screen_type, tag_list, exclude_tag_list }) {
204 
       return new Promise(async (resolve, reject) => {
 204 
       return new Promise(async (resolve, reject) => {
205 
-        const tempList = await this.handleGetTagOptions()
206 
-        const tagOptions = []
207 
-        tempList.forEach(t => {
208 
-          t.tag_list.forEach(tag => {
209 
-            tagOptions.push(tag)
205 
+        const { operate_type } = this.dataInfo
206 
+        if (operate_type == 1) { // 单企微标签
207 
+          const tempList = await this.handleGetTagOptions()
208 
+          const tagOptions = []
209 
+          tempList.forEach(t => {
210 
+            t.tag_list.forEach(tag => {
211 
+              tagOptions.push(tag)
212 
+            })
210 
           })
 213 
           })
211 
-        })
212
214
213 
-        const tag_list_res = []
214 
-        if (tag_list && tag_list.length) {
215 
-          tag_list.split(',').forEach(t => {
216 
-            const isFound = tagOptions.find(tag => tag.tag_id === t)
217 
-            if (isFound) tag_list_res.push(isFound.tag_name)
218 
-          })
219 
-        }
215 
+          const tag_list_res = []
216 
+          if (tag_list && tag_list.length) {
217 
+            tag_list.split(',').forEach(t => {
218 
+              const isFound = tagOptions.find(tag => tag.tag_id === t)
219 
+              if (isFound) tag_list_res.push(isFound.tag_name)
220 
+            })
221 
+          }
220
222
221 
-        const exclude_tag_list_res = []
222 
-        if (exclude_tag_list && exclude_tag_list) {
223 
-          exclude_tag_list.split(',').forEach(t => {
224 
-            const isFound = tagOptions.find(tag => tag.tag_id === t)
225 
-            if (isFound) exclude_tag_list_res.push(isFound.tag_name)
223 
+          const exclude_tag_list_res = []
224 
+          if (exclude_tag_list && exclude_tag_list) {
225 
+            exclude_tag_list.split(',').forEach(t => {
226 
+              const isFound = tagOptions.find(tag => tag.tag_id === t)
227 
+              if (isFound) exclude_tag_list_res.push(isFound.tag_name)
228 
+            })
229 
+          }
230 
+
231 
+          resolve({
232 
+            tag_screen_type: tagScreenTypeOptions[tag_screen_type],
233 
+            tag_list: tag_list_res,
234 
+            exclude_tag_list: exclude_tag_list_res,
235 
+          })
236 
+        } else if (operate_type == 2) { // 多企微标签 - 直接返回接口数据
237 
+          resolve({
238 
+            tag_screen_type: tagScreenTypeOptions[tag_screen_type],
239 
+            tag_list: (tag_list && tag_list.length) ? tag_list.split(',') : [],
240 
+            exclude_tag_list: (exclude_tag_list && exclude_tag_list.length) ? exclude_tag_list.split(',') : [],
226 
           })
 241 
           })
227 
         }
 242 
         }
228 
-
229 
-        resolve({
230 
-          tag_screen_type: tagScreenTypeOptions[tag_screen_type],
231 
-          tag_list: tag_list_res,
232 
-          exclude_tag_list: exclude_tag_list_res,
233 
-        })
234 
       })
 243 
       })
235 
     },
 244 
     },
236 
     handleGetTagOptions() {
 245 
     handleGetTagOptions() {

+ 0 - 1
project/src/components/dataBoard/sendData/khqf.vue
Zobrazit soubor

256 
           var res = res.data;
 256 
           var res = res.data;
257 
           this.loading = false;
 257 
           this.loading = false;
258 
           if (res && res.errno == 0) {
 258 
           if (res && res.errno == 0) {
259 
-            console.log("res => ", res);
260 
             if (res.rst.data.total) {
 259 
             if (res.rst.data.total) {
261 
               // 汇总数据
 260 
               // 汇总数据
262 
               this.dataInfo = res.rst.data.total;
 261 
               this.dataInfo = res.rst.data.total;

+ 0 - 1
project/src/components/dataBoard/sendData/khqqf.vue
Zobrazit soubor

257 
           var res = res.data;
 257 
           var res = res.data;
258 
           this.loading = false;
 258 
           this.loading = false;
259 
           if (res && res.errno == 0) {
 259 
           if (res && res.errno == 0) {
260 
-            console.log("res => ", res);
261 
             if (res.rst.data.total) {
 260 
             if (res.rst.data.total) {
262 
               // 汇总数据
 261 
               // 汇总数据
263 
               this.dataInfo = res.rst.data.total;
 262 
               this.dataInfo = res.rst.data.total;

+ 0 - 1
project/src/components/dataBoard/sendData/znqf.vue
Zobrazit soubor

245 
           var res = res.data;
 245 
           var res = res.data;
246 
           this.loading = false;
 246 
           this.loading = false;
247 
           if (res && res.errno == 0) {
 247 
           if (res && res.errno == 0) {
248 
-            console.log("res => ", res);
249 
             if (res.rst.data.total) {
 248 
             if (res.rst.data.total) {
250 
               // 汇总数据
 249 
               // 汇总数据
251 
               this.dataInfo = res.rst.data.total;
 250 
               this.dataInfo = res.rst.data.total;

+ 0 - 4
project/src/components/welcomeGroup/detail.vue
Zobrazit soubor

70 
         var res = res.data
 70 
         var res = res.data
71 
         this.loading = false
 71 
         this.loading = false
72 
         if (res && res.errno == 0) {
 72 
         if (res && res.errno == 0) {
73 
-          console.log('res.rst => ', res.rst)
74 
           this.dataInfo = res.rst;
 73 
           this.dataInfo = res.rst;
75 
           this.name = res.rst.name;
 74 
           this.name = res.rst.name;
76 
           // S 坑：部分浏览器不支持 replaceAll 方法
 75 
           // S 坑：部分浏览器不支持 replaceAll 方法
129 
             ]
 128 
             ]
130 
           }
 129 
           }
131
130
132 
-          console.log('this.attachments => ', this.attachments)
133
131
134 
         } else if (res.errno != 4002) {
 132 
         } else if (res.errno != 4002) {
135 
           this.$message({
 133 
           this.$message({
210 
         content: this.content,
 208 
         content: this.content,
211 
       }
 209 
       }
212
210
213 
-      console.log('this.attachments => ', JSON.parse(JSON.stringify(this.attachments)))
214 
       if (this.attachments[0].msgtype === 'image') {
 211 
       if (this.attachments[0].msgtype === 'image') {
215 
         params.attachments = {
 212 
         params.attachments = {
216 
           "image": {
 213 
           "image": {
246 
         }
 243 
         }
247 
       }
 244 
       }
248 
       params.attachments = JSON.stringify(params.attachments)
 245 
       params.attachments = JSON.stringify(params.attachments)
249 
-      console.log('params => ', JSON.parse(JSON.stringify(params)))
250 
       this.$loading(this.$loadingConfig)
 246 
       this.$loading(this.$loadingConfig)
251 
       this.$axios.post(this.URL.BASEURL + this.URL.welcomeGroup_set, params).then((res) => {
 247 
       this.$axios.post(this.URL.BASEURL + this.URL.welcomeGroup_set, params).then((res) => {
252 
         var res = res.data
 248 
         var res = res.data

+ 0 - 3
project/src/components/welcomeGroup/index.vue
Zobrazit soubor

227
227
228 
     // 监听点击“新建配置”
 228 
     // 监听点击“新建配置”
229 
     onClickCreateBtn() {
 229 
     onClickCreateBtn() {
230 
-      console.log("onClickCreateBtn => ");
231 
       this.crtTemplateId = ''
 230 
       this.crtTemplateId = ''
232 
       this.detailVisible = true
 231 
       this.detailVisible = true
233 
     },
 232 
     },
234 
     // 监听点击“编辑配置”
 233 
     // 监听点击“编辑配置”
235 
     onClickEditBtn(row) {
 234 
     onClickEditBtn(row) {
236 
-      console.log("onClickEditBtn => row ", JSON.parse(JSON.stringify(row)));
237 
       this.crtTemplateId = row.template_id
 235 
       this.crtTemplateId = row.template_id
238 
       this.detailVisible = true
 236 
       this.detailVisible = true
239 
     },
 237 
     },
240 
     detailClose({ isEdit }) {
 238 
     detailClose({ isEdit }) {
241 
-      console.log('detailClose => ', )
242 
       this.crtTemplateId = ''
 239 
       this.crtTemplateId = ''
243 
       this.detailVisible = false
 240 
       this.detailVisible = false
244 
       if (!isEdit) {
 241 
       if (!isEdit) {

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


File diff suppressed because it is too large
+ 2 - 2
static/js/0.542b30f7250656307c6c.js


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


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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/34.7596de1bf20a9a05278d.js


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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/54.a459417d7b0589311788.js


File diff suppressed because it is too large
+ 1 - 1
static/js/55.48267e0d336f9bfcfbdd.js


File diff suppressed because it is too large
+ 1 - 1
static/js/56.6599c18103d1d009472e.js


File diff suppressed because it is too large
+ 1 - 1
static/js/57.14d5048510d645a37c3e.js


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


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


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


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


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