manage-client 3.2.62 → 3.2.63-aode

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

@@ -20,7 +20,7 @@
                   <label class="font_normal_body">包含APP</label>
                   <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
                             :options='$parent.$parent.hasapps' placeholder='请选择'
-                            condition="f_operator {} "
+                            condition="{} "
                             close-on-select></v-select>
                 </div>
               </div>
@@ -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>
@@ -248,7 +296,7 @@
 
   let readySomething = async function (self) {
     self.$refs.paged.$refs.cri.model.f_operate_date = self.$login.toStandardYearMonth()
-    self.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
+    self.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
     // await self.$refs.paged.$refs.cri.search()
     // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
@@ -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,
@@ -283,7 +333,7 @@
         oneShow: true,
         typeInfo: '选择月份',
         DateType:[{label:'选择月份',value:'选择月份'},{label:'选择区间',value:'选择区间'}],
-        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
+        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "f_operator != '悦生活'"},{label: '不包含POS', value: "len(f_voucher_number)<1"},{label: 'POS', value: "f_voucher_number!=''"}],
         criteriaShow: true,
         orgCondtionStr: '',
         sumsmodel: {},
@@ -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

@@ -18,11 +18,18 @@
                   >
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表类型</label>
+                  <v-select :value.sync="model.f_meter_type" v-model="model.f_meter_type"
+                            :options='$parent.$parent.metertypes' placeholder='请选择'
+                            :value-single="true"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">包含APP</label>
                   <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
                             :options='$parent.$parent.hasapps' placeholder='请选择'
-                            condition="f_operator {} "
+                            condition=" {} "
                             close-on-select></v-select>
                 </div>
               </div>
@@ -63,11 +70,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>-->
@@ -95,6 +105,12 @@
                 <th>
                   <nobr>民用金额</nobr>
                 </th>
+                <th>
+                  <nobr>民用补卡</nobr>
+                </th>
+                <th>
+                  <nobr>民用换表</nobr>
+                </th>
                 <th>
                   <nobr>商业开户</nobr>
                 </th>
@@ -107,6 +123,12 @@
                 <th>
                   <nobr>商业金额</nobr>
                 </th>
+                <th>
+                  <nobr>商业补卡</nobr>
+                </th>
+                <th>
+                  <nobr>商业换表</nobr>
+                </th>
                 <th>
                   <nobr>工业开户</nobr>
                 </th>
@@ -119,6 +141,27 @@
                 <th>
                   <nobr>工业金额</nobr>
                 </th>
+                <th>
+                  <nobr>工业补卡</nobr>
+                </th>
+                <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>
@@ -149,7 +192,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_collection_my}}</nobr>
               </td>
-
+              <td style="text-align: center;">
+                <nobr>{{row.f_myhb}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_mybk}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_open_sy}}</nobr>
               </td>
@@ -162,7 +210,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_collection_sy}}</nobr>
               </td>
-
+              <td style="text-align: center;">
+                <nobr>{{row.f_syhb}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_sybk}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_open_gy}}</nobr>
               </td>
@@ -175,7 +228,27 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_collection_gy}}</nobr>
               </td>
-
+              <td style="text-align: center;">
+                <nobr>{{row.f_gyhb}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gybk}}</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>
@@ -205,7 +278,12 @@
               <td style="text-align: center;background-color: mistyrose ">
                 <nobr>{{model.sums.f_collection_my}}</nobr>
               </td>
-
+              <td style="text-align: center;background-color: mistyrose ">
+                <nobr>{{model.sums.f_mybk}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose ">
+                <nobr>{{model.sums.f_myhb}}</nobr>
+              </td>
               <td style="text-align: center;background-color: mistyrose ">
                 <nobr>{{model.sums.f_open_sy}}</nobr>
               </td>
@@ -218,6 +296,12 @@
               <td style="text-align: center;background-color: mistyrose ">
                 <nobr>{{model.sums.f_collection_sy}}</nobr>
               </td>
+              <td style="text-align: center;background-color: mistyrose ">
+                <nobr>{{model.sums.f_sybk}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose ">
+                <nobr>{{model.sums.f_syhb}}</nobr>
+              </td>
 
               <td style="text-align: center;background-color: mistyrose ">
                 <nobr>{{model.sums.f_open_gy}}</nobr>
@@ -231,6 +315,28 @@
               <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_gybk}}</nobr>
+              </td>
+              <td style="text-align: center;background-color: mistyrose ">
+                <nobr>{{model.sums.f_gyhb}}</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>
@@ -258,7 +364,7 @@
   let readySomething = async function (self) {
     //console.log("拿到的默认时间是",self.$login.toStandardYearMonth())
     self.$refs.paged.$refs.cri.model.YeanMouthDate = self.$login.toStandardYearMonth()
-    self.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
+    self.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
     // await self.$refs.paged.$refs.cri.search()
   }
 
@@ -266,30 +372,42 @@
     title: '月报（客户类型）',
     data() {
       return {
-
-        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'},{
+        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_meter_type:'this.model.f_meter_type'},{
           f_open_my:0,
           f_count_my:0,
           f_pregas_my:0,
           f_collection_my:0,
+          f_mybk:0,
+          f_myhb:0,
           f_open_sy:0,
           f_count_sy:0,
           f_pregas_sy:0,
           f_collection_sy:0,
-          f_open_gy:0,
+          f_sybk:0,
+          f_syhb:0,
+          f_open_gy: 0,
           f_count_gy:0,
           f_pregas_gy:0,
           f_collection_gy:0,
+          f_gybk:0,
+          f_gyhb:0,
           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
         }),
-
+        metertypes:[{label: '全部', value: ''},{label:'卡表',value:'卡表'},{label:'机表',value:'机表'},{label:'物联网表',value:'物联网表'}],
         oneShow: true,
         typeInfo: '选择月份',
         DateType:[{label:'选择月份',value:'选择月份'},{label:'选择区间',value:'选择区间'}],
-        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
+        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "f_operator != '悦生活'"},{label: '不包含POS', value: "len(f_voucher_number)<1"},{label: 'POS', value: "f_voucher_number!=''"}],
         criteriaShow: true,
         orgCondtionStr: '',
         initres: {
@@ -297,15 +415,18 @@
           dep:[this.$login.f.depids],
           user:[this.$login.f.id]
         },
+
         sumsmodel: {},
         orgname: '',
         depname: '',
         defaultfield: [],
-        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'
-        ]
+        sumName:['f_open_my','f_count_my','f_pregas_my','f_collection_my','f_mybk','f_myhb','f_open_sy',
+          'f_count_sy','f_pregas_sy','f_collection_sy','f_sybk','f_syhb','f_open_gy','f_count_gy',
+          'f_pregas_gy','f_collection_gy','f_gybk','f_gyhb','f_open','f_count','f_pregas',
+          'f_collection','f_gtwx','f_gtsk','f_xjjf','f_gtzfb','f_pos'
+        ],
+        selectfields:[],
+
       }
     },
     ready() {
@@ -314,8 +435,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 +499,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 +527,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}`,f_meter_type:`${this.$refs.paged.$refs.cri.model.f_meter_type}`}
       },
       getfield() {
         return exportConfig.monthByUserConfig

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

@@ -21,7 +21,7 @@
               <label class="font_normal_body">包含APP</label>
               <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
                         :options='$parent.$parent.hasapps' placeholder='请选择'
-                        condition="f_operator {} "
+                        condition=" {} "
                         close-on-select></v-select>
             </div>
           </div>
@@ -31,9 +31,17 @@
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
 
 
-              <export-excel :data="$parent.$parent.getCondition"
-                            :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
-                            sqlurl="rs/logic/exportfile" sql-name="aode_YearByChargeType" template-name='年报（缴费类型）'  :choose-col="true"></export-excel>
+<!--              <export-excel :data="$parent.$parent.getCondition"-->
+<!--                            :field="$parent.$parent.getfield" :defaultselect="$parent.$parent.selectfields"-->
+<!--                            sqlurl="rs/logic/exportfile" sql-name="aode_YearByChargeType" template-name='年报（缴费类型）'  :choose-col="true"></export-excel>-->
+              <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"
+                                 :defaultselect="$parent.$parent.selectfields"
+                                 sqlurl="rs/logic/reportExportfile" sql-name="aode_YearByChargeType" template-name='年报（缴费类型）'
+                                 :choose-col="true"></export-excel-hand>
               <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>
           </div>
@@ -92,7 +100,7 @@
   let readySomething = async function (self) {
     let year = new Date().getFullYear()
     self.$refs.paged.$refs.cri.model.YeadDate = year+""
-    self.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
+    self.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
     // await self.$refs.paged.$refs.cri.search()
     // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
@@ -118,16 +126,19 @@
           user:[this.$login.f.id]
         },
         sumsmodel: {},
+        other:[],
+        footer:[],
         orgname: '',
         depname: '',
         criteriaShow: true,
-        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
+        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "f_operator != '悦生活'"},{label: '不包含POS', value: "len(f_voucher_number)<1"},{label: 'POS', value: "f_voucher_number!=''"}],
         orgCondtionStr:'',
         defaultfield:["f_operate_date","f_count_open","f_pregas_open","f_collection_open","f_count_zg","f_pregas_zg","f_collection_zg","f_count","f_pregas","f_collection"],
         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,8 +147,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){
@@ -161,12 +193,18 @@
         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(){
         this.criteriaShow = true
       },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
       hidden(){
         this.criteriaShow = false
       },
@@ -191,7 +229,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