manage-client 3.3.83 → 3.3.84

package/src/filiale/qianneng/CKHWebmeterQuery.vue

@@ -0,0 +1,43 @@
+<template>
+  <tab-button class="foot_tabset" :active="-1">
+    <tabs header="上报查询" v-if="permission('上报查询')">
+      <ckh-report-list v-if="show.includes('上报查询')"></ckh-report-list>
+    </tabs>
+    <tabs header="结算查询" v-if="permission('结算查询')">
+      <ckh-report-data-query v-if="show.includes('结算查询')"></ckh-report-data-query>
+    </tabs>
+    <tabs header="物联网表抄表查询" v-if="permission('物联网表抄表查询')">
+      <ckh-web-handplan-query v-if="show.includes('物联网表抄表查询')" @deal-msg="dealMsg" :data="data"></ckh-web-handplan-query>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from '../../components/sale/common/TabButton'
+  import Tabs from '../../components/sale/common/Tabs'
+
+  export default {
+    title: 'CKH物联查询',
+    data () {
+      return {
+        show: []
+      }
+    },
+    components: {Tabs, TabButton},
+    methods: {
+      permission (name) {
+        // 保留是为了后面可能也会和综合查询一样加权限
+        if (this.$login.r.find(value => value === '物联查询') || name === '历史指令查询') {
+          if (!this.$login.r.find(value => value === name)) {
+            return false
+          }
+        }
+        return true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/filiale/qianneng/sale.js

@@ -7,6 +7,7 @@ export default function () {
   Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
   Vue.component('handplan-query', (resolve) => { require(['./HandplanQuery'], resolve) })
   Vue.component('web-handplan-query', (resolve) => { require(['./WebHandplanQuery'], resolve) })
+  Vue.component('ckh-web-handplan-query', (resolve) => { require(['./CKHWebHandplanQuery'], resolve) })
 
   Vue.component('gasloss-query', (resolve) => { require(['./GasLossQuery'], resolve) })
   // 表具查询

package/src/filiale/qianneng/webmeterManage.js

@@ -3,5 +3,6 @@ import Vue from 'vue'
 export default function () {
   Vue.component('use-gas-statistics', (resolve) => { require(['./GasStatistics'], resolve) })
   Vue.component('webmeter-query', (resolve) => { require(['./WebmeterQuery'], resolve) })
+  Vue.component('ckh-webmeter-query', (resolve) => { require(['./CKHWebmeterQuery'], resolve) })
 }
 

package/src/filiale/tongchuan/MeterQuery.vue

@@ -302,6 +302,9 @@
                   <th>
                     <nobr>使用类型</nobr>
                   </th>
+                  <th>
+                    <nobr>使用日期</nobr>
+                  </th>
                   <th>
                     <nobr>用气性质</nobr>
                   </th>
@@ -376,6 +379,9 @@
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_usetype}}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_use_date}}</nobr>
+                </td>
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_gasproperties}}</nobr>
                 </td>

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

@@ -30,7 +30,7 @@ export default{
   },
   meterConfig: {
     'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_user_phone': '客户电话','idnumber': '身份证号','f_address': '客户地址','f_balance_amount': '表上余额',
-    'f_user_type': '客户类型','f_usetype': '使用类型','f_gasproperties': '用气性质','f_meternumber': '表号',"f_card_id":'卡号','f_price_name': '气价名称',
+    'f_user_type': '客户类型','f_usetype': '使用类型','f_use_date': '使用日期','f_gasproperties': '用气性质','f_meternumber': '表号',"f_card_id":'卡号','f_price_name': '气价名称',
     'value': '气价详情','f_meter_brand': '气表品牌', 'f_meter_style': '气表型号',
     'f_gas_person': '通气人','f_gas_date': '通气时间','f_input_date': '建表时间', 'f_table_state': '气表状态', 'isbgl': '是否壁挂炉','f_inputtor':'抄表员','f_book_name':'抄表册'
   },

package/src/webmeterManage.js

@@ -100,6 +100,8 @@ export default function () {
   Vue.component('new-query-instruct', (resolve) => { require(['./components/webmeter/instruction/NewQueryInstruct'], resolve) })
   // 物联网表结算查询
   Vue.component('report-data-query', (resolve) => { require(['./components/webmeter/reportdata/ReportDataQuery'], resolve) })
+  // 物联网表结算查询
+  Vue.component('ckh-report-data-query', (resolve) => { require(['./components/webmeter/reportdata/ckhReportDataQuery'], resolve) })
   // 充值指令查询
   Vue.component('recharge-instruct-query', (resolve) => { require(['./components/webmeter/recharge/RechargeList'], resolve) })
   // 物联网表用气量统计表