sale-client 3.5.101 → 3.5.103
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
|
@@ -10,9 +10,10 @@ var compiler = webpack(config)
|
|
|
10
10
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
|
-
var bendi = 'http://
|
|
13
|
+
var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
|
|
14
14
|
// 公司测试服务
|
|
15
|
-
var fuwu = 'http://192.168.50.4:8400'
|
|
15
|
+
// var fuwu = 'http://192.168.50.4:8400'
|
|
16
|
+
var fuwu = 'http://39.99.85.14:8400'
|
|
16
17
|
// var fuwu = 'http://121.36.106.17:8400/'
|
|
17
18
|
// 铜川正式
|
|
18
19
|
// var fuwu = 'http://61.134.55.234:9999/'
|
|
@@ -30,15 +31,40 @@ var fuwu = 'http://192.168.50.4:8400'
|
|
|
30
31
|
// var fuwu = 'http://139.214.92.34:8301/'
|
|
31
32
|
|
|
32
33
|
var proxyTable = {
|
|
33
|
-
'/
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
34
|
+
// '/'
|
|
35
|
+
// '/rs/logic/stopBasicLivingNew':{
|
|
36
|
+
// target:'http://127.0.0.1:8080'
|
|
37
|
+
// },
|
|
38
|
+
// '/rs/logic/getBatchOperaPro':{
|
|
39
|
+
// target:'http://127.0.0.1:8080'
|
|
40
|
+
// },
|
|
41
|
+
// '/rs/sql/sale_getUser':{
|
|
42
|
+
// target:'http://127.0.0.1:8080'
|
|
43
|
+
// },
|
|
44
|
+
// '/rs/logic/getOperBtns':{
|
|
45
|
+
// target:'http://127.0.0.1:8080'
|
|
46
|
+
// },
|
|
47
|
+
// '/rs/file/uploadFile':{
|
|
48
|
+
// target:'http://127.0.0.1:8080'
|
|
49
|
+
// },
|
|
50
|
+
// '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
|
|
51
|
+
// target:'http://127.0.0.1:8080'
|
|
52
|
+
// },
|
|
53
|
+
// '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
|
|
54
|
+
// target:'http:127.0.0.1:8080'
|
|
55
|
+
// },
|
|
56
|
+
// '/rs/sql/getDownPlan':{
|
|
57
|
+
// target:'http:127.0.0.1:8080'
|
|
58
|
+
// },
|
|
59
|
+
// '/rs/logic/saleExport': {
|
|
60
|
+
// target: fuwu
|
|
61
|
+
// },
|
|
62
|
+
// '/rs/logic/saleGetExportProgress': {
|
|
63
|
+
// target: fuwu
|
|
64
|
+
// },
|
|
65
|
+
// '/rs/logic/getWarningMsg': {
|
|
66
|
+
// target: 'http://localhost:8080/'
|
|
67
|
+
// },
|
|
42
68
|
'/rs/file': {
|
|
43
69
|
target: fuwu
|
|
44
70
|
},
|
|
@@ -158,7 +184,7 @@ app.use(hotMiddleware)
|
|
|
158
184
|
// serve pure static assets
|
|
159
185
|
app.use('/static', express.static('./static'))
|
|
160
186
|
|
|
161
|
-
module.exports = app.listen(
|
|
187
|
+
module.exports = app.listen(8085, function (err) {
|
|
162
188
|
if (err) {
|
|
163
189
|
console.log(err)
|
|
164
190
|
return
|
package/package.json
CHANGED
|
@@ -8,6 +8,9 @@ let specialComp = {
|
|
|
8
8
|
// 卡表收费
|
|
9
9
|
'card-meter-center': (resolve) => { require(['./business/CardMeterCenter'], resolve) },
|
|
10
10
|
// 票据补打
|
|
11
|
-
'reissue-bill': (resolve) => { require(['./ReissueBill'], resolve) }
|
|
11
|
+
'reissue-bill': (resolve) => { require(['./ReissueBill'], resolve) },
|
|
12
|
+
|
|
13
|
+
'file-user-device-info': (resolve) => { require(['./UserDeviceInfoTest'], resolve) }
|
|
14
|
+
|
|
12
15
|
}
|
|
13
16
|
exports.specialComp = specialComp
|
|
@@ -1,115 +1,115 @@
|
|
|
1
|
-
<template >
|
|
2
|
-
<div id="stand-work-list" >
|
|
3
|
-
<div @keyup.enter="search" class="span">
|
|
4
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
5
|
-
<criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
|
|
6
|
-
<div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
|
|
7
|
-
<div class="row">
|
|
8
|
-
|
|
9
|
-
<div class="col-sm-2 form-group ">
|
|
10
|
-
<label class="font_normal_body">上报时间</label>
|
|
11
|
-
<datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
|
|
12
|
-
class="datepicker"
|
|
13
|
-
condition="m.f_hand_date >= '{}'"
|
|
14
|
-
placeholder="大于等于"
|
|
15
|
-
style="width: 60%"
|
|
16
|
-
v-model="model.f_start_date"
|
|
17
|
-
></datepicker>
|
|
18
|
-
</div>
|
|
19
|
-
<div class="col-sm-2 form-group " >
|
|
20
|
-
<label class="font_normal_body"> 至</label>
|
|
21
|
-
<datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
|
|
22
|
-
class="datepicker"
|
|
23
|
-
condition="m.f_hand_date <= '{}'"
|
|
24
|
-
placeholder="小于等于"
|
|
25
|
-
style="width: 60%"
|
|
26
|
-
v-model="model.f_end_date"
|
|
27
|
-
></datepicker>
|
|
28
|
-
</div>
|
|
29
|
-
<div style="float: right">
|
|
30
|
-
<button @click="search()" class="button_search" v-el:cba>查询</button>
|
|
31
|
-
</div>
|
|
32
|
-
</div>
|
|
33
|
-
|
|
34
|
-
</div>
|
|
35
|
-
</criteria>
|
|
36
|
-
<data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
|
|
37
|
-
<template partial='head'>
|
|
38
|
-
<tr>
|
|
39
|
-
<th><nobr>上报日期</nobr></th>
|
|
40
|
-
<th><nobr>表内剩余金额</nobr></th>
|
|
41
|
-
<th><nobr>本次抄表底数</nobr></th>
|
|
42
|
-
<th><nobr>阀门状态</nobr></th>
|
|
43
|
-
<th><nobr>上报类型</nobr></th>
|
|
44
|
-
<th><nobr>系统接收时间</nobr></th>
|
|
45
|
-
<th><nobr>表内累计充值金额</nobr></th>
|
|
46
|
-
<th><nobr>噪音强度</nobr></th>
|
|
47
|
-
<th><nobr>信噪比</nobr></th>
|
|
48
|
-
<th><nobr>电压</nobr></th>
|
|
49
|
-
<th><nobr>电压状态</nobr></th>
|
|
50
|
-
<th><nobr>阀门强制状态</nobr></th>
|
|
51
|
-
<!-- <th><nobr>计量类型</nobr></th>-->
|
|
52
|
-
<!-- <th><nobr>金额状态</nobr></th>-->
|
|
53
|
-
|
|
54
|
-
<th><nobr>磁干扰异常</nobr></th>
|
|
55
|
-
<th><nobr>补偿状态</nobr></th>
|
|
56
|
-
</tr>
|
|
57
|
-
</template>
|
|
58
|
-
<template partial='body' partial='list'>
|
|
59
|
-
<tr >
|
|
60
|
-
<td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
|
|
61
|
-
<th style="text-align:center"><nobr>{{row.f_meterbalanceamt}}</nobr></th>
|
|
62
|
-
<th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
|
|
63
|
-
<th style="text-align:center"><nobr>{{row.f_valvestate == 0 ? '开阀' : '关阀'}}</nobr></th>
|
|
64
|
-
<th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
|
|
65
|
-
<th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
|
|
66
|
-
<th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>
|
|
67
|
-
<th style="text-align:center"><nobr>{{row.f_signal}}</nobr></th>
|
|
68
|
-
<th style="text-align:center"><nobr>{{row.f_snr}}</nobr></th>
|
|
69
|
-
<th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
|
|
70
|
-
<th style="text-align:center"><nobr>{{row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知'}}</nobr></th>
|
|
71
|
-
<th style="text-align:center"><nobr>{{row.f_networkshutvalve}}</nobr></th>
|
|
72
|
-
<!-- <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>-->
|
|
73
|
-
<!-- <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>-->
|
|
74
|
-
<th style="text-align:center"><nobr>{{row.f_magneticInterference}}</nobr></th>
|
|
75
|
-
<th style="text-align:center"><nobr>{{row.f_compensateState}}</nobr></th>
|
|
76
|
-
</tr>
|
|
77
|
-
</template>
|
|
78
|
-
<template partial='foot'></template>
|
|
79
|
-
</data-grid>
|
|
80
|
-
</criteria-paged>
|
|
81
|
-
</div>
|
|
82
|
-
</div>
|
|
83
|
-
</template>
|
|
84
|
-
|
|
85
|
-
<script>
|
|
86
|
-
import {PagedList} from 'vue-client'
|
|
87
|
-
|
|
88
|
-
export default {
|
|
89
|
-
title: 'WatchCollection',
|
|
90
|
-
data () {
|
|
91
|
-
return {
|
|
92
|
-
model: new PagedList('rs/sql/iot_getNewLoseUserQuery', 50)
|
|
93
|
-
}
|
|
94
|
-
},
|
|
95
|
-
props: ['row'],
|
|
96
|
-
ready () {
|
|
97
|
-
this.$refs.paged.$refs.criteria.search()
|
|
98
|
-
},
|
|
99
|
-
methods: {
|
|
100
|
-
search (args) {
|
|
101
|
-
args.condition = `${args.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
|
|
102
|
-
this.model.search(args.condition, args.model)
|
|
103
|
-
}
|
|
104
|
-
},
|
|
105
|
-
watch: {
|
|
106
|
-
// 监听查询对象
|
|
107
|
-
'row' (val) {
|
|
108
|
-
if (this.row != null) {
|
|
109
|
-
this.$refs.paged.$refs.criteria.search()
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
</script>
|
|
115
|
-
|
|
1
|
+
<template >
|
|
2
|
+
<div id="stand-work-list" >
|
|
3
|
+
<div @keyup.enter="search" class="span">
|
|
4
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
5
|
+
<criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
|
|
6
|
+
<div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
|
|
7
|
+
<div class="row">
|
|
8
|
+
|
|
9
|
+
<div class="col-sm-2 form-group ">
|
|
10
|
+
<label class="font_normal_body">上报时间</label>
|
|
11
|
+
<datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
|
|
12
|
+
class="datepicker"
|
|
13
|
+
condition="m.f_hand_date >= '{}'"
|
|
14
|
+
placeholder="大于等于"
|
|
15
|
+
style="width: 60%"
|
|
16
|
+
v-model="model.f_start_date"
|
|
17
|
+
></datepicker>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-2 form-group " >
|
|
20
|
+
<label class="font_normal_body"> 至</label>
|
|
21
|
+
<datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
|
|
22
|
+
class="datepicker"
|
|
23
|
+
condition="m.f_hand_date <= '{}'"
|
|
24
|
+
placeholder="小于等于"
|
|
25
|
+
style="width: 60%"
|
|
26
|
+
v-model="model.f_end_date"
|
|
27
|
+
></datepicker>
|
|
28
|
+
</div>
|
|
29
|
+
<div style="float: right">
|
|
30
|
+
<button @click="search()" class="button_search" v-el:cba>查询</button>
|
|
31
|
+
</div>
|
|
32
|
+
</div>
|
|
33
|
+
|
|
34
|
+
</div>
|
|
35
|
+
</criteria>
|
|
36
|
+
<data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
|
|
37
|
+
<template partial='head'>
|
|
38
|
+
<tr>
|
|
39
|
+
<th><nobr>上报日期</nobr></th>
|
|
40
|
+
<th><nobr>表内剩余金额</nobr></th>
|
|
41
|
+
<th><nobr>本次抄表底数</nobr></th>
|
|
42
|
+
<th><nobr>阀门状态</nobr></th>
|
|
43
|
+
<th><nobr>上报类型</nobr></th>
|
|
44
|
+
<th><nobr>系统接收时间</nobr></th>
|
|
45
|
+
<th><nobr>表内累计充值金额</nobr></th>
|
|
46
|
+
<th><nobr>噪音强度</nobr></th>
|
|
47
|
+
<th><nobr>信噪比</nobr></th>
|
|
48
|
+
<th><nobr>电压</nobr></th>
|
|
49
|
+
<th><nobr>电压状态</nobr></th>
|
|
50
|
+
<th><nobr>阀门强制状态</nobr></th>
|
|
51
|
+
<!-- <th><nobr>计量类型</nobr></th>-->
|
|
52
|
+
<!-- <th><nobr>金额状态</nobr></th>-->
|
|
53
|
+
|
|
54
|
+
<th><nobr>磁干扰异常</nobr></th>
|
|
55
|
+
<th><nobr>补偿状态</nobr></th>
|
|
56
|
+
</tr>
|
|
57
|
+
</template>
|
|
58
|
+
<template partial='body' partial='list'>
|
|
59
|
+
<tr >
|
|
60
|
+
<td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
|
|
61
|
+
<th style="text-align:center"><nobr>{{row.f_meterbalanceamt}}</nobr></th>
|
|
62
|
+
<th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
|
|
63
|
+
<th style="text-align:center"><nobr>{{row.f_valvestate == 0 ? '开阀' : '关阀'}}</nobr></th>
|
|
64
|
+
<th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
|
|
65
|
+
<th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
|
|
66
|
+
<th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>
|
|
67
|
+
<th style="text-align:center"><nobr>{{row.f_signal}}</nobr></th>
|
|
68
|
+
<th style="text-align:center"><nobr>{{row.f_snr}}</nobr></th>
|
|
69
|
+
<th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
|
|
70
|
+
<th style="text-align:center"><nobr>{{row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知'}}</nobr></th>
|
|
71
|
+
<th style="text-align:center"><nobr>{{row.f_networkshutvalve}}</nobr></th>
|
|
72
|
+
<!-- <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>-->
|
|
73
|
+
<!-- <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>-->
|
|
74
|
+
<th style="text-align:center"><nobr>{{row.f_magneticInterference}}</nobr></th>
|
|
75
|
+
<th style="text-align:center"><nobr>{{row.f_compensateState}}</nobr></th>
|
|
76
|
+
</tr>
|
|
77
|
+
</template>
|
|
78
|
+
<template partial='foot'></template>
|
|
79
|
+
</data-grid>
|
|
80
|
+
</criteria-paged>
|
|
81
|
+
</div>
|
|
82
|
+
</div>
|
|
83
|
+
</template>
|
|
84
|
+
|
|
85
|
+
<script>
|
|
86
|
+
import {PagedList} from 'vue-client'
|
|
87
|
+
|
|
88
|
+
export default {
|
|
89
|
+
title: 'WatchCollection',
|
|
90
|
+
data () {
|
|
91
|
+
return {
|
|
92
|
+
model: new PagedList('rs/sql/iot_getNewLoseUserQuery', 50)
|
|
93
|
+
}
|
|
94
|
+
},
|
|
95
|
+
props: ['row'],
|
|
96
|
+
ready () {
|
|
97
|
+
this.$refs.paged.$refs.criteria.search()
|
|
98
|
+
},
|
|
99
|
+
methods: {
|
|
100
|
+
search (args) {
|
|
101
|
+
args.condition = `${args.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
|
|
102
|
+
this.model.search(args.condition, args.model)
|
|
103
|
+
}
|
|
104
|
+
},
|
|
105
|
+
watch: {
|
|
106
|
+
// 监听查询对象
|
|
107
|
+
'row' (val) {
|
|
108
|
+
if (this.row != null) {
|
|
109
|
+
this.$refs.paged.$refs.criteria.search()
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
</script>
|
|
115
|
+
|
|
@@ -1671,19 +1671,19 @@ let sellgasGen = async function (model, row) {
|
|
|
1671
1671
|
} else {
|
|
1672
1672
|
// 调用读卡进行校验
|
|
1673
1673
|
let readCardInfo = await Vue.resetpost('http://127.0.0.1:8003/ReadCard', {kmm: row.f_card_password}, {resolveMsg: null, rejectMsg: '读卡失败！！'})
|
|
1674
|
-
if (readCardInfo.data) {
|
|
1674
|
+
if (readCardInfo.data && Vue.$login.r.includes('读卡2')) {
|
|
1675
1675
|
console.log('读卡验证', readCardInfo.data, row)
|
|
1676
|
-
|
|
1677
|
-
|
|
1678
|
-
|
|
1679
|
-
|
|
1680
|
-
}
|
|
1681
|
-
} else {
|
|
1682
|
-
if (readCardInfo.data.Gas !== Number((model.f_pregas - 0).toFixed(2)) || readCardInfo.data.Factory !== row.f_alias) {
|
|
1683
|
-
Vue.showAlert('读卡参数和缴费参数不一致，请核实！！', 'warning', 2000)
|
|
1684
|
-
return
|
|
1685
|
-
}
|
|
1676
|
+
if (row.f_collection_type === '按金额') {
|
|
1677
|
+
if (readCardInfo.data.Money !== model.f_preamount || readCardInfo.data.Factory !== row.f_alias) {
|
|
1678
|
+
Vue.showAlert('读卡参数和缴费参数不一致，请核实！！', 'warning', 2000)
|
|
1679
|
+
return result.data.id
|
|
1686
1680
|
}
|
|
1681
|
+
} else {
|
|
1682
|
+
if (readCardInfo.data.Gas !== Number((model.f_pregas - 0).toFixed(2)) || readCardInfo.data.Factory !== row.f_alias) {
|
|
1683
|
+
Vue.showAlert('读卡参数和缴费参数不一致，请核实！！', 'warning', 2000)
|
|
1684
|
+
return result.data.id
|
|
1685
|
+
}
|
|
1686
|
+
}
|
|
1687
1687
|
}
|
|
1688
1688
|
// 更新卡密码
|
|
1689
1689
|
await Vue.CommonService.updatePassword(row, cardRes)
|