system-phone 3.1.29 → 3.1.31

package/src/components/PhoneSellInfo.vue

@@ -1,148 +1,148 @@
-<template >
-  <div class="panel panel-default auto repair-info-content">
-    <div class="panel-body" v-show="show">
-      <div class="panel panel-default well" v-for="row in model">
-        <div class="bg-info">
-          <div class="row form-group">
-            <div class="col-xs-12 col-sm-12 col-md-12">
-              <div class="row">
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  购气量: {{row.f_pregas}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  购气金额: {{row.f_preamount}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  收费状态: {{row.f_state}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  收款: {{row.f_collection}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  缴费方式: {{row.f_payment}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  营业网点: {{row.f_depname}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  操作员: {{row.f_operator}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  购气时间: {{row.f_operate_date}}
-                </div>
-
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="panel panel-default well">
-        <div className="bg-info">
-          <div className="row form-group">
-            <div className="col-xs-12 col-sm-12 col-md-12">
-              <div className="row">
-                <div className="col-xs-6 col-sm-6 col-md-6">
-                  总购气量: {{ f_pregas_count }}
-                </div>
-                <div className="col-xs-6 col-sm-6 col-md-6">
-                  总购气金额: {{ f_preamount_count }}
-                </div>
-                <div className="col-xs-6 col-sm-6 col-md-6">
-                  购气次数: {{ model.length }}
-                </div>
-              </div>
-            </div>
-            </div>
-        </div>
-      </div>
-      <p v-show="model.length == 0 ">此用户暂无购气记录</p>
-    </div>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import co from 'co'
-  export default {
-    title: '查询用户',
-    data () {
-      return {
-        model: [],
-        f_pregas_count: 0,
-        f_preamount_count: 0,
-        show: false,
-        row: Object
-      }
-    },
-    props: {
-      user: {
-        type: Object
-      },
-      f_userinfo_id:''
-    },
-    methods: {
-      getmodel () {
-        let userinfoid
-        if(this.f_userinfo_id){
-          userinfoid = this.f_userinfo_id
-        }else{
-          userinfoid = this.user.f_userinfo_id
-          console.log(this.user.f_userinfo_id)
-        }
-        console.log(userinfoid)
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_userinfo_id = '${userinfoid}'`}},{resolveMsg : null,rejectMsg :null}).then((row) => {
-          this.model = row.data
-          row.data.forEach(item => {
-            this.f_pregas_count += item.f_pregas
-            this.f_preamount_count += item.f_preamount
-          })
-          this.show=true
-        })
-      },
-      back(){
-
-      }
-    },
-    watch: {
-      'user' (val) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        if(this.user){
-          if (!(this.user.isNuN)) {
-            this.model= []
-            this.getmodel()
-          }
-        }
-      },
-      'f_userinfo_id'(){
-        if(this.f_userinfo_id){
-          this.model= []
-          this.getmodel()
-        }
-      }
-    },
-    ready () {
-      if (this.user && this.user.f_userinfo_id) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        this.getmodel()
-      }
-      if(this.f_userinfo_id){
-        this.getmodel()
-      }
-    }
-  }
-</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="panel panel-default auto repair-info-content">
+    <div class="panel-body" v-show="show">
+      <div class="panel panel-default well" v-for="row in model">
+        <div class="bg-info">
+          <div class="row form-group">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="row">
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  购气量: {{row.f_pregas}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  购气金额: {{row.f_preamount}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收费状态: {{row.f_state}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收款: {{row.f_collection}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  缴费方式: {{row.f_payment}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  营业网点: {{row.f_depname}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  操作员: {{row.f_operator}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  购气时间: {{row.f_operate_date}}
+                </div>
+
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="panel panel-default well">
+        <div className="bg-info">
+          <div className="row form-group">
+            <div className="col-xs-12 col-sm-12 col-md-12">
+              <div className="row">
+                <div className="col-xs-6 col-sm-6 col-md-6">
+                  总购气量: {{ f_pregas_count }}
+                </div>
+                <div className="col-xs-6 col-sm-6 col-md-6">
+                  总购气金额: {{ f_preamount_count }}
+                </div>
+                <div className="col-xs-6 col-sm-6 col-md-6">
+                  购气次数: {{ model.length }}
+                </div>
+              </div>
+            </div>
+            </div>
+        </div>
+      </div>
+      <p v-show="model.length == 0 ">此用户暂无购气记录</p>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  export default {
+    title: '查询用户',
+    data () {
+      return {
+        model: [],
+        f_pregas_count: 0,
+        f_preamount_count: 0,
+        show: false,
+        row: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      f_userinfo_id:''
+    },
+    methods: {
+      getmodel () {
+        let userinfoid
+        if(this.f_userinfo_id){
+          userinfoid = this.f_userinfo_id
+        }else{
+          userinfoid = this.user.f_userinfo_id
+          console.log(this.user.f_userinfo_id)
+        }
+        console.log(userinfoid)
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_state = '有效' and f_userinfo_id = '${userinfoid}'`}},{resolveMsg : null,rejectMsg :null}).then((row) => {
+          this.model = row.data
+          row.data.forEach(item => {
+            this.f_pregas_count += item.f_pregas
+            this.f_preamount_count += item.f_preamount
+          })
+          this.show=true
+        })
+      },
+      back(){
+
+      }
+    },
+    watch: {
+      'user' (val) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        if(this.user){
+          if (!(this.user.isNuN)) {
+            this.model= []
+            this.getmodel()
+          }
+        }
+      },
+      'f_userinfo_id'(){
+        if(this.f_userinfo_id){
+          this.model= []
+          this.getmodel()
+        }
+      }
+    },
+    ready () {
+      if (this.user && this.user.f_userinfo_id) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        this.getmodel()
+      }
+      if(this.f_userinfo_id){
+        this.getmodel()
+      }
+    }
+  }
+</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/components/Test.vue

@@ -1,14 +1,14 @@
-<template>
-  <div>
-    <h1>Hello Test {{msg}}</h1>
-  </div>
-</template>
-<script>
-  export default {
-    title: "test",
-    props: ['msg'],
-    data () {
-      return {}
-    }
-  }
-</script>
+<template>
+  <div>
+    <h1>Hello Test {{msg}}</h1>
+  </div>
+</template>
+<script>
+  export default {
+    title: "test",
+    props: ['msg'],
+    data () {
+      return {}
+    }
+  }
+</script>

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
+  }
+}