sale-client 3.5.201 → 3.5.203
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 +108 -108
- package/package.json +1 -1
- package/src/components/charge/business/CardMeterCenter.vue +2 -2
- package/src/components/charge/business/ShowCardSellGas.vue +2 -2
- package/src/components/revenue/base/rightview/CardList.vue +10 -10
- package/src/filiale/wuhai/FileUserAddress.vue +1 -1
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
|
@@ -100,12 +100,12 @@
|
|
|
100
100
|
<label for="f_collection" class=" font_normal_body">*收  款</label>
|
|
101
101
|
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
102
102
|
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
|
|
103
|
-
v-
|
|
103
|
+
v-show="config.calculatePreByCollection"
|
|
104
104
|
@blur="config.calculatePreByCollection && calculatePreByCollection()"
|
|
105
105
|
v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
|
|
106
106
|
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
107
107
|
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
|
|
108
|
-
v-
|
|
108
|
+
v-show="!config.calculatePreByCollection"
|
|
109
109
|
v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
|
|
110
110
|
</div>
|
|
111
111
|
<div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
|
|
@@ -89,11 +89,11 @@
|
|
|
89
89
|
<label for="f_collection" class=" font_normal_body">*收  款</label>
|
|
90
90
|
<input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
91
91
|
@blur="calculatePreByCollection()"
|
|
92
|
-
v-
|
|
92
|
+
v-show="config.calculatePreByCollection"
|
|
93
93
|
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
|
|
94
94
|
v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
|
|
95
95
|
<input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
96
|
-
v-
|
|
96
|
+
v-show="!config.calculatePreByCollection"
|
|
97
97
|
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
|
|
98
98
|
v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
|
|
99
99
|
</div>
|
|
@@ -184,6 +184,15 @@
|
|
|
184
184
|
self.$showMessage('当前操作类型暂时没有票据')
|
|
185
185
|
return
|
|
186
186
|
}
|
|
187
|
+
row.f_bill_type = row.type
|
|
188
|
+
row.f_bill_style = '普通收据'
|
|
189
|
+
row.f_operator = self.$login.f.name
|
|
190
|
+
row.f_operatorid = self.$login.f.id
|
|
191
|
+
row.f_orgid = self.$login.f.orgid
|
|
192
|
+
row.f_orgname = self.$login.f.orgs
|
|
193
|
+
row.f_depid = self.$login.f.depids
|
|
194
|
+
row.f_depname = self.$login.f.deps
|
|
195
|
+
self.reissue_data = JSON.parse(JSON.stringify(row))
|
|
187
196
|
if (row.type === '调价预存') {
|
|
188
197
|
let id = await self.$resetpost('rs/sql/singleTable_OrderBy', {
|
|
189
198
|
data: {
|
|
@@ -193,17 +202,8 @@
|
|
|
193
202
|
orderitem: 'id'
|
|
194
203
|
}
|
|
195
204
|
}, {resolveMsg: null, rejectMsg: '查询优惠信息失败'})
|
|
196
|
-
|
|
205
|
+
self.reissue_data.id = id.data[0].f_surplus_id
|
|
197
206
|
}
|
|
198
|
-
row.f_bill_type = row.type
|
|
199
|
-
row.f_bill_style = '普通收据'
|
|
200
|
-
row.f_operator = self.$login.f.name
|
|
201
|
-
row.f_operatorid = self.$login.f.id
|
|
202
|
-
row.f_orgid = self.$login.f.orgid
|
|
203
|
-
row.f_orgname = self.$login.f.orgs
|
|
204
|
-
row.f_depid = self.$login.f.depids
|
|
205
|
-
row.f_depname = self.$login.f.deps
|
|
206
|
-
self.reissue_data = row
|
|
207
207
|
self.reissue_show = true
|
|
208
208
|
} catch (error) {
|
|
209
209
|
if (error.status) {
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
<input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
|
|
88
88
|
/>
|
|
89
89
|
</div>
|
|
90
|
-
<div v-if="!usertype" class="col-sm-6 form-group "
|
|
90
|
+
<div v-if="!usertype" class="col-sm-6 form-group ">
|
|
91
91
|
<label for="f_address" class="font_normal_body">楼  层</label>
|
|
92
92
|
<input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
|
|
93
93
|
placeholder="楼层" />
|