telephone-clients 3.0.103-9 → 3.0.103-90

package/src/filiale/wenxi/pc/MetereadInfo.vue

@@ -0,0 +1,82 @@
+<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 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">{{row.f_valvestate == '0' ? '开阀' : '关阀'}}</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('rs/sql/tel_singleTable_OrderBy', 8, {items: '"f_valveState,f_jval,f_tablebase,f_meternumber,f_manufacturers,f_hand_date"', tablename: '"t_meteread with (nolock)"', orderitem: '"f_hand_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/filiale/wenxi/pc/RepairsWork.vue

@@ -229,6 +229,7 @@ import * as Util from '../../../components/Util'
           serviceacitivity: [{
             f_service_acitivity_type: '派单'
           }],
+          failure_str:'',
           f_finish_date:'',
           f_source:'用户来电',
           f_service_id: '',
@@ -442,6 +443,7 @@ import * as Util from '../../../components/Util'
       },
       assignObj() {
         if (this.data) {
+          this.model.failure_str = ''
           this.model.f_address = this.data.f_address
           this.model.f_user_name = this.data.f_user_name
           this.model.f_user_type = this.data.f_user_type
@@ -493,6 +495,7 @@ import * as Util from '../../../components/Util'
           f_card_id: '',
           f_remarks: '',
           f_user_type: '',
+          failure_str:'',
           f_area: '',
           f_street: '',
           f_residential_area: '',
@@ -545,6 +548,18 @@ import * as Util from '../../../components/Util'
           this.model.f_outlets = this.$login.f.deps
           this.model.f_filiale_id = this.$login.f.orgid
         }
+        let failureStr = ''
+        if(this.model.failure.startsWith("[")){
+          const failureData = JSON.parse(this.model.failure)
+          failureData.forEach(item=>{
+            if (item.failurecase.length>0){
+              failureStr+=item.f_failure_type+":"+item.failurecase.toString()+";"
+            }else {
+              failureStr+=item.f_failure_type+";"
+            }
+          })
+          this.model.failure_str = failureStr
+        }
         let data = {
           model: this.model, loginUser: {
             name: this.loginUser.name,

package/src/filiale/wenxi/pc/TelFindUser.vue

@@ -4,38 +4,81 @@
       <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row" style="margin:10px 10px 0 10px">
-          <div class="form-group col-sm-4"  >
-            <label class="font_normal_body" style="width:55%">用户编号:</label>
-            <input  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='用户编号'
-                    condition="ti.f_userinfo_code like '%{}%'"
-                    :size="model.f_userinfo_code ? model.f_userinfo_code.length : 8" style="height: 95%;width: 90%"></input>
-          </div>
-
-          <div class="form-group col-sm-4" >
-            <label class="font_normal_body" style="width:55%">表号:</label>
-            <input  type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
-                    condition="tu.f_meternumber like '%{}%'"
-                    :size="model.f_meternumber ? model.f_meternumber.length : 8" style="height: 95%;width: 90%"></input>
-          </div>
-          <div class="form-group col-sm-4"  >
-            <label class="font_normal_body" style="width:55%">用户名称:</label>
-            <input  type="text" class="input_search" v-model="model.f_user_name" placeholder='姓名'
-                    condition="ti.f_user_name like '%{}%'"
-                    :size="model.f_user_name ? model.f_user_name.length * 2 : 4"  style="height: 95%;width: 90%"></input>
-          </div>
-          <div class="form-group col-sm-4"  >
-            <label class="font_normal_body" style="width:55%">用户地址:</label>
-            <input  type="text" class="input_search" v-model="model.f_address" placeholder='地址'
-                    condition="ta.f_address like '%{}%'"
-                    :size="model.f_address ? model.f_address.length * 2 : 4"  style="height: 95%;width: 90%" ></input>
-          </div>
+            <div class="form-group col-sm-4"  >
+              <label class="font_normal_body" style="width:55%">电话号码:</label>
+              <input  type="text" class="input_search" v-model="model.f_user_phone" placeholder='电话号码'
+                      condition="ti.f_user_phone like '%{}%'"
+                      :size="model.f_user_phone ? model.f_user_phone.length : 8" style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  >
+              <label class="font_normal_body" style="width:55%">用户编号:</label>
+              <input  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='用户编号'
+                      condition="ti.f_userinfo_code like '%{}%'"
+                      :size="model.f_userinfo_code ? model.f_userinfo_code.length : 8" style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4">
+              <button type="button" name="button" class="button_spacing button_search" style="float: right" @click="search()">查询</button>
+              <button type="button" name="button" style="background-color: #5ac0d9;border-radius: 4px;"  class="button_spacing button_search" @click="$parent.$parent.clear()">清空</button>
+            </div>
             <div class="form-group col-sm-4">
-              <button class="button_spacing button_search" style="margin: 0 auto;" @click="search()">查询</button>
+              <label class="font_normal_body" style="width:55%">表号:</label>
+              <input  type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
+                      condition="tu.f_meternumber like '%{}%'"
+                      :size="model.f_meternumber ? model.f_meternumber.length : 8" style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  >
+              <label class="font_normal_body" style="width:55%">用户名称:</label>
+              <input  type="text" class="input_search" v-model="model.f_user_name" placeholder='姓名'
+                      condition="ti.f_user_name like '%{}%'"
+                      :size="model.f_user_name ? model.f_user_name.length * 2 : 4"  style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  >
+              <label class="font_normal_body" style="width:55%">用户地址:</label>
+              <input  type="text" class="input_search" v-model="model.f_address" placeholder='地址'
+                      condition="ta.f_address like '%{}%'"
+                      :size="model.f_address ? model.f_address.length * 2 : 4"  style="height: 95%;width: 90%" ></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.enter_number_show">
+              <label class="font_normal_body" style="width:55%">入户证号:</label>
+              <input  type="text" class="input_search" v-model="model.f_enter_number" placeholder='入户证号'
+                      condition="ta.f_enter_number like '%{}%'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.residential_area_show">
+              <label class="font_normal_body" style="width:55%">小区:</label>
+              <input  type="text" class="input_search" v-model="model.f_residential_area" placeholder='小区'
+                      condition="ta.f_residential_area like '%{}%'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.building_show">
+              <label class="font_normal_body" style="width:55%">楼栋:</label>
+              <input  type="text" class="input_search" v-model="model.f_building" placeholder='楼栋'
+                      condition="ta.f_building = '{}'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.unit_show">
+              <label class="font_normal_body" style="width:55%">单元:</label>
+              <input  type="text" class="input_search" v-model="model.f_unit" placeholder='单元'
+                      condition="ta.f_unit = '{}'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.floor_show">
+              <label class="font_normal_body" style="width:55%">楼层:</label>
+              <input  type="text" class="input_search" v-model="model.f_floor" placeholder='楼层'
+                      condition="ta.f_floor = '{}'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  v-if="$parent.$parent.room_show">
+              <label class="font_normal_body" style="width:55%">房间号:</label>
+              <input  type="text" class="input_search" v-model="model.f_room" placeholder='房间号'
+                      condition="ta.f_room = '{}'"
+                      style="height: 95%;width: 90%"></input>
+            </div>
+            <div class="form-group col-sm-4"  >
+              <label class="font_normal_body" style="width:55%">是否预备:</label>
+              <v-select :value.sync="model.is_prepare" :options='$parent.$parent.is_prepares' placeholder='是否预备' close-on-select width="60%"
+                        class="select select_list form-group"  v-model='model.is_prepare'  :search='true'></v-select>
             </div>
-<!--          <div class="form-group col-sm-2"  >-->
-<!--            <v-select :value.sync="model.f_residential_area" :options='$parent.$parent.areaselected' placeholder='小区' close-on-select width="90%"-->
-<!--                      :size="model.f_residential_area?model.f_residential_area.length * 2 : 4"   class="select select_list form-group"  v-model='model.f_residential_area'   condition="ta.f_residential_area like '%{}%'" :search='true'></v-select>-->
-<!--          </div>-->
 
           </div>
         </div>
@@ -67,6 +110,9 @@
               </div>
             </div>
             <div class="row">
+              <div class="col-sm-6" v-if="$parent.$parent.$parent.enter_number_show">
+                <label style="color: #666666">入户证号: </label>{{row.f_enter_number}}
+              </div>
               <div class="col-sm-6">
                 <label style="color: #666666">详细地址: </label>{{row.f_address}}
               </div>
@@ -88,106 +134,157 @@
 </template>
 
 <script>
-import {HttpResetClass, PagedList} from 'vue-client'
-export default {
-  title: '查询用户',
-  data () {
-    return {
-      model: new PagedList('rs/sql/tel_getUserInfoAdress', 10),
-      show: false,
-      row: Object,
-      tempnumber: '',
-      rows:[]
-    }
-  },
-  props: {
-    isText: {
-      type: Boolean,
-      default: false
-    },
-    user: {},
-    callObj:{
-      type: Object
+  import {HttpResetClass, PagedList} from 'vue-client'
+  export default {
+    title: '查询用户',
+    data () {
+      return {
+        model: new PagedList('rs/sql/tel_getUserInfoAdress', 10),
+        show: false,
+        is_prepares:[{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+        row: Object,
+        tempnumber: '',
+        rows:[],
+        enter_number_show:true,
+        residential_area_show:true,
+        building_show:true,
+        unit_show:true,
+        room_show:true,
+        floor_show:true
+      }
     },
-  },
-  methods: {
-    search (args) {
-      args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}'`
-      this.model.search(args.condition, args.model)
+    props: {
+      isText: {
+        type: Boolean,
+        default: false
+      },
+      user: {},
+      callObj:{
+        type: Object
+      },
     },
-    bind (row) {
-      //tag
+    methods: {
+      clear(){
+        //清空查询条件
+        this.$refs.paged.$refs.criteria.model={}
+      },
+      // 获取该组件配置文件
+      getTelFindUserConfig(){
+        let http  = new HttpResetClass()
+        http.load('GET', `/phone/rs/vue`, {}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+          if(res.data.telephone){
+            if (res.data.telephone.TelFindUser){
+              let telconfig = res.data.telephone.TelFindUser.data
+              if(telconfig.criteria){
+                telconfig.criteria.forEach((item)=>{
+                  if(item.name =='入户证号'){
+                    this.enter_number_show = item.ifshow
+                  }
+                  if(item.name =='小区'){
+                    this.residential_area_show = item.ifshow
+                  }
+                  if(item.name =='楼栋'){
+                    this.building_show = item.ifshow
+                  }
+                  if(item.name =='单元'){
+                    this.unit_show = item.ifshow
+                  }
+                  if(item.name =='房间号'){
+                    this.room_show = item.ifshow
+                  }
+                  if(item.name =='楼层'){
+                    this.floor_show = item.ifshow
+                  }
+
+                })
+              }
+            }
+          }
+        })
+      },
+      search (args) {
+        if(args.model.is_prepare && args.model.is_prepare.length>0 && args.model.is_prepare[0]=='是'){
+          args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state = '预备' and tu.f_table_state = '待开通'`
+        }else if(args.model.is_prepare && args.model.is_prepare.length>0 && args.model.is_prepare[0]=='否'){
+          args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state in('正常','停用') and tu.f_table_state = '正常'`
+        }else {
+          args.condition += ` and ti.f_filialeid = '${this.$login.f.orgid}' and ti.f_user_state in('正常','停用','预备')`
+        }
+        this.model.search(args.condition, args.model)
+      },
+      bind (row) {
+        //tag
+      },
+      teleNoQuery (teleNo) {
+        this.$refs.paged.$refs.criteria.model.f_user_phone = teleNo
+        this.$refs.paged.$refs.criteria.search()
+      }
     },
-    teleNoQuery (teleNo) {
-      this.$refs.paged.$refs.criteria.model.f_user_phone = teleNo
+    ready(){
+      this.getTelFindUserConfig()
       this.$refs.paged.$refs.criteria.search()
-    }
-  },
-  ready(){
-    this.$refs.paged.$refs.criteria.search()
-    //this.model.search(`ti.f_filialeid = '${this.$login.f.orgid}'`)
 
-  },
-  watch: {
-    'callObj.callNum' () {
-      // 查找用户的 业务逻辑
-      let http = new HttpResetClass()
-      http.load('POST', 'rs/sql/tel_getUserInfoAdress', {data: {
-          condition: `(f_user_phone = '${this.callObj.callNum}' or f_rent_phone = '${this.callObj.callNum}') and ti.f_user_state = '正常' `,
-        }},{resolveMsg: null, rejectMsg: null}).then((req) => {
-        this.model.rows = req.data
-        this.model.state = '正确'
-      })
     },
-    'user' (val) {
-      // this.$resetpost('rs/sql/singleTable', {data: { tablename: 't_userinfo', condition: "f_user_name='" + this.user.name + "' and f_userinfo_id=" + this.user.userId }}).then((req) => {
-      //   this.row = req.data
-      // })
-      if (val.name === '' && val.userId === '') { // 用户未绑定
-        // 清空查询条件
-        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
-          this.$refs.paged.$refs.criteria.model[key] = ''
+    watch: {
+      'callObj.callNum' () {
+        // 查找用户的 业务逻辑
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/sql/tel_getUserInfoAdress', {data: {
+            condition: `(f_user_phone = '${this.callObj.callNum}' or f_zuhu_phone = '${this.callObj.callNum}' or f_rent_phone = '${this.callObj.callNum}') and ti.f_user_state = '正常' `,
+          }},{resolveMsg: null, rejectMsg: null}).then((req) => {
+          this.model.rows = req.data
+          this.model.state = '正确'
         })
-        this.model.rows = []
-        this.model.state = '错误'
-        this.model.error = '未找到用户或用户未绑定'
-        this.$emit('find-error', '未找到用户或用户未绑定')
-        return
+      },
+      'user' (val) {
+        // this.$resetpost('rs/sql/singleTable', {data: { tablename: 't_userinfo', condition: "f_user_name='" + this.user.name + "' and f_userinfo_id=" + this.user.userId }}).then((req) => {
+        //   this.row = req.data
+        // })
+        if (val.name === '' && val.userId === '') { // 用户未绑定
+          // 清空查询条件
+          Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+            this.$refs.paged.$refs.criteria.model[key] = ''
+          })
+          this.model.rows = []
+          this.model.state = '错误'
+          this.model.error = '未找到用户或用户未绑定'
+          this.$emit('find-error', '未找到用户或用户未绑定')
+          return
+        }
+        this.$refs.paged.$refs.criteria.model.f_user_name = this.user.name
+        this.$refs.paged.$refs.criteria.model.f_userinfo_id = this.user.userId
+        this.$refs.paged.$refs.criteria.search()
+        // this.model.search(`f_user_name = '${this.user.name}' and f_userinfo_id = ${this.user.userId}`, this.model)
+      },
+      'model.state' (val) {
+        if (val === '正确' && this.model.rows.length === 1) {
+          this.$emit('find-one', this.model.rows[0])
+        }
       }
-      this.$refs.paged.$refs.criteria.model.f_user_name = this.user.name
-      this.$refs.paged.$refs.criteria.model.f_userinfo_id = this.user.userId
-      this.$refs.paged.$refs.criteria.search()
-      // this.model.search(`f_user_name = '${this.user.name}' and f_userinfo_id = ${this.user.userId}`, this.model)
     },
-    'model.state' (val) {
-      if (val === '正确' && this.model.rows.length === 1) {
-        this.$emit('find-one', this.model.rows[0])
+    events: {
+      //点击用户信息后变色
+      'select-changed' :function (val) {
+        this.tempnumber = val.val.f_userinfo_code
       }
     }
-  },
-  events: {
-    //点击用户信息后变色
-    'select-changed' :function (val) {
-      this.tempnumber = val.val.f_userinfo_code
-    }
   }
-}
 </script>
 <style scoped>
-label {
-  width: 80px;
-}
-#pc-finduser-page .form-input-group {
-  margin: 5px 0px;
-  height: auto;
-}
-.themeOne .span{
-  overflow-y: scroll;
-}
-.pager{
-  margin: 5px 0px !important;
-  background-color: #f8f8f8;
-}
+  label {
+    width: 80px;
+  }
+  #pc-finduser-page .form-input-group {
+    margin: 5px 0px;
+    height: auto;
+  }
+  .themeOne .span{
+    overflow-y: scroll;
+  }
+  .pager{
+    margin: 5px 0px !important;
+    background-color: #f8f8f8;
+  }
   .inbg{
     font-family: PingFang-SC-Medium;
     font-size: 14px;

package/src/filiale/wenxi/pc/WorkListAll.vue

@@ -269,7 +269,7 @@
               <nobr>{{ row.f_contact_phone }}</nobr>
             </td>
             <td  style="text-align: center;">
-              <nobr>{{ $parent.$parent.$parent.trouble(row.failure) }}</nobr>
+              <nobr>{{ $parent.$parent.$parent.trouble(row.failure_str) }}</nobr>
             </td>
             <td  style="text-align: center;">
               <nobr>{{ row.f_remarks }}</nobr>
@@ -414,7 +414,7 @@ export default {
         'f_result_status': '工单结果',
         'f_date': '上传时间',
         'f_remarks': '派单备注',
-        'failure':'故障明细',
+        'failure_str':'故障明细',
         'f_remar': '工单完成备注'
       },
       criteriaShow: false
@@ -547,6 +547,9 @@ export default {
     // 是否可以退回
 
     trouble (val) {
+      if (!val.startsWith('[')){
+        return val
+      }
       let failureall=''
       // val=[{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""},{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""},{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""}]
 

package/src/filiale/wenxi/telephone.js

@@ -3,13 +3,11 @@ import Vue from "vue";
 
 //pc和手机分别注册到两个文件中
 let specialComp = {
-  // 工单详情子组件
-  'voice-server':(resolve) => { require(['./pc/VoiceServer'], resolve) },
-  'distribute-work': (resolve) => { require(['./pc/DistributeWork'], resolve) },
-  'repairs-work':(resolve) => { require(['./pc/RepairsWork'], resolve) },
-  'tel-find-user':(resolve) => { require(['./pc/TelFindUser'], resolve) },
-  'failure-edit':(resolve) => { require(['./pc/FailureEdit'], resolve) },
   'work-listall':(resolve) => { require(['./pc/WorkListAll'], resolve) },
+  'tel-find-user':(resolve) => { require(['./pc/TelFindUser'], resolve) },
+  'gas-work':(resolve) => { require(['./pc/GasWork'], resolve) },
+  'distribute-work':(resolve) => { require(['./pc/DistributeWork'], resolve) },
+  'tel-meteread-info':(resolve) => { require(['./pc/MetereadInfo'], resolve) },
 }
 exports.specialComp = specialComp
 

package/src/filiale/wenxi/telephoneAndroid.js

@@ -7,7 +7,10 @@ let specialComp = {
   //
   'repair-first': (resolve) => { require(['./android/RepairFirstV'], resolve) },
   'repair-orderV': (resolve) => { require(['./android/RepairOrderV'], resolve) },
-  // 'repair-user-info': (resolve) => { require(['./android/RepairUserInfo'], resolve) },
+  'zhihuan-first': (resolve) => { require(['./android/ZHihuanFirst'], resolve) },
+  'PhoneUpUserinfoTel': (resolve) => { require(['./android/PhoneUpUserinfo'], resolve) },
+  'repair-info': (resolve) => { require(['./android/RepairInfo'], resolve) },
+  'repair-user-info': (resolve) => { require(['./android/RepairUserInfo.vue'], resolve) },
   }
 exports.specialComp = specialComp