sale-client 3.6.104 → 3.6.105
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/package.json
CHANGED
|
@@ -29,15 +29,15 @@
|
|
|
29
29
|
condition="f_user_name = '{}'">
|
|
30
30
|
</div>
|
|
31
31
|
|
|
32
|
-
<div class="form-group col-sm-2"
|
|
33
|
-
<label class="font_normal_body" style="color: #c52323">气价变更时间</label
|
|
34
|
-
<datepicker placeholder="气价变更时间"
|
|
35
|
-
style="padding: 2px;width: 60%"
|
|
36
|
-
v-model="model.f_change_date"
|
|
37
|
-
:value.sync="model.f_change_date"
|
|
38
|
-
:format="'yyyy-MM-dd'"
|
|
39
|
-
></datepicker
|
|
40
|
-
</div
|
|
32
|
+
<!-- <div class="form-group col-sm-2">-->
|
|
33
|
+
<!-- <label class="font_normal_body" style="color: #c52323">气价变更时间</label>-->
|
|
34
|
+
<!-- <datepicker placeholder="气价变更时间"-->
|
|
35
|
+
<!-- style="padding: 2px;width: 60%"-->
|
|
36
|
+
<!-- v-model="model.f_change_date"-->
|
|
37
|
+
<!-- :value.sync="model.f_change_date"-->
|
|
38
|
+
<!-- :format="'yyyy-MM-dd'"-->
|
|
39
|
+
<!-- ></datepicker>-->
|
|
40
|
+
<!-- </div>-->
|
|
41
41
|
<div class="span" style="float:right;">
|
|
42
42
|
<button class="button_new" style="width: max-content" v-show="$parent.$parent.pricechange" @click="$parent.$parent.priceshow()">批量调价</button>
|
|
43
43
|
<button class="button_search" @click="search()" v-el:cx>查询</button>
|
|
@@ -206,6 +206,15 @@
|
|
|
206
206
|
<th>
|
|
207
207
|
<nobr>三阶气量</nobr>
|
|
208
208
|
</th>
|
|
209
|
+
<th>
|
|
210
|
+
<nobr>一阶单价</nobr>
|
|
211
|
+
</th>
|
|
212
|
+
<th>
|
|
213
|
+
<nobr>二阶单价</nobr>
|
|
214
|
+
</th>
|
|
215
|
+
<th>
|
|
216
|
+
<nobr>三阶单价</nobr>
|
|
217
|
+
</th>
|
|
209
218
|
<th>
|
|
210
219
|
<nobr>一阶补差单价</nobr>
|
|
211
220
|
</th>
|
|
@@ -230,9 +239,9 @@
|
|
|
230
239
|
<th>
|
|
231
240
|
<nobr>总补差金额</nobr>
|
|
232
241
|
</th>
|
|
233
|
-
<th
|
|
234
|
-
<nobr>调价时间</nobr
|
|
235
|
-
</th
|
|
242
|
+
<!-- <th>-->
|
|
243
|
+
<!-- <nobr>调价时间</nobr>-->
|
|
244
|
+
<!-- </th>-->
|
|
236
245
|
<th>
|
|
237
246
|
<nobr>上期底数</nobr>
|
|
238
247
|
</th>
|
|
@@ -270,6 +279,9 @@
|
|
|
270
279
|
<th style="text-align: center;">{{row.f_stair_gas1}}</th>
|
|
271
280
|
<th style="text-align: center;">{{row.f_stair_gas2}}</th>
|
|
272
281
|
<th style="text-align: center;">{{row.f_stair_gas3}}</th>
|
|
282
|
+
<th style="text-align: center;">{{row.f_stair_price1}}</th>
|
|
283
|
+
<th style="text-align: center;">{{row.f_stair_price2}}</th>
|
|
284
|
+
<th style="text-align: center;">{{row.f_stair_price3}}</th>
|
|
273
285
|
<th style="text-align: center;">
|
|
274
286
|
<div v-if="!row.f_change_price1">
|
|
275
287
|
<button type="button" name="button" class="btn btn-link"
|
|
@@ -289,7 +301,7 @@
|
|
|
289
301
|
<th style="text-align: center;">{{row.f_surplus_fee3}}</th>
|
|
290
302
|
<th style="text-align: center;">{{row.f_pregas}}</th>
|
|
291
303
|
<th style="text-align: center;">{{row.f_surplus_fee}}</th>
|
|
292
|
-
<th style="text-align: center;">{{row.f_change_date}}</th
|
|
304
|
+
<!-- <th style="text-align: center;">{{row.f_change_date}}</th>-->
|
|
293
305
|
<th style="text-align: center;">{{row.f_last_tablebase}}</th>
|
|
294
306
|
<th style="text-align: center;">{{row.f_tablebase}}</th>
|
|
295
307
|
<th style="text-align: center;">{{row.f_tablebase-row.f_last_tablebase}}</th>
|
|
@@ -317,19 +329,19 @@
|
|
|
317
329
|
<div class="row" v-if="model.model.price_type==='阶梯气价'">
|
|
318
330
|
<div class="row">
|
|
319
331
|
<div class="form-group col-sm-6">
|
|
320
|
-
<label class="font_normal_body">一阶补差单价</label>
|
|
332
|
+
<label class="font_normal_body col-sm-9"><span v-if="operatorrow">({{operatorrow.f_stair_price1}})</span>一阶补差单价</label>
|
|
321
333
|
<input type="text" class="form-control" v-model="f_change_price1">
|
|
322
334
|
</div>
|
|
323
335
|
</div>
|
|
324
336
|
<div class="row" >
|
|
325
337
|
<div class="form-group col-sm-6">
|
|
326
|
-
<label class="font_normal_body">二阶补差单价</label>
|
|
338
|
+
<label class="font_normal_body col-sm-9"><span v-if="operatorrow">({{operatorrow.f_stair_price2}})</span>二阶补差单价</label>
|
|
327
339
|
<input type="text" class="form-control" v-model="f_change_price2">
|
|
328
340
|
</div>
|
|
329
341
|
</div>
|
|
330
342
|
<div class="row">
|
|
331
|
-
<div class="form-group col-sm-6">
|
|
332
|
-
<label class="font_normal_body">三阶补差单价</label>
|
|
343
|
+
<div class="form-group col-sm-6 ">
|
|
344
|
+
<label class="font_normal_body col-sm-9"><span v-if="operatorrow">({{operatorrow.f_stair_price3}})</span>三阶补差单价</label>
|
|
333
345
|
<input type="text" class="form-control" v-model="f_change_price3">
|
|
334
346
|
</div>
|
|
335
347
|
</div>
|
|
@@ -379,7 +391,7 @@
|
|
|
379
391
|
}
|
|
380
392
|
console.log(rs)
|
|
381
393
|
self.pricers = [ ...rs]
|
|
382
|
-
self.$showAlert('请输入[
|
|
394
|
+
self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
|
|
383
395
|
self.pricechange = false
|
|
384
396
|
//self.$refs.paged.$refs.criteria.search()
|
|
385
397
|
})
|
|
@@ -672,17 +684,13 @@
|
|
|
672
684
|
})
|
|
673
685
|
},
|
|
674
686
|
priceshow () {
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
this.f_change_price3 = 0
|
|
683
|
-
this.pricetime_states = ''
|
|
684
|
-
this.operatortype = 'batch'
|
|
685
|
-
}
|
|
687
|
+
this.operatorrow = this.model.rows[0]
|
|
688
|
+
this.show = true
|
|
689
|
+
this.f_change_price1 = 0
|
|
690
|
+
this.f_change_price2 = 0
|
|
691
|
+
this.f_change_price3 = 0
|
|
692
|
+
this.pricetime_states = ''
|
|
693
|
+
this.operatortype = 'batch'
|
|
686
694
|
},
|
|
687
695
|
close () {
|
|
688
696
|
this.f_change_price1 = 0
|
|
@@ -797,8 +805,8 @@
|
|
|
797
805
|
this.f_prices = [{label: '全部', value: ''}]
|
|
798
806
|
args.model.addSelectParam = ''
|
|
799
807
|
// args.model.joinTable =''
|
|
800
|
-
if (
|
|
801
|
-
this.$showAlert('请输入[
|
|
808
|
+
if ( this.$refs.paged.$refs.criteria.model.price_type == '') {
|
|
809
|
+
this.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
|
|
802
810
|
this.model.rows = []
|
|
803
811
|
this.pricechange = false
|
|
804
812
|
return
|
|
@@ -808,7 +816,7 @@
|
|
|
808
816
|
// args.model.addSelectParam = 'u5.f_surplus_fee,u5.id,u5.f_state,u5.f_new_price,u5.f_old_price,u5.f_change_price,u5.f_whether_pay,u5.f_sell_id,'
|
|
809
817
|
// args.model.joinTable = 'left join t_surplus_detail u5 on u5.f_handplan_id = u1.f_handplan_id'
|
|
810
818
|
} else {
|
|
811
|
-
if(args.model.
|
|
819
|
+
if(args.model.price_name && args.model.price_type && args.model.price_states[0] && args.model.price_states[0]==='is null'){
|
|
812
820
|
this.pricechange = true
|
|
813
821
|
}else {
|
|
814
822
|
this.pricechange = false
|
|
@@ -151,6 +151,15 @@
|
|
|
151
151
|
<th>
|
|
152
152
|
<nobr>三阶补差单价</nobr>
|
|
153
153
|
</th>
|
|
154
|
+
<th>
|
|
155
|
+
<nobr>一阶补差单价</nobr>
|
|
156
|
+
</th>
|
|
157
|
+
<th>
|
|
158
|
+
<nobr>二阶补差单价</nobr>
|
|
159
|
+
</th>
|
|
160
|
+
<th>
|
|
161
|
+
<nobr>三阶补差单价</nobr>
|
|
162
|
+
</th>
|
|
154
163
|
<th>
|
|
155
164
|
<nobr>一阶补差金额</nobr>
|
|
156
165
|
</th>
|
|
@@ -184,6 +193,9 @@
|
|
|
184
193
|
<th style="text-align: center;">{{row.f_stair_gas1}}</th>
|
|
185
194
|
<th style="text-align: center;">{{row.f_stair_gas2}}</th>
|
|
186
195
|
<th style="text-align: center;">{{row.f_stair_gas3}}</th>
|
|
196
|
+
<th style="text-align: center;">{{row.f_stair_price1}}</th>
|
|
197
|
+
<th style="text-align: center;">{{row.f_stair_price2}}</th>
|
|
198
|
+
<th style="text-align: center;">{{row.f_stair_price3}}</th>
|
|
187
199
|
<th style="text-align: center;">
|
|
188
200
|
<div v-if="!row.f_change_price1">
|
|
189
201
|
<button type="button" name="button" class="btn btn-link"
|
|
@@ -248,26 +260,26 @@
|
|
|
248
260
|
<div class="row" v-if="model.model.price_type==='阶梯气价'">
|
|
249
261
|
<div class="row">
|
|
250
262
|
<div class="form-group col-sm-6">
|
|
251
|
-
<label class="font_normal_body col-sm-
|
|
263
|
+
<label class="font_normal_body col-sm-9"><span v-if="operatorrow">({{operatorrow.f_stair_price1}})</span>一阶补差单价</label>
|
|
252
264
|
<input type="text" class="form-control" v-model="f_change_price1">
|
|
253
265
|
</div>
|
|
254
266
|
</div>
|
|
255
267
|
<div class="row" >
|
|
256
268
|
<div class="form-group col-sm-6">
|
|
257
|
-
<label class="font_normal_body col-sm-
|
|
269
|
+
<label class="font_normal_body col-sm-9"><span v-if="operatorrow">({{operatorrow.f_stair_price2}})</span>二阶补差单价</label>
|
|
258
270
|
<input type="text" class="form-control" v-model="f_change_price2">
|
|
259
271
|
</div>
|
|
260
272
|
</div>
|
|
261
273
|
<div class="row">
|
|
262
|
-
<div class="form-group col-sm-6">
|
|
263
|
-
<label class="font_normal_body col-sm-
|
|
274
|
+
<div class="form-group col-sm-6 ">
|
|
275
|
+
<label class="font_normal_body col-sm-9"><span v-if="operatorrow">({{operatorrow.f_stair_price3}})</span>三阶补差单价</label>
|
|
264
276
|
<input type="text" class="form-control" v-model="f_change_price3">
|
|
265
277
|
</div>
|
|
266
278
|
</div>
|
|
267
279
|
</div>
|
|
268
280
|
<div v-else>
|
|
269
|
-
<div class="form-group col-sm-
|
|
270
|
-
<label class="font_normal_body
|
|
281
|
+
<div class="form-group col-sm-4">
|
|
282
|
+
<label class="font_normal_body">补差单价</label>
|
|
271
283
|
<input type="text" class="form-control" v-model="f_change_price1">
|
|
272
284
|
</div>
|
|
273
285
|
</div>
|
|
@@ -417,6 +429,7 @@
|
|
|
417
429
|
})
|
|
418
430
|
},
|
|
419
431
|
priceshow () {
|
|
432
|
+
this.operatorrow = this.model.rows[0]
|
|
420
433
|
this.show = true
|
|
421
434
|
this.f_change_price1 = 0
|
|
422
435
|
this.f_change_price2 = 0
|
|
@@ -363,22 +363,74 @@
|
|
|
363
363
|
<td style="text-align: center;">{{ row.f_actualtablebase }}</td>
|
|
364
364
|
<td style="text-align: center;">{{ row.total_gas - (row.f_tablebase - row.f_initial_base) }}</td>
|
|
365
365
|
<td style="text-align: center;">
|
|
366
|
-
<
|
|
366
|
+
<div class="form-group" style="margin-bottom:0px;"
|
|
367
|
+
v-if="row.f_meter_state === '未抄表' ">
|
|
368
|
+
<input type="text" class="form-control" v-model="row.f_instantaneous_flow"
|
|
369
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
370
|
+
:disabled="row.state === '开始'"
|
|
371
|
+
>
|
|
372
|
+
</div>
|
|
373
|
+
<div v-else>
|
|
374
|
+
<span >{{ row.f_instantaneous_flow }}</span>
|
|
375
|
+
</div>
|
|
367
376
|
</td>
|
|
368
377
|
<td style="text-align: center;">
|
|
369
|
-
<nobr>{{row.f_pressure}}</nobr
|
|
378
|
+
<!-- <nobr>{{row.f_pressure}}</nobr>-->
|
|
379
|
+
<div class="form-group" style="margin-bottom:0px;"
|
|
380
|
+
v-if="row.f_meter_state === '未抄表' ">
|
|
381
|
+
<input type="text" class="form-control" v-model="row.f_pressure"
|
|
382
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
383
|
+
:disabled="row.state === '开始'"
|
|
384
|
+
>
|
|
385
|
+
</div>
|
|
386
|
+
<div v-else>
|
|
387
|
+
<span >{{ row.f_pressure }}</span>
|
|
388
|
+
</div>
|
|
370
389
|
</td>
|
|
371
390
|
<td style="text-align: center;">
|
|
372
|
-
<nobr>{{row.f_temperature}}</nobr
|
|
391
|
+
<!-- <nobr>{{row.f_temperature}}</nobr>-->
|
|
392
|
+
<div class="form-group" style="margin-bottom:0px;"
|
|
393
|
+
v-if="row.f_meter_state === '未抄表' ">
|
|
394
|
+
<input type="text" class="form-control" v-model="row.f_temperature"
|
|
395
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
396
|
+
:disabled="row.state === '开始'"
|
|
397
|
+
>
|
|
398
|
+
</div>
|
|
399
|
+
<div v-else>
|
|
400
|
+
<span >{{ row.f_temperature }}</span>
|
|
401
|
+
</div>
|
|
373
402
|
</td>
|
|
374
403
|
<td style="text-align: center;">
|
|
375
404
|
<nobr>{{row.f_flowmeter_capacity}}</nobr>
|
|
376
405
|
</td>
|
|
377
406
|
<td style="text-align: center;">
|
|
378
|
-
<nobr>{{row.f_controller_power}}</nobr
|
|
407
|
+
<!-- <nobr>{{row.f_controller_power}}</nobr>-->
|
|
408
|
+
<div class="form-group" style="margin-bottom:0px;"
|
|
409
|
+
v-if="row.f_meter_state === '未抄表' ">
|
|
410
|
+
<input type="text" class="form-control" v-model="row.f_controller_power"
|
|
411
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
412
|
+
:disabled="row.state === '开始'"
|
|
413
|
+
>
|
|
414
|
+
</div>
|
|
415
|
+
<div v-else>
|
|
416
|
+
<span >{{ row.f_controller_power }}</span>
|
|
417
|
+
</div>
|
|
379
418
|
</td>
|
|
380
419
|
<td style="text-align: center;">
|
|
381
|
-
<nobr>{{row.f_valve_switch}}</nobr
|
|
420
|
+
<!-- <nobr>{{row.f_valve_switch}}</nobr>-->
|
|
421
|
+
<div class="form-group" style="margin-bottom:0px;display: contents;"
|
|
422
|
+
v-if="row.f_meter_state === '未抄表' && row.states !== 0">
|
|
423
|
+
<v-select :value.sync="row.f_valve_switch" v-model="row.f_valve_switch"
|
|
424
|
+
:options='$parent.$parent.$parent.valve_switch' placeholder='阀门开关'
|
|
425
|
+
width="100%"
|
|
426
|
+
:value-single="true"
|
|
427
|
+
close-on-select
|
|
428
|
+
></v-select>
|
|
429
|
+
<!-- <span id="inputError2Status" class="sr-only">(error)</span> -->
|
|
430
|
+
</div>
|
|
431
|
+
<div v-else>
|
|
432
|
+
{{ row.f_valve_switch }}
|
|
433
|
+
</div>
|
|
382
434
|
</td>
|
|
383
435
|
<td style="text-align: center;">{{ row.f_meter_state }}</td>
|
|
384
436
|
<td style="text-align: center;">
|
|
@@ -474,6 +526,7 @@ export default {
|
|
|
474
526
|
// 请求对象(批量导入,查询进度使用)
|
|
475
527
|
HttpReset: new HttpResetClass(),
|
|
476
528
|
resultstate: this.$appdata.getParam('卡表抄表表状态'),
|
|
529
|
+
valve_switch:this.$appdata.getParam('阀门开关'),
|
|
477
530
|
criteriaShow: false,
|
|
478
531
|
orderitem: 'f_userinfo_code',
|
|
479
532
|
model: new PagedList('rs/sql/getCardPlan', 50, {orderitem: this.orderitem ? '"' + this.orderitem + ' "' : `'f_userinfo_code'`}, {f_actualtablebase: 0}),
|