sale-client 3.5.212 → 3.5.213
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.
package/build/dev-server.js
CHANGED
|
@@ -1,108 +1,108 @@
|
|
|
1
|
-
const express = require('express')
|
|
2
|
-
const webpack = require('webpack')
|
|
3
|
-
const config = require('./webpack.dev.conf')
|
|
4
|
-
const proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
-
const app = express()
|
|
6
|
-
const compiler = webpack(config)
|
|
7
|
-
|
|
8
|
-
// 自己改了这里不要提交 来回覆盖挺麻烦的
|
|
9
|
-
const [local, server] = ['http://121.36.60.63:8800/#', 'http://121.36.60.63:8800/#']
|
|
10
|
-
const port = 8089
|
|
11
|
-
|
|
12
|
-
const proxyTable = {
|
|
13
|
-
'/rs/file': {
|
|
14
|
-
target: server
|
|
15
|
-
},
|
|
16
|
-
// 查找资源服务数据
|
|
17
|
-
'/rs/search': {
|
|
18
|
-
target: server
|
|
19
|
-
},
|
|
20
|
-
// 查找资源服务数据
|
|
21
|
-
'/rs/logic/getLogin': {
|
|
22
|
-
target: server
|
|
23
|
-
},
|
|
24
|
-
// 查找资源服务数据
|
|
25
|
-
'/rs/logic/getInitData': {
|
|
26
|
-
target: server
|
|
27
|
-
},
|
|
28
|
-
'/rs/logic/getSaleInitData': {
|
|
29
|
-
target: server
|
|
30
|
-
},
|
|
31
|
-
// 用户登录服务地址
|
|
32
|
-
'/rs/user': {
|
|
33
|
-
target: server
|
|
34
|
-
},
|
|
35
|
-
'/rs/path': {
|
|
36
|
-
target: server
|
|
37
|
-
},
|
|
38
|
-
'/rs/data': {
|
|
39
|
-
target: server
|
|
40
|
-
},
|
|
41
|
-
'/rs/license': {
|
|
42
|
-
target: server
|
|
43
|
-
},
|
|
44
|
-
'/rs/db': {
|
|
45
|
-
target: server
|
|
46
|
-
},
|
|
47
|
-
'/excel': {
|
|
48
|
-
target: server
|
|
49
|
-
},
|
|
50
|
-
'/rs/config': {
|
|
51
|
-
target: server
|
|
52
|
-
},
|
|
53
|
-
'/rs/report': {
|
|
54
|
-
target: server
|
|
55
|
-
},
|
|
56
|
-
'/rs/vue': {
|
|
57
|
-
target: server
|
|
58
|
-
},
|
|
59
|
-
'/rs/logic': {
|
|
60
|
-
target: local
|
|
61
|
-
},
|
|
62
|
-
'/rs/sql': {
|
|
63
|
-
target: local
|
|
64
|
-
},
|
|
65
|
-
'/webmeter': {
|
|
66
|
-
target: server
|
|
67
|
-
},
|
|
68
|
-
'/rs': {
|
|
69
|
-
target: server,
|
|
70
|
-
// changeOrigin: true
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
const devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
75
|
-
publicPath: config.output.publicPath,
|
|
76
|
-
stats: {
|
|
77
|
-
colors: true,
|
|
78
|
-
chunks: false
|
|
79
|
-
}
|
|
80
|
-
})
|
|
81
|
-
|
|
82
|
-
const hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
83
|
-
compiler.plugin('compilation', function (compilation) {
|
|
84
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
85
|
-
hotMiddleware.publish({action: 'reload'})
|
|
86
|
-
cb()
|
|
87
|
-
})
|
|
88
|
-
})
|
|
89
|
-
|
|
90
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
91
|
-
let options = proxyTable[context]
|
|
92
|
-
if (typeof options === 'string') {
|
|
93
|
-
options = {target: options}
|
|
94
|
-
}
|
|
95
|
-
app.use(proxyMiddleware(context, options))
|
|
96
|
-
})
|
|
97
|
-
app.use(require('connect-history-api-fallback')())
|
|
98
|
-
app.use(devMiddleware)
|
|
99
|
-
app.use(hotMiddleware)
|
|
100
|
-
app.use('/static', express.static('./static'))
|
|
101
|
-
|
|
102
|
-
module.exports = app.listen(port, function (err) {
|
|
103
|
-
if (err) {
|
|
104
|
-
console.log(err)
|
|
105
|
-
return
|
|
106
|
-
}
|
|
107
|
-
console.log('Listening at http://localhost:' + port)
|
|
108
|
-
})
|
|
1
|
+
const express = require('express')
|
|
2
|
+
const webpack = require('webpack')
|
|
3
|
+
const config = require('./webpack.dev.conf')
|
|
4
|
+
const proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
+
const app = express()
|
|
6
|
+
const compiler = webpack(config)
|
|
7
|
+
|
|
8
|
+
// 自己改了这里不要提交 来回覆盖挺麻烦的
|
|
9
|
+
const [local, server] = ['http://121.36.60.63:8800/#', 'http://121.36.60.63:8800/#']
|
|
10
|
+
const port = 8089
|
|
11
|
+
|
|
12
|
+
const proxyTable = {
|
|
13
|
+
'/rs/file': {
|
|
14
|
+
target: server
|
|
15
|
+
},
|
|
16
|
+
// 查找资源服务数据
|
|
17
|
+
'/rs/search': {
|
|
18
|
+
target: server
|
|
19
|
+
},
|
|
20
|
+
// 查找资源服务数据
|
|
21
|
+
'/rs/logic/getLogin': {
|
|
22
|
+
target: server
|
|
23
|
+
},
|
|
24
|
+
// 查找资源服务数据
|
|
25
|
+
'/rs/logic/getInitData': {
|
|
26
|
+
target: server
|
|
27
|
+
},
|
|
28
|
+
'/rs/logic/getSaleInitData': {
|
|
29
|
+
target: server
|
|
30
|
+
},
|
|
31
|
+
// 用户登录服务地址
|
|
32
|
+
'/rs/user': {
|
|
33
|
+
target: server
|
|
34
|
+
},
|
|
35
|
+
'/rs/path': {
|
|
36
|
+
target: server
|
|
37
|
+
},
|
|
38
|
+
'/rs/data': {
|
|
39
|
+
target: server
|
|
40
|
+
},
|
|
41
|
+
'/rs/license': {
|
|
42
|
+
target: server
|
|
43
|
+
},
|
|
44
|
+
'/rs/db': {
|
|
45
|
+
target: server
|
|
46
|
+
},
|
|
47
|
+
'/excel': {
|
|
48
|
+
target: server
|
|
49
|
+
},
|
|
50
|
+
'/rs/config': {
|
|
51
|
+
target: server
|
|
52
|
+
},
|
|
53
|
+
'/rs/report': {
|
|
54
|
+
target: server
|
|
55
|
+
},
|
|
56
|
+
'/rs/vue': {
|
|
57
|
+
target: server
|
|
58
|
+
},
|
|
59
|
+
'/rs/logic': {
|
|
60
|
+
target: local
|
|
61
|
+
},
|
|
62
|
+
'/rs/sql': {
|
|
63
|
+
target: local
|
|
64
|
+
},
|
|
65
|
+
'/webmeter': {
|
|
66
|
+
target: server
|
|
67
|
+
},
|
|
68
|
+
'/rs': {
|
|
69
|
+
target: server,
|
|
70
|
+
// changeOrigin: true
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
const devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
75
|
+
publicPath: config.output.publicPath,
|
|
76
|
+
stats: {
|
|
77
|
+
colors: true,
|
|
78
|
+
chunks: false
|
|
79
|
+
}
|
|
80
|
+
})
|
|
81
|
+
|
|
82
|
+
const hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
83
|
+
compiler.plugin('compilation', function (compilation) {
|
|
84
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
85
|
+
hotMiddleware.publish({action: 'reload'})
|
|
86
|
+
cb()
|
|
87
|
+
})
|
|
88
|
+
})
|
|
89
|
+
|
|
90
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
91
|
+
let options = proxyTable[context]
|
|
92
|
+
if (typeof options === 'string') {
|
|
93
|
+
options = {target: options}
|
|
94
|
+
}
|
|
95
|
+
app.use(proxyMiddleware(context, options))
|
|
96
|
+
})
|
|
97
|
+
app.use(require('connect-history-api-fallback')())
|
|
98
|
+
app.use(devMiddleware)
|
|
99
|
+
app.use(hotMiddleware)
|
|
100
|
+
app.use('/static', express.static('./static'))
|
|
101
|
+
|
|
102
|
+
module.exports = app.listen(port, function (err) {
|
|
103
|
+
if (err) {
|
|
104
|
+
console.log(err)
|
|
105
|
+
return
|
|
106
|
+
}
|
|
107
|
+
console.log('Listening at http://localhost:' + port)
|
|
108
|
+
})
|
package/package.json
CHANGED
|
@@ -95,24 +95,23 @@
|
|
|
95
95
|
v-scale="[curbalance, 4]" placeholder="本期结余" disabled>
|
|
96
96
|
</div>
|
|
97
97
|
|
|
98
|
-
<div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表')"
|
|
98
|
+
<div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && !config.calculatePreByCollection"
|
|
99
99
|
:class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
|
|
100
100
|
<label for="f_collection" class=" font_normal_body">*收  款</label>
|
|
101
|
-
|
|
102
|
-
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
103
|
-
v-validate:f_collection='{required: true }'
|
|
104
|
-
v-show="config.calculatePreByCollection"
|
|
105
|
-
@blur="config.calculatePreByCollection && calculatePreByCollection()"
|
|
106
|
-
v-el:fcollection
|
|
107
|
-
@keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
|
|
108
|
-
v-scale="[model.f_totalcost, 4]"/>
|
|
109
|
-
|
|
110
101
|
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
111
102
|
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
|
|
112
|
-
v-if="!config.calculatePreByCollection"
|
|
113
103
|
v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
|
|
114
104
|
v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''"/>
|
|
115
105
|
</div>
|
|
106
|
+
<div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && config.calculatePreByCollection"
|
|
107
|
+
:class="[$v.f_collection.required ? 'has-error' : 'has-success']">
|
|
108
|
+
<label for="f_collection" class=" font_normal_body">*收  款</label>
|
|
109
|
+
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
110
|
+
v-validate:f_collection='{required: true }'
|
|
111
|
+
@blur="calculatePreByCollection()"
|
|
112
|
+
v-el:fcollection
|
|
113
|
+
@keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"/>
|
|
114
|
+
</div>
|
|
116
115
|
<div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
|
|
117
116
|
:class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
|
|
118
117
|
<label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收 款</font></label>
|
|
@@ -140,7 +139,7 @@
|
|
|
140
139
|
<give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
|
|
141
140
|
</div>
|
|
142
141
|
</div>
|
|
143
|
-
<div class="row" style="margin-top:5px;">
|
|
142
|
+
<div class="row" style="margin-top:5px;" v-if="!config.calculatePreByCollection">
|
|
144
143
|
<div class="col-sm-9">
|
|
145
144
|
</div>
|
|
146
145
|
<div class="col-sm-3">
|
|
@@ -226,7 +226,7 @@ export default {
|
|
|
226
226
|
},
|
|
227
227
|
ready () {
|
|
228
228
|
this.getfield = this.config.excelHeaders
|
|
229
|
-
this.search()
|
|
229
|
+
// this.search()
|
|
230
230
|
this.readCiTiaoCard()
|
|
231
231
|
},
|
|
232
232
|
destroyed () {
|
|
@@ -314,6 +314,10 @@ export default {
|
|
|
314
314
|
this.$dispatch('operate', val)
|
|
315
315
|
},
|
|
316
316
|
selfSearch (args) {
|
|
317
|
+
if (args.condition === ' 1=1 ') {
|
|
318
|
+
this.$showMessage('请输入条件进行查询!')
|
|
319
|
+
return
|
|
320
|
+
}
|
|
317
321
|
if (!this.f_orgid) {
|
|
318
322
|
this.getorg([this.$login.f.orgid])
|
|
319
323
|
}
|
package/src/main.js
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
import Vue from 'vue'
|
|
2
|
-
import all from 'vue-client/src/all'
|
|
3
|
-
import App from './App'
|
|
4
|
-
import system from 'system-clients/src/system'
|
|
5
|
-
import sale from './sale'
|
|
6
|
-
import address from 'address-client/src/address'
|
|
7
|
-
import ldap from 'ldap-clients/src/ldap'
|
|
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/src/all'
|
|
3
|
+
import App from './App'
|
|
4
|
+
import system from 'system-clients/src/system'
|
|
5
|
+
import sale from './sale'
|
|
6
|
+
import address from 'address-client/src/address'
|
|
7
|
+
import ldap from 'ldap-clients/src/ldap'
|
|
8
|
+
import VueClipboard from 'vue-clipboard2'
|
|
9
|
+
Vue.use(VueClipboard)
|
|
10
|
+
Vue.config.silent = true
|
|
11
|
+
|
|
12
|
+
all()
|
|
13
|
+
system(false)
|
|
14
|
+
sale('wuhai')
|
|
15
|
+
address()
|
|
16
|
+
ldap()
|
|
17
|
+
require('system-clients/src/styles/less/bootstrap.less')
|
|
18
|
+
|
|
19
|
+
new Vue({
|
|
20
|
+
el: 'body',
|
|
21
|
+
components: { App }
|
|
22
|
+
})
|