telephone-clients 3.0.104-7 → 3.0.104-71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.104-7",
+  "version": "3.0.104-71",
   "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/android/ImgArea.vue

@@ -0,0 +1,80 @@
+<template>
+  <div>
+    <div class="row">
+      <button type="button" name="button" class="btn btn-primary" @click="takePic()">拍照</button>
+    </div>
+    <div class="row">
+      <div class="col-xs-4 col-sm-3 col-md-2" v-for="img in model" v-if="img.imgpath == sutitle ">
+        <img-self :src="getimgstr(img)" alt="维修照片" :width="150" :height="200"></img-self>
+        <button type="button" name="button" class="btn btn-default" @click="remove(img)">-</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import * as Util from '../../components/Util'
+
+  export default {
+  props: {
+    // 存放照片的数组
+    model: {
+      type: Array
+    },
+    sutitle:'维修照片'
+  },
+  data () {
+    return {
+      // 拍照时的文件名
+      fileName: '',
+      is_has_jingweidu: this.$appdata.getSingleValue('照片水印加经纬度') || 'false',
+
+    }
+  },
+  methods: {
+    // 从图片中删除
+    remove (row) {
+      this.$androidUtil.delfile(row.android_file)
+      let pos = this.model.findIndex((value) => {
+        return value === row
+      });
+      this.model.splice(pos, 1)
+    },
+    // fileName: 回传文件名,传入的带安卓路径url
+    // prop: 传入的字段名，没做改动
+    cameraCallBack(prop, fileName) {
+      alert("callback!!!!!!!!!!!!!!!!!!--start")
+      // 当前this只能通过HostApp.__tis__获取
+      let self = this.$androidUtil.getCallBack(this)
+      // 添加新图片
+      self.model.push({
+        android_file: self.fileName,
+        path: fileName,
+        imgpath: this.sutitle
+      })
+      alert("callback!!!!!!!!!!!!!!!!!!--end")
+    },
+    takePic() {
+      const obj = HostApp.getGpsDetailAddress()
+      let jingweidu = ''
+      if (this.is_has_jingweidu == 'true'){
+        jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
+      }
+      let prop = 'repair'
+      let idx = 'aofeng'
+      this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+      this.$androidUtil.takePic(this, this.cameraCallBack, this.fileName,this.sutitle+jingweidu)
+    },
+    getimgstr(val){
+      if(!val){
+        return ''
+      }
+      if(Vue.android){
+        return val.path + '?' + Math.random()
+      }
+      return 'rs/file/getfile/' + val.imgid
+    }
+  },
+}
+</script>

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/ComplainWork.vue

@@ -144,6 +144,7 @@ export default {
           f_reciever:'',
           f_complaint_results:''
         }],
+        f_small_area:'',
         picked: this.picked, //待办/已办
         f_content: '', //投诉内容
         f_user_name: '',
@@ -223,6 +224,7 @@ export default {
     assignObj () {
       this.model = Object.assign(this.model, {}, this.data)
       this.model.f_user_name = this.data.f_user_name
+      this.model.f_small_area = this.data.f_slice_area
       this.model.f_contact_phone = this.data.f_user_phone
       //tag
     },
@@ -236,6 +238,7 @@ export default {
           f_reciever:f_reciever1,
           f_complaint_results:''
         }],
+        f_small_area:'',
         f_content: '',
         f_user_name: '',
         f_phone: '',

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"
@@ -41,8 +36,24 @@
               <div style="float: right;" class="button_spacing button_search"
                    :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                    @click="$parent.$parent.hidden()"></div>
+              <export-excel-tel :data="$parent.$parent.searchData"
+                                :field="$parent.$parent.excelHeaders"
+                                :choose-col="true"
+                                sqlurl="rs/logic/telephoneExport" sql-name="tel_recordlist"
+                                :template-name="$parent.$parent.excelTitle"></export-excel-tel>
+
             </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 +165,48 @@ 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: '',
+      excelTitle: '电话记录录导出',
+      excelHeaders: {
+        'teltype': '电话类型',
+        'telnum': '电话号码',
+        'outltime': '呼入/呼出',
+        'findtime':'寻找坐席',
+        'inltime': '响铃',
+        'starttime': '开始通话',
+        'endtime': '结束通话',
+        'savetime': '保存工单',
+        'telname': '话务员'
+      },
+      searchData: {
+        condition: '1=1'
+      },
     }
   },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 +215,14 @@ 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.searchData.condition = args.condition
+      this.searchData.orderitem= " outltime desc"
       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',
@@ -241,13 +245,15 @@
           serviceacitivity: [{
             f_service_acitivity_type: '派单'
           }],
+          f_small_area:'',
           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 +298,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: {
       // 当维修员发生改变，获取维修员手机号
@@ -481,6 +492,7 @@
       assignObj() {
         if (this.data) {
           this.model.failure_str = ''
+          this.model.f_small_area = this.data.f_slice_area
           this.model.f_address = this.data.f_address
           this.model.f_user_name = this.data.f_user_name
           this.model.f_user_type = this.data.f_user_type
@@ -517,6 +529,7 @@
             f_meetunit:this.model.serviceacitivity[0].f_meetunit,
             f_reciever:this.model.serviceacitivity[0].f_reciever
           }],
+          f_small_area:'',
           f_finish_date:'',
           f_meetunit : this.model.f_meetunit,
           f_orgstr : this.model.f_orgstr,
@@ -621,6 +634,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 +655,8 @@
             Util.afterCallBz(this.$login.f.id, this.$login.f.name)
           }
           this.saveing = false
+        }).catch(error=>{
+          this.saveing = false
         })
       },
       address() {
@@ -696,6 +716,13 @@
       },
     },
     watch: {
+      'telsource'(){
+        if(this.telsource == '转站点' ) {
+          this.servicesource = '话务来电'
+        }else{
+          this.servicesource = '部门派单'
+        }
+      },
       // 转接类型
       'model.f_handlingtype'(){
         if(this.operType === '修改工单'){
@@ -767,6 +794,9 @@
       getTestData() {
         return this.testdata
       },
+      getSource() {
+        return this.servicesource
+      },
       serviceacitivity() {
         return this.model.serviceacitivity.find((row) => {
           return row.f_service_acitivity_type === '派单'