manage-client 3.2.56-aode → 3.2.57-aode
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/build/dev-server.js
CHANGED
package/package.json
CHANGED
|
@@ -80,6 +80,22 @@
|
|
|
80
80
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_address"
|
|
81
81
|
condition="f_address like '%{}%'" placeholder='客户地址'>
|
|
82
82
|
</div>
|
|
83
|
+
<div class="col-sm-2 form-group">
|
|
84
|
+
<label class="font_normal_body">新表类型</label>
|
|
85
|
+
<v-select :value.sync="model.f_meter_type"
|
|
86
|
+
v-model="model.f_meter_type"
|
|
87
|
+
:options='$parent.$parent.metertype' placeholder='请选择'
|
|
88
|
+
condition="f_meter_type = '{}'"
|
|
89
|
+
close-on-select></v-select>
|
|
90
|
+
</div>
|
|
91
|
+
<div class="col-sm-2 form-group">
|
|
92
|
+
<label class="font_normal_body">旧表类型</label>
|
|
93
|
+
<v-select :value.sync="model.f_meter_type_old"
|
|
94
|
+
v-model="model.f_meter_type_old"
|
|
95
|
+
:options='$parent.$parent.metertype' placeholder='请选择'
|
|
96
|
+
condition="f_meter_type_old = '{}'"
|
|
97
|
+
close-on-select></v-select>
|
|
98
|
+
</div>
|
|
83
99
|
<div class="col-sm-2 form-group">
|
|
84
100
|
<label class="font_normal_body">新表品牌</label>
|
|
85
101
|
<v-select :value.sync="model.f_new_meter_brand"
|
|
@@ -96,6 +112,7 @@
|
|
|
96
112
|
condition="f_old_meter_brand = '{}'"
|
|
97
113
|
close-on-select></v-select>
|
|
98
114
|
</div>
|
|
115
|
+
|
|
99
116
|
<div class="col-sm-2 form-group">
|
|
100
117
|
<label class="font_normal_body">换表类型</label>
|
|
101
118
|
<v-select :value.sync="model.f_type"
|
|
@@ -181,6 +198,12 @@
|
|
|
181
198
|
<th>
|
|
182
199
|
<nobr>新流量计表号</nobr>
|
|
183
200
|
</th>
|
|
201
|
+
<th>
|
|
202
|
+
<nobr>旧气表类型</nobr>
|
|
203
|
+
</th>
|
|
204
|
+
<th>
|
|
205
|
+
<nobr>新气表类型</nobr>
|
|
206
|
+
</th>
|
|
184
207
|
<th>
|
|
185
208
|
<nobr>旧气表品牌</nobr>
|
|
186
209
|
</th>
|
|
@@ -274,6 +297,12 @@
|
|
|
274
297
|
<td style="text-align: center;">
|
|
275
298
|
<nobr>{{row.f_flowmeternumber}}</nobr>
|
|
276
299
|
</td>
|
|
300
|
+
<td style="text-align: center;">
|
|
301
|
+
<nobr>{{row.f_meter_type_old}}</nobr>
|
|
302
|
+
</td>
|
|
303
|
+
<td style="text-align: center;">
|
|
304
|
+
<nobr>{{row.f_meter_type}}</nobr>
|
|
305
|
+
</td>
|
|
277
306
|
<td style="text-align: center;">
|
|
278
307
|
<nobr>{{row.f_meter_brand_old}}</nobr>
|
|
279
308
|
</td>
|
|
@@ -617,6 +646,9 @@
|
|
|
617
646
|
getCondition() {
|
|
618
647
|
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
|
|
619
648
|
},
|
|
649
|
+
metertype() {
|
|
650
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
651
|
+
},
|
|
620
652
|
getfield() {
|
|
621
653
|
return exportConfig.changemeterConfig
|
|
622
654
|
},
|
|
@@ -67,7 +67,7 @@ export default{
|
|
|
67
67
|
changemeterConfig: {
|
|
68
68
|
'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address': '客户地址','f_user_phone':'客户电话','f_user_type': '用户类型','f_gasproperties': '用气性质','f_type': '换表类型',
|
|
69
69
|
'f_changemeter_fee': '换表费','f_meternumber_old': '旧表号','f_meternumber': '新表号','f_flowmeternumber_old': '旧流量计表号',
|
|
70
|
-
'f_flowmeternumber': '新流量计表号','f_meter_brand_old': '旧气表品牌','f_meter_brand': '新气表品牌','f_initial_base_old': '旧表初始底数',"f_whether_pay":"换表时是否收费",
|
|
70
|
+
'f_flowmeternumber': '新流量计表号','f_meter_type': '新气表类型','f_meter_type_old': '旧气表类型','f_meter_brand_old': '旧气表品牌','f_meter_brand': '新气表品牌','f_initial_base_old': '旧表初始底数',"f_whether_pay":"换表时是否收费",
|
|
71
71
|
'f_using_base_old': '旧表读数','f_initial_base_new': '新表初始底数','f_remanent_gas': '补气量','f_remanent_price':'补气单价','f_remanent_money': '补气金额','f_comments': '备注',
|
|
72
72
|
'f_change_operator': '换表人','f_state': '状态','f_operate_date': '换表日期','f_ismgq': '是否煤改气','f_operator': '人员','f_depname': '部门','f_orgname': '公司'
|
|
73
73
|
},
|
|
@@ -6,9 +6,9 @@
|
|
|
6
6
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
7
7
|
<div class="row">
|
|
8
8
|
<div class="col-sm-2 form-group">
|
|
9
|
-
<label class="font_normal_body">表 
|
|
9
|
+
<label class="font_normal_body">表 号 </label>
|
|
10
10
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search"
|
|
11
|
-
v-model="model.f_meternumber" placeholder='
|
|
11
|
+
v-model="model.f_meternumber" placeholder='表号'
|
|
12
12
|
condition="uf.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
|
|
13
13
|
>
|
|
14
14
|
</div>
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
<datepicker style="width:60%" placeholder="起始时间"
|
|
80
80
|
:value.sync="model.startDate"
|
|
81
81
|
v-model="model.startDate"
|
|
82
|
-
:format="'yyyy-MM-dd
|
|
82
|
+
:format="'yyyy-MM-dd'"
|
|
83
83
|
></datepicker>
|
|
84
84
|
</div>
|
|
85
85
|
<div class="col-sm-2 form-group">
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
<datepicker style="width:60%" placeholder="结束时间"
|
|
88
88
|
:value.sync="model.endDate"
|
|
89
89
|
v-model="model.endDate"
|
|
90
|
-
:format="'yyyy-MM-dd
|
|
90
|
+
:format="'yyyy-MM-dd'"
|
|
91
91
|
></datepicker>
|
|
92
92
|
</div>
|
|
93
93
|
</div>
|
|
@@ -103,9 +103,10 @@
|
|
|
103
103
|
<th style="text-align:center" title="停用户数:表具状态为停用的用户数"><nobr>停用户数</nobr></th>
|
|
104
104
|
<th style="text-align:center" title="在用户数:表具状态为正常的用户数"><nobr>在用户数</nobr></th>
|
|
105
105
|
|
|
106
|
-
<th style="text-align:center" title="用户使用率=在用户数/正常户数"><nobr>用户使用率</nobr></th
|
|
106
|
+
<!-- <th style="text-align:center" title="用户使用率=在用户数/正常户数"><nobr>用户使用率</nobr></th>-->
|
|
107
107
|
<th style="text-align:center"><nobr>抄表成功户数</nobr></th>
|
|
108
108
|
<th style="text-align:center"><nobr>总用气量</nobr></th>
|
|
109
|
+
<th style="text-align:center"><nobr>总用气金额</nobr></th>
|
|
109
110
|
<th style="text-align:center" title="日均户均用气量=总用气量/抄表成功户数"><nobr>日均户均用气量(成功)</nobr></th>
|
|
110
111
|
<th style="text-align:center" title="日均户均用气量=总用气量/在用户数"><nobr>日均户均用气量(在用)</nobr></th>
|
|
111
112
|
<!--<th style="text-align:center"><nobr>指令成功户数</nobr></th>-->
|
|
@@ -123,10 +124,11 @@
|
|
|
123
124
|
<th style="text-align:center">{{row.c0}}</th>
|
|
124
125
|
<td style="text-align:center"><nobr>{{row.c}}</nobr></td>
|
|
125
126
|
|
|
126
|
-
<td style="text-align:center"><nobr>{{row.user_bv}}%</nobr></td
|
|
127
|
+
<!-- <td style="text-align:center"><nobr>{{row.user_bv}}%</nobr></td>-->
|
|
127
128
|
<!--<td style="text-align:center"><nobr>{{row.f_gas}}</nobr></td>-->
|
|
128
129
|
<td style="text-align:center">{{row.c1}}</td>
|
|
129
130
|
<td style="text-align:center">{{row.f_gas_all}}</td>
|
|
131
|
+
<td style="text-align:center">{{row.f_fee_all}}</td>
|
|
130
132
|
<td style="text-align:center">{{row.f_gas}}</td>
|
|
131
133
|
<td style="text-align:center">{{row.f_gas1}}</td>
|
|
132
134
|
<td style="text-align:center">{{row.f_bv1}}%</td>
|
|
@@ -168,7 +170,7 @@
|
|
|
168
170
|
getfield:{"f_insert_date":"上报日期","anzhuang":"安装户数",
|
|
169
171
|
"c0":"停用户数",
|
|
170
172
|
"c":"在用户数","user_bv":"用户使用率",
|
|
171
|
-
"c1":"抄表成功户数",
|
|
173
|
+
"c1":"抄表成功户数","f_fee_all":"总用金额",
|
|
172
174
|
"f_gas_all":"总用气量","f_gas":"日均户均用气量(成功)",
|
|
173
175
|
"f_gas1":"日均户均用气量(在用)",
|
|
174
176
|
"f_bv1":"抄表成功率"
|
|
@@ -186,9 +188,9 @@
|
|
|
186
188
|
}
|
|
187
189
|
},
|
|
188
190
|
ready () {
|
|
189
|
-
this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString()
|
|
190
|
-
this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString()
|
|
191
|
-
this.$refs.paged.$refs.cri.search()
|
|
191
|
+
this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString()
|
|
192
|
+
this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString()
|
|
193
|
+
// this.$refs.paged.$refs.cri.search()
|
|
192
194
|
},
|
|
193
195
|
methods: {
|
|
194
196
|
hidden(){
|