telephone-clients 3.0.104-1 → 3.0.104-100

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,33 @@
               <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>
+              <v-select :value.sync="model.istelon" :value-single="true"
+                        v-model="model.istelon"
+                        :options='$parent.$parent.istelons' 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="开始时间"
@@ -140,6 +160,9 @@ export default {
   title: "电话记录列表",
   data () {
     return {
+      istelons:[{label: '全部', value: ''},
+        {label: '是', value: '是'},
+        {label: '否', value: '否'}],
       criteriaShow: false,
       LoggedStates: [{label: '全部', value: ''},
         {label: '呼入', value: '呼入'},
@@ -154,15 +177,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 +227,20 @@ 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
+        }
+      }
+      if(args.model.istelon == '是'){
+        args.condition = args.condition + " and recordfile is not null  and  recordfile != '' "
+      }
+      if(args.model.istelon == '否'){
+        args.condition = args.condition + "and (recordfile is  null  or  recordfile = '') "
+      }
+      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 === '派单'

package/src/components/pc/RoleSelector.vue

@@ -78,6 +78,9 @@ import {HttpResetClass} from 'vue-client'
     methods: {
       valuechange(val){
 
+        if (val instanceof Event){
+          return
+        }
         if(this.valueMultiple && Array.isArray(val)){
           if(val&&val.length > 0){
             var valuesele = `(`
@@ -91,7 +94,10 @@ import {HttpResetClass} from 'vue-client'
         }else{
            this.value = val
         }
-        this.changeval = val
+        if (!this.value instanceof Event) {
+          this.changeval = val
+          this.value = val
+        }
       },
       getRes(obj) {
         this.resids = obj.resids

package/src/components/pc/Seekwork.vue

@@ -123,6 +123,7 @@ export default {
           f_reciever:'',
           f_complaint_results:''
         }],
+        f_small_area:'',
         f_content: '', //咨询内容
         f_user_name: '',
         f_phone: '',
@@ -205,6 +206,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
     },
     cleardata () {
@@ -218,6 +220,7 @@ export default {
           f_reciever:f_reciever1,
           f_complaint_results:''
         }],
+        f_small_area:'',
         f_content: '',
         f_user_name: '',
         f_phone: '',

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,15 @@ export default {
     }
   },
   methods: {
+    // 选中部门
+    reres(val){
+      if(val.res == undefined || val.res[0] == undefined || val.res[0] == ''){
+        return
+      }
+      this.row.f_outlets = val.res[0]
+      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 +160,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()
@@ -192,6 +228,7 @@ export default {
           userdata.f_advice = this.f_advice
           let data = {
             model: userdata,
+            handlingtype: this.f_handlingtype,
             loginUser: {name: this.$login.f.name, ename: this.$login.f.ename}
             // adduser:{userinfo: result, devices: []}
           }

package/src/components/pc/TelLossList.vue

@@ -8,7 +8,7 @@
             <datepicker placeholder="查询日期"
                         :value.sync="searchDate"
                         v-model="searchDate"
-                        :format="'yyyy-MM-dd 00:00:00'"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
             <button type="button" name="button"
                     class="button_search button_spacing" style="z-index: 2" @click="searchEcharts()">查询</button>
@@ -35,7 +35,7 @@
                   <datepicker placeholder="来电时间"
                               :value.sync="model.f_date"
                               v-model="model.f_date"
-                              :format="'yyyy-MM-dd 00:00:00'"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
                               condition="outltime > '{}'"
                   ></datepicker>
                 </div>
@@ -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/VisitInfo.vue

@@ -79,6 +79,28 @@
         </div>
       </div>
     </div>
+    <modal :show.sync="showcalloutResult" width="50%"  backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <center><h4 class="modal-title ">{{showTitle}}结果</h4></center>
+      </header>
+      <article slot="modal-body" class="modal-body" style="height: 100px;padding-top: 15px!important;">
+        <div v-show="!calloutResult"><label>正在{{ showTitle }}，请稍后。。。。。。</label></div>
+        <div v-show="calloutResult">
+          <div class="row auto" v-show="calloutResult.area">
+            <label>真实归属地:</label><span>{{calloutResult.area}}</span>
+          </div>
+          <div class="row auto" v-show="calloutResult.calloutNo">
+            <label>真实呼出号码:</label><span>{{calloutResult.calloutNo}}</span>
+          </div>
+          <div class="row auto" v-show="calloutResult.err">
+            <label>其他信息:</label><span>{{calloutResult.err}}</span>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='calloutConfirm()'>确认</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -93,7 +115,11 @@
       row:Object,
       phone:'',
       idwavfile:'',
-      outltime:''
+      outltime:'',
+      showcalloutResult:false,
+      calloutResult:null,
+      showTitle:'呼出'
+
     },
     data () {
       return {
@@ -117,6 +143,10 @@
       }
     },
     methods: {
+      calloutConfirm(){
+        this.calloutResult=null
+        this.showcalloutResult=false
+      },
       //获取当前时间
       getNowFormatDate() {
         var date = new Date();
@@ -201,7 +231,6 @@
         if(telnum){
           let http = new HttpResetClass()
           try{
-            this.$showMessage("号码"+telnum+"    正在呼出...")
             http.load('POST', wxcon.voiceUrl, {
               aId: this.$login.f.id,
               aChannel: Util.attendant.aChannel,
@@ -213,15 +242,23 @@
               RoleId:this.$login.f.rolesnames,
               sendTime:Util.toStandardTimeString()
             }, {resolveMsg: null, rejectMsg: null}).then((req) => {
-              // 返回录音ID 存在回访数据里
-              this.model.f_record_sound = req.data.RecordsID
-              //tag
+              this.calloutResult = req.data.calloutResult
+              if (req.data.desc === '呼出失败') {
+                this.$showAlert(`呼出${telnum}失败`, 'danger', 0)
+              }else{
+                this.showcalloutResult=true
+                this.showTitle='呼出'
+                // 返回录音ID 存在回访数据里
+                this.model.f_record_sound = req.data.RecordsID
+              }
             })
           }catch(e){
-            //tag
+            this.$showAlert(`${e.data},呼出失败`, 'danger', 0)
+            this.callContent = '呼出失败'
           }
         }else{
-          //tag
+          this.$showAlert(`无电话号码`, 'danger', 0)
+          this.callContent = '呼出失败'
         }
       },
     },

package/src/components/pc/WorkHistory.vue

@@ -14,7 +14,7 @@
         <div class="row"
              v-if="service.f_workorder_type=='报修单'|| service.f_workorder_type=='置换通气单'|| service.f_workorder_type=='安装单'">
           <label class="col-sm-4 ">当前状态：</label>
-          <span class="col-sm-8">{{ rowOne.processins.activities[0].defname }}</span>
+          <span class="col-sm-8">{{ rowOne.defname }}</span>
         </div>
         <div class="row">
           <label class="col-sm-4 ">工单时间：</label>

package/src/components/pc/WorkList.vue

@@ -273,7 +273,7 @@
           </div>
 
           <div class="col-sm-12  form-input-group" >
-            <label class="font_normal_body" style="width: 10%">备注</label>
+            <label class="font_normal_body" style="width: 10%">描述</label>
             <textarea name="name" rows="3"  v-model="showModalComplan.f_remarks"
                       class="form-control ver-textarea" readonly="readonly"></textarea>
           </div>
@@ -326,7 +326,7 @@
           </div>
 
           <div class="col-sm-12  form-input-group" >
-            <label class="font_normal_body" style="width: 10%">备注</label>
+            <label class="font_normal_body" style="width: 10%">描述</label>
             <textarea name="name" rows="3"  v-model="showModalSeekWork.f_remarks"
                       class="form-control ver-textarea" readonly="readonly"></textarea>
           </div>
@@ -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
     }