sale-client 3.7.11 → 3.7.13
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,7 +1,7 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
2
|
var checkVersion = require('./versionCheck.js')
|
|
3
3
|
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://
|
|
4
|
+
const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
|
@@ -19,18 +19,7 @@ var devConfig = {
|
|
|
19
19
|
children: false // 不输出子模块构建信息
|
|
20
20
|
},
|
|
21
21
|
proxy: {
|
|
22
|
-
|
|
23
|
-
pathRewrite: {
|
|
24
|
-
'^/rs/sql/': '/api/af-revenue/sql/'
|
|
25
|
-
},
|
|
26
|
-
target: serverRul
|
|
27
|
-
},
|
|
28
|
-
'/rs/logic/': {
|
|
29
|
-
pathRewrite: {
|
|
30
|
-
'^/rs/logic/': '/api/af-revenue/logic/'
|
|
31
|
-
},
|
|
32
|
-
target: serverRul
|
|
33
|
-
},
|
|
22
|
+
|
|
34
23
|
'/rs/file': {
|
|
35
24
|
pathRewrite: {
|
|
36
25
|
'^/rs/file/': '/api/af-revenue/file/'
|
package/package.json
CHANGED
|
@@ -146,6 +146,7 @@
|
|
|
146
146
|
*/
|
|
147
147
|
import Vue from 'vue'
|
|
148
148
|
import {PagedList, HttpResetClass} from 'vue-client'
|
|
149
|
+
import * as Util from '../../../../Util'
|
|
149
150
|
|
|
150
151
|
export default {
|
|
151
152
|
title: '气费减免',
|
|
@@ -183,7 +184,9 @@
|
|
|
183
184
|
}
|
|
184
185
|
},
|
|
185
186
|
ready () {
|
|
186
|
-
this.$refs.paged.$refs.cri.search()
|
|
187
|
+
// this.$refs.paged.$refs.cri.search()
|
|
188
|
+
this.$refs.paged.$refs.cri.model.f_stat_data = Util.toStandardDateString() + ' 00:00:00'
|
|
189
|
+
this.$refs.paged.$refs.cri.model.f_end_data = Util.toStandardDateString() + ' 23:59:59'
|
|
187
190
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
188
191
|
},
|
|
189
192
|
methods: {
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<!--<partial-view v-ref:pv>-->
|
|
3
|
+
<div id="stair" class="panel panel-info auto;" style="height:auto">
|
|
4
|
+
<div class="panel-heading" style="height: 35px;">
|
|
5
|
+
<h4 style="margin-top: auto">阶梯使用情况</h4>
|
|
6
|
+
</div>
|
|
7
|
+
<div class="progress" id="srair" style="margin-top:auto; margin-bottom: auto;">
|
|
8
|
+
<div class="progress-bar" :class="cls[n]" :style="{width: widths[n]}" v-for="n in jt">{{content[n]}}</div>
|
|
9
|
+
</div>
|
|
10
|
+
<table class="table table-bordered self-table " id="table1" >
|
|
11
|
+
<thead>
|
|
12
|
+
<th><nobr>气阶</nobr></th><th><nobr>上限</nobr></th><th><nobr>已用</nobr></th><th><nobr>未用</nobr></th><th><nobr>单价</nobr></th>
|
|
13
|
+
</thead>
|
|
14
|
+
<tbody>
|
|
15
|
+
<tr>
|
|
16
|
+
<td>一阶</td>
|
|
17
|
+
<td>{{mydata.f_stair1ceiling.toFixed(4)}}</td>
|
|
18
|
+
<td>{{mydata.f_hasuse1 > 0 ? mydata.f_hasuse1 : 0}}</td>
|
|
19
|
+
<td>{{(mydata.f_stair1ceiling - mydata.f_hasuse1).toFixed(4)}}</td>
|
|
20
|
+
<td>{{mydata.f_stair1price}}</td>
|
|
21
|
+
</tr>
|
|
22
|
+
<tr v-if="jt === 2">
|
|
23
|
+
<td>二阶</td>
|
|
24
|
+
<td>无上限</td>
|
|
25
|
+
<td>{{mydata.f_hasuse2 > 0 ? mydata.f_hasuse2 : 0}}</td>
|
|
26
|
+
<td>无上限</td><td>{{mydata.f_stair2price}}</td>
|
|
27
|
+
</tr>
|
|
28
|
+
<tr v-if="jt > 2">
|
|
29
|
+
<td>二阶</td>
|
|
30
|
+
<td>{{mydata.f_stair2ceiling.toFixed(4)}}</td>
|
|
31
|
+
<td>{{mydata.f_hasuse2 > 0 ? mydata.f_hasuse2 : 0}}</td>
|
|
32
|
+
<td>{{(mydata.f_stair2ceiling - mydata.f_stair1ceiling - (mydata.f_hasuse2 > 0 ? mydata.f_hasuse2 : 0)).toFixed(4)}}</td>
|
|
33
|
+
<td>{{mydata.f_stair2price}}</td>
|
|
34
|
+
</tr>
|
|
35
|
+
<tr v-if="jt === 3">
|
|
36
|
+
<td>三阶</td>
|
|
37
|
+
<td>无上限</td>
|
|
38
|
+
<td>{{mydata.f_hasuse3 > 0 ? mydata.f_hasuse3 : 0}}</td>
|
|
39
|
+
<td>无上限</td>
|
|
40
|
+
<td>{{mydata.f_stair3price}}</td>
|
|
41
|
+
</tr>
|
|
42
|
+
<tr v-if=" jt > 3">
|
|
43
|
+
<td>三阶</td>
|
|
44
|
+
<td>{{mydata.f_stair3ceiling.toFixed(4)}}</td>
|
|
45
|
+
<td>{{mydata.f_hasuse3 > 0 ? mydata.f_hasuse3 : 0}}</td>
|
|
46
|
+
<td>{{(mydata.f_stair3ceiling - mydata.f_stair2ceiling - (mydata.f_hasuse3 > 0 ? mydata.f_hasuse3 : 0)).toFixed(4)}}</td>
|
|
47
|
+
<td>{{mydata.f_stair3price}}</td>
|
|
48
|
+
</tr>
|
|
49
|
+
<tr v-if="jt === 4">
|
|
50
|
+
<td>四阶</td>
|
|
51
|
+
<td>无上限</td>
|
|
52
|
+
<td>{{mydata.f_hasuse4 > 0 ? mydata.f_hasuse4 : 0}}</td>
|
|
53
|
+
<td>无上限</td>
|
|
54
|
+
<td>{{mydata.f_stair4price}}</td>
|
|
55
|
+
</tr>
|
|
56
|
+
<tr v-if="jt > 4">
|
|
57
|
+
<td>四阶</td>
|
|
58
|
+
<td>{{mydata.f_stair4ceiling.toFixed(4)}}</td>
|
|
59
|
+
<td>{{mydata.f_hasuse4 > 0 ? mydata.f_hasuse4 : 0}}</td>
|
|
60
|
+
<td>{{(mydata.f_stair4ceiling - mydata.f_stair3ceiling - (mydata.f_hasuse4 > 0 ? mydata.f_hasuse4 : 0)).toFixed(4)}}</td>
|
|
61
|
+
<td>{{mydata.f_stair4price}}</td>
|
|
62
|
+
</tr>
|
|
63
|
+
</tbody>
|
|
64
|
+
</table>
|
|
65
|
+
</div>
|
|
66
|
+
<!--</partial-view>-->
|
|
67
|
+
</template>
|
|
68
|
+
|
|
69
|
+
<script>
|
|
70
|
+
/**
|
|
71
|
+
*阶梯气价相关信息组件
|
|
72
|
+
*/
|
|
73
|
+
import co from 'co'
|
|
74
|
+
import {HttpResetClass} from 'vue-client'
|
|
75
|
+
|
|
76
|
+
let getdata = function * (self) {
|
|
77
|
+
self.data.f_userinfo_id = self.data.f_userinfo_id + ''
|
|
78
|
+
let http = new HttpResetClass()
|
|
79
|
+
let a = yield http.load('POST', 'rs/logic/commonCal', {data: {model: self.data, isGasValue: 0, value: 0}}, {resolveMsg: null, rejectMsg: '获取阶梯使用情况出错'})
|
|
80
|
+
self.jt = a.data.chargeprice.length
|
|
81
|
+
self.mydata = a.data
|
|
82
|
+
self.calhasuse(self.mydata)
|
|
83
|
+
if (self.jt === 1) {
|
|
84
|
+
self.cls = ['progress-bar-success']
|
|
85
|
+
self.widths = ['100%']
|
|
86
|
+
self.content = [self.mydata.f_stair1price + '元/m³']
|
|
87
|
+
} else if (self.jt === 2) {
|
|
88
|
+
self.cls = ['progress-bar-success', 'progress-bar-danger']
|
|
89
|
+
self.widths = ['50%', '50%']
|
|
90
|
+
self.content = [self.mydata.f_stair1price + '元/m³', self.mydata.f_stair2price + '元/m³']
|
|
91
|
+
} else if (self.jt === 3) {
|
|
92
|
+
self.cls = ['progress-bar-success', 'progress-bar-warning', 'progress-bar-danger']
|
|
93
|
+
self.widths = ['33%', '34%', '33%']
|
|
94
|
+
self.content = [self.mydata.f_stair1price + '元/m³', self.mydata.f_stair2price + '元/m³', self.mydata.f_stair3price + '元/m³']
|
|
95
|
+
} else if (self.jt === 4) {
|
|
96
|
+
self.cls = ['progress-bar-success', ' progress-bar-info', 'progress-bar-warning', 'progress-bar-danger']
|
|
97
|
+
self.widths = ['25%', '25%', '25%', '25%']
|
|
98
|
+
self.content = [self.mydata.f_stair1price + '元/m³', self.mydata.f_stair2price + '元/m³', self.mydata.f_stair3price + '元/m³', self.mydata.f_stair4price + '元/m³']
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
export default {
|
|
103
|
+
props: ['data'],
|
|
104
|
+
data () {
|
|
105
|
+
return {
|
|
106
|
+
myChart: {},
|
|
107
|
+
jt: 0,
|
|
108
|
+
width: 0,
|
|
109
|
+
widths: [],
|
|
110
|
+
cls: [],
|
|
111
|
+
length: 0,
|
|
112
|
+
mydata: '',
|
|
113
|
+
values: 0
|
|
114
|
+
}
|
|
115
|
+
},
|
|
116
|
+
methods: {
|
|
117
|
+
getd () {
|
|
118
|
+
this.mydata = ''
|
|
119
|
+
let gen = getdata(this)
|
|
120
|
+
co(gen)
|
|
121
|
+
},
|
|
122
|
+
calhasuse (value) {
|
|
123
|
+
value.f_hasuse1 = (value.f_stair1ceiling - value.f_stair1surplus).toFixed(4)
|
|
124
|
+
value.f_hasuse2 = (value.f_stair2ceiling - value.f_stair1ceiling - value.f_stair2surplus).toFixed(4)
|
|
125
|
+
value.f_hasuse3 = Math.max(0, value.sumamount - value.f_hasuse1 - value.f_hasuse2).toFixed(4)
|
|
126
|
+
console.log(value.f_hasuse3)
|
|
127
|
+
value.f_hasuse4 = (value.sumamount >= value.f_stair4ceiling ? value.f_stair4ceiling - value.f_stair3ceiling : value.sumamount - value.f_stair3ceiling).toFixed(4)
|
|
128
|
+
}
|
|
129
|
+
},
|
|
130
|
+
watch: {
|
|
131
|
+
|
|
132
|
+
'data' (val) {
|
|
133
|
+
this.getd()
|
|
134
|
+
}
|
|
135
|
+
},
|
|
136
|
+
ready () {
|
|
137
|
+
this.getd()
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
</script>
|
|
141
|
+
<style media="screen">
|
|
142
|
+
#srair{
|
|
143
|
+
height: 30px;
|
|
144
|
+
margin-top:10px;
|
|
145
|
+
margin-bottom: 10px;
|
|
146
|
+
}
|
|
147
|
+
#srair .progress-bar {
|
|
148
|
+
line-height: 25px !important;
|
|
149
|
+
}
|
|
150
|
+
#table1{
|
|
151
|
+
text-align:center;
|
|
152
|
+
}
|
|
153
|
+
.self-table > tbody > tr > td {
|
|
154
|
+
padding: 3px;
|
|
155
|
+
text-align: center;
|
|
156
|
+
}
|
|
157
|
+
</style>
|
|
@@ -5,6 +5,7 @@ export default function () {
|
|
|
5
5
|
// 售气收费 --收费gas-move
|
|
6
6
|
Vue.component('charge-manage', (resolve) => { require(['./ChargeManage'], resolve) })
|
|
7
7
|
Vue.component('hand-operate', (resolve) => { require(['./handOperate'], resolve) })
|
|
8
|
+
Vue.component('stairinfo', (resolve) => { require(['./common/Stairinfo'], resolve) })
|
|
8
9
|
Vue.component('charge-list', (resolve) => { require(['./ChargeList'], resolve)})
|
|
9
10
|
Vue.component('card-hand', (resolve) => { require(['./CardHand'], resolve) })
|
|
10
11
|
Vue.component('hand-manager', (resolve) => { require(['./HandManager'], resolve) })
|
package/src/main.js
CHANGED
|
@@ -2,7 +2,7 @@ import Vue from 'vue'
|
|
|
2
2
|
import all from 'vue-client/src/all'
|
|
3
3
|
import App from './App'
|
|
4
4
|
import system from 'system-clients/src/system'
|
|
5
|
-
import FilialeSale from './filiale/
|
|
5
|
+
import FilialeSale from './filiale/meihekou/sale'
|
|
6
6
|
import sale from './sale'
|
|
7
7
|
import address from 'address-client/src/address'
|
|
8
8
|
import ldap from 'ldap-clients/src/ldap'
|