telephone-clients 3.0.103-99 → 3.0.104-1

package/src/components/telreport/TrafficClassificationReport.vue

@@ -0,0 +1,134 @@
+<template>
+  <div id='app' class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
+        <div novalidate class="form-inline auto" partial>
+          <div class="row">
+            <div class="col-sm-2 form-group">
+              <label for="startDate" class="font_normal_body">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          style="width: 60%;"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="endDate" class="font_normal_body">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="font_normal_body" style="width: 40%">话&ensp;务&ensp;员</label>
+              <v-select :value.sync="model.attendants"
+                        :options='$parent.$parent.operators'
+                        placeholder='请选择话务员'
+                        style="width: 60%"
+              ></v-select>
+            </div>
+            <div class="col-sm-3 form-group" style="margin-top: 8px">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <report-print class="button_export button_spacing" style="width:28%" ></report-print>
+              <report-excel class="button_export button_spacing" style="width:28%" ></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' class="list_area" style="overflow-y: scroll;position:relative">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">话务报表统计</h3>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import {DataModel, HttpResetClass} from 'vue-client'
+  import * as Util from "../Util";
+
+  export default {
+    title: '话务报表',
+    data() {
+      let model = new DataModel('rs/telephone/report/trafficClassification',{
+        startDate:'this.model.startDate',
+        endDate:'this.model.endDate',
+        attendant:'this.model.attendant'
+      })
+      return {
+        operators:[],
+        filialeNameStr: '',
+        filialeCodeStr: '',
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model
+      }
+    },
+    methods: {
+      getOperators (role) {
+        this.operators = []
+        let val = {source: `this.getParentByType($organization$).getChildByName($${role}$).getUsers()`, userid: `${this.$login.f.id}`}
+        let http = new HttpResetClass()
+        http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          res.data.forEach((item) => {
+            this.operators.push({label: item.name, value: item.name})
+          })
+        })
+      },
+      getRes(obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
+      },
+      search(args){
+        debugger
+        if (args.model.attendants && args.model.attendants.length>0){
+          // let attStr = "("
+          // for (let attendantKey in args.model.attendants) {
+          //   attStr +=`'${args.model.attendants[attendantKey]}',`
+          // }
+          // attStr+="'')"
+          // args.model.attendant = attStr
+          args.model.attendant = args.model.attendants[0]
+        }else {
+          args.model.attendant = ""
+        }
+        this.model.search('1=1',args.model)
+      }
+    },
+    ready() {
+      let date = new Date()
+      let month = date.getMonth()
+      let realMonth = date.getMonth()+1
+      let day = date.getDate()
+      this.$refs.paged.$refs.criteria.model.startDate = date.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (day<10? '0'+ day : day) + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = date.getFullYear() + '-' + (realMonth<10? '0'+ realMonth : realMonth) + '-' + (day<10? '0'+ day : day) + ' 23:59:59'
+      this.getOperators('话务员')
+    },
+    computed: {
+    }
+  }
+</script>
+<style>
+  th>tr>td {
+    width: 200px;
+  }
+</style>

package/src/components/temp/MetereadInfo.vue

@@ -8,7 +8,6 @@
         <template partial='head'>
           <tr>
             <th><nobr>表号</nobr></th>
-            <!--<th><nobr>气表厂家</nobr></th>-->
             <th><nobr>上报日期</nobr></th>
             <th><nobr>本次抄表底数</nobr></th>
             <th><nobr>表内剩余金额</nobr></th>
@@ -17,12 +16,10 @@
         </template>
         <template partial='body'>
           <td style="text-align: center">{{row.f_meternumber}}</td>
-          <!--<td>{{row.f_manufacturers}}</td>-->
           <td style="text-align: center">{{row.f_hand_date}}</td>
           <td style="text-align: center">{{row.f_tablebase}}</td>
           <td style="text-align: center">{{row.f_jval}}</td>
-          <td style="text-align: center" v-if="row.f_valveState===0">开阀</td>
-          <td  style="text-align: center" v-else>关阀</td>
+          <td style="text-align: center">{{row.f_valvestate == '0' ? '开阀' : '关阀'}}</td>
         </template>
       </data-grid>
     </criteria-paged>

package/src/components/weinan/Console.vue

@@ -356,7 +356,7 @@
           callObj = {
             callNum: this.initPhone,
             ext_no: this.ext_no,
-            aId: Util.f.id,
+            aId: this.$login.f.id,
             RecordsID: ''
           }
           this.$emit('call-in', callObj)

package/src/components/workorder/FaultAll.vue

@@ -433,7 +433,7 @@ export default {
           return
         }
         let imgflag = this.checkzhihuanimg()
-        if(!(imgflag.check) && Vue.config.telephone.FaultAll.photograph?Vue.config.telephone.FaultAll.photograph:false){
+        if(!(imgflag.check)){
           this.$showMessage(`${imgflag.title}未拍照！`, ['confirm'])
           return
         }