manage-client 3.3.238 → 3.3.240

package/src/filiale/yangchun/HandplanQuery.vue

@@ -497,6 +497,15 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
+                <th>
+                  <nobr>抵扣单价</nobr>
+                </th>
+                <th>
+                  <nobr>本次抵扣金额</nobr>
+                </th>
+                <th>
+                  <nobr>剩余抵扣金额</nobr>
+                </th>
                 <th>
                   <nobr>附件</nobr>
                 </th>
@@ -653,6 +662,15 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_orgname }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_gas_type }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_current_deduct_amount }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_remaining_deduct_amount }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>
                   <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">

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

@@ -252,7 +252,10 @@ export default {
     'f_stair3fee': '三阶气费',
     'f_inputtor': '抄表员',
     'f_residential_area': '小区',
-    'f_serial_number': '业务单号'
+    'f_serial_number': '业务单号',
+    'f_gas_type': '抵扣单价',
+    'f_current_deduct_amount': '本次抵扣金额',
+    'f_remaining_deduct_amount': '剩余抵扣金额'
   },
   loginQueryConfig: {
     'userid': '登录人编号', 'username': '登录人名称', 'logindate': '登录时间', 'type': '类型'
@@ -664,6 +667,7 @@ export default {
     'f_changemeter_fee': '换表费',
     'f_meternumber_old': '旧表号',
     'f_meternumber': '新表号',
+    'f_meter_base_old': '旧表底数',
     'f_initial_base': '新表初始底数',
     'f_meter_brand_old': '旧气表品牌',
     'f_meter_brand': '新气表品牌',
@@ -835,7 +839,10 @@ export default {
     'f_stair3amount': '三阶气量',
     'f_stair3price': '三阶单价',
     'f_stair3fee': '三阶气费',
-    'f_rest_date': '所属年月'
+    'f_rest_date': '所属年月',
+    'f_gas_type': '抵扣单价',
+    'f_current_deduct_amount': '本次抵扣金额',
+    'f_remaining_deduct_amount': '剩余抵扣金额'
   },
   handplanInfoConfig: {
     'f_userinfo_code': '用户号',

package/src/filiale/yangchun/sale.js

@@ -21,4 +21,12 @@ export default function () {
   Vue.component('handplan-query', (resolve) => {
     require(['./HandplanQuery'], resolve)
   })
+  // 换表查询
+  Vue.component('change-meter-query', (resolve) => {
+    require(['./ChangeMeterQuery'], resolve)
+  })
+  // 收费查询
+  Vue.component('charge-query', (resolve) => {
+    require(['./ChargeQuery'], resolve)
+  })
 }

package/src/main.js

@@ -6,7 +6,7 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/meihekou/sale'
+import ShanXianSaleManage from './filiale/hantou/sale'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'

package/src/filiale/kelai/WebmeterQuery.vue

@@ -1,77 +0,0 @@
-<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('历史指令查询')">
-      <instruct-manage-history v-if="show.includes('历史指令查询')"></instruct-manage-history>
-    </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="!newWebHand && permission('用气查询')">
-      <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
-    </tabs>
-    <tabs header="新用气查询" v-if="permission('用气查询')">
-      <new-use-gas-statistics v-if="show.includes('用气查询')"></new-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="!newWebHand && permission('物联网表结算分析')">
-      <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
-    </tabs>
-    <tabs header="物联网表结算分析" v-if="newWebHand &&permission('物联网表结算分析')">
-      <new-webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></new-webmeter-settlement-analysis>
-    </tabs>
-    <tabs header="物联用户月度结算查询" v-if="permission('物联用户月度结算查询')">
-      <webhand-month-gas v-if="show.includes('物联用户月度结算查询')"></webhand-month-gas>
-    </tabs>
-  </tab-button>
-
-</template>
-
-<script>
-import TabButton from '../../components/sale/common/TabButton'
-import Tabs from '../../components/sale/common/Tabs'
-
-export default {
-  title: '物联查询',
-  data () {
-    return {
-      newWebHand: this.$appdata.getSingleValue('新抄表'),
-      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>