sale-client 3.5.143 → 3.5.145

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 +195 -195
  2. package/package.json +1 -1
  3. package/src/components/FilesManage/UserGeneralInfoTest.vue +1 -1
  4. package/src/components/charge/ChargeOper.vue +6 -6
  5. package/src/filiale/dongguan/components/EditWebMeterInfo.vue +4 -0
  6. package/src/main.js +22 -22
package/build/dev-server.js CHANGED
@@ -1,195 +1,195 @@
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://192.168.50.4:8400'
16
- // var fuwu = 'http://39.99.85.14:8400'
17
- var fuwu = 'http://39.108.82.124:8400'
18
- // var fuwu = 'http://47.93.217.125:8400'
19
- // var fuwu = 'http://121.36.106.17:8400/'
20
- // 铜川正式
21
- // var fuwu = 'http://61.134.55.234:9999/'
22
- // 铜川测试
23
- // var fuwu = 'http://61.134.55.234:9999/'
24
- // var fuwu = 'http://60.222.250.39:8300/'
25
- // 韶关
26
- // var fuwu = 'http://119.146.1.106:8300/'
27
- // 巩义测试服务
28
- // var fuwu = 'http://192.168.0.227:8400'
29
- // 燎原测试服务
30
- // var fuwu = 'http://121.41.19.238:8400 '
31
- // var fuwu = 'http://121.41.19.238:9001/'
32
-
33
- // var fuwu = 'http://139.214.92.34:8301/'
34
-
35
- var proxyTable = {
36
- // '/'
37
- // '/rs/logic/stopBasicLivingNew':{
38
- // target:'http://127.0.0.1:8080'
39
- // },
40
- // '/rs/logic/getBatchOperaPro':{
41
- // target:'http://127.0.0.1:8080'
42
- // },
43
- // '/rs/sql/sale_getUser':{
44
- // target:'http://127.0.0.1:8080'
45
- // },
46
- // '/rs/logic/getOperBtns':{
47
- // target:'http://127.0.0.1:8080'
48
- // },
49
- // '/rs/file/uploadFile':{
50
- // target:'http://127.0.0.1:8080'
51
- // },
52
- // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
53
- // target:'http://127.0.0.1:8080'
54
- // },
55
- // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
56
- // target:'http:127.0.0.1:8080'
57
- // },
58
- // '/rs/sql/getDownPlan':{
59
- // target:'http:127.0.0.1:8080'
60
- // },
61
- // '/rs/logic/saleExport': {
62
- // target: fuwu
63
- // },
64
- // '/rs/logic/saleGetExportProgress': {
65
- // target: fuwu
66
- // },
67
- // '/rs/logic/getWarningMsg': {
68
- // target: 'http://localhost:8080/'
69
- // },
70
- '/rs/file': {
71
- target: fuwu
72
- },
73
- '/files': {
74
- target: fuwu
75
- },
76
- // 查找资源服务数据
77
- '/rs/search': {
78
- target: fuwu
79
- },
80
- // 查找资源服务数据
81
- '/rs/logic/getLogin': {
82
- target: fuwu
83
- },
84
- // 查找资源服务数据
85
- '/rs/logic/getInitData': {
86
- target: fuwu
87
- },
88
- '/rs/logic/getSaleInitData': {
89
- target: fuwu
90
- },
91
- '/invoice': {
92
- target: fuwu
93
- },
94
- // 用户登录服务地址
95
- '/rs/user': {
96
- target: fuwu
97
- },
98
- '/rs/path/getParams': {
99
- target: fuwu
100
- },
101
- '/rs/data': {
102
- target: fuwu
103
- },
104
- '/rs/license': {
105
- target: fuwu
106
- },
107
- '/rs/db': {
108
- target: fuwu
109
- },
110
- '/excel': {
111
- target: fuwu
112
- },
113
- '/rs/config': {
114
- target: fuwu
115
- },
116
- '/rs/sql/getLicenseById': {
117
- target: fuwu
118
- },
119
- '/rs/sql/manage_getarealist': {
120
- target: fuwu
121
- },
122
- '/rs/sql/manage_getstreetlist': {
123
- target: fuwu
124
- },
125
- '/rs/report': {
126
- target: 'http://121.36.106.17:8400/'
127
- },
128
- '/rs/vue': {
129
- target: fuwu
130
- },
131
- '/webmeter': {
132
- target: 'http://192.168.50.4:8450'
133
- },
134
- '/rs': {
135
- // target: 'http://192.168.30.63:8081/'
136
- // target: 'http://121.36.106.17:8400/'
137
- target: fuwu
138
- }
139
- }
140
-
141
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
142
- publicPath: config.output.publicPath,
143
- stats: {
144
- colors: true,
145
- chunks: false
146
- }
147
- })
148
-
149
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
150
- // force page reload when html-webpack-plugin template changes
151
- compiler.plugin('compilation', function (compilation) {
152
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
153
- hotMiddleware.publish({action: 'reload'})
154
- cb()
155
- })
156
- })
157
-
158
- // proxy api requests
159
- Object.keys(proxyTable).forEach(function (context) {
160
- var options = proxyTable[context]
161
- if (typeof options === 'string') {
162
- options = {target: options}
163
- }
164
- app.use(proxyMiddleware(context, options))
165
- })
166
-
167
- // handle fallback for HTML5 history API
168
- app.use(require('connect-history-api-fallback')())
169
- // app.use(function (req, res, next) {
170
- // res.header('Access-Control-Allow-Origin', '*')
171
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
172
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
173
- // res.header('X-Powered-By', '3,2,1')
174
- // res.header('Access-Control-Allow-Credentials', 'true')
175
- // res.header('Content-Type', 'application/json;charset=utf-8')
176
- // next()
177
- // })
178
-
179
- // serve webpack bundle output
180
- app.use(devMiddleware)
181
-
182
- // enable hot-reload and state-preserving
183
- // compilation error display
184
- app.use(hotMiddleware)
185
-
186
- // serve pure static assets
187
- app.use('/static', express.static('./static'))
188
-
189
- module.exports = app.listen(8089, function (err) {
190
- if (err) {
191
- console.log(err)
192
- return
193
- }
194
- console.log('Listening at http://localhost:8089')
195
- })
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://192.168.50.4:8400'
16
+ // var fuwu = 'http://39.99.85.14:8400'
17
+ var fuwu = 'http://219.138.226.181:8401/#'
18
+ // var fuwu = 'http://47.93.217.125:8400'
19
+ // var fuwu = 'http://121.36.106.17:8400/'
20
+ // 铜川正式
21
+ // var fuwu = 'http://61.134.55.234:9999/'
22
+ // 铜川测试
23
+ // var fuwu = 'http://61.134.55.234:9999/'
24
+ // var fuwu = 'http://60.222.250.39:8300/'
25
+ // 韶关
26
+ // var fuwu = 'http://119.146.1.106:8300/'
27
+ // 巩义测试服务
28
+ // var fuwu = 'http://192.168.0.227:8400'
29
+ // 燎原测试服务
30
+ // var fuwu = 'http://121.41.19.238:8400 '
31
+ // var fuwu = 'http://121.41.19.238:9001/'
32
+
33
+ // var fuwu = 'http://139.214.92.34:8301/'
34
+
35
+ var proxyTable = {
36
+ // '/'
37
+ // '/rs/logic/stopBasicLivingNew':{
38
+ // target:'http://127.0.0.1:8080'
39
+ // },
40
+ // '/rs/logic/getBatchOperaPro':{
41
+ // target:'http://127.0.0.1:8080'
42
+ // },
43
+ // '/rs/sql/sale_getUser':{
44
+ // target:'http://127.0.0.1:8080'
45
+ // },
46
+ // '/rs/logic/getOperBtns':{
47
+ // target:'http://127.0.0.1:8080'
48
+ // },
49
+ // '/rs/file/uploadFile':{
50
+ // target:'http://127.0.0.1:8080'
51
+ // },
52
+ // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
53
+ // target:'http://127.0.0.1:8080'
54
+ // },
55
+ // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
56
+ // target:'http:127.0.0.1:8080'
57
+ // },
58
+ // '/rs/sql/getDownPlan':{
59
+ // target:'http:127.0.0.1:8080'
60
+ // },
61
+ // '/rs/logic/saleExport': {
62
+ // target: fuwu
63
+ // },
64
+ // '/rs/logic/saleGetExportProgress': {
65
+ // target: fuwu
66
+ // },
67
+ // '/rs/logic/getWarningMsg': {
68
+ // target: 'http://localhost:8080/'
69
+ // },
70
+ '/rs/file': {
71
+ target: fuwu
72
+ },
73
+ '/files': {
74
+ target: fuwu
75
+ },
76
+ // 查找资源服务数据
77
+ '/rs/search': {
78
+ target: fuwu
79
+ },
80
+ // 查找资源服务数据
81
+ '/rs/logic/getLogin': {
82
+ target: fuwu
83
+ },
84
+ // 查找资源服务数据
85
+ '/rs/logic/getInitData': {
86
+ target: fuwu
87
+ },
88
+ '/rs/logic/getSaleInitData': {
89
+ target: fuwu
90
+ },
91
+ '/invoice': {
92
+ target: fuwu
93
+ },
94
+ // 用户登录服务地址
95
+ '/rs/user': {
96
+ target: fuwu
97
+ },
98
+ '/rs/path/getParams': {
99
+ target: fuwu
100
+ },
101
+ '/rs/data': {
102
+ target: fuwu
103
+ },
104
+ '/rs/license': {
105
+ target: fuwu
106
+ },
107
+ '/rs/db': {
108
+ target: fuwu
109
+ },
110
+ '/excel': {
111
+ target: fuwu
112
+ },
113
+ '/rs/config': {
114
+ target: fuwu
115
+ },
116
+ '/rs/sql/getLicenseById': {
117
+ target: fuwu
118
+ },
119
+ '/rs/sql/manage_getarealist': {
120
+ target: fuwu
121
+ },
122
+ '/rs/sql/manage_getstreetlist': {
123
+ target: fuwu
124
+ },
125
+ '/rs/report': {
126
+ target: 'http://121.36.106.17:8400/'
127
+ },
128
+ '/rs/vue': {
129
+ target: fuwu
130
+ },
131
+ '/webmeter': {
132
+ target: 'http://192.168.50.4:8450'
133
+ },
134
+ '/rs': {
135
+ // target: 'http://192.168.30.63:8081/'
136
+ // target: 'http://121.36.106.17:8400/'
137
+ target: fuwu
138
+ }
139
+ }
140
+
141
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
142
+ publicPath: config.output.publicPath,
143
+ stats: {
144
+ colors: true,
145
+ chunks: false
146
+ }
147
+ })
148
+
149
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
150
+ // force page reload when html-webpack-plugin template changes
151
+ compiler.plugin('compilation', function (compilation) {
152
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
153
+ hotMiddleware.publish({action: 'reload'})
154
+ cb()
155
+ })
156
+ })
157
+
158
+ // proxy api requests
159
+ Object.keys(proxyTable).forEach(function (context) {
160
+ var options = proxyTable[context]
161
+ if (typeof options === 'string') {
162
+ options = {target: options}
163
+ }
164
+ app.use(proxyMiddleware(context, options))
165
+ })
166
+
167
+ // handle fallback for HTML5 history API
168
+ app.use(require('connect-history-api-fallback')())
169
+ // app.use(function (req, res, next) {
170
+ // res.header('Access-Control-Allow-Origin', '*')
171
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
172
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
173
+ // res.header('X-Powered-By', '3,2,1')
174
+ // res.header('Access-Control-Allow-Credentials', 'true')
175
+ // res.header('Content-Type', 'application/json;charset=utf-8')
176
+ // next()
177
+ // })
178
+
179
+ // serve webpack bundle output
180
+ app.use(devMiddleware)
181
+
182
+ // enable hot-reload and state-preserving
183
+ // compilation error display
184
+ app.use(hotMiddleware)
185
+
186
+ // serve pure static assets
187
+ app.use('/static', express.static('./static'))
188
+
189
+ module.exports = app.listen(8089, function (err) {
190
+ if (err) {
191
+ console.log(err)
192
+ return
193
+ }
194
+ console.log('Listening at http://localhost:8089')
195
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.143",
3
+ "version": "3.5.145",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/FilesManage/UserGeneralInfoTest.vue CHANGED
@@ -427,7 +427,7 @@ export default {
427
427
 
428
428
  // 将oldAddress 置为空，
429
429
  this.oldAddress = {}
430
- // this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state ? [this.data.baseinfo.base.f_user_state] : '正常'
430
+ this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state ? [this.data.baseinfo.base.f_user_state] : '正常'
431
431
  // this.data.baseinfo.base.f_user_nature = this.data.baseinfo.base.f_user_nature ? [this.data.baseinfo.base.f_user_nature] : '民用'
432
432
  // this.data.baseinfo.base.f_credentials = this.data.baseinfo.base.f_credentials ? [this.data.baseinfo.base.f_credentials] : '身份证'
433
433
  this.data.baseinfo.base.f_cost_type = this.data.baseinfo.base.f_cost_type ? [this.data.baseinfo.base.f_cost_type] : '现金缴费'
package/src/components/charge/ChargeOper.vue CHANGED
@@ -81,17 +81,17 @@
81
81
  }})
82
82
  }
83
83
  }
84
- if (self.data.f_user_nature == '单位') {
84
+ if (self.data.f_user_nature === '单位') {
85
85
  self.temp.push({name: '维管收费',
86
86
  value: {
87
87
  'weight': 5,
88
88
  'routeName': 'repair-charge'
89
89
  }})
90
90
  }
91
- if (self.data.f_meter_type == '物联网表') {
92
- if (self.data.f_hascard == '是') {
93
- if (self.data.f_whether_hairpin == '未发') {
94
- if(self.data.f_share_times != '' && self.data.f_share_times == '是' && self.data.f_times>0){
91
+ if (self.data.f_meter_type === '物联网表') {
92
+ if (self.data.f_hascard === '是') {
93
+ if (self.data.f_whether_hairpin === '未发') {
94
+ if(self.data.f_share_times !== '' && self.data.f_share_times === '是' && self.data.f_times>0){
95
95
  self.temp.push({
96
96
  name: '补卡',
97
97
  value: {
@@ -106,7 +106,7 @@
106
106
  }
107
107
  }
108
108
  // 如果卡上有气，添加购气撤销按钮
109
- if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase == '是')) {
109
+ if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是')) {
110
110
  self.temp.push({name: '购气撤销',
111
111
  value: {
112
112
  'weight': 0,
package/src/filiale/dongguan/components/EditWebMeterInfo.vue CHANGED
@@ -145,6 +145,10 @@
145
145
  close-on-select
146
146
  :value-single="true"> </v-select>
147
147
  </div>
148
+ <div class="col-sm-6" >
149
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;操作员</label>
150
+ <input type="text" v-model="newmeterinfo.f_operator" class="input_search" style="width:60%" placeholder="操作员">
151
+ </div>
148
152
  </div>
149
153
  <div class="auto row">
150
154
  <div style="margin-top: 2%">
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()
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('gehua')
15
+ address()
16
+ ldap()
17
+ require('system-clients/src/styles/less/bootstrap.less')
18
+
19
+ new Vue({
20
+ el: 'body',
21
+ components: { App }
22
+ })