manage-client 3.2.120 → 3.2.121

package/build/dev-server.js

@@ -1,176 +1,176 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-// 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://172.168.1.11:9001'
-var fuwu = 'http://121.36.106.17:8400'
-// var fuwu = 'http://203.57.101.233:9001'
-var system = 'http://192.168.50.4:8400'
-//192.168.
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
-var proxyTable = {
-  '/rs/logic/exportfile': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: bendi
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: bendi
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+// 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://172.168.1.11:9001'
+var fuwu = 'http://121.36.106.17:8400'
+// var fuwu = 'http://203.57.101.233:9001'
+var system = 'http://192.168.50.4:8400'
+//192.168.
+//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
+// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
+var proxyTable = {
+  '/rs/logic/exportfile': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

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

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/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

@@ -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': '操作人'
+  },
 }
 

package/src/saleManage.js

@@ -576,6 +576,8 @@ export default function (filiale) {
   Vue.component('handplan-info',(resolve) =>{ require(['./components/sale/businessquery/handplan-info'], resolve)})
   // 未抄表用户报表
   Vue.component('unhand-business',(resolve) =>{ require(['./components/sale/businessquery/UnhandBusiness'], resolve)})
+  // 报表明细
+  Vue.component('report-detail',(resolve) =>{ require(['./components/sale/businessquery/reportDetail'], resolve)})
   // 分公司选择新组件,默认全选
   Vue.component('res-select-new', (resolve) => { require(['./filiale/tongchuan/ResSelectNew'], resolve)})
   // 分公司特殊页面注册替换