telephone-clients 3.0.104-65 → 3.0.104-66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.104-65",
+  "version": "3.0.104-66",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/pc/TelLossList.vue

@@ -1,264 +1,264 @@
-<template >
-  <div class="flex-row">
-    <div id="stand-work-list" class="flex bg-white p-10 basic-main" style="flex-direction: row">
-      <div style="width: 40%;height: 100%" v-show="leftShow">
-        <div class="row" style="height: 10%;width: 50%">
-          <div class="form-group form-input-group" style="display: flex;justify-content: flex-start">
-            <label class="font_normal_body" style="width: 40%">查询日期</label>
-            <datepicker placeholder="查询日期"
-                        :value.sync="searchDate"
-                        v-model="searchDate"
-                        :format="'yyyy-MM-dd 00:00:00'"
-            ></datepicker>
-            <button type="button" name="button"
-                    class="button_search button_spacing" style="z-index: 2" @click="searchEcharts()">查询</button>
-          </div>
-        </div>
-        <div style="height: 45%;" id="husunzhexian1"></div>
-        <div style="height: 45%;" id="husunzhexian2"></div>
-      </div>
-      <div class="span" style="width: 60%;overflow: auto">
-        <visit-info v-if="showVisit" :phone="wavflie" :idwavfile="idwavfile" :outltime="outltime" @show-obj="watchShow"></visit-info>
-        <criteria-paged :model="model" v-else v-ref:paged>
-          <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
-            <div novalidate class="form-inline" partial>
-              <div class="row">
-                <div class="col-sm-3 form-group form-input-group">
-                  <label class="font_normal_body" style="width: 35%">电话号码</label>
-                  <input  type="text" class="input_search" v-model="model.telnum" placeholder='电话号码'
-                          condition="telnum like '%{}%'"
-                          :size="model.telnum ? model.telnum.length : 7">
-                </div>
-
-                <div class="col-sm-3 form-group form-input-group">
-                  <label class="font_normal_body" style="width: 40%">来电时间</label>
-                  <datepicker placeholder="来电时间"
-                              :value.sync="model.f_date"
-                              v-model="model.f_date"
-                              :format="'yyyy-MM-dd 00:00:00'"
-                              condition="outltime > '{}'"
-                  ></datepicker>
-                </div>
-                <div class="col-sm-3 form-group form-input-group">
-                  <label class="font_normal_body" style="width: 35%">回访状态</label>
-                  <v-select :value.sync="model.f_flghuifang"
-                            :options='$parent.$parent.huifangs'
-                            :value-single="true"
-                            placeholder='请选择回访状态'
-                            close-on-select
-                            style="width: 60%"
-                  ></v-select>
-                </div>
-                <div style="float: right;" class="form-group span">
-                  <button type="button" name="button"
-                          class="button_search button_spacing" @click="search(),$dispatch('search')" style="z-index: 2">查询</button>
-                  <export-excel-tel
-                    :data="$parent.$parent.searchData"
-                    :field="$parent.$parent.excelHeaders"
-                    sqlurl="rs/logic/telephoneExport" sql-name="tel_singleTable_OrderBy" template-name='呼损记录导出'
-                    :choose-col="false">
-                  </export-excel-tel>
-                </div>
-              </div>
-            </div>
-          </criteria>
-          <data-grid  partial='list' v-ref:grid :model="model" class="list_area table_sy">
-            <template partial='head'>
-              <tr>
-                <th><nobr>电话号码</nobr></th>
-                <th><nobr>来电时间</nobr></th>
-                <th><nobr>操作</nobr></th>
-              </tr>
-            </template>
-            <template partial='body'>
-              <td style="text-align: center">{{row.telnum}}</td>
-              <td style="text-align: center">{{row.outltime}}</td>
-              <td style="text-align: center">
-                <button-link v-show="!row.f_flghuifang" type="button" class="btn btn-link" @click="$parent.$parent.$parent.playWav(row.telnum,row.id)">回拨</button-link>
-              </td>
-            </template>
-          </data-grid>
-        </criteria-paged>
-      </div>
-    </div>
-  </div>
-<!--  <modal :show.sync="showVisit" v-ref:modal backdrop="false">-->
-<!--    <header slot="modal-header" class="modal-header">-->
-<!--    </header>-->
-<!--    <article slot="modal-body" class="modal-body">-->
-<!--      <visit-info v-if="showVisit" :phone="wavflie" :idwavfile="idwavfile" :outltime="outltime" @show-obj="watchShow"></visit-info>-->
-<!--    </article>-->
-<!--    <footer slot="modal-footer" class="modal-footer">-->
-<!--    </footer>-->
-<!--  </modal>-->
-</template>
-
-<script>
-import {HttpResetClass, PagedList} from 'vue-client'
-import * as Util from '../Util'
-import {addDate} from "../Util";
-export default {
-  title: '呼损记录',
-  data () {
-    return {
-      model: new PagedList('rs/sql/tel_singleTable_OrderBy', 20, {items: "'*'", tablename: "'t_records'", orderitem: "'outltime desc'" }),
-      row: null,
-      show: false,
-      wavflie : '',
-      idwavfile:'',
-      leftShow:true,
-      searchDate:Util.toStandardDateString(),
-      orderMan: '',
-      msgs: [],
-      huifangs:[{label:"全部",value:""},{label:"已回访",value:"已回访"},{label:"未回访",value:"未回访"}],
-      service: Object,
-      pendingCount: 0,
-      serobj:Object,
-      showVisit:false,
-      outltime:this.getNowFormatDate(),
-      searchData:{
-        items: "*",
-        tablename: "t_records",
-        orderitem: "outltime desc",
-        condition: '1=1'
-      },
-      excelHeaders: {
-        'telnum': '电话号码',
-        'outltime': '来电时间',
-      },
-    }
-  },
-  ready () {
-    this.$refs.paged.$refs.criteria.model.f_flghuifang = '未回访'
-    this.leftShow = (this.$parent.leftShow == undefined ? true : this.$parent.leftShow)
-    this.renderEcharts(Util.toStandardDateString())
-    // this.selfSearch()
-
-  },
-  methods: {
-    searchEcharts(){
-      console.log("9334",this.searchDate)
-      this.renderEcharts(this.searchDate)
-    },
-    //获取当前日期
-    renderEcharts(date){
-      console.log("933",Util.addDate(3,date),Util.addDate(-3),date)
-      new HttpResetClass().load("post",'rs/sql/getLossPhoneByTime',{
-        data:{
-          groupitem:'SUBSTRING(outltime, 0, 11)',
-          condition:`outltime>='${Util.addDate(-3,date)} 00:00:00' and outltime<='${Util.addDate(3,date)} 23:59:59'`
-        }
-      },{resolveMsg:null,rejectMsg:null}).then(res=>{
-        let myChart1 = this.$echarts.init(document.getElementById(("husunzhexian1")))
-        myChart1.setOption(this.getAOptions("呼损日分析表",res.data))
-      })
-
-      new HttpResetClass().load("post",'rs/sql/getLossPhoneByTime',{
-        data:{
-          groupitem:"SUBSTRING(outltime, 12, 2)+':00'",
-          condition:`outltime>='${Util.toStandardDateString(date)} 08:00:00' and outltime<='${Util.toStandardDateString(date)} 18:59:59'`
-        }
-      },{resolveMsg:null,rejectMsg:null}).then(res=>{
-        let myChart1 = this.$echarts.init(document.getElementById(("husunzhexian2")))
-        myChart1.setOption(this.getAOptions("呼损时分析表",res.data))
-      })
-    },
-    getAOptions(title,arr){
-
-      return {
-        color: ['rgb(155,214,129)', '#73c0de'],
-        title: {
-          text: title
-        },
-        tooltip: {
-          trigger: 'axis'
-        },
-        legend: {
-          data: ['忙线', '未接']
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
-        },
-        toolbox: {
-          feature: {
-            saveAsImage: {}
-          }
-        },
-        xAxis: {
-          type: 'category',
-          boundaryGap: false,
-          data: arr.map(item=>{
-            if(title === '呼损日分析表'){
-              return item.timearea.substr(5,5)
-            }
-            return item.timearea
-          })
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: [
-          {
-            name: '未接',
-            type: 'line',
-            stack: 'Total',
-            data: arr.map(item=>item.weijie)
-          },
-          {
-            name: '忙线',
-            type: 'line',
-            stack: 'Total',
-            data: arr.map(item=>item.zhanxian)
-          },
-        ]
-      }
-    },
-    getNowFormatDate() {
-      var date = new Date();
-      var seperator1 = "-";
-      var month = date.getMonth() + 1;
-      var strDate = date.getDate();
-      if (month >= 1 && month <= 9) {
-        month = "0" + month;
-      }
-      if (strDate >= 0 && strDate <= 9) {
-        strDate = "0" + strDate;
-      }
-      var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate + ' 23:59:59'
-      return currentdate;
-    },
-    watchShow(val){
-      this.showVisit = val
-    },
-    clearVisit(){
-      this.show = false
-    },
-    playWav(val,val1){
-      if (!this.leftShow){
-        this.$parent.setUserPhone(val)
-      }
-      this.wavflie=val;
-      this.idwavfile=val1
-      this.showVisit = true
-    },
-    closemodel () {
-      this.showVisit = false
-    },
-    search(args) {
-      if(args.model.f_flghuifang){
-        if(args.model.f_flghuifang==='已回访'){
-          args.condition += ` and f_flghuifang = '已回访'`
-        }else{
-          args.condition += ` and f_flghuifang is null`
-        }
-      }
-      args.condition += " AND isnull(starttime,'') = '' AND isnull(findtime,'') != ''"
-      this.searchData.condition = args.condition
-      this.model.search(args.condition)
-    },
-  },
-}
-</script>
+<template >
+  <div class="flex-row">
+    <div id="stand-work-list" class="flex bg-white p-10 basic-main" style="flex-direction: row">
+      <div style="width: 40%;height: 100%" v-show="leftShow">
+        <div class="row" style="height: 10%;width: 50%">
+          <div class="form-group form-input-group" style="display: flex;justify-content: flex-start">
+            <label class="font_normal_body" style="width: 40%">查询日期</label>
+            <datepicker placeholder="查询日期"
+                        :value.sync="searchDate"
+                        v-model="searchDate"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+            ></datepicker>
+            <button type="button" name="button"
+                    class="button_search button_spacing" style="z-index: 2" @click="searchEcharts()">查询</button>
+          </div>
+        </div>
+        <div style="height: 45%;" id="husunzhexian1"></div>
+        <div style="height: 45%;" id="husunzhexian2"></div>
+      </div>
+      <div class="span" style="width: 60%;overflow: auto">
+        <visit-info v-if="showVisit" :phone="wavflie" :idwavfile="idwavfile" :outltime="outltime" @show-obj="watchShow"></visit-info>
+        <criteria-paged :model="model" v-else v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
+            <div novalidate class="form-inline" partial>
+              <div class="row">
+                <div class="col-sm-3 form-group form-input-group">
+                  <label class="font_normal_body" style="width: 35%">电话号码</label>
+                  <input  type="text" class="input_search" v-model="model.telnum" placeholder='电话号码'
+                          condition="telnum like '%{}%'"
+                          :size="model.telnum ? model.telnum.length : 7">
+                </div>
+
+                <div class="col-sm-3 form-group form-input-group">
+                  <label class="font_normal_body" style="width: 40%">来电时间</label>
+                  <datepicker placeholder="来电时间"
+                              :value.sync="model.f_date"
+                              v-model="model.f_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              condition="outltime > '{}'"
+                  ></datepicker>
+                </div>
+                <div class="col-sm-3 form-group form-input-group">
+                  <label class="font_normal_body" style="width: 35%">回访状态</label>
+                  <v-select :value.sync="model.f_flghuifang"
+                            :options='$parent.$parent.huifangs'
+                            :value-single="true"
+                            placeholder='请选择回访状态'
+                            close-on-select
+                            style="width: 60%"
+                  ></v-select>
+                </div>
+                <div style="float: right;" class="form-group span">
+                  <button type="button" name="button"
+                          class="button_search button_spacing" @click="search(),$dispatch('search')" style="z-index: 2">查询</button>
+                  <export-excel-tel
+                    :data="$parent.$parent.searchData"
+                    :field="$parent.$parent.excelHeaders"
+                    sqlurl="rs/logic/telephoneExport" sql-name="tel_singleTable_OrderBy" template-name='呼损记录导出'
+                    :choose-col="false">
+                  </export-excel-tel>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid  partial='list' v-ref:grid :model="model" class="list_area table_sy">
+            <template partial='head'>
+              <tr>
+                <th><nobr>电话号码</nobr></th>
+                <th><nobr>来电时间</nobr></th>
+                <th><nobr>操作</nobr></th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center">{{row.telnum}}</td>
+              <td style="text-align: center">{{row.outltime}}</td>
+              <td style="text-align: center">
+                <button-link v-show="!row.f_flghuifang" type="button" class="btn btn-link" @click="$parent.$parent.$parent.playWav(row.telnum,row.id)">回拨</button-link>
+              </td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+<!--  <modal :show.sync="showVisit" v-ref:modal backdrop="false">-->
+<!--    <header slot="modal-header" class="modal-header">-->
+<!--    </header>-->
+<!--    <article slot="modal-body" class="modal-body">-->
+<!--      <visit-info v-if="showVisit" :phone="wavflie" :idwavfile="idwavfile" :outltime="outltime" @show-obj="watchShow"></visit-info>-->
+<!--    </article>-->
+<!--    <footer slot="modal-footer" class="modal-footer">-->
+<!--    </footer>-->
+<!--  </modal>-->
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import * as Util from '../Util'
+import {addDate} from "../Util";
+export default {
+  title: '呼损记录',
+  data () {
+    return {
+      model: new PagedList('rs/sql/tel_singleTable_OrderBy', 20, {items: "'*'", tablename: "'t_records'", orderitem: "'outltime desc'" }),
+      row: null,
+      show: false,
+      wavflie : '',
+      idwavfile:'',
+      leftShow:true,
+      searchDate:Util.toStandardDateString(),
+      orderMan: '',
+      msgs: [],
+      huifangs:[{label:"全部",value:""},{label:"已回访",value:"已回访"},{label:"未回访",value:"未回访"}],
+      service: Object,
+      pendingCount: 0,
+      serobj:Object,
+      showVisit:false,
+      outltime:this.getNowFormatDate(),
+      searchData:{
+        items: "*",
+        tablename: "t_records",
+        orderitem: "outltime desc",
+        condition: '1=1'
+      },
+      excelHeaders: {
+        'telnum': '电话号码',
+        'outltime': '来电时间',
+      },
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.f_flghuifang = '未回访'
+    this.leftShow = (this.$parent.leftShow == undefined ? true : this.$parent.leftShow)
+    this.renderEcharts(Util.toStandardDateString())
+    // this.selfSearch()
+
+  },
+  methods: {
+    searchEcharts(){
+      console.log("9334",this.searchDate)
+      this.renderEcharts(this.searchDate)
+    },
+    //获取当前日期
+    renderEcharts(date){
+      console.log("933",Util.addDate(3,date),Util.addDate(-3),date)
+      new HttpResetClass().load("post",'rs/sql/getLossPhoneByTime',{
+        data:{
+          groupitem:'SUBSTRING(outltime, 0, 11)',
+          condition:`outltime>='${Util.addDate(-3,date)} 00:00:00' and outltime<='${Util.addDate(3,date)} 23:59:59'`
+        }
+      },{resolveMsg:null,rejectMsg:null}).then(res=>{
+        let myChart1 = this.$echarts.init(document.getElementById(("husunzhexian1")))
+        myChart1.setOption(this.getAOptions("呼损日分析表",res.data))
+      })
+
+      new HttpResetClass().load("post",'rs/sql/getLossPhoneByTime',{
+        data:{
+          groupitem:"SUBSTRING(outltime, 12, 2)+':00'",
+          condition:`outltime>='${Util.toStandardDateString(date)} 08:00:00' and outltime<='${Util.toStandardDateString(date)} 18:59:59'`
+        }
+      },{resolveMsg:null,rejectMsg:null}).then(res=>{
+        let myChart1 = this.$echarts.init(document.getElementById(("husunzhexian2")))
+        myChart1.setOption(this.getAOptions("呼损时分析表",res.data))
+      })
+    },
+    getAOptions(title,arr){
+
+      return {
+        color: ['rgb(155,214,129)', '#73c0de'],
+        title: {
+          text: title
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        legend: {
+          data: ['忙线', '未接']
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: {}
+          }
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: arr.map(item=>{
+            if(title === '呼损日分析表'){
+              return item.timearea.substr(5,5)
+            }
+            return item.timearea
+          })
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            name: '未接',
+            type: 'line',
+            stack: 'Total',
+            data: arr.map(item=>item.weijie)
+          },
+          {
+            name: '忙线',
+            type: 'line',
+            stack: 'Total',
+            data: arr.map(item=>item.zhanxian)
+          },
+        ]
+      }
+    },
+    getNowFormatDate() {
+      var date = new Date();
+      var seperator1 = "-";
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+        month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+        strDate = "0" + strDate;
+      }
+      var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate + ' 23:59:59'
+      return currentdate;
+    },
+    watchShow(val){
+      this.showVisit = val
+    },
+    clearVisit(){
+      this.show = false
+    },
+    playWav(val,val1){
+      if (!this.leftShow){
+        this.$parent.setUserPhone(val)
+      }
+      this.wavflie=val;
+      this.idwavfile=val1
+      this.showVisit = true
+    },
+    closemodel () {
+      this.showVisit = false
+    },
+    search(args) {
+      if(args.model.f_flghuifang){
+        if(args.model.f_flghuifang==='已回访'){
+          args.condition += ` and f_flghuifang = '已回访'`
+        }else{
+          args.condition += ` and f_flghuifang is null`
+        }
+      }
+      args.condition += " AND isnull(starttime,'') = '' AND isnull(findtime,'') != ''"
+      this.searchData.condition = args.condition
+      this.model.search(args.condition)
+    },
+  },
+}
+</script>

package/src/components/telreport/RepairsDetailsReport.vue

@@ -1,98 +1,98 @@
-<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'"
-                          :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'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </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} from 'vue-client'
-
-  export default {
-    title: '维修报表',
-    data() {
-      let model = new DataModel('rs/telephone/report/repairsDetailsReport')
-      return {
-        filialeNameStr: '',
-        filialeCodeStr: '',
-        userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
-        model: model
-      }
-    },
-    methods: {
-      getRes(obj) {
-        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
-      },
-      search(args){
-        let condition = ' and 1 = 1 '
-        if (args.model.startDate){
-          condition += ` and ts1.f_date_leave >= '${args.model.startDate} 00:00:00' `
-        }
-        if (args.model.endDate){
-          condition += ` and ts1.f_date_leave <= '${args.model.endDate} 23:59:59' `
-        }
-        this.model.search(condition,args.model)
-      }
-    },
-    ready() {
-    },
-    computed: {
-    }
-  }
-</script>
-<style>
-  th>tr>td {
-    width: 200px;
-  }
-</style>
+<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 HH:mm:ss'"
+                          :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 HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </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} from 'vue-client'
+
+  export default {
+    title: '维修报表',
+    data() {
+      let model = new DataModel('rs/telephone/report/repairsDetailsReport')
+      return {
+        filialeNameStr: '',
+        filialeCodeStr: '',
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model
+      }
+    },
+    methods: {
+      getRes(obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
+      },
+      search(args){
+        let condition = ' and 1 = 1 '
+        if (args.model.startDate){
+          condition += ` and ts1.f_date_leave >= '${args.model.startDate} 00:00:00' `
+        }
+        if (args.model.endDate){
+          condition += ` and ts1.f_date_leave <= '${args.model.endDate} 23:59:59' `
+        }
+        this.model.search(condition,args.model)
+      }
+    },
+    ready() {
+    },
+    computed: {
+    }
+  }
+</script>
+<style>
+  th>tr>td {
+    width: 200px;
+  }
+</style>

package/src/components/telreport/TrafficClassificationReport.vue

@@ -1,135 +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='请选择话务员'
-                        :multiple="true"
-                        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){
-        if (args.model.attendants && args.model.attendants.length>0){
-          let attStr = ""
-          for (let attendantKey in args.model.attendants) {
-            attStr +=`'${args.model.attendants[attendantKey]}','，',`
-          }
-          attStr=attStr.substring(0, attStr.length-1)
-          args.model.attendant = attStr
-          // args.model.attendant = args.model.attendants[0]
-        }else {
-          this.$showMessage('请选择话务员')
-          return
-        }
-        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>
+<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 HH:mm:ss'"
+                          :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 HH:mm:ss'"
+                          :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='请选择话务员'
+                        :multiple="true"
+                        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){
+        if (args.model.attendants && args.model.attendants.length>0){
+          let attStr = ""
+          for (let attendantKey in args.model.attendants) {
+            attStr +=`'${args.model.attendants[attendantKey]}','，',`
+          }
+          attStr=attStr.substring(0, attStr.length-1)
+          args.model.attendant = attStr
+          // args.model.attendant = args.model.attendants[0]
+        }else {
+          this.$showMessage('请选择话务员')
+          return
+        }
+        this.model.search('1=1',args.model)
+      }
+    },
+    ready() {
+      let date = new Date()
+      let realMonth = date.getMonth()+1
+      let day = date.getDate()
+      this.$refs.paged.$refs.criteria.model.startDate = date.getFullYear() + '-' + (realMonth<10? '0'+ realMonth : realMonth) + '-' + (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/telreport/Trafficassess.vue

@@ -1,121 +1,121 @@
-<template>
-  <div class="flex-row">
-  <div  class="basic-main">
-    <criteria-paged :model="model" :pager='false' v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search' class="search_area" v-ref:criteria>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-<!--            <div class="form-group col-sm-2">-->
-<!--              <label class="font_normal_body">分公司:</label>-->
-<!--              <right-tree @re-res="$parent.$parent.getRes" :initresid="$login.f.orgid"></right-tree>-->
-<!--            </div>-->
-            <div class="form-group col-sm-2">
-              <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="form-group col-sm-2">
-              <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="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
-              <button class="button_search button_spacing" @click="search()">查询</button>
-              <!--              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>-->
-              <report-excel class="button_export button_spacing"  id='shexian'></report-excel>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
-          <thead>
-          <tr>
-            <th colspan='10' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">{{ $parent.orgname }}话务统计报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
-              开始时间：{{ model.model.startDate }}
-            </th>
-
-            <th colspan='5' style="font-weight: normal; text-align: center;">
-              结束时间：{{ model.model.endDate }}
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <th colspan='10' style="font-weight: normal;">
-              {{{model.data.substring(26, model.data.length - 8)}}}
-            </th>
-          </tr>
-        </table>
-      </div>
-    </criteria-paged>
-  </div>
-  </div>
-
-</template>
-
-<script>
-import {DataModel} from 'vue-client'
-import * as Util from '../Util'
-
-export default {
-  title: '话务统计报表',
-  data () {
-
-    let model = new DataModel('rs/telephone/report/trafficassess', {
-      startDate: 'this.model.startDate',
-      endDate: 'this.model.endDate',
-      f_filialeid: 'this.f_filialeid'
-    })
-    model.f_filialeid = '(' + this.$login.f.orgid + ')'
-    // model.model.endDate=Util.toStandardTimeString().substring(0,10)
-    // model.model.startDate=Util.getPreMonth(model.model.endDate)
-    return {
-      filialeNameStr: '',
-      filialeCodeStr: '',
-      orgname: '',
-      userid: this.$login.f.id,
-      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
-      model: model
-    }
-  },
-  methods: {
-    getRes (obj) {
-      ////tag)
-      this.orgname = obj.res[0]
-      this.$set('orgname', obj.res[0])
-      this.model.f_filialeid = this.$login.convertToIn(obj.resids)
-      //tag
-      //tag
-    }
-  },
-  ready () {
-    //tag
-    this.orgname = this.$login.f.orgs
-    this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+ ' 23:59:59'
-    this.$refs.paged.$refs.criteria.model.startDate =  Util.getYesterDay() + ' 00:00:00'
-
-  },
-  computed: {
-    selected () {
-      return this.$refs.grid.selected
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex-row">
+  <div  class="basic-main">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' class="search_area" v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+<!--            <div class="form-group col-sm-2">-->
+<!--              <label class="font_normal_body">分公司:</label>-->
+<!--              <right-tree @re-res="$parent.$parent.getRes" :initresid="$login.f.orgid"></right-tree>-->
+<!--            </div>-->
+            <div class="form-group col-sm-2">
+              <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 HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <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 HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <!--              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>-->
+              <report-excel class="button_export button_spacing"  id='shexian'></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='10' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">{{ $parent.orgname }}话务统计报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{ model.model.startDate }}
+            </th>
+
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='10' style="font-weight: normal;">
+              {{{model.data.substring(26, model.data.length - 8)}}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+  </div>
+
+</template>
+
+<script>
+import {DataModel} from 'vue-client'
+import * as Util from '../Util'
+
+export default {
+  title: '话务统计报表',
+  data () {
+
+    let model = new DataModel('rs/telephone/report/trafficassess', {
+      startDate: 'this.model.startDate',
+      endDate: 'this.model.endDate',
+      f_filialeid: 'this.f_filialeid'
+    })
+    model.f_filialeid = '(' + this.$login.f.orgid + ')'
+    // model.model.endDate=Util.toStandardTimeString().substring(0,10)
+    // model.model.startDate=Util.getPreMonth(model.model.endDate)
+    return {
+      filialeNameStr: '',
+      filialeCodeStr: '',
+      orgname: '',
+      userid: this.$login.f.id,
+      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+      model: model
+    }
+  },
+  methods: {
+    getRes (obj) {
+      ////tag)
+      this.orgname = obj.res[0]
+      this.$set('orgname', obj.res[0])
+      this.model.f_filialeid = this.$login.convertToIn(obj.resids)
+      //tag
+      //tag
+    }
+  },
+  ready () {
+    //tag
+    this.orgname = this.$login.f.orgs
+    this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+ ' 23:59:59'
+    this.$refs.paged.$refs.criteria.model.startDate =  Util.getYesterDay() + ' 00:00:00'
+
+  },
+  computed: {
+    selected () {
+      return this.$refs.grid.selected
+    }
+  }
+}
+</script>