manage-client 3.2.210 → 3.2.211

package/src/filiale/huayin/sale.js

@@ -0,0 +1,8 @@
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
+  'change-meter-query': (resolve) => { require(['./ChangeMeterQuery'], resolve) }
+}
+exports.specialComp = specialComp
+

package/src/filiale/qianneng/BusinessManage.vue

@@ -13,6 +13,9 @@
     <tabs header="机表抄表查询" v-if="permission('机表抄表查询')">
       <handplan-query v-if="show.includes('机表抄表查询')" @deal-msg="dealMsg" :data="data"></handplan-query>
     </tabs>
+    <tabs header="物联网表抄表查询" v-if="permission('物联网表抄表查询')">
+      <web-handplan-query v-if="show.includes('物联网表抄表查询')" @deal-msg="dealMsg" :data="data"></web-handplan-query>
+    </tabs>
     <tabs header="免费送气查询" v-if="permission('免费送气查询')">
       <privilege-query v-if="show.includes('免费送气查询')" @deal-msg="dealMsg" :data="data"></privilege-query>
     </tabs>

package/src/filiale/qianneng/WebHandplanQuery.vue

@@ -117,26 +117,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_input_person"
                          condition="f_input_person like '%{}%'" placeholder='录入人员'>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">收费日期</label>
-                  <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.sellStartDate"
-                              :value.sync="model.sellStartDate"
-                              :format="'yyyy-MM-dd 00:00:00'"
-                              :show-reset-button="true"
-                              condition="f_sellinggas_operate_date >= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.sellEndDate"
-                              :value.sync="model.sellEndDate"
-                              :format="'yyyy-MM-dd 23:59:59'"
-                              :show-reset-button="true"
-                              condition="f_sellinggas_operate_date <= '{}'">
-                  </datepicker>
-                </div>
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
@@ -268,27 +248,12 @@
                 <th>
                   <nobr>用气金额</nobr>
                 </th>
-                <th>
-                  <nobr>优惠金额</nobr>
-                </th>
                 <th>
                   <nobr>上期余额</nobr>
                 </th>
-                <th>
-                  <nobr>账户支出</nobr>
-                </th>
-                <th>
-                  <nobr>账户存入</nobr>
-                </th>
                 <th>
                   <nobr>本期余额</nobr>
                 </th>
-                <th>
-                  <nobr>收费时间</nobr>
-                </th>
-                <th>
-                  <nobr>收费人员</nobr>
-                </th>
                 <th>
                   <nobr>冲正时间</nobr>
                 </th>
@@ -353,7 +318,7 @@
                   <nobr>抄表状态</nobr>
                 </th>
                 <th>
-                  <nobr>状态</nobr>
+                  <nobr>纪录状态</nobr>
                 </th>
                 <th>
                   <nobr>下发人员</nobr>
@@ -408,27 +373,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtfee}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_privilege_money}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_balance}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_newbalance}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_newcurbalance}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_curbalance}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_sellinggas_operate_date}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_sell_operator}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_corrhand_date}}</nobr>
               </td>
@@ -551,7 +501,7 @@
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     await self.$MagLoadParams.loadParam()
     await self.initParams()
-    await self.$getConfig(self, 'HandplanQuery')
+    await self.$getConfig(self, 'WebHandplanQuery')
     console.log('开始查询')
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
@@ -965,9 +915,6 @@
     },
     computed: {
 
-      banklist() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('银行名称')]
-      },
       getCondition() {
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
@@ -983,18 +930,12 @@
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-      accountsState() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('下账状态')]
-      },
       meterstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')]
       },
       handstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('表单状态')]
       },
-      // inputtor() {
-      //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
-      // },
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },

package/src/filiale/qianneng/WebmeterQuery.vue

@@ -30,9 +30,6 @@
     <tabs header="未用气查询" v-if="permission('未用气查询')">
       <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
     </tabs>
-    <tabs header="物联网表抄表查询" v-if="permission('物联网表抄表查询')">
-      <web-handplan-query v-if="show.includes('物联网表抄表查询')" @deal-msg="dealMsg" :data="data"></web-handplan-query>
-    </tabs>
     <tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">
       <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
     </tabs>

package/src/filiale/qianneng/exportConfig.js

@@ -64,9 +64,8 @@ export default{
   webhandplanConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额','f_meternumber': '表号', 'ym_data': '数据年月',
-    'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_newbalance': '账户支出', 'f_newcurbalance': '账户存入', 'f_sellinggas_operate_date': '收费时间',
-    'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态','f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
-    'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
+    'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
+    'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
     'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费','f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
     'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月'
   },

package/src/filiale/qianneng/sale.js

@@ -4,6 +4,8 @@ let specialComp = {
   'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) },
   'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
   'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) },
+  'web-handplan-query': (resolve) => { require(['./WebHandplanQuery'], resolve) },
+
   'gasloss-query': (resolve) => { require(['./GasLossQuery'], resolve) },
   // 表具查询
   'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },

package/src/filiale/qianneng/webmeterManage.js

@@ -2,7 +2,6 @@
 let specialComp = {
   'use-gas-statistics': (resolve) => { require(['./GasStatistics'], resolve) },
   'webmeter-query': (resolve) => { require(['./WebmeterQuery'], resolve) },
-  'web-handplan-query': (resolve) => { require(['./WebHandplanQuery'], resolve) },
 
 }
 exports.specialComp = specialComp

package/src/filiale/shanxian/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: 'item'
+        },
+        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/shanxian/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:'item'
+        },
+       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/shanxian/reportManage.js

@@ -2,10 +2,14 @@
 let specialComp = {
   // 收费查询
   'site-manager': (resolve) => { require(['./SiteManager'], resolve) },
+  //新增用户散列图
+  'bank-manager': (resolve) => { require(['./BankManager'], resolve) },
   // 付款方式饼图
   'paymentpie': (resolve) => {
     require(['./Paymentpie'], resolve)
   },
+  // 其他业务散列
+  'bussiness-type': (resolve) => { require(['./BussinessType'], resolve) }
 }
 exports.specialComp = specialComp