apply-clients 3.3.110-233 → 3.3.110-237
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/components/android/Process/AppServiceControl.vue +46 -0
- package/src/components/android/Process/Processes/AppAddMaterialScience.vue +42 -0
- package/src/components/android/Process/Processes/AppChargeManagement.vue +29 -17
- package/src/components/product/Process/Service/ServiceControl.vue +26 -1
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-237",
|
|
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",
|
|
@@ -728,6 +728,27 @@ export default {
|
|
|
728
728
|
}
|
|
729
729
|
}))
|
|
730
730
|
},
|
|
731
|
+
// 获取集收单位
|
|
732
|
+
async getArea () {
|
|
733
|
+
let data = {
|
|
734
|
+
tablename: 't_area',
|
|
735
|
+
condition: `f_filialeid = '${Vue.user.orgid}'`
|
|
736
|
+
}
|
|
737
|
+
let http = new HttpResetClass()
|
|
738
|
+
let res = await http.load(
|
|
739
|
+
'POST',
|
|
740
|
+
`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
|
|
741
|
+
{data: data},
|
|
742
|
+
{resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
|
|
743
|
+
)
|
|
744
|
+
|
|
745
|
+
return res.data.map(item => {
|
|
746
|
+
return {
|
|
747
|
+
label: item.f_residential_area,
|
|
748
|
+
value: item.f_residential_area
|
|
749
|
+
}
|
|
750
|
+
})
|
|
751
|
+
},
|
|
731
752
|
async pcdChange () {
|
|
732
753
|
if (isEmpty(this.show_data.f_pcd)) {
|
|
733
754
|
return
|
|
@@ -1516,6 +1537,31 @@ export default {
|
|
|
1516
1537
|
}
|
|
1517
1538
|
}))
|
|
1518
1539
|
},
|
|
1540
|
+
// 搜索小区
|
|
1541
|
+
async 'searchAreaCollective' (area, index) {
|
|
1542
|
+
let data = {
|
|
1543
|
+
tablename: 't_area',
|
|
1544
|
+
condition: `f_filialeid = '${Vue.user.orgid}' and f_residential_area like '%${area}%'`
|
|
1545
|
+
}
|
|
1546
|
+
let http = new HttpResetClass()
|
|
1547
|
+
let res = await http.load(
|
|
1548
|
+
'POST',
|
|
1549
|
+
`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
|
|
1550
|
+
{data: data},
|
|
1551
|
+
{resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
|
|
1552
|
+
)
|
|
1553
|
+
|
|
1554
|
+
if (res.data.length === 0) {
|
|
1555
|
+
return
|
|
1556
|
+
}
|
|
1557
|
+
|
|
1558
|
+
this.setLabelOptions('集收单位', res.data.map(item => {
|
|
1559
|
+
return {
|
|
1560
|
+
label: item.f_residential_area,
|
|
1561
|
+
value: item.f_residential_area
|
|
1562
|
+
}
|
|
1563
|
+
}))
|
|
1564
|
+
},
|
|
1519
1565
|
// 团购转散户初始化
|
|
1520
1566
|
'apply2ReadyEvent' () {
|
|
1521
1567
|
if (this.show_data.f_apply_source === '线下发起') {
|
|
@@ -141,6 +141,48 @@
|
|
|
141
141
|
/>
|
|
142
142
|
</div>
|
|
143
143
|
</div>
|
|
144
|
+
<div class="form-group col-sm-6">
|
|
145
|
+
<label class="col-sm-4 control-label"></label>
|
|
146
|
+
<div class="col-sm-8">
|
|
147
|
+
|
|
148
|
+
</div>
|
|
149
|
+
</div>
|
|
150
|
+
<div class="form-group col-sm-6">
|
|
151
|
+
<label class="col-sm-4 control-label"></label>
|
|
152
|
+
<div class="col-sm-8">
|
|
153
|
+
|
|
154
|
+
</div>
|
|
155
|
+
</div>
|
|
156
|
+
<div class="form-group col-sm-6">
|
|
157
|
+
<label class="col-sm-4 control-label"></label>
|
|
158
|
+
<div class="col-sm-8">
|
|
159
|
+
|
|
160
|
+
</div>
|
|
161
|
+
</div>
|
|
162
|
+
<div class="form-group col-sm-6">
|
|
163
|
+
<label class="col-sm-4 control-label"></label>
|
|
164
|
+
<div class="col-sm-8">
|
|
165
|
+
|
|
166
|
+
</div>
|
|
167
|
+
</div>
|
|
168
|
+
<div class="form-group col-sm-6">
|
|
169
|
+
<label class="col-sm-4 control-label"></label>
|
|
170
|
+
<div class="col-sm-8">
|
|
171
|
+
|
|
172
|
+
</div>
|
|
173
|
+
</div>
|
|
174
|
+
<div class="form-group col-sm-6">
|
|
175
|
+
<label class="col-sm-4 control-label"></label>
|
|
176
|
+
<div class="col-sm-8">
|
|
177
|
+
|
|
178
|
+
</div>
|
|
179
|
+
</div>
|
|
180
|
+
<div class="form-group col-sm-6">
|
|
181
|
+
<label class="col-sm-4 control-label"></label>
|
|
182
|
+
<div class="col-sm-8">
|
|
183
|
+
|
|
184
|
+
</div>
|
|
185
|
+
</div>
|
|
144
186
|
<div v-if=" (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建')">
|
|
145
187
|
<app-qrcode-reader :istype = fmaterialname :index = i v-show="isShow[i]"></app-qrcode-reader>
|
|
146
188
|
</div>
|
|
@@ -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) {
|
|
@@ -480,7 +480,7 @@ export default {
|
|
|
480
480
|
}
|
|
481
481
|
})
|
|
482
482
|
},
|
|
483
|
-
//
|
|
483
|
+
// 获取集收单位
|
|
484
484
|
async getArea () {
|
|
485
485
|
let data = {
|
|
486
486
|
tablename: 't_area',
|
|
@@ -984,6 +984,31 @@ export default {
|
|
|
984
984
|
}
|
|
985
985
|
}))
|
|
986
986
|
},
|
|
987
|
+
// 搜索小区
|
|
988
|
+
async 'searchAreaCollective' (area, index) {
|
|
989
|
+
let data = {
|
|
990
|
+
tablename: 't_area',
|
|
991
|
+
condition: `f_filialeid = '${this.$login.f.orgid}' and f_residential_area like '%${area}%'`
|
|
992
|
+
}
|
|
993
|
+
let http = new HttpResetClass()
|
|
994
|
+
let res = await http.load(
|
|
995
|
+
'POST',
|
|
996
|
+
`rs/sql/singleTable`,
|
|
997
|
+
{data: data},
|
|
998
|
+
{resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
|
|
999
|
+
)
|
|
1000
|
+
|
|
1001
|
+
if (res.data.length === 0) {
|
|
1002
|
+
return
|
|
1003
|
+
}
|
|
1004
|
+
|
|
1005
|
+
this.setLabelOptions('集收单位', res.data.map(item => {
|
|
1006
|
+
return {
|
|
1007
|
+
label: item.f_residential_area,
|
|
1008
|
+
value: item.f_residential_area
|
|
1009
|
+
}
|
|
1010
|
+
}))
|
|
1011
|
+
},
|
|
987
1012
|
// 选择气价
|
|
988
1013
|
'priceChange' (index) {
|
|
989
1014
|
debugger
|