system-phone 3.0.49-9 → 3.1.0

package/src/plugins/vue-py.js

@@ -1,37 +1,37 @@
-import { pinyin } from './const.js'
-export default {
-  chineseToPinYin: function (l1) {
-    var l2 = l1.length
-    var I1 = ''
-    var reg = new RegExp('[a-zA-Z0-9]')
-    for (var i = 0; i < l2; i++) {
-      var val = l1.substr(i, 1)
-      var name = this.arraySearch(val, pinyin)
-      if (reg.test(val)) {
-        I1 += val
-      } else if (name !== false) {
-        I1 += name
-      }
-    }
-    I1 = I1.replace(/ /g, '-')
-    while (I1.indexOf('--') > 0) {
-      I1 = I1.replace('--', '-')
-    }
-    return I1
-  },
-  arraySearch: function (l1, l2) {
-    for (var name in pinyin) {
-      if (pinyin[name].indexOf(l1) !== -1) {
-        return this.ucfirst(name)
-      }
-    }
-    return false
-  },
-  ucfirst: function (l1) {
-    if (l1.length > 0) {
-      var first = l1.substr(0, 1).toUpperCase()
-      var spare = l1.substr(1, l1.length)
-      return first + spare
-    }
-  }
-}
+import { pinyin } from './const.js'
+export default {
+  chineseToPinYin: function (l1) {
+    var l2 = l1.length
+    var I1 = ''
+    var reg = new RegExp('[a-zA-Z0-9]')
+    for (var i = 0; i < l2; i++) {
+      var val = l1.substr(i, 1)
+      var name = this.arraySearch(val, pinyin)
+      if (reg.test(val)) {
+        I1 += val
+      } else if (name !== false) {
+        I1 += name
+      }
+    }
+    I1 = I1.replace(/ /g, '-')
+    while (I1.indexOf('--') > 0) {
+      I1 = I1.replace('--', '-')
+    }
+    return I1
+  },
+  arraySearch: function (l1, l2) {
+    for (var name in pinyin) {
+      if (pinyin[name].indexOf(l1) !== -1) {
+        return this.ucfirst(name)
+      }
+    }
+    return false
+  },
+  ucfirst: function (l1) {
+    if (l1.length > 0) {
+      var first = l1.substr(0, 1).toUpperCase()
+      var spare = l1.substr(1, l1.length)
+      return first + spare
+    }
+  }
+}

package/src/stores/AppData.js

@@ -1,63 +1,91 @@
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-let GetAppDataService = {
-  install(Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
-  },
-
-  // 开启卡监听
-  async load () {
-    let result = await new HttpResetClass().load('POST',`${Vue.androidUtil.getProxyUrl()}/rs/logic/getInitData`, {data: {f_filialeids: Vue.user.orgid}}, {resolveMsg: null, rejectMsg: null})
-    console.log('system加载参数')
-    console.log(JSON.stringify(result))
-    result.data.singleValues.forEach((item) => {
-      this.singleValues[item.name] = item.value
-    })
-    result.data.params.forEach((item) => {
-      let value = []
-      item.f_paramvalues.forEach((item, index) => {
-        value[index] = {}
-        value[index].label = item.name
-        value[index].value = item.name
-      })
-      this.params[item.name] = value
-    })
-    let getParams =   await new HttpResetClass().load('post',`${Vue.androidUtil.getProxyUrl()}/rs/logic/getSaleInitData`, {data: {f_orgid: Vue.user.orgid}}, {resolveMsg: null, rejectMsg: null})
-    console.log('获取营收参数')
-    console.log(JSON.stringify(getParams))
-    if (getParams.data) {
-      getParams.data.gasbrands.forEach((item, index) => {
-        this.saleParams.gasbrands[index] = {}
-        this.saleParams.gasbrands[index].label = item.f_meter_brand
-        this.saleParams.gasbrands[index].value = item.f_meter_brand
-        let gasmodel = []
-        item.gasmodel.forEach((item, index) => {
-          gasmodel[index] = {}
-          gasmodel[index].label = item.f_meter_style
-          gasmodel[index].value = item.f_meter_style
-        })
-        this.params[item.f_meter_brand] = gasmodel
-      })
-    }
-  },
-
-  params: {},
-  singleValues: {},
-
-  // 营收模块参数
-  saleParams: {
-    gasbrands:[]
-  },
-
-  // 安检模块参数
-  safeCheckParams: {},
-
-  getParam(key) {
-    return this.params[key]
-  },
-  getSingleValue(key) {
-    return this.singleValues[key]
-  }
-}
-export default GetAppDataService
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+let GetAppDataService = {
+  install(Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
+  },
+
+  // 开启卡监听
+  async load (noSale) {
+    let url1 = `${Vue.androidUtil.getProxyUrl()}/rs/logic/getInitData`
+    if(Vue.isv4){
+      url1 = `${Vue.androidUtil.getProxyUrl()}/api/af-system/logic/getInitData`
+    }
+    let result = await new HttpResetClass().load('POST',url1, {data: {f_filialeids: Vue.user.orgid}}, {resolveMsg: null, rejectMsg: null})
+    console.log('system加载参数')
+    console.log(JSON.stringify(result))
+    let newdata = {
+      singleValues : result.data.singleValues,
+      params: result.data.params
+    }
+    if(Vue.isv4 && result.data.code == 200){
+      newdata = {
+        singleValues : result.data.data.singleValues,
+        params: result.data.data.params
+      }
+    }
+    newdata.singleValues.forEach((item) => {
+      this.singleValues[item.name] = item.value
+    })
+    newdata.params.forEach((item) => {
+      let value = []
+      item.f_paramvalues.forEach((item, index) => {
+        value[index] = {}
+        value[index].label = item.name
+        value[index].value = item.name
+      })
+      this.params[item.name] = value
+    })
+    if (!noSale){
+      let url2 = `${Vue.androidUtil.getProxyUrl()}/rs/logic/getSaleInitData`
+      if(Vue.isv4){
+        url2 = `${Vue.androidUtil.getProxyUrl()}/api/af-revenue/logic/getSaleInitData`
+      }
+      let getParams =   await new HttpResetClass().load('post',url2, {data: {f_orgid: Vue.user.orgid}}, {resolveMsg: null, rejectMsg: null})
+      console.log('获取营收参数')
+      console.log(JSON.stringify(getParams))
+      let newsaledata = {
+        gasbrands : getParams.data.gasbrands
+      }
+      if(Vue.isv4 && getParams.data.code == 200){
+        newsaledata = {
+          gasbrands : getParams.data.data.gasbrands
+        }
+      }
+      if (newsaledata) {
+        newsaledata.gasbrands.forEach((item, index) => {
+          this.saleParams.gasbrands[index] = {}
+          this.saleParams.gasbrands[index].label = item.f_meter_brand
+          this.saleParams.gasbrands[index].value = item.f_meter_brand
+          let gasmodel = []
+          item.gasmodel.forEach((item, index) => {
+            gasmodel[index] = {}
+            gasmodel[index].label = item.f_meter_style
+            gasmodel[index].value = item.f_meter_style
+          })
+          this.params[item.f_meter_brand] = gasmodel
+        })
+      }
+    }
+  },
+
+  params: {},
+  singleValues: {},
+
+  // 营收模块参数
+  saleParams: {
+    gasbrands:[]
+  },
+
+  // 安检模块参数
+  safeCheckParams: {},
+
+  getParam(key) {
+    return this.params[key]
+  },
+  getSingleValue(key) {
+    return this.singleValues[key]
+  }
+}
+export default GetAppDataService

package/src/systemphone-gaomi.js

@@ -1,105 +1,105 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import GetAppDataService from './stores/AppData'
-import GetStringData from './plugins/GetStringData'
-/* require('./assets/fonttype/fontAndroid.less')*/
-
-/** **************************通用组件******************************/
-
-export default function () {
-  Vue.use(GetAppDataService)
-  Vue.use(GetStringData)
-// 测试
-  Vue.component('test', (resolve) => {
-    require(['./components/Test'], resolve)
-  })
-// android登录
-  Vue.component('login-app', (resolve) => {
-    require(['./components/LoginApp'], resolve)
-  })
-// 导航
-  Vue.component('nav-bottom', (resolve) => {
-    require(['./components/gaomi/NavBottomV'], resolve)
-  })
-  Vue.component('nav-bottomss', (resolve) => {
-    require(['./components/gaomi/NavBottomVVVV'], resolve)
-  })
-// 导航
-  Vue.component('scroller', (resolve) => {
-    require(['./components/gaomi/Scroller'], resolve)
-  })
-  // 导航
-  Vue.component('tab-bar', (resolve) => {
-    require(['./components/TabBarPhone'], resolve)
-  })
-// 只加载参数（只有下拉框所需参数）
-  Vue.component('load-appdata', (resolve) => {
-    require(['./components/LoadAppdata'], resolve)
-  })
-  // 头部标题
-  Vue.component('tools-page', (resolve) => {
-    require(['./components/gaomi/ToolsPage'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-user-find', (resolve) => {
-    require(['./components/PhoneUserFind'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-info-table', (resolve) => {
-    require(['./components/PhoneInfoTable'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-sell-info', (resolve) => {
-    require(['./components/PhoneSellInfo'], resolve)
-  })
-  // 用户购气记录查询
-  Vue.component('phone-sell-info-lite', (resolve) => {
-    require(['./components/PhoneSellInfoLite'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-changemeter-info', (resolve) => {
-    require(['./components/PhoneChangemeterInfo'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-repair-info', (resolve) => {
-    require(['./components/PhoneRepairInfo'], resolve)
-  })
-  // 设置
-  Vue.component('system-setup', (resolve) => {
-    require(['./components/gaomi/SystemSetUp'], resolve)
-  })
-  // 待办工作
-  Vue.component('attend-manage', (resolve) => {
-    require(['./components/AttendManage'], resolve)
-  })
-  // 上传工作
-  Vue.component('upload-manage', (resolve) => {
-    require(['./components/UploadManage'], resolve)
-  })
-  // 已办工作
-  Vue.component('already-service', (resolve) => {
-    require(['./components/AlreadyService'], resolve)
-  })
-  // 在线业务
-  Vue.component('online-manage', (resolve) => {
-    require(['./components/OnlineManage'], resolve)
-  })
-  // 修改密码
-  Vue.component('modify-pass-word', (resolve) => {
-    require(['./components/ModifyPassWord'], resolve)
-  })
-  Vue.component('wasm-test', (resolve) => {
-    require(['./components/wasm'], resolve)
-  })
-  Vue.component('right-tree', (resolve) => {
-    require(['./components/RightTree'], resolve)
-  })
-  Vue.component('apply-online', (resolve) => {
-    require(['./components/online/ApplyOnline'], resolve)
-  })
-
-
-// // 只加载参数（只有下拉框所需参数）
-// Vue.component('alone-load-params', (resolve) => { require(['./components/AloneLoadParams'], resolve) })
-}
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import GetAppDataService from './stores/AppData'
+import GetStringData from './plugins/GetStringData'
+/* require('./assets/fonttype/fontAndroid.less')*/
+
+/** **************************通用组件******************************/
+
+export default function () {
+  Vue.use(GetAppDataService)
+  Vue.use(GetStringData)
+// 测试
+  Vue.component('test', (resolve) => {
+    require(['./components/Test'], resolve)
+  })
+// android登录
+  Vue.component('login-app', (resolve) => {
+    require(['./components/LoginApp'], resolve)
+  })
+// 导航
+  Vue.component('nav-bottom', (resolve) => {
+    require(['./components/gaomi/NavBottomV'], resolve)
+  })
+  Vue.component('nav-bottomss', (resolve) => {
+    require(['./components/gaomi/NavBottomVVVV'], resolve)
+  })
+// 导航
+  Vue.component('scroller', (resolve) => {
+    require(['./components/gaomi/Scroller'], resolve)
+  })
+  // 导航
+  Vue.component('tab-bar', (resolve) => {
+    require(['./components/TabBarPhone'], resolve)
+  })
+// 只加载参数（只有下拉框所需参数）
+  Vue.component('load-appdata', (resolve) => {
+    require(['./components/LoadAppdata'], resolve)
+  })
+  // 头部标题
+  Vue.component('tools-page', (resolve) => {
+    require(['./components/gaomi/ToolsPage'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-user-find', (resolve) => {
+    require(['./components/PhoneUserFind'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-info-table', (resolve) => {
+    require(['./components/PhoneInfoTable'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-sell-info', (resolve) => {
+    require(['./components/PhoneSellInfo'], resolve)
+  })
+  // 用户购气记录查询
+  Vue.component('phone-sell-info-lite', (resolve) => {
+    require(['./components/PhoneSellInfoLite'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-changemeter-info', (resolve) => {
+    require(['./components/PhoneChangemeterInfo'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-repair-info', (resolve) => {
+    require(['./components/PhoneRepairInfo'], resolve)
+  })
+  // 设置
+  Vue.component('system-setup', (resolve) => {
+    require(['./components/gaomi/SystemSetUp'], resolve)
+  })
+  // 待办工作
+  Vue.component('attend-manage', (resolve) => {
+    require(['./components/AttendManage'], resolve)
+  })
+  // 上传工作
+  Vue.component('upload-manage', (resolve) => {
+    require(['./components/UploadManage'], resolve)
+  })
+  // 已办工作
+  Vue.component('already-service', (resolve) => {
+    require(['./components/AlreadyService'], resolve)
+  })
+  // 在线业务
+  Vue.component('online-manage', (resolve) => {
+    require(['./components/OnlineManage'], resolve)
+  })
+  // 修改密码
+  Vue.component('modify-pass-word', (resolve) => {
+    require(['./components/ModifyPassWord'], resolve)
+  })
+  Vue.component('wasm-test', (resolve) => {
+    require(['./components/wasm'], resolve)
+  })
+  Vue.component('right-tree', (resolve) => {
+    require(['./components/RightTree'], resolve)
+  })
+  Vue.component('apply-online', (resolve) => {
+    require(['./components/online/ApplyOnline'], resolve)
+  })
+
+
+// // 只加载参数（只有下拉框所需参数）
+// Vue.component('alone-load-params', (resolve) => { require(['./components/AloneLoadParams'], resolve) })
+}

package/src/systemphone.js

@@ -1,58 +1,60 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import GetAppDataService from './stores/AppData'
-import GetStringData from './plugins/GetStringData'
-
-/** **************************通用组件******************************/
-
-export default function () {
-    Vue.use(GetAppDataService)
-    Vue.use(GetStringData)
-// 测试
-    Vue.component('test', (resolve) => {
-        require(['./components/Test'], resolve)
-    })
-// android登录
-    Vue.component('login-app', (resolve) => {
-        require(['./components/LoginApp'], resolve)
-    })
-// 导航
-    Vue.component('nav-bottom', (resolve) => {
-        require(['./components/NavBottom'], resolve)
-    })
-// 只加载参数（只有下拉框所需参数）
-    Vue.component('load-appdata', (resolve) => {
-        require(['./components/LoadAppdata'], resolve)
-    })
-  // 头部标题
-  Vue.component('tools-page', (resolve) => {
-    require(['./components/ToolsPage'], resolve)
-  })
-  // 设置
-  Vue.component('system-setup', (resolve) => {
-    require(['./components/SystemSetUp'], resolve)
-  })
-  // 修改密码
-  Vue.component('modify-pass-word', (resolve) => {
-    require(['./components/ModifyPassWord'], resolve)
-  })
-  // 物联网监控
-  Vue.component('iot-monitoring-main', (resolve) => {
-    require(['./components/iot/iotMonitoringMain'], resolve)
-  })
-  // 物联网监控表具信息
-  Vue.component('iot-meter-info', (resolve) => {
-    require(['./components/iot/IotMeterInfo'], resolve)
-  })
-  // 物联网监控基础信息
-  Vue.component('iot-base-info', (resolve) => {
-    require(['./components/iot/IotBaseInfo'], resolve)
-  })
-  // 物联网监控指令信息
-  Vue.component('instruct-message', (resolve) => {
-    require(['./components/iot/InstructMessage'], resolve)
-  })
-// // 只加载参数（只有下拉框所需参数）
-// Vue.component('alone-load-params', (resolve) => { require(['./components/AloneLoadParams'], resolve) })
-}
+import Vue from 'vue'
+import GetAppDataService from './stores/AppData'
+import GetStringData from './plugins/GetStringData'
+
+/** **************************通用组件******************************/
+
+export default function () {
+  Vue.use(GetAppDataService)
+  Vue.use(GetStringData)
+// 测试
+  Vue.component('test', (resolve) => {
+    require(['./components/Test'], resolve)
+  })
+// android登录
+  Vue.component('login-app', (resolve) => {
+    require(['./components/LoginApp'], resolve)
+  })
+// android登录
+  Vue.component('login-app-v4', (resolve) => {
+    require(['./components/LoginAppV4'], resolve)
+  })
+// 导航
+  Vue.component('nav-bottom', (resolve) => {
+    require(['./components/NavBottom'], resolve)
+  })
+// 只加载参数（只有下拉框所需参数）
+  Vue.component('load-appdata', (resolve) => {
+    require(['./components/LoadAppdata'], resolve)
+  })
+  // 头部标题
+  Vue.component('tools-page', (resolve) => {
+    require(['./components/ToolsPage'], resolve)
+  })
+  // 设置
+  Vue.component('system-setup', (resolve) => {
+    require(['./components/SystemSetUp'], resolve)
+  })
+  // 修改密码
+  Vue.component('modify-pass-word', (resolve) => {
+    require(['./components/ModifyPassWord'], resolve)
+  })
+  // 物联网监控
+  Vue.component('iot-monitoring-main', (resolve) => {
+    require(['./components/iot/iotMonitoringMain'], resolve)
+  })
+  // 物联网监控表具信息
+  Vue.component('iot-meter-info', (resolve) => {
+    require(['./components/iot/IotMeterInfo'], resolve)
+  })
+  // 物联网监控基础信息
+  Vue.component('iot-base-info', (resolve) => {
+    require(['./components/iot/IotBaseInfo'], resolve)
+  })
+  // 物联网监控指令信息
+  Vue.component('instruct-message', (resolve) => {
+    require(['./components/iot/InstructMessage'], resolve)
+  })
+// // 只加载参数（只有下拉框所需参数）
+// Vue.component('alone-load-params', (resolve) => { require(['./components/AloneLoadParams'], resolve) })
+}