manage-client 3.2.107 → 3.2.108

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

@@ -578,7 +578,7 @@ export default{
   },
   ReportListConfig: {
     'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_phone': '客户电话', 'f_address': '客户地址',
-    'f_hand_date': '上报日期', 'f_meterBalanceAmt': '表内剩余金额', 'f_tablebase': '本次抄表底数', 'f_valvestate': '阀门状态',
+    'f_hand_date': '上报日期', 'f_jval': '表内剩余金额', 'f_tablebase': '本次抄表底数', 'f_valvestate': '阀门状态',
     'f_upload_type': '上报类型', 'f_insert_date': '系统接收时间', 'f_meterDebitAmt': '表内累计充值金额',
     'f_signal': '噪音强度', 'f_snr': '信噪比', 'f_batterylevel': '电压', 'f_lowlithiumbattery': '电压状态', 'f_networkshutvalve': '阀门强制状态',
     'f_wmprepaytype': '计量类型', 'f_moneystate': '金额状态', 'f_magneticInterference': '磁干扰异常', 'f_compensateState': '补偿状态'

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

@@ -1,48 +1,48 @@
-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_price",
-      "信号强度":"f_signal",
-      "信噪比":"f_snr",
-      "电压":"f_batterylevel",
-
-      "阀门强制状态":"f_networkshutvalve",
-      "阀门状态":"f_valvestate",
-      "计量类型":"f_wmprepaytype",
-      "上报类型":"f_upload_type",
-      "金额状态":"f_moneystate",
-
-      "外电低电":"f_lowlithiumbattery",
-      "磁干扰异常":"f_magneticinterference",
-      "表内剩余金额":"f_meterbalanceamt",
-      "表内累计充值金额":"f_meterdebitamt",
-      "补偿状态":"f_compensatestate",
-      "气表品牌":"f_meter_brand",
-      "气表型号":"f_meter_style",
-      "分公司":"f_orgname"
-
-    }
-
-}
+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_price",
+      "信号强度":"f_signal",
+      "信噪比":"f_snr",
+      "电压":"f_batterylevel",
+
+      "阀门强制状态":"f_networkshutvalve",
+      "阀门状态":"f_valvestate",
+      "计量类型":"f_wmprepaytype",
+      "上报类型":"f_upload_type",
+      "金额状态":"f_moneystate",
+
+      "外电低电":"f_lowlithiumbattery",
+      "磁干扰异常":"f_magneticinterference",
+      "表内剩余金额":"f_meterbalanceamt",
+      "表内累计充值金额":"f_meterdebitamt",
+      "补偿状态":"f_compensatestate",
+      "气表品牌":"f_meter_brand",
+      "气表型号":"f_meter_style",
+      "分公司":"f_orgname"
+
+    }
+
+}

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>