telephone-clients 3.0.104-4 → 3.0.104-41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.104-4",
+  "version": "3.0.104-41",
   "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

@@ -141,7 +141,7 @@
           //tag;
         };
         this.$webSocket.onCallState =  (event) => {
-          //tag);
+          console.log('国信websocaket返回得数据：')
           const json = event;
           // 弹屏通知
           const id = json.id;
@@ -179,16 +179,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=>{
@@ -313,14 +313,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/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/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/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: '"t_handplan with (nolock)"', 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: '"id desc"'}),
         show: false,
         row: Object
       }
@@ -62,6 +62,11 @@
       'user' (val) {
         if(this.user) {
           this.model.rows = []
+          if(val.f_meter_classify == '物联网表'){
+              this.model.tablename = 't_web_handplan with (nolock)'
+          }else{
+            this.model.tablename = 't_handplan with (nolock)'
+          }
           this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
         }
       },
@@ -71,6 +76,12 @@
     },
     ready () {
       if (this.user && this.user.f_userinfo_id) {
+        if(this.user.f_meter_classify == '物联网表'){
+          debugger
+          this.model.tablename = 't_web_handplan with (nolock)'
+        }else{
+          this.model.tablename = 't_handplan with (nolock)'
+        }
         this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
       }
     }

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
       }