manage-client 3.2.25 → 3.2.29
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 +3 -3
- package/src/components/SellReport/ChargePrick.vue +43 -122
- package/src/components/sale/businessquery/ChangeMeterQuery.vue +8 -3
- package/src/components/sale/businessquery/FillCardQuery.vue +7 -3
- package/src/components/sale/businessquery/FillGasQuery.vue +19 -4
- package/src/components/sale/businessquery/OtherChargeQuery.vue +10 -5
- package/src/components/sale/businessquery/TransferQuery.vue +6 -2
- package/src/components/sale/filesquery/ArchivesManage.vue +57 -54
- package/src/components/sale/filesquery/FireQuery.vue +477 -0
- package/src/components/webmeter/DrillData/UserGasAll.vue +17 -6
- package/src/filiale/macheng/ArrearsQuery.vue +1 -1
- package/src/filiale/tongchuan/ChargeQuery.vue +19 -1
- package/src/filiale/tongchuan/FillGasQuery.vue +19 -4
- package/src/filiale/tongchuan/config/exportConfig.js +857 -857
- package/src/main.js +3 -3
- package/src/saleManage.js +529 -524
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.29",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"moment": "2.24.0",
|
|
58
58
|
"ncp": "^2.0.0",
|
|
59
59
|
"rimraf": "^2.5.0",
|
|
60
|
-
"sale-client": "3.
|
|
60
|
+
"sale-client": "3.4.14",
|
|
61
61
|
"selenium-server": "2.52.0",
|
|
62
62
|
"sinon": "^2.1.0",
|
|
63
63
|
"sinon-chai": "^2.8.0",
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"system-clients": "3.1.89-20",
|
|
67
67
|
"url-loader": "^0.5.7",
|
|
68
68
|
"vue-amap": "0.5.10",
|
|
69
|
-
"vue-client": "1.
|
|
69
|
+
"vue-client": "1.24.33",
|
|
70
70
|
"vue-hot-reload-api": "^1.2.0",
|
|
71
71
|
"vue-html-loader": "^1.0.0",
|
|
72
72
|
"vue-loader": "8.2.1",
|
|
@@ -2,11 +2,9 @@
|
|
|
2
2
|
<div class="basic-main" style="height: 100%">
|
|
3
3
|
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
4
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
|
|
5
|
-
<p class="bg-info text-center" style="padding: 8px;">操作员收款日结账单</p>
|
|
6
|
-
<div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
|
|
7
5
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
8
6
|
<div class="row">
|
|
9
|
-
<div class="col-sm-
|
|
7
|
+
<div class="col-sm-2" >
|
|
10
8
|
<label class="font_normal_body" for="startDate">开始日期:</label>
|
|
11
9
|
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
12
10
|
v-model="model.startDate"
|
|
@@ -16,7 +14,7 @@
|
|
|
16
14
|
:show-reset-button="reset">
|
|
17
15
|
</datepicker>
|
|
18
16
|
</div>
|
|
19
|
-
<div class="col-sm-
|
|
17
|
+
<div class="col-sm-2" >
|
|
20
18
|
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
21
19
|
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
22
20
|
v-model="model.endDate"
|
|
@@ -26,22 +24,24 @@
|
|
|
26
24
|
:show-reset-button="reset">
|
|
27
25
|
</datepicker>
|
|
28
26
|
</div>
|
|
29
|
-
<
|
|
30
|
-
|
|
31
|
-
<
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
:
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
27
|
+
<res-select-group :show-component="['company','operator']" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
28
|
+
<!-- <div class="col-sm-3 form-group" >-->
|
|
29
|
+
<!-- <label class="font_normal_body" for="org">公  司:</label>-->
|
|
30
|
+
<!-- <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"-->
|
|
31
|
+
<!-- ></right-tree>-->
|
|
32
|
+
<!-- </div>-->
|
|
33
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
34
|
+
<!-- <label class="font_normal_body" for="oper">人  员:</label>-->
|
|
35
|
+
<!-- <v-select id="oper" style="width: 60%"-->
|
|
36
|
+
<!-- :multiple="false"-->
|
|
37
|
+
<!-- @change="$parent.$parent.getOpe"-->
|
|
38
|
+
<!-- :value.sync="model.f_operatorid"-->
|
|
39
|
+
<!-- v-model="model.f_operatorid"-->
|
|
40
|
+
<!-- :options='$parent.$parent.userresid' placeholder='请选择'-->
|
|
41
|
+
<!-- condition="f_operatorid in {}">-->
|
|
42
|
+
<!-- </v-select>-->
|
|
43
|
+
<!-- </div>-->
|
|
44
|
+
<div class="col-sm-2 form-group">
|
|
45
45
|
<label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
|
|
46
46
|
<v-select :value.sync="model.f_payment" multiple
|
|
47
47
|
v-model="model.f_payment"
|
|
@@ -94,56 +94,21 @@
|
|
|
94
94
|
</tr>
|
|
95
95
|
</tfoot>
|
|
96
96
|
</table>
|
|
97
|
-
{{{ $parent.reportStr}}}
|
|
98
97
|
</div>
|
|
99
98
|
</criteria-paged>
|
|
100
|
-
<modal :show.sync="show" v-ref:modal small backdrop="false">
|
|
101
|
-
<header slot="modal-header" class="modal-header">
|
|
102
|
-
<h4 class="modal-title">输入文件名称</h4>
|
|
103
|
-
</header>
|
|
104
|
-
<article slot="modal-body" class="modal-body">
|
|
105
|
-
<div class="form-group">
|
|
106
|
-
<input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
|
|
107
|
-
</div>
|
|
108
|
-
</article>
|
|
109
|
-
<footer slot="modal-footer" class="modal-footer">
|
|
110
|
-
<button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
111
|
-
<button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
|
|
112
|
-
</footer>
|
|
113
|
-
</modal>
|
|
114
99
|
</div>
|
|
115
100
|
</template>
|
|
116
101
|
|
|
117
102
|
<script>
|
|
118
103
|
import {DataModel, HttpResetClass} from 'vue-client'
|
|
119
104
|
import co from 'co'
|
|
120
|
-
|
|
121
|
-
// 线验证文件是否重名
|
|
122
|
-
let count = yield self.$resetpost('rs/sql/manageSingleTable',
|
|
123
|
-
{data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
|
|
124
|
-
{resolveMsg: null, rejectMsg: null})
|
|
125
|
-
if (count.data.length > 0) {
|
|
126
|
-
self.$showAlert('无法保存,文件名重名', 'warning', 3000)
|
|
127
|
-
return
|
|
128
|
-
}
|
|
129
|
-
let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
|
|
130
|
-
f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
|
|
131
|
-
f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
|
|
132
|
-
f_outlets: this.$login.f.depname})
|
|
133
|
-
if (saveBack.data.status === 'succeed') {
|
|
134
|
-
self.show = false
|
|
135
|
-
self.filename = ''
|
|
136
|
-
// 后台保存完成,通知刷新
|
|
137
|
-
self.$dispatch('save-success', self.filename)
|
|
138
|
-
}
|
|
139
|
-
}
|
|
105
|
+
|
|
140
106
|
let getData = function * (self) {
|
|
141
|
-
|
|
142
|
-
load.load("POST",'rs/sql/manageSingleTable',
|
|
107
|
+
new HttpResetClass().load("POST",'rs/sql/manageSingleTable',
|
|
143
108
|
{
|
|
144
109
|
data: {
|
|
145
110
|
tablename: 't_user',
|
|
146
|
-
condition: `
|
|
111
|
+
condition: `1=1`
|
|
147
112
|
}
|
|
148
113
|
},
|
|
149
114
|
{resolveMsg: null, rejectMsg: null})
|
|
@@ -161,16 +126,20 @@ let getData = function * (self) {
|
|
|
161
126
|
printTime: this.$login.toStandardTimeString(),
|
|
162
127
|
depresid: [],
|
|
163
128
|
userresid: [],
|
|
164
|
-
|
|
129
|
+
initres: {
|
|
130
|
+
org:[this.$login.f.orgid],
|
|
131
|
+
user:[]
|
|
132
|
+
},
|
|
133
|
+
//f_orgid: '',
|
|
165
134
|
// f_depid: this.$login.f.depids,
|
|
166
|
-
f_operatorid: '',
|
|
167
|
-
operatorid: [],
|
|
168
|
-
depid: [],
|
|
169
|
-
tablen:0,
|
|
135
|
+
// f_operatorid: '',
|
|
136
|
+
// operatorid: [],
|
|
137
|
+
// depid: [],
|
|
138
|
+
tablen: 0,
|
|
170
139
|
orgname: '',
|
|
171
|
-
depname: '',
|
|
140
|
+
// depname: '',
|
|
172
141
|
operatorname: '',
|
|
173
|
-
orgCondtionStr: '
|
|
142
|
+
orgCondtionStr: '',
|
|
174
143
|
model: new DataModel('rs/report/chargePrick', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
175
144
|
f_orgid: 'this.model.f_orgid'}),
|
|
176
145
|
reportStr: null,
|
|
@@ -196,78 +165,30 @@ let getData = function * (self) {
|
|
|
196
165
|
console.log(this.$login.f)
|
|
197
166
|
},
|
|
198
167
|
methods: {
|
|
199
|
-
getOpe(val){
|
|
200
|
-
this.operatorname = this.userresid.filter(x => x.value == val).map(x=>x.label).toString()
|
|
201
|
-
console.log('dep',this.operatorname )
|
|
202
|
-
},
|
|
203
168
|
searchData () {
|
|
204
169
|
this.$refs.paged.$refs.criteria.search()
|
|
205
170
|
},
|
|
206
171
|
selfSearch (args) {
|
|
207
172
|
this.printTime = this.$login.toStandardTimeString()
|
|
173
|
+
|
|
208
174
|
let orgcondition = '1 = 1'
|
|
209
|
-
if(this.
|
|
210
|
-
orgcondition +=
|
|
175
|
+
if (this.orgCondtionStr) {
|
|
176
|
+
orgcondition += this.orgCondtionStr
|
|
211
177
|
}
|
|
212
|
-
|
|
213
|
-
// if(this.f_operatorid[0]) {
|
|
214
|
-
// orgcondition += ' and f_operatorid in(' + this.f_operatorid + ')'
|
|
215
|
-
// }
|
|
216
178
|
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
217
179
|
this.$refs.paged.search(args)
|
|
218
180
|
},
|
|
219
|
-
getRes (obj) {
|
|
181
|
+
getRes (condition,obj) {
|
|
220
182
|
console.log('gs>>>>>>>>>>>>', obj)
|
|
221
|
-
this.
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
},
|
|
226
|
-
getuser ( obj, val) {
|
|
227
|
-
this.operatorname = val[0]
|
|
228
|
-
this.f_operatorid = obj
|
|
229
|
-
},
|
|
230
|
-
// 根据文件路径获取储存的报表内容
|
|
231
|
-
getFileContent (path) {
|
|
232
|
-
this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
233
|
-
this.reportStr = res.data.filecontent
|
|
234
|
-
this.model.state = '正确'
|
|
235
|
-
})
|
|
236
|
-
},
|
|
237
|
-
confirm () {
|
|
238
|
-
if (!this.filename || this.filename === '') {
|
|
239
|
-
this.$showAlert('无法保存,文件名不能为空', 'warning', 3000)
|
|
240
|
-
}
|
|
241
|
-
let saveGen = saveFile(this)
|
|
242
|
-
co(saveGen)
|
|
243
|
-
},
|
|
244
|
-
close () {
|
|
245
|
-
this.show = false
|
|
246
|
-
},
|
|
247
|
-
// 将报表保存成文件
|
|
248
|
-
confirmReport () {
|
|
249
|
-
this.show = true
|
|
250
|
-
this.filename = this.data.f_report_name + this.$login.toStandardDateString()
|
|
183
|
+
this.orgCondtionStr = condition
|
|
184
|
+
this.orgname = obj.orgnames.map(item => item.split('-')[0]).toString()
|
|
185
|
+
this.operatorname = this.userresid.filter(x => obj.operatornames.includes(x.value)).map(x=>x.label).toString()
|
|
186
|
+
|
|
251
187
|
}
|
|
252
188
|
},
|
|
253
189
|
watch: {
|
|
254
|
-
'data' (val) {
|
|
255
|
-
if (val.f_files_path) {
|
|
256
|
-
this.getFileContent(val.f_files_path)
|
|
257
|
-
} else {
|
|
258
|
-
this.reportStr = null
|
|
259
|
-
}
|
|
260
|
-
},
|
|
261
190
|
'model.data' (val) {
|
|
262
|
-
|
|
263
|
-
let a=val.split('</tr>')
|
|
264
|
-
for(let i=0;i<a.length;i++){
|
|
265
|
-
if(a[i].split('</td>').length-1>len){
|
|
266
|
-
len=a[i].split('</td>').length-1
|
|
267
|
-
}
|
|
268
|
-
continue
|
|
269
|
-
}
|
|
270
|
-
this.tablen=len
|
|
191
|
+
this.tablen = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
|
|
271
192
|
}
|
|
272
193
|
},
|
|
273
194
|
computed: {
|
|
@@ -339,6 +339,9 @@
|
|
|
339
339
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
340
340
|
补气金额合计: {{sumsmodel.f_remanent_money}}
|
|
341
341
|
</td>
|
|
342
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
343
|
+
户数合计: {{sumsmodel.hushu}}
|
|
344
|
+
</td>
|
|
342
345
|
</tr>
|
|
343
346
|
</table>
|
|
344
347
|
<!--<colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
|
|
@@ -409,7 +412,7 @@
|
|
|
409
412
|
footer:[],
|
|
410
413
|
meterbrands: [],
|
|
411
414
|
pricenames: [],
|
|
412
|
-
model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0}),
|
|
415
|
+
model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
|
|
413
416
|
criteriaShow: false,
|
|
414
417
|
orgCondtionStr: '',
|
|
415
418
|
modelval: [],
|
|
@@ -498,14 +501,16 @@
|
|
|
498
501
|
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
499
502
|
|
|
500
503
|
},
|
|
501
|
-
|
|
504
|
+
async selfSearch(args) {
|
|
502
505
|
if (this.data) {
|
|
503
506
|
this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
|
|
504
507
|
this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
|
|
505
508
|
}
|
|
506
509
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
507
|
-
this.model.search(args.condition, args.model)
|
|
510
|
+
await this.model.search(args.condition, args.model)
|
|
508
511
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
512
|
+
this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
|
|
513
|
+
|
|
509
514
|
},
|
|
510
515
|
clear() {
|
|
511
516
|
//清空部门和人员
|
|
@@ -225,6 +225,9 @@
|
|
|
225
225
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
226
226
|
卡费合计: {{sumsmodel.f_cardfees}}
|
|
227
227
|
</td>
|
|
228
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
229
|
+
户数合计: {{sumsmodel.hushu}}
|
|
230
|
+
</td>
|
|
228
231
|
</tr>
|
|
229
232
|
</table>
|
|
230
233
|
</div>
|
|
@@ -268,7 +271,7 @@
|
|
|
268
271
|
data: {},
|
|
269
272
|
other:[],
|
|
270
273
|
footer:[],
|
|
271
|
-
model: new PagedList('rs/sql/fillCardQuery', 20, {}, {f_cardfees: 0}),
|
|
274
|
+
model: new PagedList('rs/sql/fillCardQuery', 20, {}, {f_cardfees: 0,hushu:0}),
|
|
272
275
|
criteriaShow: false,
|
|
273
276
|
headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费", "补卡日期", "人员", "部门", "公司"],
|
|
274
277
|
bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
|
|
@@ -336,15 +339,16 @@
|
|
|
336
339
|
cancel() {
|
|
337
340
|
this.show = false
|
|
338
341
|
},
|
|
339
|
-
selfSearch(args) {
|
|
342
|
+
async selfSearch(args) {
|
|
340
343
|
console.log("--------------------?")
|
|
341
344
|
if (this.data) {
|
|
342
345
|
this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
|
|
343
346
|
this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
|
|
344
347
|
}
|
|
345
348
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
346
|
-
|
|
349
|
+
await this.model.search(args.condition, args.model)
|
|
347
350
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
351
|
+
this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
|
|
348
352
|
},
|
|
349
353
|
|
|
350
354
|
initParams() {
|
|
@@ -73,8 +73,9 @@
|
|
|
73
73
|
<label class="font_normal_body">补气类型</label>
|
|
74
74
|
<v-select :value.sync="model.f_type"
|
|
75
75
|
v-model="model.f_type"
|
|
76
|
+
:multiple="true"
|
|
76
77
|
:options='$parent.$parent.fillGasTypes' placeholder='请选择'
|
|
77
|
-
condition="
|
|
78
|
+
condition="f_fill_type in {}"
|
|
78
79
|
close-on-select></v-select>
|
|
79
80
|
</div>
|
|
80
81
|
|
|
@@ -83,6 +84,13 @@
|
|
|
83
84
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
|
|
84
85
|
condition="f_card_id like '%{}%'" placeholder='卡号'>
|
|
85
86
|
</div>
|
|
87
|
+
<div class="col-sm-2 form-group">
|
|
88
|
+
<label class="font_normal_body">气表类型</label>
|
|
89
|
+
<v-select :value.sync="model.f_meter_type" multiple
|
|
90
|
+
:options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
|
|
91
|
+
condition="f_meter_type in {}"
|
|
92
|
+
close-on-select></v-select>
|
|
93
|
+
</div>
|
|
86
94
|
<div class="col-sm-2 form-group">
|
|
87
95
|
<label class="font_normal_body">气表品牌</label>
|
|
88
96
|
<v-select :value.sync="model.f_meter_brand"
|
|
@@ -237,6 +245,9 @@
|
|
|
237
245
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
238
246
|
补气金额合计: {{sumsmodel.f_preamount}}
|
|
239
247
|
</td>
|
|
248
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
249
|
+
户数合计: {{sumsmodel.hushu}}
|
|
250
|
+
</td>
|
|
240
251
|
</tr>
|
|
241
252
|
</table>
|
|
242
253
|
</div>
|
|
@@ -279,7 +290,7 @@
|
|
|
279
290
|
data: {},
|
|
280
291
|
other:[],
|
|
281
292
|
footer:[],
|
|
282
|
-
model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0}),
|
|
293
|
+
model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0,hushu:0}),
|
|
283
294
|
criteriaShow: false,
|
|
284
295
|
headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补气类型", "表编号", "卡号", "气表品牌", "气表状态", "补气量", "补气日期", "操作员", "部门", "公司"],
|
|
285
296
|
bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", "f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_fillgas", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
|
|
@@ -307,7 +318,9 @@
|
|
|
307
318
|
selected:{},
|
|
308
319
|
gasproperties:[],
|
|
309
320
|
//合计数据
|
|
310
|
-
sumsmodel: {}
|
|
321
|
+
sumsmodel: {},
|
|
322
|
+
metertypes: this.$appdata.getParam('气表类型')?[{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]:[]
|
|
323
|
+
|
|
311
324
|
}
|
|
312
325
|
},
|
|
313
326
|
ready() {
|
|
@@ -359,8 +372,10 @@
|
|
|
359
372
|
this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
|
|
360
373
|
}
|
|
361
374
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
362
|
-
|
|
375
|
+
this.model.search(args.condition, args.model)
|
|
363
376
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
377
|
+
this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
|
|
378
|
+
console.log("this.sumsmodel",this.sumsmodel,this.$refs.paged.$refs.grid)
|
|
364
379
|
},
|
|
365
380
|
clear() {
|
|
366
381
|
//清空部门和人员
|
|
@@ -339,6 +339,9 @@
|
|
|
339
339
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
340
340
|
收款合计: {{sumsmodel.f_money}}
|
|
341
341
|
</td>
|
|
342
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
343
|
+
户数合计: {{sumsmodel.hushu}}
|
|
344
|
+
</td>
|
|
342
345
|
</tr>
|
|
343
346
|
</table>
|
|
344
347
|
|
|
@@ -395,7 +398,7 @@
|
|
|
395
398
|
data: {},
|
|
396
399
|
other:[],
|
|
397
400
|
footer:[],
|
|
398
|
-
model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0}),
|
|
401
|
+
model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0,hushu:0}),
|
|
399
402
|
criteriaShow: false,
|
|
400
403
|
orgCondtionStr: '',
|
|
401
404
|
modelval: [],
|
|
@@ -474,15 +477,17 @@
|
|
|
474
477
|
search(){
|
|
475
478
|
this.$refs.paged.$refs.cri.search()
|
|
476
479
|
},
|
|
477
|
-
|
|
480
|
+
async selfSearch(args) {
|
|
478
481
|
if (this.data) {
|
|
479
482
|
this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
|
|
480
483
|
this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
|
|
481
484
|
}
|
|
482
485
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
+
await this.model.search(args.condition, args.model)
|
|
487
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
488
|
+
this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
|
|
489
|
+
|
|
490
|
+
},
|
|
486
491
|
clear() {
|
|
487
492
|
//清空部门和人员
|
|
488
493
|
this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
|
|
@@ -184,6 +184,9 @@
|
|
|
184
184
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
185
185
|
过户费合计: {{sumsmodel.f_transfer_fees}}
|
|
186
186
|
</td>
|
|
187
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
188
|
+
户数合计: {{sumsmodel.hushu}}
|
|
189
|
+
</td>
|
|
187
190
|
</tr>
|
|
188
191
|
</table>
|
|
189
192
|
</div>
|
|
@@ -225,7 +228,7 @@
|
|
|
225
228
|
footer:[],
|
|
226
229
|
show:false,
|
|
227
230
|
rowdata:{},
|
|
228
|
-
model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0}),
|
|
231
|
+
model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0,hushu:0}),
|
|
229
232
|
criteriaShow: false,
|
|
230
233
|
initres: {
|
|
231
234
|
org:[this.$login.f.orgid],
|
|
@@ -302,8 +305,9 @@
|
|
|
302
305
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
303
306
|
console.log('我的阐述', JSON.stringify(args.condition))
|
|
304
307
|
await this.model.search(args.condition, args.model)
|
|
305
|
-
|
|
306
308
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
309
|
+
this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
|
|
310
|
+
|
|
307
311
|
console.log('合计字段', this.sumsmodel)
|
|
308
312
|
},
|
|
309
313
|
dealmsg(val) {
|
|
@@ -1,54 +1,57 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<tab-button class="foot_tabset" :active="-1">
|
|
3
|
-
<tabs header="客户查询" v-if="permission('客户查询')">
|
|
4
|
-
<user-query v-if="show.includes('客户查询')"></user-query>
|
|
5
|
-
</tabs>
|
|
6
|
-
<tabs header="表具查询" v-if="permission('表具查询')">
|
|
7
|
-
<meter-query v-if="show.includes('表具查询')"></meter-query>
|
|
8
|
-
</tabs>
|
|
9
|
-
<tabs header="表具设备查询" v-if="permission('表具设备查询')">
|
|
10
|
-
<equipment-query v-if="show.includes('表具设备查询')"></equipment-query>
|
|
11
|
-
</tabs>
|
|
12
|
-
<tabs header="
|
|
13
|
-
<
|
|
14
|
-
</tabs>
|
|
15
|
-
<tabs header="
|
|
16
|
-
<
|
|
17
|
-
</tabs>
|
|
18
|
-
<tabs header="
|
|
19
|
-
<
|
|
20
|
-
</tabs>
|
|
21
|
-
<tabs header="
|
|
22
|
-
<
|
|
23
|
-
</tabs>
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
</
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
</
|
|
1
|
+
<template>
|
|
2
|
+
<tab-button class="foot_tabset" :active="-1">
|
|
3
|
+
<tabs header="客户查询" v-if="permission('客户查询')">
|
|
4
|
+
<user-query v-if="show.includes('客户查询')"></user-query>
|
|
5
|
+
</tabs>
|
|
6
|
+
<tabs header="表具查询" v-if="permission('表具查询')">
|
|
7
|
+
<meter-query v-if="show.includes('表具查询')"></meter-query>
|
|
8
|
+
</tabs>
|
|
9
|
+
<tabs header="表具设备查询" v-if="permission('表具设备查询')">
|
|
10
|
+
<equipment-query v-if="show.includes('表具设备查询')"></equipment-query>
|
|
11
|
+
</tabs>
|
|
12
|
+
<tabs header="点火查询" v-if="permission('点火查询')">
|
|
13
|
+
<fire-query v-if="show.includes('点火查询')"></fire-query>
|
|
14
|
+
</tabs>
|
|
15
|
+
<tabs header="综合档案信息查询" v-if="permission('综合档案信息查询')">
|
|
16
|
+
<record-info-query v-if="show.includes('综合档案信息查询')"></record-info-query>
|
|
17
|
+
</tabs>
|
|
18
|
+
<tabs header="档案变更记录" v-if="permission('档案变更记录')">
|
|
19
|
+
<changeuser-query v-if="show.includes('档案变更记录')" @deal-msg="dealMsg"></changeuser-query>
|
|
20
|
+
</tabs>
|
|
21
|
+
<tabs header="用户设备查询" v-if="permission('用户设备查询')">
|
|
22
|
+
<user-equipment-query v-if="show.includes('用户设备查询')"></user-equipment-query>
|
|
23
|
+
</tabs>
|
|
24
|
+
<tabs header="调价记录查询" v-if="permission('调价记录查询')">
|
|
25
|
+
<price-change-query v-if="show.includes('调价记录查询')"></price-change-query>
|
|
26
|
+
</tabs>
|
|
27
|
+
</tab-button>
|
|
28
|
+
|
|
29
|
+
</template>
|
|
30
|
+
|
|
31
|
+
<script>
|
|
32
|
+
import TabButton from "../common/TabButton";
|
|
33
|
+
import Tabs from "../common/Tabs";
|
|
34
|
+
|
|
35
|
+
export default {
|
|
36
|
+
title: '档案查询',
|
|
37
|
+
data(){
|
|
38
|
+
return{
|
|
39
|
+
show: []
|
|
40
|
+
}
|
|
41
|
+
},
|
|
42
|
+
components: {Tabs, TabButton},
|
|
43
|
+
methods: {
|
|
44
|
+
permission (name) {
|
|
45
|
+
if (this.$login.r.find(value => value == '综合查询')) {
|
|
46
|
+
if (!this.$login.r.find(value => value == name)) {
|
|
47
|
+
return false
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return true
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
</script>
|
|
55
|
+
|
|
56
|
+
<style scoped>
|
|
57
|
+
</style>
|