manage-client 3.3.14 → 3.3.16

package/src/filiale/qianneng/QnAqzzXzjwhhz.vue

@@ -0,0 +1,600 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search" v-if="!show">
+      <div class="flex">
+        <div style="flex:1;" class="flex" >
+          <criteria-paged :model="model" v-ref:paged @sort="sort">
+            <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+              <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+                <div class="row">
+                  <res-select-group :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
+                  <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="col-sm-2 form-group">
+                    <label class="font_normal_body">乡镇</label>
+                    <v-select :value.sync="model.f_community"
+                              @change="$parent.$parent.communityChange()"
+                              :options='$parent.$parent.communityArray' placeholder='请选择' v-model="model.f_community" multiple
+                              condition="xz in {}"
+                    ></v-select>
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">居委会</label>
+                    <v-select :value.sync="model.f_committee"
+                              :options='$parent.$parent.committeeArray' placeholder='请选择' v-model="model.f_committee" multiple
+                              condition="jwh in {}"
+                    ></v-select>
+                  </div>
+
+                  <div class="span" style="float:right;">
+                    <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
+                    <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                    <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+                    <export-excel :data="$parent.$parent.getCondition"
+                                  :field="$parent.$parent.getExportField"
+                                  :footer="$parent.$parent.footer"
+                                  :header="$parent.$parent.other"
+                                  sqlurl="rs/logic/exportfile" sql-name="qnAqzzXzjwhhz" template-name='乡镇居委会汇总导出'
+                                  :choose-col="true"></export-excel>
+
+                    <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>
+            </criteria>
+
+            <data-grid :model="model" partial='list' class="list_area table_sy" @dblclick="$parent.dblclick" v-ref:grid>
+              <template partial='head'>
+                <tr>
+                  <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>
+                </tr>
+              </template>
+              <template partial='body'>
+                <td style="text-align: center;">
+                  <nobr>{{row.xz}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.jwh}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.bjqdr}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.bjqlj}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.fbjsrgdr}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.fbjsrglj}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.zbfdr}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.zbflj}}</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.bjqdr}}&emsp;&emsp;报警器（非补贴项）累计合计:&emsp;{{sumsmodel.bjqlj}}&emsp;&emsp;防爆金属软管当日合计:&emsp;{{sumsmodel.fbjsrgdr}}&emsp;&emsp;防爆金属软管累计合计:&emsp;{{sumsmodel.fbjsrglj}}&emsp;&emsp;自闭阀当日合计:&emsp;{{sumsmodel.zbfdr}}&emsp;&emsp;自闭阀累计合计:&emsp;{{sumsmodel.zbflj}}
+              </td>
+            </tr>
+          </table>
+        </div>
+
+      </div>
+    </div>
+    <div class="basic-main" style="width:99%;height:98%;margin-bottom:0px" v-if="show">
+      <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import defaultPrint from '../../components/sale/config/DefaultPrint'
+import exportConfig from './exportConfig'
+
+let readySomething = async function (self) {
+  self.$MagGetSaleParam.initinputtor();
+  self.getinputtores();
+  // 获取区县
+  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()
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+}
+
+export default {
+  title: '乡镇居委会汇总',
+  data() {
+    return {
+      other:[],
+      footer:[],
+      model: new PagedList('rs/sql/qnAqzzXzjwhhz', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {bjqdr: 0, bjqlj: 0, fbjsrgdr: 0, fbjsrglj: 0, zbfdr: 0, zbflj: 0}),
+      criteriaShow: false,
+      orgCondtionStr: '',
+      modelval: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      //排序
+      orderitem:'',
+      orderFields: {
+
+      },
+      committeeArray:[],
+      communityArray:[],
+      //默认打印列
+      defaultfield: [],
+      config: {
+        defaultPrint: []
+      },
+      balance2:'',
+      thead: '',
+      tfoot: '',
+      area: [],
+      //合计数据
+      sumsmodel: {},
+      initres: {
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[],
+      },
+      userdetail: {
+        show: false,
+        f_userinfo_code: '',
+        f_filialeids: ''
+      },
+
+      show:false,
+      rowdata:{},
+      meterInfo:{},
+      deviceInfo:{},
+      condition2:'',
+
+
+      weixinSign:[{label:"全部",value:""},{label:"已绑定",value:"已绑定"},{label:"未绑定",value:"未绑定"}],
+      //小区
+      residentialArea: [],
+      //表册片区
+      bookSlice:[{label: '全部',value: ''}],
+      inputtores:[{label: '全部',value: ''}],  //抄表员
+      allorgid:[],
+      f_filialeid: this.$login.f.f_orgid,
+      dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+    }
+  },
+  ready() {
+    //this.getaddress()
+    // this.$refs.paged.$refs.cri.model.f_user_state=['正常']
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+    //this.initAreas(this.$login.f.orgid)
+    //self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+    //self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+    this.getCommunityArray();
+  },
+  methods: {
+    async 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)
+        }
+      }
+      this.inputtores = [{label: '全部', value: ''}, ...rs]
+    },
+    async updateParams() {
+      await this.$MagLoadParams.loadParam(this.f_filialeid)
+      this.inputtores = [];
+      this.inputtores.push({label: "全部", value: ""})
+      this.initSlice(this.f_filialeid)
+      if(this.allorgid!=null){
+        this.allorgid.forEach((res)=>{
+          this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
+        })
+      }
+    },
+    async getCommunityArray(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: "t.name like '%行政划分%'",
+          tablename: 't_parameter t left outer join t_paramvalue t2 on t2.processid = t.id',
+          groupitem: "t2.name",
+          orderitem: 't2.name',
+          items: 't2.name'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取失败!'})
+      let nameArr = []
+      for (let row of data.data){
+        nameArr.push({label: row.name, value: row.name})
+      }
+      this.communityArray = nameArr
+    },
+    async communityChange(){
+      this.committeeArray=[]
+      if(this.$refs.paged.$refs.cri.model !==null) {
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: "t.name = '"+this.$refs.paged.$refs.cri.model.f_community[0]+"'",
+            tablename: 't_parameter t left outer join t_paramvalue t2 on t2.processid = t.id',
+            groupitem: 't2.name',
+            orderitem: 't2.name',
+            items: 't2.name'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取失败!'})
+        let nameArr = []
+        for (let row of data.data){
+          nameArr.push({label: row.name, value: row.name})
+        }
+        this.committeeArray = nameArr
+      }else{
+        this.committeeArray =[{label: '全部', value: ''}]
+      }
+    },
+    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.getExportField;
+      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 = []
+      for (let row of data.data){
+        console.log('开始保存小区')
+        house.push({label: row.f_residential_area, value: row.f_residential_area})
+      }
+      this.residentialArea = house
+    },
+
+    //把数据库查询数据转换为下拉数据
+    calculate(rows){
+      let data = []
+      rows.forEach((row, n) => {
+        data[n] = {label: row.f_residential_area, value: row.id}
+      })
+      return data
+    },
+    search(){
+      console.log("=====search====")
+      //this.$refs.paged.$refs.cri.search()
+      this.$refs.paged.$refs.cri.search()
+    },
+    cancel(obj) {
+      console.log("=====cancel====" + obj)
+      this.show = false
+    },
+    showmsg(obj){
+      this.rowdata=obj
+      this.show=true
+      // let http = new HttpResetClass()
+      // http.load('POST','rs/sql/getUserMeter',{data: {condition: `f_userinfo_id ='${obj.f_userinfo_id}'`}},
+      //   {resolveMsg: null, rejectMsg: null}).then((res) => {
+      //   this.meterInfo = res.data})
+      // let http2 = new HttpResetClass()
+      // http2.load('POST','rs/sql/deviceQuery',{data: {condition: `f_userinfo_id ='${obj.f_userinfo_id}'`}},
+      //   {resolveMsg: null, rejectMsg: null}).then((res) => {
+      //   this.deviceInfo = res.data})
+
+      // this.f_userinfo_id=obj.f_userinfo_id
+    },
+    userTypeChange () {
+      this.gasproperties=[]
+      if(this.$refs.paged.$refs.cri.model !==null) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties=''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+      }
+      else{
+        this.gasproperties =[{label: '全部', value: ''}]
+      }
+    },
+    //初始化片区
+    async initSlice (val) {
+      if (val) {
+        let getAllArea = await this.$resetpost('/rs/search', {
+          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+          userid: this.$login.f.id
+        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+        let arr = getAllArea.data.filter((res) => {
+          return res.parentid == val
+        })
+        this.bookSlice = []
+        console.log('过滤之后的片区-------------------', arr)
+        arr.forEach((res) => {
+          this.bookSlice.push({label: res.name, value: res.name})
+        })
+      }
+    },
+    async initAreas (val) {
+
+      if (val) {
+        let getAllArea = await this.$resetpost('/rs/search', {
+          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+          userid: this.$login.f.id
+        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+
+        let arr = getAllArea.data.filter((res) => {
+          return res.parentid == val
+        })
+        console.log('过滤之后的片区', arr)
+        this.sliceArea = []
+        arr.forEach((res) => {
+          this.sliceArea.push({label: res.name, value: res.name})
+        })
+      }
+    },
+    selfSearch(args) {
+      console.log('args', args)
+      console.log('this.orgCondtionStr', this.orgCondtionStr)
+      if (!this.orgCondtionStr) {
+        args.condition = `${args.condition}` + " and tr.f_orgid = " + this.$login.f.orgid
+      } else {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+      }
+      this.condition2 = args.condition
+      this.model.search(args.condition, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      console.log('合计字段', this.sumsmodel)
+    },
+    clear() {
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = []
+      })
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes(obj) {
+      this.orgCondtionStr = obj
+    },
+    stamp() {
+      this.all = false
+      //默认选择要打印的列
+      this.modelval = defaultPrint.config
+      this.fields = this.getfield
+      console.log('所有打印字段', this.fields)
+      this.printshow = true
+      this.put()
+    },
+    put() {
+      // 对Modelval进行排序
+      this.sortModelval()
+      this.thead = `<tr><th colspan=${this.modelval.length}>用户查询统计报表</th></tr><tr>`
+      for (let key of this.modelval) {
+        this.thead += '<th>' + this.fields[key] + '</th>'
+      }
+      this.thead += '</tr>'
+    },
+    print() {
+      this.$refs.print.PrintAsFile()
+      this.printshow = false
+    },
+    close() {
+      this.printshow = false
+    },
+    // 对选择的列进行排序
+    sortModelval() {
+      let sortModel = []
+      Object.keys(this.fields).forEach((key) => {
+        if (this.modelval.includes(key)) {
+          sortModel.push(key)
+        }
+      })
+      this.modelval = sortModel
+      console.log('选择的打印的字段', this.modelval)
+    },
+    dblclick(row, index) {
+      console.log('双击之后数据', row, index)
+      this.userdetail.show = true
+      this.userdetail.f_userinfo_code = row.f_userinfo_code
+      this.userdetail.f_filialeids = row.f_filialeids
+    },
+    sort (field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
+        } else {
+          this.orderFields[key] = 'no'
+        }
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderitem}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+
+      this.search()
+    }
+  },
+
+  watch: {
+    'all'(val) {
+      if (val) {
+        this.modelval = this.bodyData
+      } else {
+        this.modelval = defaultPrint.config
+        this.put()
+      }
+    },
+    'modelval.length'() {
+      this.put()
+    },
+    sumsmodel:{
+      handler: function(val) {
+        this.getotherfooter();
+      },
+      deep: true
+    },
+    'orgCondtionStr'(val) {
+      let res = val.match(/'(.*?)'/)
+      console.log('正则提取:',res && res[1])
+      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: {
+    // defaultexport() {
+    //   return exportConfig.chargeexportConfig
+    // },
+    authArr () {
+      return this.$login.r ? this.$login.r : []
+    },
+
+    getCondition() {
+      return {condition: this.condition2,orderitem:this.orderitem}
+    },
+    getfield() {
+      let data = {}
+      this.bodyData.forEach((value, index) => {
+        data[this.bodyData[index]] = this.headData[index]
+      })
+      //合计字段打印
+      this.tfoot = `<tr><th colspan=${this.modelval.length}>全表汇总信息: `
+      if (this.sumsmodel) {
+        Object.keys(this.sumsmodel).forEach((key) => {
+          this.tfoot += this.fields[key] + '合计: ' + `<font color="blue">${this.sumsmodel[key]} </font>`
+        })
+      } else {
+        this.tfoot += '暂无'
+      }
+      this.tfoot += '</th></tr>'
+      return data
+    },
+    getExportField() {
+      return exportConfig.qnAqzzXzjwhhz
+    },
+    inputtor () {
+      // 获取抄表员
+      console.log('获取抄表员', this.$login.f)
+      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]
+    },
+    userstates() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
+    },
+    usertypes () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    addressstate() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
+    },
+
+  }
+}
+</script>
+<style>
+.back-red{		/* 红色背景 */
+  background-color: #F6C6CE;
+}
+.back-blue{		/* 蓝色背景 */
+
+}
+</style>

package/src/filiale/qianneng/exportConfig.js

@@ -198,5 +198,23 @@ export default{
     'a_dabm':'档案编码','b_yhmc':'用户名称','c_dz':'地址','d_lxfs':'联系方式','e_yhlx':'用户类型','f_yqxz':'用气性质','g_jgmc':'价格名称','h_bh':'表号',
     'i_qd':'起度','j_zd':'止度','k_ql':'气量','l_dj':'单价','m_ysje':'应收金额','n_ssje':'实收金额','o_sfsj':'收费时间','p_yd':'月度','q_sfy':'收费员','r_bjlx':'表具类型','z_fylx':'费用类型'
   },
+  qnAqzzHmc:{
+    'f_userinfo_id':'用户ID','f_community':'乡镇','f_committee':'居委会','f_userinfo_code':'用户编号','f_user_name':'姓名',
+    'f_address':'地址','f_user_phone':'用户联系电话','azlxdh':'安装联系电话','bjq':'报警器','fbjsrg':'防爆金属软管',
+    'zbf':'自闭阀','gmxx':'购买信息','xfrq':'收费日期','bz':'备注','sfhg':'是否合规'
+  },
+  qnAqzzJfmx:{
+    'f_userinfo_id':'用户ID','f_community':'乡镇','f_committee':'居委会','f_userinfo_code':'用户编号','f_user_name':'姓名',
+    'f_address':'地址','f_user_phone':'用户联系电话','f_contact_phone':'安装联系电话','f_typename':'品名规格',
+    'f_number':'数量','f_unitprice':'单价','je':'金额','sfrq':'收费日期','f_serial_id':'微信缴费流水号','sfhg':'是否合规'
+  },
+  qnAqzzXzhz:{
+    'xz':'乡镇','bjqdr':'报警器（非补贴项）当日','bjqlj':'报警器（非补贴项）累计','fbjsrgdr':'防爆金属软管当日',
+    'fbjsrglj':'防爆金属软管累计','zbfdr':'自闭阀当日','zbflj':'自闭阀累计'
+  },
+  qnAqzzXzjwhhz:{
+    'xz':'乡镇','jwh':'居委会','bjqdr':'报警器（非补贴项）当日','bjqlj':'报警器（非补贴项）累计','fbjsrgdr':'防爆金属软管当日',
+    'fbjsrglj':'防爆金属软管累计','zbfdr':'自闭阀当日','zbflj':'自闭阀累计'
+  },
 }
 

package/src/filiale/qianneng/reportManage.js

@@ -58,5 +58,16 @@ export default function () {
   Vue.component('qn-jgq-yhsbb', (resolve) => { require(['./QnJgqYhsbb'], resolve) })
   // 报表查询 --> 其他报表菜单
   Vue.component('qnotherreport', (resolve) => { require(['./QnOtherReport'], resolve) })
+
+  //太康安全装置加装项目20230621
+  //安全装置加装  加装花名册
+  Vue.component('qn-aqzz-hmc', (resolve) => { require(['./QnAqzzHmc'], resolve) })
+  //安全装置加装  缴费明细
+  Vue.component('qn-aqzz-jfmx', (resolve) => { require(['./QnAqzzJfmx'], resolve) })
+  //安全装置加装  乡镇汇总
+  Vue.component('qn-aqzz-xzhz', (resolve) => { require(['./QnAqzzXzhz'], resolve) })
+  //安全装置加装  乡镇居委会汇总
+  Vue.component('qn-aqzz-xzjwhhz', (resolve) => { require(['./QnAqzzXzjwhhz'], resolve) })
+  Vue.component('qn-aqzz', (resolve) => { require(['./QnAqzz'], resolve) })
   // **************潜能自定义报表end***************
 }

package/src/filiale/shanxian/FmyGasDeviceQuery.vue

@@ -478,9 +478,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.f_total_gas}}</nobr>
                 </td>
-<!--                <td style="text-align: center;">-->
-<!--                  <nobr>{{row.f_balance_gas}}</nobr>-->
-<!--                </td>-->
+                <td style="text-align: center;">
+                  <nobr>{{row.c}}</nobr>
+                </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_defect_content}}</nobr>
                 </td>

package/src/filiale/shanxian/OtherChargeQuery.vue

@@ -288,7 +288,7 @@
                 <nobr>{{row.f_olduserinfo_code}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_sell_id}}</nobr>
+                <nobr>{{row.id}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>