manage-client 3.2.63 → 3.2.67
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/BusinessManage.vue +177 -174
- package/src/components/sale/businessquery/GroupChargeQuery.vue +450 -0
- package/src/components/sale/businessquery/PrivilegeQuery.vue +10 -1
- package/src/components/sale/config/exportConfig.js +11 -4
- package/src/components/sale/filesquery/MeterQuery.vue +937 -931
- package/src/components/webmeter/newwebmeter/UserGasList.vue +81 -83
- package/src/filiale/qianneng/ArrearsQuery.vue +853 -0
- package/src/filiale/qianneng/exportConfig.js +35 -0
- package/src/filiale/qianneng/sale.js +10 -9
- package/src/filiale/tongchuan/GasPrice.vue +255 -262
- package/src/main.js +1 -1
- package/src/saleManage.js +550 -546
|
@@ -83,33 +83,46 @@
|
|
|
83
83
|
<div class="col-sm-2 form-group">
|
|
84
84
|
<label class="font_normal_body">气表品牌</label>
|
|
85
85
|
<v-select
|
|
86
|
-
|
|
86
|
+
:options='$parent.$parent.meterbrand'
|
|
87
|
+
|
|
87
88
|
:value.sync="model.f_meter_brand"
|
|
88
|
-
v-model="model.f_meter_brand"
|
|
89
|
-
:options='$parent.$parent.WarningType'
|
|
90
|
-
@change="$parent.$parent.getMeterType"
|
|
91
89
|
close-on-select
|
|
92
|
-
condition="
|
|
90
|
+
condition="f_meter_brand='{}'"
|
|
91
|
+
placeholder='气表品牌'
|
|
92
|
+
style="width:60%"
|
|
93
|
+
v-model="model.f_meter_brand">
|
|
93
94
|
</v-select>
|
|
94
95
|
</div>
|
|
96
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
97
|
+
<!-- <label class="font_normal_body">气表品牌</label>-->
|
|
98
|
+
<!-- <v-select-->
|
|
99
|
+
<!-- placeholder='气表品牌'-->
|
|
100
|
+
<!-- :value.sync="model.f_meter_brand"-->
|
|
101
|
+
<!-- v-model="model.f_meter_brand"-->
|
|
102
|
+
<!-- :options='$parent.$parent.WarningType'-->
|
|
103
|
+
<!-- @change="$parent.$parent.getMeterType"-->
|
|
104
|
+
<!-- close-on-select-->
|
|
105
|
+
<!-- condition="gb.f_meter_brand='{}'">-->
|
|
106
|
+
<!-- </v-select>-->
|
|
107
|
+
<!-- </div>-->
|
|
95
108
|
<div class="col-sm-2 form-group" >
|
|
96
109
|
<label class="font_normal_body">气表型号</label>
|
|
97
|
-
<v-select
|
|
110
|
+
<v-select
|
|
98
111
|
placeholder='气表型号'
|
|
99
112
|
:value.sync="model.f_meter_style"
|
|
100
113
|
v-model="model.f_meter_style"
|
|
101
|
-
:options='$parent.$parent.
|
|
114
|
+
:options='$parent.$parent.meterstyle[model.f_meter_brand]'
|
|
102
115
|
close-on-select
|
|
103
116
|
condition="gm.f_meter_style='{}'">
|
|
104
117
|
</v-select>
|
|
105
|
-
<v-select v-if="!$parent.$parent.styles"
|
|
106
|
-
placeholder='气表型号'
|
|
107
|
-
:value.sync="model.f_meter_style"
|
|
108
|
-
v-model="model.f_meter_style"
|
|
109
|
-
:options='$parent.$parent.Warningstyles'
|
|
110
|
-
close-on-select
|
|
111
|
-
condition="f_meter_style='{}'"
|
|
112
|
-
</v-select
|
|
118
|
+
<!-- <v-select v-if="!$parent.$parent.styles"-->
|
|
119
|
+
<!-- placeholder='气表型号'-->
|
|
120
|
+
<!-- :value.sync="model.f_meter_style"-->
|
|
121
|
+
<!-- v-model="model.f_meter_style"-->
|
|
122
|
+
<!-- :options='$parent.$parent.Warningstyles'-->
|
|
123
|
+
<!-- close-on-select-->
|
|
124
|
+
<!-- condition="f_meter_style='{}'">-->
|
|
125
|
+
<!-- </v-select>-->
|
|
113
126
|
</div>
|
|
114
127
|
<div class="col-sm-2 form-group">
|
|
115
128
|
<label class="font_normal_body" style="word-break:keep-all;">上报时间</label>
|
|
@@ -127,31 +140,31 @@
|
|
|
127
140
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
128
141
|
></datepicker>
|
|
129
142
|
</div>
|
|
130
|
-
<div class="col-sm-2 form-group"
|
|
131
|
-
<label class="font_normal_body">壁 挂 炉</label
|
|
132
|
-
<v-select id="f_meter_brand"
|
|
133
|
-
v-model="model.f_usetype"
|
|
134
|
-
placeholder='壁挂炉'
|
|
135
|
-
:value.sync="model.f_usetype"
|
|
136
|
-
:options='$parent.$parent.usetypes'
|
|
137
|
-
condition="" :search="false"
|
|
138
|
-
close-on-select style="width: 60%"
|
|
139
|
-
</v-select
|
|
140
|
-
</div
|
|
141
|
-
<div class="col-sm-2 form-group"
|
|
142
|
-
<label class="font_normal_body">房屋类型</label
|
|
143
|
-
<v-select :value.sync="model.f_house_type" v-model="model.f_house_type"
|
|
144
|
-
:options='$parent.$parent.houseTypes' placeholder='请选择'
|
|
145
|
-
close-on-select
|
|
146
|
-
condition=""></v-select
|
|
147
|
-
</div
|
|
148
|
-
<div class="col-sm-2 form-group"
|
|
149
|
-
<label class="font_normal_body">安装位置</label
|
|
150
|
-
<v-select :value.sync="model.f_position" v-model="model.f_position"
|
|
151
|
-
:options='$parent.$parent.positions' placeholder='请选择'
|
|
152
|
-
condition=""
|
|
153
|
-
close-on-select></v-select
|
|
154
|
-
</div
|
|
143
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
144
|
+
<!-- <label class="font_normal_body">壁 挂 炉</label>-->
|
|
145
|
+
<!-- <v-select id="f_meter_brand"-->
|
|
146
|
+
<!-- v-model="model.f_usetype"-->
|
|
147
|
+
<!-- placeholder='壁挂炉'-->
|
|
148
|
+
<!-- :value.sync="model.f_usetype"-->
|
|
149
|
+
<!-- :options='$parent.$parent.usetypes'-->
|
|
150
|
+
<!-- condition="" :search="false"-->
|
|
151
|
+
<!-- close-on-select style="width: 60%">-->
|
|
152
|
+
<!-- </v-select>-->
|
|
153
|
+
<!-- </div>-->
|
|
154
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
155
|
+
<!-- <label class="font_normal_body">房屋类型</label>-->
|
|
156
|
+
<!-- <v-select :value.sync="model.f_house_type" v-model="model.f_house_type"-->
|
|
157
|
+
<!-- :options='$parent.$parent.houseTypes' placeholder='请选择'-->
|
|
158
|
+
<!-- close-on-select-->
|
|
159
|
+
<!-- condition=""></v-select>-->
|
|
160
|
+
<!-- </div>-->
|
|
161
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
162
|
+
<!-- <label class="font_normal_body">安装位置</label>-->
|
|
163
|
+
<!-- <v-select :value.sync="model.f_position" v-model="model.f_position"-->
|
|
164
|
+
<!-- :options='$parent.$parent.positions' placeholder='请选择'-->
|
|
165
|
+
<!-- condition=""-->
|
|
166
|
+
<!-- close-on-select></v-select>-->
|
|
167
|
+
<!-- </div>-->
|
|
155
168
|
</div>
|
|
156
169
|
</div>
|
|
157
170
|
</criteria>
|
|
@@ -215,7 +228,13 @@
|
|
|
215
228
|
import * as Util from '../../../Util'
|
|
216
229
|
import plugins from '../../../plugins/GetLoginInfoService'
|
|
217
230
|
import plugin from 'system-clients/src/plugins/GetLoginInfoService'
|
|
218
|
-
|
|
231
|
+
let readySomething = async function (self) {
|
|
232
|
+
self.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
|
|
233
|
+
self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
|
|
234
|
+
await self.$MagLoadParams.loadParam()
|
|
235
|
+
self.initQueryParam()
|
|
236
|
+
self.$refs.paged.$refs.cri.search()
|
|
237
|
+
}
|
|
219
238
|
export default {
|
|
220
239
|
title: '抄表分析',
|
|
221
240
|
props: ['data'],
|
|
@@ -227,6 +246,8 @@
|
|
|
227
246
|
startDate: '',
|
|
228
247
|
gasproperties:[{label: '全部', value: ''}],
|
|
229
248
|
endDate: '',
|
|
249
|
+
meterbrand: [],
|
|
250
|
+
meterstyle: {},
|
|
230
251
|
WarningType: [
|
|
231
252
|
{label: '全部', value: ''}
|
|
232
253
|
],
|
|
@@ -262,52 +283,29 @@
|
|
|
262
283
|
}
|
|
263
284
|
},
|
|
264
285
|
ready () {
|
|
265
|
-
this
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
286
|
+
readySomething(this).then(() => {
|
|
287
|
+
this.$emit('ready')
|
|
288
|
+
}).catch((error) => {
|
|
289
|
+
this.$emit('error', error)
|
|
290
|
+
})
|
|
269
291
|
},
|
|
270
292
|
methods: {
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
condition = `${condition} and ui.f_orgid like '${this.$login.f.orgid}%'`
|
|
279
|
-
let self = this
|
|
280
|
-
let load = new HttpResetClass()
|
|
281
|
-
load.load('POST', 'rs/sql/getMeterStyleAndBrand1', {
|
|
282
|
-
data: {
|
|
283
|
-
condition: condition,
|
|
284
|
-
groupname: groupname
|
|
285
|
-
}
|
|
286
|
-
}, {warnMsg: null, resolveMsg: null}).then((res) => {
|
|
287
|
-
let dr = {label: '', value: ''}
|
|
288
|
-
let i = 0
|
|
289
|
-
for (i = 0; i < res.data.length; i++) {
|
|
290
|
-
dr = {label: '', value: ''}
|
|
291
|
-
if (groupname == 'f_meter_brand') {
|
|
292
|
-
dr.label = res.data[i].f_meter_brand
|
|
293
|
-
dr.value = res.data[i].f_meter_brand
|
|
294
|
-
//气表品牌
|
|
295
|
-
self.WarningType.push(dr)
|
|
296
|
-
console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
|
|
297
|
-
console.log(dr)
|
|
298
|
-
console.log( self.WarningType)
|
|
299
|
-
} else if (groupname == 'f_meter_style') {
|
|
300
|
-
dr.label = res.data[i].f_meter_style
|
|
301
|
-
dr.value = res.data[i].f_meter_style
|
|
302
|
-
//气表类型
|
|
303
|
-
self.Warningstyle.push(dr)
|
|
293
|
+
initQueryParam () {
|
|
294
|
+
let meters = this.$MagGetSaleParam.getGasbrand().filter(item => item.value.f_meter_type==='物联网表')
|
|
295
|
+
let arr = meters.map(res => {
|
|
296
|
+
let sty = res.value.gasmodel.map(row => {
|
|
297
|
+
return {
|
|
298
|
+
label: row.label,
|
|
299
|
+
value: row.value.f_meter_style
|
|
304
300
|
}
|
|
305
|
-
}
|
|
306
|
-
|
|
307
|
-
|
|
301
|
+
})
|
|
302
|
+
this.meterstyle[res.value.f_meter_brand] = [{label: '全部', value: ''}, ...sty]
|
|
303
|
+
return {
|
|
304
|
+
label: res.label,
|
|
305
|
+
value: res.value.f_meter_brand
|
|
308
306
|
}
|
|
309
307
|
})
|
|
310
|
-
|
|
308
|
+
this.meterbrand = [{label: '全部', value: ''}, ...arr]
|
|
311
309
|
},
|
|
312
310
|
showMeterStyle() {
|
|
313
311
|
this.styles = true
|
|
@@ -365,7 +363,7 @@
|
|
|
365
363
|
return this.$showMessage("时间区间的开始和结束时间不能为空！")
|
|
366
364
|
}
|
|
367
365
|
if (this.orgCondtionStr){
|
|
368
|
-
this.condition = this.$refs.paged.$refs.cri.condition + `and uf.f_orgid in ${this.orgCondtionStr}`
|
|
366
|
+
this.condition = this.$refs.paged.$refs.cri.condition + ` and uf.f_orgid in ${this.orgCondtionStr}`
|
|
369
367
|
}
|
|
370
368
|
else
|
|
371
369
|
this.condition = this.$refs.paged.$refs.cri.condition
|