传真列表显示问题

CallCenterWeb.UI/src/api/customerManagement/contact.js

@@ -8,7 +8,14 @@ export function getContactList(params) {
         params
     })
 }
-
+// 获取联系人列表数据
+export function postcus(params) {
+    return request({
+        url: 'api/concat/getcus',
+        method: 'get',
+        params
+    })
+}
 // 添加联系人数据
 export function addContact(data) {
     return request({
@@ -75,3 +82,4 @@ export function searchContact(params) {
 }
 
 
+

CallCenterWeb.UI/src/api/reportFormManagement/reportFormManagement.js

@@ -134,3 +134,10 @@ export function getfkfsbymonth(params) {
     params
   });
 }
+export function getdetailfkfsbymonth(params) {
+  return request({
+    url: "/api/workorderstatistics/getdetailfkfsbymonth",
+    method: "get",
+    params
+  });
+}

CallCenterWeb.UI/src/views/callScreen/components/AddOrEditCustomer.vue

@@ -317,9 +317,9 @@ export default {
       console.log('watch---' + this.screenState)
       console.log('watch---' + this.callinNum)
 
-      if (this.callinNum.length === 4) {
-        return
-      }
+      // if (this.callinNum.length === 4) {
+      //   return
+      // }
 
       if (this.screenState && this.callinNum) {
         this.isButton = true
@@ -333,9 +333,9 @@ export default {
     this.getcode()
     this.getList()
     this.getSeatGroup()
-    if (this.callinNum.length === 4) {
-      return
-    }
+    // if (this.callinNum.length === 4) {
+    //   return
+    // }
     console.log(this.callinNum + '--121212121212')
     if (this.callinNum) {
       this.ruleForm.cusTel = this.callinNum

CallCenterWeb.UI/src/views/callScreen/components/callScreen.vue

@@ -399,6 +399,7 @@ export default {
       ruleForm: {
         // 新增工单
         workId: "", // 工单id
+        cusTrade:"",
         callNum: "", // 呼入号码
         zxbh: "", // 坐席编号
         name: "", // 客户姓名
@@ -690,7 +691,9 @@ export default {
             this.loading = true;
             return new Promise((resolve) => {
               const params = {
-                callid: this.callid,
+                // callid: this.callid,
+                callId: this.callid,
+                cusTrade:this.ruleForm.cusTrade,
                 zxbh: this.zxbh, // 坐席编号
                 gdzl: this.slType, // 工单种类
                 content: this.ruleForm.content, // 来电内容
@@ -711,6 +714,7 @@ export default {
                 callType: this.ruleForm.callType,
                 rate: this.ruleForm.rate,
               };
+              console.log(params)
               if (params.isClose === 0) {
                 this.$emit("childByValue", this.callinText);
               }
@@ -728,6 +732,7 @@ export default {
                         offset: 50,
                       });
                       this.ruleForm.content = "";
+                      this.ruleForm.cusTrade = ''
                       this.slType = "";
                       this.csType = "";
                       this.consultType = "";
@@ -811,11 +816,12 @@ export default {
     },
     // 获取客户信息
     getCusInfos(data) {
-      console.log(data);
       if (data) {
         this.cusInfo.cusname = data.cusName;
         this.ruleForm.cusName = data.cusName; // 客户姓名
         this.ruleForm.clientId = data.clientId;
+        this.ruleForm.cusTrade = data.cusTrade;
+        
       }
     },
     // 短信

CallCenterWeb.UI/src/views/faxManager/faxManagement/faxImgs.vue

@@ -86,6 +86,7 @@ export default {
     }
     this.url =
       'http://' + this.faxurl + ':' + this.part + '/files/' + this.rowfile
+    console.log(this.url)
     this.loadImage()
     this.seefax()
   },
@@ -127,6 +128,7 @@ export default {
             canvasList.push(canvas)
           }
         }
+        console.log(canvasList)
         self.imglists = canvasList
         self.imgnum = self.imglists.length
       }

CallCenterWeb.UI/src/views/faxManager/faxTransmission/customSend.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form ref="ruleForm" :model="ruleForm" label-width="80px">
       <el-row>
-        <el-col :span="18">
+        <el-col :span="24">
           <el-form-item label="发送对象">
             <el-select
               style="width: 390px"
@@ -16,25 +16,24 @@
               @change="selectStatus"
             >
               <el-option
-                v-if="item.telePhone"
-                v-for="item in contactDataLists"
-                :key="item.telePhone"
-                :label="(item.cusPname?(item.cusPname+'-'):'') + item.telePhone"
-                :value="item.telePhone"
+                v-if="item.value"
+                v-for="(item,index) in contactDataLists"
+                :key="index"
+                :label="item.lable"
+                :value="item.value"
               />
             </el-select>
+            <el-button style="margin-left: 30px;" type="primary" @click="submitForm()">提交</el-button>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item>
-        <el-button type="primary" @click="submitForm()">提交</el-button>
-      </el-form-item>
+      <!-- <el-form-item></el-form-item> -->
     </el-form>
   </div>
 </template>
 <script>
 import { addSMSInfo } from "@/api/noteManagement/noteList";
-import { getContactList } from "@/api/customerManagement/contact";
+import { getContactList,postcus } from "@/api/customerManagement/contact";
 import { mapGetters } from "vuex";
 export default {
   props: {
@@ -42,6 +41,14 @@ export default {
       type: Number,
       default: 0,
     },
+    recvTime:{
+      type: String,
+      default: "",
+    },
+    smsTaskid:{
+      type: Number,
+      default: 0,
+    },
     faxPage: {
       type: Number,
       default: 0,
@@ -57,7 +64,14 @@ export default {
   },
   data() {
     return {
-      contactDataLists: [],
+      contactDataLists: [
+        // {
+        //   lable:'mm' ,
+        //   value :'15838094023'
+        // }
+      ],
+      
+      SMScontent:'',
       dataTime: "",
       ruleForm: {
         faxStatus: "", // 状态
@@ -75,16 +89,28 @@ export default {
     hh = hh > 9 ? hh : "0" + hh;
     this.dataTime = month + "月" + day + "日" + hh + "点";
     this.getContactDataLists();
-    console.log(this.f_customerid,this.faxPage,this.cusCode)
+    console.log(this.f_customerid,this.faxPage,this.cusCode,this.smsTaskid)
   },
   methods: {
+    getSendTime() {
+      const yyyy = this.recvTime.split(' ')[0].split('-')[0]
+      const mm = this.recvTime.split(' ')[0].split('-')[1]
+      const dd = this.recvTime.split(' ')[0].split('-')[2]
+      const hh = this.recvTime.split(' ')[1].split(':')[0]
+      const resultData = "您好！我公司于" + yyyy +'年' + mm+ '月' + dd + '日'+ hh+'点'+"收到贵司" +this.faxPage + "页传真。"
+      return resultData
+    },
     submitForm() {
-      this.SMScontent =
-        "您好！我公司于" +
-        this.dataTime +
-        "收到贵司" +
-        this.faxPage +
-        "页传真。";
+      if (this.recvTime) {
+        this.SMScontent = this.getSendTime()
+      } else {
+        this.$message({
+            message: '接收传真时间为空',
+            type: 'warning'
+        })
+        return
+      }
+      
       return new Promise((resolve) => {
         const params = {
           content: this.SMScontent,
@@ -96,7 +122,13 @@ export default {
           f_userid: this.zxbh,
           isTimer: 0,
         };
-        console.log(params);
+        if (this.f_customerid == -1) {
+          params.taskid = this.smsTaskid
+        } else {
+          params.id = this.f_customerid
+        }
+        console.log(params)
+        console.log(this.recvTime)
         addSMSInfo(params)
           .then((response) => {
             if (response.state == "success") {
@@ -118,14 +150,23 @@ export default {
       // this.loadingR = true;
       return new Promise((resolve) => {
         const params = {
-          pageindex: 1, // int 第几页
-          pagesize: 9999, // int 每页几条信息
-          cusCode: this.cusCode, // 客户代码
+          
+          cuscode: this.cusCode, // 客户代码
         };
-        getContactList(params).then((response) => {
+        postcus(params).then((response) => {
           // this.loadingR = false;
           if (response.state.toLowerCase() === "success") {
-            this.contactDataLists = response.data;
+            this.contactDataLists = [];
+            let newAway = []
+            if (response.data.length>0) {
+              response.data.forEach(element => {
+                const obj = {}
+                obj.lable = (element.cuspname?(element.cuspname+'-'):'')+element.telephone
+                obj.value = element.telephone
+                this.contactDataLists.push(obj)
+              });
+              console.log(this.contactDataLists)
+            }
           }
         });
         resolve();

CallCenterWeb.UI/src/views/faxManager/faxTransmission/index.vue

@@ -300,14 +300,14 @@
         label="传真号码"
         align="left"
         prop="qh"
-        min-width="120"
+        min-width="100"
       />
 
       <el-table-column
         :show-overflow-tooltip="true"
         label="接收时间"
         align="left"
-        min-width="125"
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ scope.row.recvTime | isrecvTime }}
@@ -325,7 +325,7 @@
         prop="companyName"
         label="单位名称"
         align="left"
-        min-width="310"
+        min-width="270"
       />
       <el-table-column
         :show-overflow-tooltip="true"
@@ -339,7 +339,7 @@
         :show-overflow-tooltip="true"
         label="付款方式"
         align="left"
-        min-width="160"
+        min-width="140"
       >
         <template slot-scope="scope">
           {{ scope.row.payment | CusCcFilter }}
@@ -368,7 +368,7 @@
         prop="czyName"
         label="经办人"
         align="left"
-        min-width="160"
+        min-width="140"
       />
 
       <el-table-column
@@ -393,6 +393,16 @@
           <span>{{ scope.row.completionTime | iscompletionTime }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="短信状态"
+        align="left"
+        min-width="80"
+      >
+        <template slot-scope="scope">
+          {{ scope.row.sendSMS?'已发送':'未发送' }}
+        </template>
+      </el-table-column>
       <el-table-column label="是否关闭" align="left" min-width="80">
         <template slot-scope="scope">
           {{ scope.row.isClose | isCloseFilter }}
@@ -519,6 +529,7 @@ export default {
   },
   data() {
     return {
+      rowItem:{},
       hackReset: true,
       pageshow: true,
       stateStr: '',
@@ -614,7 +625,7 @@ export default {
       this.$nextTick(function () {
         if (this.suoyin.length != 0) {
           this.$refs.tb.setCurrentRow(this.dataLists[this.suoyin])
-
+          this.rowItem = this.dataLists[this.suoyin]
           this.faxid = this.dataLists[this.suoyin].id
           this.faxnum = this.dataLists[this.suoyin].faxNumber
           this.cusCodeSend = this.dataLists[this.suoyin].cusCode
@@ -632,7 +643,7 @@ export default {
           }
         } else {
           this.$refs.tb.setCurrentRow(this.dataLists[0])
-
+          this.rowItem = this.dataLists[0]
           this.faxid = this.dataLists[0].id
           this.faxnum = this.dataLists[0].faxNumber
           this.cusCodeSend = this.dataLists[0].cusCode
@@ -889,6 +900,15 @@ export default {
     },
     btn_add_send() {
       if (this.faxid) {
+        let recvTime = ''
+        let smsTaskid = 0
+        if (this.faxid == -1) {
+          smsTaskid = this.rowItem.recvFax.taskid
+        }
+        if (this.rowItem.recvTime) {
+          recvTime = this.rowItem.recvTime
+        }
+        console.log(recvTime,smsTaskid)
         this.$layer.iframe({
           content: {
             content: customSend, // 传递的组件对象
@@ -896,7 +916,10 @@ export default {
             data: {
               f_customerid: this.faxid,
               cusCode: this.cusCodeSend,
-              faxPage: this.faxPage
+              faxPage: this.faxPage,
+              recvTime:recvTime,
+              smsTaskid:smsTaskid
+
             } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
           },
           area: ['60%', '25%'],
@@ -1269,6 +1292,7 @@ export default {
     // 选择传真
     linkcus(row, rowIndex) {
       console.log('数据', row)
+      this.rowItem = row
       this.suoyin = row.index // 行索引
       // this.$refs.tb.toggleRowSelection(row)
       this.recvTaskId = row.recvTaskId

CallCenterWeb.UI/src/views/faxManager/faxTransmission/updateFax.vue

@@ -347,7 +347,7 @@ export default {
       checkednum: '', // 不用编号
       intcolor: '', // 原始color
       fileList: [], // 上传文件数组
-
+      recvTime:'',
       ruleForm: {
         faxColor: '', // 颜色
         faxPhone: '', // 传真号码
@@ -443,6 +443,7 @@ export default {
           content: customSend, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: {
+            recvTime:this.recvTime,
             f_customerid: this.rowid,
             cusCode: this.cusCode,
             faxPage: this.faxPage
@@ -633,6 +634,7 @@ export default {
             } else {
               this.ruleForm.faxPhone = res.faxPhone // 传真号码
             }
+            this.recvTime = res.recvTime
             this.faxPhone = res.faxPhone
             this.cusFaxBackup = this.faxPhone
             this.ruleForm.clientId = res.clientId // 客户id

CallCenterWeb.UI/src/views/reportFormManagement/clientGrade/index.vue

@@ -30,62 +30,74 @@
         <el-table-column prop="type" label="客户等级" align="center" min-width="120" />
         <el-table-column prop="january" label="一月" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,1)" >{{ scope.row.january }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,1)" >{{ scope.row.january }}</el-button>
+            <span  v-show="!scope.row.typeid">{{ scope.row.january }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="february" label="二月" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,2)" >{{ scope.row.february }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,2)" >{{ scope.row.february }}</el-button>
+            <span  v-show="!scope.row.typeid">{{ scope.row.february }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="march" label="三月" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,3)" >{{ scope.row.march }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,3)" >{{ scope.row.march }}</el-button>
+            <span  v-show="!scope.row.typeid">{{ scope.row.april }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="april" label="四月" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,4)" >{{ scope.row.april }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,4)" >{{ scope.row.april }}</el-button>
+            <span v-show="!scope.row.typeid">{{ scope.row.april }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="may" label="五月" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,5)" >{{ scope.row.may }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,5)" >{{ scope.row.may }}</el-button>
+            <span v-show="!scope.row.typeid">{{ scope.row.may }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="june" label="六月" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,6)" >{{ scope.row.june }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,6)" >{{ scope.row.june }}</el-button>
+            <span v-show="!scope.row.typeid">{{ scope.row.june }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="july" label="七月" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,7)" >{{ scope.row.july }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,7)" >{{ scope.row.july }}</el-button>
+            <span v-show="!scope.row.typeid">{{ scope.row.august }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="august" label="八月" align="center" >
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,8)" >{{ scope.row.august }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,8)" >{{ scope.row.august }}</el-button>
+            <span v-show="!scope.row.typeid">{{ scope.row.august }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="september" label="九月" align="center" >
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,9)" >{{ scope.row.september }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,9)" >{{ scope.row.september }}</el-button>
+            <span v-show="!scope.row.typeid">{{ scope.row.september }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="october" label="十月" align="center" >
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,10)" >{{ scope.row.october }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,10)" >{{ scope.row.october }}</el-button>
+            <span v-show="!scope.row.typeid">{{ scope.row.october }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="november" label="十一月" align="center" >
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,11)" >{{ scope.row.november }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,11)" >{{ scope.row.november }}</el-button>
+            <span v-show="!scope.row.typeid">{{ scope.row.november }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="december" label="十二月" align="center" >
           <template slot-scope="scope">
-            <el-button type="text" @click="btnDetail(scope.row,12)" >{{ scope.row.december }}</el-button>
+            <el-button v-show="scope.row.typeid" type="text" @click="btnDetail(scope.row,12)" >{{ scope.row.december }}</el-button>
+            <span v-show="!scope.row.typeid">{{ scope.row.december }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -128,7 +140,7 @@ export default {
   },
   methods: {
     btnDetail(item,month){
-      console.log(this.year,month,item.typeid)
+      console.log(this.year,month,item.typeid,item)
       this.$layer.iframe({
         content: {
           content: listdetail, // 传递的组件对象

CallCenterWeb.UI/src/views/reportFormManagement/clientGrade/listDetail.vue

@@ -5,14 +5,11 @@
       border
       highlight-current-row
       stripe>
-      <el-table-column
-        label="序号"
-        type="index"
-        align="center"
-        width="100"/>
-      <el-table-column prop="name" label="姓名" align="center" min-width />
-      <el-table-column prop="tel" label="电话" align="center" min-width />
-      <el-table-column prop="count" label="数量" align="center" min-width />
+      <el-table-column prop="level" label="客户等级" align="center"/>
+      <el-table-column prop="salman" label="销售经理" align="center" min-width />
+      <el-table-column prop="records" label="来电数量" align="center" min-width />
+      <el-table-column prop="jindu" label="查询进度" align="center" min-width />
+      <el-table-column prop="per" label="占比" align="center" min-width />
     </el-table>
     <!-- <pagination
       v-show="pageParams.total > 0"
@@ -26,7 +23,7 @@
 
 <script>
 import Pagination from '@/components/Paginationtwo' // 对el-pagination 二次封装
-import { getfkfsbymonth } from "@/api/reportFormManagement/reportFormManagement";
+import { getfkfsbymonth,getdetailfkfsbymonth } from "@/api/reportFormManagement/reportFormManagement";
 
 export default {
   name: 'ListDetail',
@@ -88,8 +85,8 @@ export default {
         type: this.typeid
       }
       return new Promise(resolve => {
-        // ?year=2021&month=06&type=A 
-        getfkfsbymonth(params).then(response => {
+        // ?year=2021&month=06&type=A getfkfsbymonth  getdetailfkfsbymonth
+        getdetailfkfsbymonth(params).then(response => {
           if (response.state.toLowerCase() === 'success') {
             this.dataLists = response.data
             // this.pageParams.total = response.total

CallCenterWeb.UI/static/config/serverConfig.json

@@ -1,6 +1,6 @@
 {
   "NODE_ENV": "development",
-  "BASE_API": "http://192.168.8.3:8081/",
+  "BASE_API": "http://192.168.8.3:8081/", 
   "SOCKET_IP": "192.168.8.7",
   "SOCKET_PORT": "8081",
   "LineChat_SOCKET_IP": "192.168.5.42",