telephone-clients 3.0.103 → 3.0.104-1

package/src/components/pc/RepairsWork.vue

@@ -256,6 +256,7 @@
           f_reciever:'',
           f_remarks: '',
           f_user_type: '',
+          failure_str:'',
           f_area: '',
           f_unit_name:'',
           f_street: '',
@@ -354,8 +355,9 @@
         http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           // let result = res.data.filter(res=>res.orgid==this.$login.f.orgid)
           res.data.forEach((item) => {
-            this.repairers.push({label: `${item.name}`, value: item.name})
-
+            if (item.state == '在职'){
+              this.repairers.push({label: `${item.name}`, value: item.name})
+            }
           })
         })
       },
@@ -478,6 +480,7 @@
       },
       assignObj() {
         if (this.data) {
+          this.model.failure_str = ''
           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
@@ -524,6 +527,7 @@
           f_user_name: '',
           failure: '',
           f_userinfo_id: '',
+          failure_str:'',
           f_address: '',
           f_json: '',
           f_repair_date: Util.getNowDate(),
@@ -581,6 +585,18 @@
           this.model.f_outlets = this.$login.f.deps
           this.model.f_filiale_id = this.$login.f.orgid
         }
+        let failureStr = ''
+        if(this.model.failure.startsWith("[")){
+          const failureData = JSON.parse(this.model.failure)
+          failureData.forEach(item=>{
+            if (item.failurecase.length>0){
+              failureStr+=item.f_failure_type+":"+item.failurecase.toString()+";"
+            }else {
+              failureStr+=item.f_failure_type+";"
+            }
+          })
+          this.model.failure_str = failureStr
+        }
         let data = {
           model: this.model, loginUser: {
             name: this.loginUser.name,
@@ -603,6 +619,7 @@
           url = config[this.operType].url
           data.toRepair = '一级派单'
         }
+        data.model.f_state = null
         this.saveing = true
         return this.$resetpost(url, data).then((data) => {
            if(data.data && data.data.id){
@@ -681,6 +698,9 @@
     watch: {
       // 转接类型
       'model.f_handlingtype'(){
+        if(this.operType === '修改工单'){
+          return
+        }
         // 清楚上次记录
         this.model.serviceacitivity[0].f_reciever = ''
         this.model.serviceacitivity[0].f_meetunit =''

package/src/components/pc/RoleSelectorDep.vue

@@ -0,0 +1,158 @@
+<template>
+  <div style="width: 100%;height: 100%">
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">所属部门</label>
+      <right-tree-safe-dep :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe-dep>
+    </div>
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">{{ roleLable }}</label>
+      <v-select :value="selVal" v-model='selVal'
+                :value-single="!valueMultiple"
+                class="select_list select"
+                :options='users' :placeholder='roleName'
+                :close-on-select = 'valueClose'
+                :multiple="valueMultiple"
+                :width="rightWidth"
+                @change="valuechange">
+      </v-select>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    name: "RoleSelector",
+    props: {
+      valueMultiple: {
+        type: Boolean,
+        default: false
+      },
+      roleName: {
+        type: String,
+        default: '安检员'
+      },
+      roleLable: {
+        type: String,
+        default: '安检员'
+      },
+      leftWidth: {
+        type: String,
+        default: '60%'
+      },
+      rightWidth: {
+        type: String,
+        default: '60%'
+      },
+      value: {
+        default: ''
+      },
+      resobjprop: {
+        default: {}
+      },
+      valueClose: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        // source: `tool.getChildrenOfResName($${this.roleName}$)`,
+        source: `root.getResourceById($${this.$login.f.depids}$,$department$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`,
+        allUsers: [],
+        users: [],
+        selVal: '',
+        organizationname:this.$login.f.organizationname,
+        resids: [],
+        changeval: ''
+      }
+    },
+    watch: {
+      'value'(val) {
+        console.log("969696", val)
+        if (val) {
+          if (this.valueMultiple) {
+
+          } else {
+            this.selVal = val
+          }
+
+        }
+      }
+    },
+    async ready() {
+      await this.search()
+      await this.filterUser(this.resids)
+    },
+    methods: {
+      async search() {
+        let http = new HttpResetClass()
+        const res = await http.load('POST', '/rs/search', {
+          data: {
+            source: this.source,
+            userid: this.$login.f.id
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.allUsers = res.data
+      },
+      valuechange(val) {
+        console.log(`val instanceof Array======${!val instanceof Array}`)
+        if ((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)) {
+          return
+        }
+        if (this.valueMultiple && Array.isArray(val)) {
+          if (val && val.length > 0) {
+            let valuesele = `(`
+            for (let i = 0; i < val.length; i++) {
+              valuesele += `'${val[i]}',`
+            }
+            this.value = valuesele.substring(0, valuesele.length - 1) + ')'
+          } else {
+            this.value = ''
+          }
+        } else {
+          this.value = val
+        }
+        // this.changeval = val
+      },
+      getRes(obj) {
+        this.resids = obj.resids
+        this.organizationname = obj.res[0]
+        this.filterUser(this.resids)
+        this.$dispatch('re-res', obj)
+      },
+      async filterUser(resids) {
+        // 处理第一次进入页面值异常问题
+        if (resids.length > 0 && typeof resids[0] == "object") {
+          resids = resids[0]
+        }
+        if (resids[0]) {
+          this.source = `root.getResourceById($${resids[0]}$,$department$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`
+          await this.search()
+        }
+        this.users = []
+        this.allUsers.forEach(user => {
+            this.users.push({label: user.name, value: user.name})
+        })
+        if (!this.valueMultiple && this.users.length > 0) {
+          this.users = [{label: '全部', value: ''}, ...this.users]
+        }
+        let temp = []
+        this.users = this.users.filter(item => {
+          if (!temp.includes(item.label)) {
+            temp.push(item.label)
+            return true
+          }
+          return false
+        })
+        this.$emit('alluser', this.allUsers)
+        //tag
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/pc/TelFindUser.vue

@@ -206,7 +206,7 @@ export default {
       }else if(this.$login.f.orgid == 46997 && this.$login.f.fullnames.indexOf("铜川市天然气")!= -1){
         args.condition += ` and ti.f_user_state = '正常'`
       }else {
-        args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state = '正常'`
+        args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state in('正常','停用','预备')`
       }
       this.model.search(args.condition, args.model)
     },

package/src/components/pc/TelListener.vue

@@ -24,7 +24,7 @@
           <td style="text-align: center;">{{inlinemodel1.aState}}</td>
           <td style="text-align: center;">{{inlinemodel1.callingNo}}</td>
           <td style="text-align: center;">
-            <button-link type="button" class="btn btn-link" @click="listen(inlinemodel1.aChannel)">监听</button-link>
+            <button-link type="button" class="btn btn-link" @click="listen(inlinemodel1)">监听</button-link>
           </td>
         </tr>
         <tr v-for="outlinemodel1 in outlinemodel" >
@@ -39,6 +39,25 @@
       </table>
     </div>
   </div>
+  <modal :show.sync="showlisten" width="50%"  backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <center><h4 class="modal-title ">话务监听信息</h4></center>
+    </header>
+    <article slot="modal-body" class="modal-body" style="height: 100px;padding-top: 15px!important;">
+        <div class="row auto">
+          <label>坐席号码</label><span>{{lisachanl.aChannel}}</span>
+        </div>
+         <div class="row auto">
+           <label>话务人员</label><span>{{lisachanl.aName}}</span>
+         </div>
+         <div class="row auto">
+           <label>通话号码</label><span>{{lisachanl.callingNo}}</span>
+          </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-success" @click='canal'>取消</button>
+    </footer>
+  </modal>
 </template>
 
 <script>
@@ -68,6 +87,12 @@
     },
     data () {
       return {
+        showlisten:false,
+        lisachanl:{
+          aChannel:0,
+          aName:'',
+          callingNo:''
+        },
         interval: null, // 循环函数返回值，用来停止循环
         inlinemodel:{
           type: Object,
@@ -81,18 +106,6 @@
       }
     },
     ready () {
-      // 循环读取通道状态
-      // let sql = 'tel_singleTable_OrderBy'
-      // let condition = {
-      //   items: 'tongdao',
-      //   tablename: 'T_IPTONGDAO',
-      //   condition: `loginip = '${this.$login.f.loginip}'`,
-      //   orderitem: 'id'
-      // }
-      // let http = new HttpResetClass()
-      // http.load('POST', `rs/logic/tel_getOneData`,  {data: {sql: sql, params: condition}},  {resolveMsg: null, rejectMsg: null}).then((req) => {
-      //   this.aChannel = parseInt(req.data.tongdao);
-      // })
       if(this.aChannel) {
         let gen = stateGen(this)
         co(gen)
@@ -105,13 +118,31 @@
 
     },
     methods: {
+      canal(){
+        this.lisachanl = {
+          aChannel:0,
+          aName:'',
+          callingNo:''
+        }
+        this.showlisten = false
+      },
       // 所有控制函数
       // 循环获取通道状态
-      listen(val){
-        val = val + ''
+       listen(val){
+        let valaChannel  = val.aChannel + ''
         let http1 = new HttpResetClass()
-        http1.load('POST', data.voiceUrl, {aId: Util.f.id, RecordsID:'',aChannel:this.aChannel, aModule:1, aBzType:"listen", bzExtra: val, bzId: "1", aName: Util.f.name,RoleId:"话务员"}, {resolveMsg: null, rejectMsg: null}).then((req) => {
+        http1.load('POST', data.voiceUrl, {aId: this.$login.f.id,aName: this.$login.f.name,aChannel:this.aChannel, aModule:1, aBzType:"listen", bzExtra: valaChannel, bzId: "1",RoleId:"话务员"}, {resolveMsg: null, rejectMsg: null}).then((req) => {
           //tag
+          if(req.data && req.data.msg == '开始监听'){
+            this.showlisten = true
+            this.lisachanl = {
+              aChannel:val.aChannel,
+              aName:val.aName,
+              callingNo:val.callingNo
+            }
+          }else{
+            this.$showMessage(`操作结果：${req.data.msg}`)
+          }
         })
       },
 

package/src/components/pc/VisitInfo.vue

@@ -90,7 +90,6 @@
     title: '回访单',
     props: {
       contextxianshi:null,
-      show: false,
       row:Object,
       phone:'',
       idwavfile:'',
@@ -191,14 +190,12 @@
             f_visitdate:this.getNowFormatDate(),
             f_record_sound:''
           })
-          this.show=false
           this.$emit('visitback','commit')
         })
       },
       // 取消
       clearVisit () {
         this.$emit('visitback','nodo')
-        this.show=false
       },
       callout(telnum){
         if(telnum){
@@ -229,13 +226,6 @@
       },
     },
     watch: {
-      'show' () {
-        this.$emit('show-obj', {showVisit: this.show})
-      },
-      'row' () {
-        this.show=this.row;
-        this.$emit('show-obj', {showVisit: this.show})
-      },
       'phone'(val){
         this.model.f_phone = val
       }

package/src/components/pc/WorkCenter.vue

@@ -14,7 +14,7 @@
       <reminder-order :call-obj="callObj" :login-user="loginUser" :row="row" @success="component = 'list'" @cancel="component = 'list'"></reminder-order>
     </div>
     <!--    撤销-->
-    <div class="" v-if="component === '结案'" style="height: 200px;">
+    <div class="" v-if="component === '结案' || component == 'serviceDelete'"  style="height: 200px;">
       <service-delete-order :call-obj="callObj" :login-user="loginUser" :row="row" @success="sucs" @cancel="component = 'list'" ></service-delete-order>
     </div>
     <div class="" v-if="component === 'modify'">

package/src/components/pc/WorkCenterList.vue

@@ -122,7 +122,7 @@
               </div>
               <div v-show="$parent.$parent.$parent.canRemindChange(row) && row.f_workorder_type == '报修单'  &&  row.f_state!='完成' ">
                 <button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$emit('do', 'remind', row)" style="min-width: 30px;">催单</button>
-                <button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$emit('do', 'modify', row)" style="min-width: 30px;">修改</button>
+                <button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$emit('do', 'modify', row)" v-show="row.f_source != '安检'" style="min-width: 30px;">修改</button>
               </div>
               <div v-show="$parent.$parent.$parent.canRemindChange(row) && row.f_workorder_type == '置换通气单'  &&  row.f_state!='完成' ">
                 <button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$emit('do', 'remind', row)" style="min-width: 30px;">催单</button>

package/src/components/pc/WorkHistory.vue

@@ -114,12 +114,30 @@
               <p>{{ activity.f_operator }}将工单{{activity.f_back_type}}</p>
               <p v-if="activity.f_remarks">原因：{{ activity.f_remarks }}</p>
             </div>
+            <!-- 工单打回 工单打回旧版使用t_site_back，兼容之前的逻辑。新版本无需调整此项-->
+            <div style="margin-top: 5px" v-if="activity.type === 't_site_back'">
+              <p>{{ activity.f_site_back_date }}</p>
+              <p>{{ activity.f_site_back_name }}将工单打回</p>
+              <p>原因：{{ activity.f_site_back_reason }}</p>
+            </div>
+            <!-- 未维修，属于维修员打回 兼容之前的逻辑。新版本无需调整此项 -->
+            <div style="margin-top: 5px" v-if="activity.type === 't_notwork'">
+              <p>{{ activity.f_date }}</p>
+              <p>{{ activity.f_name }}未处理</p>
+              <p>原因：{{ activity.f_reason }}</p>
+            </div>
             <!-- 用户催单 -->
             <div style="margin-top: 5px" v-if="activity.type === 't_reminder'">
               <p>{{ activity.f_reminder_date }}</p>
               <p>用户催单</p>
               <p>催单内容：{{ activity.f_content }}</p>
             </div>
+            <!-- 工单撤回 -->
+            <div style="margin-top: 5px" v-if="activity.type === 't_recall'">
+              <p>{{ activity.f_recall_date }}</p>
+              <p>{{ activity.f_recall_name }}撤回工单</p>
+              <p>备注：{{ activity.f_remarks }}</p>
+            </div>
             <!-- 工单信息补充 -->
             <div style="margin-top: 5px" v-if="activity.type === 't_telinformation'">
               <p>{{ activity.f_information_date }}</p>
@@ -270,7 +288,7 @@
           <div class="col-sm-12  form-input-group" >
             <label class="font_normal_body" style="width: 10%" v-if="rowOne.f_workorder_type === '咨询单'">咨询内容</label>
             <label class="font_normal_body" style="width: 10%"  v-if="rowOne.f_workorder_type === '投诉单'">投诉内容</label>
-            <textarea name="name" rows="3" v-model="rowOne.f_content"
+            <textarea name="name" rows="3" v-model="rowOne.f_content || service.f_content"
                       class="form-control ver-textarea" id="f_content" name="f_content" readonly="readonly"></textarea>
           </div>
           <div class="col-sm-4 form-group form-input-group" >
@@ -295,7 +313,7 @@
           </div>
           <div class="col-sm-12  form-input-group">
             <label class="font_normal_body" style="width: 10%">处理结果</label>
-            <textarea name="name" rows="3" v-model="complanResult.f_complaint_results"
+            <textarea name="name" rows="3" v-model="complanResult.f_complaint_results || '已处理'"
                       class="form-control ver-textarea" readonly="readonly"></textarea>
           </div>
         </div>

package/src/components/pc/WorkListAll.vue

@@ -267,7 +267,7 @@
     <header slot="modal-header" class="modal-header">
     </header>
     <article slot="modal-body" class="modal-body">
-      <visit-info-xin v-if="showVisit" :row="visitrow" :phone="wavflie" :outltime="outltime" @show-obj="watchShow"></visit-info-xin>
+      <visit-info v-if="showVisit" :row="visitrow" :phone="wavflie" :outltime="outltime" @show-obj="watchShow"></visit-info>
     </article>
     <footer slot="modal-footer" class="modal-footer">
     </footer>

package/src/components/pc/WorkListAllNew.vue

@@ -8,7 +8,7 @@
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
                 <label class="font_normal_body" style="width: 40%">工单编号</label>
                 <input type="text" class="input_search" v-model="model.f_service_id" placeholder='工单编号'
-                       condition="f_service_id like '%{}%'"
+                       condition="tswo.f_service_id like '%{}%'"
                        :size="model.f_service_id ? model.f_service_id.length : 6">
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -248,6 +248,9 @@
               <th>
                 <nobr>工单结果</nobr>
               </th>
+              <th>
+                <nobr>维护信息</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -321,6 +324,9 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_result_status }}</nobr>
             </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_content }}</nobr>
+            </td>
 
 
           </template>
@@ -415,10 +421,10 @@ export default {
       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',
         '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_overdue_show','f_finish_time_show','f_result_status','f_content'],
       searchData: {
         condition: '1=1'
       },
@@ -440,6 +446,7 @@ export default {
         'f_overdue_show': '逾期状态',
         'f_finish_time_show': '截止时间',
         'f_result_status': '工单结果',
+        'f_content': '维护信息'
       },
       criteriaShow: false
     }