apply-clients 3.3.110-236 → 3.3.110-239
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 +2 -2
- package/src/apply.js +4 -0
- package/src/components/android/Process/Processes/AppChargeManagement.vue +29 -17
- package/src/components/product/GroupByApply/ApplyGroupByList.vue +253 -0
- package/src/components/product/GroupByApply/ApplyGroupByMain.vue +53 -0
- package/src/components/product/GroupByApply/ApplyGroupByPaper.vue +376 -0
- package/src/components/product/Process/Service/ServiceControl.vue +1867 -1862
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apply-clients",
|
|
3
|
-
"version": "3.3.110-
|
|
3
|
+
"version": "3.3.110-239",
|
|
4
4
|
"description": "报建前端模块",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
"style": "0.0.3",
|
|
94
94
|
"style-loader": "^0.20.3",
|
|
95
95
|
"system-clients": "3.1.87",
|
|
96
|
-
"system-phone": "1.2.
|
|
96
|
+
"system-phone": "1.2.96",
|
|
97
97
|
"url-loader": "^0.5.7",
|
|
98
98
|
"vue-client": "1.24.33",
|
|
99
99
|
"vue-hot-reload-api": "^1.2.0",
|
package/src/apply.js
CHANGED
|
@@ -46,6 +46,10 @@ export default function () {
|
|
|
46
46
|
/** 报建收费记录 **/
|
|
47
47
|
Vue.component('apply-charge-search', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeSearch'], resolve) })
|
|
48
48
|
Vue.component('apply-charge-list', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeList'], resolve) })
|
|
49
|
+
/** 团购转散户 **/
|
|
50
|
+
Vue.component('apply-group-by-paper', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByPaper'], resolve) })
|
|
51
|
+
Vue.component('apply-group-by-main', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByMain'], resolve) })
|
|
52
|
+
Vue.component('apply-group-by-list', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByList'], resolve) })
|
|
49
53
|
|
|
50
54
|
// 地址管理
|
|
51
55
|
Vue.component('apply-address-userinfo-management', (resolve) => { require(['./components/product/Process/Processes/addressAndUserinfoManagement'], resolve) })
|
|
@@ -245,10 +245,9 @@ export default {
|
|
|
245
245
|
let data = {
|
|
246
246
|
apply: this.selectdata,
|
|
247
247
|
charge: this.charge,
|
|
248
|
-
user: Vue.user
|
|
249
|
-
|
|
248
|
+
user: Vue.user,
|
|
249
|
+
f_out_trade_no:this.order.f_out_trade_no
|
|
250
250
|
}
|
|
251
|
-
|
|
252
251
|
let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/appaddApplyChargeRecord`, {data:data}, {
|
|
253
252
|
resolveMsg: null,
|
|
254
253
|
rejectMsg: '缴费失败！！！'
|
|
@@ -361,26 +360,39 @@ export default {
|
|
|
361
360
|
resolveMsg: null,
|
|
362
361
|
rejectMsg: '订单生成失败！！！'
|
|
363
362
|
})
|
|
364
|
-
|
|
365
363
|
console.log('=================================')
|
|
366
364
|
console.log(JSON.stringify(res.data))
|
|
367
365
|
this.order = res.data
|
|
366
|
+
let info = {
|
|
367
|
+
apply: this.selectdata,
|
|
368
|
+
charge: this.charge,
|
|
369
|
+
user: Vue.user,
|
|
370
|
+
f_out_trade_no:this.order.f_out_trade_no
|
|
371
|
+
}
|
|
372
|
+
http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
|
|
373
|
+
resolveMsg: null,
|
|
374
|
+
rejectMsg: null
|
|
375
|
+
}).then(ress=>{
|
|
376
|
+
console.log('ress',ress)
|
|
377
|
+
if(ress.data.code == '200'){
|
|
378
|
+
this.showQrCode = true
|
|
379
|
+
this.$nextTick(()=>{
|
|
380
|
+
this.qrcode()
|
|
381
|
+
})
|
|
382
|
+
// 剩余支付时间
|
|
383
|
+
this.paymentInterval = setInterval(() => {
|
|
384
|
+
this.timeLeft = this.timeLeft - 1
|
|
385
|
+
},1000)
|
|
368
386
|
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
387
|
+
// 3秒查询一次订单支付信息
|
|
388
|
+
this.orderInterval = setInterval(() => {
|
|
389
|
+
this.getOrderInformation()
|
|
390
|
+
},3000)
|
|
391
|
+
}else{
|
|
392
|
+
this.$showMessage('订单生成失败')
|
|
393
|
+
}
|
|
373
394
|
})
|
|
374
395
|
|
|
375
|
-
// 剩余支付时间
|
|
376
|
-
this.paymentInterval = setInterval(() => {
|
|
377
|
-
this.timeLeft = this.timeLeft - 1
|
|
378
|
-
},1000)
|
|
379
|
-
|
|
380
|
-
// 3秒查询一次订单支付信息
|
|
381
|
-
this.orderInterval = setInterval(() => {
|
|
382
|
-
this.getOrderInformation()
|
|
383
|
-
},3000)
|
|
384
396
|
|
|
385
397
|
},
|
|
386
398
|
accMul(arg1,arg2) {
|
|
@@ -0,0 +1,253 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<criteria-paged :model="model" v-ref:cp>
|
|
3
|
+
<criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
|
|
4
|
+
<div class="form-horizontal select-overspread container-fluid auto" partial>
|
|
5
|
+
<div class="row">
|
|
6
|
+
<div class="form-group col-sm-6">
|
|
7
|
+
<label class="font_normal_body">客户编号：</label>
|
|
8
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
|
|
9
|
+
v-on:keyup.enter="$parent.$parent.search()" condition="ui.f_userinfo_code like '%{}%'" placeholder='客户编号'>
|
|
10
|
+
</div>
|
|
11
|
+
<div class="form-group col-sm-6">
|
|
12
|
+
<label class="font_normal_body">客户名称：</label>
|
|
13
|
+
<input type="text" style="width:60%" class="input_search" placeholder='客户名称' v-model="model.f_user_name"
|
|
14
|
+
v-on:keyup.enter="$parent.$parent.search()"
|
|
15
|
+
condition="ui.f_user_name like '%{}%'">
|
|
16
|
+
</div>
|
|
17
|
+
<div class="form-group col-sm-6">
|
|
18
|
+
<label class="font_normal_body">小 区：</label>
|
|
19
|
+
<input type="text" style="width:60%" class="input_search" placeholder='小区' v-model="model.f_residential_area"
|
|
20
|
+
v-on:keyup.enter="$parent.$parent.search()"
|
|
21
|
+
condition="ua.f_residential_area like '%{}%'">
|
|
22
|
+
</div>
|
|
23
|
+
<div class="form-group col-sm-6">
|
|
24
|
+
<label class="font_normal_body">客户地址：</label>
|
|
25
|
+
<input type="text" style="width:60%" class="input_search" placeholder='客户地址' v-model="model.f_address"
|
|
26
|
+
v-on:keyup.enter="$parent.$parent.search()"
|
|
27
|
+
condition="ua.f_address like '%{}%'">
|
|
28
|
+
</div>
|
|
29
|
+
<div class="form-group col-sm-6">
|
|
30
|
+
<label for="startDate" class="font_normal_body">开始时间：</label>
|
|
31
|
+
<datepicker id="startDate" placeholder="开始日期"
|
|
32
|
+
style="width: 60%!important;"
|
|
33
|
+
v-model="model.startDate"
|
|
34
|
+
:value.sync="model.startDate"
|
|
35
|
+
:format="'yyyy-MM-dd 00:00:00'"
|
|
36
|
+
:show-reset-button="true"
|
|
37
|
+
condition="ua.f_create_date >= '{}'">
|
|
38
|
+
</datepicker>
|
|
39
|
+
</div>
|
|
40
|
+
<div class="form-group col-sm-6">
|
|
41
|
+
<label for="endDate" class="font_normal_body">结束时间：</label>
|
|
42
|
+
<datepicker id="endDate" placeholder="结束日期"
|
|
43
|
+
style="width: 60%!important;"
|
|
44
|
+
v-model="model.endDate"
|
|
45
|
+
:value.sync="model.endDate"
|
|
46
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
|
47
|
+
:show-reset-button="true"
|
|
48
|
+
condition="ua.f_create_date <= '{}'">
|
|
49
|
+
</datepicker>
|
|
50
|
+
</div>
|
|
51
|
+
<div class="form-group col-sm-6">
|
|
52
|
+
<label class="font_normal_body">通气状态：</label>
|
|
53
|
+
<v-select
|
|
54
|
+
v-model="model.f_address_state"
|
|
55
|
+
placeholder='请选择'
|
|
56
|
+
condition="f_address_state='{}'"
|
|
57
|
+
:value.sync="model.f_address_state"
|
|
58
|
+
:options='$parent.$parent.address_state'
|
|
59
|
+
class="select select_list"
|
|
60
|
+
:value-single="true"
|
|
61
|
+
close-on-select ></v-select>
|
|
62
|
+
</div>
|
|
63
|
+
<button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
|
|
64
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
65
|
+
<!-- <export-excel :data="$parent.$parent.getCondition"-->
|
|
66
|
+
<!-- :field="$parent.$parent.getfield"-->
|
|
67
|
+
<!-- sqlurl="rs/logic/applyExportfile"-->
|
|
68
|
+
<!-- sql-name="getApplyCharge"-->
|
|
69
|
+
<!-- template-name='收费记录信息导出'-->
|
|
70
|
+
<!-- :choose-col="true"></export-excel>-->
|
|
71
|
+
<!-- <div-->
|
|
72
|
+
<!-- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
|
|
73
|
+
<!-- @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"-->
|
|
74
|
+
<!-- class="button_spacing"-->
|
|
75
|
+
<!-- style="float: right">-->
|
|
76
|
+
<!-- </div>-->
|
|
77
|
+
</div>
|
|
78
|
+
|
|
79
|
+
</div>
|
|
80
|
+
</criteria>
|
|
81
|
+
<data-grid :model="model" v-ref:grid partial='list' class="list_area table_sy" style="padding: 0px">
|
|
82
|
+
<template partial='head'>
|
|
83
|
+
<tr>
|
|
84
|
+
<th class="textNoLineBreak">序号</th>
|
|
85
|
+
<th class="textNoLineBreak">客户编号</th>
|
|
86
|
+
<th class="textNoLineBreak">用户姓名</th>
|
|
87
|
+
<th class="textNoLineBreak">电话</th>
|
|
88
|
+
<th class="textNoLineBreak">通气状态</th>
|
|
89
|
+
<th class="textNoLineBreak">证件类型</th>
|
|
90
|
+
<th class="textNoLineBreak">证件号码</th>
|
|
91
|
+
<th class="textNoLineBreak">区/县</th>
|
|
92
|
+
<th class="textNoLineBreak">片区</th>
|
|
93
|
+
<th class="textNoLineBreak">街道</th>
|
|
94
|
+
<th class="textNoLineBreak">小区</th>
|
|
95
|
+
<th class="textNoLineBreak">详细地址</th>
|
|
96
|
+
<th class="textNoLineBreak">时间</th>
|
|
97
|
+
<th class="textNoLineBreak">备注</th>
|
|
98
|
+
<th class="textNoLineBreak">
|
|
99
|
+
<!-- <button type="button" class="btn btn-info head-but"-->
|
|
100
|
+
<!-- :disabled="$parent.$parent.$parent.mark === 1"-->
|
|
101
|
+
<!-- @click="$parent.$parent.$parent.showFileModal()">导入</button>-->
|
|
102
|
+
<!-- <a type="button" class="btn btn-info head-but"-->
|
|
103
|
+
<!-- href="/apply/download/excel/批量导入.xlsx" download>模板下载</a>-->
|
|
104
|
+
</th>
|
|
105
|
+
</tr>
|
|
106
|
+
</template>
|
|
107
|
+
<template partial='body'>
|
|
108
|
+
<tr>
|
|
109
|
+
<td style="text-align: center;">
|
|
110
|
+
<nobr>{{$index+1}}</nobr>
|
|
111
|
+
</td>
|
|
112
|
+
<td style="text-align: center;">
|
|
113
|
+
<nobr>{{row.f_userinfo_code}}</nobr>
|
|
114
|
+
</td>
|
|
115
|
+
<td style="text-align: center;">
|
|
116
|
+
<nobr>{{row.f_user_name}}</nobr>
|
|
117
|
+
</td>
|
|
118
|
+
<td style="text-align: center;">
|
|
119
|
+
<nobr>{{row.f_user_phone}}</nobr>
|
|
120
|
+
</td>
|
|
121
|
+
<td style="text-align: center;">
|
|
122
|
+
<nobr>{{row.f_address_state}}</nobr>
|
|
123
|
+
</td>
|
|
124
|
+
<td style="text-align: center;">
|
|
125
|
+
<nobr>{{row.f_credentials}}</nobr>
|
|
126
|
+
</td>
|
|
127
|
+
<td style="text-align: center;">
|
|
128
|
+
<nobr>{{row.f_idnumber}}</nobr>
|
|
129
|
+
</td>
|
|
130
|
+
<td style="text-align: center;">
|
|
131
|
+
<nobr>{{row.f_pcd}}</nobr>
|
|
132
|
+
</td>
|
|
133
|
+
<td style="text-align: center;">
|
|
134
|
+
<nobr>{{row.f_slice_area}}</nobr>
|
|
135
|
+
</td>
|
|
136
|
+
<td style="text-align: center;">
|
|
137
|
+
<nobr>{{row.f_street}}</nobr>
|
|
138
|
+
</td>
|
|
139
|
+
<td style="text-align: center;">
|
|
140
|
+
<nobr>{{row.f_residential_area}}</nobr>
|
|
141
|
+
</td>
|
|
142
|
+
<td style="text-align: center;">
|
|
143
|
+
<nobr>{{row.f_address}}</nobr>
|
|
144
|
+
</td>
|
|
145
|
+
<td style="text-align: center;">
|
|
146
|
+
<nobr>{{row.f_create_date}}</nobr>
|
|
147
|
+
</td>
|
|
148
|
+
<td style="text-align: center;">
|
|
149
|
+
<nobr>{{row.f_userinfo_comments}}</nobr>
|
|
150
|
+
</td>
|
|
151
|
+
<td style="text-align: center;">
|
|
152
|
+
<nobr>
|
|
153
|
+
|
|
154
|
+
</nobr>
|
|
155
|
+
</td>
|
|
156
|
+
</tr>
|
|
157
|
+
</template>
|
|
158
|
+
</data-grid>
|
|
159
|
+
</criteria-paged>
|
|
160
|
+
</template>
|
|
161
|
+
|
|
162
|
+
<script>
|
|
163
|
+
import {PagedList} from 'vue-client'
|
|
164
|
+
export default {
|
|
165
|
+
title: '报建团购数据查询列表',
|
|
166
|
+
props: ['check'],
|
|
167
|
+
data () {
|
|
168
|
+
let model = new PagedList('rs/sql/getAddressAanUserinfo1', 30, {
|
|
169
|
+
f_filialeid: 'this.f_filialeid',
|
|
170
|
+
f_process_id: 'this.f_process_id'
|
|
171
|
+
})
|
|
172
|
+
model.f_filialeid = ''
|
|
173
|
+
model.f_process_id = ''
|
|
174
|
+
return {
|
|
175
|
+
model: model,
|
|
176
|
+
f_process_id: '',
|
|
177
|
+
f_filialeid: '',
|
|
178
|
+
address_state: [{label: '全部', value: ''}, ...this.$appdata.getParam('通气状态')],
|
|
179
|
+
istongqi: [{label: '全部', value: ''},
|
|
180
|
+
{label: '是', value: '是'},
|
|
181
|
+
{label: '否', value: '否'}
|
|
182
|
+
],
|
|
183
|
+
chargeStatus: [
|
|
184
|
+
{label: '全部', value: ''},
|
|
185
|
+
{label: '是', value: '是'},
|
|
186
|
+
{label: '否', value: '否'}
|
|
187
|
+
],
|
|
188
|
+
criteriaShow: false,
|
|
189
|
+
chargeAll: {
|
|
190
|
+
count: 0,
|
|
191
|
+
sum: 0
|
|
192
|
+
},
|
|
193
|
+
getfield: {
|
|
194
|
+
'f_apply_num': '工程编号',
|
|
195
|
+
'f_contract_number': '合同编号',
|
|
196
|
+
'f_apply_type': '报建类型',
|
|
197
|
+
'f_apply_nature': '报建性质',
|
|
198
|
+
'f_user_name': '用户名称',
|
|
199
|
+
'f_phone': '用户电话',
|
|
200
|
+
'f_address': '用户地址',
|
|
201
|
+
'f_idnumber': '身份证号',
|
|
202
|
+
'f_charge_number': '缴费编码',
|
|
203
|
+
'f_charge_money': '收费金额',
|
|
204
|
+
'f_payment_method': '付款方式',
|
|
205
|
+
'f_payer_number': '流水号',
|
|
206
|
+
'f_charge_collectors': '收费人员',
|
|
207
|
+
'f_charge_date': '收费日期',
|
|
208
|
+
'f_actual_date': '实际收费时间',
|
|
209
|
+
'f_charge_status': '状态'
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
},
|
|
213
|
+
methods: {
|
|
214
|
+
clear () {
|
|
215
|
+
Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
|
|
216
|
+
this.$refs.cp.$refs.cri.model[key] = ''
|
|
217
|
+
})
|
|
218
|
+
this.curdepid = []
|
|
219
|
+
this.curuserid = []
|
|
220
|
+
},
|
|
221
|
+
searchCondition (args) {
|
|
222
|
+
this.model.search(args.condition, args.model)
|
|
223
|
+
},
|
|
224
|
+
// 查询
|
|
225
|
+
search () {
|
|
226
|
+
this.model.f_process_id = this.check.f_process_id
|
|
227
|
+
this.model.f_filialeid = this.check.f_orgid
|
|
228
|
+
this.$refs.cp.$refs.cri.search()
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
},
|
|
232
|
+
watch: {
|
|
233
|
+
'check': function (val) {
|
|
234
|
+
if (val) {
|
|
235
|
+
this.search()
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
},
|
|
239
|
+
computed: {
|
|
240
|
+
getCondition () {
|
|
241
|
+
return {
|
|
242
|
+
condition: this.model.condition
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
</script>
|
|
248
|
+
|
|
249
|
+
<style scoped>
|
|
250
|
+
.textNoLineBreak {
|
|
251
|
+
white-space: nowrap;
|
|
252
|
+
}
|
|
253
|
+
</style>
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="flex">
|
|
3
|
+
<section>
|
|
4
|
+
<div class="row" style="height: 100%" :class="{'basic-main':!showItem,'binary':showItem}">
|
|
5
|
+
<div :class="{'binary-left':showItem}" >
|
|
6
|
+
<apply-group-by-paper @select-changed="selected" v-ref:check></apply-group-by-paper>
|
|
7
|
+
</div>
|
|
8
|
+
<div :class="{'binary-right':showItem}" v-show="showItem">
|
|
9
|
+
<apply-group-by-list v-show='$refs.check && $refs.check.selected' :check='$refs.check.selected'
|
|
10
|
+
v-ref:detail></apply-group-by-list>
|
|
11
|
+
</div>
|
|
12
|
+
|
|
13
|
+
</div>
|
|
14
|
+
</section>
|
|
15
|
+
</div>
|
|
16
|
+
</template>
|
|
17
|
+
|
|
18
|
+
<script>
|
|
19
|
+
export default {
|
|
20
|
+
title: '团购报建数据查询',
|
|
21
|
+
data() {
|
|
22
|
+
return {
|
|
23
|
+
showItem: false
|
|
24
|
+
}
|
|
25
|
+
},
|
|
26
|
+
ready(){
|
|
27
|
+
|
|
28
|
+
},
|
|
29
|
+
methods: {
|
|
30
|
+
selected(row) {
|
|
31
|
+
this.showItem = true
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
|
|
35
|
+
watch: {}
|
|
36
|
+
|
|
37
|
+
}
|
|
38
|
+
</script>
|
|
39
|
+
|
|
40
|
+
<style >
|
|
41
|
+
.form-input-group label {
|
|
42
|
+
text-align: right;
|
|
43
|
+
width: auto;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
.datapanel {
|
|
47
|
+
color: #333;
|
|
48
|
+
background-color: white;
|
|
49
|
+
box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
|
|
50
|
+
padding: 5px 7px 5px 7px;
|
|
51
|
+
border-radius: 10px;
|
|
52
|
+
}
|
|
53
|
+
</style>
|