manage-client 3.3.17 → 3.3.18-1

package/src/filiale/xiangyun/sale.js

@@ -1,6 +1,6 @@
-// 分公司特殊组件页面注册
-import Vue from 'vue'
-export default function () {
-  // 收费查询
-  Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
-}
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+export default function () {
+  // 收费查询
+  Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
+}

package/src/filiale/xiangyun/tableConfig.js

@@ -1,60 +1,60 @@
-export default{
-  //查询页面的字段名和中文对应
-  ReportDataQuery:
-    {
-      "用户编号":"f_userinfo_code",
-      "用户名称":"f_user_name",
-      "表号":"f_meternumber",
-      "本次抄表底数":"f_tablebase",
-      "上次抄表底数":"f_last_tablebase",
-      "表上余额":"f_jval",
-      "抄表日期":"f_hand_date",
-
-      "用气量":"f_oughtamount",
-      "用气金额":"f_oughtfee",
-      "用气性质":"f_gasproperties",
-      "客户类型":"f_user_type",
-      "用户地址":"f_address",
-
-      "上次抄表日期":"f_last_hand_date",
-      "开户日期":"f_gas_date",
-      "软件版本号":"f_software_version",
-      "表状态信息":"f_table_msg",
-      "上次表状态信息":"f_last_meter_state_msg",
-
-      "插入日期":"f_insert_date",
-      "上次插入日期":"f_last_insertdate",
-      "是否结算":"f_whether_clear",
-      "超用气量":"f_super_gas",
-      "电量等级":"f_electricity",
-
-      "购气次数":"f_times",
-      "单价":"f_price",
-      "信号强度":"f_signal",
-      "信噪比":"f_snr",
-      "电压":"f_batterylevel",
-
-      "阀门强制状态":"f_networkshutvalve",
-      "阀门状态":"f_valvestate",
-      "计量类型":"f_wmprepaytype",
-      "上报类型":"f_upload_type",
-      "金额状态":"f_moneystate",
-
-      "增加工况瞬时":"operatingModeFlow",
-      "标况瞬时":"standardConditionFlow",
-      "开盖状态" :"f_SplitAlarm",
-      "液晶状态" : "f_XTIpllStopFlag",
-      "声速" :"soundVelocity",
-
-      "外电低电":"f_lowlithiumbattery",
-      "磁干扰异常":"f_magneticinterference",
-      "表内剩余金额":"f_meterbalanceamt",
-      "表内累计充值金额":"f_meterdebitamt",
-      "补偿状态":"f_compensatestate",
-      "气表品牌":"f_meter_brand",
-      "气表型号":"f_meter_style",
-      "分公司":"f_orgname"
-
-    }
-
-}
+export default{
+  //查询页面的字段名和中文对应
+  ReportDataQuery:
+    {
+      "用户编号":"f_userinfo_code",
+      "用户名称":"f_user_name",
+      "表号":"f_meternumber",
+      "本次抄表底数":"f_tablebase",
+      "上次抄表底数":"f_last_tablebase",
+      "表上余额":"f_jval",
+      "抄表日期":"f_hand_date",
+
+      "用气量":"f_oughtamount",
+      "用气金额":"f_oughtfee",
+      "用气性质":"f_gasproperties",
+      "客户类型":"f_user_type",
+      "用户地址":"f_address",
+
+      "上次抄表日期":"f_last_hand_date",
+      "开户日期":"f_gas_date",
+      "软件版本号":"f_software_version",
+      "表状态信息":"f_table_msg",
+      "上次表状态信息":"f_last_meter_state_msg",
+
+      "插入日期":"f_insert_date",
+      "上次插入日期":"f_last_insertdate",
+      "是否结算":"f_whether_clear",
+      "超用气量":"f_super_gas",
+      "电量等级":"f_electricity",
+
+      "购气次数":"f_times",
+      "单价":"f_price",
+      "信号强度":"f_signal",
+      "信噪比":"f_snr",
+      "电压":"f_batterylevel",
+
+      "阀门强制状态":"f_networkshutvalve",
+      "阀门状态":"f_valvestate",
+      "计量类型":"f_wmprepaytype",
+      "上报类型":"f_upload_type",
+      "金额状态":"f_moneystate",
+
+      "增加工况瞬时":"operatingModeFlow",
+      "标况瞬时":"standardConditionFlow",
+      "开盖状态" :"f_SplitAlarm",
+      "液晶状态" : "f_XTIpllStopFlag",
+      "声速" :"soundVelocity",
+
+      "外电低电":"f_lowlithiumbattery",
+      "磁干扰异常":"f_magneticinterference",
+      "表内剩余金额":"f_meterbalanceamt",
+      "表内累计充值金额":"f_meterdebitamt",
+      "补偿状态":"f_compensatestate",
+      "气表品牌":"f_meter_brand",
+      "气表型号":"f_meter_style",
+      "分公司":"f_orgname"
+
+    }
+
+}

package/src/filiale/xiangyun/webmeterManage.js

@@ -1,7 +1,7 @@
-import Vue from 'vue'
-
-export default function () {
-  // 物联网表结算查询
-  Vue.component('report-data-query', (resolve) => { require(['./ReportDataQuery'], resolve) })
-}
-
+import Vue from 'vue'
+
+export default function () {
+  // 物联网表结算查询
+  Vue.component('report-data-query', (resolve) => { require(['./ReportDataQuery'], resolve) })
+}
+

package/src/main.js

@@ -1,68 +1,68 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/shanxian/sale'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage()
-ShanXianSaleManage()
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import ShanXianSaleManage from './filiale/shanxian/sale'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage()
+ShanXianSaleManage()
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+

package/src/plugins/getAllInputtor.js

@@ -1,29 +1,29 @@
-import Vue from 'vue'
-
-let getAllInputtor ={
-  inputtors : [],
-  async init(){
-    let res = await Vue.resetpost('rs/sql/getAlluserRes', {
-      condition:" 1=1"
-    }, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
-    if(res.data){
-      getAllInputtor.inputtors = res.data;
-    }
-  },
-  getresinputtor(orgid){
-    let inputtors = []
-    if(getAllInputtor.inputtors.length>0){
-      let arr = getAllbatch.data.filter((res) => {
-        return res.rolestr.indexOf("抄表员")>-1 && res.f_orgid == 'orgid'
-      })
-      inputtors.push({label: "全部", value: ""})
-      arr.forEach((res) => {
-        inputtors.push({label: res.name, value: res.name})
-      })
-      getAllInputtor.inputtors = inputtors;
-    }
-    return getAllInputtor;
-  }
-
-}
-export default getAllInputtor
+import Vue from 'vue'
+
+let getAllInputtor ={
+  inputtors : [],
+  async init(){
+    let res = await Vue.resetpost('rs/sql/getAlluserRes', {
+      condition:"1=1"
+    }, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
+    if(res.data){
+      getAllInputtor.inputtors = res.data;
+    }
+  },
+  getresinputtor(orgid){
+    let inputtors = []
+    if(getAllInputtor.inputtors.length>0){
+      let arr = getAllbatch.data.filter((res) => {
+        return res.rolestr.indexOf("抄表员")>-1 && res.f_orgid == 'orgid'
+      })
+      inputtors.push({label: "全部", value: ""})
+      arr.forEach((res) => {
+        inputtors.push({label: res.name, value: res.name})
+      })
+      getAllInputtor.inputtors = inputtors;
+    }
+    return getAllInputtor;
+  }
+
+}
+export default getAllInputtor

package/src/stores/MagGetSaleParams.js

@@ -1,156 +1,156 @@
-import Vue from 'vue'
-
-let MagGetSaleParam = {
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.MagGetSaleParam = Vue.prototype.$MagGetSaleParam = MagGetSaleParam
-  },
-  gasbrands: [],
-  prices: [],
-  adjustables: [],
-  inputtors : [],
-  smallareas:[],
-  async initinputtor(){
-    let res = await Vue.resetpost('rs/sql/getAlluserRes', {data:{
-      condition:" 1=1"
-    }}, {newly:true, resolveMsg: null, rejectMsg: '获取用户出错！！！'})
-    if(res.data){
-      MagGetSaleParam.inputtors = res.data;
-    }
-  },
-  async getsmallarea(filiale){
-    let smallareas=[]
-    let condition=`f_small_area is not null and f_small_area <>''  group by f_small_area`
-    if(filiale){
-      condition=`f_filialeid='${filiale}' and f_small_area is not null and f_small_area <>''  group by f_small_area`
-    }
-    let res = await Vue.resetpost('rs/sql/manage_singleTable', {data:{
-    items: 'f_small_area', tablename: 't_user_address', orderitem: 'f_small_area DESC',condition:condition
-      }}, {newly:true,resolveMsg: null, rejectMsg: '获取区域出错！！！'})
-    if(res.data){
-      res.data.forEach((item) => {
-        var param={
-          label:item.f_small_area,
-          value:item.f_small_area
-        }
-        smallareas.push(param)
-      })
-    }
-    return  smallareas
-  },
-  getresinputtor(orgid){
-    let inputtors = []
-    if(MagGetSaleParam.inputtors.length>0){
-      let arr = MagGetSaleParam.inputtors.filter((res) => {
-        if(res.rolestr != null &&  res.rolestr!='' ){
-          return res.rolestr.indexOf("抄表员")>-1 && res.f_orgid == orgid
-        }
-      })
-
-      arr.forEach((res) => {
-        inputtors.push({label: res.name, value: res.name})
-      })
-    }
-    return inputtors;
-  },
-  // 开启卡监听
-  organizeData (fromSystem) {
-    if(Vue.android){
-      console.log('接受System中返回的参数进行组织', fromSystem)
-      fromSystem.gasbrands.forEach((item, index) => {
-        MagGetSaleParam.gasbrands[index] = {}
-        MagGetSaleParam.gasbrands[index].label = item.f_meter_brand
-        let gasmodel = []
-        item.gasmodel.forEach((item, index) => {
-          gasmodel[index] = {}
-          gasmodel[index].label = item.f_meter_style + item.f_type
-          gasmodel[index].value = item
-        })
-        item.gasmodel = gasmodel
-      MagGetSaleParam.gasbrands[index].value = item
-      })
-      fromSystem.adjustable.forEach((item, index) => {
-        MagGetSaleParam.adjustables[index] = {}
-      MagGetSaleParam.adjustables[index].label = item.f_adjustable_name
-      MagGetSaleParam.adjustables[index].value = item
-      })
-      MagGetSaleParam.prices = [...MagGetSaleParam.prices, ...fromSystem.price]
-      console.log('参数组织完毕', MagGetSaleParam)
-    }
-  },
-  getAdjustable (val) {
-    // 数组去重
-    let arr = []
-    console.log("调压箱调压箱调压箱调压箱调压箱调压箱调压箱调压箱调压箱")
-    console.log(Vue.$appdata.saleParams)
-    console.log(MagGetSaleParam.adjustables)
-    if (val) {
-      MagGetSaleParam.adjustables.forEach((item, next) => {
-        if (item.value.f_orgid === val) {
-        arr.push(item)
-      }
-    })
-    } else {
-      MagGetSaleParam.adjustables.forEach((item, next) => {
-        arr.push(item)
-    })
-    }
-    let hash = {}
-    let result = arr.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-  },
-  getGasbrand () {
-    if (MagGetSaleParam.gasbrands.length === 0) {
-      MagGetSaleParam.organizeData(Vue.$appdata.saleParams)
-    }
-    return MagGetSaleParam.gasbrands
-  },
-  getPrices() {
-    return MagGetSaleParam.prices
-  },
-  getPrice (object) {
-    if (MagGetSaleParam.prices.length === 0) {
-      MagGetSaleParam.organizeData(Vue.$appdata.saleParams)
-    }
-    let result = []
-    console.log('获取价格。。。', MagGetSaleParam.prices)
-    if (object){
-      // 做筛选
-      MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' &&
-          item.f_price_type === object.f_price_type &&
-          item.f_filialeid === object.filter) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          result.push(value)
-        }
-      })
-    }else{
-      // 做筛选
-      MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' &&
-          item.f_price_type === object.f_price_type) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          result.push(value)
-        }
-      })
-    }
-    // 数组去重
-    let hash = {}
-    result = result.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-}
-}
-
-export default MagGetSaleParam
+import Vue from 'vue'
+
+let MagGetSaleParam = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.MagGetSaleParam = Vue.prototype.$MagGetSaleParam = MagGetSaleParam
+  },
+  gasbrands: [],
+  prices: [],
+  adjustables: [],
+  inputtors : [],
+  smallareas:[],
+  async initinputtor(){
+    let res = await Vue.resetpost('rs/sql/getAlluserRes', {data:{
+      condition:"1=1"
+    }}, {newly:true, resolveMsg: null, rejectMsg: '获取用户出错！！！'})
+    if(res.data){
+      MagGetSaleParam.inputtors = res.data;
+    }
+  },
+  async getsmallarea(filiale){
+    let smallareas=[]
+    let condition=`f_small_area is not null and f_small_area <>''  group by f_small_area`
+    if(filiale){
+      condition=`f_filialeid='${filiale}' and f_small_area is not null and f_small_area <>''  group by f_small_area`
+    }
+    let res = await Vue.resetpost('rs/sql/manage_singleTable', {data:{
+    items: 'f_small_area', tablename: 't_user_address', orderitem: 'f_small_area DESC',condition:condition
+      }}, {newly:true,resolveMsg: null, rejectMsg: '获取区域出错！！！'})
+    if(res.data){
+      res.data.forEach((item) => {
+        var param={
+          label:item.f_small_area,
+          value:item.f_small_area
+        }
+        smallareas.push(param)
+      })
+    }
+    return  smallareas
+  },
+  getresinputtor(orgid){
+    let inputtors = []
+    if(MagGetSaleParam.inputtors.length>0){
+      let arr = MagGetSaleParam.inputtors.filter((res) => {
+        if(res.rolestr != null &&  res.rolestr!='' ){
+          return res.rolestr.indexOf("抄表员")>-1 && res.f_orgid == orgid
+        }
+      })
+
+      arr.forEach((res) => {
+        inputtors.push({label: res.name, value: res.name})
+      })
+    }
+    return inputtors;
+  },
+  // 开启卡监听
+  organizeData (fromSystem) {
+    if(Vue.android){
+      console.log('接受System中返回的参数进行组织', fromSystem)
+      fromSystem.gasbrands.forEach((item, index) => {
+        MagGetSaleParam.gasbrands[index] = {}
+        MagGetSaleParam.gasbrands[index].label = item.f_meter_brand
+        let gasmodel = []
+        item.gasmodel.forEach((item, index) => {
+          gasmodel[index] = {}
+          gasmodel[index].label = item.f_meter_style + item.f_type
+          gasmodel[index].value = item
+        })
+        item.gasmodel = gasmodel
+      MagGetSaleParam.gasbrands[index].value = item
+      })
+      fromSystem.adjustable.forEach((item, index) => {
+        MagGetSaleParam.adjustables[index] = {}
+      MagGetSaleParam.adjustables[index].label = item.f_adjustable_name
+      MagGetSaleParam.adjustables[index].value = item
+      })
+      MagGetSaleParam.prices = [...MagGetSaleParam.prices, ...fromSystem.price]
+      console.log('参数组织完毕', MagGetSaleParam)
+    }
+  },
+  getAdjustable (val) {
+    // 数组去重
+    let arr = []
+    console.log("调压箱调压箱调压箱调压箱调压箱调压箱调压箱调压箱调压箱")
+    console.log(Vue.$appdata.saleParams)
+    console.log(MagGetSaleParam.adjustables)
+    if (val) {
+      MagGetSaleParam.adjustables.forEach((item, next) => {
+        if (item.value.f_orgid === val) {
+        arr.push(item)
+      }
+    })
+    } else {
+      MagGetSaleParam.adjustables.forEach((item, next) => {
+        arr.push(item)
+    })
+    }
+    let hash = {}
+    let result = arr.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+  },
+  getGasbrand () {
+    if (MagGetSaleParam.gasbrands.length === 0) {
+      MagGetSaleParam.organizeData(Vue.$appdata.saleParams)
+    }
+    return MagGetSaleParam.gasbrands
+  },
+  getPrices() {
+    return MagGetSaleParam.prices
+  },
+  getPrice (object) {
+    if (MagGetSaleParam.prices.length === 0) {
+      MagGetSaleParam.organizeData(Vue.$appdata.saleParams)
+    }
+    let result = []
+    console.log('获取价格。。。', MagGetSaleParam.prices)
+    if (object){
+      // 做筛选
+      MagGetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' &&
+          item.f_price_type === object.f_price_type &&
+          item.f_filialeid === object.filter) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          result.push(value)
+        }
+      })
+    }else{
+      // 做筛选
+      MagGetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' &&
+          item.f_price_type === object.f_price_type) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          result.push(value)
+        }
+      })
+    }
+    // 数组去重
+    let hash = {}
+    result = result.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+}
+}
+
+export default MagGetSaleParam