manage-client 3.3.52 → 3.3.53
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
|
@@ -581,7 +581,7 @@
|
|
|
581
581
|
<nobr>{{row.f_tablebase }}</nobr>
|
|
582
582
|
</td>
|
|
583
583
|
<td style="text-align: center;">
|
|
584
|
-
<nobr>{{row.f_pregas}}</nobr>
|
|
584
|
+
<nobr>{{(row.f_pregas-0).toFixed(2)}}</nobr>
|
|
585
585
|
</td>
|
|
586
586
|
<td style="text-align: center;">
|
|
587
587
|
<nobr>{{row.fee}}</nobr>
|
|
@@ -694,7 +694,7 @@
|
|
|
694
694
|
<nobr>{{row.f_corr_operate_date}}</nobr>
|
|
695
695
|
</td>
|
|
696
696
|
<td style="text-align: center;">
|
|
697
|
-
<nobr>{{row.f_stairamount1}}</nobr>
|
|
697
|
+
<nobr>{{(row.f_stairamount1 - 0).toFixed(2)}}</nobr>
|
|
698
698
|
</td>
|
|
699
699
|
<td style="text-align: center;">
|
|
700
700
|
<nobr>{{row.conutnum>1?'--':row.f_stair1price}}</nobr>
|
|
@@ -703,7 +703,7 @@
|
|
|
703
703
|
<nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
|
|
704
704
|
</td>
|
|
705
705
|
<td style="text-align: center;">
|
|
706
|
-
<nobr>{{row.f_stair2amount}}</nobr>
|
|
706
|
+
<nobr>{{(row.f_stair2amount - 0).toFixed(2)}}</nobr>
|
|
707
707
|
</td>
|
|
708
708
|
<td style="text-align: center;">
|
|
709
709
|
<nobr>{{row.conutnum>1?'--':row.f_stair2price}}</nobr>
|
|
@@ -712,7 +712,7 @@
|
|
|
712
712
|
<nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
|
|
713
713
|
</td>
|
|
714
714
|
<td style="text-align: center;">
|
|
715
|
-
<nobr>{{row.f_stair3amount}}</nobr>
|
|
715
|
+
<nobr>{{(row.f_stair3amount - 0).toFixed(2)}}</nobr>
|
|
716
716
|
</td>
|
|
717
717
|
<td style="text-align: center;">
|
|
718
718
|
<nobr>{{row.conutnum>1?'--':row.f_stair3price}}</nobr>
|
|
@@ -755,19 +755,19 @@
|
|
|
755
755
|
优惠合计: {{sumsmodel.f_privilege_money}}
|
|
756
756
|
</td>
|
|
757
757
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
758
|
-
一阶气量合计: {{sumsmodel.f_stairamount1}}
|
|
758
|
+
一阶气量合计: {{sumsmodel.f_stairamount1.toFixed(2)}}
|
|
759
759
|
</td>
|
|
760
760
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
761
761
|
一阶气费合计: {{sumsmodel.f_stair1fee}}
|
|
762
762
|
</td>
|
|
763
763
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
764
|
-
二阶气量合计: {{sumsmodel.f_stair2amount}}
|
|
764
|
+
二阶气量合计: {{sumsmodel.f_stair2amount.toFixed(2)}}
|
|
765
765
|
</td>
|
|
766
766
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
767
767
|
二阶气费合计: {{sumsmodel.f_stair2fee}}
|
|
768
768
|
</td>
|
|
769
769
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
770
|
-
三阶气量合计: {{sumsmodel.f_stair3amount}}
|
|
770
|
+
三阶气量合计: {{sumsmodel.f_stair3amount.toFixed(2)}}
|
|
771
771
|
</td>
|
|
772
772
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
773
773
|
三阶气费合计: {{sumsmodel.f_stair3fee}}
|
|
@@ -454,6 +454,24 @@
|
|
|
454
454
|
condition="f_network_valve='{}'">
|
|
455
455
|
</v-select>
|
|
456
456
|
</div>
|
|
457
|
+
<div class="col-sm-2 form-group" >
|
|
458
|
+
<label for="endDate4" class="font_normal_body" title='未购气开始时间'>开始时间</label>
|
|
459
|
+
<datepicker id="endDate4" placeholder="未购气开始时间" style="width:60%"
|
|
460
|
+
v-model="model.startDate5"
|
|
461
|
+
:value.sync="model.startDate5"
|
|
462
|
+
:format="'yyyy-MM-dd'"
|
|
463
|
+
:show-reset-button="true">
|
|
464
|
+
</datepicker>
|
|
465
|
+
</div>
|
|
466
|
+
<div class="col-sm-2 form-group" >
|
|
467
|
+
<label for="endDate4" class="font_normal_body" title="未购气结束时间">结束时间</label>
|
|
468
|
+
<datepicker id="endDate4" placeholder="未购气结束时间" style="width:60%"
|
|
469
|
+
v-model="model.endDate5"
|
|
470
|
+
:value.sync="model.endDate5"
|
|
471
|
+
:format="'yyyy-MM-dd'"
|
|
472
|
+
:show-reset-button="true">
|
|
473
|
+
</datepicker>
|
|
474
|
+
</div>
|
|
457
475
|
</div>
|
|
458
476
|
</div>
|
|
459
477
|
</criteria>
|
|
@@ -473,7 +491,7 @@
|
|
|
473
491
|
<th colspan="6">
|
|
474
492
|
<nobr>燃气表</nobr>
|
|
475
493
|
</th>
|
|
476
|
-
<th colspan="
|
|
494
|
+
<th colspan="65">
|
|
477
495
|
<nobr>其他</nobr>
|
|
478
496
|
</th>
|
|
479
497
|
</tr>
|
|
@@ -488,7 +506,7 @@
|
|
|
488
506
|
<nobr>身份证号</nobr>
|
|
489
507
|
</th>
|
|
490
508
|
<th>
|
|
491
|
-
<
|
|
509
|
+
<data-order field="f_address" name="详细地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
492
510
|
</th>
|
|
493
511
|
<th>
|
|
494
512
|
<nobr>联系电话</nobr>
|
|
@@ -665,6 +683,15 @@
|
|
|
665
683
|
<th>
|
|
666
684
|
<nobr>灶具信息</nobr>
|
|
667
685
|
</th>
|
|
686
|
+
<th>
|
|
687
|
+
<nobr>上次安检时间</nobr>
|
|
688
|
+
</th
|
|
689
|
+
><th>
|
|
690
|
+
<nobr>上次安检状态</nobr>
|
|
691
|
+
</th>
|
|
692
|
+
<th>
|
|
693
|
+
<nobr>上次购气时间</nobr>
|
|
694
|
+
</th>
|
|
668
695
|
<th>
|
|
669
696
|
<nobr>备注</nobr>
|
|
670
697
|
</th>
|
|
@@ -795,6 +822,9 @@
|
|
|
795
822
|
<td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
|
|
796
823
|
<td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
|
|
797
824
|
<td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
|
|
825
|
+
<td style="text-align: center;"><nobr>{{row.f_last_check_date}}</nobr></td>
|
|
826
|
+
<td style="text-align: center;"><nobr>{{row.f_last_check_result}}</nobr></td>
|
|
827
|
+
<td style="text-align: center;"><nobr>{{row.f_last_gas_date}}</nobr></td>
|
|
798
828
|
<td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
|
|
799
829
|
</template>
|
|
800
830
|
<template partial='foot'>
|
|
@@ -880,7 +910,7 @@ let readySomething = async function (self) {
|
|
|
880
910
|
self.getPricenames();
|
|
881
911
|
self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
|
|
882
912
|
// self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
|
|
883
|
-
|
|
913
|
+
self.$refs.paged.$refs.cri.model.endDate5 = self.$login.toStandardDateString()
|
|
884
914
|
// await self.$refs.paged.$refs.cri.search()
|
|
885
915
|
}
|
|
886
916
|
export default {
|
|
@@ -892,7 +922,10 @@ export default {
|
|
|
892
922
|
isSingleUser: null,
|
|
893
923
|
other:[],
|
|
894
924
|
footer:[],
|
|
895
|
-
model: new PagedList('rs/sql/compreQuery', 20,
|
|
925
|
+
model: new PagedList('rs/sql/compreQuery', 20,
|
|
926
|
+
{startDate5: 'this.model.startDate5', endDate5: 'this.model.endDate5',
|
|
927
|
+
orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area asc,f_building asc,f_unit asc,f_floor asc,f_room asc'`},
|
|
928
|
+
{f_yiguabiao:0,f_weiguabiao:0}),
|
|
896
929
|
criteriaShow: false,
|
|
897
930
|
orgCondtionStr:'',
|
|
898
931
|
residentialArea: [],
|
|
@@ -908,7 +941,7 @@ export default {
|
|
|
908
941
|
tfoot: '',
|
|
909
942
|
defaultfield: [],
|
|
910
943
|
//排序
|
|
911
|
-
orderitem: 'f_residential_area
|
|
944
|
+
orderitem: 'f_residential_area asc,f_building asc,f_unit asc,f_floor asc,f_room asc',
|
|
912
945
|
orderFields: {
|
|
913
946
|
f_operate_date: 'no'
|
|
914
947
|
},
|
|
@@ -226,7 +226,7 @@ export default{
|
|
|
226
226
|
'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型',
|
|
227
227
|
'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
|
|
228
228
|
'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控',
|
|
229
|
-
'f_defendcard': '防盗卡号', 'f_factory_date': '生产年月'
|
|
229
|
+
'f_defendcard': '防盗卡号', 'f_factory_date': '生产年月', 'f_last_check_date': '上次安检时间', 'f_last_check_result': '上次安检状态', 'f_last_gas_date': '上次购气时间'
|
|
230
230
|
},
|
|
231
231
|
|
|
232
232
|
compreConfigGY: {
|