npm - manage-client - Versions diffs - 3.3.70-s → 3.3.71 - Mend

manage-client 3.3.70-s → 3.3.71

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/build/dev-server.js +180 -204
package/package.json +1 -1
package/src/filiale/WEINAN/ManageSummaryReport.vue +9 -5
package/src/filiale/tongchuan/ManageBusSummary.vue +251 -240
package/src/main.js +70 -72

package/build/dev-server.js CHANGED Viewed

@@ -1,204 +1,180 @@
-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://220.194.141.253:8600/'
-// var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001/'
-// var bendi = 'http://203.57.101.233:8400/'
-// var bendi = 'http://121.36.106.17:8400/'
-// var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400/'
-// var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://127.0.0.1:8488/'
-// 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': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/files': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/logic/getSaleInitData': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/path/getParams': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/data': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/license': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/db': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/excel': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/config': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/sql/getLicenseById': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/report': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/vue': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/file': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/sql/singleTable': {
-    // changeOrigin: true,
-    target: bendi
-  },
-  '/rs/logic': {
-    target: bendi
-  },
-  '/rs/sql': {
-    target: bendi
-  },
-  '/rs': {
-    // changeOrigin: true,
-    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(8015, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8015')
-})
+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://220.194.141.253:8600/'
+// var bendi = 'http://203.57.101.233:9001'
+// var bendi = 'http://172.168.1.11:9001/'
+// var bendi = 'http://203.57.101.233:8400/'
+// var bendi = 'http://121.36.106.17:8400/'
+// var fuwu = 'http://203.57.101.233:9001'
+var bendi = 'http://121.36.106.17:8400'
+// var bendi = 'http://119.187.112.234:8400/'
+var wode = 'http://121.36.106.17: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: bendi
+  },
+  '/files': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: bendi
+  },
+  '/rs/logic/getSaleInitData': {
+    target: bendi
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: bendi
+  },
+  '/rs/path/getParams': {
+    target: bendi
+  },
+  '/rs/data': {
+    target: bendi
+  },
+  '/rs/license': {
+    target: bendi
+  },
+  '/rs/db': {
+    target: bendi
+  },
+  '/excel': {
+    target: bendi
+  },
+  '/rs/config': {
+    target: bendi
+  },
+  '/rs/sql/getLicenseById': {
+    target: bendi
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: bendi
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/sql/singleTable': {
+    target: bendi
+  },
+  '/rs': {
+    target: wode
+  }
+}
+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(8015, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8015')
+})

package/package.json CHANGED Viewed

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

package/src/filiale/WEINAN/ManageSummaryReport.vue CHANGED Viewed

@@ -1,6 +1,6 @@
 <template>
   <div id="unit" class="flex-row">
-    <div class="basic-main">
+    <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>
@@ -78,6 +78,7 @@
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type"
                             :options='$parent.$parent.usertypes'
+                            @change="$parent.$parent.userTypeChange()"
                             placeholder='请选择' v-model="model.f_user_type"
                             condition="f_user_type = '{}'"
                             close-on-select></v-select>
@@ -120,7 +121,6 @@
                             class="select_list select"
                             enter-push :disabled="$parent.$parent.isCompanyShow"
                             v-model="model.f_company_id" multiple="true"
-                            @select-search="$parent.$parent.getCompanyList"
                             :options='$parent.$parent.corporatename' placeholder='单位名称'
                             condition="f_company_id in {}">
                   </v-select>
@@ -431,6 +431,13 @@ export default {
         }
       }
     },
+    userTypeChange () {
+      this.userusetypes = []
+      if (this.$refs.paged.$refs.cri.model.f_user_type.length === 1) {
+        let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
+        this.userusetypes = this.$appdata.getParam(str)
+      }
+    },
     userUseInstitutionChange () {
       this.userusenatures = []
       if (this.$refs.paged.$refs.cri.model.f_use_institution.length === 1) {
@@ -593,9 +600,6 @@ export default {
       }
       return field
     },
-    userusetypes () {
-      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
-    },
     useTypes () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
     },

package/src/filiale/tongchuan/ManageBusSummary.vue CHANGED Viewed

@@ -1,240 +1,251 @@
-<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-3 form-group">
-              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
-              <v-select id="dep" style="width: 60%"
-                        :multiple="true"
-                        @change="$parent.$parent.getDep"
-                        :value.sync="model.f_depid"
-                        v-model="model.f_depid"
-                        :options='$parent.$parent.depresid' placeholder='请选择'
-                        condition="f_depid in {}">
-              </v-select>
-            </div>
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
-              <v-select id="oper" style="width: 60%"
-                        :multiple="false"
-                        @change="$parent.$parent.getOpe"
-                        :value.sync="model.f_operatorid"
-                        v-model="model.f_operatorid"
-                        :options='$parent.$parent.userresid' placeholder='请选择'
-                        condition="f_operatorid in {}">
-              </v-select>
-            </div>
-          </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_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="$parent.operatorname">人员：{{$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>
-      </div>
-    </criteria-paged>
-  </div>
-</template>
-<script>
-import {DataModel, HttpResetClass} from 'vue-client'
-import co from 'co'
-let getorg = async function (self) {
-  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
-    {
-      data: {
-        items: 'name label,id value',
-        tablename: 't_department',
-        condition: `1=1`
-      }
-    },
-    {resolveMsg: null, rejectMsg: null})
-    .then((res) => {
-      self.depresid = res.data
-    })
-  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
-    {
-      data: {
-        items: 'name label,id value',
-        tablename: 't_user',
-        condition: `state = '在职' and f_department_name is not null`
-      }
-    },
-    {resolveMsg: null, rejectMsg: null})
-    .then((res) => {
-      self.userresid = res.data
-    })
-}
-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_state:'',
-      model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'}),
-      reportStr: null,
-      spans: 0,
-      initres: {
-        org: [this.$login.f.orgid],
-        dep: [],
-        user: []
-      }
-    }
-  },
-  ready () {
-    getorg(this)
-    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 = ''
-      if (this.f_orgid[0]) {
-        orgcondition += `  and f_orgid in ('${this.f_orgid}')`
-      }
-      if(this.f_state && this.f_state[0]) {
-        orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
-      }
-      this.$refs.paged.$refs.criteria.model.f_orgid = args.condition + orgcondition
-      this.$refs.paged.search(args)
-    },
-    hidden() {
-      this.criteriaShow = !this.criteriaShow
-    },
-    getRes (obj) {
-      this.orgname = obj.res[0]
-      this.f_orgid = obj.resids
-    },
-    getDep(val){
-      this.depname = this.depresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
-      console.log('dep',this.depname )
-    },
-    getOpe(val){
-      this.operatorname = this.userresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
-      console.log('operatorname',this.operatorname )
-    },
-  },
-  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('收费状态')]
-    }
-  }
-}
-</script>
-<style scoped>
-.noborder{
-  border: none;
-}
-</style>
+<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-3 form-group">
+              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+              <v-select id="dep" style="width: 60%"
+                        :multiple="true"
+                        @change="$parent.$parent.getDep"
+                        :value.sync="model.f_depid"
+                        v-model="model.f_depid"
+                        :options='$parent.$parent.depresid' placeholder='请选择'
+                        condition="f_depid in {}">
+              </v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
+              <v-select id="oper" style="width: 60%"
+                        :multiple="false"
+                        @change="$parent.$parent.getOpe"
+                        :value.sync="model.f_operatorid"
+                        v-model="model.f_operatorid"
+                        :options='$parent.$parent.userresid' placeholder='请选择'
+                        condition="f_operatorid in {}">
+              </v-select>
+            </div>
+          </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_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="$parent.operatorname">人员：{{$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>
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {DataModel, HttpResetClass} from 'vue-client'
+import co from 'co'
+let getorg = async function (self) {
+  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
+    {
+      data: {
+        items: 'name label,id value',
+        tablename: 't_department',
+        condition: `1=1`
+      }
+    },
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      self.depresid = res.data
+    })
+  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
+    {
+      data: {
+        items: 'name label,id value',
+        tablename: 't_user',
+        condition: `state = '在职' and f_department_name is not null`
+      }
+    },
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      self.userresid = res.data
+    })
+}
+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_state:'',
+      model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  ready () {
+    getorg(this)
+    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 = ''
+      if (this.f_orgid[0]) {
+        orgcondition += `  and f_orgid in (${this.getParamStr(this.f_orgid)})`
+      }
+      if(this.f_state && this.f_state[0]) {
+        orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
+      }
+      this.$refs.paged.$refs.criteria.model.f_orgid = args.condition + orgcondition
+      this.$refs.paged.search(args)
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getParamStr (array) {
+      let stringValue = ''
+      for (let i = 0; i < array.length; i++) {
+        if (i === array.length - 1) {
+          stringValue = stringValue + "'" + array[i] + "'"
+        } else {
+          stringValue = stringValue + "'" + array[i] + "',"
+        }
+      }
+      return stringValue
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.f_orgid = obj.resids
+    },
+    getDep(val){
+      this.depname = this.depresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
+      console.log('dep',this.depname )
+    },
+    getOpe(val){
+      this.operatorname = this.userresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
+      console.log('operatorname',this.operatorname )
+    },
+  },
+  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('收费状态')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/main.js CHANGED Viewed

@@ -1,72 +1,70 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-// import saleManage from './saleManage'
-// import saleManageFiliale from './filiale/WEINAN/sale'
-// import webmeterManage from './webmeterManage'
-// import webmeterManageFiliale from './filiale/WEINAN/webmeterManage'
-import reportManage from './reportManage'
-import reportManageFiliale from './filiale/tongchuan/reportManage'
-// import newmanage from './newmanage'
-// import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-Vue.use(AMap);
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-// saleManage()
-// saleManageFiliale()
-// webmeterManage()
-// webmeterManageFiliale()
-// ManageHome()
-// newmanage()
-reportManage()
-reportManageFiliale()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import ShanXianSaleManage from './filiale/shanxian/sale'
+import ShanXianWebmeterManage from './filiale/shanxian/webmeterManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+Vue.use(AMap);
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+saleManage()
+ShanXianSaleManage()
+webmeterManage()
+ShanXianWebmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})