telephone-clients 3.0.103-9 → 3.0.103-91

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

@@ -60,7 +60,7 @@
                             :value.sync="model.f_created_date"
                             v-model="model.f_created_date"
                             :format="'yyyy-MM-dd 00:00:00'"
-                            condition="f_created_date > '{}'"
+                            condition="tswo.f_created_date > '{}'"
                 ></datepicker>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -69,7 +69,7 @@
                             :value.sync="model.f_created_enddate"
                             v-model="model.f_created_enddate"
                             :format="'yyyy-MM-dd 23:59:59'"
-                            condition="f_created_date < '{}'"
+                            condition="tswo.f_created_date < '{}'"
                 ></datepicker>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -104,7 +104,7 @@
                             :value.sync="model.f_date_start"
                             v-model="model.f_date_start"
                             :format="'yyyy-MM-dd 00:00:00'"
-                            condition="f_date > '{}'"
+                            condition="tsw.f_date > '{}'"
                 ></datepicker>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -113,7 +113,7 @@
                             :value.sync="model.f_date_end"
                             v-model="model.f_date_end"
                             :format="'yyyy-MM-dd 23:59:59'"
-                            condition="f_date < '{}'"
+                            condition="tsw.f_date < '{}'"
                 ></datepicker>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -152,7 +152,7 @@
                 <label class="font_normal_body" style="width: 40%" >报修类型</label>
                 <v-select :value.sync="model.f_repairtype" :value-single="true" v-model="model.f_repairtype"
                           :options='$parent.$parent.repairstypes' placeholder='报修类型'
-                          condition="f_repairtype like '%{}%'"
+                          condition="tswo.f_repairtype like '%{}%'"
                           close-on-select>
                 </v-select>
               </div>
@@ -160,7 +160,7 @@
                 <label class="font_normal_body" style="width: 40%" >故障类型</label>
                 <v-select :value.sync="model.failure" :value-single="true" v-model="model.failure"
                           :options='$parent.$parent.failures' placeholder='故障类型'
-                          condition="failure like '%{}%'"
+                          condition="tswo.failure like '%{}%'"
                           close-on-select>
                 </v-select>
               </div>
@@ -237,7 +237,6 @@
               <th>
                 <nobr>话务员</nobr>
               </th>
-
               <th>
                 <nobr>结单时间</nobr>
               </th>
@@ -247,7 +246,9 @@
               <th>
                 <nobr>离开时间</nobr>
               </th>
-
+              <th>
+                <nobr>不处理原因</nobr>
+              </th>
 <!--              <th>-->
 <!--                <nobr>逾期状态</nobr>-->
 <!--              </th>-->
@@ -330,6 +331,9 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_date_leave }}</nobr>
             </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_case_remarks }}</nobr>
+            </td>
 
 <!--            <td  style="text-align: center;">-->
 <!--              <nobr>{{ $parent.$parent.$parent.d1(row)}}</nobr>-->
@@ -438,20 +442,22 @@ export default {
       },
       excelHeaders: {
         'f_workorder_type': '工单类型',
+        'f_repairtype': '报修类型',
         'f_service_id': '工单编号',
         'f_created_date': '派单时间',
         'f_user_name': '用户姓名',
         'f_address': '用户地址',
         'f_contact_phone': '联系电话',
         'f_source': '工单来源',
+        'f_remarks': '备注',
         'f_json': '故障明细',
+        'f_repair_remarks': '维修结果',
         'f_single_man': '派单人',
         'f_attendant': '受理人',
         'f_order_man': '接单人',
         'defname': '工单状态',
-        'f_date_leave': '完成时间',
-        'f_repair_remarks': '维修结果',
-        'f_remarks': '备注'
+        'f_case_remarks':'无法处理原因',
+        'f_date_leave': '完成时间'
       },
       criteriaShow: false
     }
@@ -577,9 +583,9 @@ export default {
     search (args) {
 
       if (this.f_filialeids) {
-        args.condition += ` and f_filiale_id in ${this.f_filialeids}`
+        args.condition += ` and tswo.f_filiale_id in ${this.f_filialeids}`
       } else {
-        args.condition += ` and f_filiale_id = '${this.$login.f.orgid}'`
+        args.condition += ` and tswo.f_filiale_id = '${this.$login.f.orgid}'`
       }
 
       this.searchData.condition = args.condition
@@ -590,10 +596,10 @@ export default {
       let condition = '1=1'
 
       if (this.f_filialeids) {
-        condition += ` and f_filiale_id in ${this.f_filialeids}`
+        condition += ` and tswo.f_filiale_id in ${this.f_filialeids}`
         //tag
       } else {
-        condition += ` and f_filiale_id = '${this.$login.f.orgid}'`
+        condition += ` and tswo.f_filiale_id = '${this.$login.f.orgid}'`
       }
       return this.model.search(condition)
     },

package/src/filiale/shexian/telephoneAndroid.js

@@ -20,6 +20,9 @@ let specialComp = {
   },
   'fault-all': (resolve) => {
     require(['./android/FaultAll'], resolve)
+  },
+  'completed-repairV': (resolve) => {
+    require(['./android/CompletedRepair'], resolve)
   }
 }
 exports.specialComp = specialComp

package/src/filiale/tongchuan/android/TicketDetails.vue

@@ -179,6 +179,9 @@
                 <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                   故障明细: {{ trouble(row.failure) }}
                 </div>
+                <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu" v-if="['维修员接单', '维修完成'].indexOf(row.defname) >= 0">
+                  维修人员: {{ row.f_order_man }}
+                </div>
               </div>
             </div>
           </div>

package/src/filiale/tongchuan/pc/WorkOrderStatistics.vue

@@ -129,7 +129,7 @@ export default {
         this.condition += ` and f_created_date < '${this.f_date_end}'`
       }
       if(this.f_orgid){
-        this.condition += ` and f_filiale_id = '${this.f_orgid}'`
+        this.condition += ` and (f_filiale_id = '${this.f_orgid}' or f_orgid = '${this.f_orgid}') `
       }
       new HttpResetClass().load('POST','rs/sql/tel_singleTable_OrderBy', {data: {
           items: `count(0) as zongshu,
@@ -145,7 +145,7 @@ export default {
                 sum(case when tswo.f_workorder_type ='预约单' then 1 else 0 end ) as  anjiandan`,
           tablename: `t_serviceworkorder tswo
                           LEFT JOIN (SELECT * FROM t_servicework sw WHERE sw.id = (SELECT MAX(id) FROM t_servicework WHERE serviceid = sw.serviceid)) tsw ON tswo.id = tsw.serviceid
-                          left join activityins act on tswo.f_processid = act.processid and state = '开始活动' `,
+                          left join activityins act on tswo.f_processid = act.processid and state = '开始活动' and defname in ('话务员派单','站点接单', '维修员接单', '班组长派单', '维修完成','置换完成','安装完成','安装员接单','置换员接单','处理完成') `,
           condition: this.condition,
           orderitem: '1'
         }}, {resolveMsg: null, rejectMsg: null}).then(res=>{

package/src/filiale/wenxi/android/FailureShow.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="row">
+    <label class = "col-sm-4 " v-if="value">故障明细：</label>
+    <span class = "col-sm-8" v-for="failure in failures">
+      {{failure.f_failure_type}}:
+      <span v-for="caes in failure.failurecase">{{caes}}&nbsp;&nbsp;</span>
+    </span>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: "failure-show",
+    props:{
+      // 要显示的故障
+      value: {
+        type: String
+      }
+    },
+    data () {
+      return {
+        // 故障类型
+        failures: [],
+      }
+    },
+    methods: {
+      // 把字符串转换成故障类型列表
+      procValue() {
+        // 清除原来内容
+        this.failures.splice(0, this.failures.length)
+
+        // 空串，直接返回
+        if (this.value) {
+          // 把字符串转换成故障列表对象
+          let array = JSON.parse(this.value)
+          if(Array.isArray(array)) {
+            array.forEach((value) => {
+              this.failures.push(value)
+            })
+          }
+        }
+      },
+    },
+    watch: {
+      'value' () {
+	     this.failures.splice(0, this.failures.length)
+        this.procValue()
+      },
+    },
+    created () {
+    },
+    ready () {
+
+      this.procValue()
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>