telephone-clients 3.0.103 → 3.0.104-11

package/src/components/temp/ChangemeterInfo.vue

@@ -1,87 +1,75 @@
-<template >
-  <div id="pc-finduser-page">
-    <criteria-paged :model="model" v-ref:paged :simple="true">
-      <!-- <criteria partial='criteria'>
-      </criteria> -->
-      <data-grid :model="model" partial='list' v-ref:grid
-                 class="list_area table_sy">
-        <template partial='head'>
-          <tr>
-            <!--<th><nobr>用户编号</nobr></th>-->
-            <!--<th><nobr>用户姓名</nobr></th>-->
-            <th><nobr>新表号</nobr></th>
-            <th><nobr>旧表号</nobr></th>
-            <th><nobr>补气量</nobr></th>
-            <th><nobr>换表原因</nobr></th>
-            <th><nobr>操作人</nobr></th>
-            <th><nobr>操作日期</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <!--<td><nobr>{{row.f_userinfo_id}}</nobr></td>-->
-          <!--<td><nobr>{{row.f_user_name}}</nobr></td>-->
-          <td><nobr>{{row.f_newmeternumber}}</nobr></td>
-          <td><nobr>{{row.f_meternumber}}</nobr></td>
-          <td><nobr>{{row.f_newremanent_gas}}</nobr></td>
-          <td><nobr>{{row.f_changemeter_type}}</nobr></td>
-          <th><nobr>{{row.f_operator}}</nobr></th>
-          <td><nobr>{{row.f_operate_date}}</nobr></td>
-        </template>
-        <!--<template partial='foot'>
-          <td style="text-align:center">汇总</td>
-          <td></td>
-          <td></td>
-          <td >累计购气量:{{model.sums.f_pregas}}</td>
-          <td >累计金额：{{model.sums.f_totalcost}}</td>
-          <td >共{{model.count}}条</td>
-        </template>-->
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  export default {
-    title: '换表记录',
-    data () {
-      return {
-        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 5, {items: '"*"', tablename: '"t_changemeter"', orderitem: '"f_operate_date desc"'}),
-        show: false,
-        row: Object
-      }
-    },
-    props: {
-      user: {
-        type: Object
-      },
-      clearflg:0
-    },
-    methods: {
-      selected (row) {
-        if (this.row === row) {
-          this.row = null
-        } else {
-          this.row = row
-        }
-      },
-      isSelected (row) {
-        return this.row === row
-      }
-    },
-    watch: {
-      'user' (val) {
-        this.model.rows = []
-        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
-      },
-      'clearflg'(){
-        this.model.rows = []
-      }
-    },
-    ready () {
-      if (this.user && this.user.f_userinfo_id) {
-        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
-      }
-    }
-  }
-</script>
+<template >
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+      <!-- <criteria partial='criteria'>
+      </criteria> -->
+      <data-grid :model="model" partial='list' v-ref:grid
+                 class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th><nobr>新表号</nobr></th>
+            <th><nobr>旧表号</nobr></th>
+            <th><nobr>补气量</nobr></th>
+            <th><nobr>换表原因</nobr></th>
+            <th><nobr>操作人</nobr></th>
+            <th><nobr>操作日期</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td><nobr>{{row.f_meternumber}}</nobr></td>
+          <td><nobr>{{row.f_meternumber_old}}</nobr></td>
+          <td><nobr>{{row.f_remanent_gas}}</nobr></td>
+          <td><nobr>{{row.f_type}}</nobr></td>
+          <th><nobr>{{row.f_operator}}</nobr></th>
+          <td><nobr>{{row.f_operate_date}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  export default {
+    title: '换表记录',
+    data () {
+      return {
+        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 5, {items: '"*"', tablename: '"t_changetables"', orderitem: '"f_operate_date desc"'}),
+        show: false,
+        row: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      clearflg:0
+    },
+    methods: {
+      selected (row) {
+        if (this.row === row) {
+          this.row = null
+        } else {
+          this.row = row
+        }
+      },
+      isSelected (row) {
+        return this.row === row
+      }
+    },
+    watch: {
+      'user' (val) {
+        this.model.rows = []
+        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
+      },
+      'clearflg'(){
+        this.model.rows = []
+      }
+    },
+    ready () {
+      if (this.user && this.user.f_userinfo_id) {
+        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
+      }
+    }
+  }
+</script>

package/src/components/temp/DeviceInfo.vue

@@ -1,82 +1,80 @@
-<template >
-  <div id="pc-finduser-page">
-    <criteria-paged :model="model" v-ref:paged :simple="true">
-      <!-- <criteria partial='criteria'>
-      </criteria> -->
-      <data-grid :model="model" partial='list' v-ref:grid
-                 class="list_area table_sy">
-        <template partial='head'>
-          <tr>
-            <!--<th><nobr>用户编号</nobr></th>-->
-            <th><nobr>设备类型</nobr></th>
-            <th><nobr>设备品牌</nobr></th>
-            <th><nobr>设备数量</nobr></th>
-            <th><nobr>设备状态</nobr></th>
-            <th><nobr>操作日期</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <!--<td><nobr>{{row.f_user_id}}</nobr></td>-->
-          <td><nobr>{{row.f_devices_type}}</nobr></td>
-          <td><nobr>{{row.f_brand}}</nobr></td>
-          <td><nobr>{{row.f_devices_num}}</nobr></td>
-          <td><nobr>{{row.f_devices_state}}</nobr></td>
-          <td><nobr>{{row.f_operate_date}}</nobr></td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import co from 'co'
-  let getmodelGen = function * (self, val) {
-    yield self.model.search((`f_userinfo_id = '${self.user.f_userinfo_id}'`))
-      .then(() => {
-        // self.getdata()
-      })
-  }
-  export default {
-    title: '设备信息',
-    data () {
-      return {
-        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: '"t_devices"', orderitem: '"f_operate_date desc"'}),
-        show: false,
-        row: Object
-      }
-    },
-    props: {
-      user: {
-        type: Object
-      },
-      clearflg:0
-    },
-    methods: {
-      getmodel () {
-        let gen = getmodelGen(this)
-        co(gen)
-      }
-    },
-    watch: {
-      'user' (val) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        if(this.user){
-          if (!(this.user.isNuN)) {
-            this.model.rows = []
-            this.getmodel()
-          }
-        }
-      },
-      'clearflg'(){
-        this.model.rows = []
-      }
-    },
-    ready () {
-      if (this.user && this.user.f_userinfo_id) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        this.getmodel()
-      }
-    }
-  }
-</script>
+<template >
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+      <!-- <criteria partial='criteria'>
+      </criteria> -->
+      <data-grid :model="model" partial='list' v-ref:grid
+                 class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th><nobr>设备类型</nobr></th>
+            <th><nobr>设备品牌</nobr></th>
+            <th><nobr>设备数量</nobr></th>
+            <th><nobr>设备状态</nobr></th>
+            <th><nobr>操作日期</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td><nobr>{{row.f_devices_type}}</nobr></td>
+          <td><nobr>{{row.f_brand}}</nobr></td>
+          <td><nobr>{{row.f_devices_num}}</nobr></td>
+          <td><nobr>{{row.f_userinfodevices_state}}</nobr></td>
+          <td><nobr>{{row.f_operate_date}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  let getmodelGen = function * (self, val) {
+    yield self.model.search((`f_user_id = '${self.user.f_user_id}'`))
+      .then(() => {
+        // self.getdata()
+      })
+  }
+  export default {
+    title: '设备信息',
+    data () {
+      return {
+        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: '"t_devices"', orderitem: '"f_operate_date desc"'}),
+        show: false,
+        row: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      clearflg:0
+    },
+    methods: {
+      getmodel () {
+        let gen = getmodelGen(this)
+        co(gen)
+      }
+    },
+    watch: {
+      'user' (val) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        if(this.user){
+          if (!(this.user.isNuN)) {
+            this.model.rows = []
+            this.getmodel()
+          }
+        }
+      },
+      'clearflg'(){
+        this.model.rows = []
+      }
+    },
+    ready () {
+      if (this.user && this.user.f_userinfo_id) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        this.getmodel()
+      }
+    }
+  }
+</script>

package/src/components/temp/HandplanInfo.vue

@@ -21,7 +21,7 @@
           </tr>
         </template>
         <template partial='body'>
-          <td><nobr>{{row.f_userinfo_id}}</nobr></td>
+          <td><nobr>{{row.f_userinfo_code}}</nobr></td>
           <td><nobr>{{row.f_user_name}}</nobr></td>
           <td><nobr>{{row.f_meternumber}}</nobr></td>
           <td><nobr>{{row.f_meter_brand}}</nobr></td>
@@ -45,7 +45,7 @@
     title: '抄表记录',
     data () {
       return {
-        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: '"t_handplan with (nolock)"', orderitem: '"id desc"'}),
+        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: 'this.tablename', orderitem: '"id desc"'}),
         show: false,
         row: Object
       }
@@ -62,6 +62,11 @@
       'user' (val) {
         if(this.user) {
           this.model.rows = []
+          if(val.f_meter_classify == '物联网表'){
+              this.model.tablename = 't_web_handplan with (nolock)'
+          }else{
+            this.model.tablename = 't_handplan with (nolock)'
+          }
           this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
         }
       },
@@ -70,7 +75,13 @@
       }
     },
     ready () {
-      if (this.user && this.user.f_userid) {
+      if (this.user && this.user.f_userinfo_id) {
+        if(this.user.f_meter_classify == '物联网表'){
+          debugger
+          this.model.tablename = 't_web_handplan with (nolock)'
+        }else{
+          this.model.tablename = 't_handplan with (nolock)'
+        }
         this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
       }
     }

package/src/components/temp/InfoTable.vue

@@ -19,6 +19,7 @@
                   <li ><a :style="selectFiled == '指令查看'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '指令查看','tel_f_size':selectFiled != '指令查看'}" href="javascript:void(0)" @click="setField('指令查看')">指令查看</a></li>
                   <li ><a :style="selectFiled == '上报查询'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '上报查询','tel_f_size':selectFiled != '上报查询'}" href="javascript:void(0)" @click="setField('上报查询')">上报查询</a></li>
                   <li ><a :style="selectFiled == '停用信息'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '停用信息','tel_f_size':selectFiled != '停用信息'}" href="javascript:void(0)" @click="setField('停用信息')">停用信息</a></li>
+                  <li v-if="oldshow"><a :style="selectFiled == '旧单信息'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '旧单信息','tel_f_size':selectFiled != '旧单信息'}" href="javascript:void(0)" @click="setField('旧单信息')">旧单信息</a></li>
                 </ul>
                 <div class="tab-content span">
                   <sell-info v-if="selectFiled=='购气记录'" :user="user" :clearflg="clearflg" style="font-size: 12px"></sell-info>
@@ -31,7 +32,7 @@
                   <tel-meteread-info v-if="selectFiled=='上报查询'" :user="user" :clearflg="clearflg" style="font-size: 12px"></tel-meteread-info>
                   <disable-information v-if="selectFiled=='停用信息'" :user="user" :clearflg="clearflg" style="font-size: 12px"></disable-information>
                   <repair-list v-if="selectFiled=='来电记录'" :user="user" :clearflg="clearflg" style="font-size: 12px"></repair-list>
-
+                  <old-repair-list v-if="selectFiled=='旧单信息'" :user="user" :clearflg="clearflg" style="font-size: 12px"></old-repair-list>
                 </div>
 
               </div>
@@ -81,12 +82,14 @@ export default {
   },
 
   ready () {
+    this.oldshow = this.$appdata.getSingleValue('旧工单信息显示') ? true : false
     //tag
   },
   data () {
     return {
       a:'tabs-one',
-      selectFiled:'购气记录'
+      selectFiled:'购气记录',
+      oldshow:false
     }
   },
   methods :{

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/temp/OldRepairList.vue

@@ -0,0 +1,100 @@
+<template>
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+      <data-grid :model="model" partial='list' v-ref:grid
+                 class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th><nobr>用户编号</nobr></th>
+            <th><nobr>用户信息</nobr></th>
+            <th><nobr>来电电话</nobr></th>
+            <th><nobr>来电时间</nobr></th>
+            <th><nobr>表信息</nobr></th>
+            <th><nobr>累够</nobr></th>
+            <th><nobr>来电方式</nobr></th>
+            <th><nobr>报修类型</nobr></th>
+            <th><nobr>话务员信息</nobr></th>
+            <th><nobr>维修备注</nobr></th>
+            <th><nobr>工单编号</nobr></th>
+            <th><nobr>处理方式</nobr></th>
+            <th><nobr>是否处理</nobr></th>
+            <th><nobr>派单人</nobr></th>
+            <th><nobr>派单时间</nobr></th>
+            <th><nobr>接单人信息</nobr></th>
+            <th><nobr>维修信息</nobr></th>
+            <th><nobr>完成状态</nobr></th>
+            <th><nobr>是否回访</nobr></th>
+            <th><nobr>回访人</nobr></th>
+            <th><nobr>用户意见</nobr>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_userid}}</td>
+          <td>{{row.f_username}} {{row.f_address}} {{row.f_phone}}</td>
+          <td>{{row.f_linktype}}</td>
+          <td>{{row.f_reporttime}}</td>
+          <td>{{row.f_meternumber}} {{row.f_metertype}} {{row.f_aroundmeter}}</td>
+          <td>{{row.f_metergasnums}}</td>
+          <td>{{row.f_teltype}}</td>
+          <td>{{row.f_repairtype}}</td>
+          <td>{{row.f_operator}} {{row.f_department}}</td>
+          <td>{{row.f_repairreason}}</td>
+          <td>{{row.f_cucode}}</td>
+          <td>{{row.f_dealtype}}</td>
+          <td>{{row.f_havadeal}}</td>
+          <td>{{row.f_sender}}</td>
+          <td>{{row.f_senddate}}</td>
+          <td>{{row.f_accepter}} {{row.f_acceptertel}}</td>
+          <td>{{row.f_smwxjl}}</td>
+          <td>{{row.f_havacomplete}}</td>
+          <td>{{row.f_ifvisit}}</td>
+          <td>{{row.f_visitren}}</td>
+          <td>{{row.f_consumeroption}}</td>
+        </template>
+
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  /**
+   *用户档案相关信息组件
+   */
+  import { PagedList } from 'vue-client'
+  export default {
+    title: '历史维修记录',
+    data () {
+      return {
+        model: new PagedList( 'rs/sql/tel_singleTable_OrderBy', 5,{items: '"*"', tablename: '"t_oldserviceworkorder"', orderitem: '"f_reporttime desc"'}),
+        show:false,
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      callObj:{
+        type: Object
+      },
+      clearflg:0
+    },
+    methods: {
+    },
+    watch : {
+      'user' (val) {
+        this.model.rows = []
+        this.model.search(`f_userid = '${this.user.f_userinfo_code}'`)
+
+      },
+      'clearflg'(){
+        this.model.rows = []
+      }
+    },
+    ready () {
+      if (this.user && this.user.f_userinfo_code) {
+        this.model.search(`f_userid = '${this.user.f_userinfo_code}'`)
+      }
+    }
+  }
+</script>

package/src/components/temp/RepairList.vue

@@ -108,7 +108,7 @@
     watch : {
       'user' (val) {
         this.model.rows = []
-        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
+        this.model.search(`tswo.f_userinfo_id = '${this.user.f_userinfo_id}'`)
 
       },
 
@@ -118,7 +118,7 @@
     },
     ready () {
       if (this.user && this.user.f_userinfo_id) {
-        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
+        this.model.search(`tswo.f_userinfo_id = '${this.user.f_userinfo_id}'`)
       }
     }
   }

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/weinan/RecordList.vue

@@ -78,7 +78,7 @@
                 </v-select>
               </div>
               <div class="col-sm-9 form-group form-input-group" style="width: 80%" >
-                <label style="width: 100%;margin-right: 10px" class="font_normal_body">呼入数:{{$parent.$parent.RecordAll.neixian}}&nbsp;&nbsp;&nbsp;  接听数:{{$parent.$parent.RecordAll.jieting}}&nbsp;&nbsp;&nbsp;  回访数:{{$parent.$parent.RecordAll.huchu}}&nbsp;&nbsp;&nbsp;  接线率:{{$parent.$parent.RecordAll.hflv}}%&nbsp;&nbsp;&nbsp;  </label>
+                <label style="width: 100%;margin-right: 10px" class="font_normal_body">呼入自助数:{{$parent.$parent.RecordAll.zizhu}}&nbsp;&nbsp;&nbsp;  呼入人工数:{{$parent.$parent.RecordAll.neixian}}&nbsp;&nbsp;&nbsp;  人工接听数:{{$parent.$parent.RecordAll.jieting}}&nbsp;&nbsp;&nbsp;  回访数:{{$parent.$parent.RecordAll.huchu}}&nbsp;&nbsp;&nbsp;  接线率:{{$parent.$parent.RecordAll.hflv}}%&nbsp;&nbsp;&nbsp;  </label>
 
               </div>
 <!--              <div class="col-sm-1" style="float: right;margin-right: 40px"  >-->
@@ -218,7 +218,7 @@
         ],
         model: new PagedList('rs/sql/tel_recordlist', 20, {items: "'*'", tablename: "'t_records'", orderitem: "'outltime desc'" }),
         row: null,
-        RecordAll: {"huru":0,"zongshu":0,"jieting":0,"huchu":0,"neixian":0,"hflv":0,"jxlv":0},
+        RecordAll: {"huru":0,"zongshu":0,"jieting":0,"huchu":0,"neixian":0,"hflv":0,"jxlv":0,"zizhu":0},
         cclist:{
           type: Array,
           default: null

package/src/components/weinan/SiteSend.vue

@@ -199,7 +199,7 @@ export default {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {
-          let result = res.data.filter(res=>res.depids==Vue.user.depids)
+          let result = res.data.filter(res=>res.depids==Vue.user.depids && res.state == '在职')
           result.forEach((item) => {
             this.repairers.push({label: `${item.name} ${item.f_user_telephone}`, value: item.name})
 
@@ -213,7 +213,7 @@ export default {
         }
         http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
 
-          let result = res.data.filter(res=>res.depids==this.$login.f.depids)
+          let result = res.data.filter(res=>res.depids==this.$login.f.depids && res.state == '在职')
 
           result.forEach((item) => {
             this.repairers.push({label: `${item.name} ${item.f_user_telephone}`, value: item.name})