manage-client 3.3.136 → 3.3.138
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/handReport/HandPriceReport.vue +1 -1
- package/src/components/sale/config/tableConfig.js +56 -52
- package/src/components/valueaddinfo/valueAddUserQuery.vue +1 -1
- package/src/components/webmeter/reportdata/ReportDataQuery.vue +50 -1
- package/src/filiale/qianneng/HandplanQuery.vue +6 -0
- package/src/filiale/shanxian/UserQuery.vue +4 -4
package/package.json
CHANGED
|
@@ -1,54 +1,58 @@
|
|
|
1
|
-
export default{
|
|
2
|
-
|
|
3
|
-
ReportDataQuery:
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
1
|
+
export default {
|
|
2
|
+
// 查询页面的字段名和中文对应
|
|
3
|
+
ReportDataQuery: {
|
|
4
|
+
'用户编号': 'f_userinfo_code',
|
|
5
|
+
'用户名称': 'f_user_name',
|
|
6
|
+
'用户地址': 'f_address',
|
|
7
|
+
'小区': 'f_residential_area',
|
|
8
|
+
'用户类型': 'f_user_type',
|
|
9
|
+
'用气类型': 'f_user_nature',
|
|
10
|
+
'用气性质': 'f_gasproperties',
|
|
11
|
+
'表号': 'f_meternumber',
|
|
12
|
+
'本次抄表底数': 'f_tablebase',
|
|
13
|
+
'上次抄表底数': 'f_last_tablebase',
|
|
14
|
+
'表上余额': 'f_jval',
|
|
15
|
+
'抄表日期': 'f_hand_date',
|
|
16
|
+
|
|
17
|
+
'上次抄表日期': 'f_last_hand_date',
|
|
18
|
+
'开户日期': 'f_gas_date',
|
|
19
|
+
'软件版本号': 'f_software_version',
|
|
20
|
+
'表状态信息': 'f_table_msg',
|
|
21
|
+
'上次表状态信息': 'f_last_meter_state_msg',
|
|
22
|
+
|
|
23
|
+
'插入日期': 'f_insert_date',
|
|
24
|
+
'上次插入日期': 'f_last_insertdate',
|
|
25
|
+
'是否结算': 'f_whether_clear',
|
|
26
|
+
'超用气量': 'f_super_gas',
|
|
27
|
+
'电量等级': 'f_electricity',
|
|
28
|
+
|
|
29
|
+
'购气次数': 'f_times',
|
|
30
|
+
'单价': 'f_price',
|
|
31
|
+
'信号强度': 'f_signal',
|
|
32
|
+
'信噪比': 'f_snr',
|
|
33
|
+
'电压': 'f_batterylevel',
|
|
34
|
+
|
|
35
|
+
'阀门强制状态': 'f_networkshutvalve',
|
|
36
|
+
'阀门状态': 'f_valvestate',
|
|
37
|
+
'计量类型': 'f_wmprepaytype',
|
|
38
|
+
'上报类型': 'f_upload_type',
|
|
39
|
+
'金额状态': 'f_moneystate',
|
|
40
|
+
|
|
41
|
+
'增加工况瞬时': 'operatingModeFlow',
|
|
42
|
+
'标况瞬时': 'standardConditionFlow',
|
|
43
|
+
'开盖状态': 'f_SplitAlarm',
|
|
44
|
+
'液晶状态': 'f_XTIpllStopFlag',
|
|
45
|
+
'声速': 'soundVelocity',
|
|
46
|
+
|
|
47
|
+
'外电低电': 'f_lowlithiumbattery',
|
|
48
|
+
'磁干扰异常': 'f_magneticinterference',
|
|
49
|
+
'表内剩余金额': 'f_meterbalanceamt',
|
|
50
|
+
'表内累计充值金额': 'f_meterdebitamt',
|
|
51
|
+
'补偿状态': 'f_compensatestate',
|
|
52
|
+
'气表品牌': 'f_meter_brand',
|
|
53
|
+
'气表型号': 'f_meter_style',
|
|
54
|
+
'分公司': 'f_orgname'
|
|
55
|
+
|
|
56
|
+
}
|
|
53
57
|
|
|
54
58
|
}
|
|
@@ -160,7 +160,7 @@
|
|
|
160
160
|
<nobr>{{row.f_orgname}}</nobr>
|
|
161
161
|
</td>
|
|
162
162
|
<td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
|
|
163
|
-
<nobr>{{row.
|
|
163
|
+
<nobr>{{row.f_remark}}</nobr>
|
|
164
164
|
</td>
|
|
165
165
|
</template>
|
|
166
166
|
<template partial='foot'></template>
|
|
@@ -16,6 +16,11 @@
|
|
|
16
16
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
17
17
|
condition=" f_user_name like '%{}%'" placeholder='客户名称'>
|
|
18
18
|
</div>
|
|
19
|
+
<div class="col-sm-2 form-group">
|
|
20
|
+
<label class="font_normal_body">用户地址</label>
|
|
21
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_address"
|
|
22
|
+
condition="f_address like '%{}%'" placeholder='客户地址'>
|
|
23
|
+
</div>
|
|
19
24
|
<!-- <div class="col-sm-2">-->
|
|
20
25
|
<!-- <label class="font_normal_body">组织机构</label>-->
|
|
21
26
|
<!-- <res-select :initresid="$parent.$parent.org"-->
|
|
@@ -25,7 +30,7 @@
|
|
|
25
30
|
<!-- </res-select>-->
|
|
26
31
|
|
|
27
32
|
<!-- </div>-->
|
|
28
|
-
<div class="col-sm-2">
|
|
33
|
+
<div class="col-sm-2 form-group">
|
|
29
34
|
<label class="font_normal_body"> 公司 </label>
|
|
30
35
|
<right-tree @re-res="$parent.$parent.getorg"
|
|
31
36
|
:initresid='$parent.$parent.org'></right-tree>
|
|
@@ -50,6 +55,11 @@
|
|
|
50
55
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
|
|
51
56
|
condition="f_meternumber like '%{}%'" placeholder='表号'>
|
|
52
57
|
</div>
|
|
58
|
+
<div class="col-sm-2 form-group">
|
|
59
|
+
<label class="font_normal_body"> 小区 </label>
|
|
60
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
|
|
61
|
+
condition="f_residential_area like '%{}%'" placeholder='小区'>
|
|
62
|
+
</div>
|
|
53
63
|
<div class="col-sm-2 form-group">
|
|
54
64
|
<label class="font_normal_body">气表品牌</label>
|
|
55
65
|
<v-select
|
|
@@ -92,6 +102,28 @@
|
|
|
92
102
|
condition="f_insert_date <= '{}'">
|
|
93
103
|
</datepicker>
|
|
94
104
|
</div>
|
|
105
|
+
<div class="col-sm-2 form-group">
|
|
106
|
+
<label class="font_normal_body">客户类型</label>
|
|
107
|
+
<v-select :value.sync="model.f_user_type"
|
|
108
|
+
@change="$parent.$parent.userTypeChange()"
|
|
109
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
110
|
+
condition="f_user_type = '{}'"
|
|
111
|
+
close-on-select></v-select>
|
|
112
|
+
</div>
|
|
113
|
+
<div class="col-sm-2 form-group">
|
|
114
|
+
<label class="font_normal_body">用气性质</label>
|
|
115
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
116
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
117
|
+
condition="f_gasproperties = '{}'"
|
|
118
|
+
close-on-select></v-select>
|
|
119
|
+
</div>
|
|
120
|
+
<div class="col-sm-2 form-group">
|
|
121
|
+
<label class="font_normal_body">用气类型</label>
|
|
122
|
+
<v-select :value.sync="model.f_user_nature" v-model="model.f_user_nature"
|
|
123
|
+
:options='$parent.$parent.usernatures' placeholder='请选择'
|
|
124
|
+
condition="f_user_nature = '{}'"
|
|
125
|
+
close-on-select></v-select>
|
|
126
|
+
</div>
|
|
95
127
|
</div>
|
|
96
128
|
|
|
97
129
|
</div>
|
|
@@ -157,6 +189,7 @@
|
|
|
157
189
|
styles:false,
|
|
158
190
|
headData: [],
|
|
159
191
|
bodyData: [],
|
|
192
|
+
gasproperties:[],
|
|
160
193
|
orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
|
|
161
194
|
resshow:['company'],
|
|
162
195
|
org:[this.$login.f.orgid],
|
|
@@ -188,6 +221,16 @@
|
|
|
188
221
|
})
|
|
189
222
|
},
|
|
190
223
|
methods: {
|
|
224
|
+
userTypeChange () {
|
|
225
|
+
this.gasproperties=[]
|
|
226
|
+
if(this.$refs.paged.$refs.cri.model !==null) {
|
|
227
|
+
this.$refs.paged.$refs.cri.model.f_gasproperties=''
|
|
228
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
229
|
+
}
|
|
230
|
+
else{
|
|
231
|
+
this.gasproperties =[{label: '全部', value: ''}]
|
|
232
|
+
}
|
|
233
|
+
},
|
|
191
234
|
initParams() {
|
|
192
235
|
// 初始化气表品牌
|
|
193
236
|
let brandArr = []
|
|
@@ -263,6 +306,12 @@
|
|
|
263
306
|
metertypes() {
|
|
264
307
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
265
308
|
},
|
|
309
|
+
usernatures(){
|
|
310
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
|
|
311
|
+
},
|
|
312
|
+
usertypes() {
|
|
313
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
314
|
+
},
|
|
266
315
|
getCondition() {
|
|
267
316
|
return {
|
|
268
317
|
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
@@ -483,6 +483,9 @@
|
|
|
483
483
|
<th>
|
|
484
484
|
<nobr>状态</nobr>
|
|
485
485
|
</th>
|
|
486
|
+
<th>
|
|
487
|
+
<nobr>是否单户抄表</nobr>
|
|
488
|
+
</th>
|
|
486
489
|
<th>
|
|
487
490
|
<nobr>下发人员</nobr>
|
|
488
491
|
</th>
|
|
@@ -646,6 +649,9 @@
|
|
|
646
649
|
<td style="text-align: center;">
|
|
647
650
|
<nobr>{{row.f_hand_state}}</nobr>
|
|
648
651
|
</td>
|
|
652
|
+
<td style="text-align: center;">
|
|
653
|
+
<nobr>{{row.f_isone == '是' ? '是': '否'}}</nobr>
|
|
654
|
+
</td>
|
|
649
655
|
<td style="text-align: center;">
|
|
650
656
|
<nobr>{{row.f_operator}}</nobr>
|
|
651
657
|
</td>
|
|
@@ -209,22 +209,22 @@
|
|
|
209
209
|
<!-- </div>-->
|
|
210
210
|
<div class="col-sm-2 form-group">
|
|
211
211
|
<label for="startDate" class="font_normal_body">开始日期</label>
|
|
212
|
-
<datepicker id="startDate" placeholder="
|
|
212
|
+
<datepicker id="startDate" placeholder="开户日期" style="width:60%"
|
|
213
213
|
v-model="model.startDate"
|
|
214
214
|
:value.sync="model.startDate"
|
|
215
215
|
:format="'yyyy-MM-dd'"
|
|
216
216
|
:show-reset-button="true"
|
|
217
|
-
condition="
|
|
217
|
+
condition="f_open_date >= '{} 00:00:00'">
|
|
218
218
|
</datepicker>
|
|
219
219
|
</div>
|
|
220
220
|
<div class="col-sm-2 form-group">
|
|
221
221
|
<label for="endDate" class="font_normal_body">结束日期</label>
|
|
222
|
-
<datepicker id="endDate" placeholder="
|
|
222
|
+
<datepicker id="endDate" placeholder="开户日期" style="width:60%"
|
|
223
223
|
v-model="model.endDate"
|
|
224
224
|
:value.sync="model.endDate"
|
|
225
225
|
:format="'yyyy-MM-dd'"
|
|
226
226
|
:show-reset-button="true"
|
|
227
|
-
condition="
|
|
227
|
+
condition="f_open_date <= '{} 23:59:59'">
|
|
228
228
|
</datepicker>
|
|
229
229
|
</div>
|
|
230
230
|
<!--表册片区-->
|