manage-client 3.2.120 → 3.2.123

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

@@ -0,0 +1 @@
+

package/build/dev-server.js

@@ -13,9 +13,9 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8090'
+var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://121.36.106.17:8400'
+var fuwu = 'http://192.168.50.4:8400'
 // var fuwu = 'http://203.57.101.233:9001'
 var system = 'http://192.168.50.4:8400'
 //192.168.

package/package.json

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

package/src/components/SellReport/ManageBusSummarynopay.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/getmoneyallnopay', {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

@@ -185,22 +185,22 @@
               汇总信息
             </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(1)}}
+              卡费:&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(1)}}
+              合计方量:&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(1)}}
+              小计:{{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(1)}}
+              现金收入:&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(1)}}&emsp;
+              转账收入:&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(1)}}
+              合计金额:&emsp;{{(sumsmodel.f_preamount-sumsmodel.cardfee).toFixed(2)}}
             </td>
           </tr>
         </table>

package/src/components/sale/businessquery/CollectManage.vue

@@ -90,6 +90,9 @@
     <tabs header="未抄表用户报表" v-if="permission('未抄表用户报表')">
       <unhand-business @deal-msg="dealMsg"></unhand-business>
     </tabs>
+    <tabs header="明细报表查询" v-if="permission('明细报表查询')">
+      <report-detail ></report-detail>
+    </tabs>
   </tab-button>
 
 </template>

package/src/components/sale/businessquery/FMYGasQuery.vue

@@ -248,6 +248,9 @@
                 <th>
                   <nobr>用气金额</nobr>
                 </th>
+                <th>
+                  <nobr>建档日期</nobr>
+                </th>
               </tr>
             </template>
             <template partial='body'>
@@ -332,6 +335,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtfee}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_createfile_date}}</nobr>
+              </td>
             </template>
             <template partial='foot'></template>
           </data-grid>

package/src/components/sale/businessquery/MonthGasQuery.vue

@@ -358,8 +358,8 @@
             },
             selfSearch(args) {
                 args.condition = `${args.condition} ` + this.orgCondtionStr
-                let f_orgstr = this.orgCondtionStr + 'and f_orgid = ' + this.f_orgid
-                args.condition = `${args.condition} ` + f_orgstr
+                // let f_orgstr = this.orgCondtionStr + 'and f_orgid = ' + this.f_orgid
+                // args.condition = `${args.condition} ` + f_orgstr
                 this.model.search(args.condition, args.model)
                 this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
             },

package/src/components/sale/businessquery/PrickBillQuery.vue

@@ -100,9 +100,12 @@
                 <th>
                   <nobr>系统金额</nobr>
                 </th>
+                <th>
+                  <nobr>扎帐归属开始时间</nobr>
+                </th>
                 <th>
                   <!--<nobr>扎帐归属时间</nobr>-->
-                  <data-order field="f_end_date" name="扎帐归属时间" :order.sync="$parent.$parent.$parent.orderFields.f_end_date"></data-order>
+                  <data-order field="f_end_date" name="扎帐归属结束时间" :order.sync="$parent.$parent.$parent.orderFields.f_end_date"></data-order>
                 </th>
                 <th>
                   <!--<nobr>操作时间</nobr>-->
@@ -135,6 +138,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_report_fee}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_start_date}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_end_date}}</nobr>
               </td>

package/src/components/sale/businessquery/reportDetail.vue

@@ -0,0 +1,256 @@
+<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 HH:mm:ss"
+                              :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 HH:mm:ss"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <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>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="reportDetail"
+                                template-name='报表明细导出'
+                                :choose-col="true"></export-excel>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">支付流水号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_serial_id"
+                           condition="f_serial_id = '{}'" placeholder="支付流水号">
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">客户名称</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                           condition="f_user_name like '%{}%'" placeholder="客户名称">
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户电话</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                           placeholder="用户电话"  condition="f_user_phone='{}'">
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户地址</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                           placeholder="地址"  condition="f_address like '%{}%'">
+                  </div>
+                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :show-component="['company','department','operator']" v-ref:sel></res-select-group>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" 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>
+                  <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;">{{row.f_userinfo_code}}</td>
+              <td style="text-align: center;">{{row.f_user_name}}</td>
+              <td style="text-align: center;">{{row.f_address}}</td>
+              <td style="text-align: center;">{{row.f_user_phone}}</td>
+              <td style="text-align: center;">{{row.f_user_nature}}</td>
+              <td style="text-align: center;">{{row.f_meternumber}}</td>
+              <td style="text-align: center;">{{row.f_serial_id}}</td>
+              <td style="text-align: center;">{{row.f_type}}</td>
+              <td style="text-align: center;">{{row.f_brand_spec}}</td>
+              <td style="text-align: center;">{{row.f_typenumber}}</td>
+              <td style="text-align: center;">{{row.f_unitprice}}</td>
+              <td style="text-align: center;">{{row.f_number}}</td>
+              <td style="text-align: center;">{{row.f_collection}}</td>
+              <td style="text-align: center;">{{row.f_payment}}</td>
+              <td style="text-align: center;">{{row.f_operate_date}}</td>
+              <td style="text-align: center;">{{row.f_state}}</td>
+              <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
+              <td style="text-align: center;">{{row.f_depname}}</td>
+              <td style="text-align: center;">{{row.f_operator}}</td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+  /**
+   *档案查询列表以及添加操作组件
+   */
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+
+  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'
+  }
+
+  export default {
+    title: '报表明细',
+    data() {
+      return {
+        rows: null,
+        criteriaShow: false,
+        model: new PagedList('rs/sql/reportDetail', 20,
+          {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
+        orgCondtionStr: '',
+        getfield: '',
+        show:false,
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        defaultfield: []
+      }
+    },
+    ready() {
+      debugger
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        if (this.data) {
+          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
+          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+        }
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      cancel() {
+        this.show = false
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].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] = []
+        })
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj
+      }
+    },
+    watch: {
+
+    },
+    computed: {
+      getCondition() {
+        let result = {
+          condition: this.$refs.paged.$refs.cri.condition + this.orgCondtionStr,
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate
+        }
+
+        return result
+      },
+      getfield() {
+        return exportConfig.reportDetailConfig
+      }
+    }
+  }
+</script>
+

package/src/components/sale/config/exportConfig.js

@@ -372,7 +372,7 @@ export default{
   fmygasConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_credentials': '证件类型',
     'f_idnumber': '证件号码', 'f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_residential_area': '小区',
-    'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_meter_classify': '气表类型', 'f_price_value': '气价详情',
+    'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_meter_classify': '气表类型', 'f_price_value': '气价详情', 'f_createfile_date': '建档日期',
     'f_pregas': '预购气量', 'f_preamount': '预购金额', 'f_collection': '实交金额', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
     'f_hand_number': '抄表次数', 'f_date': '抄表区间', 'f_input_day': '天数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_usetype': '使用类型'
   },
@@ -666,7 +666,8 @@ export default{
   'f_operator': '操作员', 'f_operate_date': '时间', 'f_meternumber': '表号'
   },
   PrickBillConfig: {
-    'f_report_name': '报表名称', 'f_fee': '扎帐金额', 'f_report_fee': '系统金额', 'f_end_date': '扎帐归属时间',
+    'f_report_name': '报表名称', 'f_fee': '扎帐金额', 'f_report_fee': '系统金额',
+    'f_start_date': '扎帐归属开始时间', 'f_end_date': '扎帐归属结束时间',
     'f_operate_date': '操作时间', 'f_payment': '付款方式', 'f_state': '状态', 'f_orgname': '公司', 'f_depname': '部门',
     'f_operator': '操作员', 'f_remarks': '备注'
   },
@@ -1047,5 +1048,12 @@ export default{
     'itemname':'增值服务类型','yearstartdate':'上次购买时间','yearenddate':'本次购买时间',
     'f_orgname': '所属公司'
   },
+  reportDetailConfig: {
+    'f_userinfo_code': '用户编号', 'f_user_name': '用户名称', 'f_address': '用户地址', 'f_user_phone': '联系方式',
+    'f_user_nature': '用户类型', 'f_meternumber': '表号', 'f_serial_id': '支付流水号',
+    'f_type': '收费类型', 'f_brand_spec': '规格名称', 'f_typenumber': '型号', 'f_unitprice': '单价','f_number': '数量',
+    'f_collection': '收款', 'f_payment': '付款方式', 'f_operate_date': '收费日期', 'f_state': '状态',
+    'f_orgname': '所属机构', 'f_depname': '部门', 'f_operator': '操作人'
+  },
 }