manage-client 3.3.84 → 3.3.85

package/package.json

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

package/src/filiale/WEINAN/ManageUserCount.vue

@@ -0,0 +1,321 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <p class="bg-info text-center" style="padding: 8px;">用户新增销户统计报表</p>
+        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
+              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties"
+                        v-model="model.f_gasproperties"
+                        :options='$parent.$parent.gaspropertyTypes' placeholder='请选择'
+                        condition=" f_gasproperties = '{}'"
+                        :value-single="true"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">客户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                        condition="f_user_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气价名称</label>
+              <v-select :value.sync="model.f_price_name"
+                        v-model="model.f_price_name"
+                        :options="$parent.$parent.getPricenames"
+                        condition="f_price_name = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气表品牌</label>
+              <v-select :value.sync="model.f_meter_brand"
+                        v-model="model.f_meter_brand"
+                        :options='$parent.$parent.meterbrands' placeholder='请选择'
+                        condition="f_meter_brand = '{}'"
+                        close-on-select></v-select>
+            </div>
+
+            <div  style = "float:right;">
+              <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+              <report-excel id='gasprice'></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: bold; text-align: left;">
+              <h3 style="text-align: center">用户新增销户统计报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <!--<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>-->
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans'  class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <!--<tfoot>-->
+          <!--<tr style="text-align: left">-->
+          <!--<th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: left;">-->
+          <!--收款人：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->
+          <!--运营部审核人：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->
+          <!--微信后台审核人：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->
+          <!--经手人：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->
+          <!--</th>-->
+          <!--</tr>-->
+          <!--</tfoot>-->
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+    <modal :show.sync="show" v-ref:modal small backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">输入文件名称</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+        <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {DataModel, HttpResetClass} from 'vue-client'
+  import co from 'co'
+
+  let saveFile = function * (self) {
+    // 线验证文件是否重名
+    let count = yield self.$resetpost('rs/sql/manageSingleTable',
+      {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+      {resolveMsg: null, rejectMsg: null})
+    if (count.data.length > 0) {
+      self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+      return
+    }
+    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+      f_outlets: this.$login.f.depname})
+    if (saveBack.data.status === 'succeed') {
+      self.show = false
+      self.filename = ''
+      // 后台保存完成，通知刷新
+      self.$dispatch('save-success', self.filename)
+    }
+  }
+
+  export default {
+    title: '用户新增销户统计报表',
+    props: ['data'],
+    data () {
+      return {
+        printTime: this.$login.toStandardTimeString(),
+        depresid: [],
+        userresid: [],
+        initres: {
+          org:[this.$login.f.orgid]
+        },
+        meterbrands: [],
+        getPricenames:[],
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        depname: '',
+        operatorname: '',
+        orgCondtionStr: '1=1',
+        model: new DataModel('rs/report/manageusercount', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          f_orgid: 'this.model.f_orgid',f_gasproperties: 'this.model.f_gasproperties'}),
+        reportStr: null,
+        show: false,
+        spans: ''
+      }
+    },
+    ready () {
+      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      this.initParams()
+      this.qijia()
+    },
+    methods: {
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.printTime = this.$login.toStandardTimeString()
+        this.orgCondtionStr='1=1'
+        if (this.f_orgid[0]) {
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
+        }
+        this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr
+        this.$refs.paged.search(args)
+      },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.f_orgid = obj.resids
+        console.log('this.f_orgid',this.f_orgid)
+        this.initParams()
+        this.qijia()
+      },
+      getdep (obj, val) {
+        this.depname = val[0]
+        this.userresid = obj
+        this.f_depid = obj
+      },
+      getuser ( obj, val) {
+        this.operatorname = val[0]
+        this.f_operatorid = obj
+      },
+      async initParams (condition) {
+        // 初始化气表品牌
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: '1=1',
+            tablename: 't_gasbrand',
+            groupitem: 'f_meter_brand',
+            orderitem: 'f_meter_brand',
+            items: 'f_meter_brand'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取气表品牌失败!'})
+        let brandArr = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          brandArr.push({label: row.f_meter_brand, value: row.f_meter_brand})
+        }
+        this.meterbrands = brandArr
+      },
+      async qijia (condition) {
+        // 初始化气价名称 t_stairprice 表中的 f_price_name 条件是f_state='有效'
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: "1=1 and f_state='有效' " + (condition==null ? '' : condition),
+            tablename: 't_stairprice',
+            groupitem: 'f_price_name',
+            orderitem: 'f_price_name',
+            items: 'f_price_name'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取气价名称失败!'})
+        let brandArr1 = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          brandArr1.push({label: row.f_price_name, value: row.f_price_name})
+        }
+        this.getPricenames = brandArr1
+      },
+      // 根据文件路径获取储存的报表内容
+      getFileContent (path) {
+        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.reportStr = res.data.filecontent
+          this.model.state = '正确'
+        })
+      },
+      confirm () {
+        if (!this.filename || this.filename === '') {
+          this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
+        }
+        let saveGen = saveFile(this)
+        co(saveGen)
+      },
+      close () {
+        this.show = false
+      },
+      // 将报表保存成文件
+      confirmReport () {
+        this.show = true
+        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+      }
+    },
+    watch: {
+      'data' (val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      },
+      'model.data' (val) {
+        let len=0
+        let a=val.split('</tr>')
+        for(let i=0;i<a.length;i++){
+          if(a[i].split('</td>').length-1>len){
+            len=a[i].split('</td>').length-1
+          }
+          continue
+        }
+        this.spans = len
+      }
+    },
+    computed: {
+      gaspropertyTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

package/src/filiale/WEINAN/config/exportConfig.js

@@ -91,11 +91,11 @@ export default{
   },
   sellPeopleConfig: {
     'f_operator': '收费员', 'f_oughtfee': '燃气费', 'f_yucun': '预存款', 'f_other_fee': '其他费', 'f_number': '销售笔数', 'f_cal_collection': '冲正金额',
-    'f_collection': '实收金额', 'qifei_num': '气费笔数','qifei_fee': '气费金额','yucun_num': '预存笔数','yucun_fee': '预存金额', 'tuifei_num': '退费笔数', 'tuifei_fee': '退费金额','f_delaypay': '已交滞纳金', 'f_heji': '合计金额'
+    'f_collection': '实收金额', 'qifei_num': '气费笔数','qifei_fee': '气费金额','yucun_num': '预存笔数','yucun_fee': '预存金额', 'tuifei_num': '退费笔数', 'tuifei_fee': '退费金额','f_delaypay': '已交违约金', 'f_heji': '合计金额'
   },
   sellOrgnameConfig: {
     'f_orgname': '分公司', 'f_oughtfee': '燃气费', 'f_yucun': '预存款', 'f_other_fee': '其他费', 'f_number': '销售笔数', 'f_cal_collection': '冲正金额',
-    'f_collection': '实收金额', 'qifei_num': '气费笔数','qifei_fee': '气费金额','yucun_num': '预存笔数','yucun_fee': '预存金额', 'tuifei_num': '退费笔数', 'tuifei_fee': '退费金额','f_delaypay': '已交滞纳金', 'f_heji': '合计金额'
+    'f_collection': '实收金额', 'qifei_num': '气费笔数','qifei_fee': '气费金额','yucun_num': '预存笔数','yucun_fee': '预存金额', 'tuifei_num': '退费笔数', 'tuifei_fee': '退费金额','f_delaypay': '已交违约金', 'f_heji': '合计金额'
   },
   handPeopleConfig: {
     'f_inputtor': '抄表员', 'f_user_number': '应抄户数', 'f_no_hand': '未抄户数', 'f_out_hand': '已抄无用量',
@@ -117,7 +117,7 @@ export default{
     'f_user_phone': '客户电话','f_rent_phone': '备用电话','f_inputtor': '抄表员','f_book_name': '抄表册','f_user_type': '客户类型',
     'f_gasproperties': '用气性质', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_oughtamount': '用气量',
     'f_oughtfee': '用气金额','f_operate_date': '缴费时间', 'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费',
-    'overdue': '滞纳金', 'f_garbage_fee': '附加费','f_last_tablebase': '上期抄表底数','f_balance': '上期余额',
+    'overdue': '违约金', 'f_garbage_fee': '附加费','f_last_tablebase': '上期抄表底数','f_balance': '上期余额',
     'f_oughtfee_all': '合计欠费金额','f_cost_type':'缴费方式','f_meter_type':'气表类型'
   },
   arrearsGYConfig: {
@@ -238,8 +238,8 @@ export default{
   UserSellHeadDetailConfig: {
     'f_userinfo_code': '用户编号','f_user_name':'用户名称','f_address':'用户地址', 'f_balance': '期初余额',
     'f_collection':'实收金额','f_m_fee':'免交金额','f_t_fee':'退费','f_b_fee':'补费','f_k_fee':'扣费',
-    'f_oughtamount':'应收气费','f_debt_money':'已收气费','f_w_money':'未收气费','f_delaypay':'已收滞纳金',
-    'f_reduction_fee':'滞纳金减免','f_h_fee':'超用收费','f_curbalance':'期末余额','f_x_balance':'最新余额'
+    'f_oughtamount':'应收气费','f_debt_money':'已收气费','f_w_money':'未收气费','f_delaypay':'已收违约金',
+    'f_reduction_fee':'违约金减免','f_h_fee':'超用收费','f_curbalance':'期末余额','f_x_balance':'最新余额'
   },
   TransactionSummaryConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_type': '类型', 'f_price': '气价',
@@ -263,7 +263,7 @@ export default{
   batchBankConfig: {
     'f_userinfo_code': '客户编号', 'f_userinfo_id': '用户编号', 'f_user_phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',
     'f_bank_accopen': '银行户名', 'f_bank_pay_number': '缴费编号', 'f_bank_account': '银行开户账号', 'f_paper_account': '开户行及账号',
-    'f_bank_name': '银行名称', 'f_oughtfee': '欠费金额','overdue': '滞纳金'
+    'f_bank_name': '银行名称', 'f_oughtfee': '欠费金额','overdue': '违约金'
   },
   batchBankConfig2: {
     'f_userinfo_code': '客户编号', 'f_userinfo_id': '用户编号', 'phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',
@@ -510,7 +510,7 @@ monthGasConfig: {
   },
   overduelistConfig:{
     'f_month':'月份','f_last_balance':'期初余额','f_account':'本期发生额','f_wechat_pay':'微信','f_money_pay':'现金',
-    'f_reduction':'本期减免','f_bank_pay':'银行转账','f_sum_pay':'滞纳金合计','f_balance':'期末余额'
+    'f_reduction':'本期减免','f_bank_pay':'银行转账','f_sum_pay':'违约金合计','f_balance':'期末余额'
   },
   sellinggaslistConfig:{
     'f_month':'月份','f_last_balance':'期初余额','f_account':'本期发生额','f_wechat_pay':'微信',

package/src/filiale/WEINAN/reportManage.js

@@ -11,5 +11,7 @@ export default function () {
   Vue.component('manage-company-gas-summary', (resolve) => { require(['./ManageCompanyGasSummary'], resolve) })
   Vue.component('manage-company-gas-manage', (resolve) => { require(['./ManageCompanyGasManage'], resolve) })
   Vue.component('manage-company-gas-detail', (resolve) => { require(['./ManageCompanyGasDetail'], resolve) })
+  // 报表展示组件（用户新增销户统计报表）
+  Vue.component('manage-user-count', (resolve) => { require(['./ManageUserCount'], resolve) })
 }
 

package/src/filiale/aode/exportConfig.js

@@ -25,7 +25,7 @@ export default{
     'id': '收费编号', 'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_meternumber': '表号','f_times':'购气次数',
     'f_pregas': '气量','f_preamount': '金额','f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
     'f_curbalance': '本期结余','f_type': '收费类型','f_payment': '付款方式','f_state': '状态','f_operate_date': '收费日期',
-    'f_delaypay': '滞纳金','f_comments': '备注','f_operator': '操作员','f_depname': '部门','f_orgname': '公司','f_rest_date':'所属年月',
+    'f_delaypay': '违约金','f_comments': '备注','f_operator': '操作员','f_depname': '部门','f_orgname': '公司','f_rest_date':'所属年月',
     'f_yucun':'预存金额','f_card_id':'卡号','f_stairamount1':"一阶气量",'f_stair1price':"一阶单价",'f_stair1fee':"一阶气费",
     'f_stair2amount':"二阶气量",'f_stair2price':"二阶单价",'f_stair2fee':"二阶气费",
     'f_stair3amount':"三阶气量",'f_stair3price':"三阶单价",'f_stair3fee':"三阶气费",
@@ -43,7 +43,7 @@ export default{
     'f_userinfo_code': '客户编号', 'f_userinfo_id': '户编号', 'f_user_name': '客户名称', 'f_user_type': '客户类型',
     'f_gasproperties': '用气性质', 'f_residential_area': '小区名称', 'f_address': '客户地址', 'f_user_phone': '客户电话',
     'f_rent_phone': '备用电话', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费时间', 'f_oughtamount': '用气量',
-    'f_oughtfee': '用气金额', 'f_debt_money': '已交金额', 'f_oughtfee_new': '气费金额', 'overdue': '滞纳金', 'f_garbage_fee': '附加费',
+    'f_oughtfee': '用气金额', 'f_debt_money': '已交金额', 'f_oughtfee_new': '气费金额', 'overdue': '违约金', 'f_garbage_fee': '附加费',
     'f_oughtfee_all': '合计欠费金额'
   },
   sellingHandConfig:{
@@ -238,7 +238,7 @@ export default{
   },
   overduelistConfig:{
     "f_month":"月份","f_last_balance":"期初余额","f_account":"本期发生额","f_wechat_pay":"微信","f_money_pay":"现金",
-    "f_reduction":"本期减免","f_bank_pay":"银行转账","f_sum_pay":"滞纳金合计","f_balance":"期末余额","f_comments":"备注"
+    "f_reduction":"本期减免","f_bank_pay":"银行转账","f_sum_pay":"违约金合计","f_balance":"期末余额","f_comments":"备注"
   },
   sellinggaslistConfig:{
     "f_month":"月份","f_last_balance":"期初余额","f_account":"本期发生额","f_wechat_pay":"微信",

package/src/filiale/ceshi/ArrearsQuery.vue

@@ -238,7 +238,7 @@
                   <nobr>应交气费</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>违约金</nobr>
                 </th>
                 <th>
                   <nobr>附加费</nobr>
@@ -347,7 +347,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/ceshi/exportConfig.js

@@ -43,7 +43,7 @@ export default{
     'id': '收费编号', 'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_meternumber': '表号','f_times':'购气次数',
     'f_pregas': '气量','f_preamount': '金额','f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
     'f_curbalance': '本期结余','f_type': '收费类型','f_payment': '付款方式','f_state': '状态','f_operate_date': '收费日期',
-    'f_delaypay': '滞纳金','f_comments': '备注','f_operator': '操作员','f_depname': '部门','f_orgname': '公司','f_rest_date':'所属年月',
+    'f_delaypay': '违约金','f_comments': '备注','f_operator': '操作员','f_depname': '部门','f_orgname': '公司','f_rest_date':'所属年月',
     'f_yucun':'预存金额','f_card_id':'卡号','f_stairamount1':"一阶气量",'f_stair1price':"一阶单价",'f_stair1fee':"一阶气费",
     'f_stair2amount':"二阶气量",'f_stair2price':"二阶单价",'f_stair2fee':"二阶气费",
     'f_stair3amount':"三阶气量",'f_stair3price':"三阶单价",'f_stair3fee':"三阶气费",
@@ -61,7 +61,7 @@ export default{
     'f_userinfo_code': '客户编号', 'f_userinfo_id': '户编号', 'f_user_name': '客户名称', 'f_user_type': '客户类型',
     'f_gasproperties': '用气性质', 'f_residential_area': '小区名称', 'f_address': '客户地址', 'f_user_phone': '客户电话',
     'f_rent_phone': '备用电话', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费时间', 'f_oughtamount': '用气量',
-    'f_oughtfee': '用气金额', 'f_debt_money': '已交金额', 'f_oughtfee_new': '气费金额', 'overdue': '滞纳金', 'f_garbage_fee': '附加费',
+    'f_oughtfee': '用气金额', 'f_debt_money': '已交金额', 'f_oughtfee_new': '气费金额', 'overdue': '违约金', 'f_garbage_fee': '附加费',
     'f_oughtfee_all': '合计欠费金额'
   },
   sellingHandConfig:{
@@ -256,7 +256,7 @@ export default{
   },
   overduelistConfig:{
     "f_month":"月份","f_last_balance":"期初余额","f_account":"本期发生额","f_wechat_pay":"微信","f_money_pay":"现金",
-    "f_reduction":"本期减免","f_bank_pay":"银行转账","f_sum_pay":"滞纳金合计","f_balance":"期末余额","f_comments":"备注"
+    "f_reduction":"本期减免","f_bank_pay":"银行转账","f_sum_pay":"违约金合计","f_balance":"期末余额","f_comments":"备注"
   },
   sellinggaslistConfig:{
     "f_month":"月份","f_last_balance":"期初余额","f_account":"本期发生额","f_wechat_pay":"微信",

package/src/filiale/gaomi/ChargeQuery.vue

@@ -346,7 +346,7 @@
                   <nobr>金额</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>违约金</nobr>
                 </th>
                 <th>
                   <nobr>燃气费</nobr>
@@ -677,7 +677,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_preamount}}

package/src/filiale/gaomi/config/exportConfig.js

@@ -67,7 +67,7 @@ export default{
     'f_gasproperties': '用气性质', 'f_meternumber': '表号','f_meter_brand': '气表品牌','f_times':'购气次数',
     'f_pregas': '气量','fee': '金额','f_preamount': '燃气费','f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
     'f_curbalance': '本期结余','f_type': '收费类型','f_payment': '付款方式','f_bank_type': '支付渠道','f_state': '状态','f_operate_date': '收费日期',
-    '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':"三阶气费",
@@ -91,11 +91,11 @@ export default{
   },
   sellPeopleConfig: {
     'f_operator': '收费员', 'f_oughtfee': '燃气费', 'f_yucun': '预存款', 'f_other_fee': '其他费', 'f_number': '销售笔数', 'f_cal_collection': '冲正金额',
-    'f_collection': '实收金额', 'qifei_num': '气费笔数','qifei_fee': '气费金额','yucun_num': '预存笔数','yucun_fee': '预存金额', 'tuifei_num': '退费笔数', 'tuifei_fee': '退费金额','f_delaypay': '已交滞纳金', 'f_heji': '合计金额'
+    'f_collection': '实收金额', 'qifei_num': '气费笔数','qifei_fee': '气费金额','yucun_num': '预存笔数','yucun_fee': '预存金额', 'tuifei_num': '退费笔数', 'tuifei_fee': '退费金额','f_delaypay': '已交违约金', 'f_heji': '合计金额'
   },
   sellOrgnameConfig: {
     'f_orgname': '分公司', 'f_oughtfee': '燃气费', 'f_yucun': '预存款', 'f_other_fee': '其他费', 'f_number': '销售笔数', 'f_cal_collection': '冲正金额',
-    'f_collection': '实收金额', 'qifei_num': '气费笔数','qifei_fee': '气费金额','yucun_num': '预存笔数','yucun_fee': '预存金额', 'tuifei_num': '退费笔数', 'tuifei_fee': '退费金额','f_delaypay': '已交滞纳金', 'f_heji': '合计金额'
+    'f_collection': '实收金额', 'qifei_num': '气费笔数','qifei_fee': '气费金额','yucun_num': '预存笔数','yucun_fee': '预存金额', 'tuifei_num': '退费笔数', 'tuifei_fee': '退费金额','f_delaypay': '已交违约金', 'f_heji': '合计金额'
   },
   handPeopleConfig: {
     'f_inputtor': '抄表员', 'f_user_number': '应抄户数', 'f_no_hand': '未抄户数', 'f_out_hand': '已抄无用量',
@@ -240,8 +240,8 @@ export default{
   UserSellHeadDetailConfig: {
     'f_userinfo_code': '用户编号','f_user_name':'用户名称','f_address':'用户地址', 'f_balance': '期初余额',
     'f_collection':'实收金额','f_m_fee':'免交金额','f_t_fee':'退费','f_b_fee':'补费','f_k_fee':'扣费',
-    'f_oughtamount':'应收气费','f_debt_money':'已收气费','f_w_money':'未收气费','f_delaypay':'已收滞纳金',
-    'f_reduction_fee':'滞纳金减免','f_h_fee':'超用收费','f_curbalance':'期末余额','f_x_balance':'最新余额'
+    'f_oughtamount':'应收气费','f_debt_money':'已收气费','f_w_money':'未收气费','f_delaypay':'已收违约金',
+    'f_reduction_fee':'违约金减免','f_h_fee':'超用收费','f_curbalance':'期末余额','f_x_balance':'最新余额'
   },
   TransactionSummaryConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_type': '类型', 'f_price': '气价',
@@ -265,7 +265,7 @@ export default{
   batchBankConfig: {
     'f_userinfo_code': '客户编号', 'f_userinfo_id': '用户编号', 'f_user_phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',
     'f_bank_accopen': '银行户名', 'f_bank_pay_number': '缴费编号', 'f_bank_account': '银行开户账号', 'f_paper_account': '开户行及账号',
-    'f_bank_name': '银行名称', 'f_oughtfee': '欠费金额','overdue': '滞纳金'
+    'f_bank_name': '银行名称', 'f_oughtfee': '欠费金额','overdue': '违约金'
   },
   batchBankConfig2: {
     'f_userinfo_code': '客户编号', 'f_userinfo_id': '用户编号', 'phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',
@@ -490,7 +490,7 @@ monthGasConfig: {
   },
   overduelistConfig:{
     "f_month":"月份","f_last_balance":"期初余额","f_account":"本期发生额","f_wechat_pay":"微信","f_money_pay":"现金",
-    "f_reduction":"本期减免","f_bank_pay":"银行转账","f_sum_pay":"滞纳金合计","f_balance":"期末余额"
+    "f_reduction":"本期减免","f_bank_pay":"银行转账","f_sum_pay":"违约金合计","f_balance":"期末余额"
   },
   sellinggaslistConfig:{
     "f_month":"月份","f_last_balance":"期初余额","f_account":"本期发生额","f_wechat_pay":"微信",

package/src/filiale/gongyi/sale/businessquery/exportConfig.js

@@ -12,6 +12,6 @@ export default {
   batchBankConfig: {
     'f_userinfo_code': '客户编号', 'f_userinfo_id': '用户编号', 'f_user_phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',
     'f_bank_accopen': '银行户名', 'f_bank_pay_number': '缴费编号', 'f_bank_account': '银行开户账号', 'f_paper_account': '开户行及账号',
-    'f_bank_name': '银行名称', 'f_oughtfee': '欠费金额', 'overdue': '滞纳金'
+    'f_bank_name': '银行名称', 'f_oughtfee': '欠费金额', 'overdue': '违约金'
   }
 }

package/src/filiale/jingzhou/ChargeQuery.vue

@@ -357,7 +357,7 @@
                   <nobr>上期结余</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>违约金</nobr>
                 </th>
                 <!--<th>-->
                 <!--&lt;!&ndash;                  <nobr>所属年月</nobr>&ndash;&gt;-->
@@ -682,7 +682,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_preamount}}

package/src/filiale/jingzhou/HandplanQuery.vue

@@ -321,7 +321,7 @@
                   <nobr>用气量</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>违约金</nobr>
                 </th>
                 <th>
                   <nobr>用气金额</nobr>