manage-client 4.0.72 → 4.0.73
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 +1 -1
- package/src/filiale/bayan/MonthlyReport.vue +2 -10
- package/src/filiale/shexian/ChangeMeterQuery.vue +2 -2
- package/src/filiale/yangchun/DeviceQuery.vue +1 -1
- package/src/filiale/yangchun/MeterQuery.vue +15 -5
- package/src/filiale/yangchun/WebHandplanQuery.vue +17 -1
- package/src/filiale/yangchun/config/exportConfig.js +1 -1
package/package.json
CHANGED
|
@@ -91,7 +91,6 @@
|
|
|
91
91
|
|
|
92
92
|
<script>
|
|
93
93
|
import { DataModel } from 'vue-client'
|
|
94
|
-
import co from 'co'
|
|
95
94
|
export default {
|
|
96
95
|
title: '月报表',
|
|
97
96
|
props: ['data'],
|
|
@@ -125,16 +124,13 @@ export default {
|
|
|
125
124
|
},
|
|
126
125
|
selfSearch (args) {
|
|
127
126
|
this.printTime = this.$login.toStandardTimeString()
|
|
128
|
-
let orgcondition = '1=1'
|
|
127
|
+
let orgcondition = 'and 1=1'
|
|
129
128
|
if (this.f_orgid && this.f_orgid[0]) {
|
|
130
129
|
orgcondition += ` and f_orgid in ('${this.f_orgid}')`
|
|
131
130
|
}
|
|
132
131
|
if (this.f_depid && this.f_depid[0]) {
|
|
133
132
|
orgcondition += ` and f_depid in ('${this.f_depid}')`
|
|
134
133
|
}
|
|
135
|
-
if(this.f_operatorid && this.f_operatorid[0]) {
|
|
136
|
-
orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
|
|
137
|
-
}
|
|
138
134
|
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
139
135
|
this.$refs.paged.search(args)
|
|
140
136
|
},
|
|
@@ -147,15 +143,11 @@ export default {
|
|
|
147
143
|
this.depname = val[0]
|
|
148
144
|
this.userresid = obj
|
|
149
145
|
this.f_depid = obj
|
|
150
|
-
},
|
|
151
|
-
getuser ( obj, val) {
|
|
152
|
-
this.operatorname = val[0]
|
|
153
|
-
this.f_operatorid = obj
|
|
154
146
|
}
|
|
155
147
|
},
|
|
156
148
|
watch: {
|
|
157
149
|
'model.data' (val) {
|
|
158
|
-
this.spans = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
|
|
150
|
+
this.spans = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
|
|
159
151
|
}
|
|
160
152
|
},
|
|
161
153
|
computed: {
|
|
@@ -192,12 +192,12 @@
|
|
|
192
192
|
</div>
|
|
193
193
|
<div class="col-sm-2 form-group">
|
|
194
194
|
<label class="font_normal_body">旧 表 号</label>
|
|
195
|
-
<input type="text" style="width:60%" class="input_search" v-model="model.
|
|
195
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber_old"
|
|
196
196
|
condition="f_meternumber_old = '{}'" placeholder='旧表号'>
|
|
197
197
|
</div>
|
|
198
198
|
<div class="col-sm-2 form-group">
|
|
199
199
|
<label class="font_normal_body">旧 卡 号</label>
|
|
200
|
-
<input type="text" style="width:60%" class="input_search" v-model="model.
|
|
200
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_card_old"
|
|
201
201
|
condition="f_card_old = '{}'" placeholder='旧卡号'>
|
|
202
202
|
</div>
|
|
203
203
|
<div class="col-sm-2 form-group">
|
|
@@ -167,14 +167,14 @@
|
|
|
167
167
|
</datepicker>
|
|
168
168
|
</div>
|
|
169
169
|
<div class="col-sm-2 form-group">
|
|
170
|
-
<label for="startDate" class="font_normal_body"
|
|
170
|
+
<label for="startDate" class="font_normal_body">表具通气日期</label>
|
|
171
171
|
<datepicker id="startDate" placeholder="开始日期" style="width:60%" v-model="model.startTQDate"
|
|
172
172
|
:value.sync="model.startTQDate" :format="'yyyy-MM-dd'" :show-reset-button="true"
|
|
173
173
|
condition="f_gas_date >= '{} 00:00:00'">
|
|
174
174
|
</datepicker>
|
|
175
175
|
</div>
|
|
176
176
|
<div class="col-sm-2 form-group">
|
|
177
|
-
<label for="endDate" class="font_normal_body"
|
|
177
|
+
<label for="endDate" class="font_normal_body">表具通气日期</label>
|
|
178
178
|
<datepicker id="endDate" placeholder="结束日期" style="width:60%" v-model="model.endTQDate"
|
|
179
179
|
:value.sync="model.endTQDate" :format="'yyyy-MM-dd'" :show-reset-button="true"
|
|
180
180
|
condition="f_gas_date <= '{} 23:59:59'">
|
|
@@ -226,13 +226,23 @@
|
|
|
226
226
|
<div class="col-sm-2 form-group">
|
|
227
227
|
<label for="startGasDate" class="font_normal_body">首次通气日期</label>
|
|
228
228
|
<datepicker id="startGasDate" placeholder="开始日期" style="width:60%"
|
|
229
|
-
v-model="model.
|
|
230
|
-
:value.sync="model.
|
|
229
|
+
v-model="model.startuserGasDate"
|
|
230
|
+
:value.sync="model.startuserGasDate"
|
|
231
231
|
:format="'yyyy-MM-dd'"
|
|
232
232
|
:show-reset-button="true"
|
|
233
233
|
condition="f_uservent_date >= '{} 00:00:00'">
|
|
234
234
|
</datepicker>
|
|
235
235
|
</div>
|
|
236
|
+
<div class="col-sm-2 form-group">
|
|
237
|
+
<label for="startGasDate" class="font_normal_body">首次通气日期</label>
|
|
238
|
+
<datepicker id="startGasDate" placeholder="截至日期" style="width:60%"
|
|
239
|
+
v-model="model.enduserGasDate"
|
|
240
|
+
:value.sync="model.enduserGasDate"
|
|
241
|
+
:format="'yyyy-MM-dd'"
|
|
242
|
+
:show-reset-button="true"
|
|
243
|
+
condition="f_uservent_date <= '{} 00:00:00'">
|
|
244
|
+
</datepicker>
|
|
245
|
+
</div>
|
|
236
246
|
</div>
|
|
237
247
|
</div>
|
|
238
248
|
</criteria>
|
|
@@ -315,7 +325,7 @@
|
|
|
315
325
|
</th>
|
|
316
326
|
<th>
|
|
317
327
|
<!--<nobr>通气时间</nobr>-->
|
|
318
|
-
<data-order field="f_gas_date" name="
|
|
328
|
+
<data-order field="f_gas_date" name="表具通气时间"
|
|
319
329
|
:order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
|
|
320
330
|
</th>
|
|
321
331
|
<th>
|
|
@@ -196,6 +196,17 @@
|
|
|
196
196
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_curbalance"
|
|
197
197
|
condition="f_curbalance < '{}' " placeholder="本期余额小于">
|
|
198
198
|
</div>
|
|
199
|
+
<div class="col-sm-2 form-group">
|
|
200
|
+
<label class="font_normal_body">使用类型</label>
|
|
201
|
+
<v-select :value.sync="model.f_usetype"
|
|
202
|
+
v-model="model.f_usetype"
|
|
203
|
+
:options='$parent.$parent.usetype'
|
|
204
|
+
placeholder='使用类型'
|
|
205
|
+
style="width:60%"
|
|
206
|
+
close-on-select
|
|
207
|
+
condition="f_usetype = '{}'">
|
|
208
|
+
</v-select>
|
|
209
|
+
</div>
|
|
199
210
|
</div>
|
|
200
211
|
</div>
|
|
201
212
|
</criteria>
|
|
@@ -268,6 +279,7 @@
|
|
|
268
279
|
<th>
|
|
269
280
|
<nobr>气价名称</nobr>
|
|
270
281
|
</th>
|
|
282
|
+
<th><nobr>使用类型</nobr></th>
|
|
271
283
|
<th>
|
|
272
284
|
<nobr>一阶气量</nobr>
|
|
273
285
|
</th>
|
|
@@ -399,6 +411,7 @@
|
|
|
399
411
|
<td style="text-align: center;">
|
|
400
412
|
<nobr>{{row.f_price_name}}</nobr>
|
|
401
413
|
</td>
|
|
414
|
+
<th style="text-align:center"><nobr>{{row.f_usetype}}</nobr></th>
|
|
402
415
|
<td style="text-align: center;">
|
|
403
416
|
<nobr>{{row.f_stair1amount}}</nobr>
|
|
404
417
|
</td>
|
|
@@ -935,7 +948,7 @@
|
|
|
935
948
|
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_valve_state': '阀门状态',
|
|
936
949
|
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额','f_meternumber': '表号', 'ym_data': '数据年月',
|
|
937
950
|
'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '抄表日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
|
|
938
|
-
'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
|
|
951
|
+
'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司','f_usetype': '使用类型',
|
|
939
952
|
'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费','f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
|
|
940
953
|
'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月','f_current_deduct_amount':'本次抵扣金额','f_remaining_deduct_amount':'剩余抵扣金额'
|
|
941
954
|
}
|
|
@@ -949,6 +962,9 @@
|
|
|
949
962
|
meterstate() {
|
|
950
963
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')]
|
|
951
964
|
},
|
|
965
|
+
usetype() {
|
|
966
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
|
|
967
|
+
},
|
|
952
968
|
handstate() {
|
|
953
969
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('表单状态')]
|
|
954
970
|
},
|