manage-client 3.2.143 → 3.2.144

package/package.json

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

package/src/components/webmeter/recharge/RechargeList.vue

@@ -55,7 +55,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户地址</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_address" placeholder='客户地址'
-                         condition="u.f_address like '%{}%'" v-next-el='userid' v-el:username>
+                         condition="s.f_address like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>

package/src/filiale/dongguan/components/SellReport/BankManager.vue

@@ -0,0 +1,146 @@
+<template lang="html">
+  <div id="charts">
+    <div id="bm" :style="{width:'100%',height:'100%'}"></div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../../../../Util'
+import co from 'co'
+import echarts from 'echarts'
+import {HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+  load.load('POST', 'rs/sql/userfilesvalues',
+  {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    self.texttile = '用户类型'
+    // let arrparams = []
+    console.log('获取数据。。', res.data)
+    let org = []
+    //let name = []
+    let minyongvalue=[]
+    let feiminyongvalue=[]
+    for (var i = 0; i < res.data.length; i++) {
+        if (!org.includes(res.data[i].org)) {
+          org.push(res.data[i].org)
+        }
+        if (res.data[i].name === '民用') {
+          minyongvalue[org.indexOf(res.data[i].org)] = res.data[i].number
+        }else{
+          feiminyongvalue[org.indexOf(res.data[i].org)]= res.data[i].number
+        }
+    }
+    self.set(org,minyongvalue,feiminyongvalue)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+},
+ data () {
+   title: '银行管理'
+   return {
+     texttile: '',
+     xc: '',
+
+     minyongvalue: [],
+     feiminyongvalue: []
+   }
+ },
+ methods: {
+   set (org,minyongvalue,feiminyongvalue) {
+     this.xc = echarts.init(document.getElementById('bm'))
+     this.xc.setOption({
+       title : {
+         text: '新增汇总',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+       tooltip : {
+         trigger: 'axis'
+       },
+       legend: {
+         x: 'left',
+         y: 'bottom',
+         data: ['民用','非民用']
+       },
+       toolbox: {
+         show : true,
+         feature : {
+           dataView : {show: true, readOnly: false},
+           magicType : {show: true, type: ['line', 'bar']},
+           restore : {show: true},
+           saveAsImage : {show: true}
+         }
+       },
+       calculable : true,
+       xAxis : [
+         {
+           type : 'category',
+           data : org
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'民用',
+          type:'bar',
+          data:minyongvalue,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'非民用',
+          type:'bar',
+          data:feiminyongvalue,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        }
+      ]
+     })
+   },
+   searchdata () {
+     let getGen =getData(this)
+     co(getGen)
+   }
+ },
+ ready () {
+   this.searchdata()
+ },
+ watch: {
+   'startdate' (val) {
+     this.searchdata()
+   },
+   'enddate' (val) {
+     this.searchdata()
+   },
+   'orgid' (val) {
+     this.searchdata()
+   }
+ }
+
+}
+</script>

package/src/filiale/dongguan/components/SellReport/SiteManager.vue

@@ -0,0 +1,147 @@
+<template lang="html">
+  <div id="charts">
+    <div id="gph" :style="{width:'100%',height:'100%'}"></div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../../../../Util'
+import co from 'co'
+import echarts from 'echarts'
+import {HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+  load.load('POST','rs/sql/sellinggasvalue',
+  {data: {startDate: self.startdate, endDate: self.enddate,key: 'f_depname',f_orgid: self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    self.texttile = '用户类型'
+    let arrparams = []
+    let numdata = []
+    let gasdata = []
+    let pricedata = []
+    for (var i = 0; i < res.data.length; i++) {
+        arrparams[i] = res.data[i].name
+        numdata[i] = res.data[i].num_value
+        gasdata[i] = res.data[i].gas_value
+        pricedata[i] = res.data[i].money_value
+    }
+    self.set(arrparams,numdata,gasdata,pricedata)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+},
+ data () {
+   title: '站点管理'
+   return {
+     texttile: '',
+     xc: ''
+   }
+ },
+ methods: {
+   set (arrparams,numdata,gasdata,pricedata) {
+     this.xc = echarts.init(document.getElementById('gph'))
+     this.xc.setOption({
+       title : {
+         text: '营收汇总',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+       tooltip : {
+         trigger: 'axis'
+       },
+       legend: {
+         x: 'left',
+         y: 'bottom',
+         data: ['数量','气量','金额']
+       },
+       toolbox: {
+         show : true,
+         feature : {
+           dataView : {show: true, readOnly: false},
+           magicType : {show: true, type: ['line', 'bar']},
+           restore : {show: true},
+           saveAsImage : {show: true}
+         }
+       },
+       calculable : true,
+       xAxis : [
+         {
+           type : 'category',
+           data : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'数量',
+          type:'bar',
+          data:numdata,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'气量',
+          type:'bar',
+          data:gasdata,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'金额',
+          type:'bar',
+          data:pricedata,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        }
+      ]
+     })
+   },
+   searchdata () {
+     let getGen =getData(this)
+     co(getGen)
+   }
+ },
+ ready () {
+   this.searchdata()
+ },
+ watch: {
+   'startdate' (val) {
+     this.searchdata()
+   },
+   'enddate' (val) {
+     this.searchdata()
+   },
+   'orgid' (val) {
+     this.searchdata()
+   }
+ }
+
+}
+</script>

package/src/filiale/dongguan/components/WebReport/BussinessType.vue

@@ -0,0 +1,137 @@
+<template lang="html">
+  <div id="charts">
+    <div id="sm" :style="{width:'100%',height:'98%'}"></div>
+  </div>
+</template>
+
+<script>
+  /* eslint-disable indent,key-spacing,no-labels */
+
+  import * as Util from '../../../../Util'
+import co from 'co'
+import echarts from 'echarts'
+import {HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+  load.load('POST','rs/sql/BusinessType',
+  {data: {startDate: self.startdate, endDate: self.enddate,f_orgid: self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    self.texttile = '用户类型'
+    let arrparams = []
+    let numdata = []
+    let pricedata = []
+    for (var i = 0; i < res.data.length; i++) {
+        arrparams[i] = res.data[i].name
+        numdata[i] = res.data[i].num
+        pricedata[i] = res.data[i].money
+    }
+    self.set(arrparams,numdata,pricedata)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+  },
+ data () {
+    title: '业务类型'
+   return {
+     texttile: '',
+     xc: ''
+   }
+ },
+ methods: {
+   set (arrparams,numdata,pricedata) {
+     this.xc = echarts.init(document.getElementById('sm'))
+     this.xc.setOption({
+       title : {
+         text: '非气体营收汇总',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+        tooltip:{
+          trigger:'axis'
+        },
+       legend: {
+         x: 'left',
+         y: 'bottom',
+         data: ['数量','金额']
+       },
+       toolbox: {
+         show : true,
+         feature : {
+           dataView : {show: true, readOnly: false},
+           magicType : {show: true, type: ['line', 'bar']},
+           restore : {show: true},
+           saveAsImage : {show: true}
+         }
+       },
+       calculable : true,
+       xAxis : [
+         {
+           type : 'category',
+           data : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'数量',
+          type:'bar',
+          data:numdata,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'金额',
+          type:'bar',
+          data:pricedata,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        }
+      ]
+     })
+   },
+   searchdata () {
+     let getGen = getData(this)
+     co(getGen)
+   }
+ },
+ ready () {
+   this.searchdata()
+ },
+ watch: {
+   'startdate' (val) {
+     this.searchdata()
+   },
+   'enddate' (val) {
+     this.searchdata()
+   },
+   'orgid' (val) {
+     this.searchdata()
+   }
+ }
+
+}
+</script>

package/src/filiale/dongguan/components/WebReport/Paymentpie.vue

@@ -0,0 +1,157 @@
+<template lang="html">
+  <div id="charts">
+    <div id="pp" :style="{width:'100%',height:'98%'}"></div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../../../../Util'
+import co from 'co'
+import echarts from 'echarts'
+import { HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+
+  load.load('POST','rs/sql/sellinggasvalue',
+  {data: {startDate: self.startdate, endDate: self.enddate,key:'f_payment',f_orgid:self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    let arrparams = []
+    let moneydata = []
+    let gasdata = []
+    for (var i = 0; i < res.data.length; i++) {
+        let item = {}
+        let item1={}
+        arrparams[i] = res.data[i].name
+        item.name = res.data[i].name
+        item.value = res.data[i].gas_value
+        gasdata.push(item)
+        item1.name = res.data[i].name
+        item1.value = res.data[i].money_value
+        moneydata.push(item1)
+    }
+    console.log("加载echars组件")
+    console.log(arrparams,gasdata)
+    self.set(arrparams,gasdata,moneydata)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+},
+ data () {
+   return {
+     xc: ''
+   }
+ },
+ methods: {
+
+   set (arrparams,gasdata,moneydata) {
+     console.log("进入组件")
+     this.xc = echarts.init(document.getElementById('pp'))
+     this.xc.setOption({
+       title: [
+         {
+           text: '收费渠道汇总',
+           x: '0%',
+           y: '0%',
+           textStyle: {
+             color: '#010606',
+             fontSize: 18,
+           }
+         },   {
+           text: '气量分布',
+           x: '18%',
+           y: '18%',
+           textStyle: {
+             color: '#010606',
+             fontSize: 16,
+           }
+         },{
+           text: '金额分布',
+           x: '58%',
+           y: '18%',
+           textStyle: {
+             color: '#010606',
+             fontSize: 16,
+           }
+         }],
+       tooltip: {
+         trigger: 'item',
+         formatter: '{a} <br/>{b}: {c} ({d}%)'
+       },
+       legend: {
+         orient: 'horizontal',
+         icon: 'circle',
+         x: 'center',
+         y: '80%',
+
+         textStyle: {
+           padding: [0, 0, 0, 4],
+           color: '#010606'
+         },
+         data: arrparams
+       },
+    series : [
+      {
+        name: '',
+        type: 'pie',
+        radius: ['0%', '40%'],
+        center: ['25%', '50%'],
+        hoverAnimation: true,
+        minAngle: 15,//最小角度
+        startAngle: 60, //起始角度
+        label: {normal: {show:true,}},
+        labelLine: { normal: {show:true,}},
+        data: gasdata
+        },
+      {
+        name: '笔数',
+        type: 'pie',
+        radius: ['0%', '40%'],
+        center: ['65%', '50%'],
+        hoverAnimation: true,
+        minAngle: 15,//最小角度
+        startAngle: 60, //起始角度
+        label: {normal: {show:true,}},
+        labelLine: { normal: {show:true,}},
+        data: moneydata
+        }
+    ]
+
+ },true)
+
+},
+   searchdata () {
+     let getGen =getData(this);
+     co(getGen);
+   }
+ },
+ ready () {
+   this.searchdata()
+ },
+  watch: {
+    'startdate' (val) {
+      this.searchdata()
+    },
+    'enddate' (val) {
+      this.searchdata()
+    },
+    'orgid' (val) {
+      this.searchdata()
+    }
+  }
+
+}
+</script>

package/src/filiale/dongguan/reportManage.js

@@ -0,0 +1,21 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+let specialComp = {
+  // 各管理站气量金额散列图
+  'site-manager': (resolve) => {
+    require(['./components/SellReport/SiteManager'], resolve)
+  },
+  // 银行代售气量金额散列图
+  'bank-manager': (resolve) => {
+    require(['./components/SellReport/BankManager'], resolve)
+  },
+  // 付款方式饼图
+  'paymentpie': (resolve) => {
+    require(['./components/WebReport/Paymentpie'], resolve)
+  },
+  'bussiness-type': (resolve) => {
+    require(['./components/WebReport/BussinessType'], resolve)
+  }
+}
+exports.specialComp = specialComp

package/src/filiale/rongcheng/exportConfig.js

@@ -72,8 +72,8 @@ export default{
     'f_total_fee': '表累购金额','f_meternumber': '表号','f_metertitles': '表封号','f_inputtor': '抄表员','f_position': '安装位置',
     'f_userfiles_address': '安装地址','f_install_person': '安装人','f_install_date': '安装日期','f_gas_person': '通气人','f_gas_date': '通气日期',
     'f_fire_state': '点火状态','f_valve_state': '阀门状态','f_meter_book_num': '抄表册编号','f_meter_book_sort': '抄表册顺序','f_card_id': '卡号',
-    'f_aroundmeter': '左右表','f_whether_hairpin': '是否发卡','f_balance_amount': '表剩余金额','f_min_operate_date': '首次购气日期','f_times': '写卡次数',
-    'f_fillcard_times': '补卡次数','f_sell_number': '购气次数','f_hand_date': '最后抄表日期','f_max_operate_date': '最后购气日期','f_sendsuccess': '表同步状态'
+    'f_aroundmeter': '左右表','f_whether_hairpin': '是否发卡','f_balance_amount': '表剩余金额','f_times': '写卡次数',
+    'f_fillcard_times': '补卡次数','f_hand_date': '最后抄表日期','f_sendsuccess': '表同步状态'
   },
 
   changemeterConfig: {

package/build/tmp/jar/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-