阜外公告信息提醒，点击外呼问卷，在线聊天注释

fuwaiCallCenterWeb.UI/src/api/customer/customerInfoHY.js

@@ -171,3 +171,11 @@ export function getExpireCusInfo(params) {
     params
   })
 }
+// 获取公告信息
+export function getNotice(params) {
+  return request({
+    url: 'messageapi/api/NoticeInfo/getlistsbypage',
+    method: 'get',
+    params
+  })
+}

fuwaiCallCenterWeb.UI/src/api/questionnaire/management.js

@@ -28,6 +28,16 @@ export function getPager(pageid) {
     }
   })
 }
+// 获取外呼前缀
+export function getPhone(phone) {
+  return request({
+    url: 'callcenterapi/api/calloutopt/getcalloutprefix',
+    method: 'get',
+    params: {
+      phone
+    }
+  })
+}
 
 // 获取问卷下拉数据
 export function getPagerSelect() {

fuwaiCallCenterWeb.UI/src/components/TopNotice/index.vue

@@ -1,27 +1,27 @@
 <template>
   <div v-loading="loading" class="topNotice">
     <div class="header">
-      <h5 class="title">最新消息</h5>
+      <h5 class="title">公告消息</h5>
     </div>
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <ul v-if="proNoticeDatas.length" class="content">
         <li v-for="(item, index) in proNoticeDatas" :key="index" class="proitem">
           <h5 class="proname">
-            {{ item.project_name }}
+            标题：{{ item.project_name }}
           </h5>
           <span class="orderendtime">
-            将于 {{ item.orderendtime }} 到期
+            发布时间：{{ item.orderendtime }}
           </span>
         </li>
       </ul>
       <div v-else class="nomsg">
-        没有新消息
+        没有新公告消息
       </div>
     </el-scrollbar>
     <div class="footer_menu">
-      <router-link class="inlineBlock" to="/customer/customerInfoHY">
+      <router-link class="inlineBlock" to="/notice/manage">
         <el-dropdown-item>
-          <i class="el-icon-more"/>更多详细信息
+          <i class="el-icon-more"/>更多公告信息
         </el-dropdown-item>
       </router-link>
     </div>
@@ -30,7 +30,7 @@
 
 <script>
 
-import { getExpireCusInfo } from '@/api/customer/customerInfoHY'
+import { getNotice } from '@/api/customer/customerInfoHY'
 
 export default {
   name: 'TopNotice',
@@ -50,20 +50,20 @@ export default {
       const params = {
         daykind: 0 // 传值0时获取到期前一月的客户信息，传值1获取当天到期的客户信息
       }
-      getExpireCusInfo(params).then(res => {
+      getNotice(params).then(res => {
         this.loading = false
         if (res.state.toLowerCase() === 'success') {
-          if (res.data.data && res.data.data.length) {
+          if (res.data.rows && res.data.rows.length) {
             this.proNoticeDatas = []
-            res.data.data.forEach(item => {
+            res.data.rows.forEach(item => {
               this.proNoticeDatas.unshift({
-                project_name: item.project_name,
-                orderendtime: item.orderendtime
+                project_name: item.title,
+                orderendtime: item.createon
               })
             })
             this.$notify({
-              title: '项目到期提醒',
-              message: `您有${this.proNoticeDatas.length}个项目即将到期！`,
+              title: '公告消息提醒',
+              message: `您有${this.proNoticeDatas.length}个公告消息！`,
               type: 'warning',
               duration: 0,
               position: 'bottom-right'

fuwaiCallCenterWeb.UI/src/views/autoCallScreen/components/tabPager.vue

@@ -102,7 +102,6 @@ export default {
         // 修改试题数据用于提交
         pagerOptions = this.getPagerOptions()
       }
-
       const data = Object.assign(this.pagerDatas, {
         result: pagerOptions
       })

fuwaiCallCenterWeb.UI/src/views/clickoutbound/tasks/components/tabPager.vue

@@ -7,7 +7,7 @@
           <span v-if="quesName">姓名: {{ quesName }}</span>
         </el-col>
         <el-col :lg="8">
-          <span v-if="quesPhone">电话: <span class="quesephon" @click="outboundClick">{{ quesPhone }}</span></span>
+          <span v-if="quesPhone">电话: <span class="quesephon" @click="outboundClick(quesPhone)">{{ quesPhone }}</span></span>
         </el-col>
       </el-row>
     </p>
@@ -45,11 +45,13 @@
     <!-- 呼叫结果 -->
     <el-card v-if="callResults.length" shadow="hover" class="call_result">
       <h5 class="title">呼叫结果</h5>
-      <el-radio-group v-model="callresultid">
-        <el-radio v-for="item in callResults" :key="item.id" :label="item.id" border>
-          {{ item.name }}
-        </el-radio>
-      </el-radio-group>
+      <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="order_form">
+        <el-radio-group v-model="ruleForm.callresultid">
+          <el-radio v-for="item in callResults" :key="item.id" :label="item.id" border>
+            {{ item.name }}
+          </el-radio>
+        </el-radio-group>
+      </el-form>
     </el-card>
     <p v-if="pagerLists.length > 0" class="btn">
       <el-button type="primary" @click="submitPager">提 交</el-button>
@@ -58,7 +60,10 @@
 </template>
 
 <script>
-import { getPager, answerPager, taskId } from '@/api/questionnaire/management'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+import { Send } from '@/utils/telWebsocket'
+import { getPager, answerPager, taskId, getPhone } from '@/api/questionnaire/management'
 import { getDictionary } from '@/api/commonAPI'
 import { uniqueObjArray } from '@/utils'
 
@@ -81,7 +86,8 @@ export default {
   data() {
     return {
       ruleForm: {
-        id: ''
+        id: '',
+        callresultid: '5bfe540c5a10b06b7a35a83a'
       },
       rules: {
         callresultid: [{
@@ -93,15 +99,32 @@ export default {
       loading: false,
       title: '',
       quesName: '',
+      taskid: '',
+      recordid: '',
       quesPhone: '',
       remark: '',
       pagerid: '',
-      callresultid: '5bfe540c5a10b06b7a35a83a', //	否	string	话务状态（字典项：外呼结果）
       pagerLists: [],
       callResults: [], // 呼叫结果数据
       jumpItem: [] // 跳过的试题
     }
   },
+  computed: {
+    ...mapGetters([
+      'usercode', // 工号
+      'extension', // 分机号
+      'telIsLogin', // 是否签入
+      'telSeatState', // 坐席状态
+      'telLineState', // 线路状态
+      'telIsVisCallout' // 外呼面板是否显示
+    ]),
+    // 是否可以点击外呼
+    isAllowCallout: function() {
+      // `this` 指向 vm 实例
+      return this.telIsLogin && this.telSeatState === 2 && this.telLineState === 1
+    }
+    //
+  },
   watch: {
     pagerDatas(newValue, oldValue) {
       // console.log(newValue.pageid, oldValue.pageid)
@@ -110,6 +133,7 @@ export default {
       }
     }
   },
+
   created() {
     if (this.rowid) {
       this.ruleForm.id = this.rowid
@@ -127,6 +151,7 @@ export default {
           this.loading = false
           if (response.state.toLowerCase() === 'success') {
             this.taskid = response.data.pagerid
+            this.recordid = response.data.tasktel.id
             this.quesName = response.data.tasktel.cusname
             this.quesPhone = response.data.tasktel.phone
             this.getPagers(this.taskid)
@@ -168,30 +193,68 @@ export default {
 
     // 提交
     submitPager() {
-      // alert('111')
-      // 验证必填项
-      // let pagerOptions = []
-      // let pagerDatas
-      // // 修改试题数据用于提交
-      // pagerOptions = this.getPagerOptions()
-      // const data = Object.assign(this.pagerDatas, {
-      //   result: pagerOptions
-      // })
-      // console.log(JSON.stringify(data))
-      // answerPager(data).then(response => {
-      //   this.loading = false
-      //   if (response.state.toLowerCase() === 'success') {
-      //     debugger
-      //     // 触发父组件的方法
-      //     this.$emit('getTP')
-      //     this.$message.success('恭喜你，数据提交成功!')
-      //   }
-      // }).catch(() => {
-      //   this.loading = false
-      // })
+      let pagerOptions = []
+      let pagerDatas
+      // 修改试题数据用于提交
+      pagerOptions = this.getPagerOptions()
+      // console.log(pagerOptions)
+      const data = {
+        fullname: this.quesName,
+        tel: this.quesPhone,
+        pageid: this.taskid,
+        recordid: this.recordid,
+        result: pagerOptions,
+        callresult: this.ruleForm.callresultid
+      }
+      console.log(this.ruleForm.callresultid)
+      answerPager(data).then(response => {
+        this.loading = false
+        if (response.state.toLowerCase() === 'success') {
+          debugger
+          // 触发父组件的方法
+          this.$emit('getTP')
+          this.$message.success('恭喜你，数据提交成功!')
+        }
+      }).catch(() => {
+        this.loading = false
+      })
     },
-    outboundClick() {
-      // alert('111')
+    outboundClick(quesPhone) {
+      this.loading = true
+      this.$confirm('您确定要对此客户发起呼叫吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          getPhone(quesPhone).then(response => {
+            if (response.state.toLowerCase() === 'success') {
+              const res = response.data
+              this.scoketDatas = {
+                'Type': 'MakeCall',
+                'AgentID': this.usercode,
+                'AgentExten': this.extension,
+                'Header': res.fix, // 号码前缀 用于截断前缀得到真实号码
+                'DestinationNumber': res.phone //
+              }
+              store.dispatch('ChangeCallNum', quesPhone)
+              Send(this.scoketDatas)
+              // store.dispatch('UpdateCalloutScreen', false)// 关闭外呼面板
+            }
+          })
+        })
+        .catch(() => {
+          this.$message.info('已取消呼叫')
+        })
+      // return new Promise(resolve => {
+      //   getPhone(quesPhone).then(response => {
+      //     this.loading = false
+      //     if (response.state.toLowerCase() === 'success') {
+      //       debugger
+      //     }
+      //   })
+      //   resolve()
+      // })
     },
     // 单选题跳题
     jumpPage(value, e) {

fuwaiCallCenterWeb.UI/src/views/clickoutbound/tasks/index.vue

@@ -27,7 +27,7 @@
       </el-table-column>
       <el-table-column label="呼叫结果" align="center" min-width="110">
         <template slot-scope="scope">
-          {{ callResultsFilter(scope.row.askres) }}
+          {{ callResultsFilter(scope.row.hjjgname) }}
         </template>
       </el-table-column>
       <el-table-column prop="userid" label="坐席工号" align="center" min-width=""/>

fuwaiCallCenterWeb.UI/src/views/layout/Layout.vue

@@ -19,7 +19,7 @@
         <lineChat/>
       </el-popover>
     </div>
-    <el-button slot="reference" type="primary" class="btns lineChatIcon" icon="el-icon-service" circle @click="visible = !visible"/>
+    <!-- <el-button slot="reference" type="primary" class="btns lineChatIcon" icon="el-icon-service" circle @click="visible = !visible"/> -->
   </div>
 </template>
 

fuwaiCallCenterWeb.UI/src/views/notice/manage/addOrEditManege.vue

@@ -7,14 +7,14 @@
       <el-form-item label="公告信息" prop="content">
         <el-input v-model="ruleForm.content" type="textarea" autosize placeholder="请输入公告内容"/>
       </el-form-item>
-      <el-form-item label="上级分类" prop="parentids">
+      <el-form-item label="用户角色" prop="parentids">
         <el-tree
           ref="tree"
           :data="treelists"
           :default-expand-all="defaultExpandAll"
           show-checkbox
-          node-key="id"
           check-strictly
+          node-key="id"
           highlight-current
           @node-click="treeNodeClick"
         />
@@ -103,6 +103,8 @@ export default {
           }
         }
       }
+      console.log(usercodes)
+      console.log(rolecodes)
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.loading = true
@@ -173,13 +175,11 @@ export default {
           treeIcheck[tempIcheck[i].id] = tempIcheck[i]
         }
       }
-      // console.log(treeIcheck)
       return this.filterTreeidDatas(treeIcheck)
     },
     buildTree(list) {
       const temp = {}
       const tree = {}
-
       for (const j in list) {
         temp[list[j].id] = list[j]
       }
@@ -199,15 +199,30 @@ export default {
     filterTreeidDatas(treeDatas) {
       const accessedRouters = []
       let j = -1
+      console.log(treeDatas)
       for (const i in treeDatas) {
         j++
         accessedRouters.push({
-          id: treeDatas[i].id
+          id: treeDatas[i].id,
+          label: treeDatas[i].name,
+          code: treeDatas[i].code,
+          ischeck: treeDatas[i].ischeck,
+          parentid: treeDatas[i].parentid,
+          children: []
         })
-        if (treeDatas[i].children) {
-          accessedRouters[j].children = this.filterTreeidDatas(
-            treeDatas[i].children
-          )
+        if (treeDatas[i].children.length > 0) {
+          for (const n in treeDatas[i].children) {
+            if (treeDatas[i].children[n].ischeck) {
+              accessedRouters.push({
+                id: treeDatas[i].children[n].id,
+                label: treeDatas[i].children[n].name,
+                code: treeDatas[i].children[n].code,
+                ischeck: treeDatas[i].children[n].ischeck,
+                parentid: treeDatas[i].children[n].parentid,
+                children: []
+              })
+            }
+          }
         }
       }
       return accessedRouters
@@ -236,7 +251,7 @@ export default {
     },
     TimeoutExe() {
       setTimeout(() => {
-        console.log(this.treelistIscheck)
+        // console.log(this.treelistIscheck)
         this.$refs.tree.setCheckedNodes(this.treelistIscheck)
       }, 1000)
     },

fuwaiCallCenterWeb.UI/src/views/order/orderCreateHY/index.vue

@@ -372,9 +372,7 @@ export default {
         case '5d0c9e21156ef38d2086d941':// 售后
           this.businIs = true // 是否是业务类型
           break
-        case '5c47d83fd2bc5f5d5907f296':// 投诉
-          alert('投诉')
-          this.consultation = false
+        case '5c47d83fd2bc5f5d5907f296':// 投诉          this.consultation = false
           this.afterSale = false
           this.complaint = true
           this.businIs = false // 是否是业务类型