manage-client 1.8.23-45 → 1.8.23-46
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/businessquery/PriceVersionQuery.vue +32 -1
- package/src/components/sale/config/exportConfig.js +1 -1
- package/src/components/webmeter/NewQueryInstructTwo.vue +41 -0
- package/src/components/webmeter/gasAnalysis/WebmeterSettlementAnalysis.vue +49 -52
package/package.json
CHANGED
|
@@ -53,6 +53,17 @@
|
|
|
53
53
|
condition="f_price_state = '{}'">
|
|
54
54
|
</v-select>
|
|
55
55
|
</div>
|
|
56
|
+
<div class="col-sm-2 form-group form-input-group">
|
|
57
|
+
<label class="control-label">气表品牌</label>
|
|
58
|
+
<v-select
|
|
59
|
+
placeholder='气表品牌'
|
|
60
|
+
:value.sync="model.f_meter_brand"
|
|
61
|
+
v-model="model.f_meter_brand"
|
|
62
|
+
:options='$parent.$parent.meterbrands'
|
|
63
|
+
close-on-select
|
|
64
|
+
condition="f_meter_brand='{}'">
|
|
65
|
+
</v-select>
|
|
66
|
+
</div>
|
|
56
67
|
</div>
|
|
57
68
|
<div class="row">
|
|
58
69
|
<div class="span" style = "float:right;margin-top:10px">
|
|
@@ -94,24 +105,31 @@
|
|
|
94
105
|
<script>
|
|
95
106
|
import { PagedList } from 'vue-client'
|
|
96
107
|
import exportConfig from '../config/exportConfig'
|
|
108
|
+
import * as Util from '../../../Util'
|
|
97
109
|
|
|
98
110
|
let readySomething = async function (self) {
|
|
111
|
+
await self.$MagLoadParams.loadParam(self.$login.f)
|
|
112
|
+
self.initParams()
|
|
113
|
+
debugger
|
|
99
114
|
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
|
|
100
115
|
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
|
|
116
|
+
|
|
101
117
|
}
|
|
102
118
|
export default {
|
|
119
|
+
title: '气价版本校验查询',
|
|
103
120
|
data() {
|
|
104
121
|
return {
|
|
105
122
|
data: {},
|
|
106
123
|
model: new PagedList('rs/sql/priceVersionQuery', 20,{}),
|
|
107
124
|
criteriaShow: true,
|
|
108
125
|
|
|
126
|
+
meterbrands: [],
|
|
109
127
|
orgCondtionStr:'',
|
|
110
128
|
|
|
111
129
|
all: false,
|
|
112
130
|
pageFilds : {
|
|
113
131
|
"f_user_name" : "用户姓名", "f_user_phone" : "用户电话", "f_address" : "用户地址", "f_user_type" : "用户类型", "f_gasproperties" : "用气性质",
|
|
114
|
-
"f_meternumber" : "表号", "id" : "气价版本", "f_stairprice_id" : "表上版本", "f_price_state" : "气价状态", "f_operate_date" : "抄表时间","f_orgname" : "公司", "f_depname" : "部门", "f_operator" : "操作人"
|
|
132
|
+
"f_meternumber" : "表号", 'f_meter_brand':'气表品牌', "id" : "气价版本", "f_stairprice_id" : "表上版本", "f_price_state" : "气价状态", "f_operate_date" : "抄表时间","f_orgname" : "公司", "f_depname" : "部门", "f_operator" : "操作人"
|
|
115
133
|
}
|
|
116
134
|
}
|
|
117
135
|
},
|
|
@@ -123,6 +141,19 @@
|
|
|
123
141
|
})
|
|
124
142
|
},
|
|
125
143
|
methods: {
|
|
144
|
+
initParams () {
|
|
145
|
+
// 初始化气表品牌
|
|
146
|
+
let brandArr = []
|
|
147
|
+
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
148
|
+
if(item.value.f_meter_type==='物联网表'){
|
|
149
|
+
let temp = {}
|
|
150
|
+
temp.label = item.label
|
|
151
|
+
temp.value = item.value.f_meter_brand
|
|
152
|
+
brandArr.push(temp)
|
|
153
|
+
}
|
|
154
|
+
})
|
|
155
|
+
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
156
|
+
},
|
|
126
157
|
selfSearch (args) {
|
|
127
158
|
args.condition = `${args.condition}`+this.orgCondtionStr
|
|
128
159
|
this.model.search(args.condition, args.model)
|
|
@@ -130,7 +130,7 @@ export default{
|
|
|
130
130
|
},
|
|
131
131
|
pricevVersionConfig : {
|
|
132
132
|
"f_userinfo_code":"用户编号","f_user_name" : "用户姓名", "f_user_phone" : "用户电话", "f_address" : "用户地址", "f_user_type" : "用户类型", "f_gasproperties" : "用气性质",
|
|
133
|
-
"f_meternumber" : "表号", "id" : "气价版本", "f_stairprice_id" : "表上版本", "f_price_state" : "气价状态", "f_operate_date" : "抄表时间","f_orgname" : "公司", "f_depname" : "部门", "f_operator" : "操作人"
|
|
133
|
+
"f_meternumber" : "表号", 'f_meter_brand':'气表品牌', "id" : "气价版本", "f_stairprice_id" : "表上版本", "f_price_state" : "气价状态", "f_operate_date" : "抄表时间","f_orgname" : "公司", "f_depname" : "部门", "f_operator" : "操作人"
|
|
134
134
|
},
|
|
135
135
|
|
|
136
136
|
}
|
|
@@ -75,6 +75,17 @@
|
|
|
75
75
|
condition="f_gasproperties {}"
|
|
76
76
|
></v-select>
|
|
77
77
|
</div>
|
|
78
|
+
<div class="col-sm-2 form-group form-input-group">
|
|
79
|
+
<label class="control-label">气表品牌</label>
|
|
80
|
+
<v-select
|
|
81
|
+
placeholder='气表品牌'
|
|
82
|
+
:value.sync="model.f_meter_brand"
|
|
83
|
+
v-model="model.f_meter_brand"
|
|
84
|
+
:options='$parent.$parent.meterbrands'
|
|
85
|
+
close-on-select
|
|
86
|
+
condition="f_meter_brand='{}'">
|
|
87
|
+
</v-select>
|
|
88
|
+
</div>
|
|
78
89
|
<div class="col-sm-3 form-group form-input-group">
|
|
79
90
|
<label class="control-label" style="word-break:keep-all;">使用公司</label>
|
|
80
91
|
<res-select restype='organization'
|
|
@@ -115,6 +126,9 @@
|
|
|
115
126
|
<th style="text-align:center"><nobr>安装时间</nobr></th>
|
|
116
127
|
<th style="text-align:center"><nobr>表号</nobr></th>
|
|
117
128
|
|
|
129
|
+
<th style="text-align:center">
|
|
130
|
+
<nobr>气表品牌</nobr>
|
|
131
|
+
</th>
|
|
118
132
|
<th style="text-align:center"><nobr>指令类型</nobr></th>
|
|
119
133
|
<th style="text-align:center"><nobr>指令状态</nobr></th>
|
|
120
134
|
<th style="text-align:center"><nobr>指令生成时间</nobr></th>
|
|
@@ -135,6 +149,9 @@
|
|
|
135
149
|
<td style="text-align:center" v-show="!$parent.$parent.$parent.isdeal">
|
|
136
150
|
<span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_meternumber}}</a></span>
|
|
137
151
|
</td>
|
|
152
|
+
<td style="text-align:center">
|
|
153
|
+
<nobr>{{row.f_meter_brand}}</nobr>
|
|
154
|
+
</td>
|
|
138
155
|
<td style="text-align:center"><nobr>{{row.f_instruct_type}}</nobr></td>
|
|
139
156
|
<td style="text-align:center"><nobr>{{row.f_instruct_state}}</nobr></td>
|
|
140
157
|
<td style="text-align:center"><nobr>{{row.f_instruct_date}}</nobr></td>
|
|
@@ -146,6 +163,10 @@
|
|
|
146
163
|
</template>
|
|
147
164
|
<script>
|
|
148
165
|
import {PagedList} from 'vue-client'
|
|
166
|
+
let readySomething = async function (self) {
|
|
167
|
+
await self.$MagLoadParams.loadParam(self.$login.f)
|
|
168
|
+
self.initParams()
|
|
169
|
+
}
|
|
149
170
|
export default {
|
|
150
171
|
title: '指令异常查看',
|
|
151
172
|
data () {
|
|
@@ -157,6 +178,7 @@
|
|
|
157
178
|
orgCondtionStr: '(' + this.$login.f.orgid + ')',
|
|
158
179
|
orgid: [this.$login.f.orgid],
|
|
159
180
|
show: false,
|
|
181
|
+
meterbrands: [],
|
|
160
182
|
condition: '',
|
|
161
183
|
config: {
|
|
162
184
|
excelHeaders: {
|
|
@@ -165,6 +187,7 @@
|
|
|
165
187
|
'f_user_name': '用户姓名',
|
|
166
188
|
'f_user_type': '用户类型',
|
|
167
189
|
'f_gasproperties': '用气性质',
|
|
190
|
+
'f_meter_brand':'气表品牌',
|
|
168
191
|
'f_gas_date': '安装时间',
|
|
169
192
|
'f_meternumber': '表号',
|
|
170
193
|
'f_instruct_type': '指令类型',
|
|
@@ -179,6 +202,11 @@
|
|
|
179
202
|
ready () {
|
|
180
203
|
this.$refs.paged.$refs.criteria.model.f_startday = 3
|
|
181
204
|
this.$refs.paged.$refs.criteria.model.f_endday = 5
|
|
205
|
+
readySomething(this).then(() => {
|
|
206
|
+
this.$emit('ready')
|
|
207
|
+
}).catch((error) => {
|
|
208
|
+
this.$emit('error', error)
|
|
209
|
+
})
|
|
182
210
|
},
|
|
183
211
|
load () {},
|
|
184
212
|
watch: {
|
|
@@ -190,6 +218,19 @@
|
|
|
190
218
|
}
|
|
191
219
|
},
|
|
192
220
|
methods: {
|
|
221
|
+
initParams () {
|
|
222
|
+
// 初始化气表品牌
|
|
223
|
+
let brandArr = []
|
|
224
|
+
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
225
|
+
if(item.value.f_meter_type==='物联网表'){
|
|
226
|
+
let temp = {}
|
|
227
|
+
temp.label = item.label
|
|
228
|
+
temp.value = item.value.f_meter_brand
|
|
229
|
+
brandArr.push(temp)
|
|
230
|
+
}
|
|
231
|
+
})
|
|
232
|
+
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
233
|
+
},
|
|
193
234
|
clearmsg () {
|
|
194
235
|
this.$refs.paged.$refs.criteria.model = {}
|
|
195
236
|
},
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" novalidate partial>
|
|
7
7
|
<div class="row">
|
|
8
8
|
<div class="col-sm-2 form-group form-input-group">
|
|
9
|
-
<label class="control-label" >  
|
|
10
|
-
<input @keyup.enter="search" style="width:
|
|
9
|
+
<label class="control-label" > 客户编号 </label>
|
|
10
|
+
<input @keyup.enter="search" style="width:50%" type="text" class="form-control"
|
|
11
11
|
v-model="model.f_userinfo_code" placeholder='客户编号'
|
|
12
12
|
condition="f_userinfo_code like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
|
|
13
13
|
>
|
|
@@ -90,17 +90,17 @@
|
|
|
90
90
|
</div>
|
|
91
91
|
</div>
|
|
92
92
|
<div class="row" >
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
placeholder='气表型号'
|
|
97
|
-
|
|
98
|
-
v-model="model.f_meter_style"
|
|
99
|
-
|
|
100
|
-
close-on-select
|
|
101
|
-
condition="f_meter_style='{}'"
|
|
102
|
-
|
|
103
|
-
|
|
93
|
+
<!--<div class="col-sm-2 form-group form-input-group" >-->
|
|
94
|
+
<!--<label class="control-label">气表型号</label>-->
|
|
95
|
+
<!--<v-select-->
|
|
96
|
+
<!--placeholder='气表型号'-->
|
|
97
|
+
<!--:value.sync="model.f_meter_style"-->
|
|
98
|
+
<!--v-model="model.f_meter_style"-->
|
|
99
|
+
<!--:options='$parent.$parent.meterstyle[model.f_meter_brand]'-->
|
|
100
|
+
<!--close-on-select-->
|
|
101
|
+
<!--condition="f_meter_style='{}'">-->
|
|
102
|
+
<!--</v-select>-->
|
|
103
|
+
<!--</div>-->
|
|
104
104
|
<div class="col-sm-2 form-group form-input-group">
|
|
105
105
|
<label class="control-label">开始时间</label>
|
|
106
106
|
<datepicker style="width:60%" id="startdate" placeholder="开始时间"
|
|
@@ -136,7 +136,7 @@
|
|
|
136
136
|
</div>
|
|
137
137
|
</div>
|
|
138
138
|
</criteria>
|
|
139
|
-
<data-grid id="lostuserlist" :model="model" partial='list' v-ref:grid
|
|
139
|
+
<data-grid id="lostuserlist" :model="model" partial='list' v-ref:grid >
|
|
140
140
|
<template partial='head'>
|
|
141
141
|
<tr>
|
|
142
142
|
<th style="text-align:center">
|
|
@@ -163,9 +163,9 @@
|
|
|
163
163
|
<th style="text-align:center">
|
|
164
164
|
<nobr>气表品牌</nobr>
|
|
165
165
|
</th>
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
166
|
+
<!--<th style="text-align:center" >-->
|
|
167
|
+
<!--<nobr>气表型号</nobr>-->
|
|
168
|
+
<!--</th>-->
|
|
169
169
|
<th style="text-align:center" >
|
|
170
170
|
<nobr>组织机构</nobr>
|
|
171
171
|
</th>
|
|
@@ -178,22 +178,22 @@
|
|
|
178
178
|
<th style="text-align:center" >
|
|
179
179
|
<nobr>期间充值</nobr>
|
|
180
180
|
</th>
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
181
|
+
<!--<th style="text-align:center" >-->
|
|
182
|
+
<!--<nobr>表上期初气量底数</nobr>-->
|
|
183
|
+
<!--</th>-->
|
|
184
|
+
<!--<th style="text-align:center" >-->
|
|
185
|
+
<!--<nobr>表上期末气量底数</nobr>-->
|
|
186
|
+
<!--</th>-->
|
|
187
187
|
<th style="text-align:center" >
|
|
188
188
|
<nobr>表上期间用气总量</nobr>
|
|
189
189
|
</th>
|
|
190
190
|
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
191
|
+
<!--<th style="text-align:center" >-->
|
|
192
|
+
<!--<nobr>结算期初气量底数</nobr>-->
|
|
193
|
+
<!--</th>-->
|
|
194
|
+
<!--<th style="text-align:center" >-->
|
|
195
|
+
<!--<nobr>结算期末气量底数</nobr>-->
|
|
196
|
+
<!--</th>-->
|
|
197
197
|
<th style="text-align:center" >
|
|
198
198
|
<nobr>结算期间用气总量</nobr>
|
|
199
199
|
</th>
|
|
@@ -222,9 +222,9 @@
|
|
|
222
222
|
<td style="text-align:center">
|
|
223
223
|
<nobr>{{row.f_meter_brand}}</nobr>
|
|
224
224
|
</td>
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
225
|
+
<!--<td style="text-align:center">-->
|
|
226
|
+
<!--<nobr>{{row.f_meter_style}}</nobr>-->
|
|
227
|
+
<!--</td>-->
|
|
228
228
|
<td style="text-align:center">
|
|
229
229
|
<nobr>{{row.f_orgname}}</nobr>
|
|
230
230
|
</td>
|
|
@@ -237,22 +237,22 @@
|
|
|
237
237
|
<th style="text-align:center" >
|
|
238
238
|
<nobr>{{row.f_collection}}</nobr>
|
|
239
239
|
</th>
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
240
|
+
<!--<th style="text-align:center" >-->
|
|
241
|
+
<!--<nobr>{{row.f_early_meter_tablebase}}</nobr>-->
|
|
242
|
+
<!--</th>-->
|
|
243
|
+
<!--<th style="text-align:center" >-->
|
|
244
|
+
<!--<nobr>{{row.f_cur_meter_tablebase}}</nobr>-->
|
|
245
|
+
<!--</th>-->
|
|
246
246
|
<th style="text-align:center" >
|
|
247
247
|
<nobr>{{row.f_meter_tablebase}}</nobr>
|
|
248
248
|
</th>
|
|
249
249
|
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
250
|
+
<!--<th style="text-align:center" >-->
|
|
251
|
+
<!--<nobr>{{row.f_early_hand_tablebase}}</nobr>-->
|
|
252
|
+
<!--</th>-->
|
|
253
|
+
<!--<th style="text-align:center" >-->
|
|
254
|
+
<!--<nobr>{{row.f_cur_hand_tablebase}}</nobr>-->
|
|
255
|
+
<!--</th>-->
|
|
256
256
|
<th style="text-align:center" >
|
|
257
257
|
<nobr>{{row.f_hand_tablebase}}</nobr>
|
|
258
258
|
</th>
|
|
@@ -279,10 +279,11 @@
|
|
|
279
279
|
let readySomething = async function (self) {
|
|
280
280
|
|
|
281
281
|
await self.$MagLoadParams.loadParam()
|
|
282
|
+
debugger
|
|
282
283
|
self.initParams()
|
|
283
284
|
self.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() +' 00:00:00'
|
|
284
285
|
self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
|
|
285
|
-
self.$refs.paged.$refs.cri.search()
|
|
286
|
+
// self.$refs.paged.$refs.cri.search()
|
|
286
287
|
}
|
|
287
288
|
export default {
|
|
288
289
|
title: '物联网表结算分析',
|
|
@@ -294,13 +295,9 @@
|
|
|
294
295
|
endDate: 'this.model.endDate'
|
|
295
296
|
}),
|
|
296
297
|
getfield:{
|
|
297
|
-
'f_userinfo_code':'客户编号','f_user_name':'客户名称',
|
|
298
|
-
'
|
|
299
|
-
'
|
|
300
|
-
'f_meter_brand':'气表品牌','f_meter_style': '气表型号','f_orgname':'组织机构',
|
|
301
|
-
'f_early_meter_tablebase': '表上期初表底数', 'f_cur_meter_tablebase': '表上期末表底数', 'f_early_jval': '期初余额',
|
|
302
|
-
'f_cur_jval': '期末余额', 'f_meter_tablebase': '表上期间用气总量','f_early_hand_tablebase': '结算期初表底数',
|
|
303
|
-
'f_cur_hand_tablebase':'结算期末表底数', 'f_oughtfee': '应交金额','f_hand_tablebase':'结算期间用气总量','f_state':'状态','f_money': '结算金额异常'},
|
|
298
|
+
'f_userinfo_code':'客户编号','f_user_name':'客户名称', 'f_address':'客户地址','f_user_type':'客户类型','f_gasproperties':'用气性质',
|
|
299
|
+
'f_meternumber':'表号','f_meter_brand':'气表品牌','f_orgname':'组织机构', 'f_early_jval': '期初余额', 'f_cur_jval': '期末余额',
|
|
300
|
+
'f_meter_tablebase': '表上期间用气总量', 'f_oughtfee': '应交金额','f_hand_tablebase':'结算期间用气总量','f_state':'状态','f_money': '结算金额异常'},
|
|
304
301
|
showdetail:false,
|
|
305
302
|
rowdata:{},
|
|
306
303
|
startDate: '',
|