telephone-clients 3.0.103 → 3.0.104-10

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>