telephone-clients 3.0.104-5 → 3.0.104-51

package/src/filiale/rizhao/pc/WorkListAllNew.vue

@@ -232,8 +232,9 @@
               <th>
                 <nobr>离开时间</nobr>
               </th>
-
-
+              <th>
+                <nobr>工单备注</nobr>
+              </th>
               <th>
                 <nobr>工单结果</nobr>
               </th>
@@ -306,6 +307,9 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_date_leave }}</nobr>
             </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_remarks }}</nobr>
+            </td>
             <td  style="text-align: center;">
               <nobr>{{ row.f_result_status }}</nobr>
             </td>
@@ -403,8 +407,8 @@ export default {
       contents:this.$appdata.getParam('报修全部类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('报修全部类型')]:[],
       zhihuans: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '异常', value: '异常'}],
       finishdates: [{label: '全部', value: ''}, {label: '未超期', value: '未超期'}, {label: '已超期', value: '已超期'}],
-      headData: ['工单类型', '报修类型', '工单编号', '用户姓名', '用户地址', '用户电话', '报修电话', '报修时间', '报修原因', '维修人'],
-      bodyData: ['f_workorder_type', 'f_repairtype', 'f_service_id', 'f_user_name', 'f_address', 'f_phone', 'f_contact_phone', 'f_created_date', 'f_remarks', 'f_order_man'],
+      headData: ['工单类型', '报修类型', '工单编号', '用户姓名', '用户地址', '用户电话', '报修电话','故障明细', '报修时间', '报修原因', '维修人'],
+      bodyData: ['f_workorder_type', 'f_repairtype', 'f_service_id', 'f_user_name', 'f_address', 'f_phone', 'f_contact_phone','failure', 'f_created_date', 'f_remarks', 'f_order_man'],
       searchData: {
         condition: '1=1'
       },
@@ -416,7 +420,7 @@ export default {
         'f_user_name': '用户姓名',
         'f_address': '用户地址',
         'f_contact_phone': '联系电话',
-
+        'failure':'故障明细',
         'f_single_man': '派单人',
         'f_attendant': '受理人',
         'f_order_man': '接单人',

package/src/filiale/rizhao/telephone.js

@@ -45,7 +45,7 @@ let specialComp = {
   'record-list-left':(resolve) => { require(['./pc/RecordListLeft'], resolve) },
   'changemeter-info':(resolve) => { require(['./pc/ChangemeterInfo'], resolve) },
   'work-list': (resolve) => { require(['./pc/WorkList'], resolve) },
-  'console': (resolve) => { require(['./pc/console'], resolve) },
+  'console': (resolve) => { require(['./pc/Console'], resolve) },
   'reminder-order': (resolve) => { require(['./pc/ReminderOrder'], resolve) },
   'new-repair-paper': (resolve) => { require(['./pc/NewRepairPaper'], resolve) },
 }

package/src/filiale/shanxian/pc/TelFindUser.vue

@@ -0,0 +1,310 @@
+<template >
+  <div id="pc-finduser-page1" class="aaa4" style="background-color: #f8f8f8">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+      <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row" style="margin:10px 10px 0 10px">
+          <div class="form-group col-sm-4"  >
+            <label class="font_normal_body" style="width:55%">电话号码:</label>
+            <input type="text" class="input_search" v-model="model.f_user_phone" placeholder='电话号码'
+                   condition="ti.f_user_phone like '%{}%'"
+                   :size="model.f_user_phone ? model.f_user_phone.length : 8" style="height: 95%;width: 90%"/>
+          </div>
+          <div class="form-group col-sm-4"  >
+            <label class="font_normal_body" style="width:55%">用户编号:</label>
+            <input type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='用户编号'
+                   condition="ti.f_userinfo_code like '%{}%'"
+                   :size="model.f_userinfo_code ? model.f_userinfo_code.length : 8" style="height: 95%;width: 90%"/>
+          </div>
+            <div class="form-group col-sm-4">
+              <button type="button" name="button" class="button_spacing button_search" style="float: right" @click="search()">查询</button>
+              <button type="button" name="button" style="background-color: #5ac0d9;border-radius: 4px;"  class="button_spacing button_search" @click="$parent.$parent.clear()">清空</button>
+            </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body" style="width:55%">表号:</label>
+            <input type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
+                   condition="tu.f_meternumber like '%{}%'"
+                   :size="model.f_meternumber ? model.f_meternumber.length : 8" style="height: 95%;width: 90%"/>
+          </div>
+          <div class="form-group col-sm-4"  >
+            <label class="font_normal_body" style="width:55%">用户名称:</label>
+            <input type="text" class="input_search" v-model="model.f_user_name" placeholder='姓名'
+                   condition="ti.f_user_name like '%{}%'"
+                   :size="model.f_user_name ? model.f_user_name.length * 2 : 4" style="height: 95%;width: 90%"/>
+          </div>
+          <div class="form-group col-sm-4"  >
+            <label class="font_normal_body" style="width:55%">用户地址:</label>
+            <input type="text" class="input_search" v-model="model.f_address" placeholder='地址'
+                   condition="ta.f_address like '%{}%'"
+                   :size="model.f_address ? model.f_address.length * 2 : 4" style="height: 95%;width: 90%"/>
+          </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.enter_number_show">
+              <label class="font_normal_body" style="width:55%">入户证号:</label>
+              <input type="text" class="input_search" v-model="model.f_enter_number" placeholder='入户证号'
+                     condition="ta.f_enter_number like '%{}%'"
+                     style="height: 95%;width: 90%"/>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.residential_area_show">
+              <label class="font_normal_body" style="width:55%">小区:</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area" placeholder='小区'
+                     condition="ta.f_residential_area like '%{}%'"
+                     style="height: 95%;width: 90%"/>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.building_show">
+              <label class="font_normal_body" style="width:55%">楼栋:</label>
+              <input type="text" class="input_search" v-model="model.f_building" placeholder='楼栋'
+                     condition="ta.f_building = '{}'"
+                     style="height: 95%;width: 90%"/>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.unit_show">
+              <label class="font_normal_body" style="width:55%">单元:</label>
+              <input type="text" class="input_search" v-model="model.f_unit" placeholder='单元'
+                     condition="ta.f_unit = '{}'"
+                     style="height: 95%;width: 90%"/>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.floor_show">
+              <label class="font_normal_body" style="width:55%">楼层:</label>
+              <input type="text" class="input_search" v-model="model.f_floor" placeholder='楼层'
+                     condition="ta.f_floor = '{}'"
+                     style="height: 95%;width: 90%"/>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.room_show">
+              <label class="font_normal_body" style="width:55%">房间号:</label>
+              <input type="text" class="input_search" v-model="model.f_room" placeholder='房间号'
+                     condition="ta.f_room = '{}'"
+                     style="height: 95%;width: 90%"/>
+            </div>
+            <div class="form-group col-sm-4" v-if="false" >
+              <label class="font_normal_body" style="width:55%">是否预备:</label>
+              <v-select :value.sync="model.is_prepare" :options='$parent.$parent.is_prepares' placeholder='是否预备' close-on-select width="60%"
+                        class="select select_list form-group"  v-model='model.is_prepare'  :search='true'></v-select>
+            </div>
+<!--          <div class="form-group col-sm-2"  >-->
+<!--            <v-select :value.sync="model.f_residential_area" :options='$parent.$parent.areaselected' placeholder='小区' close-on-select width="90%"-->
+<!--                      :size="model.f_residential_area?model.f_residential_area.length * 2 : 4"   class="select select_list form-group"  v-model='model.f_residential_area'   condition="ta.f_residential_area like '%{}%'" :search='true'></v-select>-->
+<!--          </div>-->
+
+          </div>
+        </div>
+      </criteria>
+      <list :model='model' partial='list' style="background-color: #f8f8f8;overflow: auto;">
+        <div partial class="panel panel-default well" style="margin: 15px 10px 0 10px;background-color: #ffffff;border-radius: 8px;border: solid 1px #dddddd;">
+          <div class="panel-body inbg" :class="{aaa: $parent.$parent.$parent.tempnumber === row.f_userinfo_code}">
+            <div class="row">
+              <div class="col-sm-4">
+                <label style="color: #666666"> 用户编号:</label> {{row.f_userinfo_code}}
+              </div>
+              <div class="col-sm-4">
+                <label style="color: #666666">用户姓名:</label> {{row.f_user_name}}
+              </div>
+              <div class="col-sm-4">
+                <label style="color: #666666">用户状态: </label>{{row.f_user_state}}
+              </div>
+
+            </div>
+            <div class="row">
+              <div class="col-sm-4">
+                <label style="color: #666666">用户电话:</label> {{row.f_user_phone}}
+              </div>
+              <div class="col-sm-4">
+                <label style="color: #666666">用户类别: </label>{{row.f_user_type}}
+              </div>
+              <div class="col-sm-4">
+                <label style="color: #666666">账户结余: </label>{{row.f_balance}}
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-sm-6" v-if="$parent.$parent.$parent.enter_number_show">
+                <label style="color: #666666">入户证号: </label>{{row.f_enter_number}}
+              </div>
+              <div class="col-sm-6">
+                <label style="color: #666666">详细地址: </label>{{row.f_address}}
+              </div>
+              <div class="col-sm-6">
+                <label style="color: #666666">区域信息: </label>{{row.f_slice_area}}
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-sm-6" v-if="$parent.$parent.$parent.isText">
+                <button type="button" name="button" class="btn btn-link"
+                        @click.stop="$parent.$parent.$parent.bind(row)">绑定</button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+export default {
+  title: '查询用户',
+  data () {
+    return {
+      model: new PagedList('rs/sql/tel_getUserInfoAdress', 10),
+      show: false,
+      row: Object,
+      is_prepares:[{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+      tempnumber: '',
+      rows:[],
+      enter_number_show:true,
+      residential_area_show:true,
+      building_show:true,
+      unit_show:true,
+      room_show:true,
+      floor_show:true
+    }
+  },
+  props: {
+    isText: {
+      type: Boolean,
+      default: false
+    },
+    user: {},
+    callObj:{
+      type: Object
+    },
+  },
+  methods: {
+    clear(){
+      //清空查询条件
+      this.$refs.paged.$refs.criteria.model={}
+    },
+    // 获取该组件配置文件
+    getTelFindUserConfig(){
+      let http  = new HttpResetClass()
+      http.load('GET', `/phone/rs/vue`, {}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+        if(res.data.telephone){
+          if (res.data.telephone.TelFindUser){
+            let telconfig = res.data.telephone.TelFindUser.data
+            if(telconfig.criteria){
+              telconfig.criteria.forEach((item)=>{
+                if(item.name =='入户证号'){
+                  this.enter_number_show = item.ifshow
+                }
+                if(item.name =='小区'){
+                  this.residential_area_show = item.ifshow
+                }
+                if(item.name =='楼栋'){
+                  this.building_show = item.ifshow
+                }
+                if(item.name =='单元'){
+                  this.unit_show = item.ifshow
+                }
+                if(item.name =='房间号'){
+                  this.room_show = item.ifshow
+                }
+                if(item.name =='楼层'){
+                  this.floor_show = item.ifshow
+                }
+
+              })
+            }
+          }
+        }
+      })
+    },
+    search (args) {
+      if(args.model.is_prepare && args.model.is_prepare.length>0 && args.model.is_prepare[0]=='是'){
+        args.condition += ` and 1=1  and ti.f_user_state = '预备' and tu.f_table_state = '待开通'`
+      }else if(args.model.is_prepare && args.model.is_prepare.length>0 && args.model.is_prepare[0]=='否'){
+        args.condition += ` and 1=1 and ti.f_user_state != '预备' and tu.f_table_state != '待开通'`
+      }else {
+        args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state in('正常','停用','预备')`
+      }
+      this.model.search(args.condition, args.model)
+    },
+    bind (row) {
+      //tag
+    },
+    teleNoQuery (teleNo) {
+      this.$refs.paged.$refs.criteria.model.f_user_phone = teleNo
+      this.$refs.paged.$refs.criteria.search()
+    }
+  },
+  ready(){
+    this.getTelFindUserConfig()
+    this.$refs.paged.$refs.criteria.search()
+
+  },
+  watch: {
+    'callObj.callNum' () {
+      // 查找用户的 业务逻辑
+      let http = new HttpResetClass()
+      http.load('POST', 'rs/sql/tel_getUserInfoAdress', {data: {
+          condition: `(f_user_phone = '${this.callObj.callNum}' or f_zuhu_phone = '${this.callObj.callNum}' or f_rent_phone = '${this.callObj.callNum}') and ti.f_user_state = '正常' `,
+        }},{resolveMsg: null, rejectMsg: null}).then((req) => {
+        this.model.rows = req.data
+        this.model.state = '正确'
+      })
+    },
+    'user' (val) {
+      // this.$resetpost('rs/sql/singleTable', {data: { tablename: 't_userinfo', condition: "f_user_name='" + this.user.name + "' and f_userinfo_id=" + this.user.userId }}).then((req) => {
+      //   this.row = req.data
+      // })
+      if (val.name === '' && val.userId === '') { // 用户未绑定
+        // 清空查询条件
+        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+          this.$refs.paged.$refs.criteria.model[key] = ''
+        })
+        this.model.rows = []
+        this.model.state = '错误'
+        this.model.error = '未找到用户或用户未绑定'
+        this.$emit('find-error', '未找到用户或用户未绑定')
+        return
+      }
+      this.$refs.paged.$refs.criteria.model.f_user_name = this.user.name
+      this.$refs.paged.$refs.criteria.model.f_userinfo_id = this.user.userId
+      this.$refs.paged.$refs.criteria.search()
+      // this.model.search(`f_user_name = '${this.user.name}' and f_userinfo_id = ${this.user.userId}`, this.model)
+    },
+    'model.state' (val) {
+      if (val === '正确' && this.model.rows.length === 1) {
+        this.$emit('find-one', this.model.rows[0])
+      }
+    }
+  },
+  events: {
+    //点击用户信息后变色
+    'select-changed' :function (val) {
+      this.tempnumber = val.val.f_userinfo_code
+    }
+  }
+}
+</script>
+<style scoped>
+label {
+  width: 80px;
+}
+#pc-finduser-page .form-input-group {
+  margin: 5px 0px;
+  height: auto;
+}
+.themeOne .span{
+  overflow-y: scroll;
+}
+.pager{
+  margin: 5px 0px !important;
+  background-color: #f8f8f8;
+}
+  .inbg{
+    font-family: PingFang-SC-Medium;
+    font-size: 14px;
+    font-weight: normal;
+    font-stretch: normal;
+    line-height: 18px;
+    letter-spacing: 0px;
+    color: #333333;
+  }
+  .aaa{
+    background-color: #d8eafb;
+  }
+</style>
+<style>
+  #pc-finduser-page1 ul{
+    margin: 5px 0px !important;
+    background-color: #f8f8f8 !important;
+  }
+</style>

package/src/filiale/shanxian/pc/WorkList.vue

@@ -244,7 +244,7 @@
       <delay-reply :row="selectone" @success="selfSearch()" @cancel="editflag = null"></delay-reply>
     </div>
   </div>
-  <modal :show.sync="editflag==='工单打回'||editflag==='工单下发'||editflag==='派单'" v-if="editflag==='工单打回'||editflag==='工单下发'||editflag==='派单'" v-ref:modal backdrop="false">
+  <modal :show.sync="editflag==='工单打回'||editflag==='工单下发'||editflag==='派单'" v-ref:modal backdrop="false">
     <header slot="modal-header" class="modal-header">
       {{ editflag === '工单打回' ? '工单打回' : editflag ==='工单下发'?'工单下发':'派单' }}
     </header>
@@ -713,7 +713,7 @@ export default {
     },
     proc (selectone, type) {
       this.editflag = type
-      this.selectone = selectone
+      this.selectone = Object.assign({},selectone)
     },
     complanReview (itemVal, type) {
       //tag

package/src/filiale/shanxian/telephone.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 //pc和手机分别注册到两个文件中
 let specialComp = {
   'work-list': (resolve) => { require(['./pc/WorkList'], resolve) },
+  'tel-find-user':(resolve) => { require(['./pc/TelFindUser'], resolve) },
   'repairs-work': (resolve) => { require(['./pc/RepairsWork'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/shexian/android/AddMyTask.vue

@@ -175,6 +175,13 @@
                          @click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_contact_phone)'>
                   </p>
                 </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>租户电话:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_zuhu_phone || '无' }}
+                    <img src="../../../assets/telphonesend.png" style="width: 12px;"
+                         @click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_zuhu_phone)'>
+                  </p>
+                </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font" style="float: left"><b>派单员:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{row.f_attendant}} </p>

package/src/filiale/shexian/android/RepairFirstV.vue

@@ -104,6 +104,11 @@
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     用户姓名: {{ row.f_user_name }}
                   </div>
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    租户电话: {{ row.f_zuhu_phone }}
+                    <img src="../../../assets/telphonesend.png" style="width: 12px;"
+                         @click.stop.prevent='makeAPhoneCall(row.f_zuhu_phone)'>
+                  </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     来电电话: {{ row.f_phone }}
                     <img src="../../../assets/telphonesend.png" style="width: 12px;"

package/src/filiale/shexian/android/RepairInfo.vue

@@ -17,6 +17,7 @@
         <!--<p>预约时间： {{service.f_repair_date}}</p>-->
         <p>来电电话： {{service.f_phone}}<img src="../../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(service.f_phone)'></p>
         <p>联系电话： {{service.f_contact_phone}}<img src="../../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(service.f_contact_phone)'></p>
+        <p>租户电话： {{service.f_zuhu_phone}}<img src="../../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(service.f_rent_phone)'></p>
         <p>开启录音：<button type="button" class="btn btn-default" @click="openRecord()">开启</button>
         </p>
         <!--<p>用户姓名： {{service.f_user_name}}</p>-->

package/src/filiale/shexian/pc/TelAgentVoiceReport.vue

@@ -62,9 +62,9 @@
                 <th>
                   <nobr>接线率</nobr>
                 </th>
-                <th>
-                  <nobr>置忙次数</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>置忙次数</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>已接</nobr>
                 </th>
@@ -111,9 +111,9 @@
                 <td style="text-align:center">
                   <nobr>{{ row.scale }}</nobr>
                 </td>
-                <td style="text-align:center">
-                  <nobr>{{ row.zhimangcishu }}</nobr>
-                </td>
+<!--                <td style="text-align:center">-->
+<!--                  <nobr>{{ row.zhimangcishu }}</nobr>-->
+<!--                </td>-->
                 <td style="text-align:center" >
                   <nobr>{{ row.yijie }}</nobr>
                 </td>
@@ -151,7 +151,7 @@
               <td style="text-align: center"><span><b> </b></span></td>
               <td style="text-align: center">{{model.sums.zongji}}</td>
               <td style="text-align: center">{{((model.sums.yijie/model.sums.zongji)*100).toFixed(2)+'%'}}</td>
-              <td style="text-align: center">{{model.sums.zhimangcishu}}</td>
+<!--              <td style="text-align: center">{{model.sums.zhimangcishu}}</td>-->
               <td style="text-align: center">{{model.sums.yijie}}</td>
               <td style="text-align: center">{{model.sums.weijie}}</td>
               <td style="text-align: center">{{model.sums.waibo}}</td>
@@ -181,7 +181,7 @@ export default {
       startDate: 'this.startDate',
       endDate: 'this.endDate',
       f_filiale_id: 'this.f_filiale_id'
-    },{zongji:'',yijie:'',weijie:'',waibo:'',zhimangcishu:'',zixundan:'',tousudan:'',baoxiudan:''})
+    },{zongji:'',yijie:'',weijie:'',waibo:'',zixundan:'',tousudan:'',baoxiudan:''})
     model.f_filiale_id = `('${this.$login.f.orgid}')`
     model.startDate=Util.getYesterDay() + ' 00:00:00'//昨天时间
     model.endDate=Util.toStandardDateString()+ ' 23:59:59'//当前时间
@@ -204,7 +204,7 @@ export default {
         'id': '工号',
         'quanbujieting': '接线数',
         'scale': '接线率',
-        'zhimangcishu': '置忙次数',
+        // 'zhimangcishu': '置忙次数',
         'yijie': '已接',
         'weijie': '未接',
         'waibo': '外拨',

package/src/filiale/shexian/pc/WorkList.vue

@@ -37,7 +37,7 @@
               <export-excel-tel
                 :data="$parent.$parent.searchData"
                 :field="$parent.$parent.excelHeaders"
-                sqlurl="rs/logic/telephoneExport" sql-name="operatorService" template-name='工单导出'
+                sqlurl="rs/logic/telephoneExport" :sql-name="$parent.$parent.sqlname" template-name='工单导出'
                 :choose-col="true"></export-excel-tel>
               <div style="float: right;" class="button_spacing"
                    :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -393,6 +393,7 @@ export default {
   title: '工单列表',
   data () {
     return {
+      sqlname:'operatorService',
       // 结案备注
       f_caseremarks:'',
       criteriaShow: false,
@@ -503,8 +504,10 @@ export default {
       this.serlist = []
       if (this.picked) {
         if (this.picked === 'wait') {
+          this.sqlname = 'operatorService'
           this.model.url = 'rs/sql/operatorService'
         } else if (this.picked === 'done') {
+          this.sqlname = 'doneService'
           this.model.url = 'rs/sql/doneService'
         }
         this.model.rows = []

package/src/filiale/shexian/pc/WorkListAllNew.vue

@@ -145,7 +145,6 @@
                 <v-select :value.sync="model.defname" v-model='model.defname'
                           :value-single="true"
                           :options='$parent.$parent.defnames' placeholder='工单状态'
-                          condition="sa.defname = '{}'"
                           close-on-select></v-select>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -234,6 +233,9 @@
               <th>
                 <nobr>派单人</nobr>
               </th>
+              <th>
+                <nobr>接单时间</nobr>
+              </th>
               <th>
                 <nobr>话务员</nobr>
               </th>
@@ -319,6 +321,9 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_single_man }}</nobr>
             </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.sendtime }}</nobr>
+            </td>
             <td  style="text-align: center;">
               <nobr>{{ row.f_attendant }}</nobr>
             </td>
@@ -453,6 +458,7 @@ export default {
         'f_json': '故障明细',
         'f_repair_remarks': '维修结果',
         'f_single_man': '派单人',
+        'sendtime': '接单时间',
         'f_attendant': '受理人',
         'f_order_man': '接单人',
         'defname': '工单状态',
@@ -591,6 +597,13 @@ export default {
       } else {
         args.condition += ` and tswo.f_filiale_id = '${this.$login.f.orgid}'`
       }
+      if(args.model.defname){
+        if(args.model.defname == '无法处理'){
+          args.condition += ` and (sa.defname = '无法处理' or  tswo.f_state = '完成')`
+        }else{
+          args.condition += ` and sa.defname = '${args.model.defname}'`
+        }
+      }
 
       this.searchData.condition = args.condition
       return this.model.search(args.condition, args.model)