telephone-clients 3.0.104-46 → 3.0.104-47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.104-46",
+  "version": "3.0.104-47",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/guoxin/Console.vue

@@ -96,6 +96,8 @@
         initPhone: '',
         phonelist: [],
         timeSubscribeId:null,
+        timeZhiXianId:null,
+        timeZhiXianFen:300,
         list: [],
         newPhone: '',
         interval: null, // 循环函数返回值，用来停止循环
@@ -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
@@ -258,9 +262,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 +288,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

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()