manage-client 3.2.201 → 3.2.203

package/src/filiale/gehua/config/tableConfig.js

@@ -0,0 +1,56 @@
+export default{
+  //查询页面的字段名和中文对应
+  ReportDataQuery:
+    {
+      "用户编号":"f_userinfo_code",
+      "用户名称":"f_user_name",
+      "表号":"f_meternumber",
+      "本次抄表底数":"f_tablebase",
+      "上次抄表底数":"f_last_tablebase",
+      "表上余额":"f_jval",
+      "抄表日期":"f_hand_date",
+
+      "上次抄表日期":"f_last_hand_date",
+      "开户日期":"f_gas_date",
+      "软件版本号":"f_software_version",
+      "表状态信息":"f_table_msg",
+      "上次表状态信息":"f_last_meter_state_msg",
+
+      "插入日期":"f_insert_date",
+      "上次插入日期":"f_last_insertdate",
+      "是否结算":"f_whether_clear",
+      "超用气量":"f_super_gas",
+      "电量等级":"f_electricity",
+
+      "购气次数":"f_times",
+      "用气量":"f_oughtamount",
+      "用气金额":"f_oughtfee",
+      "单价":"f_price",
+      "信号强度":"f_signal",
+      "信噪比":"f_snr",
+      "电压":"f_batterylevel",
+
+      "阀门强制状态":"f_networkshutvalve",
+      "阀门状态":"f_valvestate",
+      "计量类型":"f_wmprepaytype",
+      "上报类型":"f_upload_type",
+      "金额状态":"f_moneystate",
+
+      "增加工况瞬时":"operatingModeFlow",
+      "标况瞬时":"standardConditionFlow",
+      "开盖状态" :"f_SplitAlarm",
+      "液晶状态" : "f_XTIpllStopFlag",
+      "声速" :"soundVelocity",
+
+      "外电低电":"f_lowlithiumbattery",
+      "磁干扰异常":"f_magneticinterference",
+      "表内剩余金额":"f_meterbalanceamt",
+      "表内累计充值金额":"f_meterdebitamt",
+      "补偿状态":"f_compensatestate",
+      "气表品牌":"f_meter_brand",
+      "气表型号":"f_meter_style",
+      "分公司":"f_orgname"
+
+    }
+
+}

package/src/filiale/gehua/webmeterManage.js

@@ -1,6 +1,7 @@
 // 分公司特殊组件页面注册
 let specialComp = {
   'use-gas-statistics': (resolve) => { require(['./GasStatistics'], resolve) },
+  'report-data-query': (resolve) => { require(['./ReportDataQuery'], resolve) },
 }
 exports.specialComp = specialComp
 

package/src/filiale/macheng/TransferQuery.vue

@@ -0,0 +1,467 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex"  v-if="!show" >
+
+        <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">
+                <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"
+                              condition="f_operate_date >= '{}'">
+                  </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"
+                              condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </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"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
+                </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>
+                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="rs/easyExcel/exportExcel" sql-name="transferQuery" 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" :cascade =true  v-ref:sel></res-select-group>
+
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户地址</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">过户状态</label>
+                  <v-select :value.sync="model.f_state"
+                            v-model="model.f_state"
+                            :options='$parent.$parent.transferstate' placeholder='请选择'
+                            condition="f_state = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">原户姓名</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         placeholder="原户姓名"
+                         condition="f_user_name like '%{}%'">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">新户姓名</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_newuser_name"
+                         condition="f_newuser_name like '%{}%' " placeholder="新户姓名">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">原户电话</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                         condition="f_user_phone like '%{}%' " placeholder="原户电话">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">新户电话</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_newuser_phone"
+                         condition="f_newuser_phone like '%{}%' " placeholder="新户电话">
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
+            <template partial='head'>
+              <tr>
+                <th>
+<!--                  <nobr>客户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="客户编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                </th>
+                <th>
+                  <nobr>客户名称</nobr>
+                </th>
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
+                <th>
+<!--                  <nobr>客户地址</nobr>-->
+                  <data-order field="f_address" name="客户地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
+                <th>
+                  <nobr>原客户名称</nobr>
+                </th>
+                <th>
+                  <nobr>新客户电话</nobr>
+                </th>
+                <th>
+                  <nobr>原客户电话</nobr>
+                </th>
+                <th>
+                  <nobr>过户费</nobr>
+                </th>
+                <th>
+<!--                  <nobr>过户日期</nobr>-->
+                  <data-order field="f_operate_date" name="过户日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                </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>
+                  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_newuser_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_newuser_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_transfer_fees}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+              <td style="text-align: center;"><nobr>
+                <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
+              </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.f_transfer_fees}}
+            </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>
+          </tr>
+        </table>
+      </div>
+      <div class="flex" 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>
+    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+        <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false"  fusetype="过户" :isremark="false" style="width:auto" ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from './config/DefaultPrint'
+  import exportConfig from './config/exportConfig'
+
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    // await self.$refs.paged.$refs.cri.search()
+    await self.$MagLoadParams.loadParam(self.$login.f)
+
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    props:['data'],
+    title: '过户查询',
+    data() {
+      return {
+        data: {},
+        other:[],
+        footer:[],
+        show:false,
+        rowdata:{},
+        model: new PagedList('rs/sql/transferQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_transfer_fees: 0,hushu:0}),
+        criteriaShow: false,
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        headData: ["客户编号", "新户姓名", "新户电话", "客户地址", "过户状态", "原户姓名", "原户电话", "客户类型", "用气性质", "气价名称", "过户费", "过户日期", "人员", "部门", "公司"],
+        bodyData: ["f_userinfo_code", "f_newuser_name", "f_newuser_phone", "address", "f_state", "f_user_name", "f_user_phone", "f_user_type", "f_gasproperties", "f_price_name", "f_transfer_fees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
+        orgCondtionStr: '',
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        config: {
+          defaultPrint: ["f_userinfo_code", "f_newuser_name", "f_newuser_phone", "address", "f_state", "f_user_name","f_transfer_fees", "f_operate_date", "f_operator", "f_depname", "f_orgname"]
+        },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
+        //默认打印列
+        defaultfield: [],
+        thead: '',
+        tfoot: '',
+        showupload:false,
+        selected:{},
+
+        transferstate: this.$appdata.getParam('过户状态') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('过户状态')] : [],
+        //合计数据
+        sumsmodel: {}
+      }
+    },
+    ready() {
+      console.log(this.$login.f)
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      view(row){
+        this.showupload = true
+        this.selected= row
+      },
+      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);
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      dblclick(obj) {
+        this.data = obj
+        this.showinfo = true
+      },
+      async selfSearch(args) {
+        if (this.data) {
+          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
+          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+        }
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        // console.log('我的阐述', JSON.stringify(args.condition))
+        await this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
+
+        console.log('合计字段', this.sumsmodel)
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      cancel() {
+        this.show = false
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        //部门和人员变为全选
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      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
+        this.all = 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)
+      },
+      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
+      }
+    },
+    computed: {
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: `'f_operate_date desc'` }
+      },
+      getfield() {
+        return exportConfig.transferConfig
+      }
+    }
+  }
+</script>

package/src/filiale/macheng/config/DefaultPrint.js

@@ -15,5 +15,8 @@ export default{
     'may': '五月', 'jun': '六月', 'jul': '七月', 'jug': '八月',
     'sep': '九月', 'oct': '十月', 'nov': '十一月', 'dec': '十二月',
     'sum_oughtamount': '累计气量', 'f_oughtfee': '累计金额', 'avg_oughtamount': '月平均气量'
-  }
+  },
+  config: [
+    "f_userinfo_code","f_user_name","f_user_phone","f_pregas","f_preamount","f_collection","f_balance","f_curbalance","f_idnumber"
+  ]
 }

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

@@ -70,5 +70,10 @@ export default{
     'sep': '九月', 'oct': '十月', 'nov': '十一月', 'dec': '十二月',
     'sum_oughtamount': '累计气量', 'f_oughtfee': '累计金额', 'avg_oughtamount': '月平均气量'
   },
-
+  transferConfig: {
+    'f_userinfo_code': '客户编号', 'f_address': '客户地址', 'f_operate_date': '过户日期',
+    'f_user_name': '原客户名称', 'f_user_phone': '原客户电话', 'f_newuser_name': '现客户名称',
+    'f_newuser_phone': '现客户电话', 'f_operator': '操作员', 'f_depname': '部门',
+    'f_meternumber': '表号', 'f_comments': '备注'
+  }
 }

package/src/filiale/macheng/sale.js

@@ -7,6 +7,7 @@ let specialComp = {
   'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) },
   'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
   'fmygas-query': (resolve) => { require(['./FMYGasQuery'], resolve) },
-  'month-gas-query': (resolve) => { require(['./MonthGasQuery'], resolve) }
+  'month-gas-query': (resolve) => { require(['./MonthGasQuery'], resolve) },
+  'transfer-query': (resolve) => { require(['./TransferQuery'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/qianneng/MeterQuery.vue

@@ -309,9 +309,15 @@
                   <th>
                     <nobr>档案编号</nobr>
                   </th>
+                  <th>
+                    <nobr>入户证号</nobr>
+                  </th>
                   <th>
                     <nobr>团缴编号</nobr>
                   </th>
+                  <th>
+                    <nobr>表ID</nobr>
+                  </th>
                   <th>
                     <nobr>客户电话</nobr>
                   </th>
@@ -415,9 +421,15 @@
                  <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_olduserinfo_code}}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_enter_number}}</nobr>
+                </td>
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_customer}}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_userfiles_id}}</nobr>
+                </td>
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_user_phone}}</nobr>
                 </td>
@@ -561,7 +573,7 @@
 
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
-  import exportConfig from '../../components/sale/config/exportConfig'
+  import exportConfig from './exportConfig'
   let cardBtnGen = async function (self, val) {
     self.cardInfo = val.data
 

package/src/filiale/qianneng/RecordInfoQuery.vue

@@ -467,6 +467,7 @@
                     <data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                   </th>
                   <th><nobr>档案编号</nobr></th>
+                  <th><nobr>入户证号</nobr></th>
                   <th><nobr>是否发卡</nobr></th>
                   <th><nobr>卡号</nobr></th>
                   <th><nobr>客户名称</nobr></th>
@@ -616,6 +617,7 @@
                 <td style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_enter_number}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_whether_hairpin}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>

package/src/filiale/qianneng/UserQuery.vue

@@ -295,6 +295,9 @@
                   <th>
                     <nobr>档案编号</nobr>
                   </th>
+                  <th>
+                    <nobr>入户证号</nobr>
+                  </th>
                   <th>
                     <nobr>客户电话</nobr>
                   </th>
@@ -388,6 +391,9 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_olduserinfo_code}}</nobr>
                 </td>
+                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_enter_number}}</nobr>
+                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_user_phone}}</nobr>
                 </td>