manage-client 3.1.13-aode → 3.1.14-aode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.1.13-aode",
+  "version": "3.1.14-aode",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/report/aode/othercharge/OtherDayReport.vue

@@ -0,0 +1,50 @@
+<template>
+  <div id="unit" class="flex-row" >
+    <div class="basic-main" :style="{width:width}">
+      <other-day-report-list @getdata="getdata" @close="close" @show="show" :style="style" v-ref:list ></other-day-report-list>
+    </div>
+    <div class="binary-right" v-if="summaryshow">
+      <ul class="nav nav-tabs">
+        <li class="active"><a href="#">数据汇总</a></li>
+      </ul>
+      <other-day-report-summary :sumsmodel="sumsmodel"  v-ref:gas></other-day-report-summary>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    title:'日清单(其他收费)',
+    name: "DayReport",
+    data () {
+      return {
+        width:'100%',
+        summaryshow:false,
+        style:'col-sm-2'
+      }
+    },
+    ready(){
+    },
+    methods:{
+      getdata(val){
+        console.log(val)
+        this.sumsmodel = val
+      },
+      show(){
+        this.width = '58%'
+        this.summaryshow = true
+        this.style='col-sm-3'
+      },
+      close(){
+        this.width = '100%'
+        this.summaryshow = false
+        this.style='col-sm-2'
+      }
+    }
+  }
+</script>
+
+<style>
+</style>
+

package/src/components/sale/report/aode/othercharge/OtherDayReportList.vue

@@ -0,0 +1,413 @@
+<template>
+  <div   v-if="!listpage"  @keyup.enter="search">
+    <criteria-paged :model="model" v-ref:paged @sort="sort">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <res-select-group :style="$parent.$parent.style" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" :style="$parent.$parent.style" v-ref:sel></res-select-group>
+            <div :class="$parent.$parent.style" >
+              <label for="startDate" class="font_normal_body">开始日期</label>
+              <datepicker  placeholder="开始日期" style="width:60%"
+                           v-model="model.f_startDate"
+                           :value.sync="model.f_startDate"
+                           :format="'yyyy-MM-dd HH:mm:ss'"
+                           class="datepicker"
+                           :show-reset-button="true"
+                           class="select"
+              >
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label for="endDate" class="font_normal_body">结束日期</label>
+              <datepicker  placeholder="结束日期" style="width:60%"
+                           v-model="model.f_endDate"
+                           :value.sync="model.f_endDate"
+                           :format="'yyyy-MM-dd HH:mm:ss'"
+                           class="datepicker"
+                           :show-reset-button="true"
+                           class="select"
+              >
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                        :options='$parent.$parent.useroptions' placeholder='请选择'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">收费类型</label>
+              <v-select :value.sync="model.f_type" v-model="model.f_type"
+                        :options='$parent.$parent.operates' placeholder='请选择'
+                        condition="f_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">操作状态</label>
+              <v-select :value.sync="model.f_state" v-model="model.f_state"
+                        :options='$parent.$parent.stateoptions' placeholder='请选择'
+                        condition="f_state = '{}'"
+                        close-on-select></v-select>
+            </div>
+<!--            <div :class="$parent.$parent.style">-->
+<!--              <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 {} "-->
+<!--                        close-on-select></v-select>-->
+<!--            </div>-->
+
+            <div class="button-range" style="float:right;margin-top:10px">
+              <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" v-ref:exportexcel
+                            :field="$parent.$parent.getfield"
+                            :defaultselect="$parent.$parent.selectfields"
+                            sqlurl="rs/logic/exportfile" sql-name="otherchargedayReport" template-name='日清单'  :choose-col="true"
+                            class="button_export button_spacing"></export-excel>
+              <other-day-report-list-print  :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></other-day-report-list-print>
+              <div style="float: right"  class="button_spacing" :class="{'button_shrink_left':$parent.$parent.criteriaShow,'button_shrink_right':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.show()"></div>
+            </div>
+
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" :sumsmodel="sumsmodel" partial='list' class="list_area table_sy" v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th><nobr>客户编号</nobr></th>
+            <th><nobr>客户姓名</nobr></th>
+            <th><nobr>客户类型</nobr></th>
+            <th><nobr>用气性质</nobr></th>
+            <th><data-order field="f_operate_date" name="操作时间"></data-order>
+              <!--<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>付款方式</nobr></th>
+            <th><nobr>操作员</nobr></th>
+            <th><nobr>备注</nobr></th>
+
+          </tr>
+        </template>
+        <template partial='body' >
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}" ><nobr>
+            <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+          </nobr> </td>
+          <td style="text-align: left;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_user_type}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_gasproperties}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_operate_date}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_state}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_type}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_typenumber}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_number}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_unitprice}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_collection}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_payment}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_operator}}</nobr></td>
+          <td style="text-align: left;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_comments}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <div v-if="listpage">
+    <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+  </div>
+</template>
+
+<script>
+
+  import { PagedList } from 'vue-client'
+  import exportConfig from '../../../config/exportConfig'
+  import OtherDayReportSummary from "./OtherDayReportSummary";
+  import getLodop from '../../../../../plugins/LodopFuncs'
+
+  export default {
+    components: {OtherDayReportSummary},
+    title: '日报表',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group'
+      },
+    },
+    data() {
+      return {
+        orderDefault: "'f_operate_date'",
+        orderFields: {
+          f_userinfo_code: 'no'
+        },
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[this.$login.f.depids],
+          user:[this.$login.f.id]
+        },
+        model: new PagedList('rs/sql/otherchargedayReport', 30, {orderitem: "'f_operate_date'"},{
+          f_count_othercharge:0,
+          f_collection_othercharge:0,
+          f_count_cz:0,
+          f_collection_cz:0,
+          f_sumgtwx:0,
+          f_sumcwsf:0,
+          f_sumxjjf:0,
+          f_sumzfb:0,
+          f_sumpos:0,
+          f_sumyhm:0,
+          f_sumxsqp:0,
+          f_sumjjbq:0
+        }),
+        listpage:false,
+        rowdata: {},
+        orgCondtionStr: '',
+        userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
+      count: 0,
+        sumsmodel: {},
+      printshow: false,
+        all: false,
+        orgname: '',
+        depname: '',
+        operaname:'',
+        criteriaShow: false,
+        operates: [{label: '全部', value: ''},...this.$appdata.getParam('品名及规格')],
+        stateoptions:[{label: '全部', value: ''}, {label: '有效', value: "有效"},{label: '撤销', value: "撤销"},{label: '无效', value: "无效"},{label: '冲正', value: "冲正"}],
+        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
+        useroptions:[{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')],
+      selectfields:[],
+        pushncshow2:false,
+        searchCondition:{},
+        pushconfirmflag: false,
+        footershow:true,
+        footershow3:false,
+    }
+    },
+    ready() {
+      this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
+      this.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
+      this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString() +' 00:00:00'
+      this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()+' 23:59:59'
+      for(var item in exportConfig.dataReportConfig){
+        this.selectfields.push(item)
+      }
+      // this.search()
+    },
+    methods: {
+      //推送数据
+      pushncdata(){
+        this.$refs.pushmanage.pushncdata();
+      },
+      //关闭推送确认窗口
+      closeCode(){
+        this.$refs.pushmanage.newmodel = {};
+        this.$refs.pushmanage.showmone = false;
+        this.pushconfirmflag = false;
+      },
+      //显示交账页面
+      showpushconfirm(){
+        this.search();
+        if(this.searchCondition.condition!=null && this.searchCondition.condition!='' && this.searchCondition.condition.includes("f_gasproperties") || this.searchCondition.condition.includes("f_type") ){
+          //this.$showMessage("交账失败,本次交账未保存,只能交账一天的数据,请确认交账时间后重新交账!!");
+          this.$showMessage("交账失败,本次交账未保存,请取消用气性质或操作类型选项,当前时间段内只允许交账一次!!");
+          return;
+        }
+        if(this.searchCondition.condition!=null && this.searchCondition.condition!='' && !this.searchCondition.condition.includes("f_state")){
+          this.$showAlert('请选择操作状态为有效进行交账!!','warning',2000);
+          return;
+        }
+        this.$showMessage("请进行一次查询后进行交账,",['confirm','cancel']).then(res=>{
+          if(res == 'confirm'){
+            this.pushconfirm();
+          }
+        })
+      },
+      pushconfirm(){
+        this.pushconfirmflag = true;
+      },
+      showmsg(obj){
+        this.criteriaShow = false
+        this.$emit('close')
+        this.rowdata=obj
+        this.listpage=true
+      },
+      cancel() {
+        this.listpage = false
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch(args) {
+        let f_orgstr = this.orgCondtionStr
+        if (!this.orgCondtionStr) {
+          f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
+        }
+        args.condition = `${args.condition} ` + f_orgstr
+
+        this.model.params.startDate = this.$refs.paged.$refs.cri.model.f_startDate
+        this.model.params.endDate = this.$refs.paged.$refs.cri.model.f_endDate
+
+        //推送条件: 需要 选择公司,部门
+        if(this.depname != null  && this.depname != '' ){
+          this.pushncshow2 = true;
+        }else{
+          this.pushncshow2= false;
+        }
+        this.searchCondition = this.getCondition;
+        await this.model.search(args.condition, args.model)
+
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        console.log('计算合计。', this.sumsmodel)
+        if (this.$refs.paged.$refs.grid.model.rows.length === 0) {
+          for (let key in this.sumsmodel) {
+            this.sumsmodel[key] = 0;
+          }
+        }
+        this.$dispatch('getdata', this.sumsmodel)
+      },
+      getRes(condition, obj) {
+        //判断最新组织和存储组织不同时,清空已经选择人员
+        if(obj.depnames[0] != this.depname){
+          this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
+        }
+        this.orgCondtionStr = condition;
+        this.orgname = obj.orgnames[0];
+        this.depname = obj.depnames[0];
+        if(obj.operatornames.length>0){
+          this.operaname =obj.operatornames[0];
+        }else{
+          this.operaname='';
+        }
+        //当未选中组织时不可进行推送
+        if(this.depname == null || this.depname == '' ){
+          this.pushncshow2 = false;
+        }else{
+          this.pushncshow2 = true;
+        }
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = [];
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = [];
+        //部门和人员变为全选
+        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.f_startDate = this.$login.toStandardDateString()+' 00:00:00';
+        this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()+ ' 23:59:59';
+      },
+      close() {
+        this.printshow = false
+      },
+      getfield() {
+
+        return exportConfig.dataReportConfig
+      },
+      show() {
+        this.pushncshow2 = !this.pushncshow2;
+        this.criteriaShow = !this.criteriaShow
+        if (this.criteriaShow) {
+          this.$emit('show')
+        } else {
+          this.$emit('close')
+        }
+      },
+      /*sort(field, rule) {
+        console.log('sort...')
+
+      },*/
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderDefault}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
+  },
+  events:{
+      'showtogglefooter'(){
+        this.footershow=true;
+      },
+      'hiddentogglefooter'(){
+        this.footershow=false
+      },
+      'confirmcolse'(){
+        this.pushconfirmflag = false;
+      },
+      'openbutton'(){
+        this.footershow3=true;
+      },
+      'closebutton'(){
+        this.footershow3=false;
+      }
+  },
+  computed: {
+    getCondition() {
+
+      return {
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+        startDate: this.$refs.paged.$refs.cri.model.f_startDate,
+        endDate: this.$refs.paged.$refs.cri.model.f_endDate,
+        orderitem: this.model.paramSource.orderitem.split("'")[1].split("'")[0]
+      }
+    },
+    getfield() {
+      //设置默认值
+
+      return exportConfig.dataReportConfig
+    },
+    gasproperties() {
+      console.log("xxx");
+      console.log(this.$appdata.getParam('用气性质'));
+      console.log(this);
+      let options = this.$appdata.getParam('用气性质')
+      let resultoptions = [];
+      if(options.length>0){
+        resultoptions.push({label: ' 全部 ', value: ''})
+        options.forEach((item)=>{
+          console.log(item)
+          resultoptions.push(item)
+        })
+      }
+      console.log(resultoptions);
+      return resultoptions;
+      //return [{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')]
+    }
+  },
+  watch:{
+      'pushncshow2'(val){
+        if(val){
+          this.search();
+        }
+      }
+  }
+  }
+
+</script>
+
+<style scoped>
+
+  .col {
+    width: 300px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+</style>

package/src/components/sale/report/aode/othercharge/OtherDayReportListPrint.vue

@@ -0,0 +1,240 @@
+<template>
+  <button class="button_export button_spacing" @click="stamp()">打印</button>
+</template>
+
+<script>
+  import getLodop from '../../../../../plugins/LodopFuncs'
+  import {PagedList} from "vue-client";
+
+  export default {
+    name: "DayReportListPrint",
+    title: '日报表打印',
+    props: {
+      countmodel:{
+        type:Object,
+        default:{}
+      }
+    },
+    data() {
+      return {
+        modelval: [],
+        fields: {},
+        thead: '',
+        tfoot: '',
+        model:{},
+        sumsmodel:{},
+        orgname: '',
+        depname: '0'
+      }
+    },
+    methods: {
+      async stamp() {
+         this.model = this.countmodel.model,
+          this.sumsmodel = this.countmodel.sumsmodel,
+          this.orgname = this.countmodel.orgname,
+          this.depname = this.countmodel.depname
+        // 验证，必须选择用气性质
+        if (this.model.model.f_gasproperties.length == 0 || this.model.model.f_gasproperties[0]=='') {
+          this.$showAlert('请选择用气性质条件，点击查询之后再进行打印！！', 'warning', 3000)
+          return
+        };
+
+        //默认选择要打印的列
+        this.modelval = [
+          "f_userinfo_code",
+          "f_user_name",
+          "f_operate_date",
+          "f_state",
+          "f_type",
+          "f_number",
+          "f_unitprice",
+          "f_collection",
+          "f_payment",
+          "f_operator",
+          "f_comments"
+        ];
+        this.fields = {
+          "f_userinfo_code": "客户编号",
+          "f_user_name": "客户姓名",
+          "f_operate_date": "充值时间",
+          "f_state":"操作状态",
+          "f_type": "收费类型",
+          "f_number": "数量",
+          "f_unitprice": "单价",
+          "f_collection": "实收金额",
+          "f_payment": "付款方式",
+          "f_operator": "操作员",
+          "f_comments": "备注"
+        };
+        this.put();
+        await this.print();
+        this.clear();
+      },
+      clear(){
+        this.model={};
+        this.sumsmodel={};
+        this.orgname= '';
+        this.depname= 0;
+      },
+      put() {
+        this.thead = `
+        <tr>
+          <th class="biaoti" colspan=${this.modelval.length} style="font-size: 6mm">
+              ${this.orgname}${this.depname ? this.depname : ''}统计报表   ${this.model.model.f_gasproperties ? this.model.model.f_gasproperties : ''}
+              ${this.model.model.f_type ? this.model.model.f_type : ''}
+          </th>
+        </tr>
+        <tr>
+          <th class="biaoti" colspan=${this.modelval.length}>统计日期：${this.model.model.f_startDate} ~ ${this.model.model.f_endDate}</th></tr>
+        <tr>
+        <tr>
+          <th class="biaoti" colspan=${this.modelval.length}>制单人：${this.$login.f.name} 打印时间: ${this.$login.toStandardTimeString()}</th></tr>
+        <tr style="text-align: left;font-family: 微软雅黑">
+          <th colspan=${this.modelval.length}>
+            <span>业务数量: ${this.sumsmodel.f_count_othercharge}</span>
+            <span>实收金额: ${this.sumsmodel.f_collection_othercharge}</span>
+            <span>应收金额: ${this.sumsmodel.f_collection_othercharge}</span>
+            <span>现金缴费: ${this.sumsmodel.f_sumxjjf}</span>
+            <span>柜台微信: ${this.sumsmodel.f_sumgtwx}</span>
+            <span>pos: ${this.sumsmodel.f_sumpos}</span>
+          </th>
+        </tr>
+        <tr style="text-align: left;font-family: 微软雅黑">
+          <th colspan=${this.modelval.length}>
+            <span>柜台支付宝: ${this.sumsmodel.f_sumzfb}</span>
+            <span>银行码收款: ${this.sumsmodel.f_sumyhm}</span>
+            <span>销售气票: ${this.sumsmodel.f_sumxsqp}</span>
+            <span>降价补气: ${this.sumsmodel.f_sumjjbq}</span>
+            <span></span>
+            <span></span>
+          </th>
+        </tr>
+`
+        this.thead += '<tr>';
+        for (let key of this.modelval) {
+          if (this.fields[key] == '客户姓名') {
+            this.thead += '<th class="khxm">' + this.fields[key] + '</th>'
+          } else if (this.fields[key] == '备注') {
+            this.thead += '<th class="bz">' + this.fields[key] + '</th>'
+          } else if(this.fields[key] == '应收金额'){
+            this.thead += '<th class="bz2">' + this.fields[key] + '</th>'
+          } else {
+            this.thead += '<th class="other">' + this.fields[key] + '</th>'
+          }
+        }
+        this.thead += '</tr>'
+      },
+      async print() {
+    // 开始打印
+    let lodop = getLodop()
+    lodop.PRINT_INIT('打印')
+
+    // 是否横向打印
+    console.log('是否横向打印？？', this.model.model.f_gasproperties[0])
+    let isHeng = this.model.model.f_gasproperties[0] === '民用用气' ? 1 : 2
+    console.log("isHeng----"+isHeng)
+    lodop.SET_PRINT_PAGESIZE(isHeng, 0, 0, "A4");
+
+    // 定义样式
+    let style;
+    if (isHeng == 2) {//横向打印
+      style = '' +
+        '<style>table {border-collapse: collapse;font-size:2.8mm} ' +
+        'table th {border-collapse: collapse;width: 264mm;border: 0.2mm solid black} ' +
+        'table td {border-collapse: collapse;text-align: center;border: 0.2mm solid black} ' +
+        '.biaoti {border-color: transparent} ' +
+        'table span {width: 36mm;text-align: left;display:inline-block}' +
+        '.comments {text-overflow: ellipsis;overflow: hidden;height:5.25mm;white-space: nowrap;width:34.32mm;} ' +
+        '.khxm {border-top: 0;width: 44.88mm} ' +
+        '.bz {border-top: 0;width: 34.32mm;} ' +
+        '.bz2 {border-top: 0;width: 13.20mm} ' +
+        '.other {border-top: 0;width: 13.20mm}</style>'
+    } else {//竖向打印
+      // 定义样式
+      style = '<style>table {border-collapse: collapse;font-size:2.8mm}' +
+        'table th {border-collapse: collapse;width: 180mm;border: 0.2mm solid black;}' +
+        'table td {border-collapse: collapse;text-align: center;border: 0.2mm solid black} ' +
+        '.biaoti {border-color: transparent} ' +
+        'table span {width: 25mm;text-align:left;display:inline-block;}' +
+        '.comments {width:16.6mm;text-overflow: ellipsis;overflow: hidden;height:5.25mm;white-space: nowrap;} ' +
+        '.khxm {border-top: 0;width: 14.4mm} ' +
+        '.bz {border-top: 0;width: 16.6mm;} ' +
+        '.bz2 {border-top: 0;width: 11.0mm} ' +
+        '.other {border-top: 0;width: 10.2mm}</style>'
+    }
+
+
+    let tHtml = style + '<table><thead>' + this.thead + '</thead><tbody>'
+    for (var i = 1; i <= this.model.totalPage; i++) {
+      await this.model.loadPage(i)
+      for (let j = 0; j < this.model.rows.length; j++) {
+        tHtml += '<tr>'
+        for (let field of this.modelval) {
+          if (field && this.model.rows[j]) {
+            if (field === 'f_comments' && this.model.rows[j][field]) {
+              tHtml += '<td ><div class="comments">' +
+                this.model.rows[j][field].substring(0, 10)
+                + '</div></td>'
+            } else {
+              tHtml += '<td>' + this.model.rows[j][field] + '</td>'
+            }
+          }
+        }
+        tHtml += '</tr>'
+      }
+    }
+    this.tfoot = `
+         <tr>
+          <td class="defaulttd" colspan='2' >
+            合计
+          </td>
+          <td class="defaulttd" colspan='3'  tdata="allSum" format="#,##0" align="right">
+          </td>
+          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0" align="left">
+            <font color="#0000FF" tindex="6">###</font>
+          </td>
+          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
+            <font color="#0000FF" tindex="7">###</font>
+          </td>
+          <td class="defaulttd" colspan='2'  tdata="allSum" format="#,##0.00" align="left">
+            <font color="#0000FF" tindex="8">###</font>
+          </td>
+          <td class="defaulttd" colspan='2'  tdata="allSum" format="#,##0.00" align="right">
+          </td>
+        </tr>`
+
+    // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
+    tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`
+    console.log('打印的html', tHtml)
+    //ADD_PRINT_TABLE(intTop,intLeft,intWidth,intHeight,strHtml)增加表格项
+    if (isHeng == 2) {//横向打印
+      lodop.ADD_PRINT_TABLE(0, 0, "264mm", 'BottomMargin:' + 30, tHtml);//增加表格项
+    } else {
+      lodop.ADD_PRINT_TABLE(0, 0, "200mm", 'BottomMargin:' + 30, tHtml);//增加表格项
+    }
+    lodop.SET_PRINT_STYLEA(0, "Horient", 2);//打印项在纸张中水平居中
+    // lodop.SET_PRINT_STYLEA(0,"Vorient",2);//打印项在纸张中垂直居中
+    // lodop.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-width')
+
+    // 设置页脚
+    lodop.ADD_PRINT_HTM("96%", "45%", 100, 50, `<font style="margin-top:2px;" color='#0000ff' format='##'><span tdata='pageNO'>第##页</span>/<span tdata='pageCount'>共##页</span></font>`);//增加超文本项
+    lodop.SET_PRINT_STYLEA(0, "ItemType", 1);
+    lodop.SET_PRINT_STYLEA(0, "Horient", 2);
+
+    // lodop.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-width')
+    // 设置打印方式 （横向|纵向）
+    lodop.SET_SHOW_MODE("LANDSCAPE_DEFROTATED", 1);
+    // 打印维护
+    // lodop.PRINT_SETUP()
+    // 使用打印预览是为了方便调整打印格式。例如：横向打印
+    lodop.PREVIEW()
+  },
+    }
+
+
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/sale/report/aode/othercharge/OtherDayReportSummary.vue

@@ -0,0 +1,67 @@
+<template>
+  <div style="margin: 3%">
+    <!--    第一行数据-->
+    <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_othercharge}}</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_othercharge}}</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_othercharge}}</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_collection_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_sumgtwx}}</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_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 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>
+    <div class="row" style="height: 60px">
+      <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_sumyhm}}</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_sumxsqp}}</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_sumjjbq}}</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/saleManage.js

@@ -229,4 +229,10 @@ export default function () {
   // 物联网充值监控
   Vue.component('iot-recharge-audit', (resolve) => { require(['./components/webmeter/IOTArrears/iotRechargeAudit'], resolve) })
 
+  // 其他收费日清单
+  Vue.component('other-day-report',(resolve) => { require(['./components/sale/report/aode/othercharge/OtherDayReport'], resolve)})
+  Vue.component('other-day-report-list',(resolve) => { require(['./components/sale/report/aode/othercharge/OtherDayReportList'], resolve)})
+  Vue.component('other-day-report-list-print',(resolve) => { require(['./components/sale/report/aode/othercharge/OtherDayReportListPrint'], resolve)})
+  Vue.component('other-day-report-summary',(resolve) => { require(['./components/sale/report/aode/othercharge/OtherDayReportSummary'], resolve)})
+
 }