manage-client 3.2.105 → 3.2.108

package/src/components/valueaddinfo/valueAddUserQuery.vue

@@ -0,0 +1,392 @@
+<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>
+          <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 class="font_normal_body">公&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;司</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </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"
+                         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_name"
+                          placeholder="客户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">增值服务类型</label>
+                  <v-select :value.sync="model.f_field_name"
+                            v-model="model.f_field_name"
+                            :options='$parent.$parent.valuetypeoptions' placeholder='请选择'
+                            condition="itemname = '{}'"
+                            close-on-select></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-plus :data="$parent.$parent.getCondition"
+                                     :defaultselect="$parent.$parent.selectfields"
+                                     :field="$parent.$parent.getfield"
+                                     :exportprogress="true"
+                                     sqlurl="rs/logic/exportfileplus"
+                                     sql-name='getValueaddInfo'
+                                     template-name="用户增值业务信息"  :choose-col="true"></export-excel-plus>
+                  <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">
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">客户地址</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="model.f_address"
+                          placeholder="客户地址">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.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_gasproperties" v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties' placeholder='请选择'
+                            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_open_state"
+                            v-model="model.f_open_state"
+                            :options='$parent.$parent.backstates' placeholder='请选择'
+                            condition="ishas = '{}'"
+                            close-on-select></v-select>
+                </div>
+
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" 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>
+                <th>
+                  <nobr>有无增值业务</nobr>
+                </th>
+                <th>
+                  <nobr>购买时间</nobr>
+                </th>
+                <th>
+                  <nobr>最后操作时间</nobr>
+                </th>
+                <th>
+                  <nobr>所属公司</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_meter_classify}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.itemname}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.ishas}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.startdate}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+
+        </criteria-paged>
+
+
+      </div>
+      <div v-if="show">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import exportConfig from '../sale/config/exportConfig'
+  import defaultPrint from "../sale/config/DefaultPrint";
+  import plugin from "system-clients/src/plugins/GetLoginInfoService";
+
+  let readySomething = async function (self) {
+    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'
+    // self.$refs.paged.$refs.cri.search()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    await self.$MagLoadParams.loadParam()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '增值业务查询',
+
+    data() {
+      return {
+        org:[this.$login.f.orgid],
+        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_address', 'f_pregas', 'f_preamount']
+        },
+        //f_price_name:[],
+        gasproperties:[],
+        showinfo: false,
+        data: {},
+        show:false,
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        model: new PagedList('rs/sql/getValueaddInfo', 20, {}, ),
+        criteriaShow: true,
+        orgCondtionStr: '',
+        // 下拉框
+        meterbrands: [],
+        pricenames: [],
+        prices: [],
+        //合计数据
+        defaultfield: [],
+        sumsmodel: {},
+        f_filialeid: this.$login.f.f_orgid,
+        selectfields:[],
+        istrueoptions:[{label:"全部",value:""},{label:"是",value:"0"},{label:"否",value:"1"}],
+        backstates:[{label: '全部', value: ''},{label: '有', value: '有'},{label: '无', value: '无'}],
+      }
+    },
+    props:['selectorg'],
+    ready() {
+      if(this.selectorg != null && this.selectorg != null != ''){
+        this.initres.org=[]
+        this.initres.org.push(this.selectorg);
+      }
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+      for(var item in exportConfig.valueuserinfoConfig){
+        this.selectfields.push(item)
+      }
+    },
+    methods: {
+      getorg (obj) {
+        if(obj.resids.length>0){
+          this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
+        }
+        else{
+          this.filialeCodeStr= " and f_orgid = " + this.$login.f.orgid
+        }
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.model.model !==null) {
+          this.$refs.paged.model.model.f_gasproperties=''
+
+          console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+
+      selfSearch(args) {
+        //args.condition = args.condition+ ` ${this.filialeCodeStr}`
+        this.model.params.f_userinfo_code = this.$refs.paged.$refs.cri.model.f_userinfo_code ==null|| this.$refs.paged.$refs.cri.model.f_userinfo_code==''?'':` and tui.f_userinfo_code = '${this.$refs.paged.$refs.cri.model.f_userinfo_code}'`
+        this.model.params.f_user_name = this.$refs.paged.$refs.cri.model.f_user_name ==null|| this.$refs.paged.$refs.cri.model.f_user_name==''?'':` and tui.f_user_name = '${this.$refs.paged.$refs.cri.model.f_user_name}'`
+        this.model.params.f_address = this.$refs.paged.$refs.cri.model.f_address ==null|| this.$refs.paged.$refs.cri.model.f_address==''?'':` and tua.f_address = '${this.$refs.paged.$refs.cri.model.f_address}'`
+        this.model.params.f_user_type = this.$refs.paged.$refs.cri.model.f_user_type ==null|| this.$refs.paged.$refs.cri.model.f_user_type==''?'':` and tuf.f_user_type = '${this.$refs.paged.$refs.cri.model.f_user_type}'`
+        this.model.params.f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties ==null|| this.$refs.paged.$refs.cri.model.f_gasproperties==''?'':` and tuf.f_gasproperties = '${this.$refs.paged.$refs.cri.model.f_gasproperties}'`
+        this.model.params.f_meter_classify = this.$refs.paged.$refs.cri.model.f_meter_classify ==null|| this.$refs.paged.$refs.cri.model.f_meter_classify==''?'':` and tuf.f_meter_classify = '${this.$refs.paged.$refs.cri.model.f_meter_classify}'`
+        this.model.params.f_meternumber = this.$refs.paged.$refs.cri.model.f_meternumber ==null|| this.$refs.paged.$refs.cri.model.f_meternumber==''?'':` and tuf.f_meternumber = '${this.$refs.paged.$refs.cri.model.f_meternumber}'`
+        this.model.params.f_filialeid = this.f_filialeid == null ||  this.f_filialeid=='' ? this.$login.f.orgid: this.f_filialeid
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      clear() {
+        // 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] = []
+        });
+        this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+        this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+
+      },
+      dealmsg(val) {
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(condition,obj) {
+        this.orgCondtionStr = condition
+        this.f_orgid = obj.resids
+      },
+      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)
+      },
+
+    },
+    watch: {
+      'model'(val) {
+        console.log(val, "12222222222222222222")
+      },
+      'filialeCodeStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.f_filialeid = res[1]
+        }
+      }
+    },
+    computed: {
+      getCondition() {
+        let params={}
+        params.f_userinfo_code = this.$refs.paged.$refs.cri.model.f_userinfo_code ==null|| this.$refs.paged.$refs.cri.model.f_userinfo_code==''?'':` and tui.f_userinfo_code = '${this.$refs.paged.$refs.cri.model.f_userinfo_code}'`
+        params.f_user_name = this.$refs.paged.$refs.cri.model.f_user_name ==null|| this.$refs.paged.$refs.cri.model.f_user_name==''?'':` and tui.f_user_name = '${this.$refs.paged.$refs.cri.model.f_user_name}'`
+        params.f_address = this.$refs.paged.$refs.cri.model.f_address ==null|| this.$refs.paged.$refs.cri.model.f_address==''?'':` and tua.f_address = '${this.$refs.paged.$refs.cri.model.f_address}'`
+        params.f_user_type = this.$refs.paged.$refs.cri.model.f_user_type ==null|| this.$refs.paged.$refs.cri.model.f_user_type==''?'':` and tuf.f_user_type = '${this.$refs.paged.$refs.cri.model.f_user_type}'`
+        params.f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties ==null|| this.$refs.paged.$refs.cri.model.f_gasproperties==''?'':` and tuf.f_gasproperties = '${this.$refs.paged.$refs.cri.model.f_gasproperties}'`
+        params.f_meter_classify = this.$refs.paged.$refs.cri.model.f_meter_classify ==null|| this.$refs.paged.$refs.cri.model.f_meter_classify==''?'':` and tuf.f_meter_classify = '${this.$refs.paged.$refs.cri.model.f_meter_classify}'`
+        params.f_meternumber = this.$refs.paged.$refs.cri.model.f_meternumber ==null|| this.$refs.paged.$refs.cri.model.f_meternumber==''?'':` and tuf.f_meternumber = '${this.$refs.paged.$refs.cri.model.f_meternumber}'`
+        params.f_filialeid = this.f_filialeid == null ||  this.f_filialeid=='' ? this.$login.f.orgid: this.f_filialeid;
+        params.condition = `${this.$refs.paged.$refs.cri.condition}`;
+        return params;
+      },
+      valuetypeoptions(){
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('增值服务类型')]
+      },
+      stateoptions(){
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('增值服务状态')]
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      pricetypeoptions(){
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      getfield() {
+        return exportConfig.valueuserinfoConfig
+      },
+
+    }
+  }
+</script>

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -66,7 +66,7 @@
 <!--                  <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 class="font_normal_body">表&emsp;&emsp;号</label>
-                    <input  style="width:60%" class="input_search" condition="f_meternumber = '%{}'" placeholder='表号' type="text"
+                    <input  style="width:60%" class="input_search" condition="f_meternumber like '%{}'" placeholder='表号' type="text"
                             v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
                     >
                   </div>

package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue

@@ -203,7 +203,7 @@
               <nobr>联系电话</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>表上剩余金额</nobr>
+              <nobr>系统金额</nobr>
             </th>
             <th style="text-align:center">
               <nobr>表号</nobr>
@@ -329,7 +329,7 @@
           "f_address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质",
           "f_meternumber":"表号",
           "f_user_phone":"联系电话",
-          "f_balance_amount":"表上剩余金额",
+          "f_balance_amount":"系统余额",
 
           "f_startuse_date":"启用日期",
           "initinsertdate":"初次上报日期",

package/src/components/webmeter/WebmeterQuery.vue

@@ -1,64 +1,64 @@
-<template>
-  <tab-button class="foot_tabset" :active="-1">
-    <tabs header="指令查询" v-if="permission('指令查询')">
-      <instruct-manage v-if="show.includes('指令查询')"></instruct-manage>
-    </tabs>
-    <tabs header="上报查询" v-if="permission('上报查询')">
-      <report-list v-if="show.includes('上报查询')"></report-list>
-    </tabs>
-    <tabs header="结算查询" v-if="permission('结算查询')">
-      <report-data-query v-if="show.includes('结算查询')"></report-data-query>
-    </tabs>
-    <tabs header="缴费查询" v-if="permission('缴费查询')">
-      <recharge-instruct-query v-if="show.includes('缴费查询')"></recharge-instruct-query>
-    </tabs>
-    <tabs header="异常查询" v-if="permission('异常查询')">
-      <meter-exception-list v-if="show.includes('异常查询')"></meter-exception-list>
-    </tabs>
-    <tabs header="用户失联" v-if="permission('用户失联')">
-      <user-lost-contact-analysis v-if="show.includes('用户失联')"></user-lost-contact-analysis>
-    </tabs>
-    <tabs header="失联查询" v-if="permission('失联查询')">
-      <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
-    </tabs>
-    <tabs header="用气查询" v-if="permission('用气查询')">
-      <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
-    </tabs>
-    <tabs header="未用气查询" v-if="permission('未用气查询')">
-      <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
-    </tabs>
-    <tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">
-      <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
-    </tabs>
-  </tab-button>
-
-</template>
-
-<script>
-  import TabButton from '../sale/common/TabButton'
-  import Tabs from '../sale/common/Tabs'
-
-  export default {
-    title: '物联查询',
-    data () {
-      return {
-        show: []
-      }
-    },
-    components: {Tabs, TabButton},
-    methods: {
-      permission (name) {
-        // 保留是为了后面可能也会和综合查询一样加权限
-        if (this.$login.r.find(value => value === '物联查询')) {
-          if (!this.$login.r.find(value => value === name)) {
-            return false
-          }
-        }
-        return true
-      }
-    }
-  }
-</script>
-
-<style scoped>
-</style>
+<template>
+  <tab-button class="foot_tabset" :active="-1">
+    <tabs header="指令查询" v-if="permission('指令查询')">
+      <instruct-manage v-if="show.includes('指令查询')"></instruct-manage>
+    </tabs>
+    <tabs header="上报查询" v-if="permission('上报查询')">
+      <report-list v-if="show.includes('上报查询')"></report-list>
+    </tabs>
+    <tabs header="结算查询" v-if="permission('结算查询')">
+      <report-data-query v-if="show.includes('结算查询')"></report-data-query>
+    </tabs>
+    <tabs header="缴费查询" v-if="permission('缴费查询')">
+      <recharge-instruct-query v-if="show.includes('缴费查询')"></recharge-instruct-query>
+    </tabs>
+    <tabs header="异常查询" v-if="permission('异常查询')">
+      <meter-exception-list v-if="show.includes('异常查询')"></meter-exception-list>
+    </tabs>
+    <tabs header="用户失联" v-if="permission('用户失联')">
+      <user-lost-contact-analysis v-if="show.includes('用户失联')"></user-lost-contact-analysis>
+    </tabs>
+    <tabs header="失联查询" v-if="permission('失联查询')">
+      <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
+    </tabs>
+    <tabs header="用气查询" v-if="permission('用气查询')">
+      <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
+    </tabs>
+    <tabs header="未用气查询" v-if="permission('未用气查询')">
+      <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
+    </tabs>
+    <tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">
+      <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from '../sale/common/TabButton'
+  import Tabs from '../sale/common/Tabs'
+
+  export default {
+    title: '物联查询',
+    data () {
+      return {
+        show: []
+      }
+    },
+    components: {Tabs, TabButton},
+    methods: {
+      permission (name) {
+        // 保留是为了后面可能也会和综合查询一样加权限
+        if (this.$login.r.find(value => value === '物联查询')) {
+          if (!this.$login.r.find(value => value === name)) {
+            return false
+          }
+        }
+        return true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/components/webmeter/meterinfo/NewMeterList.vue

@@ -9,7 +9,7 @@
                 <input @keyup.enter="search" type="text" class="input_search" style="width:60%"
                        v-model="model.f_userinfo_code"
                        placeholder='客户编号'
-                       condition="f_userinfo_code like '%{}%'"
+                       condition="f_userinfo_code = '{}'"
                 >
               </div>
               <div class="col-sm-2">
@@ -34,7 +34,7 @@
                 <input @keyup.enter="search" type="text" class="input_search" style="width:60%"
                        v-model="model.f_meternumber"
                        placeholder='表号'
-                       condition="f_meternumber like '%{}%'">
+                       condition="f_meternumber = '{}'">
               </div>
 
               <div style="float:right">
@@ -147,6 +147,9 @@
               <th style="text-align:center">
                 <nobr>累购金额</nobr>
               </th>
+              <th style="text-align:center">
+                <nobr>系统余额</nobr>
+              </th>
               <th style="text-align:center">
                 <nobr>表上余额</nobr>
               </th>
@@ -199,6 +202,9 @@
               <td style="text-align:center">
                 <nobr>{{row.f_balance_amount}}</nobr>
               </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_jval}}</nobr>
+              </td>
               <td style="text-align:center">
                 <nobr>{{row.f_valvestate}}</nobr>
               </td>
@@ -260,7 +266,8 @@
           excelHeaders: {
             'f_userinfo_code': '客户编号','f_user_name': '客户名称','f_address': '客户地址',
             'f_meternumber': '表号','f_meter_brand': '气表品牌','f_meter_base': '气表底数',
-            'f_total_fee': '累购金额','f_balance_amount': '表上余额', 'f_valvestate': '阀门状态',
+            'f_total_fee': '累购金额','f_balance_amount': '系统余额', 'f_jval': '表上余额',
+            'f_valvestate': '阀门状态',
             'f_signal': '信号强度','f_batterylevel': '电压','f_magneticInterference': '磁干扰',
             'f_orgname': '组织机构'
           }

package/src/components/webmeter/report/ReportList.vue

@@ -153,7 +153,7 @@
 
                 <td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
                 <th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_meterbalanceamt}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_valvestate}}</nobr></th>