manage-client 3.3.158 → 3.3.159
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 +3 -0
- package/src/components/sale/businessquery/NfcRechargeRecord.vue +269 -0
- package/src/components/sale/config/exportConfig.js +12 -0
- package/src/filiale/alashan/config/exportConfig.js +12 -0
- package/src/saleManage.js +4 -0
package/package.json
CHANGED
|
@@ -127,6 +127,9 @@
|
|
|
127
127
|
<tabs header="收费记录维护查询" v-if="permission('收费记录维护查询')">
|
|
128
128
|
<charge-record-maintenance-query v-if="show.includes('收费记录维护查询')" ></charge-record-maintenance-query>
|
|
129
129
|
</tabs>
|
|
130
|
+
<tabs header="NFC充值记录" v-if="permission('NFC充值记录')">
|
|
131
|
+
<nfc-recharge-record v-if="show.includes('NFC充值记录')" ></nfc-recharge-record>
|
|
132
|
+
</tabs>
|
|
130
133
|
</tab-button>
|
|
131
134
|
<!-- </div>-->
|
|
132
135
|
<!-- <div v-if="!listpage">-->
|
|
@@ -0,0 +1,269 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="unit" class="flex-row">
|
|
3
|
+
<div class="basic-main" @keyup.enter="search">
|
|
4
|
+
<div class="flex">
|
|
5
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
6
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
|
|
7
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
8
|
+
<div class="row">
|
|
9
|
+
<div class="col-sm-2 form-group">
|
|
10
|
+
<label for="startDate" class="font_normal_body">开始日期</label>
|
|
11
|
+
<datepicker id="startDate" placeholder="开始日期" style="width:60%"
|
|
12
|
+
v-model="model.startDate"
|
|
13
|
+
:value.sync="model.startDate"
|
|
14
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
15
|
+
:show-reset-button="true"
|
|
16
|
+
condition="f_operate_date >= '{}'">
|
|
17
|
+
</datepicker>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-2 form-group">
|
|
20
|
+
<label for="endDate" class="font_normal_body">结束日期</label>
|
|
21
|
+
<datepicker id="endDate" placeholder="结束日期" style="width:60%"
|
|
22
|
+
v-model="model.endDate"
|
|
23
|
+
:value.sync="model.endDate"
|
|
24
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
25
|
+
:show-reset-button="true"
|
|
26
|
+
condition="f_operate_date <= '{}'">
|
|
27
|
+
</datepicker>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="col-sm-2 form-group">
|
|
30
|
+
<label class="font_normal_body">用户编号</label>
|
|
31
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
|
|
32
|
+
condition="f_userinfo_code = '{}'" placeholder='用户编号'>
|
|
33
|
+
</div>
|
|
34
|
+
<div class="col-sm-2 form-group">
|
|
35
|
+
<label class="font_normal_body">用户姓名</label>
|
|
36
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
37
|
+
condition="f_user_name = '{}'" placeholder='用户姓名'>
|
|
38
|
+
</div>
|
|
39
|
+
<div class="span" style="float:right;">
|
|
40
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
41
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
42
|
+
|
|
43
|
+
<export-excel :data="$parent.$parent.getCondition"
|
|
44
|
+
:field="$parent.$parent.getfield"
|
|
45
|
+
sqlurl="api/af-revenue/logic/openapi/exportfile"
|
|
46
|
+
sql-name="NFCRechargeRecord"
|
|
47
|
+
template-name='NFC充值记录导出'
|
|
48
|
+
:choose-col="true"></export-excel>
|
|
49
|
+
|
|
50
|
+
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
51
|
+
</div>
|
|
52
|
+
</div>
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
57
|
+
<res-select-group :initres="$parent.$parent.initres" :show-component="$parent.$parent.showComponent" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
58
|
+
<div class="col-sm-2 form-group">
|
|
59
|
+
<label class="font_normal_body">用户类型</label>
|
|
60
|
+
<v-select :value.sync="model.f_user_type"
|
|
61
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
62
|
+
condition="f_user_type = '{}'"
|
|
63
|
+
close-on-select></v-select>
|
|
64
|
+
</div>
|
|
65
|
+
<div class="col-sm-2 form-group">
|
|
66
|
+
<label class="font_normal_body">写卡账号</label>
|
|
67
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
|
|
68
|
+
condition="f_card_id = '{}'" placeholder='写卡账号'>
|
|
69
|
+
</div>
|
|
70
|
+
|
|
71
|
+
|
|
72
|
+
</div>
|
|
73
|
+
</div>
|
|
74
|
+
</criteria>
|
|
75
|
+
|
|
76
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
|
|
77
|
+
<template partial='head'>
|
|
78
|
+
<tr>
|
|
79
|
+
<th>
|
|
80
|
+
<nobr>编号</nobr>
|
|
81
|
+
</th>
|
|
82
|
+
<th>
|
|
83
|
+
<nobr>用户编号</nobr>
|
|
84
|
+
</th>
|
|
85
|
+
<th>
|
|
86
|
+
<nobr>用户姓名</nobr>
|
|
87
|
+
</th>
|
|
88
|
+
<th>
|
|
89
|
+
<nobr>用户类型</nobr>
|
|
90
|
+
</th>
|
|
91
|
+
<th>
|
|
92
|
+
<nobr>支付类型</nobr>
|
|
93
|
+
</th>
|
|
94
|
+
<th>
|
|
95
|
+
<nobr>充值时间</nobr>
|
|
96
|
+
</th>
|
|
97
|
+
<th>
|
|
98
|
+
<nobr>写卡时间</nobr>
|
|
99
|
+
</th>
|
|
100
|
+
<th>
|
|
101
|
+
<nobr>写卡账号</nobr>
|
|
102
|
+
</th>
|
|
103
|
+
<th>
|
|
104
|
+
<nobr>写卡状态</nobr>
|
|
105
|
+
</th>
|
|
106
|
+
<th>
|
|
107
|
+
<nobr>写卡金额</nobr>
|
|
108
|
+
</th>
|
|
109
|
+
</tr>
|
|
110
|
+
</template>
|
|
111
|
+
<template partial='body'>
|
|
112
|
+
<td style="text-align: center;">
|
|
113
|
+
<nobr>{{row.id}}</nobr>
|
|
114
|
+
</td>
|
|
115
|
+
<td style="text-align: center;">
|
|
116
|
+
<nobr>{{row.f_userinfo_code}}</nobr>
|
|
117
|
+
</td>
|
|
118
|
+
<td style="text-align: center;">
|
|
119
|
+
<nobr>{{row.f_user_name}}</nobr>
|
|
120
|
+
</td>
|
|
121
|
+
<td style="text-align: center;">
|
|
122
|
+
<nobr>{{row.f_user_type}}</nobr>
|
|
123
|
+
</td>
|
|
124
|
+
<td style="text-align: center;">
|
|
125
|
+
<nobr>{{row.f_type}}</nobr>
|
|
126
|
+
</td>
|
|
127
|
+
<td style="text-align: center;">
|
|
128
|
+
<nobr>{{row.f_operate_date}}</nobr>
|
|
129
|
+
</td>
|
|
130
|
+
<td style="text-align: center;">
|
|
131
|
+
<nobr>{{row.f_write_date}}</nobr>
|
|
132
|
+
</td>
|
|
133
|
+
<td style="text-align: center;">
|
|
134
|
+
<nobr>{{row.f_card_id}}</nobr>
|
|
135
|
+
</td>
|
|
136
|
+
<td style="text-align: center;">
|
|
137
|
+
<nobr>{{row.f_write_card}}</nobr>
|
|
138
|
+
</td>
|
|
139
|
+
<td style="text-align: center;">
|
|
140
|
+
<nobr>{{row.f_write_money}}</nobr>
|
|
141
|
+
</td>
|
|
142
|
+
</template>
|
|
143
|
+
<template partial='foot'></template>
|
|
144
|
+
</data-grid>
|
|
145
|
+
</criteria-paged>
|
|
146
|
+
</div>
|
|
147
|
+
</div>
|
|
148
|
+
</div>
|
|
149
|
+
</template>
|
|
150
|
+
|
|
151
|
+
<script>
|
|
152
|
+
import {HttpResetClass, PagedList} from 'vue-client'
|
|
153
|
+
import exportConfig from '../config/exportConfig'
|
|
154
|
+
import defaultPrint from '../config/DefaultPrint'
|
|
155
|
+
|
|
156
|
+
let readySomething = async function (self) {
|
|
157
|
+
self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
|
|
158
|
+
self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
|
|
159
|
+
}
|
|
160
|
+
export default {
|
|
161
|
+
props:['data'],
|
|
162
|
+
title: 'NFC充值记录',
|
|
163
|
+
data() {
|
|
164
|
+
return {
|
|
165
|
+
other:[],
|
|
166
|
+
footer:[],
|
|
167
|
+
config: {
|
|
168
|
+
defaultPrint: ['f_userinfo_code', 'f_user_name','f_address', 'f_user_type', 'f_gasproperties','f_oldprice','f_newprice','oldprice_performdate','newprice_performdate','f_operate_date','f_operator','f_depname']
|
|
169
|
+
},
|
|
170
|
+
//f_price_name:[],
|
|
171
|
+
gasproperties:[],
|
|
172
|
+
data: {},
|
|
173
|
+
initres: {
|
|
174
|
+
org:[this.$login.f.orgid],
|
|
175
|
+
dep:[],
|
|
176
|
+
user:[]
|
|
177
|
+
},
|
|
178
|
+
showComponent:['company'],
|
|
179
|
+
model: new PagedList('api/af-revenue/sql/NFCRechargeRecord', 20, {}, ),
|
|
180
|
+
criteriaShow: false,
|
|
181
|
+
orgCondtionStr: '',
|
|
182
|
+
//合计数据
|
|
183
|
+
defaultfield: [],
|
|
184
|
+
sumsmodel: {},
|
|
185
|
+
selected:{},
|
|
186
|
+
f_filialeid: this.$login.f.f_orgid
|
|
187
|
+
}
|
|
188
|
+
},
|
|
189
|
+
ready() {
|
|
190
|
+
readySomething(this).then(() => {
|
|
191
|
+
this.$emit('ready')
|
|
192
|
+
}).catch((error) => {
|
|
193
|
+
this.$emit('error', error)
|
|
194
|
+
})
|
|
195
|
+
|
|
196
|
+
},
|
|
197
|
+
methods: {
|
|
198
|
+
search(){
|
|
199
|
+
this.$refs.paged.$refs.cri.search()
|
|
200
|
+
},
|
|
201
|
+
selfSearch(args) {
|
|
202
|
+
//小区查询条件
|
|
203
|
+
if (this.data) {
|
|
204
|
+
this.$parent.$parent.$parent.data.operateDate=this.$refs.paged.$refs.cri.model.operateDate
|
|
205
|
+
this.$parent.$parent.$parent.data.performDate=this.$refs.paged.$refs.cri.model.performDate
|
|
206
|
+
}
|
|
207
|
+
let f_orgstr = this.orgCondtionStr
|
|
208
|
+
args.condition = `${args.condition} ` + f_orgstr
|
|
209
|
+
this.model.search(args.condition, args.model)
|
|
210
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
|
|
211
|
+
|
|
212
|
+
},
|
|
213
|
+
clear() {
|
|
214
|
+
//清空部门和人员
|
|
215
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
|
|
216
|
+
//部门和人员变为全选
|
|
217
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
|
|
218
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
|
|
219
|
+
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
220
|
+
this.$refs.paged.$refs.cri.model[key] = []
|
|
221
|
+
})
|
|
222
|
+
|
|
223
|
+
},
|
|
224
|
+
dealmsg(val) {
|
|
225
|
+
val.model = this.model.model
|
|
226
|
+
this.$dispatch('deal-msg', val)
|
|
227
|
+
},
|
|
228
|
+
show() {
|
|
229
|
+
this.criteriaShow = true
|
|
230
|
+
},
|
|
231
|
+
hidden() {
|
|
232
|
+
this.criteriaShow = !this.criteriaShow
|
|
233
|
+
},
|
|
234
|
+
getRes(condition,obj) {
|
|
235
|
+
this.orgCondtionStr = condition
|
|
236
|
+
this.orgname = obj.orgnames[0]
|
|
237
|
+
this.depname = obj.depnames[0]
|
|
238
|
+
},
|
|
239
|
+
|
|
240
|
+
},
|
|
241
|
+
events:{
|
|
242
|
+
|
|
243
|
+
},
|
|
244
|
+
watch: {
|
|
245
|
+
|
|
246
|
+
'orgCondtionStr'(val) {
|
|
247
|
+
let res = val.match(/'(.*?)'/)
|
|
248
|
+
console.log('正则提取:',res && res[1])
|
|
249
|
+
if (res) {
|
|
250
|
+
this.f_filialeid = res[1]
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
},
|
|
254
|
+
computed: {
|
|
255
|
+
usertypes() {
|
|
256
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
257
|
+
},
|
|
258
|
+
getCondition() {
|
|
259
|
+
return {
|
|
260
|
+
operateDate: this.$refs.paged.$refs.cri.model.operateDate,
|
|
261
|
+
performDate: this.$refs.paged.$refs.cri.model.performDate,
|
|
262
|
+
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
|
|
263
|
+
},
|
|
264
|
+
getfield() {
|
|
265
|
+
return exportConfig.nfcRecordQuery
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
</script>
|
|
@@ -1214,6 +1214,18 @@ export default{
|
|
|
1214
1214
|
'operator': '操作人',
|
|
1215
1215
|
'modifitime': '操作时间',
|
|
1216
1216
|
'f_state': '收费记录状态'
|
|
1217
|
+
},
|
|
1218
|
+
nfcRecordQuery: {
|
|
1219
|
+
'id': '编号',
|
|
1220
|
+
'f_userinfo_code': '用户编号',
|
|
1221
|
+
'f_user_name': '用户姓名',
|
|
1222
|
+
'f_user_type': '用户类型',
|
|
1223
|
+
'f_type': '支付类型',
|
|
1224
|
+
'f_operate_date': '充值时间',
|
|
1225
|
+
'f_write_date': '写卡时间',
|
|
1226
|
+
'f_card_id': '写卡账号',
|
|
1227
|
+
'f_write_card': '写卡状态',
|
|
1228
|
+
'f_write_money': '写卡金额'
|
|
1217
1229
|
}
|
|
1218
1230
|
}
|
|
1219
1231
|
|
|
@@ -2251,6 +2251,18 @@ export default {
|
|
|
2251
2251
|
'f_type': '收费类型', 'f_brand_spec': '规格名称', 'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量',
|
|
2252
2252
|
'f_collection': '收款', 'f_payment': '付款方式', 'f_operate_date': '收费日期', 'f_state': '状态',
|
|
2253
2253
|
'f_orgname': '所属机构', 'f_depname': '部门', 'f_operator': '操作人'
|
|
2254
|
+
},
|
|
2255
|
+
nfcRecordQuery: {
|
|
2256
|
+
'id': '编号',
|
|
2257
|
+
'f_userinfo_code': '用户编号',
|
|
2258
|
+
'f_user_name': '用户姓名',
|
|
2259
|
+
'f_user_type': '用户类型',
|
|
2260
|
+
'f_type': '支付类型',
|
|
2261
|
+
'f_operate_date': '充值时间',
|
|
2262
|
+
'f_write_date': '写卡时间',
|
|
2263
|
+
'f_card_id': '写卡账号',
|
|
2264
|
+
'f_write_card': '写卡状态',
|
|
2265
|
+
'f_write_money': '写卡金额'
|
|
2254
2266
|
}
|
|
2255
2267
|
}
|
|
2256
2268
|
|
package/src/saleManage.js
CHANGED
|
@@ -89,6 +89,10 @@ export default function () {
|
|
|
89
89
|
Vue.component('charge-query', (resolve) => {
|
|
90
90
|
require(['./components/sale/businessquery/ChargeQuery'], resolve)
|
|
91
91
|
})
|
|
92
|
+
// NFC充值记录
|
|
93
|
+
Vue.component('nfc-recharge-record', (resolve) => {
|
|
94
|
+
require(['./components/sale/businessquery/NfcRechargeRecord'], resolve)
|
|
95
|
+
})
|
|
92
96
|
// 团缴查询
|
|
93
97
|
Vue.component('group-charge-query', (resolve) => {
|
|
94
98
|
require(['./components/sale/businessquery/GroupChargeQuery'], resolve)
|