manage-client 3.2.140 → 3.2.144

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/qianneng/ArrearsQuery.vue

@@ -325,7 +325,7 @@
                   <nobr>应交气费</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>违约金</nobr>
                 </th>
                 <th>
                   <nobr>附加费</nobr>
@@ -465,7 +465,7 @@
               气费金额合计:&emsp;{{sumsmodel.f_oughtfee_new}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              滞纳金合计:&emsp;{{sumsmodel.overdue}}
+              违约金合计:&emsp;{{sumsmodel.overdue}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               附加费合计:&emsp;{{sumsmodel.f_garbage_fee}}

package/src/filiale/qianneng/ChargeQuery.vue

@@ -377,7 +377,7 @@
                   <nobr>金额</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>违约金</nobr>
                 </th>
 <!--                <th>-->
 <!--                  <nobr>燃气费</nobr>-->
@@ -733,7 +733,7 @@
               应交金额合计:&emsp;{{sumsmodel.fee}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              滞纳金合计:&emsp;{{sumsmodel.f_delaypay}}
+              违约金合计:&emsp;{{sumsmodel.f_delaypay}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               账户支出合计:&emsp;{{sumsmodel.f_newbalance}}

package/src/filiale/qianneng/HandplanQuery.vue

@@ -382,7 +382,7 @@
                   <nobr>用气量</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>违约金</nobr>
                 </th>
                 <th>
                   <nobr>违约金起始时间</nobr>

package/src/filiale/qianneng/MeterQuery.vue

@@ -198,6 +198,19 @@
                               condition="isbgl = '{}'"
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">自动阀控</label>
+                    <v-select
+                      placeholder='自动阀控'
+
+                      :value.sync="model.f_network_valve"
+                      style="width:60%"
+                      v-model="model.f_network_valve"
+                      :options='$parent.$parent.networkvalves'
+                      close-on-select
+                      condition="f_networkvalve='{}'">
+                    </v-select>
+                  </div>
                   <!--<div class="col-sm-2 form-group">-->
                     <!--<label class="font_normal_body" title="旧客户编号">档案编号</label>-->
                     <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"-->
@@ -379,6 +392,9 @@
                   <th>
                     <nobr>防盗卡号2</nobr>
                   </th>
+                  <th>
+                    <nobr>自动阀控</nobr>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -475,6 +491,9 @@
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_defendcard_two}}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_networkvalve}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>
@@ -624,7 +643,8 @@
         tempfalg :false,
         lastorgstr:'',
         issecond: [{label:'是',value:" = '二次挂表'"},{label:'否',value:" <> '二次挂表'"}],
-        usetype:this.$appdata.getParam('使用类型')
+        usetype:this.$appdata.getParam('使用类型'),
+        networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : []
       }
     },
     ready() {

package/src/filiale/qianneng/exportConfig.js

@@ -6,7 +6,7 @@ export default{
     'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_meter_classify': '气表类型',
     'f_cost_type': '缴费类型', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_last_tablebase': '上期抄表底数',
     'f_tablebase': '本期抄表底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_operate_date': '缴费时间',
-    'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费', 'overdue': '滞纳金', 'f_garbage_fee': '附加费',
+    'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费', 'overdue': '违约金', 'f_garbage_fee': '附加费',
     'f_balance': '上期余额', 'f_oughtfee_all': '合计欠费', 'f_comments': '备注'
   },
   chargeConfig: {
@@ -14,14 +14,14 @@ export default{
     'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余', 'f_newbalance': '账户支出', 'f_newcurbalance': '账户存入',
     'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期', 'f_serial_id': '流水号',
-    'f_delaypay': '滞纳金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
+    'f_delaypay': '违约金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
     'f_yucun': '预存金额', 'f_card_id': '卡号', 'f_stairamount1': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
     'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员'
   },
   handplanConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_meternumber': '表号', 'ym_data': '数据年月',
-    'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '滞纳金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
+    'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '违约金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
     'f_actual_arrears': '欠费金额', 'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_newbalance': '账户支出', 'f_newcurbalance': '账户存入',
     'f_accounts_state': '下账状态', 'f_sellinggas_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
     'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_audit_date': '审核日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态', 'f_end_date': '违约金起始时间',

package/src/filiale/rongcheng/RecordInfoQuery.vue

@@ -516,7 +516,7 @@
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
   import defaultPrint from './../../components/sale/config/DefaultPrint'
-  import exportConfig from './../../components/sale/config/exportConfig'
+  import exportConfig from './exportConfig'
 
   let readySomething = async function (self) {
     self.initParams()

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/src/reportManage.js

@@ -599,6 +599,16 @@ export default function (filiale) {
   Vue.component('market-month-gas', (resolve) => {
     require(['./components/SellReport/MarketMonthgas'], resolve)
   })
+  Vue.component('left-chart', (resolve) => {
+    require(['./components/SellReport/LeftChart'], resolve)
+  })
+  Vue.component('market-month-chart', (resolve) => {
+    require(['./components/SellReport/MarketMonthChart'], resolve)
+  })
+  // 卡表抄表气价报表
+  Vue.component('card-applys-gas', (resolve) => {
+    require(['./components/SellReport/Cardapplysgas'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale

package/src/saleManage.js

@@ -174,6 +174,10 @@ export default function (filiale) {
   Vue.component('residential-query', (resolve) => {
     require(['./components/sale/businessquery/ResidentialQuery'], resolve)
   })
+  // 小区汇总（卡表）
+  Vue.component('residential-card-query', (resolve) => {
+    require(['./components/sale/businessquery/ResidentialCardQuery'], resolve)
+  })
   // 小区欠费汇总（机表）
   Vue.component('residential-arrears-query', (resolve) => {
     require(['./components/sale/businessquery/ResidentialArrearsQuery'], resolve)
@@ -582,6 +586,8 @@ export default function (filiale) {
   Vue.component('report-detail', (resolve) => { require(['./components/sale/businessquery/reportDetail'], resolve) })
   // 分公司选择新组件,默认全选
   Vue.component('res-select-new', (resolve) => { require(['./filiale/tongchuan/ResSelectNew'], resolve) })
+  // 重点用户用气排行查询
+  Vue.component('key-user-gas-ranking', (resolve) => { require(['./components/sale/businessquery/AccountQuery/keyUserGasRanking'], resolve) })
   // 分公司特殊页面注册替换
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/sale`).specialComp

package/build/tmp/jar/MANIFEST.MF

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