telephone-clients 3.0.103-7 → 3.0.103-71

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/qianneng/android/FaultAll.vue

@@ -486,7 +486,7 @@ export default {
       // if ((this.savevalid.uservalid && this.savevalid.doorvalid) || this.norepair || this.liGuanWeiXou || this.sheBeiRepairAll) {
       this.msg.serviceacitivity[0].f_date_leave = Util.toStandardTimeString()
       this.msg.serviceacitivity[0].f_result_status = param
-      this.msg.serviceacitivity[0].f_button = '审核验收'
+      this.msg.serviceacitivity[0].f_button = '维修完成'
       if (this.msg.defname == '审核验收'){
         this.msg.serviceacitivity[0].f_button = '维修完成'
       }

package/src/filiale/qianneng/android/TemporarySingle.vue

@@ -368,6 +368,9 @@
           this.$showMessage('请填写报警内容类别')
           return
         }
+        if(data.model.failure){
+          data.model.f_json =  this.trouble(data.model.failure)
+        }
         //tag)
         let data = {
           model: this.model, loginUser: {
@@ -427,6 +430,28 @@
           failure.push({"f_failure_type": val[i], "failurecase": []})
         }
         this.model.failure=JSON.stringify(failure)
+      },
+      trouble (val) {
+        let failureall=''
+        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(){

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

@@ -111,7 +111,9 @@
             <tr>
               <th>序号</th>
               <th>工单编号</th>
+              <th>客户编号</th>
               <th>客户名称</th>
+              <th>客户电话</th>
               <th>地址</th>
               <th>故障明细</th>
               <th>用户类型</th>
@@ -135,9 +137,15 @@
               <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_contact_phone}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_address}}</font></nobr>
               </td>
@@ -197,7 +205,9 @@ export default {
       criteriaShow: false,
       getfield: {
         'f_service_id': '工单编号',
+        'f_userinfo_code': '客户编号',
         'f_user_name': '客户名称',
+        'f_contact_phone': '客户电话',
         'f_address': '地址',
         'f_json': '故障明细',
         'f_user_type': '用户类型',

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

@@ -0,0 +1,144 @@
+<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" style="margin-bottom: 10px" partial>
+            <div class="row">
+              <div class="col-sm-6 form-group form-input-group" style="width: 40%">
+                <role-selector-tel
+                  role-name="维修员"
+                  role-lable="维&nbsp;修&nbsp;员"
+                  @re-res="$parent.$parent.getRes"
+                  :value.sync="model.f_checker_id"
+                  v-model="model.f_checker_id"
+                  condition="f_order_man = '{}'">
+                </role-selector-tel>
+              </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_created_date"
+                            v-model="model.f_created_date"
+                            :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_created_enddate"
+                            v-model="model.f_created_enddate"
+                            :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="getMaterialStatistics"
+                              template-name='材料汇总导出'
+                              :choose-col="true"></export-excel>
+              </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>序号</th>
+              <th>维修员</th>
+              <th>材料名称</th>
+              <th>材料型号</th>
+              <th>数量</th>
+              <th>金额（元）</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_repair_man}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_name}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_type}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_count}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_money}}</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/getMaterialStatistics', 30, null),
+      criteriaShow: false,
+      getfield: {
+        'f_repair_man': '维修员',
+        'f_material_name': '材料名称',
+        'f_material_type': '材料型号',
+        'f_count': '数量',
+        'f_money': '金额（元）',
+      },
+      f_filialeids: ''
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+    },
+    searchCondition (args) {
+      if (this.f_filialeids) {
+        args.condition += ` and t2.f_filiale_id in ${this.f_filialeids}`
+      } else {
+        args.condition += ` and t2.f_filiale_id = '${this.$login.f.orgid}'`
+      }
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    getRes (obj) {
+      this.f_filialeids = this.$login.convertToIn(obj.resids)
+    },
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.model.condition
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

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

@@ -65,13 +65,13 @@
               <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px">用户地址:</td>
               <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px">{{baseuserinfo.f_address}}</td>
             </tr>
-            <tr>
+<!--            <tr>
 
               <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">派单时间:</td>
               <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ service.f_created_date }}</td>
               <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">完成时间:</td>
               <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ service.f_repair_date }}</td>
-            </tr>
+            </tr>-->
             <tr>
 
               <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>

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

@@ -6,6 +6,12 @@
           <label class="font_normal_body" style="width: 30%">来电电话</label>
           <input style="width: 60%" type="text" readonly v-model='model.f_phone' class="form-control"></input>
         </div>
+        <div class="col-sm-6 form-group form-fix-width">
+          <label class="font_normal_body" for="f_user_name" :class="model.f_userinfo_code ? '': 'class-error' "
+                 style="width: 30%">客户编号</label>
+          <input style="width: 60%" type="text" readonly v-model='model.f_userinfo_code' id="f_userinfo_code" name="f_userinfo_code"
+                 class="form-control"/>
+        </div>
         <div class="col-sm-6 form-group form-fix-width">
           <label class="font_normal_body" for="f_user_name" :class="model.f_user_name ? '': 'class-error' "
                  style="width: 30%">客户姓名</label>
@@ -93,7 +99,8 @@
         </div>
         <div class="col-sm-6 form-group form-fix-width">
           <label class=" font_normal_body" style="width: 30%">截止天数</label>
-          <v-select :value="model.day" :value-single="true"
+          <v-select :value.sync="model.day" :value-single="true"
+                    v-model="model.day"
                     :options='days' placeholder='请选择截止天数'
                     close-on-select
                     v-on:change="daychange" style="width: 60%"></v-select>
@@ -310,12 +317,14 @@
             f_service_acitivity_type: '派单'
           }],
           f_source: '话务来电',
+          day:'',
           f_finish_date:'',
           f_service_id: '',
           f_contact_phone: '',
           f_enter_number: '',
           f_meetunit: '',
           f_phone: '',
+          f_userinfo_code: '',
           f_user_name: '',
           f_address: '',
           f_alarm_accident: '',//报警详细地址
@@ -631,6 +640,7 @@
             f_meetunit: this.model.serviceacitivity[0].f_meetunit,
             f_reciever: this.model.serviceacitivity[0].f_reciever
           }],
+          day:'',
           f_finish_date:'',
           f_repairman_phone:this.model.f_repairman_phone,
           f_meetunit: this.model.f_meetunit,
@@ -760,7 +770,7 @@
             ',报警人:' + this.showMessageData.model.f_user_name +
             ',报警电话:' + this.showMessageData.model.f_phone +
             ',联系电话:' + this.showMessageData.model.f_contact_phone +
-            ',接管时间:' + this.showMessageData.model.f_repair_date +
+            ',接警时间:' + Util.getNowDate() +
             ',警情类别:' + this.showMessageData.model.f_repairtype +
             ',报警类别:' + JSON.parse(this.showMessageData.model.failure)[0].f_failure_type +
             ',报警事故地址:' + this.showMessageData.model.f_alarm_accident +

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/telephone.js

@@ -12,6 +12,7 @@ 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)},
 }
 exports.specialComp = specialComp