telephone-clients 3.0.104-5 → 3.0.104-51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.104-5",
+  "version": "3.0.104-51",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -94,11 +94,11 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.74",
+    "system-clients": "3.2.61",
     "system-phone": "1.2.100",
     "terser-webpack-plugin-legacy": "^1.2.5",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.113",
+    "vue-client": "1.24.116",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/guoxin/Console.vue

@@ -96,6 +96,8 @@
         initPhone: '',
         phonelist: [],
         timeSubscribeId:null,
+        timeZhiXianId:null,
+        timeZhiXianFen:300,
         list: [],
         newPhone: '',
         interval: null, // 循环函数返回值，用来停止循环
@@ -141,7 +143,7 @@
           //tag;
         };
         this.$webSocket.onCallState =  (event) => {
-          //tag);
+          console.log('国信websocaket返回得数据：')
           const json = event;
           // 弹屏通知
           const id = json.id;
@@ -161,10 +163,12 @@
             //tag
             this.currentState = '已挂机'
             this.currentState = '正在保存'
+            this.timeZhiXian()
           } else if (state == "canceled") {
             //tag
             this.currentState = '已停止呼叫'
             this.currentState = '正在保存'
+            this.timeZhiXian()
             //这里发送置忙请求
           } else if (state == "calling") {
             //tag
@@ -179,16 +183,16 @@
       }
       this.showip = !this.showip
     },
-    created() {
-      window.addEventListener('beforeunload', this.handleBeforeUnload);
-    },
+    // created() {
+    //   window.addEventListener('beforeunload', this.handleBeforeUnload);
+    // },
     methods: {
-      handleBeforeUnload(){
-        if(this.$webSocket){
-          this.zhimang();
-          this.$webSocket.closeWebsocket()
-        }
-      },
+      // handleBeforeUnload(){
+      //   if(this.$webSocket){
+      //     this.zhimang();
+      //     this.$webSocket.closeWebsocket()
+      //   }
+      // },
       changeGroup(){
         let name = this.groupName == '话务分组' ? '值班分组':'话务分组'
         this.$showMessage(`确定要更改分组为${name}吗？`, ['confirm', 'cancel']).then(res=>{
@@ -245,6 +249,7 @@
         new HttpResetClass().load('POST',`/bridge/callctrl?extnum=${this.aChannel}&state=busy&opt=SET_EXT_PRESENCE_STATE`,{},{resolveMsg:null,rejectMsg:null}).then(res=>{
           if(res.data === 200){
             this.currentState = '忙'
+            this.timeZhiXianId = null
           }else if (res.data === 400){
             this.$showMessage('参数错误,置忙失败')
           }else if (res.data === 404){
@@ -258,9 +263,9 @@
         new HttpResetClass().load('POST',`bridge/callctrl?extnum=${this.aChannel}&state=online&opt=SET_EXT_PRESENCE_STATE`,{},{resolveMsg:null,rejectMsg:null}).then(res=>{
           if(res.data === 200){
             this.currentState = '空闲'
+            this.timeZhiXianId = null
           }else if (res.data === 400){
             this.$showMessage('参数错误,置忙失败')
-
           }else if (res.data === 404){
             // this.$showMessage('目标分机不存在,置忙失败')
             this.currentState = '登录错误'
@@ -284,6 +289,23 @@
           }
         }, (60 * 1000));
       },
+      timeZhiXian() {
+        let flag = this.$appdata.getSingleValue("是否自动置闲")
+        if(!flag){
+          return
+        }
+        let time = this.$appdata.getSingleValue('自动置闲时间')
+        if(time){
+          this.timeZhiXianFen = time
+        }
+        this.timeZhiXianId = setTimeout(()=> {
+          try {
+            this.zhixian();
+          } catch(err) {
+            //tag;
+          }
+        }, (this.timeZhiXianFen * 1000));
+      },
       // 确认
       confirm() {
         //tag
@@ -313,14 +335,20 @@
         }
       },
     },
-    beforeDestroy() {
+    destroyed () {
       //国信置忙代表登出
-
       if(this.$webSocket){
         this.zhimang();
         this.$webSocket.closeWebsocket()
       }
-    }
+    },
+    // beforeDestroy() {
+    //   //国信置忙代表登出
+    //   if(this.$webSocket){
+    //     this.zhimang();
+    //     this.$webSocket.closeWebsocket()
+    //   }
+    // }
   }
 </script>
 <style lang="less">

package/src/components/guoxin/call.state.api.js

@@ -104,11 +104,13 @@ import ReconnectingWebSocket from './reconnecting-websocket.min'
 
         // 发送消息给服务器
         function wsMsgSend(msg) {
+          console.log('国信发送订阅1')
             if (!window.WebSocket) {
                 return;
             }
-
+          console.log('国信发送订阅2')
             if (self.socket.readyState == WebSocket.OPEN) {
+              console.log('国信发送订阅3')
                 // //tag;
                 self.socket.send(msg);
             }

package/src/components/pc/RecordListLeft.vue

@@ -4,6 +4,11 @@
       <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
         <div novalidate class="select-overspread form-horizontal" partial>
           <div class="row" >
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%" v-if="$parent.$parent.flag == '是'">
+              <label class="font_normal_body" style="width: 40%">公&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;司</label>
+              <right-tree :userid.sync='$parent.$parent.userid' style="width: 60%;"
+                          :source.sync='$parent.$parent.source' @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
             <div class="col-sm-3 form-group form-input-group" style="width: 20%">
               <label class="font_normal_body" style="width: 40%">录音&emsp;ID</label>
               <input  type="text" class="form-control" v-model="model.id" placeholder='录音ID'
@@ -22,16 +27,6 @@
                       condition="telname like '%{}%'"
                       :size="model.telname ? model.telname.length : 7">
             </div>
-            <div class="col-sm-3 form-group form-input-group" style="width: 20%" >
-              <label class="font_normal_body" style="width: 40%">电话类型</label>
-              <v-select :value.sync="model.teltype" :value-single="true"
-                        v-model="model.teltype"
-                        condition="teltype='{}'"
-                        :options='$parent.$parent.LoggedStates' placeholder='电话类型'
-                        close-on-select >
-              </v-select>
-
-            </div>
 
             <div style="float: right;" class="form-group span">
               <button type="button" name="button"
@@ -43,6 +38,16 @@
                    @click="$parent.$parent.hidden()"></div>
             </div>
 
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%" v-if="$parent.$parent.criteriaShow">
+              <label class="font_normal_body" style="width: 40%">电话类型</label>
+              <v-select :value.sync="model.teltype" :value-single="true"
+                        v-model="model.teltype"
+                        condition="teltype='{}'"
+                        :options='$parent.$parent.LoggedStates' placeholder='电话类型'
+                        close-on-select >
+              </v-select>
+
+            </div>
             <div class="col-sm-3 form-group form-input-group" style="width: 20%" v-if="$parent.$parent.criteriaShow">
               <label class="font_normal_body" style="width: 40%">开始时间</label>
               <datepicker placeholder="开始时间"
@@ -154,15 +159,33 @@ export default {
       wavflie : '',
       msgs: [],
       infoobj:Object,
+      userid: this.$login.f.id,
+      source: 'tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))', //获取公司参数
+      flag: '',
+      f_filiale_id: ''
     }
   },props: {
 
   },
   ready () {
+    this.flag = this.$appdata.getSingleValue('电话记录只查当前公司')
+    if (this.flag) {
+      if (this.flag == '是') {
+        this.model.f_filiale = this.$login.f.f_fengongsi
+        this.model.f_filiale_id =  this.$login.f.f_orgids
+      }
+    }
   },
   watch: {
   },
   methods: {
+    getRes (obj) {
+      this.f_filiale_id = this.$login.convertToIn(obj.resids)
+      console.log('--------------------')
+      console.log(this.f_filiale_id)
+      this.orgname = obj.res[0]
+      this.$set('orgname', obj.res[0])
+    },
     hidden () {
       this.criteriaShow = !this.criteriaShow
     },
@@ -171,6 +194,12 @@ export default {
       //tag
     },
     search(args) {
+      console.log(this.f_filiale_id)
+      if (this.flag == '是') {
+        if (this.f_filiale_id) {
+          args.condition = args.condition + ' and f_filiale_id in ' + this.f_filiale_id
+        }
+      }
       this.model.search(args.condition, args.model)
     },
     clearmsg(){

package/src/components/pc/RepairsWork.vue

@@ -208,6 +208,10 @@
         type: String,
         default: '转维修员'
       },
+      telsource:{
+        type: String,
+        default: '转维修员'
+      },
       // 其他类型工单提交，清空控制
       cleantf: {
         type: Number
@@ -231,7 +235,7 @@
           f_residential_area: ''
         },
         residentialquery: '',
-        servicesource:'用户来电',  // 工单来源
+        servicesource:'话务来电',  // 工单来源
         areacondition: '',
         testdata: {f_equipment: ''},
         residentialTemplate: 'f_villagename',
@@ -242,12 +246,13 @@
             f_service_acitivity_type: '派单'
           }],
           f_finish_date:'',
-          f_source:'用户来电',
+          f_source:'话务来电',
           f_service_id: '',
           f_contact_phone: '',
           f_meetunit: '',
           f_phone: '',
           f_user_name: '',
+          failure:'',
           f_address: '',
           f_json: '',
           f_repair_date: Util.getNowDate(),
@@ -292,13 +297,18 @@
         'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
         'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
         userid: this.$login.f.id,
+        is_to_other :false,
         repairers: []   // 维修员
       }
     },
     ready() {
       // 获取sendType.json配置信息   获取派单类型  转站点，转维修员，自选模式
         getSendType(this)
-
+        if (this.$appdata.getSingleValue('转班组长') && this.$appdata.getSingleValue('转班组长') == 'true'){
+          this.is_to_other = true
+          this.source = 'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($班组长$)))'
+        }
+        this.model.f_source = this.telsource == '转维修员' ? '部门派单':'话务来电'
     },
     methods: {
       // 当维修员发生改变，获取维修员手机号
@@ -621,6 +631,11 @@
         }
         data.model.f_state = null
         this.saveing = true
+
+        if (this.is_to_other){
+          data.is_to_other = 'true'
+        }
+
         return this.$resetpost(url, data).then((data) => {
            if(data.data && data.data.id){
                 this.id = JSON.parse(data.data.id).id
@@ -637,6 +652,8 @@
             Util.afterCallBz(this.$login.f.id, this.$login.f.name)
           }
           this.saveing = false
+        }).catch(error=>{
+          this.saveing = false
         })
       },
       address() {
@@ -696,6 +713,13 @@
       },
     },
     watch: {
+      'telsource'(){
+        if(this.telsource == '转站点' ) {
+          this.servicesource = '话务来电'
+        }else{
+          this.servicesource = '部门派单'
+        }
+      },
       // 转接类型
       'model.f_handlingtype'(){
         if(this.operType === '修改工单'){
@@ -767,6 +791,9 @@
       getTestData() {
         return this.testdata
       },
+      getSource() {
+        return this.servicesource
+      },
       serviceacitivity() {
         return this.model.serviceacitivity.find((row) => {
           return row.f_service_acitivity_type === '派单'

package/src/components/pc/SiteSend.vue

@@ -15,7 +15,24 @@
   <progress-bar v-if="btnshow" :label="bartext" :color="barcolor" :percentage="barperc"
                 :height="barheight"></progress-bar>
   <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-    <div class="row">
+    <div class="row" v-if="issitesend && source != 'mobile'">
+      <div class="col-sm-5 form-group form-input-group">
+        <label class="col-sm-5" >派单类型：</label>
+        <v-select :value.sync="f_handlingtype" :value-single="true"
+                  :options='handling' placeholder='派单类型'
+                  close-on-select  :max-height="120"></v-select>
+      </div>
+    </div>
+    <div class="row" v-if="f_handlingtype == '转站点'">
+      <div class="col-sm-5 form-group form-input-group">
+        <label class="col-sm-5" >接单站点：</label>
+        <input style="width: 60%" type="text" v-show="false" v-model="row.serviceacitivity[0].f_reciever">
+        <right-tree islist :userid="userid" :source="sourcesite"  v-on:re-res="reres" :textContent="选择站点管理员" :selectData="" v-ref:f_reciever>
+
+        </right-tree>
+      </div>
+    </div>
+    <div class="row" v-if="f_handlingtype == '转维修员'">
       <div class="col-sm-5 form-group form-input-group">
         <label class="col-sm-5" >接&ensp;单&ensp;人：</label>
         <v-select :value="row.serviceacitivity[0].f_reciever" :value-single="true"
@@ -59,6 +76,13 @@ export default {
   },
   data () {
     return {
+      sourcesite:
+        'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
+        'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
+      userid: this.$login.f.id,
+      f_handlingtype:'转维修员',
+      handling:[{label:'转站点',value:'转站点'},{label:'转维修员',value:'转维修员'}],
+      issitesend:this.$appdata.getSingleValue('是否允许站点转站点'),
       saveing:false,
       show: false,
       btnshow: false,
@@ -95,6 +119,14 @@ export default {
     }
   },
   methods: {
+    // 选中部门
+    reres(val){
+      if(val.res == undefined || val.res[0] == undefined || val.res[0] == ''){
+        return
+      }
+      this.row.serviceacitivity[0].f_meetunit = val.res[0]
+      this.row.serviceacitivity[0].f_reciever = val.resids[0]
+    },
     repiarmancg (val) {
       if (val.isTrusted){
         return
@@ -127,16 +159,19 @@ export default {
       if (this.source == 'mobile') {
         data = {
           model: userdata,
+          f_handlingtype:this.f_handlingtype,
           loginUser: {name: Vue.user.name, ename: Vue.user.ename}
           // adduser:{userinfo: result, devices: []}
         }
       } else {
         data = {
           model: userdata,
+          f_handlingtype:this.f_handlingtype,
           loginUser: {name: this.$login.f.name, ename: this.$login.f.ename}
           // adduser:{userinfo: result, devices: []}
         }
       }
+
       data.message = true
       this.saveing = true
       let HttpReset = new HttpResetClass()

package/src/components/pc/TelLossList.vue

@@ -52,6 +52,12 @@
                 <div style="float: right;" class="form-group span">
                   <button type="button" name="button"
                           class="button_search button_spacing" @click="search(),$dispatch('search')" style="z-index: 2">查询</button>
+                  <export-excel-tel
+                    :data="$parent.$parent.searchData"
+                    :field="$parent.$parent.excelHeaders"
+                    sqlurl="rs/logic/telephoneExport" sql-name="tel_singleTable_OrderBy" template-name='呼损记录导出'
+                    :choose-col="false">
+                  </export-excel-tel>
                 </div>
               </div>
             </div>
@@ -109,7 +115,17 @@ export default {
       pendingCount: 0,
       serobj:Object,
       showVisit:false,
-      outltime:this.getNowFormatDate()
+      outltime:this.getNowFormatDate(),
+      searchData:{
+        items: "*",
+        tablename: "t_records",
+        orderitem: "outltime desc",
+        condition: '1=1'
+      },
+      excelHeaders: {
+        'telnum': '电话号码',
+        'outltime': '来电时间',
+      },
     }
   },
   ready () {
@@ -240,6 +256,7 @@ export default {
         }
       }
       args.condition += " AND isnull(starttime,'') = '' AND isnull(findtime,'') != ''"
+      this.searchData.condition = args.condition
       this.model.search(args.condition)
     },
   },

package/src/components/pc/WorkList.vue

@@ -646,7 +646,8 @@ export default {
     },
     proc (selectone, type) {
       this.editflag = type
-      this.selectone = selectone
+      //this.selectone = selectone
+      this.selectone = Object.assign({},selectone)
     },
     complanReview (itemVal, type) {
       //tag

package/src/components/pc/WorkListAllNew.vue

@@ -251,6 +251,9 @@
               <th>
                 <nobr>维护信息</nobr>
               </th>
+              <th>
+                <nobr>备注</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -316,10 +319,10 @@
             </td>
 
             <td  style="text-align: center;">
-              <nobr>{{ $parent.$parent.$parent.d1(row)}}</nobr>
+              <nobr>{{ row.f_overdue_show}}</nobr>
             </td>
             <td  style="text-align: center;">
-              <nobr>{{ row.f_finish_date == '1900-01-01 00:00:00' ? '' : row.f_finish_date}}</nobr>
+              <nobr>{{ row.f_finish_time_show }}</nobr>
             </td>
             <td  style="text-align: center;">
               <nobr>{{ row.f_result_status }}</nobr>
@@ -327,6 +330,9 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_content }}</nobr>
             </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_remarks }}</nobr>
+            </td>
 
 
           </template>
@@ -420,11 +426,11 @@ export default {
       thead: '',
       tfoot: '',
       zhihuans: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '异常', value: '异常'}],
-      headData: ['工单类型', '工单编号', '派单时间','客户信息', '联系电话', '故障明细', '工单来源', '工单状态', '派单人', '话务员','接单员',
-        '结单时间','到达时间', '离开时间','逾期状态','截止时间','工单结果','维护信息'],
-      bodyData: ['f_workorder_type', 'f_service_id', 'f_created_date', 'f_customer_info_show','f_contact_phone', 'f_json', 'f_source',
+      headData: ['工单类型', '工单编号', '派单时间','客户姓名','客户地址', '联系电话', '故障明细', '工单来源', '工单状态', '派单人', '话务员','接单员',
+        '结单时间','到达时间', '离开时间','逾期状态','截止时间','工单结果','维护信息','备注'],
+      bodyData: ['f_workorder_type', 'f_service_id', 'f_created_date', 'f_user_name','f_address','f_contact_phone', 'f_json', 'f_source',
         'f_state_show',  'f_single_man','f_attendant','f_order_man','f_date','f_date_come','f_date_leave',
-        'f_overdue_show','f_finish_time_show','f_result_status','f_content'],
+        'f_overdue_show','f_finish_time_show','f_result_status','f_content','f_remarks'],
       searchData: {
         condition: '1=1'
       },
@@ -432,7 +438,8 @@ export default {
         'f_workorder_type': '工单类型',
         'f_service_id': '工单编号',
         'f_created_date': '派单时间',
-        'f_customer_info_show': '客户信息',
+        'f_user_name': '客户姓名',
+        'f_address': '客户地址',
         'f_contact_phone': '联系电话',
         'f_json': '故障明细',
         'f_source': '工单来源',
@@ -446,7 +453,8 @@ export default {
         'f_overdue_show': '逾期状态',
         'f_finish_time_show': '截止时间',
         'f_result_status': '工单结果',
-        'f_content': '维护信息'
+        'f_content': '维护信息',
+        'f_remarks':'备注'
       },
       criteriaShow: false
     }

package/src/components/sendsingle/onlinequeryuser.vue

@@ -76,7 +76,7 @@
                 <label  class="font text-left">用户姓名：</label>
               </div>
               <div class="col-xs-8" >
-                <input  class="search_input input-font" v-model="model.f_user_name" condition="ui.f_user_name = '{}'" />
+                <input  class="search_input input-font" v-model="model.f_user_name" condition="ui.f_user_name like '%{}%'" />
               </div>
             </div>
             <div class="row app-row">

package/src/components/telreport/TrafficClassificationReport.vue

@@ -31,6 +31,7 @@
               <v-select :value.sync="model.attendants"
                         :options='$parent.$parent.operators'
                         placeholder='请选择话务员'
+                        :multiple="true"
                         style="width: 60%"
               ></v-select>
             </div>
@@ -99,17 +100,17 @@
         this.model.f_filialeid = this.$login.convertToIn(obj.resids);
       },
       search(args){
-        debugger
         if (args.model.attendants && args.model.attendants.length>0){
-          // let attStr = "("
-          // for (let attendantKey in args.model.attendants) {
-          //   attStr +=`'${args.model.attendants[attendantKey]}',`
-          // }
-          // attStr+="'')"
-          // args.model.attendant = attStr
-          args.model.attendant = args.model.attendants[0]
+          let attStr = ""
+          for (let attendantKey in args.model.attendants) {
+            attStr +=`'${args.model.attendants[attendantKey]}','，',`
+          }
+          attStr=attStr.substring(0, attStr.length-1)
+          args.model.attendant = attStr
+          // args.model.attendant = args.model.attendants[0]
         }else {
-          args.model.attendant = ""
+          this.$showMessage('请选择话务员')
+          return
         }
         this.model.search('1=1',args.model)
       }

package/src/components/temp/HandplanInfo.vue

@@ -45,7 +45,7 @@
     title: '抄表记录',
     data () {
       return {
-        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: 'this.tablename', orderitem: '"id desc"'}),
+        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: 'this.tablename', orderitem: '"f_hand_date desc"'}),
         show: false,
         row: Object
       }
@@ -74,6 +74,10 @@
         this.model.rows = []
       }
     },
+    /*
+    1.12月18 2W
+    2.1月18
+     */
     ready () {
       if (this.user && this.user.f_userinfo_id) {
         if(this.user.f_meter_classify == '物联网表'){

package/src/components/temp/InstructInfo.vue

@@ -45,7 +45,7 @@
     title: '指令查看',
     data () {
       return {
-        model: new PagedList('rs/sql/tel_singleTable_OrderBy', 8, {items: '"f_callback_date,f_instruct_date,f_receive_state,f_instruct_state,f_instruct_title,f_meternumber,f_instruct_type,f_manufacturers"', tablename: '"t_instruct with (nolock)"', orderitem: '"f_callback_date desc"'}),
+        model: new PagedList('rs/sql/tel_singleTable_OrderBy', 8, {items: '"f_callback_date,f_instruct_date,f_receive_state,f_instruct_state,f_instruct_title,f_meternumber,f_instruct_type,f_manufacturers"', tablename: '"t_instruct with (nolock)"', orderitem: '"f_instruct_date desc"'}),
         show: false,
         row: Object
       }