manage-client 3.3.123 → 3.3.124-sq
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 +5 -5
- package/index.html +20 -11
- package/package.json +3 -3
- package/src/App.vue +0 -3
- package/src/components/handReport/WebGastypeReport.vue +5 -5
- package/src/components/sale/businessquery/CardHandplanQuery.vue +0 -7
- package/src/components/sale/businessquery/ChargeQuery.vue +3 -7
- package/src/components/sale/businessquery/FMYGasQuery.vue +25 -32
- package/src/components/sale/filesquery/RecordInfoQuery.vue +4 -4
- package/src/components/webmeter/gasStatistics/GasStatistics.vue +22 -22
- package/src/components/webmeter/instruction/NewQueryInstruct.vue +2 -4
- package/src/components/webmeter/operationValueRecord.vue +2 -2
- package/src/filiale/WEINAN/ResSelectGroupNew.vue +1 -8
- package/src/filiale/WEINAN/businessquery/WallHangingFurnaceUserQuery.vue +0 -1
- package/src/filiale/lixianV3/ChangeMeterQuery.vue +1 -7
- package/src/filiale/lixianV3/GasAnalysisQuery.vue +6 -12
- package/src/filiale/lixianV3/config/exportConfig.js +4 -5
- package/src/filiale/lixianV3/sale.js +1 -3
- package/src/filiale/lixianV3/useGasYearRatioQuery.vue +6 -39
- package/src/filiale/ningjin/GasStatistics.vue +1 -1
- package/src/filiale/shanxian/Paymentpie.vue +34 -16
- package/src/filiale/shanxian/SiteManager.vue +47 -29
- package/src/filiale/shiquan/ChargeQuery.vue +1407 -0
- package/src/filiale/shiquan/InspectListUser.vue +685 -0
- package/src/filiale/shiquan/config/exportConfig.js +2 -1
- package/src/filiale/shiquan/sale.js +8 -0
- package/src/filiale/tongchuan/InspectListGas.vue +1 -1
- package/src/main.js +1 -1
- package/src/reportManage.js +0 -20
- package/src/components/SellReport/OpenEticketSummary.vue +0 -245
- package/src/components/SellReport/PublicGasPriceReport.vue +0 -257
- package/src/components/SellReport/YCGasSummary.vue +0 -250
- package/src/components/SellReport/YCMonthSummary.vue +0 -282
- package/src/components/SellReport/taizhou/ManageBusSummary.vue +0 -238
- package/src/filiale/lixianV3/RecordInfoQuery.vue +0 -1448
- package/src/filiale/taizhoukesi/FMYGasQuery.vue +0 -837
- package/src/filiale/taizhoukesi/NewGasStatistics.vue +0 -536
- package/src/filiale/taizhoukesi/SellReport/GasMeterBrand.vue +0 -227
- package/src/filiale/taizhoukesi/config/DefaultPrint.js +0 -6
- package/src/filiale/taizhoukesi/config/exportConfig.js +0 -2376
- package/src/filiale/taizhoukesi/config/tableConfig.js +0 -54
- package/src/filiale/taizhoukesi/reportManage.js +0 -9
- package/src/filiale/taizhoukesi/sale.js +0 -7
- package/src/filiale/taizhoukesi/webmeterManage.js +0 -6
package/build/dev-server.js
CHANGED
|
@@ -11,17 +11,17 @@ var compiler = webpack(config)
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
|
-
var shaoguan = 'http://119.146.1.106:8300/'
|
|
15
|
-
var qtx= 'http://36.103.222.144:6300/'
|
|
14
|
+
// var shaoguan = 'http://119.146.1.106:8300/'
|
|
15
|
+
// var qtx= 'http://36.103.222.144:6300/'
|
|
16
16
|
// var bendi = 'http://220.194.141.253:8600/'
|
|
17
17
|
// var bendi = 'http://203.57.101.233:9001'
|
|
18
18
|
// var bendi = 'http://172.168.1.11:9001/'
|
|
19
19
|
// var bendi = 'http://203.57.101.233:8400/'
|
|
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://61.185.130.75:8400/'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://61.185.130.75:8400/'
|
|
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'
|
|
@@ -91,7 +91,7 @@ var proxyTable = {
|
|
|
91
91
|
target: bendi
|
|
92
92
|
},
|
|
93
93
|
'/rs/sql': {
|
|
94
|
-
target:
|
|
94
|
+
target: wode
|
|
95
95
|
},
|
|
96
96
|
'/rs': {
|
|
97
97
|
target: wode
|
package/index.html
CHANGED
|
@@ -6,23 +6,32 @@
|
|
|
6
6
|
<META HTTP-EQUIV="pragma" CONTENT="no-cache">
|
|
7
7
|
<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
|
|
8
8
|
<META HTTP-EQUIV="expires" CONTENT="0">
|
|
9
|
-
<
|
|
9
|
+
<!-- <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>-->
|
|
10
|
+
<!-- <script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>-->
|
|
11
|
+
|
|
12
|
+
<!--<!– <!–引入UI组件库（1.1版本） –>–>-->
|
|
13
|
+
<!-- <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>-->
|
|
14
|
+
<title>智慧燃气</title>
|
|
15
|
+
|
|
16
|
+
<script>
|
|
17
|
+
window.versionTime = parseInt('<%= date %>');
|
|
18
|
+
</script>
|
|
10
19
|
<style media="screen">
|
|
11
20
|
/*url(./static/newmainbg.jpg)*/
|
|
12
|
-
body
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
body .loginbg {
|
|
19
|
-
width: 100%;
|
|
20
|
-
height: 100%;
|
|
21
|
-
background: url(./static/loginbg.jpg) no-repeat center top;
|
|
21
|
+
body{width: 100%;background:#7f8eaf no-repeat center bottom; background-size: cover;}
|
|
22
|
+
body .loginbg{ width:100%; height:100%; background:url(./static/loginbgmain.jpg) no-repeat center top;}
|
|
23
|
+
.nav-tabs li a{
|
|
24
|
+
font-size: 16px !important;
|
|
22
25
|
}
|
|
23
26
|
</style>
|
|
24
27
|
</head>
|
|
25
28
|
<body id="bodymain" class="themeOne">
|
|
26
29
|
<app></app>
|
|
30
|
+
<div style="display: none" id="btnid"></div>
|
|
27
31
|
</body>
|
|
28
32
|
</html>
|
|
33
|
+
<style>
|
|
34
|
+
* {
|
|
35
|
+
font-family: PingFangSC-Regular;
|
|
36
|
+
}
|
|
37
|
+
</style>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.124-sq",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -68,10 +68,10 @@
|
|
|
68
68
|
"style": "0.0.3",
|
|
69
69
|
"style-loader": "^0.20.3",
|
|
70
70
|
"swiper": "^5.4.5",
|
|
71
|
-
"system-clients": "3.2.
|
|
71
|
+
"system-clients": "3.2.80",
|
|
72
72
|
"url-loader": "^0.5.7",
|
|
73
73
|
"vue-amap": "0.5.10",
|
|
74
|
-
"vue-client": "1.
|
|
74
|
+
"vue-client": "1.25.31",
|
|
75
75
|
"vue-hot-reload-api": "^1.2.0",
|
|
76
76
|
"vue-html-loader": "^1.0.0",
|
|
77
77
|
"vue-loader": "8.2.1",
|
package/src/App.vue
CHANGED
|
@@ -51,23 +51,23 @@
|
|
|
51
51
|
<table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
|
|
52
52
|
<thead>
|
|
53
53
|
<tr>
|
|
54
|
-
<th colspan='
|
|
54
|
+
<th colspan='5' style="font-weight: bold; text-align: left;">
|
|
55
55
|
<h3 style="text-align: center">抄表性质统计报表</h3>
|
|
56
56
|
</th>
|
|
57
57
|
</tr>
|
|
58
58
|
<tr>
|
|
59
|
-
<th colspan='
|
|
59
|
+
<th colspan='5' style="font-weight: normal; text-align: center;">
|
|
60
60
|
开始时间：{{model.model.startDate}}
|
|
61
61
|
结束时间：{{ model.model.endDate }}
|
|
62
62
|
</th>
|
|
63
63
|
</tr>
|
|
64
64
|
<tr>
|
|
65
|
-
<th colspan='
|
|
65
|
+
<th colspan='5' style="font-weight: normal; text-align: center;">
|
|
66
66
|
打印时间：{{{$parent.printTime}}}
|
|
67
67
|
</th>
|
|
68
68
|
</tr>
|
|
69
69
|
<tr>
|
|
70
|
-
<th colspan='
|
|
70
|
+
<th colspan='5' style="font-weight: normal; text-align: center;">
|
|
71
71
|
<div>
|
|
72
72
|
<span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
|
|
73
73
|
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
</tr>
|
|
77
77
|
</thead>
|
|
78
78
|
<tr>
|
|
79
|
-
<td colspan='
|
|
79
|
+
<td colspan='5' style="font-weight: normal;" id="test">
|
|
80
80
|
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
81
81
|
</td>
|
|
82
82
|
</tr>
|
|
@@ -149,9 +149,6 @@
|
|
|
149
149
|
<th>
|
|
150
150
|
<nobr>本期底数</nobr>
|
|
151
151
|
</th>
|
|
152
|
-
<th>
|
|
153
|
-
<nobr>附件查看</nobr>
|
|
154
|
-
</th>
|
|
155
152
|
<th>
|
|
156
153
|
<nobr>气量</nobr>
|
|
157
154
|
</th>
|
|
@@ -207,10 +204,6 @@
|
|
|
207
204
|
<td style="text-align: center;">
|
|
208
205
|
<nobr>{{row.f_tablebase}}</nobr>
|
|
209
206
|
</td>
|
|
210
|
-
<td style="text-align:center">
|
|
211
|
-
<img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
|
|
212
|
-
<img-self :src="`rs/image/file/${row.f_notified_path}`" v-if="row.f_notified_path" :width="100" :height="100"></img-self>
|
|
213
|
-
</td>
|
|
214
207
|
<td style="text-align: center;">
|
|
215
208
|
<nobr>{{row.f_real_amount}}</nobr>
|
|
216
209
|
</td>
|
|
@@ -1001,12 +1001,9 @@
|
|
|
1001
1001
|
})
|
|
1002
1002
|
},
|
|
1003
1003
|
methods: {
|
|
1004
|
-
async batchPrintBill(row, type)
|
|
1004
|
+
async batchPrintBill(row, type){
|
|
1005
1005
|
this.operate_type = type
|
|
1006
|
-
|
|
1007
|
-
console.log(this.$refs.paged.$refs.cri.model.f_state.length === 1)
|
|
1008
|
-
console.log(this.$refs.paged.$refs.cri.model.f_state[0] == '有效')
|
|
1009
|
-
if (this.$refs.paged.$refs.cri.model.f_state.length === 1 && this.$refs.paged.$refs.cri.model.f_state[0] == '有效') {
|
|
1006
|
+
if (this.$refs.paged.$refs.cri.model.f_state.length === 1 && this.$refs.paged.$refs.cri.model.f_state[0] === '有效') {
|
|
1010
1007
|
if (type === '票据补打') {
|
|
1011
1008
|
this.batchPrintData.push(row)
|
|
1012
1009
|
this.$showMessage(`您确定补打本张票据吗？？？`, ['confirm', 'cancel']).then(async (res) => {
|
|
@@ -1025,8 +1022,7 @@
|
|
|
1025
1022
|
} else {
|
|
1026
1023
|
this.$showMessage(`请先查询数据！！！`, ['confirm'])
|
|
1027
1024
|
}
|
|
1028
|
-
|
|
1029
|
-
} else {
|
|
1025
|
+
}
|
|
1030
1026
|
this.$showMessage(`请选择有效的收费记录进行票据补打！！！`, ['confirm'])
|
|
1031
1027
|
}
|
|
1032
1028
|
},
|
|
@@ -137,12 +137,10 @@
|
|
|
137
137
|
</div>
|
|
138
138
|
<div class="col-sm-2 form-group">
|
|
139
139
|
<label class="font_normal_body">用气性质</label>
|
|
140
|
-
<v-select :value.sync="model.f_gasproperties"
|
|
141
|
-
v-model="model.f_gasproperties"
|
|
140
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
142
141
|
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
</v-select>
|
|
142
|
+
condition="f_gasproperties = '{}'"
|
|
143
|
+
close-on-select></v-select>
|
|
146
144
|
</div>
|
|
147
145
|
<!--表册片区-->
|
|
148
146
|
<div class="col-sm-2 form-group">
|
|
@@ -177,12 +175,12 @@
|
|
|
177
175
|
condition="f_oughtamount <= '{}' " placeholder="小于等于">
|
|
178
176
|
</div>
|
|
179
177
|
<div class="col-sm-2 form-group">
|
|
180
|
-
<label for="startHandDate" class="font_normal_body"
|
|
178
|
+
<label for="startHandDate" class="font_normal_body">开户时间</label>
|
|
181
179
|
<datepicker id="startHandDate" placeholder="开始日期" style="width:60%"
|
|
182
|
-
v-model="model.
|
|
183
|
-
:value.sync="model.
|
|
180
|
+
v-model="model.startOpenDate"
|
|
181
|
+
:value.sync="model.startOpenDate"
|
|
184
182
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
185
|
-
condition="
|
|
183
|
+
condition="f_open_date >= '{}'"
|
|
186
184
|
:show-reset-button="true"
|
|
187
185
|
>
|
|
188
186
|
</datepicker>
|
|
@@ -190,10 +188,10 @@
|
|
|
190
188
|
<div class="col-sm-2 form-group">
|
|
191
189
|
<label for="endHandDate" class="font_normal_body">   至</label>
|
|
192
190
|
<datepicker id="endHandDate" placeholder="结束日期" style="width:60%"
|
|
193
|
-
v-model="model.
|
|
194
|
-
:value.sync="model.
|
|
191
|
+
v-model="model.endOpenDate"
|
|
192
|
+
:value.sync="model.endOpenDate"
|
|
195
193
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
196
|
-
condition="
|
|
194
|
+
condition="f_open_date <= '{}'"
|
|
197
195
|
:show-reset-button="true"
|
|
198
196
|
>
|
|
199
197
|
</datepicker>
|
|
@@ -202,10 +200,9 @@
|
|
|
202
200
|
<label class="font_normal_body"> 抄 表 员</label>
|
|
203
201
|
<v-select :value.sync="model.f_inputtor"
|
|
204
202
|
v-model="model.f_inputtor"
|
|
205
|
-
:multiple="true"
|
|
206
203
|
:options='$parent.$parent.inputtores' placeholder='请选择'
|
|
207
|
-
condition="f_inputtor
|
|
208
|
-
:search="false">
|
|
204
|
+
condition="f_inputtor = '{}'"
|
|
205
|
+
close-on-select :search="false">
|
|
209
206
|
</v-select>
|
|
210
207
|
</div>
|
|
211
208
|
</div>
|
|
@@ -296,7 +293,7 @@
|
|
|
296
293
|
<nobr>期末底数</nobr>
|
|
297
294
|
</th>
|
|
298
295
|
<th>
|
|
299
|
-
<nobr
|
|
296
|
+
<nobr>建档日期</nobr>
|
|
300
297
|
</th>
|
|
301
298
|
</tr>
|
|
302
299
|
</template>
|
|
@@ -389,7 +386,7 @@
|
|
|
389
386
|
<nobr>{{row.f_tablebase}}</nobr>
|
|
390
387
|
</td>
|
|
391
388
|
<td style="text-align: center;">
|
|
392
|
-
<nobr>{{row.
|
|
389
|
+
<nobr>{{row.f_createfile_date}}</nobr>
|
|
393
390
|
</td>
|
|
394
391
|
</template>
|
|
395
392
|
<template partial='foot'></template>
|
|
@@ -483,7 +480,7 @@ import exportConfig from '../config/exportConfig'
|
|
|
483
480
|
printshow: false,
|
|
484
481
|
all: false,
|
|
485
482
|
fields: {},
|
|
486
|
-
inputtores:[
|
|
483
|
+
inputtores: [],
|
|
487
484
|
thead: '',
|
|
488
485
|
tfoot: '',
|
|
489
486
|
//表册片区
|
|
@@ -505,7 +502,6 @@ import exportConfig from '../config/exportConfig'
|
|
|
505
502
|
},
|
|
506
503
|
ready () {
|
|
507
504
|
readySomething(this)
|
|
508
|
-
this.getinputtores()
|
|
509
505
|
},
|
|
510
506
|
methods: {
|
|
511
507
|
initParams(){
|
|
@@ -535,19 +531,16 @@ import exportConfig from '../config/exportConfig'
|
|
|
535
531
|
})
|
|
536
532
|
}
|
|
537
533
|
},
|
|
538
|
-
async
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
rs.push(temp)
|
|
548
|
-
}
|
|
534
|
+
async updateParams() {
|
|
535
|
+
await this.$MagLoadParams.loadParam(this.f_filialeid)
|
|
536
|
+
this.inputtores = [];
|
|
537
|
+
this.inputtores.push({label: '全部', value: ''})
|
|
538
|
+
this.initSlice(this.f_filialeid)
|
|
539
|
+
if (this.allorgid != null) {
|
|
540
|
+
this.allorgid.forEach((res) => {
|
|
541
|
+
this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
|
|
542
|
+
})
|
|
549
543
|
}
|
|
550
|
-
this.inputtores = [{label: '全部', value: ''}, ...rs]
|
|
551
544
|
},
|
|
552
545
|
//表册片区和抄表册关联
|
|
553
546
|
async inputtorchange(){
|
|
@@ -630,7 +623,7 @@ import exportConfig from '../config/exportConfig'
|
|
|
630
623
|
userTypeChange () {
|
|
631
624
|
this.gasproperties = []
|
|
632
625
|
if (this.$refs.paged.$refs.cri.model !== null) {
|
|
633
|
-
this.$refs.paged.$refs.cri.model.f_gasproperties =
|
|
626
|
+
this.$refs.paged.$refs.cri.model.f_gasproperties = ''
|
|
634
627
|
|
|
635
628
|
console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
636
629
|
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
@@ -451,19 +451,19 @@
|
|
|
451
451
|
condition="f_table_state in {}"></v-select>
|
|
452
452
|
</div>
|
|
453
453
|
<div class="col-sm-2 form-group">
|
|
454
|
-
<label class="font_normal_body"
|
|
454
|
+
<label class="font_normal_body">档案抄表员</label>
|
|
455
455
|
<v-select :value.sync="model.f_book_inputtor" v-model='model.f_book_inputtor'
|
|
456
456
|
style="width:60%"
|
|
457
457
|
multiple
|
|
458
|
-
:options='$parent.$parent.inputtores' placeholder='
|
|
458
|
+
:options='$parent.$parent.inputtores' placeholder='档案抄表员'
|
|
459
459
|
v-el:cc></v-select>
|
|
460
460
|
</div>
|
|
461
461
|
<div class="col-sm-2 form-group">
|
|
462
|
-
<label class="font_normal_body"
|
|
462
|
+
<label class="font_normal_body">表册抄表员</label>
|
|
463
463
|
<v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
|
|
464
464
|
style="width:60%"
|
|
465
465
|
multiple
|
|
466
|
-
:options='$parent.$parent.inputtores' placeholder='
|
|
466
|
+
:options='$parent.$parent.inputtores' placeholder='表册抄表员'
|
|
467
467
|
v-el:cc></v-select>
|
|
468
468
|
</div>
|
|
469
469
|
<div class="col-sm-2 form-group">
|
|
@@ -18,25 +18,25 @@
|
|
|
18
18
|
<div class="col-sm-2">
|
|
19
19
|
<label class="font_normal_body">客户编号</label>
|
|
20
20
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
|
|
21
|
-
condition="
|
|
21
|
+
condition="f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
|
|
22
22
|
>
|
|
23
23
|
</div>
|
|
24
24
|
<div class="col-sm-2">
|
|
25
25
|
<label class="font_normal_body">客户名称</label>
|
|
26
26
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
|
|
27
|
-
condition="
|
|
27
|
+
condition="f_user_name like '%{}%'" v-next-el='userid' v-el:username>
|
|
28
28
|
</div>
|
|
29
29
|
<div class="col-sm-2">
|
|
30
30
|
<label class="font_normal_body">客户地址</label>
|
|
31
31
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_address" placeholder='客户地址'
|
|
32
|
-
condition="
|
|
32
|
+
condition="f_address like '%{}%'" v-next-el='f_address' v-el:f_address>
|
|
33
33
|
</div>
|
|
34
34
|
<div class="span" style="float:right;margin-top:10px">
|
|
35
35
|
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
36
36
|
<button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
|
|
37
37
|
<export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
|
|
38
38
|
:field="$parent.$parent.getfield"
|
|
39
|
-
sqlurl="rs/logic/exportfile" sql-name="
|
|
39
|
+
sqlurl="rs/logic/exportfile" sql-name="queryGasRecord" template-name='用气量统计表'
|
|
40
40
|
:choose-col="true"></export-excel>
|
|
41
41
|
<print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
|
|
42
42
|
:defaultfield="$parent.$parent.defaultfield"
|
|
@@ -49,24 +49,24 @@
|
|
|
49
49
|
<div class="col-sm-2">
|
|
50
50
|
<label class="font_normal_body">电 话</label>
|
|
51
51
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_user_phone" placeholder='电话'
|
|
52
|
-
condition="
|
|
52
|
+
condition="f_user_phone like '%{}%'" v-next-el='f_user_phone' v-el:f_user_phone
|
|
53
53
|
>
|
|
54
54
|
</div>
|
|
55
55
|
<div class="col-sm-2">
|
|
56
56
|
<label class="font_normal_body">小 区</label>
|
|
57
57
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area" placeholder='小区'
|
|
58
|
-
condition="
|
|
58
|
+
condition="f_residential_area like '%{}%'" v-next-el='f_residential_area' v-el:f_residential_area>
|
|
59
59
|
</div>
|
|
60
60
|
<div class="col-sm-2">
|
|
61
61
|
<label class="font_normal_body">表 号</label>
|
|
62
62
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
|
|
63
|
-
condition="
|
|
63
|
+
condition="f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
|
|
64
64
|
>
|
|
65
65
|
</div>
|
|
66
66
|
<div class="col-sm-2">
|
|
67
67
|
<label class="font_normal_body">燃气证号</label>
|
|
68
68
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_gascode" placeholder='燃气证号'
|
|
69
|
-
condition="
|
|
69
|
+
condition="f_gascode like '%{}%'" v-next-el='f_gascode' v-el:f_gascode
|
|
70
70
|
>
|
|
71
71
|
</div>
|
|
72
72
|
<div class="col-sm-2 form-group">
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
<v-select :value.sync="model.f_price_name"
|
|
82
82
|
v-model="model.f_price_name"
|
|
83
83
|
:options="$parent.$parent.getPricenames"
|
|
84
|
-
condition="
|
|
84
|
+
condition="f_price_name = '{}'"
|
|
85
85
|
close-on-select></v-select>
|
|
86
86
|
</div>
|
|
87
87
|
<div class="col-sm-2 form-group">
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
<v-select :value.sync="model.f_meter_brand"
|
|
90
90
|
v-model="model.f_meter_brand"
|
|
91
91
|
:options="$parent.$parent.meterbrands"
|
|
92
|
-
condition="
|
|
92
|
+
condition="f_meter_brand = '{}'"
|
|
93
93
|
close-on-select></v-select>
|
|
94
94
|
</div>
|
|
95
95
|
<div class="col-sm-2 form-group">
|
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
<v-select :value.sync="model.f_changetable_state"
|
|
98
98
|
v-model="model.f_changetable_state"
|
|
99
99
|
:options="$parent.$parent.isChange"
|
|
100
|
-
condition="
|
|
100
|
+
condition="f_changetable_state = '{}'"
|
|
101
101
|
close-on-select></v-select>
|
|
102
102
|
</div>
|
|
103
103
|
<div class="col-sm-2 form-group">
|
|
@@ -105,27 +105,27 @@
|
|
|
105
105
|
<v-select :value.sync="model.f_gas_state"
|
|
106
106
|
v-model="model.f_gas_state"
|
|
107
107
|
:options="$parent.$parent.gasState"
|
|
108
|
-
condition="
|
|
108
|
+
condition="f_gas_state = '{}'"
|
|
109
109
|
close-on-select></v-select>
|
|
110
110
|
</div>
|
|
111
111
|
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
112
112
|
<label class="font_normal_body">用气量区间</label>
|
|
113
113
|
<div class="row">
|
|
114
114
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount1"
|
|
115
|
-
condition="
|
|
115
|
+
condition="f_oughtamount >= {} " placeholder="">
|
|
116
116
|
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
117
117
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount2"
|
|
118
|
-
condition="
|
|
118
|
+
condition="f_oughtamount <= {} " placeholder="">
|
|
119
119
|
</div>
|
|
120
120
|
</div>
|
|
121
121
|
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
122
122
|
<label class="font_normal_body"> 充值区间 </label>
|
|
123
123
|
<div class="row">
|
|
124
124
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_collection1"
|
|
125
|
-
condition="
|
|
125
|
+
condition="f_collection >= {} " placeholder="">
|
|
126
126
|
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
127
127
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_collection2"
|
|
128
|
-
condition="
|
|
128
|
+
condition="f_collection <= {} " placeholder="">
|
|
129
129
|
</div>
|
|
130
130
|
</div>
|
|
131
131
|
<div class="col-sm-2 form-group" >
|
|
@@ -152,10 +152,10 @@
|
|
|
152
152
|
<label class="font_normal_body">余额区间</label>
|
|
153
153
|
<div class="row">
|
|
154
154
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_sta"
|
|
155
|
-
condition="
|
|
155
|
+
condition="f_balance_amount >= {} " placeholder="">
|
|
156
156
|
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
157
157
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_end"
|
|
158
|
-
condition="
|
|
158
|
+
condition="f_balance_amount <= {} " placeholder="">
|
|
159
159
|
</div>
|
|
160
160
|
</div>
|
|
161
161
|
<div class="col-sm-2 form-group">
|
|
@@ -292,7 +292,7 @@
|
|
|
292
292
|
return {
|
|
293
293
|
show:false,
|
|
294
294
|
org:[this.$login.f.orgid],
|
|
295
|
-
orgcondition: ' and
|
|
295
|
+
orgcondition: ' and f_orgid = ' + this.$login.f.orgid,
|
|
296
296
|
//f_filialeid: this.$login.f.f_orgid,
|
|
297
297
|
detaillist: [],
|
|
298
298
|
meterbrands: [],
|
|
@@ -311,7 +311,7 @@
|
|
|
311
311
|
//默认打印列
|
|
312
312
|
defaultfield: [],
|
|
313
313
|
orgCondtionStr: '',
|
|
314
|
-
model: new PagedList('rs/sql/
|
|
314
|
+
model: new PagedList('rs/sql/queryGasRecord', 50,{
|
|
315
315
|
startDate: 'this.model.startDate',
|
|
316
316
|
endDate: 'this.model.endDate'
|
|
317
317
|
},{
|
|
@@ -361,9 +361,9 @@
|
|
|
361
361
|
},
|
|
362
362
|
getorg(obj) {
|
|
363
363
|
if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
|
|
364
|
-
this.orgcondition = " and
|
|
364
|
+
this.orgcondition = " and f_orgid in " + plugins.convertToIn(obj)
|
|
365
365
|
}else{
|
|
366
|
-
this.orgcondition = " and
|
|
366
|
+
this.orgcondition = " and f_orgid = " + this.$login.f.orgid
|
|
367
367
|
}
|
|
368
368
|
},
|
|
369
369
|
userTypeChange () {
|
|
@@ -343,9 +343,7 @@
|
|
|
343
343
|
instructtype:[],
|
|
344
344
|
instructstate:[],
|
|
345
345
|
org:{
|
|
346
|
-
org:[this.$login.f.orgid]
|
|
347
|
-
dep:[],
|
|
348
|
-
user:[],
|
|
346
|
+
org:[this.$login.f.orgid]
|
|
349
347
|
},
|
|
350
348
|
orgcondition:'',
|
|
351
349
|
show: false,
|
|
@@ -409,7 +407,7 @@
|
|
|
409
407
|
getorg(condition,obj) {
|
|
410
408
|
this.orgcondition = condition.replace('f_orgid','i.f_orgid')
|
|
411
409
|
this.orgcondition = this.orgcondition.replace('f_depid','i.f_depid')
|
|
412
|
-
this.orgcondition = this.orgcondition.replace('f_operatorid','
|
|
410
|
+
this.orgcondition = this.orgcondition.replace('f_operatorid','u1.f_operatorid')
|
|
413
411
|
this.orgname = obj.orgnames[0]
|
|
414
412
|
},
|
|
415
413
|
initQueryParam () {
|
|
@@ -189,7 +189,6 @@
|
|
|
189
189
|
let readyGen = async function (self) {
|
|
190
190
|
await self.$MagLoadParams.loadParam()
|
|
191
191
|
self.getfield = self.config.excelHeaders
|
|
192
|
-
self.initQueryParam();
|
|
193
192
|
}
|
|
194
193
|
export default {
|
|
195
194
|
title: '开关阀记录查询',
|
|
@@ -253,7 +252,7 @@
|
|
|
253
252
|
let arr = []
|
|
254
253
|
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
255
254
|
let temp = {}
|
|
256
|
-
if(item.value.f_meter_type==='物联网表'
|
|
255
|
+
if(item.value.f_meter_type==='物联网表'){
|
|
257
256
|
temp.label = item.label
|
|
258
257
|
temp.value = item.value.f_meter_brand
|
|
259
258
|
arr.push(temp )
|
|
@@ -299,6 +298,7 @@
|
|
|
299
298
|
this.f_orgid = `${this.f_orgid_new}`;
|
|
300
299
|
}
|
|
301
300
|
await this.model.search(args.condition, args.model)
|
|
301
|
+
await this.initQueryParam();
|
|
302
302
|
await this.$refs.paged.$refs.grid.InitializedData()
|
|
303
303
|
await this.$refs.paged.$refs.grid.displayColumnSettings(undefined)
|
|
304
304
|
|
|
@@ -6,11 +6,10 @@
|
|
|
6
6
|
:initresid='initres.org'></right-tree>
|
|
7
7
|
</div>
|
|
8
8
|
<div :class="style" v-show="departmentshow">
|
|
9
|
-
<label class="font_normal_body"
|
|
9
|
+
<label class="font_normal_body">部  门</label>
|
|
10
10
|
<res-select restype='department' v-ref:department
|
|
11
11
|
@res-select="getdep"
|
|
12
12
|
:parentresid="depresid"
|
|
13
|
-
:specialquery="specialquery"
|
|
14
13
|
:initresid='initres.dep'
|
|
15
14
|
:mustselect="mustselect"
|
|
16
15
|
:is-mul="mul">
|
|
@@ -63,11 +62,6 @@ export default {
|
|
|
63
62
|
type: Object,
|
|
64
63
|
default: null,
|
|
65
64
|
},
|
|
66
|
-
//是否只查询营业厅
|
|
67
|
-
specialquery: {
|
|
68
|
-
type: Boolean,
|
|
69
|
-
default: false
|
|
70
|
-
},
|
|
71
65
|
showComponent:{
|
|
72
66
|
default:['company','department','operator','slicearea']
|
|
73
67
|
},
|
|
@@ -94,7 +88,6 @@ export default {
|
|
|
94
88
|
operatorshow:false,
|
|
95
89
|
sliceareashow:false,
|
|
96
90
|
mustselect:false,
|
|
97
|
-
deptitle: this.specialquery ? '营 业 厅' : '部  门',
|
|
98
91
|
obj:{
|
|
99
92
|
orgnames:[],
|
|
100
93
|
depnames:[],
|
|
@@ -214,10 +214,7 @@
|
|
|
214
214
|
<nobr>付款方式</nobr>
|
|
215
215
|
</th>
|
|
216
216
|
<th>
|
|
217
|
-
<nobr
|
|
218
|
-
</th>
|
|
219
|
-
<th>
|
|
220
|
-
<nobr>新表底数</nobr>
|
|
217
|
+
<nobr>气表底数</nobr>
|
|
221
218
|
</th>
|
|
222
219
|
<th>
|
|
223
220
|
<nobr>表上余额</nobr>
|
|
@@ -306,9 +303,6 @@
|
|
|
306
303
|
<td style="text-align: center;">
|
|
307
304
|
<nobr>{{row.f_payment}}</nobr>
|
|
308
305
|
</td>
|
|
309
|
-
<td style="text-align: center;">
|
|
310
|
-
<nobr>{{row.f_using_base_old}}</nobr>
|
|
311
|
-
</td>
|
|
312
306
|
<td style="text-align: center;">
|
|
313
307
|
<nobr>{{row.f_meter_base}}</nobr>
|
|
314
308
|
</td>
|