manage-client 3.3.25 → 3.3.27
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/components/sale/config/exportConfig.js +1 -1
- package/src/components/sale/filesquery/UserQuery.vue +34 -34
- package/src/components/webmeter/DrillData/LostContactAnalysisList.vue +2 -1
- package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue +2 -2
- package/src/components/webmeter/gasStatistics/NewGasStatistics.vue +2 -0
- package/src/components/webmeter/recharge/RechargeList.vue +5 -3
- package/src/components/webmeter/report/ReportList.vue +6 -3
- package/src/components/webmeter/reportdata/ReportDataQuery.vue +5 -3
- package/src/filiale/ningjin/GasStatistics.vue +10 -10
- package/src/filiale/shexian/ChangeMeterQuery.vue +748 -0
- package/src/filiale/shexian/config/DefaultPrint.js +6 -0
- package/src/filiale/shexian/config/exportConfig.js +2260 -0
- package/src/filiale/shexian/config/tableConfig.js +54 -0
- package/src/filiale/shexian/sale.js +9 -0
- package/src/filiale/wenxi/GasStatistics.vue +5 -3
- package/src/filiale/wenxi/WebHandQuery.vue +5 -3
package/package.json
CHANGED
|
@@ -682,7 +682,7 @@ export default{
|
|
|
682
682
|
GasStatistics: {
|
|
683
683
|
'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_gascode': '燃气证号', 'f_meternumber': '表号',
|
|
684
684
|
'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_user_nature': '用气类型','f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
|
|
685
|
-
'f_oughtamount': '期间用气量', 'f_oughtfee': '期间用气金额', 'f_collection': '期末充值金额', 'f_curbalance': '期末余额', 'f_gas_state': '用气状态', 'f_changetable_state': '是否换表', 'f_input_date': '最后通讯日期'
|
|
685
|
+
'f_oughtamount': '期间用气量', 'f_oughtfee': '期间用气金额', 'f_collection': '期末充值金额', 'f_curbalance': '期末余额', 'f_gas_state': '用气状态', 'f_changetable_state': '是否换表', 'f_first_input_date': '首次抄表时间', 'f_input_date': '最后通讯日期'
|
|
686
686
|
},
|
|
687
687
|
ArrearageConfig: {
|
|
688
688
|
'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_type': '用户类型', 'f_gasproperties': '用气性质', 'f_curbalance': '欠费金额', 'f_oughtamount': '欠费气量'
|
|
@@ -98,16 +98,16 @@
|
|
|
98
98
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_address"
|
|
99
99
|
condition="f_address like '%{}%'" placeholder='客户地址'>
|
|
100
100
|
</div>
|
|
101
|
-
<div class="col-sm-2 form-group"
|
|
102
|
-
<label for="startDate" class="font_normal_body">建档日期</label
|
|
103
|
-
<datepicker placeholder="
|
|
104
|
-
v-model="model.f_createfile_date"
|
|
105
|
-
:value.sync="model.f_createfile_date"
|
|
106
|
-
:format="'yyyy-MM-dd'"
|
|
107
|
-
:show-reset-button="true"
|
|
108
|
-
condition="f_createfile_date >= '{} 00:00:00'"
|
|
109
|
-
</datepicker
|
|
110
|
-
</div
|
|
101
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
102
|
+
<!-- <label for="startDate" class="font_normal_body">建档日期</label>-->
|
|
103
|
+
<!-- <datepicker placeholder="建档开始日期" style="width:60%"-->
|
|
104
|
+
<!-- v-model="model.f_createfile_date"-->
|
|
105
|
+
<!-- :value.sync="model.f_createfile_date"-->
|
|
106
|
+
<!-- :format="'yyyy-MM-dd'"-->
|
|
107
|
+
<!-- :show-reset-button="true"-->
|
|
108
|
+
<!-- condition="f_createfile_date >= '{} 00:00:00'">-->
|
|
109
|
+
<!-- </datepicker>-->
|
|
110
|
+
<!-- </div>-->
|
|
111
111
|
<div class="col-sm-2 form-group">
|
|
112
112
|
<label class="font_normal_body">建档部门</label>
|
|
113
113
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_depname"
|
|
@@ -207,8 +207,8 @@
|
|
|
207
207
|
<!-- </div>-->
|
|
208
208
|
<!-- </div>-->
|
|
209
209
|
<div class="col-sm-2 form-group">
|
|
210
|
-
<label for="startDate" class="font_normal_body">开始日期</label>
|
|
211
|
-
<datepicker id="startDate" placeholder="
|
|
210
|
+
<label for="startDate" class="font_normal_body" title="建档开始日期">开始日期</label>
|
|
211
|
+
<datepicker id="startDate" placeholder="建档开始日期" style="width:60%"
|
|
212
212
|
v-model="model.startDate"
|
|
213
213
|
:value.sync="model.startDate"
|
|
214
214
|
:format="'yyyy-MM-dd'"
|
|
@@ -217,8 +217,8 @@
|
|
|
217
217
|
</datepicker>
|
|
218
218
|
</div>
|
|
219
219
|
<div class="col-sm-2 form-group">
|
|
220
|
-
<label for="endDate" class="font_normal_body">结束日期</label>
|
|
221
|
-
<datepicker id="endDate" placeholder="
|
|
220
|
+
<label for="endDate" class="font_normal_body" title="建档结束日期">结束日期</label>
|
|
221
|
+
<datepicker id="endDate" placeholder="建档结束日期" style="width:60%"
|
|
222
222
|
v-model="model.endDate"
|
|
223
223
|
:value.sync="model.endDate"
|
|
224
224
|
:format="'yyyy-MM-dd'"
|
|
@@ -226,6 +226,26 @@
|
|
|
226
226
|
condition="f_createfile_date <= '{} 23:59:59'">
|
|
227
227
|
</datepicker>
|
|
228
228
|
</div>
|
|
229
|
+
<div class="col-sm-2 form-group">
|
|
230
|
+
<label for="startGasDate" class="font_normal_body">通气时间</label>
|
|
231
|
+
<datepicker id="startGasDate" placeholder="开始日期" style="width:60%"
|
|
232
|
+
v-model="model.startGasDate"
|
|
233
|
+
:value.sync="model.startGasDate"
|
|
234
|
+
:format="'yyyy-MM-dd'"
|
|
235
|
+
:show-reset-button="true"
|
|
236
|
+
condition="f_gas_date >= '{} 00:00:00'">
|
|
237
|
+
</datepicker>
|
|
238
|
+
</div>
|
|
239
|
+
<div class="col-sm-2 form-group">
|
|
240
|
+
<label for="endGasDate" class="font_normal_body">至</label>
|
|
241
|
+
<datepicker id="endGasDate" placeholder="结束日期" style="width:60%"
|
|
242
|
+
v-model="model.endGasDate"
|
|
243
|
+
:value.sync="model.endGasDate"
|
|
244
|
+
:format="'yyyy-MM-dd'"
|
|
245
|
+
:show-reset-button="true"
|
|
246
|
+
condition="f_gas_date <= '{} 23:59:59'">
|
|
247
|
+
</datepicker>
|
|
248
|
+
</div>
|
|
229
249
|
<!--表册片区-->
|
|
230
250
|
<div class="col-sm-2 form-group">
|
|
231
251
|
<label class="font_normal_body">表册片区</label>
|
|
@@ -251,26 +271,6 @@
|
|
|
251
271
|
:options='$parent.$parent.addressstate' placeholder='请选择'
|
|
252
272
|
close-on-select></v-select>
|
|
253
273
|
</div>
|
|
254
|
-
<div class="col-sm-2 form-group">
|
|
255
|
-
<label for="startGasDate" class="font_normal_body">通气时间</label>
|
|
256
|
-
<datepicker id="startGasDate" placeholder="开始日期" style="width:60%"
|
|
257
|
-
v-model="model.startGasDate"
|
|
258
|
-
:value.sync="model.startGasDate"
|
|
259
|
-
:format="'yyyy-MM-dd'"
|
|
260
|
-
:show-reset-button="true"
|
|
261
|
-
condition="f_gas_date >= '{} 00:00:00'">
|
|
262
|
-
</datepicker>
|
|
263
|
-
</div>
|
|
264
|
-
<div class="col-sm-2 form-group">
|
|
265
|
-
<label for="endGasDate" class="font_normal_body">至</label>
|
|
266
|
-
<datepicker id="endGasDate" placeholder="结束日期" style="width:60%"
|
|
267
|
-
v-model="model.endGasDate"
|
|
268
|
-
:value.sync="model.endGasDate"
|
|
269
|
-
:format="'yyyy-MM-dd'"
|
|
270
|
-
:show-reset-button="true"
|
|
271
|
-
condition="f_gas_date <= '{} 23:59:59'">
|
|
272
|
-
</datepicker>
|
|
273
|
-
</div>
|
|
274
274
|
<div class="col-sm-2 form-group">
|
|
275
275
|
<label class="font_normal_body">发卡状态</label>
|
|
276
276
|
<v-select :value.sync="model.f_whether_hairpin"
|
|
@@ -438,7 +438,7 @@
|
|
|
438
438
|
dr.label = res.data[i].f_meter_brand
|
|
439
439
|
dr.value = res.data[i].f_meter_brand
|
|
440
440
|
//气表品牌
|
|
441
|
-
self.WarningType.push(dr)
|
|
441
|
+
// self.WarningType.push(dr)
|
|
442
442
|
} else if (groupname == 'f_meter_style') {
|
|
443
443
|
self.Warningstyle= [
|
|
444
444
|
{label: '全部', value: ''}
|
|
@@ -497,6 +497,7 @@
|
|
|
497
497
|
}
|
|
498
498
|
|
|
499
499
|
})
|
|
500
|
+
this.WarningType = [{label: '全部', value: ''}, ...arr]
|
|
500
501
|
|
|
501
502
|
},
|
|
502
503
|
search(args) {
|
|
@@ -426,7 +426,7 @@
|
|
|
426
426
|
dr.label = res.data[i].f_meter_brand
|
|
427
427
|
dr.value = res.data[i].f_meter_brand
|
|
428
428
|
//气表品牌
|
|
429
|
-
self.WarningType.push(dr)
|
|
429
|
+
// self.WarningType.push(dr)
|
|
430
430
|
} else if (groupname == 'f_meter_style') {
|
|
431
431
|
self.Warningstyle= [
|
|
432
432
|
{label: '全部', value: ''}
|
|
@@ -510,7 +510,7 @@
|
|
|
510
510
|
}
|
|
511
511
|
|
|
512
512
|
})
|
|
513
|
-
this.
|
|
513
|
+
this.WarningType = [{label: '全部', value: ''}, ...arr]
|
|
514
514
|
},
|
|
515
515
|
// 显示柱状图
|
|
516
516
|
showEcharts() {
|
|
@@ -192,6 +192,7 @@
|
|
|
192
192
|
<th><nobr>期末余额</nobr></th>
|
|
193
193
|
<th><nobr>用气状态</nobr></th>
|
|
194
194
|
<th><nobr>是否换表</nobr></th>
|
|
195
|
+
<th><nobr>首次抄表时间</nobr></th>
|
|
195
196
|
<th><nobr>最后通讯日期</nobr></th>
|
|
196
197
|
</tr>
|
|
197
198
|
</template>
|
|
@@ -226,6 +227,7 @@
|
|
|
226
227
|
<th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
|
|
227
228
|
<th style="text-align:center"><nobr>{{row.f_gas_state}}</nobr></th>
|
|
228
229
|
<th style="text-align:center"><nobr>{{row.f_changetable_state}}</nobr></th>
|
|
230
|
+
<th style="text-align:center"><nobr>{{row.f_first_input_date}}</nobr></th>
|
|
229
231
|
<th style="text-align:center"><nobr>{{row.f_input_date}}</nobr></th>
|
|
230
232
|
</tr>
|
|
231
233
|
</template>
|
|
@@ -221,9 +221,11 @@
|
|
|
221
221
|
let brandArr = []
|
|
222
222
|
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
223
223
|
let temp = {}
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
224
|
+
if(item.value.f_meter_type==='物联网表'){
|
|
225
|
+
temp.label = item.label
|
|
226
|
+
temp.value = item.value.f_meter_brand
|
|
227
|
+
brandArr.push(temp )
|
|
228
|
+
}
|
|
227
229
|
})
|
|
228
230
|
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
229
231
|
//初始化气表价格
|
|
@@ -270,9 +270,12 @@
|
|
|
270
270
|
let brandArr = []
|
|
271
271
|
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
272
272
|
let temp = {}
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
273
|
+
if(item.value.f_meter_type==='物联网表'){
|
|
274
|
+
temp.label = item.label
|
|
275
|
+
temp.value = item.value.f_meter_brand
|
|
276
|
+
brandArr.push(temp )
|
|
277
|
+
}
|
|
278
|
+
|
|
276
279
|
})
|
|
277
280
|
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
278
281
|
//初始化气表价格
|
|
@@ -190,9 +190,11 @@
|
|
|
190
190
|
let brandArr = []
|
|
191
191
|
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
192
192
|
let temp = {}
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
193
|
+
if(item.value.f_meter_type==='物联网表'){
|
|
194
|
+
temp.label = item.label
|
|
195
|
+
temp.value = item.value.f_meter_brand
|
|
196
|
+
brandArr.push(temp )
|
|
197
|
+
}
|
|
196
198
|
})
|
|
197
199
|
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
198
200
|
//初始化气表价格
|
|
@@ -100,14 +100,14 @@
|
|
|
100
100
|
condition="ss.f_changetable_state = '{}'"
|
|
101
101
|
close-on-select></v-select>
|
|
102
102
|
</div>
|
|
103
|
-
<div class="col-sm-2 form-group"
|
|
104
|
-
<label class="font_normal_body">用气状态</label
|
|
105
|
-
<v-select :value.sync="model.f_gas_state"
|
|
106
|
-
v-model="model.f_gas_state"
|
|
107
|
-
:options="$parent.$parent.gasState"
|
|
108
|
-
condition="ss.f_gas_state = '{}'"
|
|
109
|
-
close-on-select></v-select
|
|
110
|
-
</div
|
|
103
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
104
|
+
<!-- <label class="font_normal_body">用气状态</label>-->
|
|
105
|
+
<!-- <v-select :value.sync="model.f_gas_state"-->
|
|
106
|
+
<!-- v-model="model.f_gas_state"-->
|
|
107
|
+
<!-- :options="$parent.$parent.gasState"-->
|
|
108
|
+
<!-- condition="ss.f_gas_state = '{}'"-->
|
|
109
|
+
<!-- close-on-select></v-select>-->
|
|
110
|
+
<!-- </div>-->
|
|
111
111
|
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
112
112
|
<label class="font_normal_body">用气量区间</label>
|
|
113
113
|
<div class="row">
|
|
@@ -207,7 +207,7 @@
|
|
|
207
207
|
<th><nobr>期间用气金额</nobr></th>
|
|
208
208
|
<th><nobr>期间充值金额</nobr></th>
|
|
209
209
|
<th><nobr>期末余额</nobr></th>
|
|
210
|
-
<th><nobr>用气状态</nobr></th
|
|
210
|
+
<!-- <th><nobr>用气状态</nobr></th>-->
|
|
211
211
|
<th><nobr>是否换表</nobr></th>
|
|
212
212
|
<th><nobr>最后通讯日期</nobr></th>
|
|
213
213
|
</tr>
|
|
@@ -241,7 +241,7 @@
|
|
|
241
241
|
|
|
242
242
|
<th style="text-align:center"><nobr>{{row.f_collection}}</nobr></th>
|
|
243
243
|
<th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
|
|
244
|
-
<th style="text-align:center"><nobr>{{row.f_gas_state}}</nobr></th
|
|
244
|
+
<!-- <th style="text-align:center"><nobr>{{row.f_gas_state}}</nobr></th>-->
|
|
245
245
|
<th style="text-align:center"><nobr>{{row.f_changetable_state}}</nobr></th>
|
|
246
246
|
<th style="text-align:center"><nobr>{{row.f_input_date}}</nobr></th>
|
|
247
247
|
</tr>
|