telephone-clients 3.0.74-6 → 3.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.74-6",
+  "version": "3.0.74",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -94,11 +94,11 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.1-10",
+    "system-clients": "3.2.55",
     "system-phone": "1.2.100",
     "terser-webpack-plugin-legacy": "^1.2.5",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.74",
+    "vue-client": "1.24.77",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/ExportExcel.vue

@@ -182,7 +182,7 @@ export default {
         if (this.chooseCol === true) {
           this.fields = this.field
           this.show = true;
-          // debugger
+          //
           if (this.defaultselect != null && this.defaultselect) {
             for (var item in this.defaultselect) {
               this.modelval.push(item)

package/src/components/Util/ImgSelfSafePlus.vue

@@ -0,0 +1,156 @@
+<template>
+  <div>
+    <img :src="src" :alt="alt" @click.stop="open()" :width="width" :height="height" title="点击查看图片"
+         :id="'vc-imgself-img-'+attach">
+    <div class="full-img" v-show="show" @contextmenu.prevent.stop="clearStyle">
+      <img :src="src" alt="" class="img-state" :alt="alt || ''" @mousewheel="bigimg(this)" id="image" draggable="false"
+           @mousedown.prevent="dropImage" style="position:fixed">
+      <div class="btns row">
+        <button type="button" name="button" class="btn btn-primary" @click.stop="leftRevolve()">向左旋转</button>
+        <button type="button" name="button" class="btn btn-primary" @click.stop="rightRevolve()">向右旋转</button>
+        <button type="button" name="button" class="btn btn-primary" @click.stop="close()">关闭</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import $ from 'jquery'
+
+  export default {
+    props: {
+      src: {
+        type: String
+      },
+      width: {
+        default: 60
+      },
+      height: {
+        default: 60
+      },
+      alt: {
+        default: '图片加载失败'
+      },
+      attach: {
+        type: String,
+        default: 'name'
+      }
+    },
+    data() {
+      return {
+        show: false,
+        deg: 0,
+        odiv: null,
+        powerw: 1.0,
+        positionX: null,
+        positionY: null,
+        powerh: 1.0
+      }
+    },
+    methods: {
+      clearStyle(e){
+        if (e === null) {
+          return
+        }
+        this.odiv = document.getElementById('image')
+        this.odiv.style.left = 500 + 'px';
+        this.odiv.style.top = -150 + 'px';
+      },
+      bigimg() {
+        if (event.wheelDelta > 0) {
+          this.powerh = this.powerh * 1.15
+          this.powerw = 1.15 * this.powerw
+        } else {
+          this.powerh = this.powerh * 0.85
+          this.powerw = 0.85 * this.powerw
+        }
+        this.imgState()
+      },
+      dropImage(e) {
+        if (e === null) {
+          return
+        }
+        this.odiv = e.target;
+        let disX = e.clientX - this.odiv.offsetLeft;
+        let disY = e.clientY - this.odiv.offsetTop;
+        document.onmousemove = (e) => {
+          let left = e.clientX - disX;
+          let top = e.clientY - disY;
+          this.positionX = top;
+          this.positionY = left;
+          this.odiv.style.left = left + 'px';
+          this.odiv.style.top = top + 'px';
+        };
+        document.onmouseup = (e) => {
+          document.onmousemove = null;
+          document.onmouseup = null;
+        };
+      },
+      open() {
+        this.deg = 0
+        this.powerw = 0.7
+        this.powerh = 0.8
+        $('.full-img').css({
+          'transform': 'rotate(' + this.deg + 'deg) scale(' + this.powerh + ' ,' + this.powerw + ')'
+        })
+        $('.container').css({
+          'opacity': '1'
+        })
+        this.show = true
+      },
+      close() {
+        this.show = false
+      },
+      leftRevolve() {
+        //tag
+        this.deg -= 90
+        this.imgState()
+      },
+      rightRevolve() {
+        //tag
+        this.deg += 90
+        this.imgState()
+      },
+      imgState() {
+        $('.img-state').css({
+          'transform': 'rotate(' + this.deg + 'deg) scale(' + this.powerh + ' ,' + this.powerw + ')'
+        })
+
+      }
+    },
+  }
+</script>
+<style media="screen" scoped>
+  .full-img {
+    position: fixed;
+    width: 100%;
+    height: 1000px;
+    overflow: hidden;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 20;
+    opacity: 1;
+    background: rgba(0, 0, 0, 0.8);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    color: #fff;
+  }
+
+  .btns {
+    position: fixed;
+    bottom: 100px;
+    height: auto;
+  }
+
+  .btns button {
+    margin-right: 20px;
+  }
+
+  .img-state {
+
+  }
+</style>

package/src/components/android/CompletedRepair.vue

@@ -0,0 +1,264 @@
+<template>
+  <div style="height: auto;width: 100%;margin-top: 10px" class="repair-bg">
+    <criteria-paged :model="model" v-ref:paged @sort="sort">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户姓名-蓝色.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font_normal_body">用户姓名:</label>
+              </div>
+              <div class="col-xs-8">
+                <input class="search_input input-font"
+                       v-model="model.username" condition="f_user_name like '{}%'" placeholder="  请输入用户姓名" />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/小区蓝色.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font_normal_body">用户地址:</label>
+              </div>
+              <div class="col-xs-8">
+                <input type="text" class="search_input input-font" v-model="model.address"
+                       style="width: 60%" placeholder="  请输入用户地址" condition="f_address like '{}%'">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/开始时间.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font_normal_body">开始日期:</label>
+              </div>
+              <div class="col-xs-8">
+                <datepicker
+                  class="select_list select"
+                  placeholder='开始日期' style="width: 60%"
+                  :format="'yyyy-MM-dd'"
+                  :value.sync="model.startDate"
+                  v-model="model.startDate"
+                  condition="tsw.f_date >='{} 00:00:00'">
+                </datepicker>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/结束时间.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font_normal_body">结束日期:</label>
+              </div>
+              <div class="col-xs-8">
+                <datepicker
+                  class="select_list select"
+                  placeholder='结束日期' style="width: 60%"
+                  :format="'yyyy-MM-dd'"
+                  :value.sync="model.endDate"
+                  v-model="model.endDate"
+                  condition="tsw.f_date <='{} 00:00:00'">
+                </datepicker>
+              </div>
+            </div>
+            <div class="row app-row" style="height: 10px;"></div>
+            <div class="row text-center app-row">
+              <button type="button"  class="btn btn-lg btn-font btn-color" @click="search()" style="min-width: 25%;">查询</button>
+            </div>
+            <div class="row app-row" style="height: 10px;"></div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list' style="background-color: white">
+        <div partial>
+          <div class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">工单编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_service_id }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">故障明细</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.failure ? $parent.$parent.$parent.trouble(row.failure): '无'  }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">工单来源</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_source }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">派单人员</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_single_man }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">派单时间</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_created_date }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">联系电话</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_contact_phone }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">接单人员</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_order_man }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">结单时间</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_date }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import {HttpResetClass,PagedList} from "vue-client";
+import co from 'co'
+export default {
+  title: '已办工单',
+  data() {
+    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/serviceDetails`, 20, {
+      f_filialeids:"this.f_filialeid",
+      orderitem: "'id desc'"
+    })
+    return {
+      model: model,
+      condition: "AND tswo.f_order_man = '" + Vue.user.name + "' AND sa.defname = '维修完成'"
+    }
+  },
+  props: {
+    // 控制工单类型，进行各自工作
+    worktype:{
+      type:String,
+      default:'报修单'
+    },
+    sourcet:{
+      type:String,
+      default:'横屏'
+    },
+    tabname:{
+      type:String
+    }
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    sort(field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
+        } else {
+          this.orderFields[key] = 'no'
+        }
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderDefault}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+      this.search()
+    },
+    search() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch(args) {
+      console.log(args.condition)
+      args.condition += this.condition
+      console.log(args.condition)
+      ////tag
+      //args.condition+=" and f_check_type='民用'"
+      this.model.search(args.condition, args.model, args.condValue)
+    },
+    trouble (val) {
+      let failureall=''
+      // val=[{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""},{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""},{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""}]
+
+      let failure = JSON.parse(val)
+      for (let i = 0; i <failure.length; i++) {
+        if (failure[i].failurecase.length>0){
+          failureall+=failure[i].f_failure_type+":"
+          for (let j = 0; j < failure[i].failurecase.length; j++) {
+            failureall+=failure[i].failurecase[j]
+            if (j+1!=failure[i].failurecase.length){
+              failureall+=","
+            }
+          }
+
+        }else{
+          failureall+=failure[i].f_failure_type
+        }
+        if (i+1!=failure.length){
+          failureall+=';'
+        }
+      }
+      return failureall
+    },
+  },
+  ready() {
+    this.search()
+    // var _this = this;
+    // this.timeoutHandle = window.setInterval(function() {
+    //   _this.sumsearch()
+    // }, 60000)
+  },
+  components: {
+    'delay-apply': (resolve) => {
+      require(['../../components/workorder/DelayApply'], resolve)
+    }
+  }
+
+}
+</script>
+<style scoped>
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.row1 {
+  margin: 4px 0;
+  display: flex;
+  align-items: center;
+  height: 25px !important;
+}
+</style>

package/src/components/pc/AllUserNew.vue

@@ -489,7 +489,7 @@
         this.model2.search(condition)
       },
       autoSend (row, o) {
-        debugger
+
         let params = {
           id: row.id,
           f_auto_send: o

package/src/components/pc/Console.vue

@@ -157,6 +157,7 @@
   import * as Util from '../Util'
   import {HttpResetClass} from 'vue-client'
   import data from '../../stores/wxconfig'
+  import bus from "../../bus";
 
   let stateGen = function* (self) {
     let sql = 'tel_singleTable_OrderBy'
@@ -348,6 +349,7 @@
               that.reid = res.data.ReID
               if(res.data.ReID  && res.data.callingNo ){
                 that.$emit('call-in', {callNum: res.data.callingNo,ext_no: that.ext_no,aId: Util.f.id,RecordsID:res.data.ReID})
+                bus.$emit('tongdaohao',this.aChannel)
               }
             }
             // 如果有按键返回信息

package/src/components/pc/NewRepairPaper.vue

@@ -120,7 +120,7 @@
               </td>
             </tr>
           </table>
-          <table class="table table-striped table-bordered" >
+          <table class="table table-striped table-bordered"  v-if="serviceall.f_recording_path">
             <thead>
             <tr>
               <th style="text-align: center;background-color: #dfedfb;color:black;">录音文件</th>

package/src/components/pc/RepairsWork.vue

@@ -296,7 +296,6 @@
     ready() {
       // 获取sendType.json配置信息   获取派单类型  转站点，转维修员，自选模式
         getSendType(this)
-        this.getEmp()
 
     },
     methods: {
@@ -469,7 +468,11 @@
           }, {resolveMsg: null, rejectMsg: null}
         )
       },
-      setModifyOrder() {
+      async setModifyOrder() {
+        this.meading = this.modifyOrder.f_handlingtype
+        if(this.meading === '转维修员' ){
+         await this.getEmp('维修员')
+        }
         this.model = Object.assign({}, this.model, this.modifyOrder)
       },
       assignObj() {
@@ -587,9 +590,6 @@
         if(this.operType == '报修'){
           data.model.f_attendant = this.loginUser.name
         }
-        //tag)
-        // // 获得数据发送地址
-        // let url = config[this.operType].url
         // 获得数据发送地址
         let url = ''
         if(this.meading === '转站点'){

package/src/components/pc/RoleSelector.vue

@@ -77,7 +77,7 @@ import {HttpResetClass} from 'vue-client'
     },
     methods: {
       valuechange(val){
-        debugger
+
         if(this.valueMultiple && Array.isArray(val)){
           if(val&&val.length > 0){
             var valuesele = `(`

package/src/components/pc/SiteBack.vue

@@ -4,16 +4,15 @@
       <label style="margin-left: 20px;">工单编号：</label><span>{{ row.f_service_id }}</span>
     </div>
     <div class="row">
-      <label style="margin-left: 20px;">打回原因:</label>
+      <label style="margin-left: 20px;">退回原因:</label>
       <textarea style="width: 30%" name="name" rows="2" class="ver-textarea" class="form-control" v-model='model.serviceacitivity[0].f_site_back_reason'></textarea>
-<!--      <input type="text" class="form-control" v-model='model.serviceacitivity[0].f_site_back_reason'>-->
     </div>
     <div class="row">
       <button style="float: right;" type="button" name="button" class="button_search button_spacing"
               @click="$emit('cancel')">取消
       </button>
       <button style="float: right;" type="button" name="button" class="button_search button_spacing"
-              @click="WorkBack()">打回
+              @click="WorkBack()">退回
       </button>
     </div>
   </div>

package/src/components/pc/SiteSend.vue

@@ -54,7 +54,8 @@ export default {
       type: Object
     },
     rowlist: [],
-    source: ''
+    source: '',
+    search_source: ''
   },
   data () {
     return {
@@ -232,7 +233,8 @@ export default {
       let http = new HttpResetClass()
       if (this.source == 'mobile') {
         val = {
-          source: `this.getResourceById($${this.$login.f.depids}$,$department$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
+          // `this.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
+          source: this.search_source?this.search_source:`this.getResourceById($${this.$login.f.depids}$,$department$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
           userid: `${Vue.user.id}`
         }
         http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: val}, {
@@ -242,22 +244,34 @@ export default {
           // let result = res.data.filter(res=>res.depids==Vue.user.depids)
           res.data.forEach((item) => {
             this.repairers.push({label: item.name, value: item.name})
-
           })
-
+          let temp = []
+          this.repairers = this.repairers.filter(item=>{
+            if (!temp.includes(item.label)){
+              temp.push(item.label)
+              return true
+            }
+            return false
+          })
         })
       } else {
         val = {
-          source: `this.getResourceById($${this.$login.f.depids}$,$department$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
+          source: this.search_source?this.search_source:`this.getResourceById($${this.$login.f.depids}$,$department$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
           userid: `${this.$login.f.id}`
         }
         http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          debugger
-          // let result = res.data.filter(res=>res.depids==this.$login.f.depids)
 
+          // let result = res.data.filter(res=>res.depids==this.$login.f.depids)
           res.data.forEach((item) => {
             this.repairers.push({label: item.name, value: item.name})
-
+          })
+          let temp = []
+          this.repairers = this.repairers.filter(item=>{
+            if (!temp.includes(item.label)){
+              temp.push(item.label)
+              return true
+            }
+            return false
           })
         })
       }