manage-client 3.2.12 → 3.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.12",
+  "version": "3.2.13",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/businessquery/BusinesQuery.vue

@@ -195,8 +195,7 @@
         footer: [],
         model: new PagedList('rs/sql/BusinesQuery', 20, {}, {f_money: 0}),
         criteriaShow: false,
-        headData: ["客户编号", "客户名称", "操作人", "操作日期", "停用状态", "停用原因", "其他停用原因", "同步状态"],
-        bodyData: ["f_userinfo_code", "f_user_name", "f_operat_type", "f_describe", "f_operat_type", "f_operate_date", "f_state", "f_operator"],
+        bodyData: ["f_userinfo_code", "f_user_name", "f_meternumber","f_money", "f_operat_type","f_state", "f_operate_date", "f_orgname", "f_depname", "f_operator"],
         orgCondtionStr: '',
         show:false,
         rowdata:{},

package/src/components/sale/config/exportConfig.js

@@ -17,7 +17,7 @@ export default{
   },
   // 业务查询
   businesConfig: {
-    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_operat_type': '操作类型', 'f_describe': '操作描述',
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_money': '收款金额', 'f_operat_type': '操作类型',
     'f_state': '操作状态', 'f_operate_date': '操作日期', 'f_orgname': '组织名称', 'f_depname': '部门名称', 'f_operator': '操作人'
   },
   // 资源操作

package/src/components/webmeter/newwebmeter/NewException/NewGasEcharts.vue

@@ -1,209 +1,208 @@
-<template lang="html">
-  <div>
-    <div id="m" :style="{width:'100%',height:'100%'}"></div>
-  </div>
-</template>
-
-<script>
-import * as Util from '../../../../Util'
-import co from 'co'
-import { HttpResetClass } from 'vue-client'
-
-let getData = function * (self, condition) {
-  console.log('6666666666')
-  let load = new HttpResetClass()
-  load.load('POST', 'rs/sql/webmeter_getUserGasGroup',
-    {data: {condition: '1 = 1' + (self.orgid != null ? ' and f_orgid in ( ' + self.orgid +')' : ''),
-        groupname: 'day',
-        startDate: self.startdate + ' 00:00:00',
-        endDate: self.enddate  + ' 23:59:59'}},
-    {resolveMsg: null, rejectMsg: null})
-    .then((res) => {
-      let arrparams = []
-      let gasdata1 = []
-      let gasdata2 = []
-      for (var i = 0; i < res.data.length; i++) {
-        arrparams[i] = res.data[i].f_type
-        gasdata1[i] = res.data[i].f_oughtamount1
-        gasdata2[i] = res.data[i].f_oughtamount2
-      }
-      self.set(arrparams, gasdata1, gasdata2)
-    })
-}
-export default {
-  props: {
-    echarts:{
-      type:Boolean,
-      default:false
-    },
-    startdate: {
-      type: String,
-      default: Util.toStandardDateString()
-    },
-    enddate: {
-      type: String,
-      default: Util.toStandardDateString()
-    },
-    condition: {
-      type: String,
-      default: '1=1'
-    },
-    orgid:'',
-    groupname: {
-      type: String,
-      default: 'year'
-    }
-  },
-  data () {
-    title: '业务类型'
-    return {
-      xc: ''
-    }
-  },
-  ready(){
-    console.log(this.echarts)
-    this.searchdata()
-  },
-  methods: {
-    set (arrparams, gasdata1, gasdata2) {
-      console.log('--------->>>>>>>>>>>>',arrparams,gasdata1,gasdata2)
-      console.log("ec:"+this.echarts)
-      let name = ''
-      if (this.groupname === 'year')
-      {
-        name = '年'
-      } else if (this.groupname === 'month'){
-        name = '月'
-      } else if (this.groupname === 'week'){
-        name = '周'
-      } else {
-        name = '日'
-      }
-      this.xc = this.$echarts.init(document.getElementById('m'))
-      // this.xc.resize({height: '100%',width: '100%'})
-      this.xc.setOption({
-        title: {
-          text: '用气' + name + '分析图',
-          x: 'left',
-          textStyle: {
-            color: '#000',
-            fontSize: 20
-          }
-        },
-        color: ['#61a0a8', '#2f4554'],
-        tooltip: {
-          trigger: 'axis',
-          extraCssText: 'width: auto;height: auto;'
-        },
-        grid:{
-          top:'20%',
-        },
-        legend: {
-          x: 'left',
-          y: 'bottom',
-          textStyle: {
-            fontSize: 12
-          },
-          data: ['用气量(民用)(m³)', '用气量(非民用)(m³)']
-        },
-        toolbox: {
-          show: true,
-          feature: {
-            mark: {show: true},
-            dataView: {show: true, readOnly: false},
-            magicType: {show: true, type: ['line', 'bar', 'stack', 'tiled']},
-            restore: {show: true},
-            saveAsImage: {show: true}
-          }
-        },
-        calculable: true,
-        xAxis: [
-          { name: '日期',
-            nameTextStyle: {
-              fontSize: 15
-            },
-            type: 'category',
-            data: arrparams
-          }
-        ],
-        yAxis : [
-          {
-            type : 'value',
-            name: '用气量(m³)',
-            nameTextStyle: {
-              fontSize: 15
-            },
-            axisLabel: {
-              show: true,
-              textStyle: {
-                fontSize: 15,
-                color: '#7d8000'
-              }
-            }
-          }
-        ],
-        series : [
-          {
-            name: '用气量(民用)(m³)',
-            type: 'bar',
-            smooth: true,
-            itemStyle: {normal: {areaStyle: {type: 'default'}}},
-            data: gasdata1,
-            markPoint: {
-              data: [
-                {type: 'max', name: '最大值'},
-                {type: 'min', name: '最小值'}
-              ]
-            },
-            markLine: {
-              data: [
-                {type: 'average', name: '平均值'}
-              ]
-            }
-          },
-          {
-            name: '用气量(非民用)(m³)',
-            type: 'bar',
-            smooth: true,
-            itemStyle: {normal: {areaStyle: {type: 'default'}}},
-            data: gasdata2,
-            markPoint: {
-              data: [
-                {type: 'max', name: '最大值'},
-                {type: 'min', name: '最小值'}
-              ]
-            },
-            markLine: {
-              data: [
-                {type: 'average', name: '平均值'}
-              ]
-            }
-          }
-        ]
-      })
-    },
-    searchdata (condition) {
-      console.log("ec:"+this.echarts)
-      let getGen = getData(this, condition)
-      co(getGen)
-    }
-  },
-  watch: {
-    // 'echarts' (val) {
-    //   this.searchdata(this.condition)
-    // },
-    // 'groupname' (val) {
-    //   this.searchdata(this.condition)
-    // },
-    'startdate' (val) {
-      this.searchdata()
-    },
-    'enddate' (val) {
-      this.searchdata()
-    },
-    'orgid' (val) {
-      this.searchdata()
-    }
-  }
-}
-</script>
+<template lang="html">
+  <div>
+    <div id="m" :style="{width:'100%',height:'100%'}"></div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../../../../Util'
+import co from 'co'
+import { HttpResetClass } from 'vue-client'
+
+let getData = function * (self, condition) {
+  console.log('6666666666')
+  let load = new HttpResetClass()
+  load.load('POST', 'rs/sql/webmeter_getUserGasGroup',
+    {data: {condition: '1 = 1' + (self.orgid != null ? ' and f_orgid in ( ' + self.orgid +')' : ''),
+        groupname: 'day',
+        startDate: self.startdate + ' 00:00:00',
+        endDate: self.enddate  + ' 23:59:59'}},
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      let arrparams = Array.from(new Set(res.data.map(x => x.type)))
+      let gasdata1 = []
+      let gasdata2 = []
+      for (let i = 0; i < arrparams.length; i++) {
+        gasdata1.push(res.data.filter(item => item.type == arrparams[i] && item.f_user_type == '民用').map(x => x.f_gas).reduce((x, y) => x + y,0).toFixed(2))
+        gasdata2.push(res.data.filter(item => item.type == arrparams[i] && item.f_user_type == '非民用').map(x => x.f_gas).reduce((x, y) => x + y,0).toFixed(2))
+      }
+      self.set(arrparams, gasdata1, gasdata2)
+    })
+}
+export default {
+  props: {
+    echarts:{
+      type:Boolean,
+      default:false
+    },
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    condition: {
+      type: String,
+      default: '1=1'
+    },
+    orgid:'',
+    groupname: {
+      type: String,
+      default: 'year'
+    }
+  },
+  data () {
+    title: '业务类型'
+    return {
+      xc: ''
+    }
+  },
+  ready(){
+    console.log(this.echarts)
+    this.searchdata()
+  },
+  methods: {
+    set (arrparams, gasdata1, gasdata2) {
+      console.log('--------->>>>>>>>>>>>',arrparams,gasdata1,gasdata2)
+      console.log("ec:"+this.echarts)
+      let name = ''
+      if (this.groupname === 'year')
+      {
+        name = '年'
+      } else if (this.groupname === 'month'){
+        name = '月'
+      } else if (this.groupname === 'week'){
+        name = '周'
+      } else {
+        name = '日'
+      }
+      this.xc = this.$echarts.init(document.getElementById('m'))
+      // this.xc.resize({height: '100%',width: '100%'})
+      this.xc.setOption({
+        title: {
+          text: '用气' + name + '分析图',
+          x: 'left',
+          textStyle: {
+            color: '#000',
+            fontSize: 20
+          }
+        },
+        color: ['#61a0a8', '#2f4554'],
+        tooltip: {
+          trigger: 'axis',
+          extraCssText: 'width: auto;height: auto;'
+        },
+        grid:{
+          top:'20%',
+        },
+        legend: {
+          x: 'left',
+          y: 'bottom',
+          textStyle: {
+            fontSize: 12
+          },
+          data: ['用气量(民用)(m³)', '用气量(非民用)(m³)']
+        },
+        toolbox: {
+          show: true,
+          feature: {
+            mark: {show: true},
+            dataView: {show: true, readOnly: false},
+            magicType: {show: true, type: ['line', 'bar', 'stack', 'tiled']},
+            restore: {show: true},
+            saveAsImage: {show: true}
+          }
+        },
+        calculable: true,
+        xAxis: [
+          { name: '日期',
+            nameTextStyle: {
+              fontSize: 15
+            },
+            type: 'category',
+            data: arrparams
+          }
+        ],
+        yAxis : [
+          {
+            type : 'value',
+            name: '用气量(m³)',
+            nameTextStyle: {
+              fontSize: 15
+            },
+            axisLabel: {
+              show: true,
+              textStyle: {
+                fontSize: 15,
+                color: '#7d8000'
+              }
+            }
+          }
+        ],
+        series : [
+          {
+            name: '用气量(民用)(m³)',
+            type: 'bar',
+            smooth: true,
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
+            data: gasdata1,
+            markPoint: {
+              data: [
+                {type: 'max', name: '最大值'},
+                {type: 'min', name: '最小值'}
+              ]
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '用气量(非民用)(m³)',
+            type: 'bar',
+            smooth: true,
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
+            data: gasdata2,
+            markPoint: {
+              data: [
+                {type: 'max', name: '最大值'},
+                {type: 'min', name: '最小值'}
+              ]
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          }
+        ]
+      })
+    },
+    searchdata (condition) {
+      console.log("ec:"+this.echarts)
+      let getGen = getData(this, condition)
+      co(getGen)
+    }
+  },
+  watch: {
+    // 'echarts' (val) {
+    //   this.searchdata(this.condition)
+    // },
+    // 'groupname' (val) {
+    //   this.searchdata(this.condition)
+    // },
+    'startdate' (val) {
+      this.searchdata()
+    },
+    'enddate' (val) {
+      this.searchdata()
+    },
+    'orgid' (val) {
+      this.searchdata()
+    }
+  }
+}
+</script>

package/src/filiale/WEINAN/UserGasAll.vue

@@ -457,12 +457,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
         // 初始化气表品牌
         let brandArr = []
         this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-          if (item.value.f_meter_type == '物联网表') {
             let temp = {}
             temp.label = item.label
             temp.value = item.value.f_meter_brand
             brandArr.push(temp)
-          }
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
 

package/src/filiale/WEINAN/UserGasEcharts.vue

@@ -44,7 +44,7 @@
   let getData = function * (self, condition) {
     let load = new HttpResetClass()
     load.load('POST', 'rs/sql/webmeter_getUserGasGroup',
-      {data: {condition: condition, groupname: self.groupname[0], startDate: self.startdate,
+      {data: {condition: condition, groupname: self.groupname, startDate: self.startdate,
           endDate: self.enddate}},
       {resolveMsg: null, rejectMsg: null})
       .then((res) => {