sale-client 3.5.31 → 3.5.32

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
  1. package/build/dev-server.js +161 -161
  2. package/package.json +1 -1
  3. package/src/filiale/dongguan/components/FilesManage/FileUserFiles.vue +26 -15
  4. package/src/filiale/guangxi/sale.js +1 -1
  5. package/src/main.js +22 -22
package/build/dev-server.js CHANGED
@@ -1,161 +1,161 @@
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://127.0.0.1:8080', 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
- '/files': {
40
- target: fuwu
41
- },
42
- // 查找资源服务数据
43
- '/rs/search': {
44
- target: fuwu
45
- },
46
- // 查找资源服务数据
47
- '/rs/logic/getLogin': {
48
- target: fuwu
49
- },
50
- // 查找资源服务数据
51
- '/rs/logic/getInitData': {
52
- target: fuwu
53
- },
54
- '/rs/logic/getSaleInitData': {
55
- target: fuwu
56
- },
57
- '/invoice': {
58
- target: fuwu
59
- },
60
- // 用户登录服务地址
61
- '/rs/user': {
62
- target: fuwu
63
- },
64
- '/rs/path/getParams': {
65
- target: fuwu
66
- },
67
- '/rs/data': {
68
- target: fuwu
69
- },
70
- '/rs/license': {
71
- target: fuwu
72
- },
73
- '/rs/db': {
74
- target: fuwu
75
- },
76
- '/excel': {
77
- target: fuwu
78
- },
79
- '/rs/config': {
80
- target: fuwu
81
- },
82
- '/rs/sql/getLicenseById': {
83
- target: fuwu
84
- },
85
- '/rs/sql/manage_getarealist': {
86
- target: fuwu
87
- },
88
- '/rs/sql/manage_getstreetlist': {
89
- target: fuwu
90
- },
91
- '/rs/report': {
92
- target: 'http://121.36.106.17:8400/'
93
- },
94
- '/rs/vue': {
95
- target: fuwu
96
- },
97
- '/webmeter': {
98
- target: 'http://192.168.50.4:8450'
99
- },
100
- '/rs': {
101
- // target: 'http://192.168.30.63:8081/'
102
- // target: 'http://121.36.106.17:8400/'
103
- target: bendi
104
- }
105
- }
106
-
107
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
108
- publicPath: config.output.publicPath,
109
- stats: {
110
- colors: true,
111
- chunks: false
112
- }
113
- })
114
-
115
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
116
- // force page reload when html-webpack-plugin template changes
117
- compiler.plugin('compilation', function (compilation) {
118
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
119
- hotMiddleware.publish({action: 'reload'})
120
- cb()
121
- })
122
- })
123
-
124
- // proxy api requests
125
- Object.keys(proxyTable).forEach(function (context) {
126
- var options = proxyTable[context]
127
- if (typeof options === 'string') {
128
- options = {target: options}
129
- }
130
- app.use(proxyMiddleware(context, options))
131
- })
132
-
133
- // handle fallback for HTML5 history API
134
- app.use(require('connect-history-api-fallback')())
135
- // app.use(function (req, res, next) {
136
- // res.header('Access-Control-Allow-Origin', '*')
137
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
138
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
139
- // res.header('X-Powered-By', '3,2,1')
140
- // res.header('Access-Control-Allow-Credentials', 'true')
141
- // res.header('Content-Type', 'application/json;charset=utf-8')
142
- // next()
143
- // })
144
-
145
- // serve webpack bundle output
146
- app.use(devMiddleware)
147
-
148
- // enable hot-reload and state-preserving
149
- // compilation error display
150
- app.use(hotMiddleware)
151
-
152
- // serve pure static assets
153
- app.use('/static', express.static('./static'))
154
-
155
- module.exports = app.listen(8089, function (err) {
156
- if (err) {
157
- console.log(err)
158
- return
159
- }
160
- console.log('Listening at http://localhost:8089')
161
- })
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://117.33.181.102:8400/', bendi1 = 'http://121.36.106.17:8400/'
14
+ // 公司测试服务
15
+ var fuwu = 'http://117.33.181.102: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
+ '/files': {
40
+ target: fuwu
41
+ },
42
+ // 查找资源服务数据
43
+ '/rs/search': {
44
+ target: fuwu
45
+ },
46
+ // 查找资源服务数据
47
+ '/rs/logic/getLogin': {
48
+ target: fuwu
49
+ },
50
+ // 查找资源服务数据
51
+ '/rs/logic/getInitData': {
52
+ target: fuwu
53
+ },
54
+ '/rs/logic/getSaleInitData': {
55
+ target: fuwu
56
+ },
57
+ '/invoice': {
58
+ target: fuwu
59
+ },
60
+ // 用户登录服务地址
61
+ '/rs/user': {
62
+ target: fuwu
63
+ },
64
+ '/rs/path/getParams': {
65
+ target: fuwu
66
+ },
67
+ '/rs/data': {
68
+ target: fuwu
69
+ },
70
+ '/rs/license': {
71
+ target: fuwu
72
+ },
73
+ '/rs/db': {
74
+ target: fuwu
75
+ },
76
+ '/excel': {
77
+ target: fuwu
78
+ },
79
+ '/rs/config': {
80
+ target: fuwu
81
+ },
82
+ '/rs/sql/getLicenseById': {
83
+ target: fuwu
84
+ },
85
+ '/rs/sql/manage_getarealist': {
86
+ target: fuwu
87
+ },
88
+ '/rs/sql/manage_getstreetlist': {
89
+ target: fuwu
90
+ },
91
+ '/rs/report': {
92
+ target: 'http://121.36.106.17:8400/'
93
+ },
94
+ '/rs/vue': {
95
+ target: fuwu
96
+ },
97
+ '/webmeter': {
98
+ target: 'http://192.168.50.4:8450'
99
+ },
100
+ '/rs': {
101
+ // target: 'http://192.168.30.63:8081/'
102
+ // target: 'http://121.36.106.17:8400/'
103
+ target: bendi
104
+ }
105
+ }
106
+
107
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
108
+ publicPath: config.output.publicPath,
109
+ stats: {
110
+ colors: true,
111
+ chunks: false
112
+ }
113
+ })
114
+
115
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
116
+ // force page reload when html-webpack-plugin template changes
117
+ compiler.plugin('compilation', function (compilation) {
118
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
119
+ hotMiddleware.publish({action: 'reload'})
120
+ cb()
121
+ })
122
+ })
123
+
124
+ // proxy api requests
125
+ Object.keys(proxyTable).forEach(function (context) {
126
+ var options = proxyTable[context]
127
+ if (typeof options === 'string') {
128
+ options = {target: options}
129
+ }
130
+ app.use(proxyMiddleware(context, options))
131
+ })
132
+
133
+ // handle fallback for HTML5 history API
134
+ app.use(require('connect-history-api-fallback')())
135
+ // app.use(function (req, res, next) {
136
+ // res.header('Access-Control-Allow-Origin', '*')
137
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
138
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
139
+ // res.header('X-Powered-By', '3,2,1')
140
+ // res.header('Access-Control-Allow-Credentials', 'true')
141
+ // res.header('Content-Type', 'application/json;charset=utf-8')
142
+ // next()
143
+ // })
144
+
145
+ // serve webpack bundle output
146
+ app.use(devMiddleware)
147
+
148
+ // enable hot-reload and state-preserving
149
+ // compilation error display
150
+ app.use(hotMiddleware)
151
+
152
+ // serve pure static assets
153
+ app.use('/static', express.static('./static'))
154
+
155
+ module.exports = app.listen(8089, function (err) {
156
+ if (err) {
157
+ console.log(err)
158
+ return
159
+ }
160
+ console.log('Listening at http://localhost:8089')
161
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.31",
3
+ "version": "3.5.32",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/dongguan/components/FilesManage/FileUserFiles.vue CHANGED
@@ -7,7 +7,14 @@
7
7
  <criteria @condition-changed="$parent.selfSearch" partial='criteria' v-ref:criteria>
8
8
  <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
9
9
  <div class="row">
10
-
10
+ <div
11
+ :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
12
+ class="form-group">
13
+ <label class="font_normal_body">客户电话</label>
14
+ <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
15
+ type="text"
16
+ v-model="model.f_user_phone">
17
+ </div>
11
18
  <div
12
19
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
13
20
  class="form-group"
@@ -17,8 +24,6 @@
17
24
  placeholder='客户编号'
18
25
  style="width:60%" type="text" v-model="model.f_userinfo_code">
19
26
  </div>
20
- <res-select-group v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
21
-
22
27
  <div
23
28
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
24
29
  class="form-group"
@@ -28,7 +33,6 @@
28
33
  placeholder='客户编号'
29
34
  style="width:60%" type="text" v-model="model.f_userinfo_code">
30
35
  </div>
31
-
32
36
  <div
33
37
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
34
38
  class="form-group" v-if="!$parent.$parent.createFile">
@@ -86,7 +90,6 @@
86
90
  </div>
87
91
  </div>
88
92
  <div class="row" v-if="$parent.$parent.criteriaShow">
89
-
90
93
  <div
91
94
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
92
95
  class="form-group"
@@ -96,8 +99,19 @@
96
99
  placeholder='客户编号'
97
100
  style="width:60%" type="text" v-model="model.f_userinfo_code">
98
101
  </div>
99
- <res-select-group v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
100
- <res-select-group v-if="$parent.$parent.clientWidth>=1600" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
102
+ <!-- 身份证号-->
103
+ <div
104
+ :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
105
+ class="form-group">
106
+ <label class="font_normal_body">身份证号</label>
107
+ <input class="input_search" condition="f_idnumber = '{}'" placeholder='身份证号'
108
+ style="width:60%"
109
+ type="text"
110
+ v-model="model.f_idnumber">
111
+ </div>
112
+ <!-- <res-select-group v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
113
+ <!-- <res-select-group v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
114
+ <res-select-group :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
101
115
 
102
116
  <div
103
117
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
@@ -156,14 +170,6 @@
156
170
  <!-- close-on-select condition="f_meter_brand='{}'"-->
157
171
  <!-- placeholder='气表品牌' v-model="model.f_meter_brand"></v-select>-->
158
172
  <!-- </div>-->
159
- <div
160
- :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
161
- class="form-group">
162
- <label class="font_normal_body">客户电话</label>
163
- <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
164
- type="text"
165
- v-model="model.f_user_phone">
166
- </div>
167
173
  <div
168
174
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
169
175
  class="form-group">
@@ -298,6 +304,9 @@
298
304
  <th>
299
305
  <nobr>客户名称</nobr>
300
306
  </th>
307
+ <th>
308
+ <nobr>身份证号</nobr>
309
+ </th>
301
310
  <th>
302
311
  <nobr>表号</nobr>
303
312
  </th>
@@ -349,6 +358,8 @@
349
358
  <td style="text-align: center;">
350
359
  <span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_user_name}}</b></a></span>
351
360
  </td>
361
+ <!-- 身份证号-->
362
+ <td style="text-align: center;">{{row.f_idnumber}}</td>
352
363
  <td style="text-align: center;">{{row.f_meternumber}}</td>
353
364
  <td style="text-align: center;">{{row.f_card_id}}</td>
354
365
  <td style="text-align: center;">{{row.f_user_phone}}</td>
package/src/filiale/guangxi/sale.js CHANGED
@@ -8,7 +8,7 @@ let specialComp = {
8
8
  // 线下写卡操作
9
9
  'un-write-card-center': (resolve) => { require(['./UnWriteCardCenter'], resolve) },
10
10
  // 补气购气
11
- 'change_fill_sendcard': (resolve) => { require(['./CardChangeFill'], resolve) },
11
+ 'change-fill-sendcard': (resolve) => { require(['./CardChangeFill'], resolve) },
12
12
  // 其它补气
13
13
  'other-gas': (resolve) => { require(['./OtherGas'], resolve) }
14
14
  }
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('kelai')
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('guangxi')
15
+ address()
16
+ ldap()
17
+ require('system-clients/src/styles/less/bootstrap.less')
18
+
19
+ new Vue({
20
+ el: 'body',
21
+ components: { App }
22
+ })