telephone-clients 3.0.103 → 3.0.104-1

package/src/filiale/kelai/android/AppTakePic.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class="panel">
+    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
+      <div class="row form-group" style="height: 240px;overflow: scroll;">
+        <div class="col-xs-4 col-sm-3 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" v-for="(index,file) in fileList">
+          <img-self :src="file.f_downloadURL" :width="120" :height="170"></img-self>
+          <img  src="../../../assets/删除.png"  style="width: 15px;margin-top: -80px" @click.prevent="delfile(file, index)">
+        </div>
+      </div>
+      <div class="row text-right form-group" v-if="istakepic">
+        <v-select
+          class="fileType"
+          placeholder="请选择使用类型"
+          v-if="istype"
+          :search="false"
+          close-on-select
+          value-single
+          :options="typeList"
+          v-model="type"
+          :value.sync="type"
+        ></v-select>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import {guid, toStandardTimeString} from '../../../components/Util'
+import Vue from 'vue'
+export default {
+  title: '附件',
+  props: ['blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic'],
+  data () {
+    return {
+      fileList: []
+    }
+  },
+  ready () {
+    this.getFiles()
+  },
+  methods: {
+    async getFiles () {
+      console.log('----------------开始查询图片----------------')
+      this.fileList = []
+
+      let http = new HttpResetClass()
+
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.blobid}' and fremarks = '手机拍照' order by f_uploaddate desc `
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data: data}, {
+        // let res = await http.load('POST', `rs/sql/applySingleTable`, {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+
+      for (var i = 0; i < res.data.length; i++) {
+        console.log('-----------地址----------------',`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
+        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
+      }
+
+      this.fileList = res.data
+    },
+    delfile (file, index) {
+      this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch("delResid", file.id)
+        this.getFiles()
+      })
+    },
+    takePic (title) {
+      // 拍照成功回调
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let fileName = guid() + '.jpg'
+      // 打开相机
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
+        param: {
+          file: fileName,
+          requestCode: 200,
+          callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
+          watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
+        }
+      })
+    },
+    cameraCallBack (fileName, fileUrl) {
+      console.log('-----------cameraCallBack-----------------')
+
+      let data = {
+        blobid: HostApp.__this__.blobid,
+        type: HostApp.__this__.type,
+        defname: HostApp.__this__.defname,
+        username: Vue.user.name,
+        fremarks: '手机拍照',
+        fileName: fileName,
+        fileUrl: fileUrl,
+        entityName:null
+      }
+       debugger
+      console.log('-----------bzLogic-----------------')
+      let  aaaa =HostApp.bzLogic({
+        'logic': 'appFileUpload',
+        'data': data
+      })
+     console.log("555"+aaaa)
+      console.log('----------------开始回调查询-------------------')
+      HostApp.__this__.getFiles()
+      console.log('----------------查询回调结束-------------------')
+
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    }
+  },
+  computed: {
+    typeList () {
+      if (this.typelabel) {
+        return this.$appdata.getParam(this.typelabel)
+      }
+      return this.$appdata.getParam('使用类型')
+    }
+  },
+  events: {
+  }
+}
+</script>
+
+<style lang="less">
+.fileType {
+  float: left;
+  .select-style {
+    background: #f8f8f8;
+    border: 0px;
+  }
+  input {
+    border-left: none;
+    width: 100%;
+  }
+}
+</style>

package/src/filiale/kelai/android/PhoneVentilationLeave.vue

@@ -0,0 +1,176 @@
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <label  class="font text-left">用户编号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input  class="search_input input-font" v-model="model.f_userinfo_code" condition="ti.f_userinfo_code like '%{}%'" />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <label  class="font text-left">用户姓名：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input  class="search_input input-font" v-model="model.f_user_name" condition="ti.f_user_name like '%{}%'" />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <label  class="font text-left">地址：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input  class="search_input input-font" v-model="model.f_address" condition="ta.f_address like '%{}%'" />
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;text-align: center">
+              <button type="button" class="btn btn-lg btn-font" style="width: 25%;margin-right: 3%; background-color: #499edf;color:#FFFFFF;border-radius: 10px ;" @click="search()">查询</button>
+            </div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <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="col-xs-12">
+                  <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_userinfo_code }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_user_name }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font"><b>用户电话:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" >{{ row.f_user_phone }}
+                  </p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font"><b>用户地址:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" >{{ row.f_address }}</p>
+                </div>
+                <div class="col-xs-12" style="display: flex; justify-content: flex-end;">
+                  <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">拍照</button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+    <modal   v-if="showModal"   :show.sync="showModal" v-ref:modal :backdrop="false" >
+      <div slot="modal-body" class="modal-body">
+        <panel header="拍照" :is-open="true" type="primary">
+          <tel-take-pic
+            :blobid="selectdata.f_blobid"
+            :defname="selectdata.defname"
+            :isdelete="true"
+            :istakepic="true"
+            :type="selectdata.type"
+            :istype="true">
+          </tel-take-pic>
+        </panel>
+      </div>
+      <div slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click="infoaddsure()">确定</button>
+      </div>
+    </modal>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import { PagedList,HttpResetClass } from 'vue-client'
+export default {
+  title: '通气打压留底',
+  data() {
+    return {
+      selectdata:{
+        f_blobid:'',
+        type:'档案信息',
+        defname:'通气打压留底拍照'
+      },
+        showModal: false,
+        model_f: false,
+        ispos: true,
+        cardinfo: {},
+        userinfo: {},
+        operation: '',
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/telqueryuserinfo`,5,{}),
+        f_operator: Vue.user.name,
+        f_orgid : Vue.user.orgid
+    }
+  },
+  ready(){
+    this.$refs.paged.$refs.cri.search()
+  },
+
+  methods: {
+    infoaddsure(){
+      this.showModal=false
+      this.$refs.paged.$refs.cri.search()
+    },
+    click(row){
+      this.showModal=true
+      this.selectdata.f_blobid=row.f_userinfo_id
+    }
+  }
+}
+</script>
+<style scoped>
+.bg {
+  background-color: blue;
+  height: 1px;
+  border: 0;
+}
+.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;
+}
+.btn_cz {
+  background-color: #499edf;
+  color:#FFFFFF;
+  width: 55px;
+  margin-right: 2%;
+  margin-top: 10px;
+  height: 38px;
+  border-radius: 9px;
+  font: 600 17px PingFang-SC-Bold;
+}
+</style>

package/src/filiale/kelai/pc/WorkCenterList.vue

@@ -81,6 +81,13 @@
                         :size="model.f_attendant ? model.f_order_man.length : 6" style="width: 80%;">
               </div>
 
+              <div class="col-sm-3">
+                <v-select :value.sync="model.f_state"
+                          v-model="model.f_state"
+                          :width="'80%'"
+                          :options='$parent.$parent.states' placeholder='是否退单'
+                          close-on-select  style="width: 80%;"></v-select>
+              </div>
               <!-- <div class="form-group"  style="float: left;margin-right: 3px">
                 <datepicker id="endDate" placeholder="接单日期"
                   v-model="model.f_order_date"
@@ -122,15 +129,15 @@
                 <button type="button" class="btn btn-link"
                         @click.stop="$parent.$parent.$parent.$emit('do', 'serviceDelete',row)" style="min-width: 30px;">撤销</button>
               </div>
-              <div v-show="$parent.$parent.$parent.canResend(row) && row.f_workorder_type == '报修单'">
+              <div v-show="row.f_state =='撤销' && row.f_workorder_type == '报修单'">
                 <button type="button" class="btn btn-link"
                         @click.stop="$parent.$parent.$parent.$emit('do', 'resend', row)" style="min-width: 30px;">重派</button>
               </div>
-              <div v-show="$parent.$parent.$parent.canResend(row) && row.f_workorder_type == '置换通气单' ">
+              <div v-show="row.f_state =='撤销' && row.f_workorder_type == '置换通气单' ">
                 <button type="button" class="btn btn-link"
                         @click.stop="$parent.$parent.$parent.$emit('do', 'resendzhihuan', row)" style="min-width: 30px;">重派</button>
               </div>
-              <div v-show="$parent.$parent.$parent.canResend(row) && row.f_workorder_type == '安装单' ">
+              <div v-show="row.f_state =='撤销' && row.f_workorder_type == '安装单' ">
                 <button type="button" class="btn btn-link"
                         @click.stop="$parent.$parent.$parent.$emit('do', 'resendinstall', row)" style="min-width: 30px;">重派</button>
               </div>
@@ -170,6 +177,7 @@ export default {
     return {
       model: new PagedList('rs/path/allService', 20),
       row: null,
+      states:[{label: '全部', value: ''}, {label: '是', value: '是'},{label: '否', value: '否'}],
       modifyOrder: null
 	    // defname: [{label: '全部', value: ''}, ...this.$appdata.getParam('工单状态')]
     }
@@ -201,6 +209,15 @@ export default {
       data.condition = this.$refs.paged.$refs.criteria.condition?this.$refs.paged.$refs.criteria.condition:'1=1'
       // data.condition += `and f_filiale_id  =  '${this.$login.f.orgid}'`
       data.sign = this.$refs.paged.$refs.criteria.select.defname[0]?`defname = '${this.$refs.paged.$refs.criteria.select.defname[0]}'`:'1=1'
+
+      if (this.$refs.paged.$refs.criteria.model.f_state.length > 0){
+        if (this.$refs.paged.$refs.criteria.model.f_state[0] == '是'){
+          data.condition += ` and f_state = '撤销' `
+        }else {
+          data.condition += ` and f_state = null `
+        }
+      }
+
       return this.model.search(data)
     },
     selfsearch(){

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

@@ -165,6 +165,31 @@
                           close-on-select>
                 </v-select>
               </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.f_state" :value-single="true" v-model="model.f_state"
+                          :options='$parent.$parent.states' placeholder='是否退单'
+                          close-on-select>
+                </v-select>
+              </div>
+              <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+                <label class="font_normal_body" style="width: 40%">截至时间</label>
+                <datepicker placeholder="开始时间"
+                            :value.sync="model.f_jzdate_start"
+                            v-model="model.f_jzdate_start"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            condition="f_result_status is null and f_finish_date > '{}'"
+                ></datepicker>
+              </div>
+              <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+                <label class="font_normal_body" style="width: 40%">截至时间</label>
+                <datepicker placeholder="结束时间"
+                            :value.sync="model.f_jzdate_end"
+                            v-model="model.f_jzdate_end"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            condition="f_finish_date < '{}'"
+                ></datepicker>
+              </div>
 
             </div>
 
@@ -234,13 +259,12 @@
               <th>
                 <nobr>逾期时间</nobr>
               </th>
-
-
+              <th>
+                <nobr>剩余时间</nobr>
+              </th>
               <th>
                 <nobr>工单结果</nobr>
               </th>
-
-
             </tr>
           </template>
           <template partial='body'>
@@ -314,7 +338,9 @@
             <td  style="text-align: center;">
               <nobr>{{ $parent.$parent.$parent.d2(row) }}</nobr>
             </td>
-
+            <td  style="text-align: center;">
+              <nobr>{{  $parent.$parent.$parent.d3(row) }}</nobr>
+            </td>
 
             <td  style="text-align: center;">
               <nobr>{{ row.f_result_status }}</nobr>
@@ -397,7 +423,7 @@ export default {
       model: new PagedList('rs/sql/serviceDetails', 20),
       row: null,
       orderMan: '',
-
+      states:[{label: '全部', value: ''}, {label: '是', value: '是'},{label: '否', value: '否'}],
       msgs: [],
       service: Object,
       pendingCount: 0,
@@ -456,7 +482,7 @@ export default {
   },
   ready () {
 
-    this.selfSearch()
+    // this.selfSearch()
   },
   watch: {
     'all' (val) {
@@ -483,7 +509,13 @@ export default {
       return row.f_workorder_type == '报修单'?(row.f_result_status == '已完成'?(this.datejisuan(row.f_finish_date,row.f_date)<0?'已逾期':'未逾期'):(this.datejisuan(row.f_finish_date,'')<0?'已逾期':'未逾期')):''
     },
     d2(row){
-      return row.f_workorder_type == '报修单'?(row.f_result_status == '已完成'?(this.datejisuan(row.f_finish_date,row.f_date)<0?this.formatDuring(new Date(row.f_date).getTime(),new Date(row.f_finish_date).getTime()):'未逾期'):(this.datejisuan(row.f_finish_date,'')<0?this.formatDuring(new Date().getTime(),new Date(row.f_finish_date).getTime()):'未逾期')):''
+      return row.f_workorder_type == '报修单'?(row.f_result_status == '已完成'?(this.datejisuan(row.f_finish_date,row.f_date)<0?this.formatDuring(new Date(row.f_date).getTime(),new Date(row.f_finish_date).getTime()):'未逾期'):(this.datejisuan(row.f_finish_date,this.getNowFormatDate())<0?this.formatDuring(new Date(this.getNowFormatDate()).getTime(),new Date(row.f_finish_date).getTime()):'未逾期')):''
+    },
+    d3(row){
+      return row.f_workorder_type == '报修单' && row.f_finish_date ?
+        (row.f_result_status == '已完成'?
+          '0天':(this.datejisuan(row.f_finish_date,this.getNowFormatDate())<0?
+            '已逾期':this.formatDuring(new Date(row.f_finish_date).getTime(),new Date(this.getNowFormatDate()).getTime()))):''
     },
     datejisuan(a,b){
      return  new Date(a).getTime()-new Date(b).getTime()
@@ -551,7 +583,13 @@ export default {
       } else {
         args.condition += ` and f_filiale_id = '${this.$login.f.orgid}'`
       }
-
+      if (this.$refs.paged.$refs.criteria.model.f_state.length > 0){
+        if (this.$refs.paged.$refs.criteria.model.f_state[0] == '是'){
+          args.condition += ` and f_state = '撤销' `
+        }else {
+          args.condition += ` and f_state is null `
+        }
+      }
       this.searchData.condition = args.condition
       return this.model.search(args.condition, args.model)
     },

package/src/filiale/kelai/pc/serviceDeleteOrder.vue

@@ -0,0 +1,55 @@
+<template>
+  <div class="auto ">
+    <div class="">
+      <label class="control-label">{{row.f_user_name}}</label>&nbsp;
+      <span>{{row.f_phone}}</span>&nbsp;
+      <span>{{row.f_address}}</span>
+    </div>
+    <div class="">
+      <span>报修时间：{{row.f_repair_date}}</span>&nbsp;&nbsp;
+      <span>工单编号：{{row.f_service_id}}</span>
+    </div>
+    <div class="form-input-group">
+      <label  class="control-label text-justify">撤销内容</label>
+      <textarea name="name" rows="3" cols="80" v-model="row.serviceacitivity[0].f_backaccount"></textarea>
+    </div>
+    <button type="button" name="button" class="btn btn-default" style="float: left;" @click="$emit('cancel')">取消</button>
+    <button type="button" name="button" class="btn btn-success" style="float: right;" @click="confirm()">保存</button>
+  </div>
+</template>
+<script>
+  export default {
+    title: '撤销',
+    props: {
+      // 报修单，不含关联关系
+      row: { // 工单信息
+        type: Object
+      },
+      loginUser: { // 当前登录人
+        type: Object
+      },
+      callObj: { // 来电电话
+        type: Object
+      }
+    },
+    methods: {
+      confirm () {
+        console.log("撤销工单")
+        let data = {model: this.row, loginUser: {name:this.$login.f.name, ename: this.$login.f.ename}}
+        // 将数据发送给业务逻辑
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/serviceDelete`, data).then(() => {
+          this.$emit('success')
+        })
+        // return this.$resetpost('rs/logic/reminder', {model: this.row, loginUser: this.loginUser, callObj: this.callObj}).then(() => {
+        //   this.$emit('success')
+        // })
+      }
+    },
+    watch: {
+      // 报修单发生改变，给报修单设置默认派单对象
+      row (val) {
+        this.row.serviceacitivity = [{}]
+      }
+    }
+  }
+</script>

package/src/filiale/kelai/telephone.js

@@ -14,23 +14,24 @@ let specialComp = {
   'telloss-list': (resolve) => {require(['./pc/TelLossList'], resolve)},
   // 呼叫大屏主页面
   'call-report-main-page-kelai': (resolve) => { require(['./pc/CallReport/CallReportMainPage-Kelai'], resolve) },
-   //时间
+  //时间
   'time-comp': (resolve) => { require(['./pc/CallReport/Time'], resolve) },
-   //运行天数
+  //运行天数
   'time-running': (resolve) => { require(['./pc/CallReport/timeRunning'], resolve) },
-   //累计通话
+  //累计通话
   'cumulative-calls': (resolve) => { require(['./pc/CallReport/CumulativeCalls'], resolve) },
-   //坐席状态
+  //坐席状态
   'seat-status': (resolve) => { require(['./pc/CallReport/SeatStatus'], resolve) },
-   //呼入接听量
+  //呼入接听量
   'incoming-callvolume': (resolve) => { require(['./pc/CallReport/Incomingcallvolume'], resolve) },
-   //呼入时间数据
+  //呼入时间数据
   'tncoming-timedata': (resolve) => { require(['./pc/CallReport/IncomingTimedata'], resolve) },
-   //工单类型统计
+  //工单类型统计
   'workorder-typesum': (resolve) => { require(['./pc/CallReport/WorkorderTypesum'], resolve) },
+  'service-delete-order': (resolve) => { require(['./pc/serviceDeleteOrder'], resolve) },
   'record-list-left':(resolve) => { require(['./pc/RecordListLeft'], resolve) },
   'work-listall-new':(resolve) => { require(['./pc/WorkListAllNew.vue'], resolve) },
-  'rwork-center-list':(resolve) => { require(['./pc/WorkCenterList.vue'], resolve) }
+  'work-center-list':(resolve) => { require(['./pc/WorkCenterList.vue'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/kelai/telephoneAndroid.js

@@ -8,7 +8,9 @@ let specialComp = {
   'repair-type-list' : (resolve) => { require(['./android/RepairTypeList'], resolve) },
   // 用户基本信息
   'repair-user-info': (resolve) => { require(['./android/RepairUserInfo'], resolve) },
-  'repair-orderV': (resolve) => { require(['./android/RepairOrderV'], resolve) }
+  'repair-orderV': (resolve) => { require(['./android/RepairOrderV'], resolve) },
+  'phone-ventilation-leave': (resolve) => { require(['./android/PhoneVentilationLeave'], resolve) },
+  'tel-take-pic': (resolve) => { require(['./android/AppTakePic'], resolve) }
 }
 exports.specialComp = specialComp