manage-client 3.2.126 → 3.2.127-weinan

package/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

package/package.json

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

package/src/components/SellReport/MarketMonthMoney.vue

@@ -0,0 +1,237 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div><!--
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
+              <right-tree @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='department'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid'>
+              </res-select>
+
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='user'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </div>
+-->
+            <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-excel>
+            <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
+                  'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="$parent.$parent.f_user_type"
+                        v-model="$parent.$parent.f_user_type"
+                        :options='$parent.$parent.user_type' placeholder='请选择'
+                        condition="f_user_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <!--<div class="col-sm-2 form-group">-->
+            <!--<label class="font_normal_body">收费状态</label>-->
+            <!--<v-select :value.sync="$parent.$parent.f_state" multiple-->
+            <!--v-model="$parent.$parent.f_state"-->
+            <!--:options='$parent.$parent.charge_state' placeholder='请选择'-->
+            <!--condition="f_state in {}"-->
+            <!--close-on-select></v-select>-->
+            <!--</div>-->
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">天然气售气表具月报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              <!--打印时间：{{{$parent.printTime}}}-->
+              打印时间：{{$parent.printTime}}
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+
+export default {
+  title: '天然气售气表具月报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      f_user_type: '',
+      f_state:['有效'],
+      model: new DataModel('rs/report/MarketMonthMoney', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow:['company','department','operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      console.log('23231312321:',this.f_user_type)
+      if(this.f_user_type && this.f_user_type[0]) {
+        orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
+      }
+      /*        if (this.f_orgid && this.f_orgid[0]) {
+                orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+              }
+              if (this.f_depid && this.f_depid[0]) {
+                orgcondition += ' and f_depid in (' + this.f_depid + ')'
+              }
+              if(this.f_operatorid && this.f_operatorid[0]) {
+                orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+              }*/
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
+        }
+      }
+      this.spans = len
+    }
+  },
+  computed: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/SellReport/UserGasFillCard.vue

@@ -1,441 +1,439 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
-      <div class="flex" v-if="!show">
-        <criteria-paged :model="model"  v-ref:paged>
-          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-              <div class="row">
-                <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">开始日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd 00:00:00'"
-                              :show-reset-button="true">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">结束日期</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd 23:59:59'"
-                              :show-reset-button="true">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
-                  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
-                  <res-select restype='department'
-                              @res-select="$parent.$parent.getdep"
-                              :parentresid="$parent.$parent.depresid"
-                              :initresid='$parent.$parent.depid'>
-                  </res-select>
-
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
-                  <res-select restype='user'
-                              is-mul="false"
-                              @res-select="$parent.$parent.getuser"
-                              :parentresid="$parent.$parent.userresid"
-                              :initresid='$parent.$parent.operatorid'>
-                  </res-select>
-                </div>
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="userGasFillCard"
-                                template-name='营业厅明细导出'
-                                :choose-col="true"></export-excel>
-                  <print-data-self :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" printName="营业厅明细"
-                              :sumsmodel="$parent.$parent.sumsmodel" :sum-field="$parent.$parent.sumField" :page-sum="$parent.$parent.pageSum"
-                                :start-date="$parent.$parent.startDate" :end-date="$parent.$parent.endDate"
-                  ></print-data-self>
-                </div>
-              </div>
-            </div>
-          </criteria>
-          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
-            <template partial='head'>
-              <tr>
-                <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>
-                <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">
-                <nobr>{{$index+1}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_userinfo_code}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_user_name}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_residential_area}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_pregas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gas1}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gas2}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gas3}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_preamount}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_user_type}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_type}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_date}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_operator}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_bill_number}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_bill_style}}</nobr>
-              </td>
-            </template>
-            <template partial='foot'></template>
-          </data-grid>
-        </criteria-paged>
-        <table class="table-hover">
-          <tr style="position: relative" class="table-bordered">
-            <td
-              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold" >
-              报表统计时间
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-if="startDate==endDate">
-              {{startDate}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-else>
-              {{startDate+" 至 "+endDate}}
-            </td>
-          </tr>
-          <tr style="position: relative" class="table-bordered">
-            <td
-              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
-              汇总信息
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              卡费:&emsp;{{sumsmodel.cardfee.toFixed(2)}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              合计方量:&emsp;{{sumsmodel.f_pregas.toFixed(2)}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              小计:{{sumsmodel.xiaoji.toFixed(2)}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              现金收入:&emsp;{{(sumsmodel.xianjin-sumsmodel.cardfee).toFixed(2)}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              转账收入:&emsp;{{sumsmodel.zhuanzhang.toFixed(2)}}&emsp;
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              合计金额:&emsp;{{(sumsmodel.f_preamount-sumsmodel.cardfee).toFixed(2)}}
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import {PagedList, HttpResetClass} from 'vue-client'
-  import defaultPrint from '../sale/config/DefaultPrint'
-  import exportConfig from '../sale/config/exportConfig'
-  import PrintDataSelf from '../sale/common/PrintDataSelf'
-
-  let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
-    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
-  }
-  export default {
-    title: '营业厅明细报表',
-    props: ['data'],
-    data() {
-      return {
-        depresid: [],
-        userresid: [],
-        f_orgid: this.$login.f.orgid,
-        f_depid: this.$login.f.depids,
-        f_operatorid: this.$login.f.id,
-        operatorid: [],
-        depid: [],
-        orgname: '',
-        depname: [],
-        operatorname: '',
-        orgCondtionStr: '1=1',
-        data: {},
-        other:[],
-        footer:[],
-        model: new PagedList('rs/sql/userGasFillCard', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid'},{
-          cardfee:0,
-          f_pregas:0,
-          f_preamount:0,
-          xianjin:0,
-          zhuanzhang:0
-        }),
-        gasproperties:[],
-        show:false,
-        rowdata:{},
-        residentialArea: [],
-        modelval: [],
-        startDate:"",
-        endDate:"",
-        inputtouPerson: [],
-        printshow: false,
-        all: false,
-        fields: {},
-        thead: '',
-        tfoot: '',
-
-        // 下拉框
-
-        //合计数据
-        sumsmodel: {},
-        sumField: {
-          'cardfee': '卡费', 'f_pregas': '方量', 'f_preamount': '金额', 'xiaoji': '小计','xianjin': '现金',
-          'zhuanzhang': '转账'
-        },
-        pageSum: {
-          'cardfee': '0.00',
-          'f_pregas': '0.00',
-          'f_preamount': '0.00',
-          'xianjin': '0.00',
-          'zhuanzhang': '0.00'
-        },
-        defaultfield: [],
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name']
-        },
-        batchmoneyShow:false
-      }
-    },
-    ready() {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
-    },
-    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.toStandardTimeString()}`);
-        let footerData=[],exportfield=this.getfield;
-        footerData.push("合计");
-        let self =this;
-        for(var field in self.sumsmodel){
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
-      search(){
-        this.$refs.paged.$refs.cri.search()
-      },
-      selfSearch(args) {
-        let orgcondition = ' s.f_orgid in (' + this.f_orgid + ')'
-        if (this.f_depid[0]) {
-          orgcondition += " and s.f_depid in("+this.f_depid.toString()+')'
-        }
-        if(this.f_operatorid[0]) {
-          orgcondition += ' and s.f_operatorid in (' + this.f_operatorid + ')'
-        }
-        this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
-        this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
-        this.orgCondtionStr=orgcondition
-        this.$refs.paged.$refs.cri.model.f_orgid = orgcondition
-        this.model.search(args.f_orgid, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-      },
-      getRes (obj) {
-        this.orgname = obj.res[0]
-        this.depresid = obj.resids
-        this.f_orgid = obj.resids
-      },
-      getdep (obj, val) {
-        this.depname = val
-        this.userresid = obj
-        this.f_depid = obj
-      },
-      getuser ( obj, val) {
-        this.operatorname = val[0]
-        this.f_operatorid = obj
-      },
-      stamp() {
-        this.all = false
-        //默认选择要打印的列
-        this.modelval = defaultPrint.config
-        this.fields = this.getfield
-        console.log('所有打印字段', this.fields)
-        this.printshow = true
-        this.put()
-      },
-      put() {
-        // 对Modelval进行排序
-        this.sortModelval()
-        this.thead = `<tr><th colspan=${this.modelval.length}>收费查询统计报表</th></tr><tr>`
-        for (let key of this.modelval) {
-          this.thead += '<th>' + this.fields[key] + '</th>'
-        }
-        this.thead += '</tr>'
-      },
-      print() {
-        this.$refs.print.PrintAsFile()
-        this.printshow = false
-      },
-      dealmsg(val) {
-        console.log('---------------dealmsg')
-        this.rowdata=val
-        this.show=true
-        val.model = this.model.model
-        this.$dispatch('deal-msg', val)
-      },
-      close() {
-        this.printshow = false
-        this.all = false
-      },
-      // 对选择的列进行排序
-      sortModelval() {
-        let sortModel = []
-        Object.keys(this.fields).forEach((key) => {
-          if (this.modelval.includes(key)) {
-            sortModel.push(key)
-          }
-        })
-        this.modelval = sortModel
-        console.log('选择的打印的字段', this.modelval)
-      },
-      userTypeChange () {
-        this.gasproperties=[]
-        if(this.$refs.paged.$refs.criteria.model !==null) {
-          this.$refs.paged.$refs.criteria.model.f_gasproperties=''
-          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
-        }
-        else{
-          this.gasproperties =[{label: '全部', value: ''}]
-        }
-      },
-    },
-    watch: {
-      'all'(val) {
-        if (val) {
-          this.modelval = this.bodyData
-        } else {
-          this.modelval = defaultPrint.config
-          this.put()
-        }
-      },
-      'modelval.length'() {
-        this.put()
-      },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
-      }
-    },
-    computed: {
-      getCondition() {
-        return {
-          startDate: this.$refs.paged.$refs.cri.model.startDate,
-          endDate: this.$refs.paged.$refs.cri.model.endDate,
-          f_orgid: this.orgCondtionStr
-
-        }
-
-      },
-      getfield() {
-        return exportConfig.UserGasFillCardConfig
-      },
-      whetherpaies () {
-        return [
-          {label: '全部', value: ''},
-          {label: '已缴费', value: '是'},
-          {label: '未缴费', value: '否'}
-        ]
-      },
-      usertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
-      }
-
-    }
-  }
-</script>
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+        <criteria-paged :model="model"  v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
+                  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='department'
+                              @res-select="$parent.$parent.getdep"
+                              :parentresid="$parent.$parent.depresid"
+                              :initresid='$parent.$parent.depid'>
+                  </res-select>
+
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='user'
+                              is-mul="false"
+                              @res-select="$parent.$parent.getuser"
+                              :parentresid="$parent.$parent.userresid"
+                              :initresid='$parent.$parent.operatorid'>
+                  </res-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="userGasFillCard"
+                                template-name='营业厅明细导出'
+                                :choose-col="true"></export-excel>
+                  <print-data-self :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" printName="营业厅明细"
+                              :sumsmodel="$parent.$parent.sumsmodel" :sum-field="$parent.$parent.sumField" :page-sum="$parent.$parent.pageSum"
+                                :start-date="$parent.$parent.startDate" :end-date="$parent.$parent.endDate"
+                  ></print-data-self>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
+            <template partial='head'>
+              <tr>
+                <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>
+                <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">
+                <nobr>{{$index+1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_userinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_pregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas2}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas3}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_preamount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bill_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bill_style}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold" >
+              报表统计时间
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-if="startDate==endDate">
+              {{startDate}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-else>
+              {{startDate+" 至 "+endDate}}
+            </td>
+          </tr>
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              卡费:&emsp;{{sumsmodel.cardfee.toFixed(2)}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              合计方量:&emsp;{{sumsmodel.f_pregas.toFixed(2)}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              小计:{{sumsmodel.xiaoji.toFixed(2)}}
+            </td>
+            <!--<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+              <!--现金收入:&emsp;{{(sumsmodel.xianjin-sumsmodel.cardfee).toFixed(2)}}-->
+            <!--</td>-->
+            <!--<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+              <!--转账收入:&emsp;{{sumsmodel.zhuanzhang.toFixed(2)}}&emsp;-->
+            <!--</td>-->
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              合计金额:&emsp;{{(sumsmodel.f_preamount-sumsmodel.cardfee).toFixed(2)}}
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import {PagedList, HttpResetClass} from 'vue-client'
+  import defaultPrint from '../sale/config/DefaultPrint'
+  import exportConfig from '../sale/config/exportConfig'
+  import PrintDataSelf from '../sale/common/PrintDataSelf'
+
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '营业厅明细报表',
+    props: ['data'],
+    data() {
+      return {
+        depresid: [],
+        userresid: [],
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        depname: [],
+        operatorname: '',
+        orgCondtionStr: '1=1',
+        data: {},
+        other:[],
+        footer:[],
+        model: new PagedList('rs/sql/userGasFillCard', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid'},{
+          cardfee:0,
+          f_pregas:0,
+          f_preamount:0
+        }),
+        gasproperties:[],
+        show:false,
+        rowdata:{},
+        residentialArea: [],
+        modelval: [],
+        startDate:"",
+        endDate:"",
+        inputtouPerson: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+
+        // 下拉框
+
+        //合计数据
+        sumsmodel: {},
+        sumField: {
+          'cardfee': '卡费', 'f_pregas': '方量', 'f_preamount': '金额', 'xiaoji': '小计','xianjin': '现金',
+          'zhuanzhang': '转账'
+        },
+        pageSum: {
+          'cardfee': '0.00',
+          'f_pregas': '0.00',
+          'f_preamount': '0.00',
+          'xianjin': '0.00',
+          'zhuanzhang': '0.00'
+        },
+        defaultfield: [],
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name']
+        },
+        batchmoneyShow:false
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    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.toStandardTimeString()}`);
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self =this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        let orgcondition = ' s.f_orgid in (' + this.f_orgid + ')'
+        if (this.f_depid[0]) {
+          orgcondition += " and s.f_depid in("+this.f_depid.toString()+')'
+        }
+        if(this.f_operatorid[0]) {
+          orgcondition += ' and s.f_operatorid in (' + this.f_operatorid + ')'
+        }
+        this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
+        this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
+        this.orgCondtionStr=orgcondition
+        this.$refs.paged.$refs.cri.model.f_orgid = orgcondition
+        this.model.search(args.f_orgid, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.f_orgid = obj.resids
+      },
+      getdep (obj, val) {
+        this.depname = val
+        this.userresid = obj
+        this.f_depid = obj
+      },
+      getuser ( obj, val) {
+        this.operatorname = val[0]
+        this.f_operatorid = obj
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        this.printshow = true
+        this.put()
+      },
+      put() {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>收费查询统计报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      print() {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      close() {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.criteria.model !==null) {
+          this.$refs.paged.$refs.criteria.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
+    },
+    computed: {
+      getCondition() {
+        return {
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          f_orgid: this.orgCondtionStr
+
+        }
+
+      },
+      getfield() {
+        return exportConfig.UserGasFillCardConfig
+      },
+      whetherpaies () {
+        return [
+          {label: '全部', value: ''},
+          {label: '已缴费', value: '是'},
+          {label: '未缴费', value: '否'}
+        ]
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      }
+
+    }
+  }
+</script>

package/src/reportManage.js

@@ -558,6 +558,10 @@ export default function (filiale) {
   Vue.component('price-report-whwu', (resolve) => {
     require(['./components/SellReport/PriceReportWHwu'], resolve)
   })
+  // 天然气售气表具月报表
+  Vue.component('market-month-money', (resolve) => {
+    require(['./components/SellReport/MarketMonthMoney'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-