manage-client 3.1.1-1 → 3.1.1-10-fx

package/build/dev-server.js

@@ -1,160 +1,160 @@
-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:8093/manage', fuwu = 'http://127.0.0.1:8300'
-//  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/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/vue': {
-    target: fuwu
-  },
-  '/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:8093/manage', fuwu = 'http://127.0.0.1:8300'
+//  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/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/vue': {
+    target: fuwu
+  },
+  '/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/build.gradle

@@ -5,7 +5,7 @@ buildscript {
 	}
 }
 
-version = '3.1.0-16'
+version = '3.1.0-17'
 apply plugin: 'java'
 task release(type:Exec) {
 	workingDir '.'

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "manage-client",
-  "version": "3.1.1-1",
+  "version": "3.1.1-10-fx",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
     "test": "test"
   },
-  "dependencies": {},
+  "dependencies": {
+    "crypto-js": "4.1.1",
+    "swiper": "^5.4.5"
+  },
   "devDependencies": {
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
@@ -52,6 +55,7 @@
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "vue-amap": "0.5.10",
+    "jsencrypt": "3.0.0-rc.1",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.0",
     "sale-client": "3.1.0-22",
@@ -61,11 +65,11 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "1.21.61",
+    "vue-client": "1.21.71",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",
-    "system-clients": "3.0.31",
+    "system-clients": "3.0.41",
     "vue-resource": "^1.5.0",
     "vue-router": "^0.7.13",
     "vue-strap": "^1.0.9",

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

@@ -1,88 +1,91 @@
-<template>
-<!--  <div v-if="listpage">-->
-    <tab-button v-ref:list class="foot_tabset">
-      <tabs header="收费查询">
-        <charge-query @deal-msg="dealMsg"></charge-query>
-      </tabs>
-      <tabs header="换表查询">
-        <change-meter-query v-if="show[1]" @deal-msg="dealMsg"></change-meter-query>
-      </tabs>
-      <tabs header="抄表查询">
-        <handplan-query v-if="show[2]" @deal-msg="dealMsg"></handplan-query>
-      </tabs>
-      <tabs header="过户查询">
-        <transfer-query v-if="show[3]" @deal-msg="dealMsg"></transfer-query>
-      </tabs>
-      <tabs header="其他收费查询">
-        <other-charge-query v-if="show[4]" @deal-msg="dealMsg"></other-charge-query>
-      </tabs>
-      <tabs header="冲正查询">
-        <reverse-query v-if="show[5]" @deal-msg="dealMsg"></reverse-query>
-      </tabs>
-      <tabs header="补卡查询">
-        <fill-card-query v-if="show[6]" @deal-msg="dealMsg"></fill-card-query>
-      </tabs>
-      <tabs header="补气查询">
-        <fill-gas-query v-if="show[7]" @deal-msg="dealMsg"></fill-gas-query>
-      </tabs>
-      <tabs header="收费抄表">
-        <selling-hand v-if="show[8]" @deal-msg="dealMsg"></selling-hand>
-      </tabs>
-      <tabs header="启用查询">
-        <enable-query v-if="show[9]" @deal-msg="dealMsg"></enable-query>
-      </tabs>
-      <tabs header="停用查询">
-        <disable-query v-if="show[10]" @deal-msg="dealMsg"></disable-query>
-      </tabs>
-    </tab-button>
-<!--  </div>-->
-<!--  <div v-if="!listpage">-->
-<!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
-<!--  </div>-->
-</template>
-
-<script>
-  import TabButton from "../common/TabButton";
-  import Tabs from "../common/Tabs";
-  import ChargeQuery from "./ChargeQuery";
-
-  export default {
-    name: "BusinessQuery",
-    title: '业务查询',
-    data() {
-      return {// 页面开关
-        f_start_date:'',
-        f_end_date:'',
-        listpage: true,
-        width: {
-          left: '100%',
-          right: '0%'
-        },
-        // searchNumber:'',
-        rowData: {},
-        show: [true]
-      }
-    },
-    components: {Tabs, TabButton,ChargeQuery },
-    ready(){
-      console.log(this.$refs.list)
-      console.log('业务查询')
-    },
-    methods: {
-      cancel (obj) {
-        this.listpage = true
-      },
-      dealMsg(obj) {
-        this.rowData = obj
-        this.listpage = false
-        console.log(obj.model)
-        this.f_start_date = obj.model.startDate
-        this.f_end_date = obj.model.endDate
-      },
-    },
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+<!--  <div v-if="listpage">-->
+    <tab-button v-ref:list class="foot_tabset">
+      <tabs header="收费查询">
+        <charge-query @deal-msg="dealMsg"></charge-query>
+      </tabs>
+      <tabs header="换表查询">
+        <change-meter-query v-if="show[1]" @deal-msg="dealMsg"></change-meter-query>
+      </tabs>
+      <tabs header="抄表查询">
+        <handplan-query v-if="show[2]" @deal-msg="dealMsg"></handplan-query>
+      </tabs>
+      <tabs header="过户查询">
+        <transfer-query v-if="show[3]" @deal-msg="dealMsg"></transfer-query>
+      </tabs>
+      <tabs header="其他收费查询">
+        <other-charge-query v-if="show[4]" @deal-msg="dealMsg"></other-charge-query>
+      </tabs>
+      <tabs header="冲正查询">
+        <reverse-query v-if="show[5]" @deal-msg="dealMsg"></reverse-query>
+      </tabs>
+      <tabs header="补卡查询">
+        <fill-card-query v-if="show[6]" @deal-msg="dealMsg"></fill-card-query>
+      </tabs>
+      <tabs header="补气查询">
+        <fill-gas-query v-if="show[7]" @deal-msg="dealMsg"></fill-gas-query>
+      </tabs>
+      <tabs header="收费抄表">
+        <selling-hand v-if="show[8]" @deal-msg="dealMsg"></selling-hand>
+      </tabs>
+      <tabs header="启用查询">
+        <enable-query v-if="show[9]" @deal-msg="dealMsg"></enable-query>
+      </tabs>
+      <tabs header="停用查询">
+        <disable-query v-if="show[10]" @deal-msg="dealMsg"></disable-query>
+      </tabs>
+      <tabs header="开户查询">
+        <new-account-query v-if="show[11]" @deal-msg="dealMsg"></new-account-query>
+      </tabs>
+    </tab-button>
+<!--  </div>-->
+<!--  <div v-if="!listpage">-->
+<!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
+<!--  </div>-->
+</template>
+
+<script>
+  import TabButton from "../common/TabButton";
+  import Tabs from "../common/Tabs";
+  import ChargeQuery from "./ChargeQuery";
+
+  export default {
+    name: "BusinessQuery",
+    title: '业务查询',
+    data() {
+      return {// 页面开关
+        f_start_date:'',
+        f_end_date:'',
+        listpage: true,
+        width: {
+          left: '100%',
+          right: '0%'
+        },
+        // searchNumber:'',
+        rowData: {},
+        show: [true]
+      }
+    },
+    components: {Tabs, TabButton,ChargeQuery },
+    ready(){
+      console.log(this.$refs.list)
+      console.log('业务查询')
+    },
+    methods: {
+      cancel (obj) {
+        this.listpage = true
+      },
+      dealMsg(obj) {
+        this.rowData = obj
+        this.listpage = false
+        console.log(obj.model)
+        this.f_start_date = obj.model.startDate
+        this.f_end_date = obj.model.endDate
+      },
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>