telephone-clients 3.0.101 → 3.0.103

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

@@ -248,11 +248,6 @@
               <th>
                 <nobr>截止时间</nobr>
               </th>
-              <th>
-                <nobr>逾期时间</nobr>
-              </th>
-
-
               <th>
                 <nobr>工单结果</nobr>
               </th>
@@ -326,18 +321,12 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_finish_date == '1900-01-01 00:00:00' ? '' : row.f_finish_date }}</nobr>
             </td>
-            <td  style="text-align: center;">
-              <nobr>{{ $parent.$parent.$parent.d2(row) }}</nobr>
-            </td>
-
-
             <td  style="text-align: center;">
               <nobr>{{ row.f_result_status }}</nobr>
             </td>
             <td  style="text-align: center;">
               <nobr>{{ row.f_handlingtype }}</nobr>
             </td>
-
           </template>
         </data-grid>
       </criteria-paged>
@@ -429,28 +418,30 @@ export default {
       thead: '',
       tfoot: '',
       zhihuans: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '异常', value: '异常'}],
-      headData: ['工单类型', '报修类型', '工单编号','派单时间', '用户姓名', '用户地址', '用户电话', '报修电话', '报修原因','派单人','受理人','工单状态', '结单时间','到达时间','离开时间','维修人','工单结果','派单类型'],
-      bodyData: ['f_workorder_type', 'f_repairtype', 'f_service_id', 'f_created_date','f_user_name', 'f_address', 'f_phone', 'f_contact_phone',  'f_remarks','f_single_man','f_attendant','defname','f_date','f_date_come','f_date_leave','f_order_man','f_result_status','f_handlingtype'],
+      headData: ['工单类型', '工单编号', '派单时间','客户信息', '联系电话', '故障明细', '工单状态', '派单人', '话务员','接单员',
+        '结单时间','到达时间', '离开时间','逾期状态','截止时间','工单结果','派单类型'],
+      bodyData: ['f_workorder_type', 'f_service_id', 'f_created_date', 'f_customer_info_show','f_contact_phone', 'f_json',
+        '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_handlingtype'],
       searchData: {
         condition: '1=1'
       },
       excelHeaders: {
         'f_workorder_type': '工单类型',
-        'f_repairtype': '报修类型',
         'f_service_id': '工单编号',
         'f_created_date': '派单时间',
-        'f_user_name': '用户姓名',
-        'f_address': '用户地址',
-        'f_phone': '用户电话',
-        'f_contact_phone': '报修电话',
-        'f_remarks': '报修原因',
+        'f_customer_info_show': '客户信息',
+        'f_contact_phone': '联系电话',
+        'f_json': '故障明细',
+        'f_state_show': '工单状态',
         'f_single_man': '派单人',
-        'f_attendant': '受理人',
-        'f_order_man': '维修人',
-        'defname': '工单状态',
+        'f_attendant': '话务员',
+        'f_order_man': '接单员',
         'f_date': '结单时间',
         'f_date_come': '到达时间',
         'f_date_leave': '离开时间',
+        'f_overdue_show': '逾期状态',
+        'f_finish_time_show': '截止时间',
         'f_result_status': '工单结果',
         'f_handlingtype': '派单类型'
       },
@@ -475,7 +466,6 @@ export default {
     }
   },
   ready () {
-
     this.selfSearch()
     console.log(this.model)
   },
@@ -501,7 +491,7 @@ export default {
   },
   methods: {
     d1(row){
-      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?'已逾期':'未逾期')):''
+      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,this.getNowFormatDate())<0?'已逾期':'未逾期')):''
     },
     d2(row){
       const result = 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()):'未逾期')):''

package/src/filiale/shanxian/telephone.js

@@ -1,12 +1,12 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//pc和手机分别注册到两个文件中
-let specialComp = {
-  'work-list': (resolve) => { require(['./pc/WorkList'], resolve) }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//pc和手机分别注册到两个文件中
+let specialComp = {
+  'work-list': (resolve) => { require(['./pc/WorkList'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

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

@@ -0,0 +1,347 @@
+<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;
+}
+.yybtn-color{
+  background-color:#499edf;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+  color: #FFFFFF;
+  font: 14px PingFang-SC-Bold;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  color: #499edf;
+  font: 14px PingFang-SC-Bold;
+  border: 1px solid #499EDF;
+}
+
+.button_shrink_top {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_top.png")}
+.button_shrink_bottom {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_bottom.png")}
+.button_shrink_left {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_left.png")}
+.button_shrink_right {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_right.png")}
+</style>
+
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <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 for="user-name-id"  class="font text-left">用户姓名：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input  class="search_input input-font" id="user-name-id"
+                        v-model=model.f_user_name condition="f_user_name like '%{}%'" />
+              </div>
+            </div>
+
+            <div class="row app-row" >
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="user-info-id" class="font text-left">工单编号：</label>
+              </div>
+              <input id="user-info-id"   class="search_input input-font"  v-model="model.f_service_id"
+                     condition="f_service_id like '%{}%'">
+            </div>
+
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_f_address" class="font text-left">用户地址：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_f_address" class="search_input input-font"
+                       v-model=model.f_address  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 for="f_f_address" class="font text-left">报修类型：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select
+                    :value.sync="model.f_repairtype"
+                    v-model="model.f_repairtype"
+                    :options='$parent.$parent.repairTypeOptions'
+                    placeholder='请选择'
+                    :multiple="true"
+                    condition="f_repairtype in {}"
+                ></v-select>
+              </div>
+            </div>
+
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="search()">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+            <table style="margin-left: 15px;text-align: center;font-size: 16px" border="1">
+              <tr style="background-color: #f2f2f2;height: 20px">
+                <td style="width: 15%" v-for="row in $parent.$parent.typeData">{{ row.type }}</td>
+              </tr>
+              <tr>
+                <td style="width: 15%" v-for="row in $parent.$parent.typeData">{{ row.type_num || '0' }}</td>
+              </tr>
+            </table>
+          </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"  :style="row.f_repairtype === '抢险维修'?'border: 1px solid red;':''">
+                <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_workorder_type }}</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"><span  :style="row.f_repairtype === '抢险维修'?'color:red;':''">{{ row.f_repairtype }}</span>
+                  </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-5 text-left input-font" style="width: 74%"><span  :style="row.f_repairtype === '抢险维修'?'color:red;':''">{{ row.f_service_id }}</span>
+                  </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" style="width: 79%">{{ row.f_created_date }}</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_user_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_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>
+                </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">{{$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" v-show="row.f_back_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_back_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>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+import Vue from 'vue'
+import { PagedList,HttpResetClass } from 'vue-client'
+
+export default {
+  title: '在线接单',
+  data() {
+    return {
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/phoneOperatorService`, 20, { userid: `"${Vue.user.name}"` }, null, false),
+      searchData: {
+        condition:{
+          condition: '1=1',
+          sign:'1=1'
+        },
+        // userid: Vue.user.ename
+      },
+      repairTypeOptions: [],
+      typeData: [],
+      showMessage: true
+    }
+  },
+  ready(){
+    this.$refs.paged.$refs.cri.search()
+    if (this.$appdata.getSingleValue('取消在线接单二次确定') === '是') {
+      this.showMessage = false
+    }
+    this.repairTypeOptions = this.$appdata.getParam('报修类型')
+  },
+  mounted(){
+
+  },
+  destroyed(){
+
+  },
+  methods: {
+    //  获取现有的报修类型对应的数量
+    async initRepairTypeNum(condition) {
+      condition += ` and f_filiale_id = '${Vue.user.orgid}' and f_outlets='维修部'`
+      const http = new HttpResetClass()
+      const res = await http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/getOperatorServiceTypeNum`,{data: {condition: condition}},{resolveMsg: null, rejectMsg: null})
+      const typeData = []
+      for (let i = 0; i < this.repairTypeOptions.length; i++) {
+        let one = {
+          type: this.repairTypeOptions[i].label,
+          type_num: 0
+        }
+        for (const data of res.data) {
+          if (this.repairTypeOptions[i].label == data.type) {
+            one.type_num = data.type_num
+          } else {
+            continue
+          }
+        }
+        typeData.push(one)
+      }
+      this.typeData = typeData
+    },
+    getfailure(val){
+      if (val) {
+        var result = ''
+        // 把字符串转换成故障列表对象
+        var array = JSON.parse(val)
+        if(Array.isArray(array)) {
+          array.forEach((value) => {
+            result += value.f_failure_type + ':'
+            value.failurecase.forEach((failure) => {
+              result +=  failure + ' '
+            })
+            result += ';'
+          })
+        }
+        return result
+      }
+    },
+    search (args) {
+      //tag
+      //tag
+      let data = {}
+      data.condition = this.$refs.paged.$refs.cri.condition?this.$refs.paged.$refs.cri.condition:'1=1'
+      data.condition += ` and f_workorder_type like '%报修单%' and f_outlets='维修部'`;
+      data.condition += " "+`and f_filiale_id = '${Vue.user.orgid}'`;
+      data.sign = this.$refs.paged.$refs.cri.select ? `defname = '${this.$refs.paged.$refs.cri.select.defname[0]}'`:'1=1'
+      this.searchData.condition = data
+      this.searchData = Object.assign(this.searchData,args.model)
+      this.initRepairTypeNum( args.condition)
+      console.log(data)
+      return this.model.search(data, args.model)
+    },
+    inspect(row){
+      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:{
+
+  }
+
+}
+</script>