telephone-clients 3.0.97 → 3.0.98-2

package/package.json

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

package/src/components/android/AddMyTask.vue

@@ -103,13 +103,13 @@
               </div>
               <div class="col-xs-8" >
                 <v-select
-                  :value.sync="model.f_repairtype"
-                  v-model="model.f_repairtype"
-                  :options='$parent.$parent.repairTypeOptions'
-                  placeholder='请选择'
-                  close-on-select
-                  :value-single="true"
-                  condition="f_repairtype like '%{}%'"
+                    :value.sync="model.f_repairtype"
+                    v-model="model.f_repairtype"
+                    :options='$parent.$parent.repairTypeOptions'
+                    placeholder='请选择'
+                    close-on-select
+                    :value-single="true"
+                    condition="f_repairtype like '%{}%'"
                 ></v-select>
               </div>
             </div>
@@ -162,6 +162,13 @@
                   <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_address }} &nbsp;&nbsp; {{row.f_contact_name}} </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_contact_phone || '无' }}
+                    <img src="../../assets/telphonesend.png" style="width: 12px;"
+                         @click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_contact_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>
@@ -170,6 +177,10 @@
                   <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">{{$parent.$parent.$parent.getfailure(row.failure)}} </p>
                 </div>
+                <div class="col-xs-12" v-show="row.f_remarks">
+                  <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_remarks }}</p>
+                </div>
                 <div class="col-xs-12">
                   <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="$parent.$parent.$parent.inspect(row)">接单</button>
                 </div>
@@ -200,11 +211,16 @@ export default {
         // userid: Vue.user.ename
       },
       repairTypeOptions: [{label: '全部', value: ''}],
-      typeData: []
+      typeData: [],
+      showMessage: true
     }
   },
   ready(){
     this.$refs.paged.$refs.cri.search()
+    if (this.$appdata.getSingleValue('取消在线接单二次确定') === '是') {
+      this.showMessage = false
+    }
+    console.log(this.showMessage)
   },
   mounted(){
 
@@ -216,7 +232,7 @@ export default {
     //  获取现有的报修类型对应的数量
     async initRepairTypeNum() {
       this.typeData = []
-      this.repairTypeOptions = []
+      this.repairTypeOptions = [{label: '全部', value: ''}]
       const http = new HttpResetClass()
       const res = await http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/getOperatorServiceTypeNum`,{data: {condition: `tswo.f_filiale_id = '${Vue.user.orgid}'`}},{resolveMsg: null, rejectMsg: null})
       const plainArray = res.data.map(item => Object.assign({}, item))
@@ -261,32 +277,58 @@ export default {
       return this.model.search(data, args.model)
     },
     inspect(row){
-      this.$showMessage(`确定要接编号为${row.f_service_id}的单子吗？`, ['confirm', 'cancel']).then((isconfirm)=>{
-        //tag)
-        if (isconfirm === 'confirm') {
-          let userdata = Object.assign({}, userdata, row)
-          userdata.f_advice = '自我接单'
-          userdata.serviceacitivity = [] //Vue.user.name
-          userdata.serviceacitivity.push({f_reciever: Vue.user.name})
-          let data = ''
-          data = {
-            model: userdata,
-            // loginUser: {name: '何文强', ename: 'hwq'}
-            loginUser: {name: Vue.user.name, ename: Vue.user.ename}
-          }
-          let HttpReset = new HttpResetClass()
-          HttpReset.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/siteSend`,data).then((res)=>{
-            if (res.data.code==300){
-              this.$refs.paged.$refs.cri.search()
-              return this.$showMessage('没有抢到该单哦！')
-            }else {
-              this.$refs.paged.$refs.cri.search()
-              return this.$showMessage('接单成功！请及时处理。')
+      if (this.showMessage) {
+        this.$showMessage(`确定要接编号为${row.f_service_id}的单子吗？`, ['confirm', 'cancel']).then((isconfirm)=>{
+          //tag)
+          if (isconfirm === 'confirm') {
+            let userdata = Object.assign({}, userdata, row)
+            userdata.f_advice = '自我接单'
+            userdata.serviceacitivity = [] //Vue.user.name
+            userdata.serviceacitivity.push({f_reciever: Vue.user.name})
+            let data = ''
+            data = {
+              model: userdata,
+              // loginUser: {name: '何文强', ename: 'hwq'}
+              loginUser: {name: Vue.user.name, ename: Vue.user.ename}
             }
-          })
+            let HttpReset = new HttpResetClass()
+            HttpReset.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/siteSend`,data).then((res)=>{
+              if (res.data.code==300){
+                this.$refs.paged.$refs.cri.search()
+                return this.$showMessage('没有抢到该单哦！')
+              }else {
+                this.$refs.paged.$refs.cri.search()
+                return this.$showMessage('接单成功！请及时处理。')
+              }
+            })
+          }
+        })
+      } else {
+        let userdata = Object.assign({}, userdata, row)
+        userdata.f_advice = '自我接单'
+        userdata.serviceacitivity = [] //Vue.user.name
+        userdata.serviceacitivity.push({f_reciever: Vue.user.name})
+        let data = ''
+        data = {
+          model: userdata,
+          // loginUser: {name: '何文强', ename: 'hwq'}
+          loginUser: {name: Vue.user.name, ename: Vue.user.ename}
         }
-      })
-    }
+        let HttpReset = new HttpResetClass()
+        HttpReset.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/siteSend`,data).then((res)=>{
+          if (res.data.code==300){
+            this.$refs.paged.$refs.cri.search()
+            return this.$showMessage('没有抢到该单哦！')
+          }else {
+            this.$refs.paged.$refs.cri.search()
+            return this.$showMessage('接单成功！请及时处理。')
+          }
+        })
+      }
+    },
+    makeAPhoneCall(phoneNumber) {
+      this.$androidUtil.makeAPhoneCall(phoneNumber)
+    },
   },
   computed:{
 

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

@@ -134,7 +134,7 @@
               </div>
               <div class="col-sm-12 col-xs-12 col-md-12">
                 <button type="button" name="button" class="btn btn-primary btn-sm" style="float: right"
-                        @click="isRecord(row)">处理
+                        @click="selected(row,false)">处理
                 </button>
 
                 <button type="button" name="button" class="btn btn-primary btn-sm"
@@ -406,7 +406,6 @@ export default {
       } else {
         this.$showMessage(`转单失败，请检查网络异常!`, ['confirm'])
       }
-
     },
     undo() {
       this.orderman = ''
@@ -487,15 +486,6 @@ export default {
         this.$goto('repair-orderV', {row: row, worktype: this.worktype, isRecord: isRecord}, 'self', this.ifsearch)
       }
     },
-    isRecord(row) {
-      this.$showMessage('是否开启无限制录音？', ['confirm', 'cancel'], {resolveMsg: null, rejectMsg: null}).then((res) => {
-        if (res === 'confirm') {
-          this.selected(row, true)
-        } else {
-          this.selected(row, false)
-        }
-      })
-    },
     sendback(row) {
       this.$showMessage('退回后数据不可恢复，确认退回操作吗？', ['confirm', 'cancel'], {
         resolveMsg: null,

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

@@ -0,0 +1,171 @@
+<template>
+  <div class="repair-bg" id="work-history">
+    <div class="bq-parent" v-if="shutype == 'heng'">
+      <blockquote class="blockquote">
+        <p>工单基本信息</p>
+      </blockquote>
+    </div>
+    <!-- 工单的基本信息 -->
+    <div class="panel panel-default auto repair-info-content">
+      <div class="panel-body">
+        <p v-if="service.f_userinfo_id" >用户编号： <span style="text-decoration:underline">{{service.f_userinfo_code}}</span><!--&ensp;&ensp;<span style="color: blue" @click="goOtherCharge(service.f_userinfo_id)">其他收费</span>--></p>
+        <!--<p v-if="service.f_userinfo_id" >用户编号： <span style="color: blue;text-decoration:underline" @click="searchHistory()">{{service.f_userinfo_code}}</span></p>-->
+        <!--<p>工单编号： {{service.f_service_id}}</p>-->
+        <!--<p>生成时间： {{service.f_created_date}}</p>-->
+        <!--<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>开启录音：<button type="button" class="btn btn-default" @click="openRecord()">开启</button>
+        </p>
+        <!--<p>用户姓名： {{service.f_user_name}}</p>-->
+        <!--<p>用户地址： {{service.f_address}}</p>-->
+        <p>备注信息： {{service.f_remarks}}</p>
+        <!--<p>指导建议： {{service.f_advice}}</p>-->
+        <failure-show :value='service.failure'>
+        </failure-show>
+        <div style="clear:both;">
+          <phone-sell-info-lite v-if="showSellInfo" :user="{}" :f_userinfo_id="service.f_userinfo_id"></phone-sell-info-lite>
+        </div>
+        <div class="from-group">
+          <img-self v-if="service.f_single_path" :src="imgfilename"   width="200" height="200"></img-self>
+          <img-self v-if="service.f_singlea_path" :src="imgfilenamea"   width="200" height="200"></img-self>
+          <img-self v-if="service.f_singleb_path" :src="imgfilenameb"   width="200" height="200"></img-self>
+        </div>
+        <route name="info-route" ></route>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import FailureShow from '../../../components/pc/FailureShow'
+  import {HttpResetClass} from "vue-client";
+  import Vue from "vue";
+
+  export default {
+    title: '工单历史记录',
+    data () {
+      return {
+        // service: null
+        imgfilename:'',
+        imgfilenamea:'',
+        imgfilenameb:'',
+        f_userinfo_code : '测试文本',
+        showSellInfo: false
+      }
+    },
+    props: {
+
+      service: { // 传入一条报修单信息
+        type: Object
+      },
+      issee:'',
+      worktype:{
+        type: String,
+        default: '报修单'
+      },
+      // userinfo: {
+      //   type: Object
+      // },
+      // 维修对应的用户数据收集
+      model: {
+        type: Object
+      },
+      // 工单信息
+      repair:{
+        type: Object
+      },
+      savevalid:{
+
+      },
+      sum:{
+
+      },
+      user:{
+        type: Object
+      },
+      show: {
+        type: Boolean,
+        default: false
+      },
+      // 本次维修, 用于编辑
+      data: {
+        type: Object
+      },
+      shutype:'heng'
+    },
+    ready () {
+      //tag)
+      //tag)
+      //tag)
+      //tag
+      this.imgfilename=`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+this.service.f_single_path
+      this.imgfilenamea=`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+this.service.f_singlea_path
+      this.imgfilenameb=`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+this.service.f_singleb_path
+      //tag
+      //tag
+      //tag
+      for (let i in this.service) {
+        //tag + '：' + JSON.stringify(this.service[i]))
+      }
+      this.$goto('repair-user-info',{
+        model: this.model,
+        data: this.data,
+        savevalid: this.savevalid,
+        repair: this.repair,
+        show: this.show,
+        // userinfo: this.userinfo
+        shutype:this.shutype,
+        worktype:this.worktype,
+        issee:this.issee},'info-route')
+    },
+    methods: {
+      openRecord(){
+        this.$parent.$parent.openRecord()
+      },
+      makeAPhoneCall(phoneNumber) {
+        this.$androidUtil.makeAPhoneCall(phoneNumber)
+      },
+      goOtherCharge(userinfoid){
+        //tag
+        new HttpResetClass().load("POST",`${this.$androidUtil.getProxyUrl()}/rs/sql/onlinequeryuser`,{data:{condition : ` uf.f_orgid = '${Vue.user.orgid}' and (ui.f_user_state = '正常' or ui.f_user_state = '预备') and ui.f_userinfo_id = '${userinfoid}'`}}).then((res)=>{
+          //tag)
+          if(res.data.length==1){
+            let _this = this
+            var pardate = {
+              _this:_this,
+              title:'其他收费',
+              safe:false
+            }
+            _this.$dispatch('gotoson',pardate)
+            //tag
+            _this.$parent.$goto('other_charge', {row: res.data[0]}, 'self')
+          }else if(res.data.length>1){
+            this.$showMessage('查询到了多条用户表信息,请让管理员核实用户信息是否正常！')
+          }else{
+            this.$showMessage('未查询到用户有正常状态的表具信息,请让管理员核实用户表档案信息是否正常！')
+          }
+        }).catch((msg)=>{
+          this.$showMessage('获取用户信息失败，请检查手机网络!')
+        })
+      },
+      selfSearch () {
+        if(!this.rowOne) {
+          return
+        }
+        // let gen = getGen(this)
+        // co(gen)
+      },
+      searchHistory() {
+        this.showSellInfo = !this.showSellInfo
+      }
+    },
+    watch: {
+      'rowOne' () {
+        this.selfSearch()
+      }
+    },
+    components: {
+      FailureShow,
+      'failure-show': FailureShow
+    }
+  }
+</script>

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

@@ -33,7 +33,7 @@
 <script>
 // 户内维修
 import Vue from 'vue'
-import RepairInfo from './../../../components/workorder/RepairInfo'
+import RepairInfo from './RepairInfo'
 import RepairDetails from './../../../components/workorder/RepairDetails'
 import RepairUserInfo from './../../../components/workorder/RepairUserInfo'
 import Outlay from './../../../components/workorder/Outlay'
@@ -506,6 +506,15 @@ export default {
         issee:this.issee,
         parentPage:'CurrentCreate'
       }, 'upload')
+    },
+    openRecord(){
+      let isRecodr = this.$appdata.getSingleValue('呼叫无限制录音'); //单值参数，为true则是开启全程录音
+      if (isRecodr) {
+        if (isRecodr == 'true') {
+          this.$showMessage("为了保证服务质量，您的电话将会被全程录音！")
+          this.record()
+        }
+      }
     }
   },
   watch: {
@@ -569,13 +578,6 @@ export default {
     if (this.show || this.repair) {
       this.faultshow.number = this.tabs.length
     }
-    let isRecodr = this.$appdata.getSingleValue('呼叫无限制录音'); //单值参数，为true则是开启全程录音
-    if (isRecodr) {
-      if (isRecodr == 'true' && this.isRecord) {
-        this.$showMessage("为了保证服务质量，您的电话将会被全程录音！")
-        this.record()
-      }
-    }
   },
   components: {
     'repair-info': RepairInfo,

package/src/filiale/shexian/telephoneAndroid.js

@@ -1,11 +1,17 @@
 // 分公司特殊组件页面注册
-import Vue from "vue";
 
 //pc和手机端重写组件较多的话 建议将cp和android分到两个文件中  蓉城较少，所以我就合并到一起
 let specialComp = {
   // 竖屏待办工单新
-  'repair-first': (resolve) => { require(['./android/RepairFirstV'], resolve) },
-  'repair-orderV': (resolve) => { require(['./android/RepairOrderV'], resolve) }
+  'repair-first': (resolve) => {
+    require(['./android/RepairFirstV'], resolve)
+  },
+  'repair-orderV': (resolve) => {
+    require(['./android/RepairOrderV'], resolve)
+  },
+  'repair-info': (resolve) => {
+    require(['./android/RepairInfo'], resolve)
+  },
 }
 exports.specialComp = specialComp