manage-client 3.2.96 → 3.2.98
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/.gradle/3.5.1/file-changes/last-build.bin +0 -0
- package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
- package/.gradle/buildOutputCleanup/built.bin +0 -0
- package/.gradle/buildOutputCleanup/cache.properties.lock +1 -0
- package/build/dev-server.js +177 -176
- package/package.json +1 -1
- package/src/components/sale/businessquery/CancellationQuery.vue +1 -1
- package/src/components/sale/businessquery/CardHandplanQuery.vue +1 -1
- package/src/components/sale/businessquery/HandplanQuery.vue +8 -10
- package/src/components/sale/businessquery/MoveMeterQuery.vue +1 -1
- package/src/components/sale/businessquery/PrivilegeQuery.vue +1 -1
- package/src/components/webmeter/WebmeterQuery.vue +61 -61
- package/src/components/webmeter/gasStatistics/GasStatistics.vue +34 -1
- package/src/filiale/liaoyuan/HandplanQuery.vue +1288 -0
- package/src/filiale/liaoyuan/sale.js +2 -0
- package/src/filiale/shaoguan/HandplanQuery.vue +7 -5
|
@@ -7,5 +7,7 @@ let specialComp = {
|
|
|
7
7
|
'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve) },
|
|
8
8
|
'report-list': (resolve) => { require(['./reportList'], resolve) },
|
|
9
9
|
//'hand-gas-properties-query': (resolve) => { require(['./HandGasPropertiesQuery'], resolve) }
|
|
10
|
+
// 机表抄表查询
|
|
11
|
+
'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) }
|
|
10
12
|
}
|
|
11
13
|
exports.specialComp = specialComp
|
|
@@ -13,8 +13,7 @@
|
|
|
13
13
|
v-model="model.startDate"
|
|
14
14
|
:value.sync="model.startDate"
|
|
15
15
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
|
-
:show-reset-button="true"
|
|
17
|
-
condition="f_input_date >= '{}'">
|
|
16
|
+
:show-reset-button="true">
|
|
18
17
|
</datepicker>
|
|
19
18
|
</div>
|
|
20
19
|
<div class="col-sm-2 form-group">
|
|
@@ -23,8 +22,7 @@
|
|
|
23
22
|
v-model="model.endDate"
|
|
24
23
|
:value.sync="model.endDate"
|
|
25
24
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
26
|
-
:show-reset-button="true"
|
|
27
|
-
condition="f_input_date <= '{}'">
|
|
25
|
+
:show-reset-button="true">
|
|
28
26
|
</datepicker>
|
|
29
27
|
</div>
|
|
30
28
|
<div class="col-sm-2 form-group">
|
|
@@ -705,7 +703,7 @@
|
|
|
705
703
|
other:[],
|
|
706
704
|
footer:[],
|
|
707
705
|
data: {},
|
|
708
|
-
model: new PagedList('rs/sql/handplanQuery', 20, {}, {
|
|
706
|
+
model: new PagedList('rs/sql/handplanQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
|
|
709
707
|
f_oughtamount: 0,
|
|
710
708
|
f_oughtfee: 0,
|
|
711
709
|
f_stair1amount: 0,
|
|
@@ -985,6 +983,10 @@
|
|
|
985
983
|
this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
|
|
986
984
|
this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
|
|
987
985
|
}
|
|
986
|
+
if (this.$refs.paged.$refs.cri.model.startDate === ''|| this.$refs.paged.$refs.cri.model.endDate === '') {
|
|
987
|
+
this.$showMessage('请选择录入日期开始时间和结束时间!')
|
|
988
|
+
return
|
|
989
|
+
}
|
|
988
990
|
this.area = this.$refs.paged.$refs.cri.model.f_residential_area
|
|
989
991
|
if(this.area.length !== 0){
|
|
990
992
|
let str = JSON.stringify(this.area)
|