manage-client 3.1.52 → 3.1.53-zk

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Oct 26 16:02:57 CST 2020
-gradle.version=6.1.1
+#Thu Apr 07 11:59:45 CST 2022
+gradle.version=4.9

package/build/dev-server.js

@@ -1,188 +1,170 @@
-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 fuwu='http://119.146.1.106:8300/'
-var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8083/'
-var fuwu_login = 'http://192.168.50.4:8400'
-//公司
-var fuwu='http://192.168.50.4:8400/'
-var fuwu='http://172.168.1.11:9001/'
-//经纬
-// var fuwu='http://60.222.250.39:8300/'
-//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
-  },
-  '/rs/entity':{
-    target:'http://127.0.0.1:8080'
-  },
-  '/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: fuwu
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/logic/getBatchOperaPro':{
-    target:  'http://127.0.0.1:8080'
-  },
-  '/rs/logic/machineChargePay':{
-    target:  'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: fuwu
-  }
-}
-
-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:8081/'
+var fuwu = 'http://192.168.20.28:8400/'
+var proxyTable = {
+  '/files': {
+    target: fuwu
+  },
+  '/rs/logic/exportfile': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/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: fuwu
+  },
+  '/rs/sql': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: fuwu
+  }
+}
+
+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/client.iml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
+    <src_description expected_position="0" />
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
+  </component>
+</module>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.1.52",
+  "version": "3.1.53-zk",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -63,10 +63,10 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.89-20",
+    "system-clients": "3.1.89-18",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.21",
+    "vue-client": "1.24.35",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",

package/src/components/Scard/NewScardSellReport.vue

@@ -0,0 +1,232 @@
+<template>
+    <div class="basic-main" style="height: 98%">
+      <criteria-paged :model="model" :pager='false' v-ref:paged>
+        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+          <p class="bg-info text-center" style="padding: 8px;">加气站scard汇总报表</p>
+          <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+            <div class="row">
+              <div class="col-sm-4" >
+                <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-4" >
+                <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>
+            <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>
+          </div>
+        </criteria>
+        <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+          <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+            <thead>
+            <tr>
+              <th colspan='9' style="font-weight: normal; text-align: left;">
+                <h3 style="text-align: center">加气站scard汇总报表</h3>
+              </th>
+            </tr>
+            <tr>
+              <th colspan='9' style="font-weight: normal; text-align: center;">
+                开始时间：{{model.model.startDate}}<br>
+                结束时间：{{ model.model.endDate }}<br>
+                打印时间：{{{$parent.printTime}}}
+              </th>
+            </tr>
+
+            </thead>
+            <tr>
+              <td colspan='9'>
+                {{{ model.data.substring(26,model.data.length-8) }}}
+              </td>
+            </tr>
+
+          </table>
+          {{{ $parent.reportStr}}}
+        </div>
+      </criteria-paged>
+      <modal :show.sync="show" v-ref:modal small backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <h4 class="modal-title">输入文件名称</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <div class="form-group">
+            <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+          <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
+        </footer>
+      </modal>
+    </div>
+  </template>
+
+  <script>
+    import { DataModel } from 'vue-client'
+    import co from 'co'
+    let saveFile = function * (self) {
+      // 线验证文件是否重名
+      let count = yield self.$resetpost('rs/sql/manageSingleTable',
+        {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+        {resolveMsg: null, rejectMsg: null})
+      if (count.data.length > 0) {
+        self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+        return
+      }
+      let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+        f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+        f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+        f_outlets: this.$login.f.depname})
+      if (saveBack.data.status === 'succeed') {
+        self.show = false
+        self.filename = ''
+        // 后台保存完成，通知刷新
+        self.$dispatch('save-success', self.filename)
+      }
+    }
+    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: '',
+          operatorname: '',
+          orgCondtionStr: '1=1',
+          model: new DataModel('rs/report/NewScardSellReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
+          reportStr: null,
+          show: false,
+        }
+      },
+      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'
+        // this.$refs.paged.$refs.criteria.search()
+        console.log(this.$login.f)
+      },
+      methods: {
+        searchData () {
+          this.$refs.paged.$refs.criteria.search()
+        },
+        selfSearch (args) {
+          this.printTime = this.$login.toStandardTimeString()
+          console.log( "condition:" + args.condition)
+          let orgcondition = '1=1'
+          if (this.f_orgid[0]) {
+            orgcondition += ' and f_orgid = ' + this.f_orgid
+          }
+          let deps = ''
+          let i = 0
+          let depss = ''
+          if (this.f_depid[0]) {
+            for ( i; i< this.f_depid.length; i++ )
+              deps += `'${this.f_depid[i]}',`
+            depss = deps.toString().substring(1,deps.length-2)
+            orgcondition +=  " and f_depid in ( '" + depss + "' ) "
+          }else {
+            depss = ''
+          }
+          console.log("所选部门:" + depss)
+
+          let opes = ''
+          let j = 0
+          let opess = ''
+          if(this.f_operatorid[0]) {
+            for ( j; j< this.f_operatorid.length; j++ )
+              opes += `'${this.f_operatorid[j]}',`
+            opess = opes.toString().substring(1,opes.length-2)
+            orgcondition += "and f_operatorid in ( '" + opess + "' ) "
+          }else {
+            opess = ''
+          }
+          console.log("所选人员:" + opess)
+
+          this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + " and " + args.condition
+          this.$refs.paged.search(args)
+        },
+        getRes (obj) {
+          this.orgname = obj.res[0]
+          this.depresid = obj.resids
+          this.f_orgid = obj.resids
+          this.userresid = obj.resids
+        },
+        getdep (obj, val) {
+          this.depname = val
+          // this.userresid = obj
+          this.f_depid = obj
+        },
+        getuser ( obj, val) {
+          this.operatorname = val
+          this.f_operatorid = obj
+        },
+
+        // 根据文件路径获取储存的报表内容
+        getFileContent (path) {
+          this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            this.reportStr = res.data.filecontent
+            this.model.state = '正确'
+          })
+        },
+        confirm () {
+          if (!this.filename || this.filename === '') {
+            this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
+          }
+          let saveGen = saveFile(this)
+          co(saveGen)
+        },
+        close () {
+          this.show = false
+        },
+        // 将报表保存成文件
+        confirmReport () {
+          this.show = true
+          this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+        },
+      },
+      watch: {
+        'data' (val) {
+          if (val.f_files_path) {
+            this.getFileContent(val.f_files_path)
+          } else {
+            this.reportStr = null
+          }
+        }
+      },
+      computed: {
+        metertypes() {
+          return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+        }
+      }
+    }
+  </script>
+  <style scoped>
+    .noborder{
+      border: none;
+    }
+  </style>