telephone-clients 3.0.103 → 3.0.104-1

package/src/filiale/shanxian/pc/WorkList.vue

@@ -244,7 +244,7 @@
       <delay-reply :row="selectone" @success="selfSearch()" @cancel="editflag = null"></delay-reply>
     </div>
   </div>
-  <modal :show.sync="editflag==='工单打回'||editflag==='工单下发'||editflag==='派单'" v-ref:modal backdrop="false">
+  <modal :show.sync="editflag==='工单打回'||editflag==='工单下发'||editflag==='派单'" v-if="editflag==='工单打回'||editflag==='工单下发'||editflag==='派单'" v-ref:modal backdrop="false">
     <header slot="modal-header" class="modal-header">
       {{ editflag === '工单打回' ? '工单打回' : editflag ==='工单下发'?'工单下发':'派单' }}
     </header>

package/src/filiale/shanxian/telephone.js

@@ -1,12 +1,13 @@
-// 分公司特殊组件页面注册
-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) },
+  'repairs-work': (resolve) => { require(['./pc/RepairsWork'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

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

@@ -161,6 +161,13 @@
                   <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_phone || '无' }}
+                    <img src="../../../assets/telphonesend.png" style="width: 12px;"
+                         @click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_phone)'>
+                  </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 || '无' }}

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

@@ -0,0 +1,280 @@
+<template>
+  <div style="height: auto;width: 100%;margin-top: 10px" class="repair-bg">
+    <criteria-paged :model="model" v-ref:paged @sort="sort">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <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 class="font_normal_body">用户姓名:</label>
+              </div>
+              <div class="col-xs-8">
+                <input class="search_input input-font"
+                       v-model="model.username" condition="f_user_name like '{}%'" placeholder="  请输入用户姓名" />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区蓝色.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font_normal_body">用户地址:</label>
+              </div>
+              <div class="col-xs-8">
+                <input type="text" class="search_input input-font" v-model="model.address"
+                       style="width: 60%" placeholder="  请输入用户地址" 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 class="font_normal_body">开始日期:</label>
+              </div>
+              <div class="col-xs-8">
+                <datepicker
+                  class="select_list select"
+                  placeholder='开始日期' style="width: 60%"
+                  :format="'yyyy-MM-dd'"
+                  :value.sync="model.startDate"
+                  v-model="model.startDate"
+                  condition="(tsw.f_date >='{} 00:00:00' or tswo.f_closing_time >= '{} 00:00:00')">
+                </datepicker>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/结束时间.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font_normal_body">结束日期:</label>
+              </div>
+              <div class="col-xs-8">
+                <datepicker
+                  class="select_list select"
+                  placeholder='结束日期' style="width: 60%"
+                  :format="'yyyy-MM-dd'"
+                  :value.sync="model.endDate"
+                  v-model="model.endDate"
+                  condition="(tsw.f_date <='{} 23:59:59' or tswo.f_closing_time <= '{} 23:59:59')">
+                </datepicker>
+              </div>
+            </div>
+            <div class="row app-row" style="height: 10px;"></div>
+            <div class="row text-center app-row">
+              <button type="button"  class="btn btn-lg btn-font btn-color" @click="search()" style="min-width: 25%;">查询</button>
+            </div>
+            <div class="row app-row" style="height: 10px;"></div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list' style="background-color: white">
+        <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">
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">工单编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_service_id }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">故障明细</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.failure ? $parent.$parent.$parent.trouble(row.failure): '无'  }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">用户编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_userinfo_code }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">用户姓名</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_name }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">用户地址</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_address }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">联系电话</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_contact_phone }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">派单人员</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_single_man }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">派单时间</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_created_date }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">接单人员</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_order_man }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">结单时间</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_date ? row.f_date : row.f_closing_time }}</p>
+                </div>
+                <div class="row1">
+                  <p class="panel-title col-xs-4 text-left font">工单状态</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.defname }}</p>
+                </div>
+                <div class="row1" v-if="row.f_case_remarks">
+                  <p class="panel-title col-xs-4 text-left font">结案备注</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_case_remarks }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass,PagedList} from "vue-client";
+  import co from 'co'
+  export default {
+    title: '已办工单',
+    data() {
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/serviceDetails`, 20, {
+        f_filialeids:"this.f_filialeid",
+        orderitem: "'id desc'"
+      })
+      return {
+        model: model,
+        condition: "AND tswo.f_order_man = '" + Vue.user.name + "' AND (sa.defname = '维修完成' or sa.defname = '无法处理')"
+      }
+    },
+    props: {
+      // 控制工单类型，进行各自工作
+      worktype:{
+        type:String,
+        default:'报修单'
+      },
+      sourcet:{
+        type:String,
+        default:'横屏'
+      },
+      tabname:{
+        type:String
+      }
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      sort(field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderDefault}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+        this.search()
+      },
+      search() {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch(args) {
+        console.log(args.condition)
+        args.condition += this.condition
+        console.log(args.condition)
+        ////tag
+        //args.condition+=" and f_check_type='民用'"
+        this.model.search(args.condition, args.model, args.condValue)
+      },
+      trouble (val) {
+        let failureall=''
+        // val=[{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""},{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""},{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""}]
+
+        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() {
+      this.search()
+      // var _this = this;
+      // this.timeoutHandle = window.setInterval(function() {
+      //   _this.sumsearch()
+      // }, 60000)
+    },
+    components: {
+      'delay-apply': (resolve) => {
+        require(['../../../components/workorder/DelayApply'], resolve)
+      }
+    }
+
+  }
+</script>
+<style scoped>
+  .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{
+    border-radius: 4px ;
+    border: 1px solid #499EDF;
+  }
+  .qxbtn-color{
+    background-color: #FFFFFF;
+    border-radius: 4px ;
+    border: 1px solid #499EDF;
+  }
+  .row1 {
+    margin: 4px 0;
+    display: flex;
+    align-items: center;
+    height: 25px !important;
+  }
+</style>