sale-client 3.5.67 → 3.5.69

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 (6) hide show
  1. package/build/dev-server.js +164 -167
  2. package/package.json +1 -1
  3. package/src/filiale/guangxi/OtherGas.vue +1 -1
  4. package/src/filiale/shiquan/ChargeManage.vue +5 -4
  5. package/src/main.js +22 -22
  6. package/src/sale.js +5 -4
package/build/dev-server.js CHANGED
@@ -1,167 +1,164 @@
1
- var express = require('express')
2
- var webpack = require('webpack')
3
- var config = require('./webpack.dev.conf')
4
- var proxyMiddleware = require('http-proxy-middleware')
5
- // var httpProxy = require('http-proxy')
6
-
7
- var app = express()
8
- var compiler = webpack(config)
9
- // var proxy = httpProxy.createProxyServer()
10
-
11
- // Define HTTP proxies to your custom API backend
12
- // https://github.com/chimurai/http-proxy-middleware
13
- var bendi = 'http://192.168.50.4:8400/', bendi1 = 'http://121.36.106.17:8400/'
14
- // 公司测试服务
15
- var fuwu = 'http://192.168.50.4:8400/'
16
- // var fuwu = 'http://121.36.106.17:8400/'
17
- // 铜川正式
18
- // var fuwu = 'http://61.134.55.234:9999/'
19
- // 铜川测试
20
- // var fuwu = 'http://61.134.55.234:9999/'
21
- // var fuwu = 'http://60.222.250.39:8300/'
22
- // 韶关
23
- // var fuwu = 'http://119.146.1.106:8300/'
24
- // 巩义测试服务
25
- // var fuwu = 'http://192.168.0.227:8400'
26
- // 燎原测试服务
27
- // var fuwu = 'http://121.41.19.238:8400 '
28
- // var fuwu = 'http://121.41.19.238:9001/'
29
-
30
- // var fuwu = 'http://139.214.92.34:8301/'
31
-
32
- var proxyTable = {
33
- '/rs/logic/saleExport': {
34
- target: fuwu
35
- },
36
- '/rs/logic/saleGetExportProgress': {
37
- target: fuwu
38
- },
39
- '/rs/file': {
40
- target: fuwu
41
- },
42
- '/files': {
43
- target: fuwu
44
- },
45
- // 查找资源服务数据
46
- '/rs/search': {
47
- target: fuwu
48
- },
49
- // 查找资源服务数据
50
- '/rs/logic/getLogin': {
51
- target: fuwu
52
- },
53
- // 查找资源服务数据
54
- '/rs/logic/getInitData': {
55
- target: fuwu
56
- },
57
- '/rs/logic/getSaleInitData': {
58
- target: fuwu
59
- },
60
- '/invoice': {
61
- target: fuwu
62
- },
63
- '/entity': {
64
- target: fuwu
65
- },
66
- // 用户登录服务地址
67
- '/rs/user': {
68
- target: fuwu
69
- },
70
- '/rs/path/getParams': {
71
- target: fuwu
72
- },
73
- '/rs/data': {
74
- target: fuwu
75
- },
76
- '/rs/license': {
77
- target: fuwu
78
- },
79
- '/rs/db': {
80
- target: fuwu
81
- },
82
- '/excel': {
83
- target: fuwu
84
- },
85
- '/rs/config': {
86
- target: fuwu
87
- },
88
- '/rs/sql/getLicenseById': {
89
- target: fuwu
90
- },
91
- '/rs/sql/manage_getarealist': {
92
- target: fuwu
93
- },
94
- '/rs/sql/manage_getstreetlist': {
95
- target: fuwu
96
- },
97
- '/rs/report': {
98
- target: 'http://121.36.106.17:8400/'
99
- },
100
- '/rs/vue': {
101
- target: fuwu
102
- },
103
- '/webmeter': {
104
- target: 'http://192.168.50.4:8450'
105
- },
106
- '/rs': {
107
- // target: 'http://192.168.30.63:8081/'
108
- // target: 'http://121.36.106.17:8400/'
109
- target: bendi
110
- }
111
- }
112
-
113
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
114
- publicPath: config.output.publicPath,
115
- stats: {
116
- colors: true,
117
- chunks: false
118
- }
119
- })
120
-
121
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
122
- // force page reload when html-webpack-plugin template changes
123
- compiler.plugin('compilation', function (compilation) {
124
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
125
- hotMiddleware.publish({action: 'reload'})
126
- cb()
127
- })
128
- })
129
-
130
- // proxy api requests
131
- Object.keys(proxyTable).forEach(function (context) {
132
- var options = proxyTable[context]
133
- if (typeof options === 'string') {
134
- options = {target: options}
135
- }
136
- app.use(proxyMiddleware(context, options))
137
- })
138
-
139
- // handle fallback for HTML5 history API
140
- app.use(require('connect-history-api-fallback')())
141
- // app.use(function (req, res, next) {
142
- // res.header('Access-Control-Allow-Origin', '*')
143
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
144
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
145
- // res.header('X-Powered-By', '3,2,1')
146
- // res.header('Access-Control-Allow-Credentials', 'true')
147
- // res.header('Content-Type', 'application/json;charset=utf-8')
148
- // next()
149
- // })
150
-
151
- // serve webpack bundle output
152
- app.use(devMiddleware)
153
-
154
- // enable hot-reload and state-preserving
155
- // compilation error display
156
- app.use(hotMiddleware)
157
-
158
- // serve pure static assets
159
- app.use('/static', express.static('./static'))
160
-
161
- module.exports = app.listen(8089, function (err) {
162
- if (err) {
163
- console.log(err)
164
- return
165
- }
166
- console.log('Listening at http://localhost:8089')
167
- })
1
+ var express = require('express')
2
+ var webpack = require('webpack')
3
+ var config = require('./webpack.dev.conf')
4
+ var proxyMiddleware = require('http-proxy-middleware')
5
+ // var httpProxy = require('http-proxy')
6
+
7
+ var app = express()
8
+ var compiler = webpack(config)
9
+ // var proxy = httpProxy.createProxyServer()
10
+
11
+ // Define HTTP proxies to your custom API backend
12
+ // https://github.com/chimurai/http-proxy-middleware
13
+ var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
14
+ // 公司测试服务
15
+ var fuwu = 'http://121.36.106.17:8400'
16
+ // var fuwu = 'http://121.36.106.17:8400/'
17
+ // 铜川正式
18
+ // var fuwu = 'http://61.134.55.234:9999/'
19
+ // 铜川测试
20
+ // var fuwu = 'http://61.134.55.234:9999/'
21
+ // var fuwu = 'http://60.222.250.39:8300/'
22
+ // 韶关
23
+ // var fuwu = 'http://119.146.1.106:8300/'
24
+ // 巩义测试服务
25
+ // var fuwu = 'http://192.168.0.227:8400'
26
+ // 燎原测试服务
27
+ // var fuwu = 'http://121.41.19.238:8400 '
28
+ // var fuwu = 'http://121.41.19.238:9001/'
29
+
30
+ // var fuwu = 'http://139.214.92.34:8301/'
31
+
32
+ var proxyTable = {
33
+ '/rs/logic/saleExport': {
34
+ target: fuwu
35
+ },
36
+ '/rs/logic/saleGetExportProgress': {
37
+ target: fuwu
38
+ },
39
+ '/rs/file': {
40
+ target: fuwu
41
+ },
42
+ '/files': {
43
+ target: fuwu
44
+ },
45
+ // 查找资源服务数据
46
+ '/rs/search': {
47
+ target: fuwu
48
+ },
49
+ // 查找资源服务数据
50
+ '/rs/logic/getLogin': {
51
+ target: fuwu
52
+ },
53
+ // 查找资源服务数据
54
+ '/rs/logic/getInitData': {
55
+ target: fuwu
56
+ },
57
+ '/rs/logic/getSaleInitData': {
58
+ target: fuwu
59
+ },
60
+ '/invoice': {
61
+ target: fuwu
62
+ },
63
+ // 用户登录服务地址
64
+ '/rs/user': {
65
+ target: fuwu
66
+ },
67
+ '/rs/path/getParams': {
68
+ target: fuwu
69
+ },
70
+ '/rs/data': {
71
+ target: fuwu
72
+ },
73
+ '/rs/license': {
74
+ target: fuwu
75
+ },
76
+ '/rs/db': {
77
+ target: fuwu
78
+ },
79
+ '/excel': {
80
+ target: fuwu
81
+ },
82
+ '/rs/config': {
83
+ target: fuwu
84
+ },
85
+ '/rs/sql/getLicenseById': {
86
+ target: fuwu
87
+ },
88
+ '/rs/sql/manage_getarealist': {
89
+ target: fuwu
90
+ },
91
+ '/rs/sql/manage_getstreetlist': {
92
+ target: fuwu
93
+ },
94
+ '/rs/report': {
95
+ target: 'http://121.36.106.17:8400/'
96
+ },
97
+ '/rs/vue': {
98
+ target: fuwu
99
+ },
100
+ '/webmeter': {
101
+ target: 'http://192.168.50.4:8450'
102
+ },
103
+ '/rs': {
104
+ // target: 'http://192.168.30.63:8081/'
105
+ // target: 'http://121.36.106.17:8400/'
106
+ target: fuwu
107
+ }
108
+ }
109
+
110
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
111
+ publicPath: config.output.publicPath,
112
+ stats: {
113
+ colors: true,
114
+ chunks: false
115
+ }
116
+ })
117
+
118
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
119
+ // force page reload when html-webpack-plugin template changes
120
+ compiler.plugin('compilation', function (compilation) {
121
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
122
+ hotMiddleware.publish({action: 'reload'})
123
+ cb()
124
+ })
125
+ })
126
+
127
+ // proxy api requests
128
+ Object.keys(proxyTable).forEach(function (context) {
129
+ var options = proxyTable[context]
130
+ if (typeof options === 'string') {
131
+ options = {target: options}
132
+ }
133
+ app.use(proxyMiddleware(context, options))
134
+ })
135
+
136
+ // handle fallback for HTML5 history API
137
+ app.use(require('connect-history-api-fallback')())
138
+ // app.use(function (req, res, next) {
139
+ // res.header('Access-Control-Allow-Origin', '*')
140
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
141
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
142
+ // res.header('X-Powered-By', '3,2,1')
143
+ // res.header('Access-Control-Allow-Credentials', 'true')
144
+ // res.header('Content-Type', 'application/json;charset=utf-8')
145
+ // next()
146
+ // })
147
+
148
+ // serve webpack bundle output
149
+ app.use(devMiddleware)
150
+
151
+ // enable hot-reload and state-preserving
152
+ // compilation error display
153
+ app.use(hotMiddleware)
154
+
155
+ // serve pure static assets
156
+ app.use('/static', express.static('./static'))
157
+
158
+ module.exports = app.listen(8085, function (err) {
159
+ if (err) {
160
+ console.log(err)
161
+ return
162
+ }
163
+ console.log('Listening at http://localhost:8089')
164
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.67",
3
+ "version": "3.5.69",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/guangxi/OtherGas.vue CHANGED
@@ -199,7 +199,7 @@ let otherGasGen = async function (self) {
199
199
  params.cs = self.row.f_times + 1
200
200
  }
201
201
  // 如果上次气量上表，就把上次气量变成上上次气量，上上次变为上上上次
202
- if(self.filllast == '1'){
202
+ if (self.filllast == '0'){
203
203
  params.csql = params.ccsql
204
204
  params.lastmoney = params.lastlastmoney
205
205
  params.ccsql = params.cccsql
package/src/filiale/shiquan/ChargeManage.vue CHANGED
@@ -82,12 +82,13 @@ export default {
82
82
  console.log('双击列表的时候传进来的数据：', obj)
83
83
  let arr = []
84
84
  arr = this.rolename.split(',')
85
- if((obj.f_price_name != '城区生活用气'
86
- || obj.f_price_name != '城区暖气'
87
- || obj.f_price_name != '乡镇居民')
88
- && arr.indexOf('收费员') > -1){
85
+ if(arr.indexOf('收费员') > -1){
86
+ if(obj.f_price_name != '城区生活用气' &&
87
+ obj.f_price_name != '城区暖气' &&
88
+ obj.f_price_name != '乡镇居民'){
89
89
  this.$showAlert('网厅收费员暂时不能对 '+obj.f_price_name+' 用户 进行缴费，如有需要请联系管理员', 'warning', 5000)
90
90
  return
91
+ }
91
92
  }
92
93
  if (!(obj instanceof Event)) {
93
94
  // 对此数据进行验证
package/src/main.js CHANGED
@@ -1,22 +1,22 @@
1
- import Vue from 'vue'
2
- import { all } from 'vue-client'
3
- import App from './App'
4
- import { system } from 'system-clients'
5
- import sale from './sale'
6
- import { address } from 'address-client'
7
- import { ldap } from 'ldap-clients'
8
- import VueClipboard from 'vue-clipboard2'
9
- Vue.use(VueClipboard)
10
- Vue.config.silent = true
11
-
12
- all()
13
- system(false)
14
- sale('alashan')
15
- address()
16
- ldap()
17
- require('system-clients/src/styles/less/bootstrap.less')
18
-
19
- new Vue({
20
- el: 'body',
21
- components: { App }
22
- })
1
+ import Vue from 'vue'
2
+ import { all } from 'vue-client'
3
+ import App from './App'
4
+ import { system } from 'system-clients'
5
+ import sale from './sale'
6
+ import { address } from 'address-client'
7
+ import { ldap } from 'ldap-clients'
8
+ import VueClipboard from 'vue-clipboard2'
9
+ Vue.use(VueClipboard)
10
+ Vue.config.silent = true
11
+
12
+ all()
13
+ system(false)
14
+ sale()
15
+ address()
16
+ ldap()
17
+ require('system-clients/src/styles/less/bootstrap.less')
18
+
19
+ new Vue({
20
+ el: 'body',
21
+ components: { App }
22
+ })
package/src/sale.js CHANGED
@@ -187,9 +187,10 @@ export default function (filiale) {
187
187
  // 写卡用户历史记录
188
188
  Vue.component('his-user-list', (resolve) => { require(['./components/UserFiles/XieKaUser/HisUserList'], resolve) })
189
189
 
190
- // 调价管理
190
+ // 单户调价
191
191
  Vue.component('user-pricechange-manage', (resolve) => { require(['./components/UserFiles/UserPriceChangeManage'], resolve) })
192
-
192
+ // 单户调价 查看
193
+ Vue.component('user-price-change-history', (resolve) => { require(['./components/UserFiles/UserPriceChangeHistory'], resolve) })
193
194
  /** ************综合操作业务*****************/
194
195
  // 补卡管理
195
196
  Vue.component('replace-card-manage', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/ReplaceCard/ReplaceCardManage'], resolve) })
@@ -890,8 +891,8 @@ export default function (filiale) {
890
891
  Vue.component('return-money-examine', (resolve) => { require(['./components/charge/business/ReturnMoneyExamine'], resolve) })
891
892
  // 预存收费
892
893
  Vue.component('deposit-charge', (resolve) => { require(['./components/charge/business/depositCharge/DepositCharge'], resolve) })
893
- // 单户调价 页面
894
- Vue.component('user-price-change-history', (resolve) => { require(['./components/UserFiles/UserPriceChangeHistory'], resolve) })
894
+
895
+
895
896
  Vue.component('printing-file-user-files', (resolve) => { require(['./components/revenue/printing/PrintingFileUserFiles'], resolve) })
896
897
  Vue.component('printing-dispatch-down', (resolve) => { require(['./components/revenue/printing/PrintingDispatchDown'], resolve) })
897
898
  // 打印数据