manage-client 4.1.18 → 4.1.19-jingyang
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 +7 -23
- package/package.json +1 -1
- package/src/components/SellReport/jinhong/JhPublicGasPrice2Report.vue +261 -0
- package/src/components/sale/filesquery/MeterQuery.vue +81 -3
- package/src/components/sale/filesquery/UserQuery.vue +0 -13
- package/src/filiale/jingyang/MeterQuery.vue +6 -2
- package/src/filiale/wuhai/UserGasList.vue +1 -1
- package/src/main.js +2 -2
- package/src/reportManage.js +4 -0
- package/.gradle/6.1.1/fileContent/fileContent.lock +0 -0
- package/.gradle/file-system.probe +0 -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://www.jytrq.cn:8800/'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://www.jytrq.cn:8800/'
|
|
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'
|
|
@@ -33,34 +33,18 @@ var proxyTable = {
|
|
|
33
33
|
target: 'http://203.57.101.233:9001/'
|
|
34
34
|
|
|
35
35
|
},
|
|
36
|
-
|
|
37
|
-
pathRewrite: {
|
|
38
|
-
'^/api/af-revenue': '/'
|
|
39
|
-
},
|
|
40
|
-
target: 'http://127.0.0.1:9026/'
|
|
41
|
-
},
|
|
42
|
-
'/api/af-revenue/sql/WeChatPayment': {
|
|
43
|
-
pathRewrite: {
|
|
44
|
-
'^/api/af-revenue': '/rs'
|
|
45
|
-
},
|
|
46
|
-
target: 'http://127.0.0.1:8080/'
|
|
47
|
-
},
|
|
36
|
+
|
|
48
37
|
'/api': {
|
|
49
|
-
target: 'http://
|
|
38
|
+
target: 'http://www.jytrq.cn:8800/'
|
|
50
39
|
|
|
51
40
|
},
|
|
52
|
-
|
|
53
|
-
target: 'http://localhost:8084/'
|
|
54
|
-
},
|
|
55
|
-
'/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
56
|
-
target: 'http://localhost:8084/'
|
|
57
|
-
},
|
|
41
|
+
|
|
58
42
|
'/files': {
|
|
59
43
|
target: bendi
|
|
60
44
|
},
|
|
61
45
|
// 查找资源服务数据
|
|
62
46
|
'/rs/search': {
|
|
63
|
-
target: 'http://
|
|
47
|
+
target: 'http://www.jytrq.cn:8800/'
|
|
64
48
|
},
|
|
65
49
|
// 查找资源服务数据
|
|
66
50
|
'/rs/logic/getLogin': {
|
|
@@ -102,7 +86,7 @@ var proxyTable = {
|
|
|
102
86
|
target: bendi
|
|
103
87
|
},
|
|
104
88
|
'/rs/vue': {
|
|
105
|
-
target: 'http://
|
|
89
|
+
target: 'http://www.jytrq.cn:8800/'
|
|
106
90
|
},
|
|
107
91
|
'/rs/file': {
|
|
108
92
|
target: bendi
|
package/package.json
CHANGED
|
@@ -0,0 +1,261 @@
|
|
|
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
|
+
<div class="col-sm-2 form-group">
|
|
28
|
+
<label class="font_normal_body"> 公司 </label>
|
|
29
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
30
|
+
</div>
|
|
31
|
+
<div class="col-sm-2 form-group">
|
|
32
|
+
<label class="font_normal_body"> 部门 </label>
|
|
33
|
+
<res-select restype='department'
|
|
34
|
+
@res-select="$parent.$parent.getdep"
|
|
35
|
+
:parentresid ="$parent.$parent.depresid"
|
|
36
|
+
:initresid='$parent.$parent.depid'>
|
|
37
|
+
</res-select>
|
|
38
|
+
|
|
39
|
+
</div>
|
|
40
|
+
<div class="col-sm-2 form-group">
|
|
41
|
+
<label class="font_normal_body"> 人员 </label>
|
|
42
|
+
<res-select restype='user'
|
|
43
|
+
@res-select="$parent.$parent.getuser"
|
|
44
|
+
:parentresid="$parent.$parent.userresid"
|
|
45
|
+
:initresid='$parent.$parent.operatorid'>
|
|
46
|
+
</res-select>
|
|
47
|
+
</div>
|
|
48
|
+
<div class="col-sm-2 form-group">
|
|
49
|
+
<label class="font_normal_body" title="分组项一">分组项一</label>
|
|
50
|
+
<v-select :value.sync="model.f_public_group1"
|
|
51
|
+
v-model="model.f_public_group1"
|
|
52
|
+
v-ref:groupone
|
|
53
|
+
:options='$parent.$parent.group1' placeholder='请选择'
|
|
54
|
+
close-on-select></v-select>
|
|
55
|
+
</div>
|
|
56
|
+
<div class="col-sm-2 form-group">
|
|
57
|
+
<label class="font_normal_body" title="分组项二">分组项二</label>
|
|
58
|
+
<v-select :value.sync="model.f_public_group2"
|
|
59
|
+
v-ref:grouptwo
|
|
60
|
+
v-model="model.f_public_group2"
|
|
61
|
+
:options='$parent.$parent.group2' placeholder='请选择'
|
|
62
|
+
close-on-select></v-select>
|
|
63
|
+
</div>
|
|
64
|
+
<div style = "float:right;">
|
|
65
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
66
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
67
|
+
<report-excel id='gasprice'></report-excel>
|
|
68
|
+
</div>
|
|
69
|
+
</div>
|
|
70
|
+
</div>
|
|
71
|
+
</criteria>
|
|
72
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
73
|
+
<table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
|
|
74
|
+
<thead>
|
|
75
|
+
<tr>
|
|
76
|
+
<th colspan='8' style="font-weight: bold; text-align: left;">
|
|
77
|
+
<h3 style="text-align: center">气费分项统计报表</h3>
|
|
78
|
+
</th>
|
|
79
|
+
</tr>
|
|
80
|
+
<tr>
|
|
81
|
+
<th colspan='8' style="font-weight: normal; text-align: center;">
|
|
82
|
+
开始时间：{{model.model.startDate}}
|
|
83
|
+
结束时间：{{ model.model.endDate }}
|
|
84
|
+
</th>
|
|
85
|
+
</tr>
|
|
86
|
+
<tr>
|
|
87
|
+
<th colspan='8' style="font-weight: normal; text-align: center;">
|
|
88
|
+
打印时间：{{{$parent.printTime}}}
|
|
89
|
+
</th>
|
|
90
|
+
</tr>
|
|
91
|
+
<tr>
|
|
92
|
+
<th colspan='8' style="font-weight: normal; text-align: center;">
|
|
93
|
+
<div>
|
|
94
|
+
<span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
|
|
95
|
+
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
96
|
+
</div>
|
|
97
|
+
</th>
|
|
98
|
+
</tr>
|
|
99
|
+
</thead>
|
|
100
|
+
<tr>
|
|
101
|
+
<td colspan='8' style="font-weight: normal;" id="test">
|
|
102
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
103
|
+
</td>
|
|
104
|
+
</tr>
|
|
105
|
+
<!-- <tfoot>-->
|
|
106
|
+
<!-- <tr style="text-align: left">-->
|
|
107
|
+
<!-- <th colspan='3' style="font-weight: normal; text-align: center;">-->
|
|
108
|
+
<!-- 收款人：-->
|
|
109
|
+
<!-- </th><th colspan='3' style="font-weight: normal; text-align: center;">-->
|
|
110
|
+
<!-- 审核人：-->
|
|
111
|
+
<!-- </th><th colspan='2' style="font-weight: normal; text-align: center;">-->
|
|
112
|
+
<!-- 经手人：-->
|
|
113
|
+
<!-- </th>-->
|
|
114
|
+
<!-- </tr>-->
|
|
115
|
+
<!-- </tfoot>-->
|
|
116
|
+
</table>
|
|
117
|
+
{{{ $parent.reportStr}}}
|
|
118
|
+
</div>
|
|
119
|
+
</criteria-paged>
|
|
120
|
+
</div>
|
|
121
|
+
</template>
|
|
122
|
+
|
|
123
|
+
<script>
|
|
124
|
+
import { DataModel } from 'vue-client'
|
|
125
|
+
import co from 'co'
|
|
126
|
+
export default {
|
|
127
|
+
title: '气费分项统计报表',
|
|
128
|
+
props: ['data'],
|
|
129
|
+
data () {
|
|
130
|
+
return {
|
|
131
|
+
printTime: this.$login.toStandardTimeString(),
|
|
132
|
+
depresid: [],
|
|
133
|
+
userresid: [],
|
|
134
|
+
initres: {
|
|
135
|
+
org:[this.$login.f.orgid],
|
|
136
|
+
dep:[],
|
|
137
|
+
user:[]
|
|
138
|
+
},
|
|
139
|
+
f_public_group1: '',
|
|
140
|
+
f_public_group2: '',
|
|
141
|
+
f_orgid: this.$login.f.orgid,
|
|
142
|
+
f_depid: this.$login.f.depids,
|
|
143
|
+
f_operatorid: this.$login.f.id,
|
|
144
|
+
operatorid: [],
|
|
145
|
+
depid: [],
|
|
146
|
+
orgname: '',
|
|
147
|
+
group1Name: '',
|
|
148
|
+
group2Name: '',
|
|
149
|
+
depname: '',
|
|
150
|
+
operatorname: '',
|
|
151
|
+
orgCondtionStr: '1=1',
|
|
152
|
+
model: new DataModel('api/af-revenue/report/jinHongPublicGasPriceReport2',
|
|
153
|
+
{startDate: 'this.model.startDate',
|
|
154
|
+
endDate: 'this.model.endDate',
|
|
155
|
+
f_orgid: 'this.model.f_orgid',
|
|
156
|
+
f_public_group1: 'this.model.f_public_group1[0]',
|
|
157
|
+
f_public_group2: 'this.model.f_public_group2[0]',
|
|
158
|
+
group1Name: 'this.model.group1Name',
|
|
159
|
+
group2Name: 'this.model.group2Name'
|
|
160
|
+
}
|
|
161
|
+
),
|
|
162
|
+
reportStr: null,
|
|
163
|
+
show: false,
|
|
164
|
+
spans: ''
|
|
165
|
+
}
|
|
166
|
+
},
|
|
167
|
+
ready () {
|
|
168
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
169
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
170
|
+
// this.$refs.paged.$refs.criteria.search()
|
|
171
|
+
},
|
|
172
|
+
methods: {
|
|
173
|
+
searchData () {
|
|
174
|
+
this.$refs.paged.$refs.criteria.search()
|
|
175
|
+
},
|
|
176
|
+
selfSearch (args) {
|
|
177
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
178
|
+
this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
|
|
179
|
+
this.$refs.paged.$refs.criteria.model.group2Name = this.$refs.paged.$refs.criteria.$refs.grouptwo.selectedItems
|
|
180
|
+
let orgcondition = '1 = 1'
|
|
181
|
+
if (this.f_orgid[0]) {
|
|
182
|
+
orgcondition += ` and f_orgid in ('${this.f_orgid}')`
|
|
183
|
+
}
|
|
184
|
+
if (this.f_depid[0]) {
|
|
185
|
+
orgcondition += ` and f_depid in ('${this.f_depid}')`
|
|
186
|
+
}
|
|
187
|
+
if(this.f_operatorid[0]) {
|
|
188
|
+
orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
|
|
189
|
+
}
|
|
190
|
+
let name1 = args.model.f_public_group1
|
|
191
|
+
let name2 = args.model.f_public_group2
|
|
192
|
+
if (name1 == null || name1 == '' || name2 == null || name2 == ''){
|
|
193
|
+
alert("请选择分组项！！！")
|
|
194
|
+
return
|
|
195
|
+
}
|
|
196
|
+
if (name2.toString() == name1.toString()){
|
|
197
|
+
alert("分组项一与分组项二不能重复！！！")
|
|
198
|
+
return
|
|
199
|
+
}
|
|
200
|
+
console.log(args.model.f_public_group1)
|
|
201
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
202
|
+
this.$refs.paged.search(args)
|
|
203
|
+
},
|
|
204
|
+
getRes (obj) {
|
|
205
|
+
this.orgname = obj.res[0]
|
|
206
|
+
this.depresid = obj.resids
|
|
207
|
+
this.f_orgid = obj.resids
|
|
208
|
+
},
|
|
209
|
+
getdep (obj, val) {
|
|
210
|
+
this.depname = val[0]
|
|
211
|
+
this.userresid = obj
|
|
212
|
+
this.f_depid = obj
|
|
213
|
+
},
|
|
214
|
+
getuser ( obj, val) {
|
|
215
|
+
this.operatorname = val[0]
|
|
216
|
+
this.f_operatorid = obj
|
|
217
|
+
}
|
|
218
|
+
},
|
|
219
|
+
watch: {
|
|
220
|
+
'data' (val) {
|
|
221
|
+
if (val.f_files_path) {
|
|
222
|
+
this.getFileContent(val.f_files_path)
|
|
223
|
+
} else {
|
|
224
|
+
this.reportStr = null
|
|
225
|
+
}
|
|
226
|
+
},
|
|
227
|
+
'model.data' (val) {
|
|
228
|
+
let tab = document.getElementById('test').children[0]
|
|
229
|
+
var tds = tab.getElementsByTagName('td')
|
|
230
|
+
var num = 0
|
|
231
|
+
for (let td of tds) {
|
|
232
|
+
let span = td.getAttribute('colspan')
|
|
233
|
+
num = num + ((span ? span : 1) - 0)
|
|
234
|
+
}
|
|
235
|
+
this.spans = num
|
|
236
|
+
}
|
|
237
|
+
},
|
|
238
|
+
computed: {
|
|
239
|
+
group1() {
|
|
240
|
+
return [{label:'用户类型', value:'f_user_type'},
|
|
241
|
+
{label:'用气性质', value:'f_gasproperties'},
|
|
242
|
+
{label:'用户标签', value:'f_user_tags'},
|
|
243
|
+
{label:'用气类型', value:'f_user_gas_type'},
|
|
244
|
+
{label:'气价名称 ', value:'f_price_name'}]
|
|
245
|
+
},
|
|
246
|
+
group2() {
|
|
247
|
+
return [{label:'用户类型', value:'f_user_type'},
|
|
248
|
+
{label:'用气性质', value:'f_gasproperties'},
|
|
249
|
+
{label:'气价名称', value:'f_price_name'},
|
|
250
|
+
{label:'用户标签', value:'f_user_tags'},
|
|
251
|
+
{label:'用气类型', value:'f_user_gas_type'},
|
|
252
|
+
{label:'单价', value:'f_stair_price'}]
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
</script>
|
|
257
|
+
<style scoped>
|
|
258
|
+
.noborder{
|
|
259
|
+
border: none;
|
|
260
|
+
}
|
|
261
|
+
</style>
|
|
@@ -40,13 +40,15 @@
|
|
|
40
40
|
|
|
41
41
|
<export-excel :data="$parent.$parent.getCondition" :field="$parent.$parent.getExportField"
|
|
42
42
|
:footer="$parent.$parent.footer" :header="$parent.$parent.other"
|
|
43
|
+
:defaultfield="$parent.$parent.defaultfield"
|
|
43
44
|
v-if="$parent.$parent.authArr.includes('档案查询导出')" sqlurl="api/af-revenue/logic/openapi/exportfile"
|
|
44
45
|
sql-name="meterQuery"
|
|
45
46
|
template-name='表具查询导出' :choose-col="true"></export-excel>
|
|
46
47
|
<print-data :sum-field="$parent.$parent.getExportField" :model="$parent.model"
|
|
47
48
|
:field="$parent.$parent.getExportField" :defaultfield="$parent.$parent.defaultfield"
|
|
48
49
|
titletable="客户查询" :sumsmodel="$parent.$parent.sumsmodel"></print-data>
|
|
49
|
-
|
|
50
|
+
<button class="button_new" style="margin-right: 10px" @click="$parent.$parent.showUploadCodeCondition()">导入编号</button>
|
|
51
|
+
<button class="button_new" style="margin-right: 10px" @click="$parent.$parent.clearUserInfoId()">清空编号</button>
|
|
50
52
|
|
|
51
53
|
<div style="float: right" class="button_spacing"
|
|
52
54
|
:class="{ 'button_shrink_top': $parent.$parent.criteriaShow, 'button_shrink_bottom': !$parent.$parent.criteriaShow }"
|
|
@@ -219,6 +221,22 @@
|
|
|
219
221
|
condition="f_gas_person like '%{}%' " placeholder="通气人">
|
|
220
222
|
</div>
|
|
221
223
|
</div>
|
|
224
|
+
<modal :show.sync="$parent.$parent.excelUserCondtion" width="500px" v-ref:modal>
|
|
225
|
+
<div slot="modal-header" class="modal-header">
|
|
226
|
+
<h4 class="modal-title">
|
|
227
|
+
导入用户表号
|
|
228
|
+
</h4>
|
|
229
|
+
</div>
|
|
230
|
+
<div slot="modal-body" class="modal-body">
|
|
231
|
+
<div class="row">
|
|
232
|
+
<file-upload class="my-file-uploader btn" name="UploadFile" style="border-radius: 2px;"
|
|
233
|
+
action="rs/file/uploadFile" tagname="档案信息导入" v-ref:file :headers="headers" multiple></file-upload>
|
|
234
|
+
<img src="../../../../static/Excelformat.png" style="width: 100%"/>
|
|
235
|
+
</div>
|
|
236
|
+
</div>
|
|
237
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
238
|
+
</footer>
|
|
239
|
+
</modal>
|
|
222
240
|
</div>
|
|
223
241
|
</criteria>
|
|
224
242
|
|
|
@@ -260,6 +278,12 @@
|
|
|
260
278
|
<th>
|
|
261
279
|
<nobr>表上余额</nobr>
|
|
262
280
|
</th>
|
|
281
|
+
<th>
|
|
282
|
+
<nobr>系统余额</nobr>
|
|
283
|
+
</th>
|
|
284
|
+
<th>
|
|
285
|
+
<nobr>上报日期</nobr>
|
|
286
|
+
</th>
|
|
263
287
|
<th>
|
|
264
288
|
<nobr>客户类型</nobr>
|
|
265
289
|
</th>
|
|
@@ -283,6 +307,9 @@
|
|
|
283
307
|
<th>
|
|
284
308
|
<nobr>气价详情</nobr>
|
|
285
309
|
</th>
|
|
310
|
+
<th>
|
|
311
|
+
<nobr>气表类型</nobr>
|
|
312
|
+
</th>
|
|
286
313
|
<th>
|
|
287
314
|
<nobr>气表品牌</nobr>
|
|
288
315
|
</th>
|
|
@@ -349,6 +376,12 @@
|
|
|
349
376
|
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
350
377
|
<nobr>{{ row.f_balance_amount }}</nobr>
|
|
351
378
|
</td>
|
|
379
|
+
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
380
|
+
<nobr>{{ row.f_jval }}</nobr>
|
|
381
|
+
</td>
|
|
382
|
+
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
383
|
+
<nobr>{{ row.f_hand_date }}</nobr>
|
|
384
|
+
</td>
|
|
352
385
|
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
353
386
|
<nobr>{{ row.f_user_type }}</nobr>
|
|
354
387
|
</td>
|
|
@@ -374,6 +407,9 @@
|
|
|
374
407
|
<th :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
375
408
|
<nobr>{{ row.value }}</nobr>
|
|
376
409
|
</th>
|
|
410
|
+
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
411
|
+
<nobr>{{ row.f_meter_classify }}</nobr>
|
|
412
|
+
</td>
|
|
377
413
|
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
378
414
|
<nobr>{{ row.f_meter_brand }}</nobr>
|
|
379
415
|
</td>
|
|
@@ -458,7 +494,7 @@
|
|
|
458
494
|
</template>
|
|
459
495
|
|
|
460
496
|
<script>
|
|
461
|
-
import {PagedList} from 'vue-client'
|
|
497
|
+
import {HttpResetClass, PagedList} from 'vue-client'
|
|
462
498
|
import exportConfig from '../config/exportConfig'
|
|
463
499
|
|
|
464
500
|
let cardBtnGen = async function (self, val) {
|
|
@@ -552,12 +588,23 @@ export default {
|
|
|
552
588
|
allorgid: [],
|
|
553
589
|
tempfalg: false,
|
|
554
590
|
lastorgstr: '',
|
|
591
|
+
excelUserCondtion: false,
|
|
592
|
+
uploadCodeCondition:'',
|
|
555
593
|
issecond: [{label: '是', value: " = '二次挂表'"}, {label: '否', value: " <> '二次挂表'"}],
|
|
556
594
|
usetype: this.$appdata.getParam('使用类型'),
|
|
557
595
|
networkvalves: this.$appdata.getParam('自动阀控') ? [{
|
|
558
596
|
label: '全部',
|
|
559
597
|
value: ''
|
|
560
598
|
}, ...this.$appdata.getParam('自动阀控')] : [],
|
|
599
|
+
defaultfield: [
|
|
600
|
+
'f_userinfo_code', // 客户编号
|
|
601
|
+
'f_user_name', // 客户名称
|
|
602
|
+
'f_user_phone', // 客户电话
|
|
603
|
+
'f_address', // 客户地址
|
|
604
|
+
'f_meternumber', // 表号
|
|
605
|
+
'f_card_id', // 卡号
|
|
606
|
+
// ... 添加更多你想默认勾选的字段
|
|
607
|
+
]
|
|
561
608
|
}
|
|
562
609
|
},
|
|
563
610
|
ready() {
|
|
@@ -663,6 +710,9 @@ export default {
|
|
|
663
710
|
if (this.IdCardInfo != '') {
|
|
664
711
|
args.condition += ` and f_idnumber='${this.IdCardInfo}'`
|
|
665
712
|
}
|
|
713
|
+
if(this.uploadCodeCondition){
|
|
714
|
+
args.condition +=` and ${this.uploadCodeCondition}`
|
|
715
|
+
}
|
|
666
716
|
this.model.search(args.condition, args.model)
|
|
667
717
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
|
|
668
718
|
this.card = ''
|
|
@@ -789,7 +839,35 @@ export default {
|
|
|
789
839
|
}
|
|
790
840
|
|
|
791
841
|
this.search()
|
|
792
|
-
}
|
|
842
|
+
},
|
|
843
|
+
showUploadCodeCondition() {
|
|
844
|
+
console.log('点击了导入编号按钮');
|
|
845
|
+
this.excelUserCondtion = true;
|
|
846
|
+
console.log('excelUserCondtion:', this.excelUserCondtion);
|
|
847
|
+
},
|
|
848
|
+
//清空用户编号
|
|
849
|
+
clearUserInfoId(){
|
|
850
|
+
this.uploadCodeCondition=''
|
|
851
|
+
Vue.showMessage("已清空用户编号")
|
|
852
|
+
},
|
|
853
|
+
|
|
854
|
+
},
|
|
855
|
+
events: {
|
|
856
|
+
onFileUpload: function (file, res) {
|
|
857
|
+
//tag)
|
|
858
|
+
//tag)
|
|
859
|
+
let data = {
|
|
860
|
+
filepath: res.f_downloadpath
|
|
861
|
+
}
|
|
862
|
+
new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
|
|
863
|
+
resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
|
|
864
|
+
rejectMsg: '导入失败'
|
|
865
|
+
}).then((res) => {
|
|
866
|
+
this.uploadCodeCondition=res.data.condition
|
|
867
|
+
this.excelUserCondtion = false
|
|
868
|
+
})
|
|
869
|
+
},
|
|
870
|
+
|
|
793
871
|
},
|
|
794
872
|
watch: {
|
|
795
873
|
'model.rows.length'() {
|
|
@@ -799,19 +799,6 @@
|
|
|
799
799
|
}
|
|
800
800
|
},
|
|
801
801
|
selfSearch(args) {
|
|
802
|
-
//小区查询条件
|
|
803
|
-
this.area = this.$refs.paged.$refs.cri.model.f_residential_area
|
|
804
|
-
console.log("=====小区model绑定====",this.area)
|
|
805
|
-
if(this.area.length !== 0){
|
|
806
|
-
let str = JSON.stringify(this.area)
|
|
807
|
-
str = str.replace(/"/g,`'`)
|
|
808
|
-
str = str.replace(/\[/g,``)
|
|
809
|
-
str = str.replace(/\]/g,``)
|
|
810
|
-
console.log("=====小区model22222222222绑定====",str)
|
|
811
|
-
//查询多个小区时条件
|
|
812
|
-
args.condition += ` and f_residential_area in ( ${str} )`
|
|
813
|
-
}
|
|
814
|
-
|
|
815
802
|
if (!this.orgCondtionStr) {
|
|
816
803
|
args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
|
|
817
804
|
} else {
|
|
@@ -860,7 +860,7 @@ export default {
|
|
|
860
860
|
let data = {
|
|
861
861
|
filepath: res.f_downloadpath
|
|
862
862
|
}
|
|
863
|
-
new HttpResetClass().load('POST','/rs/logic/
|
|
863
|
+
new HttpResetClass().load('POST','/rs/logic/meter_GetUserInfoFromExcel', {data: data}, {
|
|
864
864
|
resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
|
|
865
865
|
rejectMsg: '导入失败'
|
|
866
866
|
}).then((res) => {
|
|
@@ -954,7 +954,11 @@ export default {
|
|
|
954
954
|
}
|
|
955
955
|
},
|
|
956
956
|
getCondition() {
|
|
957
|
-
|
|
957
|
+
let condition = `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr;
|
|
958
|
+
if (this.uploadCodeCondition) {
|
|
959
|
+
condition += ` and ${this.uploadCodeCondition}`;
|
|
960
|
+
}
|
|
961
|
+
return {condition, orderitem: this.orderitem}
|
|
958
962
|
},
|
|
959
963
|
getfield() {
|
|
960
964
|
let data = {}
|
package/src/main.js
CHANGED
|
@@ -6,8 +6,8 @@ import { all } from 'vue-client'
|
|
|
6
6
|
import { system } from 'system-clients'
|
|
7
7
|
import { ldap } from 'ldap-clients'
|
|
8
8
|
import saleManage from './saleManage'
|
|
9
|
-
import ShanXianSaleManage from './filiale/
|
|
10
|
-
// import ShanXianwebSaleManage from './filiale/
|
|
9
|
+
import ShanXianSaleManage from './filiale/jingyang/sale'
|
|
10
|
+
// import ShanXianwebSaleManage from './filiale/jingyang/sale'
|
|
11
11
|
import webmeterManage from './webmeterManage'
|
|
12
12
|
import reportManage from './reportManage'
|
|
13
13
|
import newmanage from './newmanage'
|
package/src/reportManage.js
CHANGED
|
@@ -803,6 +803,10 @@ export default function () {
|
|
|
803
803
|
Vue.component('public-gas-price2-report', (resolve) => {
|
|
804
804
|
require(['./components/SellReport/PublicGasPrice2Report'], resolve)
|
|
805
805
|
})
|
|
806
|
+
// 气价分布通用报表2
|
|
807
|
+
Vue.component('jh-public-gas-price2-report', (resolve) => {
|
|
808
|
+
require(['./components/SellReport/jinhong/JhPublicGasPrice2Report'], resolve)
|
|
809
|
+
})
|
|
806
810
|
// 运城 居民用户各项数据统计表（月报）
|
|
807
811
|
Vue.component('yc-month-summary', (resolve) => {
|
|
808
812
|
require(['./components/SellReport/YCMonthSummary'], resolve)
|
|
Binary file
|
|
Binary file
|