Merge branch 'master' into newStyle

src/api/modules/http.js

@@ -683,6 +683,17 @@ export function personalReceptionRecord(query) {
   })
 }
 
+// 获取禁忌执行
+export function findTabooWordsByCusId(query) {
+  return request({
+    url: 'autoSR/customer/findTabooWordsByCusId',
+    method:'get',
+    params:query
+  })
+}
+
+
+
 // 获取系统分析
 export function findCARKeywords(query) {
   return request({

src/views/Receive/index.vue

@@ -615,13 +615,18 @@
           v-if="zhixingcenterindex == 1"
           style="padding: 0px 10px 10px 10px"
         >
-          <div
-            style="margin-top: 10px"
-            v-for="(item, index) in prohibitedlist"
-            :key="index"
-          >
-            {{ index + 1 }}、{{ item }}
-          </div>
+          <template v-if="prohibitedlist.guwen.length > 0">
+						<div style="font-size: 26x;padding: 12px 24px;">顾问</div>
+						<div class="title1-12" v-for="(item,index) in  prohibitedlist.guwen" :key='index'>
+							{{index+1}}、{{item}}
+						</div>
+					</template>
+					<template v-if="prohibitedlist.kehu.length > 0">
+						<div style="font-size: 26px;padding: 12px 24px;">客户</div>
+						<div class="title1-12" v-for="(item,index) in  prohibitedlist.kehu" :key='index'>
+							{{index+1}}、{{item}}
+						</div>
+					</template>
         </div>
         <!-- 需求挖掘 -->
         <div v-if="zhixingcenterindex == 2" class="wajueBox">
@@ -1394,7 +1399,10 @@ export default {
       Getintentionlist: [], //客户意向
       argtextindex: "", //常错词下标
       ratelist: [], //评分集合
-      prohibitedlist: [], //违禁集合
+      prohibitedlist: {
+        guwen: [], // 顾问违禁
+        kehu: [], // 客户违禁
+      }, //违禁集合
       textItself: "", //原词内容
       Acquirecustomerintentlist2: [], //校准列表
       dialogFormtext: false,
@@ -2242,15 +2250,22 @@ export default {
           } else {
             this.kehuyixiangcenterindex = 1;
           }
-
-          this.prohibitedlist = JSON.parse(res.data.sensitiveWords) || [];
           this.findCARKeywords();
           this.findBannedWordsByCusId();
           this.Getsthetransliteratecontent();
           this.marketingBusinessNoApi();
+          this.findTabooWordsByCusId();
         });
     },
+    // 禁忌执行
+    findTabooWordsByCusId() {
+      this.$api.http
+        .findTabooWordsByCusId({ cusId: this.fileId })
+        .then((res) => {
+          this.prohibitedlist = res.data;
+        });
 
+    },
     //常错词确认
     subMsg() {
       if (this.mistakenList.indexOf(this.form.wrongWord) != -1) {