manage-client 3.1.23 → 3.1.24-aode

package/src/components/sale/report/aode/DayReportSummary.vue

@@ -1,75 +1,112 @@
-<template>
-  <div style="margin: 3%">
-    <!--    第一行数据-->
-    <div class="row" style="height: 50px">
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >发卡人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_count_open}}</label></div>
-      <div class="col-xs-2"><label type="text" class="form-control mystylecenter font_normal_body"> 发卡气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_pregas_open}}</label></div>
-      <div class="col-xs-2"><label type="text" class="form-control mystylecenter font_normal_body" >发卡金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_collection_open}}</label></div>
-    </div>
-  <div class="row" style="height: 50px">
-    <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >再购人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_count_zg}}</label></div>
-    <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >再购气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_pregas_zg}}</label></div>
-    <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >再购金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_collection_zg}}</label></div>
-  </div>
-    <div class="row" style="height: 50px">
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补气人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_count_bq}}</label></div>
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补气气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_pregas_bq}}</label></div>
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补气金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_collection_bq}}</label></div>
-    </div>
-    <div class="row" style="height: 50px">
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补卡人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_count_bk}}</label></div>
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补卡气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_pregas_bk}}</label></div>
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补卡金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_collection_bk}}</label></div>
-    </div>
-      <div class="row" style="height: 50px">
-        <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >换表人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_count_hb}}</label></div>
-        <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >换表气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_pregas_hb}}</label></div>
-        <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >换表金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_collection_hb}}</label></div>
-      </div>
-    <div class="row" style="height: 50px">
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >冲正人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_count_cz}}</label></div>
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >冲正气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_pregas_cz}}</label></div>
-      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >冲正金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_collection_cz}}</label></div>
-    </div>
-      <div class="row" style="height: 50px">
-        <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >业务人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_sum_count}}</label></div>
-        <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >业务气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_shouru_gas}}</label></div>
-        <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >业务金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body" >{{sumsmodel.f_shouru_fee}}</label></div>
-      </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "DayReportSummary",
-    props: {
-      sumsmodel: {}
-    },
-    watch: {
-      sumsmodel(val){
-        console.log(val,"====================")
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .datapanel {
-    color: #333;
-    background-color: white;
-    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
-    padding: 10px 30px 10px 30px;
-    border-radius:15px;
-    width: 100%;
-  }
-  .mystyleboder{
-    border: 0px;
-    text-align: left;
-    padding-left: 3px;
-  }
-  .mystylecenter{
-    border: 0px;
-    text-align: center;
-    padding-left: 3px;
-  }
-</style>
+<template>
+  <div style="margin: 3%;height:93%;overflow-y: scroll;">
+    <!--    第一行数据-->
+    <div class="row" style="height: 50px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >开户人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_open}}</label></div>
+      <div class="col-xs-2"><label type="text" class="form-control mystylecenter font_normal_body"> 开户气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_open}}</label></div>
+      <div class="col-xs-2"><label type="text" class="form-control mystylecenter font_normal_body" >开户金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_open}}</label></div>
+    </div>
+    <div class="row" style="height: 50px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >再购人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_zg}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >再购气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_zg}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >再购金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_zg}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补气人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_bq}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补气气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_bq}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补气金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_bq}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补卡人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_bk}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补卡气量</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_bk}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补卡金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_bk}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >涨价补费人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_zjbf}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >涨价补费金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_zjbf}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >物联网补费人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_iotbf}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >物联网补费金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_iotbf}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >物联网扣费人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_iotkf}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >物联网扣费金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_iotkf}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >预收款金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_ysk}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >预收款人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_ysk}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >换表人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_hb}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >换表气量</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_hb}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >换表金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_hb}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >冲正人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_cz}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >冲正气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_cz}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >冲正金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_cz}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >业务人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sum_count}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >业务气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_shouru_gas}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >实收金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_shouru_fee}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >应收金额</label></div><div class="col-xs-2"><label type="text"   class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_yingshou_fee}}</label></div>
+      <div class="col-xs-3"><label type="text" :title="sumsmodel.f_benqi_fee"  class="form-control mystylecenter font_normal_body" >本期新增结余</label></div><div class="col-xs-1"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_benqi_fee}}</label></div>
+      <div class="col-xs-3"><label :title="sumsmodel.f_usebenqi_fee" type="text"  class="form-control mystylecenter font_normal_body" >本期使用结余</label></div><div   class="col-xs-1"><label type="text"   class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_usebenqi_fee}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >柜台微信</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumgtwx}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >财务收款</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumcwsf}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >现金缴费</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumxjjf}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >柜台支付宝</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumzfb}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >pos</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumpos}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >销售气票</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumqp}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >银行码收款</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumyysk}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >降价补气</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumjjbq}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >煤改气补贴款</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumbtk}}</label></div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "DayReportSummary",
+    props: {
+      sumsmodel: {}
+    },
+    watch: {
+      sumsmodel(val){
+        console.log(val,"====================")
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 10px 30px 10px 30px;
+    border-radius:15px;
+    width: 100%;
+  }
+  .mystyleboder{
+    border: 0px;
+    text-align: left;
+    padding-left: 3px;
+  }
+  .mystylecenter{
+    border: 0px;
+    text-align: center;
+    padding-left: 3px;
+  }
+  .linelabel{
+    line-height: 60px!important;
+  }
+</style>

package/src/components/sale/report/aode/MonthByChargeType.vue

@@ -60,10 +60,13 @@
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
 
-                  <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                  <export-excel-hand :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                                     :other-data="$parent.$parent.other"
+                                     :footer-data="$parent.$parent.footer" v-ref:exports
+                                     :defaultselect="$parent.$parent.selectfields"
                                 :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
-                                sqlurl="rs/logic/exportfile" sql-name="aode_monthByChargeType" template-name='月报（缴费类型）'
-                                :choose-col="true"></export-excel>
+                                sqlurl="rs/logic/reportExportfile" sql-name="aode_monthByChargeType" template-name='月报（缴费类型）'
+                                :choose-col="true"></export-excel-hand>
 
                   <!--<print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
                               <!--:defaultfield="$parent.$parent.defaultfield" print-name="月报（缴费类型）"></print-data>-->
@@ -115,6 +118,21 @@
                 <th>
                   <nobr>换表人次</nobr>
                 </th>
+                <th>
+                  <nobr>柜台微信</nobr>
+                </th>
+                <th>
+                  <nobr>财务收款</nobr>
+                </th>
+                <th>
+                  <nobr>现金缴费</nobr>
+                </th>
+                <th>
+                  <nobr>柜台支付宝</nobr>
+                </th>
+                <th>
+                  <nobr>P&nbsp;O&nbsp;S</nobr>
+                </th>
                 <th>
                   <nobr>换表金额</nobr>
                 </th>
@@ -169,6 +187,21 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_count_hb}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment =='柜台微信'? row.f_collection:0}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment =='财务收款'? row.f_collection:0}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment =='现金缴费'? row.f_collection:0}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment =='柜台支付宝'? row.f_collection:0}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment =='pos'? row.f_collection:0}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_collection_hb}}</nobr>
               </td>
@@ -222,6 +255,21 @@
               <td style="text-align: center;background-color: mistyrose">
                 <nobr>{{model.sums.f_count_hb}}</nobr>
               </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{row.f_payment =='柜台微信'? row.f_collection:0}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{row.f_payment =='财务收款'? row.f_collection:0}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{row.f_payment =='现金缴费'? row.f_collection:0}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{row.f_payment =='柜台支付宝'? row.f_collection:0}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{row.f_payment =='pos'? row.f_collection:0}}</nobr>
+              </td>
               <td style="text-align: center;background-color: mistyrose">
                 <nobr>{{model.sums.f_collection_hb}}</nobr>
               </td>
@@ -257,6 +305,8 @@
     title: '月报（缴费类型）',
     data() {
       return {
+        other:[],
+        footer:[],
         model: new PagedList('rs/sql/aode_monthByChargeType', 35, {YeanMouthDate: 'this.model.YeanMouthDate',f_begin_operate_date: 'this.model.f_begin_operate_date',f_end_operate_date: 'this.model.f_end_operate_date'}, {
           f_count_open:0,
           f_pregas_open:0,
@@ -296,7 +346,8 @@
         ' f_count_bq', 'f_pregas_bq','f_collection_bq',
         'f_count_hb', 'f_collection_bk',
         'f_count','f_pregas','f_collection'
-        ]
+        ],
+        selectfields:[]
       }
     },
     ready() {
@@ -305,8 +356,30 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.dataReportConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
+      getotherfooter(){
+        this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other=[];
+        this.footer=[];
+        let exportdata = this.getCondition;
+        let otherInData=[];
+
+        otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
+        otherInData.push(`导出人：${this.$login.f.name}`)
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
       async selfSearch(args) {
         let f_orgstr = this.orgCondtionStr
         if (!this.orgCondtionStr) {
@@ -344,7 +417,7 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         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[key] = ''
         })
       },
       show() {
@@ -408,11 +481,18 @@
       'modelval.length'() {
         this.put()
       },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
     },
     computed: {
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,f_operate_date:`${this.$refs.paged.$refs.cri.model.f_operate_date}`
-          + this.orgCondtionStr,f_begin_operate_date:`${this.$refs.paged.$refs.cri.model.f_begin_operate_date}` + this.orgCondtionStr,f_end_operate_date:`${this.$refs.paged.$refs.cri.model.f_end_operate_date}`}
+          ,f_begin_operate_date:`${this.$refs.paged.$refs.cri.model.f_begin_operate_date}` ,f_end_operate_date:`${this.$refs.paged.$refs.cri.model.f_end_operate_date}`,
+          YeanMouthDate:`${this.$refs.paged.$refs.cri.model.YeanMouthDate}`}
       },
       getfield() {
         return exportConfig.monthByChargeConfig

package/src/components/sale/report/aode/MonthByUserType.vue

@@ -63,11 +63,14 @@
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
 
-                  <export-excel :data="$parent.$parent.getCondition"
+                  <export-excel-hand :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
+                                     :other-data="$parent.$parent.other"
+                                     :footer-data="$parent.$parent.footer" v-ref:exports
                                 :sumname="$parent.$parent.sumName"
-                                sqlurl="rs/logic/exportfile" sql-name="aode_monthByUserType" template-name='月报（客户类型）'
-                                :choose-col="true"></export-excel>
+                                :defaultselect="$parent.$parent.selectfields"
+                                sqlurl="rs/logic/reportExportfile" sql-name="aode_monthByUserType" template-name='月报（客户类型）'
+                                :choose-col="true"></export-excel-hand>
 
                   <!--<print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
                               <!--:defaultfield="$parent.$parent.defaultfield" print-name="月报（客户类型）"></print-data>-->
@@ -119,6 +122,21 @@
                 <th>
                   <nobr>工业金额</nobr>
                 </th>
+                <th>
+                  <nobr>柜台微信</nobr>
+                </th>
+                <th>
+                  <nobr>财务收款</nobr>
+                </th>
+                <th>
+                  <nobr>现金缴费</nobr>
+                </th>
+                <th>
+                  <nobr>柜台支付宝</nobr>
+                </th>
+                <th>
+                  <nobr>P&nbsp;O&nbsp;S</nobr>
+                </th>
                 <th>
                   <nobr>合计开户</nobr>
                 </th>
@@ -175,7 +193,21 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_collection_gy}}</nobr>
               </td>
-
+              <td style="text-align: center;">
+                <nobr>{{row.f_gtwx}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gtsk}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_xjjf}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gtzfb}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_pos}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_open}}</nobr>
               </td>
@@ -231,6 +263,21 @@
               <td style="text-align: center;background-color: mistyrose ">
                 <nobr>{{model.sums.f_collection_gy}}</nobr>
               </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{model.sums.f_gtwx}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{model.sums.f_gtsk}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{model.sums.f_xjjf}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{model.sums.f_gtzfb}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose">
+                <nobr>{{model.sums.f_pos}}</nobr>
+              </td>
               <td style="text-align: center;background-color: mistyrose ">
                 <nobr>{{model.sums.f_open}}</nobr>
               </td>
@@ -266,7 +313,8 @@
     title: '月报（客户类型）',
     data() {
       return {
-
+        other:[],
+        footer:[],
         model: new PagedList('rs/sql/aode_monthByUserType', 35,{YeanMouthDate: 'this.model.YeanMouthDate',f_begin_operate_date: 'this.model.f_begin_operate_date',f_end_operate_date: 'this.model.f_end_operate_date'},{
           f_open_my:0,
           f_count_my:0,
@@ -283,7 +331,12 @@
           f_open: 0,
           f_count: 0,
           f_pregas: 0,
-          f_collection: 0
+          f_collection: 0,
+          f_gtwx:0,
+          f_gtsk:0,
+          f_xjjf:0,
+          f_gtzfb:0,
+          f_pos:0
         }),
 
         oneShow: true,
@@ -304,8 +357,10 @@
         sumName:['f_open_my','f_count_my','f_pregas_my','f_collection_my','f_open_sy',
           'f_count_sy','f_pregas_sy','f_collection_sy','f_open_gy','f_count_gy',
           'f_pregas_gy','f_collection_gy','f_open','f_count','f_pregas',
-          'f_collection'
-        ]
+          'f_collection','f_gtwx','f_gtsk','f_xjjf','f_gtzfb','f_pos'
+        ],
+        selectfields:[],
+
       }
     },
     ready() {
@@ -314,8 +369,29 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.dataReportConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
+      getotherfooter(){
+        this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other=[];
+        this.footer=[];
+        let exportdata = this.getCondition;
+        let otherInData=[];
+        otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
+        otherInData.push(`导出人：${this.$login.f.name}`)
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
       async selfSearch(args) {
         let f_orgstr = this.orgCondtionStr
         if (!this.orgCondtionStr) {
@@ -357,7 +433,7 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         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[key] = ''
         })
       },
       show() {
@@ -385,11 +461,18 @@
       'modelval.length'() {
         this.put()
       },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
     },
     computed: {
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,YeanMouthDate:`${this.$refs.paged.$refs.cri.model.YeanMouthDate}`
-          + this.orgCondtionStr,f_begin_operate_date:`${this.$refs.paged.$refs.cri.model.f_begin_operate_date}` + this.orgCondtionStr,f_end_operate_date:`${this.$refs.paged.$refs.cri.model.f_end_operate_date}`}
+          ,f_begin_operate_date:`${this.$refs.paged.$refs.cri.model.f_begin_operate_date}`,f_end_operate_date:`${this.$refs.paged.$refs.cri.model.f_end_operate_date}`,
+          YeanMouthDate:`${this.$refs.paged.$refs.cri.model.YeanMouthDate}`}
       },
       getfield() {
         return exportConfig.monthByUserConfig

package/src/components/sale/report/aode/YearByChargeTpye.vue

@@ -32,7 +32,7 @@
 
 
               <export-excel :data="$parent.$parent.getCondition"
-                            :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
+                            :field="$parent.$parent.getfield" :defaultselect="$parent.$parent.selectfields"
                             sqlurl="rs/logic/exportfile" sql-name="aode_YearByChargeType" template-name='年报（缴费类型）'  :choose-col="true"></export-excel>
               <year-by-charge-print :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></year-by-charge-print>
             </div>
@@ -127,7 +127,8 @@
         sumName:[
         'f_count_open','f_pregas_open','f_collection_open',
         'f_count_zg', 'f_pregas_zg','f_collection_zg',
-        'f_count','f_pregas','f_collection']
+        'f_count','f_pregas','f_collection'],
+        selectfields:[],
       }
     },
     ready(){
@@ -136,6 +137,9 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.dataReportConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
       async selfSearch (args) {
@@ -161,7 +165,7 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         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[key] = ''
         })
       },
       show(){
@@ -191,7 +195,8 @@
     },
     computed:{
       getCondition(){
-        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr,YeadDate:`${this.$refs.paged.$refs.cri.model.YeadDate}`}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr,
+          YeadDate:`${this.$refs.paged.$refs.cri.model.YeadDate}`}
       },
       getfield(){
         return exportConfig.yearByChargeConfig