telephone-clients 4.0.0-1-33 → 4.0.0-1-34

package/src/filiale/meihekou/android/RepairOrderV.vue

@@ -572,8 +572,8 @@ export default {
       let response = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
         data: {
           items: 'count(0) as num',
-          tablename: 't_userfiles',
-          condition: `f_userinfo_id = '${this.row.f_userinfo_id}' and f_meter_classify != '物联网表'`,
+          tablename: 't_userfiles a left join t_userinfo b on a.f_userinfo_id = b.f_userinfo_id',
+          condition: `a.f_userinfo_id = '${this.row.f_userinfo_id}' and a.f_meter_classify != '物联网表' and a.f_table_state = '正常' and b.f_user_state='正常'`,
           orderitem: '1'
         }
       }, {resolveMsg: null, rejectMsg: null})

package/src/main.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-import App from './App'
-import all  from 'vue-client/src/all'
-import system from 'system-clients/src/system'
-import telephone from './telephone'
-// import safecheck from 'safecheck-client/src/safecheck'
-import echarts from 'echarts'
-Vue.prototype.$echarts = echarts
-
-/** **************************通用组件******************************/
-all()
-system(false)
-telephone()
-// safecheck('bayan')
-require('./expandcss.less')
-require('system-clients/src/styles/less/bootstrap.less')
-require('./telephoneanaly.less')
-// 测试
-
-Vue.component('test', (resolve) => { require(['./components/Test'], resolve) })
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import all  from 'vue-client/src/all'
+import system from 'system-clients/src/system'
+import telephone from './telephone'
+// import safecheck from 'safecheck-client/src/safecheck'
+import echarts from 'echarts'
+Vue.prototype.$echarts = echarts
+
+/** **************************通用组件******************************/
+all()
+system(false)
+telephone('xinkang')
+// safecheck('bayan')
+require('./expandcss.less')
+require('system-clients/src/styles/less/bootstrap.less')
+require('./telephoneanaly.less')
+// 测试
+
+Vue.component('test', (resolve) => { require(['./components/Test'], resolve) })
+new Vue({
+  el: 'body',
+  components: { App }
+})