manage-client 3.3.133 → 3.3.135
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/valueaddinfo/valueAddUserQuery.vue +6 -0
- package/src/components/webmeter/DrillData/UserGasAll.vue +5 -1
- package/src/components/webmeter/instruction/NewQueryInstruct.vue +1 -1
- package/src/components/webmeter/operationValueRecord.vue +2 -2
- package/src/components/webmeter/report/ReportDetailList.vue +4 -4
- package/src/filiale/haile/sale/businessquery/ChargeQuery.vue +18 -18
- package/src/filiale/lixianV3/NewGasStatistics.vue +4 -17
- package/src/filiale/lixianV3/config/exportConfig.js +3 -2
- package/src/filiale/yuncheng/RecordInfoQuery.vue +1447 -0
- package/src/filiale/yuncheng/config/exportConfig.js +1 -1
- package/src/filiale/yuncheng/sale.js +4 -0
package/package.json
CHANGED
|
@@ -1096,7 +1096,7 @@ export default{
|
|
|
1096
1096
|
valueuserinfoConfig:{
|
|
1097
1097
|
'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address':'客户地址','f_user_type':'用户类型','f_gasproperties':'用气性质','f_meter_classify':'气表类型',
|
|
1098
1098
|
'f_meternumber':'表号','itemname':'增值服务类型','ishas':'有无增值业务','startdate':'购买时间','f_operate_date':'最后操作时间',
|
|
1099
|
-
'f_orgname': '所属公司'
|
|
1099
|
+
'f_orgname': '所属公司', 'f_remark': '备注'
|
|
1100
1100
|
},
|
|
1101
1101
|
renewalvalueuserinfoConfig:{
|
|
1102
1102
|
'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address':'客户地址','f_meternumber':'表号','f_user_type':'用户类型','f_gasproperties':'用气性质','f_meter_classify':'气表类型',
|
|
@@ -117,6 +117,9 @@
|
|
|
117
117
|
<th>
|
|
118
118
|
<nobr>所属公司</nobr>
|
|
119
119
|
</th>
|
|
120
|
+
<th>
|
|
121
|
+
<nobr>备注</nobr>
|
|
122
|
+
</th>
|
|
120
123
|
</tr>
|
|
121
124
|
</template>
|
|
122
125
|
<template partial='body'>
|
|
@@ -156,6 +159,9 @@
|
|
|
156
159
|
<td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
|
|
157
160
|
<nobr>{{row.f_orgname}}</nobr>
|
|
158
161
|
</td>
|
|
162
|
+
<td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
|
|
163
|
+
<nobr>{{row.f_orgname}}</nobr>
|
|
164
|
+
</td>
|
|
159
165
|
</template>
|
|
160
166
|
<template partial='foot'></template>
|
|
161
167
|
</data-grid>
|
|
@@ -471,7 +471,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
471
471
|
})
|
|
472
472
|
},
|
|
473
473
|
clearmsg() {
|
|
474
|
-
this.$refs.paged.$refs.cri.model = {}
|
|
474
|
+
// this.$refs.paged.$refs.cri.model = {}
|
|
475
|
+
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
476
|
+
console.log(this.$refs.paged.$refs.cri.model[key])
|
|
477
|
+
this.$refs.paged.$refs.cri.model[key] = []
|
|
478
|
+
})
|
|
475
479
|
},
|
|
476
480
|
initParams() {
|
|
477
481
|
// 初始化气表品牌
|
|
@@ -122,9 +122,9 @@
|
|
|
122
122
|
</div>
|
|
123
123
|
<div class="col-sm-2 form-group">
|
|
124
124
|
<label class="font_normal_body">气表类型</label>
|
|
125
|
-
<v-select :value.sync="model.f_meter_type"
|
|
125
|
+
<v-select :value.sync="model.f_meter_type"
|
|
126
126
|
:options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
|
|
127
|
-
condition="
|
|
127
|
+
condition="u4.f_meter_type in {}"
|
|
128
128
|
close-on-select></v-select>
|
|
129
129
|
</div>
|
|
130
130
|
</div>
|
|
@@ -142,10 +142,10 @@
|
|
|
142
142
|
sumsmodel: {},
|
|
143
143
|
ReportDetailListConfig: {
|
|
144
144
|
'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_phone': '客户电话', 'f_address': '客户地址',
|
|
145
|
-
'f_hand_date': '上报日期', 'f_meter_brand': '气表品牌', '
|
|
146
|
-
'
|
|
147
|
-
'
|
|
148
|
-
'
|
|
145
|
+
'f_hand_date': '上报日期', 'f_meter_brand': '气表品牌', 'f_readdata1': '上传协议版本号', 'f_readdata2': '通信信号值', 'f_readdata3': '铭牌号',
|
|
146
|
+
'f_readdata4': '通信模式', 'f_readdata5': 'IC卡编号', 'f_readdata6': '购气次数','f_readdata7': '剩余金额/量', 'f_readdata8': '总累计用气量',
|
|
147
|
+
'f_readdata9': '总累计用气金额','f_readdata10': '总累计购气金额/量', 'f_readdata11': '计费周期累计用气量', 'f_readdata12': '当前透支金额/量', 'f_readdata13': '阀门状态',
|
|
148
|
+
'f_readdata14': '主电电压','f_readdata15': '备电电压', 'f_readdata16': '软件版本', 'f_readdata17': '硬件版本', 'f_readdata18': '当前rtc时钟'
|
|
149
149
|
},
|
|
150
150
|
orgid:[this.$login.f.orgid],
|
|
151
151
|
criteriaShow:false,
|
|
@@ -371,10 +371,10 @@
|
|
|
371
371
|
<nobr>金额</nobr>
|
|
372
372
|
</th>
|
|
373
373
|
<th>
|
|
374
|
-
<nobr
|
|
374
|
+
<nobr>阀门状态</nobr>
|
|
375
375
|
</th>
|
|
376
376
|
<th>
|
|
377
|
-
<nobr
|
|
377
|
+
<nobr>开关阀原因</nobr>
|
|
378
378
|
</th>
|
|
379
379
|
<th>
|
|
380
380
|
<nobr>余额</nobr>
|
|
@@ -553,12 +553,12 @@
|
|
|
553
553
|
<th>
|
|
554
554
|
<nobr>三阶气费</nobr>
|
|
555
555
|
</th>
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
556
|
+
<th>
|
|
557
|
+
<nobr>用气量</nobr>
|
|
558
|
+
</th>
|
|
559
|
+
<th>
|
|
560
|
+
<nobr>用气金额</nobr>
|
|
561
|
+
</th>
|
|
562
562
|
|
|
563
563
|
<th><nobr>附件</nobr></th>
|
|
564
564
|
</tr>
|
|
@@ -591,13 +591,11 @@
|
|
|
591
591
|
<td style="text-align: center;">
|
|
592
592
|
<nobr>{{row.fee}}</nobr>
|
|
593
593
|
</td>
|
|
594
|
-
<!--用气量-->
|
|
595
594
|
<td style="text-align: center;">
|
|
596
|
-
<nobr>{{row.
|
|
595
|
+
<nobr>{{row.f_fm_state}}</nobr>
|
|
597
596
|
</td>
|
|
598
|
-
<!--用气金额-->
|
|
599
597
|
<td style="text-align: center;">
|
|
600
|
-
<nobr>{{row.
|
|
598
|
+
<nobr>{{row.f_fm_reason}}</nobr>
|
|
601
599
|
</td>
|
|
602
600
|
<!--余额-->
|
|
603
601
|
<td style="text-align: center;">
|
|
@@ -776,12 +774,14 @@
|
|
|
776
774
|
<td style="text-align: center;">
|
|
777
775
|
<nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
|
|
778
776
|
</td>
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
</
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
777
|
+
<!--用气量-->
|
|
778
|
+
<td style="text-align: center;">
|
|
779
|
+
<nobr>{{row.f_oughtamount}}</nobr>
|
|
780
|
+
</td>
|
|
781
|
+
<!--用气金额-->
|
|
782
|
+
<td style="text-align: center;">
|
|
783
|
+
<nobr>{{row.f_oughtfee}}</nobr>
|
|
784
|
+
</td>
|
|
785
785
|
<td style="text-align: center;"><nobr>
|
|
786
786
|
<button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
|
|
787
787
|
</nobr></td>
|
|
@@ -191,20 +191,15 @@
|
|
|
191
191
|
<th><nobr>期末余额</nobr></th>
|
|
192
192
|
<th><nobr>录入人员</nobr></th>
|
|
193
193
|
<th><nobr>抄表员</nobr></th>
|
|
194
|
+
<th><nobr>用气性质</nobr></th>
|
|
195
|
+
<th><nobr>气表品牌</nobr></th>
|
|
194
196
|
<th><nobr>小区</nobr></th>
|
|
195
|
-
|
|
196
|
-
|
|
197
197
|
<th><nobr>燃气证号</nobr></th>
|
|
198
|
-
<th><nobr>气表品牌</nobr></th>
|
|
199
198
|
<th><nobr>表具类型</nobr></th>
|
|
200
199
|
<th><nobr>表描述</nobr></th>
|
|
201
200
|
<th><nobr>气价名称</nobr></th>
|
|
202
|
-
|
|
203
|
-
<th><nobr>用气性质</nobr></th>
|
|
204
201
|
<th><nobr>期初余额</nobr></th>
|
|
205
|
-
|
|
206
202
|
<th><nobr>期间充值金额</nobr></th>
|
|
207
|
-
|
|
208
203
|
<th><nobr>用气状态</nobr></th>
|
|
209
204
|
<th><nobr>是否换表</nobr></th>
|
|
210
205
|
<th><nobr>首次抄表时间</nobr></th>
|
|
@@ -225,23 +220,15 @@
|
|
|
225
220
|
<th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
|
|
226
221
|
<th style="text-align:center"><nobr>{{row.f_input_person}}</nobr></th>
|
|
227
222
|
<th style="text-align:center"><nobr>{{row.f_inputtor}}</nobr></th>
|
|
228
|
-
|
|
223
|
+
<th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
|
|
224
|
+
<th style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></th>
|
|
229
225
|
<td style="text-align: left;"><nobr>{{row.f_residential_area}}</nobr></td>
|
|
230
|
-
|
|
231
226
|
<td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
|
|
232
|
-
<th style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></th>
|
|
233
227
|
<th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
|
|
234
228
|
<th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
|
|
235
229
|
<th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
<th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
|
|
239
|
-
|
|
240
|
-
|
|
241
230
|
<th style="text-align:center"><nobr>{{row.f_balance}}</nobr></th>
|
|
242
|
-
|
|
243
231
|
<th style="text-align:center"><nobr>{{row.f_collection}}</nobr></th>
|
|
244
|
-
|
|
245
232
|
<th style="text-align:center"><nobr>{{row.f_gas_state}}</nobr></th>
|
|
246
233
|
<th style="text-align:center"><nobr>{{row.f_changetable_state}}</nobr></th>
|
|
247
234
|
<th style="text-align:center"><nobr>{{row.f_first_input_date}}</nobr></th>
|
|
@@ -1622,17 +1622,18 @@ export default {
|
|
|
1622
1622
|
'f_curbalance': '期末余额',
|
|
1623
1623
|
'f_input_person': '录入人员',
|
|
1624
1624
|
'f_inputtor': '抄表员',
|
|
1625
|
+
'f_gasproperties': '用气性质',
|
|
1626
|
+
'f_meter_brand': '气表品牌',
|
|
1625
1627
|
'f_residential_area': '小区',
|
|
1626
1628
|
'f_gascode': '燃气证号',
|
|
1627
1629
|
'f_meter_classify': '表具类型',
|
|
1628
1630
|
'f_meter_title': '表描述',
|
|
1629
1631
|
'f_price_name': '气价名称',
|
|
1630
|
-
'f_user_nature': '用气类型',
|
|
1631
|
-
'f_gasproperties': '用气性质',
|
|
1632
1632
|
'f_balance': '期初余额',
|
|
1633
1633
|
'f_collection': '期末充值金额',
|
|
1634
1634
|
'f_gas_state': '用气状态',
|
|
1635
1635
|
'f_changetable_state': '是否换表',
|
|
1636
|
+
'f_first_input_date': '首次抄表时间',
|
|
1636
1637
|
'f_input_date': '最后通讯日期'
|
|
1637
1638
|
},
|
|
1638
1639
|
ArrearageConfig: {
|