system-phone 3.1.35 → 3.1.37

package/src/components/info/FindUserInfo.vue

@@ -1,176 +1,176 @@
-<template>
-  <!--  <div class="app-botton" @click="back()" v-if="show">-->
-  <!--    <span class="glyphicon glyphicon-menu-left">返回</span>-->
-  <!--  </div>-->
-  <div class="select-overspread auto" style="padding-bottom:5px;">
-    <div class="auto repair-info-content compatible">
-      <div class="row" style="display: flex;align-items: center">
-        <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
-          模糊查询:
-        </div>
-        <div class="col-xs-9 col-sm-9 col-md-9 form-input-group mg8">
-          <input type="text" class="form-control" v-model="model.f_userinfo"  placeholder='模糊查询'>
-        </div>
-      </div>
-      <div class="row" style="display: flex;align-items: center">
-        <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
-          用户编号:
-        </div>
-        <div class="col-xs-9 col-sm-9 col-md-9 form-input-group mg8">
-          <input type="text" class="form-control" v-model="model.f_userid"  placeholder='用户编号'>
-        </div>
-      </div>
-      <div class="row" style="display: flex;align-items: center">
-        <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
-          用户姓名:
-        </div>
-        <div class="col-xs-9 col-sm-9 col-md-9 form-input-group mg8">
-          <input type="text" class="form-control" v-model="model.f_username"  placeholder='用户姓名'>
-        </div>
-      </div>
-      <div class="row" style="display: flex;align-items: center">
-        <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
-          用户地址:
-        </div>
-        <div class="col-xs-9 col-sm-9 col-md-9 form-input-group mg8">
-          <input type="text" class="form-control" v-model="model.f_address"  placeholder='用户地址'>
-        </div>
-      </div>
-      <div class="row" style="text-align: center;margin-top: 30px;margin-bottom: 30px" >
-        <button style="width: 70%" type="button" name="button" class="btn btn-primary" @click="search()">查询</button>
-        <!--            <button type="button" name="button" class="btn btn-primary pull-right" @click="read()">读卡</button>-->
-      </div>
-    </div>
-    <div partial class="panel panel-default well" style="padding: 0px;background-color:#ffffff;" v-for="row in users">
-      <div class="panel-body inbg" @click="selectUser(row)">
-        <div class="row auto"  >
-          <div class="col-sm-4">
-            用户编号: {{row.f_userinfo_code}}
-          </div>
-          <div class="col-sm-4">
-            用户姓名: {{row.f_user_name}}
-          </div>
-          <div class="col-sm-4">
-            用户电话: {{row.f_user_phone}}
-          </div>
-          <div class="col-sm-3">
-            用户类别: {{row.f_user_type}}
-          </div>
-          <div class="col-sm-9">
-            地址信息: {{row.f_address}}
-          </div>
-          <div class="col-sm-6">
-            表底数: {{row.f_meter_base}}
-          </div>
-          <div class="col-sm-6">
-            表上余额: {{row.f_balance_amount}}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <!--  <phone-info-table  :user="user" :is-need-condition="false" :is-group="false" v-if="show"></phone-info-table>-->
-</template>
-
-<script>
-import Vue from 'vue'
-import { HttpResetClass } from 'vue-client'
-export default {
-  title: '移动端用户信息查询',
-  props: {
-
-  },
-  data () {
-    return {
-      users:[],
-      model:{
-        f_userid:'',
-        f_username:'',
-        f_address:''
-      },
-      user:'',
-      show:false
-    }
-  },
-  methods: {
-    search() {
-      // console.log("Vue.user",Vue.user)
-      this.model.f_userid ? this.model.f_userid : '1=1'
-      let condition = `ti.f_orgid = '${Vue.user.orgid}'`
-      condition += this.model.f_userid ? ` and ti.f_userinfo_code = '${this.model.f_userid}'` : ' and 1=1'
-      condition += this.model.f_username ? ` and ti.f_user_name like '%${this.model.f_username}%'` : ' and 1=1'
-      condition += this.model.f_address ? ` and tua.f_address like '%${this.model.f_address}%'` : ' and 1=1'
-      if (this.model.f_userinfo){
-        condition += ` and (
-        ti.f_userinfo_code like '%${this.model.f_userinfo}%'
-        or ti.f_user_name like '%${this.model.f_userinfo}%'
-        or ti.f_user_phone like '%${this.model.f_userinfo}%'
-        or f_meternumber like '%${this.model.f_userinfo}%'
-        or tua.f_address like '%${this.model.f_userinfo}%'
-        or ti.f_rent_phone like '${this.model.f_userinfo}'
-        or ti.f_zuhu_phone like '${this.model.f_userinfo}'
-        )`
-      }
-      console.log(condition)
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_UserInfo`, {
-        data: {
-          condition:condition
-        }
-      },{rejectMsg:null,resolveMsg:null}).then((res) => {
-        console.log("查找用户返回的结果")
-        console.log(res.data)
-        this.users = res.data
-      })
-    },
-    selectUser(row){
-      this.user = row
-      var prpdata = {
-        _this:this,
-        title:"用户信息",
-        safe:false
-      }
-      this.$dispatch('gotoson',prpdata)
-      this.$goto('info-table',{user:row,},'self')
-    },
-    back(){
-      this.show = false
-    },
-    read(){
-      // 读卡
-      let res =  HostApp.read()
-      if(res.code == 200){
-        let cardid = res.msg.CardID
-        let condition1 = `tf.f_card_id = '${cardid}'`
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_UserInfo`, {
-          data: {
-            condition:condition1
-          }
-        }).then((res) => {
-          console.log("查找用户返回的结果")
-          console.log(res.data)
-          this.users = res.data
-        })
-      }else{
-        HostApp.alert('读卡异常，请检查读卡设备!')
-      }
-    }
-  },
-  ready(){
-  }
-}
-</script>
-<style>
-.app-botton {
-  position:fixed;
-  background: #87b2dd;
-  color: #FFF;
-  padding: 8px;
-  text-align: center;
-  font-size: 1.2em;
-  z-index: 10;
-  opacity:0.5;
-  bottom: 50px;
-  margin-top: -10px;
-  height: 40px;
-}
-</style>
+<template>
+  <!--  <div class="app-botton" @click="back()" v-if="show">-->
+  <!--    <span class="glyphicon glyphicon-menu-left">返回</span>-->
+  <!--  </div>-->
+  <div class="select-overspread auto" style="padding-bottom:5px;">
+    <div class="auto repair-info-content compatible">
+      <div class="row" style="display: flex;align-items: center">
+        <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
+          模糊查询:
+        </div>
+        <div class="col-xs-9 col-sm-9 col-md-9 form-input-group mg8">
+          <input type="text" class="form-control" v-model="model.f_userinfo"  placeholder='模糊查询'>
+        </div>
+      </div>
+      <div class="row" style="display: flex;align-items: center">
+        <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
+          用户编号:
+        </div>
+        <div class="col-xs-9 col-sm-9 col-md-9 form-input-group mg8">
+          <input type="text" class="form-control" v-model="model.f_userid"  placeholder='用户编号'>
+        </div>
+      </div>
+      <div class="row" style="display: flex;align-items: center">
+        <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
+          用户姓名:
+        </div>
+        <div class="col-xs-9 col-sm-9 col-md-9 form-input-group mg8">
+          <input type="text" class="form-control" v-model="model.f_username"  placeholder='用户姓名'>
+        </div>
+      </div>
+      <div class="row" style="display: flex;align-items: center">
+        <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
+          用户地址:
+        </div>
+        <div class="col-xs-9 col-sm-9 col-md-9 form-input-group mg8">
+          <input type="text" class="form-control" v-model="model.f_address"  placeholder='用户地址'>
+        </div>
+      </div>
+      <div class="row" style="text-align: center;margin-top: 30px;margin-bottom: 30px" >
+        <button style="width: 70%" type="button" name="button" class="btn btn-primary" @click="search()">查询</button>
+        <!--            <button type="button" name="button" class="btn btn-primary pull-right" @click="read()">读卡</button>-->
+      </div>
+    </div>
+    <div partial class="panel panel-default well" style="padding: 0px;background-color:#ffffff;" v-for="row in users">
+      <div class="panel-body inbg" @click="selectUser(row)">
+        <div class="row auto"  >
+          <div class="col-sm-4">
+            用户编号: {{row.f_userinfo_code}}
+          </div>
+          <div class="col-sm-4">
+            用户姓名: {{row.f_user_name}}
+          </div>
+          <div class="col-sm-4">
+            用户电话: {{row.f_user_phone}}
+          </div>
+          <div class="col-sm-3">
+            用户类别: {{row.f_user_type}}
+          </div>
+          <div class="col-sm-9">
+            地址信息: {{row.f_address}}
+          </div>
+          <div class="col-sm-6">
+            表底数: {{row.f_meter_base}}
+          </div>
+          <div class="col-sm-6">
+            表上余额: {{row.f_balance_amount}}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!--  <phone-info-table  :user="user" :is-need-condition="false" :is-group="false" v-if="show"></phone-info-table>-->
+</template>
+
+<script>
+import Vue from 'vue'
+import { HttpResetClass } from 'vue-client'
+export default {
+  title: '移动端用户信息查询',
+  props: {
+
+  },
+  data () {
+    return {
+      users:[],
+      model:{
+        f_userid:'',
+        f_username:'',
+        f_address:''
+      },
+      user:'',
+      show:false
+    }
+  },
+  methods: {
+    search() {
+      // console.log("Vue.user",Vue.user)
+      this.model.f_userid ? this.model.f_userid : '1=1'
+      let condition = `ti.f_orgid = '${Vue.user.orgid}'`
+      condition += this.model.f_userid ? ` and ti.f_userinfo_code = '${this.model.f_userid}'` : ' and 1=1'
+      condition += this.model.f_username ? ` and ti.f_user_name like '%${this.model.f_username}%'` : ' and 1=1'
+      condition += this.model.f_address ? ` and tua.f_address like '%${this.model.f_address}%'` : ' and 1=1'
+      if (this.model.f_userinfo){
+        condition += ` and (
+        ti.f_userinfo_code like '%${this.model.f_userinfo}%'
+        or ti.f_user_name like '%${this.model.f_userinfo}%'
+        or ti.f_user_phone like '%${this.model.f_userinfo}%'
+        or f_meternumber like '%${this.model.f_userinfo}%'
+        or tua.f_address like '%${this.model.f_userinfo}%'
+        or ti.f_rent_phone like '${this.model.f_userinfo}'
+        or ti.f_zuhu_phone like '${this.model.f_userinfo}'
+        )`
+      }
+      console.log(condition)
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_UserInfo`, {
+        data: {
+          condition:condition
+        }
+      },{rejectMsg:null,resolveMsg:null}).then((res) => {
+        console.log("查找用户返回的结果")
+        console.log(res.data)
+        this.users = res.data
+      })
+    },
+    selectUser(row){
+      this.user = row
+      var prpdata = {
+        _this:this,
+        title:"用户信息",
+        safe:false
+      }
+      this.$dispatch('gotoson',prpdata)
+      this.$goto('info-table',{user:row,},'self')
+    },
+    back(){
+      this.show = false
+    },
+    read(){
+      // 读卡
+      let res =  HostApp.read()
+      if(res.code == 200){
+        let cardid = res.msg.CardID
+        let condition1 = `tf.f_card_id = '${cardid}'`
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_UserInfo`, {
+          data: {
+            condition:condition1
+          }
+        }).then((res) => {
+          console.log("查找用户返回的结果")
+          console.log(res.data)
+          this.users = res.data
+        })
+      }else{
+        HostApp.alert('读卡异常，请检查读卡设备!')
+      }
+    }
+  },
+  ready(){
+  }
+}
+</script>
+<style>
+.app-botton {
+  position:fixed;
+  background: #87b2dd;
+  color: #FFF;
+  padding: 8px;
+  text-align: center;
+  font-size: 1.2em;
+  z-index: 10;
+  opacity:0.5;
+  bottom: 50px;
+  margin-top: -10px;
+  height: 40px;
+}
+</style>

package/src/plugins/GetStringData.js

@@ -1,18 +1,18 @@
-
-let GetStringdatas = {
-
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.$getString = Vue.prototype.$getString = GetStringdatas
-  },
-  getSubStr (String) {
-    if(String.endsWith('phone')){
-      let oldStr = String
-      let index = oldStr.lastIndexOf("/")
-      return oldStr.substring(0, index)
-    }
-    return String
-  }
-}
-
-export default GetStringdatas
+
+let GetStringdatas = {
+
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.$getString = Vue.prototype.$getString = GetStringdatas
+  },
+  getSubStr (String) {
+    if(String.endsWith('phone')){
+      let oldStr = String
+      let index = oldStr.lastIndexOf("/")
+      return oldStr.substring(0, index)
+    }
+    return String
+  }
+}
+
+export default GetStringdatas

package/src/plugins/LoadParams.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/rs/path/getParams`, {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      res.data.forEach((item) => {
-        let value = []
-        item.f_paramvalues.forEach((item, index) => {
-          value[index] = {}
-          value[index].label = item.name
-          value[index].value = item.name
-        })
-        AppData.params[item.name] = value
-      })
-    }).catch((res) => {
-      this.msg = res.data
-      this.show = true
-    })
-  }
-}
-
-export default LoadParams
+import Vue from 'vue'
+import AppData from '../stores/AppData'
+
+let LoadParams = {
+    // 开启卡监听
+  load () {
+    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/rs/path/getParams`, {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        AppData.params[item.name] = value
+      })
+    }).catch((res) => {
+      this.msg = res.data
+      this.show = true
+    })
+  }
+}
+
+export default LoadParams

package/src/services/ConfigService.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/rs/path/getParams`, {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      res.data.forEach((item) => {
-        let value = []
-        item.f_paramvalues.forEach((item, index) => {
-          value[index] = {}
-          value[index].label = item.name
-          value[index].value = item.name
-        })
-        AppData.params[item.name] = value
-      })
-    }).catch((res) => {
-      this.msg = res.data
-      this.show = true
-    })
-  }
-}
-
-export default LoadParams
+import Vue from 'vue'
+import AppData from '../stores/AppData'
+
+let LoadParams = {
+    // 开启卡监听
+  load () {
+    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/rs/path/getParams`, {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        AppData.params[item.name] = value
+      })
+    }).catch((res) => {
+      this.msg = res.data
+      this.show = true
+    })
+  }
+}
+
+export default LoadParams

package/static/app.json

@@ -1,5 +1,5 @@
-{
-	"hybrid_version":"2018-01-01 00:00:01",
-	"appVer":"1"
-
+{
+	"hybrid_version":"2018-01-01 00:00:01",
+	"appVer":"1"
+
 }

package/static/globals.txt

@@ -1,74 +1,74 @@
-{
-    "lastNewFormDate": "1980-01-01 00:00:00",
-    "f_repairman_id": "x",
-    "f_user_id": "aaa",
-    "cc_base_url": "http://aotesoft.f3322.net:8300",
-    "REMOTE_WWW_PREFIX": "",
-    "LOCAL_PATH_PREFIX": "/data/data/com.aofeng.hybridwork/files/",
-    "REMOTE_BZ_PREFIX": "thiswillremove",
-    "ProjectNativeMethod": "com.aofeng.hybridwork.android.ProjectNativeMethod",
-    "SCREEN_ORIENTATION":"0",
-    "startService": "true",
-    "full_screen":"true",
-    "pos":"false",
-    "device":"com.aofeng.hybrid.pos.device.ZTDevice",
-    "reader":"com.aofeng.hybrid.pos.reader.ZTChangAnReader",
-    "printer":"com.aofeng.hybrid.pos.printer.ZTPrinter",
-    "cloud_url":"http://113.140.20.122:4004/",
-    "version": "0",
-    "txtServiceStopped": "false",
-    "msgCount": "0",
-    "f_subcompany": "changan",
-    "entities": [
-	      "t_serviceworkorder",
-        "t_oppointment",
-        "t_service",
-        "t_complaint",
-        "t_consult",
-      	"t_service_acitivity",
-        "t_servicework",
-       	"t_notwork",
-       	"t_delayapply",
-       	"t_delayreply",
-        "t_reminder",
-        "t_site_back",
-       	"t_servicesend",
-        "t_recall",
-        "t_servicedelete",
-      	"t_servicerepair",
-       	"t_details",
-       	"t_doorrepair",
-       	"t_accidenttreatment",
-      	"t_gaiconduit",
-       	"t_liconduit",
-       	 "t_firstgascheck",
-       	"t_failure",
-       	"t_failurecase",
-       	"t_material",
-       	"t_baseuserinfo",
-       	"t_repairimg",
-       	"t_retail",
-         "t_notice",
-         "t_check_paper_alarm",
-         "t_check_paper",
-         "t_check_plan_item",
-         "t_check_plan",
-         "t_check_paper_cooker",
-         "t_check_paper_counter",
-         "t_check_paper_defect",
-         "t_check_paper_furnace",
-         "t_check_paper_heater",
-         "t_check_paper_innerplumb",
-         "t_check_paper_meter",
-         "t_phone_state",
-         "t_check_paper_plumb",
-         "t_check_paper_valve",
-         "t_blob",
-         "t_plan_item_meter",
-         "t_plan_item_device",
-         "t_device_info",
-         "t_defect_info",
-         "t_devices_items",
-         "t_paper_devices"
-    ]
-}
+{
+    "lastNewFormDate": "1980-01-01 00:00:00",
+    "f_repairman_id": "x",
+    "f_user_id": "aaa",
+    "cc_base_url": "http://aotesoft.f3322.net:8300",
+    "REMOTE_WWW_PREFIX": "",
+    "LOCAL_PATH_PREFIX": "/data/data/com.aofeng.hybridwork/files/",
+    "REMOTE_BZ_PREFIX": "thiswillremove",
+    "ProjectNativeMethod": "com.aofeng.hybridwork.android.ProjectNativeMethod",
+    "SCREEN_ORIENTATION":"0",
+    "startService": "true",
+    "full_screen":"true",
+    "pos":"false",
+    "device":"com.aofeng.hybrid.pos.device.ZTDevice",
+    "reader":"com.aofeng.hybrid.pos.reader.ZTChangAnReader",
+    "printer":"com.aofeng.hybrid.pos.printer.ZTPrinter",
+    "cloud_url":"http://113.140.20.122:4004/",
+    "version": "0",
+    "txtServiceStopped": "false",
+    "msgCount": "0",
+    "f_subcompany": "changan",
+    "entities": [
+	      "t_serviceworkorder",
+        "t_oppointment",
+        "t_service",
+        "t_complaint",
+        "t_consult",
+      	"t_service_acitivity",
+        "t_servicework",
+       	"t_notwork",
+       	"t_delayapply",
+       	"t_delayreply",
+        "t_reminder",
+        "t_site_back",
+       	"t_servicesend",
+        "t_recall",
+        "t_servicedelete",
+      	"t_servicerepair",
+       	"t_details",
+       	"t_doorrepair",
+       	"t_accidenttreatment",
+      	"t_gaiconduit",
+       	"t_liconduit",
+       	 "t_firstgascheck",
+       	"t_failure",
+       	"t_failurecase",
+       	"t_material",
+       	"t_baseuserinfo",
+       	"t_repairimg",
+       	"t_retail",
+         "t_notice",
+         "t_check_paper_alarm",
+         "t_check_paper",
+         "t_check_plan_item",
+         "t_check_plan",
+         "t_check_paper_cooker",
+         "t_check_paper_counter",
+         "t_check_paper_defect",
+         "t_check_paper_furnace",
+         "t_check_paper_heater",
+         "t_check_paper_innerplumb",
+         "t_check_paper_meter",
+         "t_phone_state",
+         "t_check_paper_plumb",
+         "t_check_paper_valve",
+         "t_blob",
+         "t_plan_item_meter",
+         "t_plan_item_device",
+         "t_device_info",
+         "t_defect_info",
+         "t_devices_items",
+         "t_paper_devices"
+    ]
+}

package/test/unit/.eslintrc

@@ -1,5 +1,5 @@
-{
-  "env": {
-    "jasmine": true
-  }
-}
+{
+  "env": {
+    "jasmine": true
+  }
+}