manage-client 3.3.95 → 3.3.96

package/src/filiale/WEINAN/ManageSummaryReportManage.vue

@@ -0,0 +1,58 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div :class="{'basic-main':!showDetail,'binary-left':showDetail}">
+      <manage-summary-report v-ref:gas
+                             @user-detail="selected"
+                             :style="style">
+      </manage-summary-report>
+    </div>
+    <div v-if="showDetail" class="binary-right">
+      <div class="flex">
+        <manage-summary-report-detail v-if="showDetail" :data="row">
+        </manage-summary-report-detail>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '营收汇总报表',
+  components: {},
+  data () {
+    return {
+      row: {},
+      showDetail: false,
+      companyId: null,
+      style: 'col-sm-2 form-group'
+    }
+  },
+  methods: {
+    selected (obj) {
+      console.log('看看选中的数据', obj)
+      if (obj) {
+        this.style = 'col-sm-3 form-group'
+        this.showDetail = true
+        this.row = obj
+        this.row.startDate = this.$refs.gas.$refs.paged.$refs.cri.model.startDate
+        this.row.endDate = this.$refs.gas.$refs.paged.$refs.cri.model.endDate
+        this.row.f_user_type = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_type
+        this.row.f_user_usetype = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_usetype
+        this.row.f_user_usenature = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_usenature
+        this.row.f_use_institution = this.$refs.gas.$refs.paged.$refs.cri.model.f_use_institution
+      }
+    },
+    refresh () {
+    }
+  },
+  events: {
+    'cancel' () {
+      this.style = 'col-sm-2 form-group'
+      this.row = null
+      this.showDetail = false
+    }
+  }
+}
+</script>
+<style>
+</style>

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

@@ -838,12 +838,20 @@ monthGasConfig: {
   manageChargeSummaryByCompanyConfig: {
     'f_company_name': '单位名称',
     'f_pregas': '购气（充值）数量',
+    'f_gas': '卡表购气量',
+    'f_card_money': '卡表购气金额',
+    'f_money': '物联网表购气金额',
+    'f_table_num': '表具数量',
     'f_stairamount1': '一阶气量',
     'f_collection': '实收款'
   },
   manageChargeSummaryByAreaConfig: {
     'f_residential_area': '小区名称',
     'f_pregas': '购气（充值）数量',
+    'f_gas': '卡表购气量',
+    'f_card_money': '卡表购气金额',
+    'f_money': '物联网表购气金额',
+    'f_table_num': '表具数量',
     'f_stairamount1': '一阶气量',
     'f_stairamount2': '二阶气量',
     'f_stairamount3': '三阶气量',

package/src/filiale/WEINAN/reportManage.js

@@ -7,6 +7,8 @@ export default function () {
   Vue.component('site-manager', (resolve) => { require(['./SiteManager'], resolve) })
   Vue.component('bank-manager', (resolve) => { require(['./BankManager'], resolve) })
   Vue.component('manage-summary-report', (resolve) => { require(['./ManageSummaryReport'], resolve) })
+  Vue.component('manage-summary-report-manage', (resolve) => { require(['./ManageSummaryReportManage'], resolve) })
+  Vue.component('manage-summary-report-detail', (resolve) => { require(['./ManageSummaryReportDetail'], resolve) })
   // 单位用气售气汇总
   Vue.component('manage-company-gas-summary', (resolve) => { require(['./ManageCompanyGasSummary'], resolve) })
   Vue.component('manage-company-gas-manage', (resolve) => { require(['./ManageCompanyGasManage'], resolve) })

package/src/filiale/daliyihua/RecordInfoQuery.vue

@@ -736,9 +736,9 @@
                 <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>-->
 <!--                <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>-->
-                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_building}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_unit}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>-->
                 <td style="text-align: center;"><nobr>{{row.f_room}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>-->

package/src/filiale/huayin/RecordInfoQuery.vue

@@ -725,9 +725,9 @@
                 <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
                 <!--                <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>-->
                 <!--                <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>-->
-                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_building}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_unit}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
                 <!--                <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>-->
                 <td style="text-align: center;"><nobr>{{row.f_room}}</nobr></td>
                 <!--                <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>-->

package/src/filiale/rongchuang/RecordInfoQuery.vue

@@ -578,9 +578,9 @@
                 <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</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_floor}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_building}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_unit}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_room}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{ row.f_price_type }}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></td>

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

@@ -159,7 +159,7 @@ export default{
   handplanConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_type':'客户类型','f_residential_area':'小区','f_user_phone': '客户手机', 'f_meternumber': '表号','ym_data': '数据年月','f_meter_classify': '气表类型','f_meter_brand': '气表品牌',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量','overdue':'违约金' ,'f_oughtfee': '用气金额', 'f_debt_money': '预存扣费','f_balance': '上期余额','f_curbalance': '本期余额',
-    'f_accounts_state': '下账状态', 'f_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
+    'f_accounts_state': '下账状态', 'f_sellinggas_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',
     'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费','f_actual_arrears':'实际欠费金额','alloughtfee':'已交气量合计',

package/src/filiale/shiquan/RecordInfoQuery.vue

@@ -735,9 +735,9 @@
 <!--                <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>-->
 <!--                <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>-->
                 <td style="text-align: center;"><nobr>{{row.f_street}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_building}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_unit}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>-->
                 <td style="text-align: center;"><nobr>{{row.f_room}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>-->