manage-client 3.2.140 → 3.2.144

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

@@ -0,0 +1,373 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">选择小区</label>
+                  <v-select :value.sync="model.f_residential_area" :value-single="true"
+                            class="select_list select"
+                            style="width: 60%"
+                            v-model="model.f_residential_area"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            condition="ud.f_residential_area = '{}'"
+                            close-on-select search="true">
+                  </v-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="residentialCardQuery"
+                                template-name='小区综合查询(卡表)导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                               :defaultfield="$parent.$parent.defaultfield"
+                              titletable="小区综合查询(卡表)导出"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
+                  <v-select :value.sync="model.f_inputtor"
+                            v-model="model.f_inputtor"
+                            :options='$parent.$parent.inputtores' placeholder='请选择'
+                            condition="f_inputtor = '{}'"
+                            close-on-select :search="false">
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
+                            :options='$parent.$parent.meterbooks' placeholder='抄表册'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_meter_book_num = '{}'"></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand" multiple
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand in {}"
+                            close-on-select></v-select>
+                </div>
+                <!--<div class="col-sm-2 form-group" v-for="con in $parent.$parent.config.conditions">-->
+                  <!--<label class="font_normal_body">{{con.label}}</label>-->
+                  <!--<input  type="text" style="width:60%" class="input_search" v-model="model[con.value]"-->
+                          <!--condition= " '{}' = {{con.value}}" placeholder="{{con.label}}">-->
+                <!--</div>-->
+              </div>
+            </div>
+          </criteria>
+          <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+            <template partial='head'>
+              <tr>
+                <th v-for="(key,value ) in $parent.$parent.$parent.config.pageFilds" ><nobr>{{value}}</nobr></th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;" v-for="(key,value ) in $parent.$parent.$parent.config.pageFilds"><nobr>{{row[key]}}</nobr></td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              户数合计:&emsp;{{sumsmodel.hushu}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              新建户数合计:&emsp;{{sumsmodel.xinhushu}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              用气金额合计:&emsp;{{sumsmodel.f_pregas}}
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList, HttpResetClass} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from "../config/exportConfig";
+  import plugins from "../../../plugins/GetLoginInfoService";
+
+  let readySomething = async function (self) {
+    self.initParams()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    //加载抄表册
+    self.$MagGetSaleParam.initinputtor();
+    self.getinputtores();
+    self.initmeterbook();
+
+
+
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    // await self.$refs.paged.$refs.cri.search()
+    await self.$MagLoadParams.loadParam()
+    await self.$getConfig(self, 'ResidentialCardQuery')
+
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+
+  export default {
+    title: '小区汇总',
+    data() {
+      let model = new PagedList('rs/sql/residentialCardQuery', 20, {
+        startdate: 'this.model.startDate',
+        enddate: 'this.model.endDate'
+      },{
+        hushu:0,
+        xinhushu:0,
+        f_pregas:0
+      })
+      model.f_filialeid = this.$login.f.orgid
+      return {
+        //默认打印列
+        defaultfield: [],
+        config: {
+          pageFilds:{
+            'f_residential_area': '小区', 'hushu': '户数', 'xinhushu': '新建户数',  'f_pregas': '购气量'
+          },
+          defaultPrint: ['xinhushu', 'hushu', 'f_pregas']
+        },
+        data: {},
+        other: [],
+        footer: [],
+        meterbrands: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        model: model,
+        criteriaShow: false,
+        f_filialeid: this.$login.f.orgid,
+        orgid: [this.$login.f.orgid],
+        //小区
+        residentialArea: [],
+        orgCondtionStr: '',
+        //合计数据
+        sumsmodel:{},
+        meterbooks:[{label: '全部',value: ''}],  //抄表册
+        inputtores:[{label: '全部',value: ''}],
+        allorgid:[],
+        tempfalg :false,
+        lastorgstr:'',
+      }
+    },
+    ready() {
+      this.getaddress()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      async initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      },
+      async initmeterbook(orgstr){
+        if(orgstr == null ){
+          orgstr = this.f_filialeid;
+        }
+        //获取新的抄表册,先去清理所有的抄表册
+        this.$MagGetSaleParam.meterbooks = [];
+        //开始加载新的抄表册
+        await this.$MagGetSaleParam.loadMeterBook(orgstr)
+        this.meterbooks = [{label: '全部', value: ''}, ...this.$MagGetSaleParam.getMeterBooks()]
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.inputtores = [];
+        this.inputtores.push({label: "全部", value: ""})
+        if(this.allorgid!=null){
+          this.allorgid.forEach((res)=>{
+            this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
+          })
+        }
+      },
+      getinputtores() {
+        // 获取抄表员
+        let rs = []
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
+        }
+
+        return [{label: '全部', value: ''}, ...rs]
+      },
+      //加载抄表册
+      loadMeterBooks(){
+        this.meterbooks = [{label: '全部', value: ''}, ...this.$MagGetSaleParam.getMeterBooks()]
+      },
+      getotherfooter() {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other = [];
+        this.footer = [];
+        let exportdata = this.getCondition;
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData = [], exportfield = this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      async getaddress() {
+        console.log('开始获取小区')
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区', data)
+        let house = [{label: '全部', value: ''}]
+        for (let row of data.data) {
+          console.log('开始保存小区')
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
+      selfSearch(args) {
+        // if (this.orgCondtionStr)
+        //   args.condition = `${args.condition}` + 'and f_filialeid in ' + this.orgCondtionStr
+        // else
+        //   args.condition = `${args.condition}` + 'and f_filialeid in ' + '(' + this.$login.f.orgid + ')'
+        debugger
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      async getRes(condition,obj) {
+        console.log(condition,"========")
+        this.orgCondtionStr = condition
+
+      },
+      clear() {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      }
+    },
+    watch: {
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+      async 'orgCondtionStr'(val) {
+        this.$refs.paged.$refs.cri.model.f_inputtor = []
+        this.$refs.paged.$refs.cri.model.f_meter_book = []
+        this.meterbooks = [{label: '全部',value: ''}];
+        if(this.lastorgstr != val){
+          this.tempfalg = true;
+          this.lastorgstr = val;
+        }
+        if(this.tempfalg && val != null && val!=''  && val.indexOf("(")>-1){
+          this.tempfalg = false;
+          let a = val.substring(val.indexOf("(")+2)
+          await this.initmeterbook(a.substring(0,a.indexOf(")")-1));
+        }
+        let res = val.match(/'(.*?)'/)
+        if (res) {
+          this.f_filialeid = res[1]
+          if(res.input !=null){
+            let resorgid = res.input.substring(res.input.indexOf("'"));
+            if(resorgid!= null && resorgid!=''){
+              resorgid = resorgid.substring(0,resorgid.lastIndexOf("'")+1);
+              // resorgid = resorgid.replaceAll("'","");
+              resorgid = resorgid.replace(/'/g,"");
+              this.allorgid = resorgid.split(",")
+            }
+          }
+          this.updateParams()
+        }
+      }
+    },
+    computed: {
+
+      getCondition() {
+        var con = ""
+        if (this.orgCondtionStr) {
+          con = `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr
+        } else {
+          con = `${this.$refs.paged.$refs.cri.condition}`
+        }
+        return {
+          startdate: this.$refs.paged.$refs.cri.model.startDate,
+          enddate: this.$refs.paged.$refs.cri.model.endDate,
+          condition: con
+        }
+      },
+      getfield() {
+        return exportConfig.ResidentialQuery
+      }
+    }
+
+  }
+</script>

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

@@ -209,7 +209,7 @@
                   <nobr>退费金额</nobr>
                 </th>
                 <th>
-                  <nobr>已交滞纳金</nobr>
+                  <nobr>已交违约金</nobr>
                 </th>
                 <th title="合计金额 = 实收金额 + 其他费">
                   <nobr>合计金额</nobr>
@@ -309,7 +309,7 @@
               退费金额合计:&emsp;{{sumsmodel.tuifei_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_heji}}

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

@@ -212,7 +212,7 @@
                   <nobr>退费金额</nobr>
                 </th>
                 <th>
-                  <nobr>已交滞纳金</nobr>
+                  <nobr>已交违约金</nobr>
                 </th>
                 <th title="合计金额 = 实收金额 + 其他费">
                   <nobr>合计金额</nobr>
@@ -312,7 +312,7 @@
               退费金额合计:&emsp;{{sumsmodel.tuifei_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_heji}}

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

@@ -152,10 +152,10 @@
                   <nobr>未收气费</nobr>
                 </th>
               <th>
-                  <nobr>已收滞纳金</nobr>
+                  <nobr>已收违约金</nobr>
                 </th>
               <th>
-                  <nobr>滞纳金减免</nobr>
+                  <nobr>违约金减免</nobr>
                 </th>
               <th>
                   <nobr>超用收费</nobr>
@@ -262,10 +262,10 @@
               未收合计:&emsp;{{sumsmodel.f_w_money}}
             </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_reduction_fee}}
+              违约金减免合计:&emsp;{{sumsmodel.f_reduction_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_h_fee}}

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

@@ -51,7 +51,7 @@ export default{
     'f_balance_amount': '表上余额', 'f_user_type': '客户类型', 'f_usetype': '使用类型', 'f_gasproperties': '用气性质',
     'f_meternumber': '表号', 'f_card_id': '卡号', 'f_price_name': '气价名称', 'value': '气价详情', 'f_meter_brand': '气表品牌',
     'f_meter_style': '气表型号', 'f_inputtor': '户管员', 'f_gas_person': '通气人', 'f_gas_date': '通气时间',
-    'f_input_date': '建表时间', 'f_table_state': '气表状态', 'isbgl': '是否壁挂炉'
+    'f_input_date': '建表时间', 'f_table_state': '气表状态', 'isbgl': '是否壁挂炉', 'f_networkvalve': '自动阀控'
   },
   ResidentialQuery: {
     'f_residential_area': '小区', 'hushu': '户数', 'xinhushu': '新建户数', 'f_oughtfee': '用气金额', 'f_oughtamount': '用气量',
@@ -90,7 +90,7 @@ export default{
     'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数', 'f_price_name': '气价名称',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', '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_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': '抄表员','f_residential_area':'小区','f_serial_number':'业务单号'
@@ -118,11 +118,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': '已抄无用量',
@@ -147,8 +147,8 @@ export default{
 
   ProceedsOperConfig: {
     'f_operate_date': '日期', 'c': '售气笔数', 'f_pregas': '售气气量', 'f_preamount': '售气金额',
-    'f_balance': '上期结余', 'f_curbalance': '本期结余', 'f_delaypay': '气费滞纳金',
-    'f_returnfee': '退费', 'f_czpregas': '冲正气量', 'f_czpreamount': '冲正金额', 'f_czdelaypay': '冲正滞纳金',
+    'f_balance': '上期结余', 'f_curbalance': '本期结余', 'f_delaypay': '气费违约金',
+    'f_returnfee': '退费', 'f_czpregas': '冲正气量', 'f_czpreamount': '冲正金额', 'f_czdelaypay': '冲正违约金',
     'fkcardnum': '发卡数', 'f_fkcardfees': '发卡费', 'gc': '其他数', 'f_gmoney': '其他费', 'cardnum': '补卡数',
     'f_cardfees': '补卡费', 'f_collection': '实收金额'
   },
@@ -169,7 +169,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_tablebase': '本期抄表底数', 'f_balance': '上期余额',
+    'overdue': '违约金', 'f_garbage_fee': '附加费', 'f_last_tablebase': '上期抄表底数', 'f_tablebase': '本期抄表底数', 'f_balance': '上期余额',
     'f_oughtfee_all': '合计欠费金额','f_oughtfee_col': '实际欠费金额', 'f_cost_type': '缴费方式', 'f_meter_type': '气表类型'
   },
   areaChargeQueryConfig: {
@@ -224,7 +224,7 @@ export default{
     'f_balance_amount': '表剩余金额', 'f_times': '写卡次数',
     'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型'
     , 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
-    'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息'
+    'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控'
   },
 
   compreConfigGY: {
@@ -303,7 +303,7 @@ export default{
   },
   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_accounts_state': '下账状态', 'f_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
     'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_audit_date': '审核日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
@@ -335,8 +335,8 @@ export default{
   UserSellHeadDetailConfig: {
     'f_userinfo_code': '用户编号', 'f_user_name': '用户名称', 'f_olduserinfo_code': '档案编号', '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': '气价',
@@ -360,7 +360,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': '客户地址',
@@ -678,7 +678,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_reduction': '本期减免', 'f_bank_pay': '银行转账', 'f_sum_pay': '违约金合计', 'f_balance': '期末余额'
   },
   sellinggaslistConfig: {
     'f_month': '月份', 'f_last_balance': '期初余额', 'f_account': '本期发生额', 'f_wechat_pay': '微信',
@@ -986,7 +986,7 @@ export default{
     'finaltotal': '一日'
   },
   GroupCharge: {
-    'id': '收费编号', 'f_user_name': '客户姓名', 'f_user_type': '客户类型', 'f_address': '客户地址','f_pregas': '气量','f_preamount': '气费','f_delay': '应交滞纳金','f_delaypay': '实交滞纳金',
+    'id': '收费编号', 'f_user_name': '客户姓名', 'f_user_type': '客户类型', 'f_address': '客户地址','f_pregas': '气量','f_preamount': '气费','f_delay': '应交违约金','f_delaypay': '实交违约金',
     'f_balance': '上期余额','f_curbalance': '本期余额','f_collection': '收款','f_state': '收费状态','f_operate_date': '收费日期','f_payment': '付款方式','f_type': '收费类型','f_comments': '备注',
     'f_operator': '收费人','f_orgname': '部门','f_depname': '公司'
   },

package/src/components/sale/filesquery/MeterQuery.vue

@@ -244,6 +244,19 @@
                               close-on-select
                               condition="f_meter_book_num = '{}'"></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>
               </div>
@@ -330,6 +343,9 @@
                   <th>
                     <nobr>是否壁挂炉</nobr>
                   </th>
+                  <th>
+                    <nobr>自动阀控</nobr>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -407,6 +423,9 @@
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.isbgl}}</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>
@@ -556,7 +575,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/components/sale/filesquery/RecordInfoQuery.vue

@@ -441,6 +441,19 @@
                               condition="f_install_person in {}"
                               v-el:cc></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_network_valve='{}'">
+                    </v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -496,6 +509,7 @@
                   </th>
                   <!--<th><nobr>最后购气日期</nobr></th>-->
 
+                  <th><nobr>自动阀控</nobr></th>
                   <th><nobr>阀门状态</nobr></th>
 
                   <!--                  <th><nobr>旧客户编号</nobr></th> -->
@@ -627,6 +641,7 @@
                 <td style="text-align: center;"><nobr>{{row.f_balance}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
                <!-- <td style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>-->
+                <td style="text-align: center;"><nobr>{{row.f_network_valve}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_valve_state}}</nobr></td>
 
                 <!-- <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>-->
@@ -837,6 +852,7 @@
         bookSlice:[{label: '全部',value: ''}],
         pricenames:[],
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+        networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : [],
       }
     },
     ready(){