manage-client 4.1.1 → 4.1.2
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 +21 -3
- package/package.json +1 -1
- package/src/components/SellReport/ronghao/rhMonthGas.vue +167 -0
- package/src/components/sale/businessquery/GasInspection.vue +18 -1
- package/src/components/sale/businessquery/InspectListGas.vue +18 -0
- package/src/filiale/shanxian/FmyGasDeviceQuery.vue +1 -1
- package/src/filiale/shexian/GasInspection.vue +618 -0
- package/src/filiale/shexian/InspectListGas.vue +599 -0
- package/src/filiale/shexian/sale.js +8 -0
- package/src/filiale/xinjiangdexin/UserGasAll.vue +2 -2
- package/src/main.js +3 -3
- package/src/reportManage.js +4 -0
package/build/dev-server.js
CHANGED
|
@@ -19,9 +19,9 @@ var qtx = 'http://36.103.222.144:6300/'
|
|
|
19
19
|
// var bendi = 'http://203.57.101.233:9001/'
|
|
20
20
|
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
21
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
var bendi = 'http://
|
|
22
|
+
var bendi = 'http://192.168.50.67:30785/'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://192.168.50.67:30785/'
|
|
25
25
|
// 192.168.
|
|
26
26
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
27
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
@@ -45,6 +45,24 @@ var proxyTable = {
|
|
|
45
45
|
},
|
|
46
46
|
target: 'http://127.0.0.1:8080/'
|
|
47
47
|
},
|
|
48
|
+
'/api/af-revenue/sql/getGasInspection': {
|
|
49
|
+
pathRewrite: {
|
|
50
|
+
'^/api/af-revenue': '/rs'
|
|
51
|
+
},
|
|
52
|
+
target: 'http://127.0.0.1:8080/'
|
|
53
|
+
},
|
|
54
|
+
'/api/af-revenue/sql/inspectList_sellinggas': {
|
|
55
|
+
pathRewrite: {
|
|
56
|
+
'^/api/af-revenue': '/rs'
|
|
57
|
+
},
|
|
58
|
+
target: 'http://127.0.0.1:8080/'
|
|
59
|
+
},
|
|
60
|
+
'/api/af-revenue/sql/inspectList': {
|
|
61
|
+
pathRewrite: {
|
|
62
|
+
'^/api/af-revenue': '/rs'
|
|
63
|
+
},
|
|
64
|
+
target: 'http://127.0.0.1:8080/'
|
|
65
|
+
},
|
|
48
66
|
'/api': {
|
|
49
67
|
target: 'http://192.168.50.67:31567/'
|
|
50
68
|
|
|
@@ -60,7 +78,7 @@ var proxyTable = {
|
|
|
60
78
|
},
|
|
61
79
|
// 查找资源服务数据
|
|
62
80
|
'/rs/search': {
|
|
63
|
-
target: 'http://192.168.50.67:
|
|
81
|
+
target: 'http://192.168.50.67:30785/'
|
|
64
82
|
},
|
|
65
83
|
// 查找资源服务数据
|
|
66
84
|
'/rs/logic/getLogin': {
|
package/package.json
CHANGED
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="basic-main" style="height: 100%">
|
|
3
|
+
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
|
|
5
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-2 form-group" >
|
|
8
|
+
<label class="font_normal_body" for="startDate">开始日期:</label>
|
|
9
|
+
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
10
|
+
v-model="model.startDate"
|
|
11
|
+
:value.sync="model.startDate"
|
|
12
|
+
:disabled-days-of-Week="[]"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
|
+
:show-reset-button="reset">
|
|
15
|
+
</datepicker>
|
|
16
|
+
</div>
|
|
17
|
+
<div class="col-sm-2 form-group" >
|
|
18
|
+
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
19
|
+
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
20
|
+
v-model="model.endDate"
|
|
21
|
+
:value.sync="model.endDate"
|
|
22
|
+
:disabled-days-of-Week="[]"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
|
+
:show-reset-button="reset">
|
|
25
|
+
</datepicker>
|
|
26
|
+
</div>
|
|
27
|
+
<res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="span" style = "float:right;">
|
|
30
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
31
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
32
|
+
<report-excel id='gasprice'></report-excel>
|
|
33
|
+
</div>
|
|
34
|
+
</div>
|
|
35
|
+
</criteria>
|
|
36
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
37
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
38
|
+
<thead>
|
|
39
|
+
<tr>
|
|
40
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
|
|
41
|
+
<h3 style="text-align: center">月用气量报表</h3>
|
|
42
|
+
</th>
|
|
43
|
+
</tr>
|
|
44
|
+
<tr>
|
|
45
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
46
|
+
开始时间：{{model.model.startDate}}
|
|
47
|
+
结束时间：{{ model.model.endDate }} <br/>
|
|
48
|
+
<!--打印时间：{{{$parent.printTime}}}-->
|
|
49
|
+
打印时间：{{$parent.printTime}}
|
|
50
|
+
<!--收费员：{{// $parent.operatorname}}-->
|
|
51
|
+
</th>
|
|
52
|
+
</tr>
|
|
53
|
+
<tr>
|
|
54
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
55
|
+
<div>
|
|
56
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
|
|
57
|
+
<span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
|
|
58
|
+
</th>
|
|
59
|
+
</tr>
|
|
60
|
+
</thead>
|
|
61
|
+
<tr>
|
|
62
|
+
<td :colspan='$parent.spans' class="noborder">
|
|
63
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
64
|
+
</td>
|
|
65
|
+
</tr>
|
|
66
|
+
<tfoot>
|
|
67
|
+
</tfoot>
|
|
68
|
+
</table>
|
|
69
|
+
{{{ $parent.reportStr}}}
|
|
70
|
+
</div>
|
|
71
|
+
</criteria-paged>
|
|
72
|
+
</div>
|
|
73
|
+
</template>
|
|
74
|
+
|
|
75
|
+
<script>
|
|
76
|
+
import { DataModel } from 'vue-client'
|
|
77
|
+
import co from 'co'
|
|
78
|
+
export default {
|
|
79
|
+
title: '月用气量报表',
|
|
80
|
+
props: ['data'],
|
|
81
|
+
data () {
|
|
82
|
+
return {
|
|
83
|
+
printTime: this.$login.toStandardTimeString(),
|
|
84
|
+
depresid: [],
|
|
85
|
+
userresid: [],
|
|
86
|
+
f_orgid: this.$login.f.orgid,
|
|
87
|
+
f_depid: this.$login.f.depids,
|
|
88
|
+
// f_operatorid: this.$login.f.id,
|
|
89
|
+
operatorid: [],
|
|
90
|
+
depid: [],
|
|
91
|
+
orgname: '',
|
|
92
|
+
depname: '',
|
|
93
|
+
criteriaShow: false,
|
|
94
|
+
operatorname: '',
|
|
95
|
+
orgCondtionStr: '1=1',
|
|
96
|
+
f_user_type: '',
|
|
97
|
+
f_state: ['有效'],
|
|
98
|
+
model: new DataModel('api/af-revenue/report/rh_month_gas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
99
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
100
|
+
reportStr: null,
|
|
101
|
+
resshow: ['company', 'department', 'operator'],
|
|
102
|
+
spans: 0,
|
|
103
|
+
initres: {
|
|
104
|
+
org: [this.$login.f.orgid],
|
|
105
|
+
dep: [],
|
|
106
|
+
user: []
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
},
|
|
110
|
+
ready () {
|
|
111
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
112
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
113
|
+
},
|
|
114
|
+
methods: {
|
|
115
|
+
searchData () {
|
|
116
|
+
this.$refs.paged.$refs.criteria.search()
|
|
117
|
+
},
|
|
118
|
+
selfSearch (args) {
|
|
119
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
120
|
+
let orgcondition = '1=1'
|
|
121
|
+
let orgstr = this.orgCondtionStr
|
|
122
|
+
orgcondition = orgcondition + orgstr
|
|
123
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
124
|
+
this.$refs.paged.search(args)
|
|
125
|
+
},
|
|
126
|
+
|
|
127
|
+
hidden () {
|
|
128
|
+
this.criteriaShow = !this.criteriaShow
|
|
129
|
+
},
|
|
130
|
+
getRes (condition, obj) {
|
|
131
|
+
this.orgCondtionStr = condition
|
|
132
|
+
this.orgname = obj.orgnames[0]
|
|
133
|
+
this.depname = obj.depnames[0]
|
|
134
|
+
this.operatorname = obj.operatornames[0]
|
|
135
|
+
},
|
|
136
|
+
getdep (obj, val) {
|
|
137
|
+
this.depname = val[0]
|
|
138
|
+
this.userresid = obj
|
|
139
|
+
this.f_depid = obj
|
|
140
|
+
},
|
|
141
|
+
getuser ( obj, val) {
|
|
142
|
+
this.operatorname = val[0]
|
|
143
|
+
this.f_operatorid = obj
|
|
144
|
+
}
|
|
145
|
+
},
|
|
146
|
+
watch: {
|
|
147
|
+
'model.data' (val) {
|
|
148
|
+
let len=0
|
|
149
|
+
let a=val.split('</tr>')
|
|
150
|
+
for(let i=0;i<a.length;i++){
|
|
151
|
+
if(a[i].split('</td>').length-1>len){
|
|
152
|
+
len=a[i].split('</td>').length-1
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
this.spans = len
|
|
156
|
+
}
|
|
157
|
+
},
|
|
158
|
+
computed: {
|
|
159
|
+
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
</script>
|
|
163
|
+
<style scoped>
|
|
164
|
+
.noborder{
|
|
165
|
+
border: none;
|
|
166
|
+
}
|
|
167
|
+
</style>
|
|
@@ -47,7 +47,19 @@
|
|
|
47
47
|
close-on-select >
|
|
48
48
|
</v-select>
|
|
49
49
|
</div>
|
|
50
|
-
|
|
50
|
+
<!-- <!–新增通气状态查询条件–>-->
|
|
51
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
52
|
+
<!-- <label for="f_gas_date" class="font_normal_body">通气状态 </label>-->
|
|
53
|
+
<!-- <v-select id="f_gas_date"-->
|
|
54
|
+
<!-- style="width:60%"-->
|
|
55
|
+
<!-- v-model="model.f_gas_date"-->
|
|
56
|
+
<!-- placeholder='通气状态'-->
|
|
57
|
+
<!-- :value.sync="model.f_gas_date"-->
|
|
58
|
+
<!-- :options='$parent.$parent.f_gas_date'-->
|
|
59
|
+
<!-- condition="ventilation_status = '{}'"-->
|
|
60
|
+
<!-- close-on-select>-->
|
|
61
|
+
<!-- </v-select>-->
|
|
62
|
+
<!-- </div>-->
|
|
51
63
|
<div class="span" style="float:right;">
|
|
52
64
|
<button class="btn button_search" @click="search()">查询</button>
|
|
53
65
|
<button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
|
|
@@ -237,6 +249,7 @@
|
|
|
237
249
|
<th><nobr>表箱号</nobr></th>
|
|
238
250
|
<th><nobr>用户类型</nobr></th>
|
|
239
251
|
<th><nobr>用气性质</nobr></th>
|
|
252
|
+
<!-- <th><nobr>通气状态</nobr></th>-->
|
|
240
253
|
<th><nobr>表具状态</nobr></th>
|
|
241
254
|
<th><nobr>气表品牌</nobr></th>
|
|
242
255
|
<th><nobr>表册片区</nobr></th>
|
|
@@ -264,6 +277,7 @@
|
|
|
264
277
|
<th style="text-align: center;"><nobr>{{row.f_metertitles}}</nobr></th>
|
|
265
278
|
<th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
|
|
266
279
|
<th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
|
|
280
|
+
<!-- <th style="text-align: center;"><nobr>{{row.ventilation_status}}</nobr></th>-->
|
|
267
281
|
<th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
|
|
268
282
|
<th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
|
|
269
283
|
<th style="text-align: center;"><nobr>{{row.f_book_slice_area}}</nobr></th>
|
|
@@ -551,6 +565,9 @@
|
|
|
551
565
|
gasproperties() {
|
|
552
566
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
|
|
553
567
|
},
|
|
568
|
+
f_gas_date() {
|
|
569
|
+
return [{label: ' 已通气 ', value: '已通气'}, {label: ' 未通气 ', value: '未通气'} ]
|
|
570
|
+
},
|
|
554
571
|
f_meter_classify(){
|
|
555
572
|
return [{label: '全部', value: ''}, {label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '网表', value: '物联网表'} ]
|
|
556
573
|
// return [{label: '卡表', value: '卡表'}]
|
|
@@ -49,6 +49,19 @@
|
|
|
49
49
|
close-on-select >
|
|
50
50
|
</v-select>
|
|
51
51
|
</div>
|
|
52
|
+
<!--新增通气状态查询条件-->
|
|
53
|
+
<!-- <div class="col-sm-2">-->
|
|
54
|
+
<!-- <label for="f_gas_date" class="font_normal_body">通气状态 </label>-->
|
|
55
|
+
<!-- <v-select id="f_gas_date"-->
|
|
56
|
+
<!-- style="width:60%"-->
|
|
57
|
+
<!-- v-model="model.f_gas_date"-->
|
|
58
|
+
<!-- placeholder='通气状态'-->
|
|
59
|
+
<!-- :value.sync="model.f_gas_date"-->
|
|
60
|
+
<!-- :options='$parent.$parent.f_gas_date'-->
|
|
61
|
+
<!-- condition="ss.ventilation_status = '{}'"-->
|
|
62
|
+
<!-- close-on-select>-->
|
|
63
|
+
<!-- </v-select>-->
|
|
64
|
+
<!-- </div>-->
|
|
52
65
|
<div class="span" style="float:right;">
|
|
53
66
|
<button class="btn button_search" @click="search()">查询</button>
|
|
54
67
|
<button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
|
|
@@ -217,6 +230,7 @@
|
|
|
217
230
|
<th><nobr>地址</nobr></th>
|
|
218
231
|
<th><nobr>用户类型</nobr></th>
|
|
219
232
|
<th><nobr>用气性质</nobr></th>
|
|
233
|
+
<!-- <th><nobr>通气状态</nobr></th>-->
|
|
220
234
|
<th><nobr>表具状态</nobr></th>
|
|
221
235
|
<th><nobr>气表品牌</nobr></th>
|
|
222
236
|
<th><nobr>气价名称</nobr></th>
|
|
@@ -247,6 +261,7 @@
|
|
|
247
261
|
<th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
|
|
248
262
|
<th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
|
|
249
263
|
<th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
|
|
264
|
+
<!-- <th style="text-align: center;"><nobr>{{row.ventilation_status}}</nobr></th>-->
|
|
250
265
|
<th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
|
|
251
266
|
<th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
|
|
252
267
|
<th style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></th>
|
|
@@ -534,6 +549,9 @@
|
|
|
534
549
|
contain_newfiles(){
|
|
535
550
|
return [{label: '是', value: '是'},{label: '否', value: '否'} ]
|
|
536
551
|
},
|
|
552
|
+
f_gas_date() {
|
|
553
|
+
return [{label: ' 已通气 ', value: '已通气'}, {label: ' 未通气 ', value: '未通气'} ]
|
|
554
|
+
},
|
|
537
555
|
getCondition () {
|
|
538
556
|
let result = {
|
|
539
557
|
condition: '',
|