telephone-clients 3.0.103-9 → 3.0.103-90

package/src/components/pc/RoleSelectorDep.vue

@@ -0,0 +1,158 @@
+<template>
+  <div style="width: 100%;height: 100%">
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">所属部门</label>
+      <right-tree-safe-dep :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe-dep>
+    </div>
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">{{ roleLable }}</label>
+      <v-select :value="selVal" v-model='selVal'
+                :value-single="!valueMultiple"
+                class="select_list select"
+                :options='users' :placeholder='roleName'
+                :close-on-select = 'valueClose'
+                :multiple="valueMultiple"
+                :width="rightWidth"
+                @change="valuechange">
+      </v-select>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    name: "RoleSelector",
+    props: {
+      valueMultiple: {
+        type: Boolean,
+        default: false
+      },
+      roleName: {
+        type: String,
+        default: '安检员'
+      },
+      roleLable: {
+        type: String,
+        default: '安检员'
+      },
+      leftWidth: {
+        type: String,
+        default: '60%'
+      },
+      rightWidth: {
+        type: String,
+        default: '60%'
+      },
+      value: {
+        default: ''
+      },
+      resobjprop: {
+        default: {}
+      },
+      valueClose: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        // source: `tool.getChildrenOfResName($${this.roleName}$)`,
+        source: `root.getResourceById($${this.$login.f.depids}$,$department$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`,
+        allUsers: [],
+        users: [],
+        selVal: '',
+        organizationname:this.$login.f.organizationname,
+        resids: [],
+        changeval: ''
+      }
+    },
+    watch: {
+      'value'(val) {
+        console.log("969696", val)
+        if (val) {
+          if (this.valueMultiple) {
+
+          } else {
+            this.selVal = val
+          }
+
+        }
+      }
+    },
+    async ready() {
+      await this.search()
+      await this.filterUser(this.resids)
+    },
+    methods: {
+      async search() {
+        let http = new HttpResetClass()
+        const res = await http.load('POST', '/rs/search', {
+          data: {
+            source: this.source,
+            userid: this.$login.f.id
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.allUsers = res.data
+      },
+      valuechange(val) {
+        console.log(`val instanceof Array======${!val instanceof Array}`)
+        if ((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)) {
+          return
+        }
+        if (this.valueMultiple && Array.isArray(val)) {
+          if (val && val.length > 0) {
+            let valuesele = `(`
+            for (let i = 0; i < val.length; i++) {
+              valuesele += `'${val[i]}',`
+            }
+            this.value = valuesele.substring(0, valuesele.length - 1) + ')'
+          } else {
+            this.value = ''
+          }
+        } else {
+          this.value = val
+        }
+        // this.changeval = val
+      },
+      getRes(obj) {
+        this.resids = obj.resids
+        this.organizationname = obj.res[0]
+        this.filterUser(this.resids)
+        this.$dispatch('re-res', obj)
+      },
+      async filterUser(resids) {
+        // 处理第一次进入页面值异常问题
+        if (resids.length > 0 && typeof resids[0] == "object") {
+          resids = resids[0]
+        }
+        if (resids[0]) {
+          this.source = `root.getResourceById($${resids[0]}$,$department$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`
+          await this.search()
+        }
+        this.users = []
+        this.allUsers.forEach(user => {
+            this.users.push({label: user.name, value: user.name})
+        })
+        if (!this.valueMultiple && this.users.length > 0) {
+          this.users = [{label: '全部', value: ''}, ...this.users]
+        }
+        let temp = []
+        this.users = this.users.filter(item => {
+          if (!temp.includes(item.label)) {
+            temp.push(item.label)
+            return true
+          }
+          return false
+        })
+        this.$emit('alluser', this.allUsers)
+        //tag
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/pc/TelFindUser.vue

@@ -206,7 +206,7 @@ export default {
       }else if(this.$login.f.orgid == 46997 && this.$login.f.fullnames.indexOf("铜川市天然气")!= -1){
         args.condition += ` and ti.f_user_state = '正常'`
       }else {
-        args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state = '正常'`
+        args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state in('正常','停用','预备')`
       }
       this.model.search(args.condition, args.model)
     },

package/src/components/pc/TelListener.vue

@@ -24,7 +24,7 @@
           <td style="text-align: center;">{{inlinemodel1.aState}}</td>
           <td style="text-align: center;">{{inlinemodel1.callingNo}}</td>
           <td style="text-align: center;">
-            <button-link type="button" class="btn btn-link" @click="listen(inlinemodel1.aChannel)">监听</button-link>
+            <button-link type="button" class="btn btn-link" @click="listen(inlinemodel1)">监听</button-link>
           </td>
         </tr>
         <tr v-for="outlinemodel1 in outlinemodel" >
@@ -39,6 +39,25 @@
       </table>
     </div>
   </div>
+  <modal :show.sync="showlisten" width="50%"  backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <center><h4 class="modal-title ">话务监听信息</h4></center>
+    </header>
+    <article slot="modal-body" class="modal-body" style="height: 100px;padding-top: 15px!important;">
+        <div class="row auto">
+          <label>坐席号码</label><span>{{lisachanl.aChannel}}</span>
+        </div>
+         <div class="row auto">
+           <label>话务人员</label><span>{{lisachanl.aName}}</span>
+         </div>
+         <div class="row auto">
+           <label>通话号码</label><span>{{lisachanl.callingNo}}</span>
+          </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-success" @click='canal'>取消</button>
+    </footer>
+  </modal>
 </template>
 
 <script>
@@ -68,6 +87,12 @@
     },
     data () {
       return {
+        showlisten:false,
+        lisachanl:{
+          aChannel:0,
+          aName:'',
+          callingNo:''
+        },
         interval: null, // 循环函数返回值，用来停止循环
         inlinemodel:{
           type: Object,
@@ -81,18 +106,6 @@
       }
     },
     ready () {
-      // 循环读取通道状态
-      // let sql = 'tel_singleTable_OrderBy'
-      // let condition = {
-      //   items: 'tongdao',
-      //   tablename: 'T_IPTONGDAO',
-      //   condition: `loginip = '${this.$login.f.loginip}'`,
-      //   orderitem: 'id'
-      // }
-      // let http = new HttpResetClass()
-      // http.load('POST', `rs/logic/tel_getOneData`,  {data: {sql: sql, params: condition}},  {resolveMsg: null, rejectMsg: null}).then((req) => {
-      //   this.aChannel = parseInt(req.data.tongdao);
-      // })
       if(this.aChannel) {
         let gen = stateGen(this)
         co(gen)
@@ -105,13 +118,31 @@
 
     },
     methods: {
+      canal(){
+        this.lisachanl = {
+          aChannel:0,
+          aName:'',
+          callingNo:''
+        }
+        this.showlisten = false
+      },
       // 所有控制函数
       // 循环获取通道状态
-      listen(val){
-        val = val + ''
+       listen(val){
+        let valaChannel  = val.aChannel + ''
         let http1 = new HttpResetClass()
-        http1.load('POST', data.voiceUrl, {aId: Util.f.id, RecordsID:'',aChannel:this.aChannel, aModule:1, aBzType:"listen", bzExtra: val, bzId: "1", aName: Util.f.name,RoleId:"话务员"}, {resolveMsg: null, rejectMsg: null}).then((req) => {
+        http1.load('POST', data.voiceUrl, {aId: this.$login.f.id,aName: this.$login.f.name,aChannel:this.aChannel, aModule:1, aBzType:"listen", bzExtra: valaChannel, bzId: "1",RoleId:"话务员"}, {resolveMsg: null, rejectMsg: null}).then((req) => {
           //tag
+          if(req.data && req.data.msg == '开始监听'){
+            this.showlisten = true
+            this.lisachanl = {
+              aChannel:val.aChannel,
+              aName:val.aName,
+              callingNo:val.callingNo
+            }
+          }else{
+            this.$showMessage(`操作结果：${req.data.msg}`)
+          }
         })
       },
 

package/src/components/pc/WorkCenter.vue

@@ -14,7 +14,7 @@
       <reminder-order :call-obj="callObj" :login-user="loginUser" :row="row" @success="component = 'list'" @cancel="component = 'list'"></reminder-order>
     </div>
     <!--    撤销-->
-    <div class="" v-if="component === '结案'" style="height: 200px;">
+    <div class="" v-if="component === '结案' || component == 'serviceDelete'"  style="height: 200px;">
       <service-delete-order :call-obj="callObj" :login-user="loginUser" :row="row" @success="sucs" @cancel="component = 'list'" ></service-delete-order>
     </div>
     <div class="" v-if="component === 'modify'">

package/src/components/pc/WorkCenterList.vue

@@ -122,7 +122,7 @@
               </div>
               <div v-show="$parent.$parent.$parent.canRemindChange(row) && row.f_workorder_type == '报修单'  &&  row.f_state!='完成' ">
                 <button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$emit('do', 'remind', row)" style="min-width: 30px;">催单</button>
-                <button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$emit('do', 'modify', row)" style="min-width: 30px;">修改</button>
+                <button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$emit('do', 'modify', row)" v-show="row.f_source != '安检'" style="min-width: 30px;">修改</button>
               </div>
               <div v-show="$parent.$parent.$parent.canRemindChange(row) && row.f_workorder_type == '置换通气单'  &&  row.f_state!='完成' ">
                 <button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$emit('do', 'remind', row)" style="min-width: 30px;">催单</button>

package/src/components/pc/WorkHistory.vue

@@ -114,6 +114,18 @@
               <p>{{ activity.f_operator }}将工单{{activity.f_back_type}}</p>
               <p v-if="activity.f_remarks">原因：{{ activity.f_remarks }}</p>
             </div>
+            <!-- 工单打回 工单打回旧版使用t_site_back，兼容之前的逻辑。新版本无需调整此项-->
+            <div style="margin-top: 5px" v-if="activity.type === 't_site_back'">
+              <p>{{ activity.f_site_back_date }}</p>
+              <p>{{ activity.f_site_back_name }}将工单打回</p>
+              <p>原因：{{ activity.f_site_back_reason }}</p>
+            </div>
+            <!-- 未维修，属于维修员打回 兼容之前的逻辑。新版本无需调整此项 -->
+            <div style="margin-top: 5px" v-if="activity.type === 't_notwork'">
+              <p>{{ activity.f_date }}</p>
+              <p>{{ activity.f_name }}未处理</p>
+              <p>原因：{{ activity.f_reason }}</p>
+            </div>
             <!-- 用户催单 -->
             <div style="margin-top: 5px" v-if="activity.type === 't_reminder'">
               <p>{{ activity.f_reminder_date }}</p>
@@ -276,7 +288,7 @@
           <div class="col-sm-12  form-input-group" >
             <label class="font_normal_body" style="width: 10%" v-if="rowOne.f_workorder_type === '咨询单'">咨询内容</label>
             <label class="font_normal_body" style="width: 10%"  v-if="rowOne.f_workorder_type === '投诉单'">投诉内容</label>
-            <textarea name="name" rows="3" v-model="rowOne.f_content"
+            <textarea name="name" rows="3" v-model="rowOne.f_content || service.f_content"
                       class="form-control ver-textarea" id="f_content" name="f_content" readonly="readonly"></textarea>
           </div>
           <div class="col-sm-4 form-group form-input-group" >
@@ -301,7 +313,7 @@
           </div>
           <div class="col-sm-12  form-input-group">
             <label class="font_normal_body" style="width: 10%">处理结果</label>
-            <textarea name="name" rows="3" v-model="complanResult.f_complaint_results"
+            <textarea name="name" rows="3" v-model="complanResult.f_complaint_results || '已处理'"
                       class="form-control ver-textarea" readonly="readonly"></textarea>
           </div>
         </div>

package/src/components/pc/WorkListAllNew.vue

@@ -8,7 +8,7 @@
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
                 <label class="font_normal_body" style="width: 40%">工单编号</label>
                 <input type="text" class="input_search" v-model="model.f_service_id" placeholder='工单编号'
-                       condition="f_service_id like '%{}%'"
+                       condition="tswo.f_service_id like '%{}%'"
                        :size="model.f_service_id ? model.f_service_id.length : 6">
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">

package/src/components/pc/WorkListNew.vue

@@ -232,8 +232,10 @@
       在线抢修照片
     </header>
     <article slot="modal-body" class="modal-body">
-      <div class="from-group">
-        <img-self :src="imgfilename" width="500" height="500"></img-self>
+      <div class="from-group" style="display: flex">
+        <img-self :src="'rs/image/file/'+imgfilename" width="220" height="300"></img-self>
+        <img-self v-if="imgfilename1" :src="'rs/image/file/'+imgfilename1" style="margin-left: 10px" width="220" height="300"></img-self>
+        <img-self v-if="imgfilename2" :src="'rs/image/file/'+imgfilename2" style="margin-left: 10px" width="220" height="300"></img-self>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer">
@@ -374,6 +376,8 @@ export default {
       service: Object,
       pendingCount: 0,
       imgfilename: '',
+      imgfilename1: '',
+      imgfilename2: '',
       select: {
         defname: ''
       },
@@ -650,7 +654,9 @@ export default {
       //tag
       //tag)
       this.imgshow = true
-      this.imgfilename = 'rs/image/file/' + val.f_single_path
+      this.imgfilename =   val.f_single_path
+      this.imgfilename1 =  val.f_singlea_path
+      this.imgfilename2 =  val.f_singleb_path
     },
     search (args) {
       this.serlist = []

package/src/components/telreport/RepairsDetailsReport.vue

@@ -0,0 +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>

package/src/components/telreport/TableFaultReport.vue

@@ -0,0 +1,96 @@
+<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">
+        <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/tableFaultReport')
+      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 = ' 1 = 1 '
+        if (args.model.startDate){
+          condition += ` and tf.f_failure_date >= '${args.model.startDate} 00:00:00' `
+        }
+        if (args.model.endDate){
+          condition += ` and tf.f_failure_date <= '${args.model.endDate} 23:59:59' `
+        }
+        this.model.search(condition,args.model)
+      }
+    },
+    ready() {
+    },
+    computed: {
+      selected() {
+        return this.$refs.grid.selected
+      },
+    }
+  }
+</script>

package/src/components/telreport/Traffic.vue

@@ -24,14 +24,14 @@
 <!--              <input  type="text" class="form-control" v-model="model.f_single_man"-->
 <!--                      placeholder='操作员'>-->
               <button class="btn btn-default" @click="search()">查询</button>
-              <export-excel class="button_search button_spacing"
+              <export-excel-tel class="button_search button_spacing"
                             :data="{startDate: this.model.startDate,endDate: this.model.endDate}"
                             :field="{'cetime':'时段','hwzl':'话务总量','weijie':'未接数',
                             'yijie':'已接数','jtl':'接听率(%)',
                             'zthsc':'总通话时长(分)'}"
                             style="margin-top: 20px"
-                            sqlurl="rs/logic/exportfile" sql-name="getTraffic" template-name='话务量报表导出'
-                            :choose-col="true"></export-excel>
+                            sqlurl="rs/logic/telephoneExport" sql-name="getTraffic" template-name='话务量报表导出'
+                            :choose-col="true"></export-excel-tel>
             </div>
           </div>
         </criteria>

package/src/components/temp/ChangemeterInfo.vue

@@ -7,8 +7,6 @@
                  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>
@@ -18,23 +16,13 @@
           </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>
+          <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>
-        <!--<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>
@@ -46,7 +34,7 @@
     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"'}),
+        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
       }

package/src/components/temp/DeviceInfo.vue

@@ -7,7 +7,6 @@
                  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>
@@ -16,11 +15,10 @@
           </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_userinfodevices_state}}</nobr></td>
           <td><nobr>{{row.f_operate_date}}</nobr></td>
         </template>
       </data-grid>
@@ -32,7 +30,7 @@
   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}'`))
+    yield self.model.search((`f_user_id = '${self.user.f_user_id}'`))
       .then(() => {
         // self.getdata()
       })