apply-clients 3.5.6-1 → 3.5.6-11
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 +2 -2
- package/package.json +1 -1
- package/src/filiale/dingcheng/android/AppInstallationDetails.vue +0 -1
- package/src/filiale/dingcheng/pc/InstallationDetails.vue +0 -1
- package/src/filiale/fugou/android/AppDevicesManagement.vue +6 -11
- package/src/filiale/fugou/android/AppInstallationDetails.vue +32 -33
- package/src/filiale/fugou/pc/ServiceControl.vue +9 -0
- package/src/filiale/gongyi/pc/chargeManagement.vue +2 -2
- package/src/filiale/jinhuang/pc/ContractList.vue +5 -3
- package/src/filiale/jinhuang/pc/ServiceControl.vue +2016 -2016
- package/src/filiale/jinhuang/pc/SupervisoryList.vue +478 -459
- package/src/filiale/shexian/android/AppServiceControl.vue +53 -30
- package/src/filiale/yangchunboneng/pc/chargeManagement.vue +1060 -1057
- package/src/main.js +1 -1
package/build/dev-server.js
CHANGED
|
@@ -8,8 +8,8 @@ var compiler = webpack(config)
|
|
|
8
8
|
// var proxy = httpProxy.createProxyServer()
|
|
9
9
|
// var ldap = 'http://121.36.79.201:8400'
|
|
10
10
|
// var applyinstall = 'http://121.36.79.201:8400'
|
|
11
|
-
var ldap = 'http://125.
|
|
12
|
-
var applyinstall = 'http://125.
|
|
11
|
+
var ldap = 'http://125.71.238.50:30789'
|
|
12
|
+
var applyinstall = 'http://125.71.238.50:30789'
|
|
13
13
|
|
|
14
14
|
var proxyTable = {
|
|
15
15
|
'/api': {
|
package/package.json
CHANGED
|
@@ -446,12 +446,7 @@ export default {
|
|
|
446
446
|
this.showDevices = true
|
|
447
447
|
},
|
|
448
448
|
async search () {
|
|
449
|
-
|
|
450
|
-
if(this.selectdata.f_sub_state ==='完工'){
|
|
451
|
-
condition1=`uf.f_userinfo_id = '${this.selectdata.f_userinfo_id}' and f_table_state='正常'`
|
|
452
|
-
}else{
|
|
453
|
-
condition1=`uf.f_userinfo_id = '${this.selectdata.f_userinfo_id}' and f_table_state='待开通'`
|
|
454
|
-
}
|
|
449
|
+
let condition1=`uf.f_userinfo_id = '${this.selectdata.f_userinfo_id}' and f_table_state in('待开通','正常')`
|
|
455
450
|
let http = new HttpResetClass()
|
|
456
451
|
let data = {
|
|
457
452
|
condition: condition1
|
|
@@ -513,9 +508,9 @@ export default {
|
|
|
513
508
|
}
|
|
514
509
|
</script>
|
|
515
510
|
<style scoped>
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
511
|
+
.vertical-center {
|
|
512
|
+
display: flex;
|
|
513
|
+
align-items: center;
|
|
514
|
+
text-align: center;
|
|
515
|
+
}
|
|
521
516
|
</style>
|
|
@@ -48,15 +48,15 @@
|
|
|
48
48
|
<h4 class="modal-title">安装明细</h4>
|
|
49
49
|
</header>
|
|
50
50
|
<article slot="modal-body" class="modal-body clearfix">
|
|
51
|
-
<!-- <div class="form-group row vertical-center">
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
51
|
+
<!-- <div class="form-group row vertical-center">
|
|
52
|
+
<label class="col-xs-4 control-label">地址信息：</label>
|
|
53
|
+
<div class="col-xs-8">
|
|
54
|
+
<input class="form-control input_view" style=""
|
|
55
|
+
v-model="useradders.f_address"
|
|
56
|
+
:value="useradders.f_address"
|
|
57
|
+
:readonly="true"/>
|
|
58
|
+
</div>
|
|
59
|
+
</div>-->
|
|
60
60
|
|
|
61
61
|
<div v-for="(i, item) in userinfo.userfiles" class="form-group col-xs-12 panel panel-info">
|
|
62
62
|
<div class="panel-heading head row" style="background-color: #e8f4ff;margin-bottom: 10px">
|
|
@@ -189,23 +189,23 @@
|
|
|
189
189
|
v-model="item.f_install_person"
|
|
190
190
|
:value.sync="installperson(item.f_install_person)"
|
|
191
191
|
placeholder="安装人"
|
|
192
|
-
|
|
193
|
-
<!-- <input-select-->
|
|
194
|
-
<!-- class="select select_list"-->
|
|
195
|
-
<!-- :value.sync="item.f_install_person"-->
|
|
196
|
-
<!-- v-model="item.f_install_person"-->
|
|
197
|
-
<!-- :options="installperson"-->
|
|
198
|
-
<!-- :valueSingle="true"></input-select>-->
|
|
192
|
+
/>
|
|
193
|
+
<!-- <input-select-->
|
|
194
|
+
<!-- class="select select_list"-->
|
|
195
|
+
<!-- :value.sync="item.f_install_person"-->
|
|
196
|
+
<!-- v-model="item.f_install_person"-->
|
|
197
|
+
<!-- :options="installperson"-->
|
|
198
|
+
<!-- :valueSingle="true"></input-select>-->
|
|
199
199
|
</div>
|
|
200
200
|
</div>
|
|
201
201
|
<div class="form-group row vertical-center">
|
|
202
202
|
<label class="col-xs-4 control-label">安装日期：</label>
|
|
203
203
|
<div class="col-xs-8">
|
|
204
|
-
<!-- <input class="form-control input_view" style=""
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
204
|
+
<!-- <input class="form-control input_view" style=""
|
|
205
|
+
v-model="item.f_install_date"
|
|
206
|
+
:value.sync="installdate(item.f_install_date)"
|
|
207
|
+
placeholder="安装日期"
|
|
208
|
+
/>-->
|
|
209
209
|
<datepicker
|
|
210
210
|
placeholder="安装日期"
|
|
211
211
|
:value.sync="item.f_install_date"
|
|
@@ -219,11 +219,11 @@
|
|
|
219
219
|
<div class="form-group row vertical-center">
|
|
220
220
|
<label class="col-xs-4 control-label">生产日期：</label>
|
|
221
221
|
<div class="col-xs-8">
|
|
222
|
-
<!-- <input class="form-control input_view" style=""
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
222
|
+
<!-- <input class="form-control input_view" style=""
|
|
223
|
+
v-model="item.f_factory_date"
|
|
224
|
+
:value.sync="installdate(item.f_factory_date)"
|
|
225
|
+
placeholder="生产日期"
|
|
226
|
+
/>-->
|
|
227
227
|
<datepicker
|
|
228
228
|
placeholder="安装日期"
|
|
229
229
|
:value.sync="item.f_factory_date"
|
|
@@ -299,7 +299,7 @@ export default {
|
|
|
299
299
|
async scanCode () {
|
|
300
300
|
console.log('===============扫码===================')
|
|
301
301
|
HostApp.__this__ = this,
|
|
302
|
-
|
|
302
|
+
HostApp.scanCode({callback: "javascript:HostApp.__this__.getCode();"})
|
|
303
303
|
await this.getCode()
|
|
304
304
|
},
|
|
305
305
|
async getCode () {
|
|
@@ -340,7 +340,7 @@ export default {
|
|
|
340
340
|
selectdata: this.selectdata
|
|
341
341
|
}
|
|
342
342
|
let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/addInstallationDetails`, {data:data}, {
|
|
343
|
-
|
|
343
|
+
// let res = await this.$resetpost(`rs/logic/addInstallationDetails`, {data:data}, {
|
|
344
344
|
resolveMsg: null,
|
|
345
345
|
rejectMsg: '表具添加失败！！！'
|
|
346
346
|
})
|
|
@@ -365,7 +365,7 @@ export default {
|
|
|
365
365
|
data.f_userfiles_id = this.userinfo.userfiles[i].f_userfiles_id
|
|
366
366
|
}
|
|
367
367
|
let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/meterbrandsNumberValidate`, {data:data}, {
|
|
368
|
-
|
|
368
|
+
// let res = await this.$resetpost(`rs/logic/meterbrandsNumberValidate`, {data:data}, {
|
|
369
369
|
resolveMsg: null,
|
|
370
370
|
rejectMsg: '表号验证失败！！'
|
|
371
371
|
})
|
|
@@ -403,7 +403,7 @@ export default {
|
|
|
403
403
|
condition: `f_userinfo_id='${row.f_userinfo_id}'`
|
|
404
404
|
}
|
|
405
405
|
let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getUserinfoAndUserfiles`, {data:data}, {
|
|
406
|
-
|
|
406
|
+
// let res = await http.load('POST', `rs/logic/getUserinfoAndUserfiles`, {data:data}, {
|
|
407
407
|
resolveMsg: null,
|
|
408
408
|
rejectMsg: null
|
|
409
409
|
})
|
|
@@ -438,7 +438,7 @@ export default {
|
|
|
438
438
|
// f_orgid: '10101'
|
|
439
439
|
}
|
|
440
440
|
let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getMeterbrands`, {data:data}, {
|
|
441
|
-
|
|
441
|
+
// let res = await http.load('POST', `rs/logic/getMeterbrands`, {data:data}, {
|
|
442
442
|
resolveMsg: null,
|
|
443
443
|
rejectMsg: null
|
|
444
444
|
})
|
|
@@ -458,11 +458,10 @@ export default {
|
|
|
458
458
|
condValue : tablestate
|
|
459
459
|
}
|
|
460
460
|
|
|
461
|
-
if (this.selectdata.f_apply_type === '居民团体单户报建' || this.selectdata.f_apply_type === '其他报建' || this.selectdata.f_apply_type === '增容报建' || this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建') {
|
|
461
|
+
if (this.selectdata.f_apply_type === '居民团体单户报建' || this.selectdata.f_apply_type === '团购转散户' ||this.selectdata.f_apply_type === '其他报建' || this.selectdata.f_apply_type === '增容报建' || this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建') {
|
|
462
462
|
data.condition = `ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
|
|
463
463
|
}
|
|
464
464
|
let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getAddresAndUserinfoAndUserfilesAmount`, {data:data}, {
|
|
465
|
-
// let res = await http.load('POST', `rs/sql/getAddresAndUserinfoAndUserfilesAmount`, {data:data}, {
|
|
466
465
|
resolveMsg: null,
|
|
467
466
|
rejectMsg: null
|
|
468
467
|
})
|
|
@@ -1600,6 +1600,9 @@
|
|
|
1600
1600
|
if(this.show_data.fields[index].label==="优惠金额"){
|
|
1601
1601
|
let contract=this.getLableValue('总金额')
|
|
1602
1602
|
let money = this.getLableValue('优惠金额')
|
|
1603
|
+
if(isEmpty(money)){
|
|
1604
|
+
money=0
|
|
1605
|
+
}
|
|
1603
1606
|
let contract_num = parseFloat(contract)
|
|
1604
1607
|
let money_num = parseFloat(money)
|
|
1605
1608
|
let new_contract = contract_num - money_num
|
|
@@ -1610,6 +1613,12 @@
|
|
|
1610
1613
|
let contract=this.getLableValue('合同金额')
|
|
1611
1614
|
let add=this.getLableValue('追加款')
|
|
1612
1615
|
let money = this.getLableValue('优惠金额')
|
|
1616
|
+
if(isEmpty(money)){
|
|
1617
|
+
money=0
|
|
1618
|
+
}
|
|
1619
|
+
if(isEmpty(add)){
|
|
1620
|
+
add=0
|
|
1621
|
+
}
|
|
1613
1622
|
//转为数字，然后contract减去money，保留两位小数
|
|
1614
1623
|
let money_num = parseFloat(money)
|
|
1615
1624
|
let add_num = parseFloat(add)
|
|
@@ -208,7 +208,7 @@
|
|
|
208
208
|
<label class="col-sm-2 control-label">纳税人：</label>
|
|
209
209
|
<div class="col-sm-10">
|
|
210
210
|
<input type="text"
|
|
211
|
-
placeholder="
|
|
211
|
+
placeholder="个人请输入人名,公司请输入公司名"
|
|
212
212
|
class="form-control input_view"
|
|
213
213
|
style="width: 100%"
|
|
214
214
|
:value.sync="charge.f_billing_name"
|
|
@@ -219,7 +219,7 @@
|
|
|
219
219
|
<label class="col-sm-2 control-label">纳税识别号：</label>
|
|
220
220
|
<div class="col-sm-10">
|
|
221
221
|
<input type="text"
|
|
222
|
-
placeholder="
|
|
222
|
+
placeholder="个人填身份证号,公司填识别码"
|
|
223
223
|
class="form-control input_view"
|
|
224
224
|
style="width: 100%"
|
|
225
225
|
:value.sync="charge.f_billing_number"
|
|
@@ -90,7 +90,6 @@
|
|
|
90
90
|
import {HttpResetClass, PagedList} from 'vue-client'
|
|
91
91
|
import QXClient from '../../../components/QXClient'
|
|
92
92
|
import { urlToBase64 } from '../../../components/SignTools'
|
|
93
|
-
import {runLogic} from 'vue-client/src/util/apiUtils';
|
|
94
93
|
export default {
|
|
95
94
|
title: '合同列表',
|
|
96
95
|
data () {
|
|
@@ -124,10 +123,13 @@ export default {
|
|
|
124
123
|
successCallback: (response) => {
|
|
125
124
|
console.log('>>> 签名结果：', JSON.stringify(response))
|
|
126
125
|
if (response.image) {
|
|
127
|
-
|
|
126
|
+
new HttpResetClass().load('POST', `/api/af-revenue/logic/contractSignature`, {
|
|
128
127
|
image: response.image,
|
|
129
128
|
...record
|
|
130
|
-
},
|
|
129
|
+
}, {
|
|
130
|
+
resolveMsg: null,
|
|
131
|
+
rejectMsg: null
|
|
132
|
+
}).then( async res2 => {
|
|
131
133
|
console.log('PDF 签名成功:', res2)
|
|
132
134
|
if (res2.f_signature_url) {
|
|
133
135
|
//修改t_files文件
|