sale-client 4.3.45 → 4.3.47
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 +1 -1
- package/package.json +1 -1
- package/src/components/charge/business/CardChangeFill.vue +9 -2
- package/src/filiale/hongYa/components/charge/business/IOTMeterCenter.vue +1 -1
- package/src/filiale/ronghao/QueryPriceChangeInstruct.vue +304 -0
- package/src/filiale/ronghao/UserInfoDetailManageNew.vue +5 -0
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 ] = ['http://
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://218.93.226.210:31467/', 'http://218.93.226.210:31467/']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
package/package.json
CHANGED
|
@@ -228,8 +228,8 @@
|
|
|
228
228
|
self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
|
|
229
229
|
}
|
|
230
230
|
self.model.f_meter_type = self.row.f_meter_type
|
|
231
|
-
//
|
|
232
|
-
if ((self.model.
|
|
231
|
+
// 限购检查只检查购气量（不含补气量），限购值限制的是额外购买的气量
|
|
232
|
+
if ((self.model.f_pregasBuy - 0) - (self.maxgas - 0) <= 0) {
|
|
233
233
|
if ((self.model.f_fill_gas - 0) < (self.model.f_pregas - 0)) {
|
|
234
234
|
// 超出【补气气量不符】部分走划价
|
|
235
235
|
let gas = self.model.f_pregas - self.model.f_fill_gas
|
|
@@ -250,6 +250,13 @@
|
|
|
250
250
|
self.model.f_collection = 0
|
|
251
251
|
}
|
|
252
252
|
self.remstrgas()
|
|
253
|
+
} else {
|
|
254
|
+
self.$showAlert(`购气量不能超过限购值${self.maxgas}方`, 'warning', 3000)
|
|
255
|
+
self.model.f_preamount = 0
|
|
256
|
+
self.model.f_totalcost = 0
|
|
257
|
+
self.model.f_collection = 0
|
|
258
|
+
self.model.f_pregasBuy = 0
|
|
259
|
+
self.model.f_pregas = self.model.f_fill_gas
|
|
253
260
|
}
|
|
254
261
|
}
|
|
255
262
|
|
|
@@ -0,0 +1,304 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div @keyup.enter="search" class="span">
|
|
3
|
+
<criteria-paged :model="model" class="list_area table_sy" v-ref:paged>
|
|
4
|
+
<criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
|
|
5
|
+
<div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
|
|
6
|
+
<div class="row">
|
|
7
|
+
|
|
8
|
+
<div class="col-sm-2 form-group">
|
|
9
|
+
<label class="font_normal_body">指令类型</label>
|
|
10
|
+
<v-select :options='$parent.$parent.instructType' :value.sync="model.f_instruct_type"
|
|
11
|
+
close-on-select
|
|
12
|
+
condition="f_instruct_type='{}'"
|
|
13
|
+
placeholder='指令类型'
|
|
14
|
+
style="width: 60%"
|
|
15
|
+
v-model="model.f_instruct_type"></v-select>
|
|
16
|
+
</div>
|
|
17
|
+
<div class="col-sm-2 form-group">
|
|
18
|
+
<label class="font_normal_body">指令状态</label>
|
|
19
|
+
<v-select :options='$parent.$parent.instructState' :value.sync="model.f_instruct_state"
|
|
20
|
+
close-on-select
|
|
21
|
+
condition="f_instruct_state='{}'"
|
|
22
|
+
placeholder='指令状态'
|
|
23
|
+
style="width: 60%"
|
|
24
|
+
v-model="model.f_instruct_state"
|
|
25
|
+
></v-select>
|
|
26
|
+
</div>
|
|
27
|
+
|
|
28
|
+
<div class="col-sm-2 form-group">
|
|
29
|
+
<label class="font_normal_body">开始时间</label>
|
|
30
|
+
<datepicker :format="'yyyy-MM-dd HH:mm:ss'"
|
|
31
|
+
:value.sync="model.f_start_date"
|
|
32
|
+
class="datepicker"
|
|
33
|
+
condition="f_instruct_date > '{}'"
|
|
34
|
+
placeholder="起始时间"
|
|
35
|
+
style="width: 60%"
|
|
36
|
+
v-model="model.f_start_date"
|
|
37
|
+
></datepicker>
|
|
38
|
+
</div>
|
|
39
|
+
<div class="col-sm-2 form-group">
|
|
40
|
+
<label class="font_normal_body">结束时间</label>
|
|
41
|
+
<datepicker :format="'yyyy-MM-dd HH:mm:ss'"
|
|
42
|
+
:value.sync="model.f_end_date"
|
|
43
|
+
class="datepicker"
|
|
44
|
+
condition="f_instruct_date < '{}'"
|
|
45
|
+
placeholder="结束时间"
|
|
46
|
+
style="width: 60%"
|
|
47
|
+
v-model="model.f_end_date"
|
|
48
|
+
></datepicker>
|
|
49
|
+
</div>
|
|
50
|
+
<div style="float: right">
|
|
51
|
+
<button @click="search()" class="button_search" v-el:cba>查询</button>
|
|
52
|
+
</div>
|
|
53
|
+
</div>
|
|
54
|
+
|
|
55
|
+
</div>
|
|
56
|
+
</criteria>
|
|
57
|
+
<data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
|
|
58
|
+
<template partial='head'>
|
|
59
|
+
<tr>
|
|
60
|
+
<th style="text-align:center;">
|
|
61
|
+
<nobr>指令类型</nobr>
|
|
62
|
+
</th>
|
|
63
|
+
<th style="text-align:center;">
|
|
64
|
+
<nobr>指令内容</nobr>
|
|
65
|
+
</th>
|
|
66
|
+
<th style="text-align:center;">
|
|
67
|
+
<nobr>指令状态</nobr>
|
|
68
|
+
</th>
|
|
69
|
+
<th style="text-align:center;">
|
|
70
|
+
<nobr>指令生成时间</nobr>
|
|
71
|
+
</th>
|
|
72
|
+
<th style="text-align:center;">
|
|
73
|
+
<nobr>指令发送时间</nobr>
|
|
74
|
+
</th>
|
|
75
|
+
<th style="text-align:center;">
|
|
76
|
+
<nobr>指令上表时间</nobr>
|
|
77
|
+
</th>
|
|
78
|
+
<th style="text-align:center;">
|
|
79
|
+
<nobr>操作人</nobr>
|
|
80
|
+
</th>
|
|
81
|
+
<th style="text-align:center;">
|
|
82
|
+
<nobr>操作时间(记录)</nobr>
|
|
83
|
+
</th>
|
|
84
|
+
<th style="text-align:center;">
|
|
85
|
+
<nobr>操作类型</nobr>
|
|
86
|
+
</th>
|
|
87
|
+
<!-- 查这里-->
|
|
88
|
+
<th style="text-align:center;">
|
|
89
|
+
<nobr>操作状态</nobr>
|
|
90
|
+
</th>
|
|
91
|
+
<th style="text-align:center;">
|
|
92
|
+
<nobr>操作人(记录)</nobr>
|
|
93
|
+
</th>
|
|
94
|
+
<th style="text-align:center;">
|
|
95
|
+
<nobr>操作内容</nobr>
|
|
96
|
+
</th>
|
|
97
|
+
<th style="text-align:center;">
|
|
98
|
+
<nobr>操作/指令状态</nobr>
|
|
99
|
+
</th>
|
|
100
|
+
<!--<th style="text-align:center;"><nobr>发送原因</nobr></th>
|
|
101
|
+
<th style="text-align:center;"><nobr>取消原因</nobr></th>-->
|
|
102
|
+
<th style="text-align:center;">
|
|
103
|
+
<nobr>备注信息</nobr>
|
|
104
|
+
</th>
|
|
105
|
+
</tr>
|
|
106
|
+
</template>
|
|
107
|
+
<template partial='body'>
|
|
108
|
+
<tr>
|
|
109
|
+
<td style="text-align:center;">
|
|
110
|
+
<nobr>{{row.f_instruct_type}}</nobr>
|
|
111
|
+
</td>
|
|
112
|
+
<td style="text-align:center;">
|
|
113
|
+
<nobr>{{row.f_instruct_title}}</nobr>
|
|
114
|
+
</td>
|
|
115
|
+
<td style="text-align:center;">
|
|
116
|
+
<nobr>{{row.f_instruct_state}}</nobr>
|
|
117
|
+
</td>
|
|
118
|
+
<td style="text-align:center;">
|
|
119
|
+
<nobr>{{row.f_instruct_date}}</nobr>
|
|
120
|
+
</td>
|
|
121
|
+
<td style="text-align:center;">
|
|
122
|
+
<nobr>{{row.f_send_date}}</nobr>
|
|
123
|
+
</td>
|
|
124
|
+
<td style="text-align:center;">
|
|
125
|
+
<nobr>{{row.f_callback_date}}</nobr>
|
|
126
|
+
</td>
|
|
127
|
+
<td style="text-align:center;">
|
|
128
|
+
<nobr>{{row.f_inputtor}}</nobr>
|
|
129
|
+
</td>
|
|
130
|
+
<td style="text-align:center;">
|
|
131
|
+
<nobr>{{row.f_operate_date}}</nobr>
|
|
132
|
+
</td>
|
|
133
|
+
<td style="text-align:center;">
|
|
134
|
+
<nobr>{{row.f_type}}</nobr>
|
|
135
|
+
</td>
|
|
136
|
+
<!-- 这里-->
|
|
137
|
+
<td style="text-align:center;">
|
|
138
|
+
<nobr>{{$parent.$parent.$parent.stateFlow(row)}}</nobr>
|
|
139
|
+
<!-- <nobr>{{row.f_state}}</nobr>-->
|
|
140
|
+
</td>
|
|
141
|
+
<td style="text-align:center;">
|
|
142
|
+
<nobr>{{row.f_operator}}</nobr>
|
|
143
|
+
</td>
|
|
144
|
+
<td style="text-align:center;">
|
|
145
|
+
<nobr>{{row.f_operator_data}}</nobr>
|
|
146
|
+
</td>
|
|
147
|
+
<td style="text-align:center;" v-if="row.f_instruct_state === '待发送' && row.f_instruct_state !== '取消发送'">
|
|
148
|
+
<nobr>
|
|
149
|
+
{{row.f_instruct_state}}
|
|
150
|
+
</nobr>
|
|
151
|
+
</td>
|
|
152
|
+
<td style="text-align:center;" v-if="row.f_instruct_state !== '待发送' && row.f_instruct_state !== '取消发送'">
|
|
153
|
+
<nobr>
|
|
154
|
+
{{row.f_receive_state}}
|
|
155
|
+
</nobr>
|
|
156
|
+
</td>
|
|
157
|
+
<td style="text-align:center;" v-if="row.f_instruct_state === '取消发送'">
|
|
158
|
+
<nobr>
|
|
159
|
+
<span title="操作人:{{row.f_cancel_inputtor}},操作原因:{{row.f_comments}}">已取消</span>
|
|
160
|
+
</nobr>
|
|
161
|
+
</td>
|
|
162
|
+
<!-- <td style="text-align:center;"><nobr>{{row.f_info}}</nobr></td>
|
|
163
|
+
<td style="text-align:center;"><nobr>{{row.f_comments}}</nobr></td>-->
|
|
164
|
+
<td style="text-align:center;">
|
|
165
|
+
<nobr><span >{{row.f_info}}</span></nobr>
|
|
166
|
+
</td>
|
|
167
|
+
</tr>
|
|
168
|
+
</template>
|
|
169
|
+
</data-grid>
|
|
170
|
+
</criteria-paged>
|
|
171
|
+
<modal :show.sync="handcental" backdrop="false" v-ref:modal>
|
|
172
|
+
<header class="modal-header" slot="modal-header">
|
|
173
|
+
<h4 class="modal-title">取消发送</h4>
|
|
174
|
+
</header>
|
|
175
|
+
<article class="modal-body" slot="modal-body">
|
|
176
|
+
<div class="form-group">
|
|
177
|
+
<label class="font_normal_body" >取消发送原因</label>
|
|
178
|
+
<textarea class="form-control" placeholder="请填写取消发送原因" rows="3" v-model="cancelreason"></textarea>
|
|
179
|
+
</div>
|
|
180
|
+
</article>
|
|
181
|
+
<footer class="modal-footer" slot="modal-footer">
|
|
182
|
+
<button @click='close' class="btn btn-default" type="button" v-show="handcental">取消</button>
|
|
183
|
+
<button @click='confirmcenta()' class="button_search" type="button" v-show="handcental">确认</button>
|
|
184
|
+
</footer>
|
|
185
|
+
</modal>
|
|
186
|
+
</div>
|
|
187
|
+
|
|
188
|
+
</template>
|
|
189
|
+
<script>
|
|
190
|
+
import {PagedList} from 'vue-client'
|
|
191
|
+
|
|
192
|
+
export default {
|
|
193
|
+
title: '调价指令查看',
|
|
194
|
+
name: 'QueryHistorylnstruct',
|
|
195
|
+
props: {
|
|
196
|
+
row: {},
|
|
197
|
+
tablename: {
|
|
198
|
+
type: String,
|
|
199
|
+
default: 't_instruct'
|
|
200
|
+
},
|
|
201
|
+
orderitem: {
|
|
202
|
+
type: String,
|
|
203
|
+
default: 'f_instruct_date desc'
|
|
204
|
+
},
|
|
205
|
+
items: {
|
|
206
|
+
type: String,
|
|
207
|
+
default: '*'
|
|
208
|
+
}
|
|
209
|
+
},
|
|
210
|
+
data () {
|
|
211
|
+
return {
|
|
212
|
+
handcental: false,
|
|
213
|
+
cancelreason: '',
|
|
214
|
+
cancelid: '',
|
|
215
|
+
f_userfiles_id: '',
|
|
216
|
+
model: new PagedList('api/af-revenue/sql/QueryPriceChangeInstructSQL', 30),
|
|
217
|
+
row: null,
|
|
218
|
+
searchshow: false,
|
|
219
|
+
show: false
|
|
220
|
+
}
|
|
221
|
+
},
|
|
222
|
+
|
|
223
|
+
ready () {
|
|
224
|
+
this.$refs.paged.$refs.criteria.search()
|
|
225
|
+
},
|
|
226
|
+
watch: {
|
|
227
|
+
'row' (val) {
|
|
228
|
+
this.f_userfiles_id = val.f_userfiles_id
|
|
229
|
+
if (this.row != null) {
|
|
230
|
+
this.$refs.paged.$refs.criteria.search()
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
},
|
|
234
|
+
methods: {
|
|
235
|
+
stateFlow: function (row) {
|
|
236
|
+
console.log(row)
|
|
237
|
+
let state = ""
|
|
238
|
+
if (row.f_instruct_type.includes("阀门控制")) {
|
|
239
|
+
let content = JSON.parse(row.f_instruct_content)
|
|
240
|
+
if (content.isOpen !== null) {
|
|
241
|
+
if (content.isOpen === 1) {
|
|
242
|
+
state = "开阀"
|
|
243
|
+
} else if (content.isOpen === 0) {
|
|
244
|
+
state = "关阀"
|
|
245
|
+
} else {
|
|
246
|
+
state = row.f_state
|
|
247
|
+
}
|
|
248
|
+
return state
|
|
249
|
+
}
|
|
250
|
+
} else {
|
|
251
|
+
return row.f_state
|
|
252
|
+
}
|
|
253
|
+
},
|
|
254
|
+
clickshow () {
|
|
255
|
+
this.searchshow = !this.searchshow
|
|
256
|
+
},
|
|
257
|
+
backSend (megrow) {
|
|
258
|
+
if (megrow.f_inputtor != '系统必需') {
|
|
259
|
+
this.handcental = true
|
|
260
|
+
this.cancelid = megrow.id
|
|
261
|
+
} else {
|
|
262
|
+
this.$showAlert('该指令为系统必需状态，无法取消发送。', 'warning', 3000)
|
|
263
|
+
}
|
|
264
|
+
},
|
|
265
|
+
confirmcenta () {
|
|
266
|
+
let send = {
|
|
267
|
+
id: this.cancelid, // 当前记录ID
|
|
268
|
+
f_cancel_inputtor_id: this.$login.f.id, // 撤销人id
|
|
269
|
+
f_cancel_inputtor: this.$login.f.name, // 撤销人姓名
|
|
270
|
+
f_instruct_state: '取消发送',
|
|
271
|
+
f_comments: this.cancelreason
|
|
272
|
+
}
|
|
273
|
+
let param = {
|
|
274
|
+
tablename: 't_instruct',
|
|
275
|
+
basedata: send
|
|
276
|
+
}
|
|
277
|
+
this.$resetpost('api/af-revenue/logic/iot_saveTable', param).then(() => {
|
|
278
|
+
// this.params.rows.splice(index, 1)
|
|
279
|
+
console.log('更新成功！')
|
|
280
|
+
})
|
|
281
|
+
this.handcental = false
|
|
282
|
+
this.$refs.paged.$refs.criteria.search()
|
|
283
|
+
},
|
|
284
|
+
search (arg) {
|
|
285
|
+
arg.condition = `${arg.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
|
|
286
|
+
this.model.search(arg.condition, arg.model)
|
|
287
|
+
}
|
|
288
|
+
},
|
|
289
|
+
computed: {
|
|
290
|
+
instructType () {
|
|
291
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('指令类型')]
|
|
292
|
+
},
|
|
293
|
+
instructState () {
|
|
294
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('指令状态')]
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
</script>
|
|
299
|
+
<style>
|
|
300
|
+
.form-input-group label {
|
|
301
|
+
text-align: right;
|
|
302
|
+
width: auto;
|
|
303
|
+
}
|
|
304
|
+
</style>
|
|
@@ -71,6 +71,9 @@
|
|
|
71
71
|
<saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
|
|
72
72
|
<query-history-instruct :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
|
|
73
73
|
</saletab>
|
|
74
|
+
<saletab header="调价指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('调价指令查看')">
|
|
75
|
+
<query-price-change-instruct :row="row" v-if="show == '调价指令查看'" @deal-msg="dealMsg"></query-price-change-instruct>
|
|
76
|
+
</saletab>
|
|
74
77
|
<saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
|
|
75
78
|
<watch-warning :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
|
|
76
79
|
</saletab>
|
|
@@ -155,6 +158,7 @@
|
|
|
155
158
|
import PriceAdjustmentQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser'
|
|
156
159
|
import MeterParam from '../../components/common/userinfo_detail/ic_detail/MeterParam'
|
|
157
160
|
import DeveiceRecord from '../../components/common/userinfo_detail/ic_detail/DeveiceRecord'
|
|
161
|
+
import QueryPriceChangeInstruct from './QueryPriceChangeInstruct'
|
|
158
162
|
|
|
159
163
|
export default {
|
|
160
164
|
title: '用户详细信息',
|
|
@@ -182,6 +186,7 @@ export default {
|
|
|
182
186
|
WatchCollection,
|
|
183
187
|
QueryInstruct,
|
|
184
188
|
QueryHistoryInstruct,
|
|
189
|
+
QueryPriceChangeInstruct,
|
|
185
190
|
ChangeRecord,
|
|
186
191
|
CardHandRecord,
|
|
187
192
|
MeterParam,
|