telephone-clients 3.0.103 → 3.0.104-11

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

@@ -154,13 +154,13 @@
                       @click="repairlist($index)">查看详情
               </button>
             </div>
-            <div style="margin-top: 5px" v-if="activity.type === 't_servicework' && activity.f_button =='维修完成' ">
+<!--            <div style="margin-top: 5px" v-if="activity.type === 't_servicework' && activity.f_button =='维修完成' ">
               <p>验收人员： {{ activity.f_name }} &nbsp;&nbsp;&nbsp;完成结果： {{ activity.f_result_status }}
               </p>
               <button type="button" name="button"style="margin-left: 0px" class="button_spacing button_search-1"
                       @click="repairlist($index)">查看详情
               </button>
-            </div>
+            </div>-->
             <!-- 工单结案 -->
             <div style="margin-top: 5px" v-if="activity.type === 't_serviceend'">
               <p>{{ activity.f_date }}</p>

package/src/filiale/qianneng/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%">
@@ -177,7 +177,6 @@
                 <label class="font_normal_body" style="width: 40%">工单结果</label>
                 <v-select :value.sync="model.f_result_status" :value-single="true" v-model="model.f_result_status"
                           :options='$parent.$parent.result_status' placeholder='工单结果'
-                          condition="tsw.f_result_status = '{}'"
                           close-on-select>
                 </v-select>
               </div>
@@ -187,6 +186,20 @@
                        condition="tswo.f_single_man like '%{}%'"
                        :size="model.f_single_man ? model.f_single_man.length : 6">
               </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_user_type" :value-single="true" v-model="model.f_user_type"
+                          :options='$parent.$parent.user_types' placeholder='客户类型'
+                          condition="tswo.f_user_type = '{}'"
+                          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>
+                <input type="text" class="input_search" v-model="model.f_failure" placeholder='维修类型'
+                       condition="tf.f_failure like '%{}%'" style="width: 150px"
+                       >
+              </div>
             </div>
           </div>
         </criteria>
@@ -251,9 +264,21 @@
               <th>
                 <nobr>工单结果</nobr>
               </th>
+              <th>
+                <nobr>客户类型</nobr>
+              </th>
+              <th>
+                <nobr>维修类型</nobr>
+              </th>
               <th>
                 <nobr>派单类型</nobr>
               </th>
+              <th>
+                <nobr>汇总备注</nobr>
+              </th>
+              <th>
+                <nobr>隐患备注</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -281,7 +306,7 @@
 
             <td>
               <nobr>
-                {{ row.f_user_name }}&nbsp;&nbsp;&nbsp;{{ row.f_address }}&nbsp;&nbsp;&nbsp;
+                {{ row.f_userinfo_code }}&nbsp;&nbsp;&nbsp;{{ row.f_user_name }}&nbsp;&nbsp;&nbsp;{{ row.f_address }}&nbsp;&nbsp;&nbsp;
               </nobr>
             </td>
             <td  style="text-align: center;">
@@ -324,9 +349,21 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_result_status }}</nobr>
             </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_user_type }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_failure }}</nobr>
+            </td>
             <td  style="text-align: center;">
               <nobr>{{ row.f_handlingtype }}</nobr>
             </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_repair_remarks }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_content }}</nobr>
+            </td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -403,6 +440,7 @@ export default {
       model: new PagedList('rs/sql/serviceDetails', 20),
       row: null,
       orderMan: '',
+      user_types:[{label: '全部', value: ''}, {label: '民用', value: '民用'},{label: '非民用', value: '非民用'}],
       handling_types:[{label: '全部', value: ''}, {label: '转站点', value: '转站点'},{label: '转维修员', value: '转维修员'},{label: '转运营系统', value: '转运营系统'}],
       msgs: [],
       service: Object,
@@ -443,7 +481,11 @@ export default {
         'f_overdue_show': '逾期状态',
         'f_finish_time_show': '截止时间',
         'f_result_status': '工单结果',
-        'f_handlingtype': '派单类型'
+        'f_user_type': '客户类型',
+        'f_failure': '维修类型',
+        'f_handlingtype': '派单类型',
+        'f_repair_remarks': '汇总备注',
+        'f_content': '隐患备注'
       },
       criteriaShow: false
     }
@@ -570,7 +612,13 @@ export default {
       } else {
         args.condition += ` and f_filiale_id = '${this.$login.f.orgid}'`
       }
-
+      if (args.model.f_result_status) {
+        if (args.model.f_result_status == '已完成') {
+          args.condition += ` and tsw.f_result_status = '已完成'`
+        }else {
+          args.condition += ` and tsw.f_result_status is null `
+        }
+      }
       this.searchData.condition = args.condition
       return this.model.search(args.condition, args.model)
     },

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

@@ -0,0 +1,273 @@
+<template>
+  <div class="flex-row">
+    <div style="height: 95%" class="basic-main" >
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+          <div class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <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="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%;">
+                <label class="font_normal_body" style="width: 40%">客户姓名</label>
+                <input type="text" class="input_search" v-model="model.f_user_name" placeholder='客户姓名'
+                       condition="tswo.f_user_name like '%{}%'"
+                       :size="model.f_user_name ? model.f_user_name.length : 6">
+              </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_date_start"
+                            v-model="model.f_date_start"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            condition="f_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_date_end"
+                            v-model="model.f_date_end"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            condition="f_date < '{}'"
+                ></datepicker>
+              </div>
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+                <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/telephoneExport"
+                              sql-name="changeTable"
+                              template-name='工单换表记录'
+                              :choose-col="true"></export-excel>
+                <div style="float: right;" class="button_spacing button_search"
+                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                     @click="$parent.$parent.hidden()"></div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.criteriaShow">
+              <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_userinfo_code" placeholder='客户编号'
+                       condition="tswo.f_userinfo_code like '%{}%'"
+                       :size="model.f_userinfo_code ? model.f_userinfo_code.length : 6">
+              </div>
+              <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_contact_phone" placeholder='联系电话'
+                       condition="tswo.f_contact_phone like '%{}%'"
+                       :size="model.f_contact_phone ? model.f_contact_phone.length : 6">
+              </div>
+              <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+                <label class="font_normal_body" style="width: 40%">地&emsp;&emsp;址</label>
+                <input type="text" class="input_search" v-model="model.f_address" placeholder='地址'
+                       condition="tswo.f_address like '%{}%'"
+                       :size="model.f_address ? model.f_address.length : 4">
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th><nobr>序号</nobr></th>
+              <th><nobr>工单编号</nobr></th>
+              <th><nobr>用户编号</nobr></th>
+              <th><nobr>用户名称</nobr></th>
+              <th><nobr>用户地址</nobr></th>
+              <th><nobr>联系电话</nobr></th>
+              <th><nobr>是否换表</nobr></th>
+              <th><nobr>换表类型</nobr></th>
+              <th><nobr>换表原因</nobr></th>
+              <th><nobr>旧表底数</nobr></th>
+              <th><nobr>旧表剩余气量</nobr></th>
+              <th><nobr>累用金额</nobr></th>
+              <th><nobr>剩余金额</nobr></th>
+              <th><nobr>表向</nobr></th>
+              <th><nobr>防盗卡1</nobr></th>
+              <th><nobr>防盗卡2</nobr></th>
+              <th><nobr>出厂日期</nobr></th>
+              <th><nobr>表位置</nobr></th>
+              <th><nobr>气表品牌</nobr></th>
+              <th><nobr>气表型号</nobr></th>
+              <th><nobr>新表号</nobr></th>
+              <th><nobr>新表底数</nobr></th>
+              <th><nobr>补气量</nobr></th>
+              <th><nobr>补气金额</nobr></th>
+              <th><nobr>换表费用</nobr></th>
+              <th><nobr>备注</nobr></th>
+              <th><nobr>完成时间</nobr></th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_service_id}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_userinfo_code}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_name}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_address}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_contact_phone}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.是否换表 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.换表类型 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.换表原因 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.旧表底数 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.旧表剩余气量 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.累用金额 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.剩余金额 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.表向 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.防盗卡1 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.防盗卡2 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.出厂日期 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.表位置 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.气表品牌 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.气表型号 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.新表号 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.新表底数 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.补气量 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.补气金额 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.换表费用 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.备注 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_date }}</font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+export default {
+  title: '工单换表记录',
+  data () {
+    return {
+      model: new PagedList('rs/sql/changeTable', 30, {
+        f_orgid: 'this.model.f_orgid'
+      }),
+      criteriaShow: false,
+      getfield: {
+        'f_service_id': '工单编号',
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户名称',
+        'f_address': '用户地址',
+        'f_contact_phone': '联系电话',
+        '是否换表':'是否换表',
+        '换表类型':'换表类型',
+        '换表原因':'换表原因',
+        '旧表底数':'旧表底数',
+        '旧表剩余气量':'旧表剩余气量',
+        '累用金额':'累用金额',
+        '剩余金额':'剩余金额',
+        '表向':'表向',
+        '防盗卡1':'防盗卡1',
+        '防盗卡2':'防盗卡2',
+        '出厂日期':'出厂日期',
+        '表位置':'表位置',
+        '气表品牌':'气表品牌',
+        '气表型号':'气表型号',
+        '新表号':'新表号',
+        '新表底数':'新表底数',
+        '补气量':'补气量',
+        '补气金额':'补气金额',
+        '换表费用':'换表费用',
+        '备注':'备注',
+        'f_date': '完成时间'
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.$refs.cp.$refs.cri.model.f_orgid = this.$login.f.orgid
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+    },
+    searchCondition (args) {
+      this.$refs.cp.$refs.cri.model.f_orgid = this.$login.f.orgid
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.model.condition,
+        f_orgid: this.$login.f.orgid
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/filiale/qianneng/telephone.js

@@ -12,6 +12,8 @@ let specialComp = {
   'failure-edit':(resolve) => { require(['./pc/FailureEdit'], resolve) },
   'new-repair-paper': (resolve) => { require(['./pc/NewRepairPaper'], resolve)},
   'tel-material-detailed': (resolve) => { require(['./pc/MaterialDetailed'], resolve)},
+  'material-statistics': (resolve) => { require(['./pc/MaterialStatistics'], resolve)},
+  'change-table': (resolve) => { require(['./pc/changetable'], resolve)},
 }
 exports.specialComp = specialComp
 

package/src/filiale/rizhao/pc/DispatchMan.vue

@@ -27,14 +27,14 @@
               <input type="text" class="form-control" v-model="model.f_single_man"
                      placeholder='操作员'>
               <button class="btn btn-default" @click="search()">查询</button>
-              <export-excel class="button_search button_spacing"
+              <export-excel-tel class="button_search button_spacing"
                             :data="{startDate: this.model.startDate,endDate: this.model.endDate}"
                             :field="{'f_filiale':'分公司','f_single_man':'派单员',
                             'baoxiudan':'报修单量','dianhuotongqi':'点火通气单量',
                             'baoxiuzongliang':'总单量'}"
                             style="margin-top: 20px"
-                            sqlurl="rs/logic/exportfile" sql-name="getDispatch" template-name='派单员工作量导出'
-                            :choose-col="true"></export-excel>
+                            sqlurl="rs/logic/telephoneExport" sql-name="getDispatch" template-name='派单员工作量导出'
+                            :choose-col="true"></export-excel-tel>
             </div>
           </div>
         </criteria>

package/src/filiale/rizhao/pc/DispatchWork.vue

@@ -27,14 +27,14 @@
 <!--              <input type="text" class="form-control" v-model="model.f_single_man"-->
 <!--                   placeholder='操作员'>-->
               <button class="btn btn-default" @click="search()">查询</button>
-              <export-excel class="button_search button_spacing"
+              <export-excel-tel class="button_search button_spacing"
                             :data="{startDate: this.model.startDate,endDate: this.model.endDate}"
                             :field="{'gongsi':'分公司',
                             'zixun':'咨询单','baoxiu':'报修单',
                             'dianhuo':'点火通气单'}"
                             style="margin-top: 20px"
-                            sqlurl="rs/logic/exportfile" sql-name="getDispatchWork" template-name='派单员工作量导出'
-                            :choose-col="true"></export-excel>
+                            sqlurl="rs/logic/telephoneExport" sql-name="getDispatchWork" template-name='派单员工作量导出'
+                            :choose-col="true"></export-excel-tel>
             </div>
           </div>
         </criteria>

package/src/filiale/rizhao/pc/Traffic.vue

@@ -25,14 +25,14 @@
 <!--              <input  type="text" class="form-control" v-model="model.f_single_man"-->
 <!--                      placeholder='操作员'>-->
               <button class="btn btn-default" @click="search()">查询</button>
-              <export-excel class="button_search button_spacing"
+              <export-excel-tel class="button_search button_spacing"
                             :data="{startDate: this.model.startDate,endDate: this.model.endDate}"
                             :field="{'cetime':'时段','hwzl':'话务总量','weijie':'未接数',
                             'yijie':'已接数','jtl':'接听率(%)',
                             'zthsc':'总通话时长(分)'}"
                             style="margin-top: 20px"
-                            sqlurl="rs/logic/exportfile" sql-name="getTraffic" template-name='话务量报表导出'
-                            :choose-col="true"></export-excel>
+                            sqlurl="rs/logic/telephoneExport" sql-name="getTraffic" template-name='话务量报表导出'
+                            :choose-col="true"></export-excel-tel>
             </div>
           </div>
         </criteria>

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

@@ -152,7 +152,6 @@
                 <v-select :value.sync="model.defname" v-model='model.defname'
                           :value-single="true"
                           :options='$parent.$parent.defnames' placeholder='工单状态'
-                          condition="defname = '{}'"
                           close-on-select></v-select>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -453,7 +452,7 @@ export default {
     // }else {
     //   this.backservice = '是'
     // }
-    this.selfSearch()
+    // this.selfSearch()
   },
   watch: {
     'all' (val) {
@@ -540,7 +539,13 @@ export default {
     },
 
     search (args) {
-
+      if(this.$refs.paged.$refs.criteria.model.defname){
+        if(this.$refs.paged.$refs.criteria.model.defname == '完成' || this.$refs.paged.$refs.criteria.model.defname == '撤销'){
+          args.condition += ` and f_state =  '${this.$refs.paged.$refs.criteria.model.defname}'`
+        }else{
+          args.condition += ` and defname =  '${this.$refs.paged.$refs.criteria.model.defname}'`
+        }
+      }
       if (this.f_filialeids) {
         args.condition += ` and f_filiale_id in ${this.f_filialeids}`
       } else {

package/src/filiale/rizhao/telephone.js

@@ -45,7 +45,7 @@ let specialComp = {
   'record-list-left':(resolve) => { require(['./pc/RecordListLeft'], resolve) },
   'changemeter-info':(resolve) => { require(['./pc/ChangemeterInfo'], resolve) },
   'work-list': (resolve) => { require(['./pc/WorkList'], resolve) },
-  'console': (resolve) => { require(['./pc/console'], resolve) },
+  'console': (resolve) => { require(['./pc/Console'], resolve) },
   'reminder-order': (resolve) => { require(['./pc/ReminderOrder'], resolve) },
   'new-repair-paper': (resolve) => { require(['./pc/NewRepairPaper'], resolve) },
 }